From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1FAA6C77B60 for ; Sun, 19 Mar 2023 19:39:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229883AbjCSTjg (ORCPT ); Sun, 19 Mar 2023 15:39:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229738AbjCSTj3 (ORCPT ); Sun, 19 Mar 2023 15:39:29 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03C3F11E87; Sun, 19 Mar 2023 12:39:04 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 23FF861166; Sun, 19 Mar 2023 19:39:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E61EC433EF; Sun, 19 Mar 2023 19:39:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679254743; bh=wOFl1sorqP7Hib+xYi2OZdOJlqgfvdW/EjWY9nlzE3Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gnM1JSCU1gPgGaK9fpb5UjGxqZBWXUq2MzWKOeQi2k4//FcJqZyCDRfycnXaCUbuv zuVvaQ6TH0bP43nO+jgcrMfn6QVMqRvQUdXyLcMuFdNzjMKOUaf1ZATotYMyHxlYkr W2sqIKEgidLg9tuc4uuO/IBObTyAUIv8Zw2w9gXENnJdp0QdroCQp3HO35hTHNP58K jYeOyv43yzLCAcFnLu9Y0OutC3XB+Gwaog4cmZjWiY/u4R7afR/XsDQXA2AZ4hrrNA yU/Ia0EFDau/9O14Xaxg7W/uvR8mK3jXhonqavjyjnTXZyERYL57BPYPC5swdWxJ3K KrJpllbmntiSQ== From: Eric Biggers To: fstests@vger.kernel.org Cc: linux-fscrypt@vger.kernel.org Subject: [PATCH 1/3] fscrypt-crypt-util: fix HKDF self-test with latest OpenSSL Date: Sun, 19 Mar 2023 12:38:45 -0700 Message-Id: <20230319193847.106872-2-ebiggers@kernel.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230319193847.106872-1-ebiggers@kernel.org> References: <20230319193847.106872-1-ebiggers@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org From: Eric Biggers In OpenSSL 3.0, EVP_PKEY_derive() fails if the output is zero-length. Therefore, update test_hkdf_sha512() to not test this case. This only affects the algorithm self-tests within fscrypt-crypt-util, which are not compiled by default. Signed-off-by: Eric Biggers --- src/fscrypt-crypt-util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/fscrypt-crypt-util.c b/src/fscrypt-crypt-util.c index 087ae09a..4bb4f4e5 100644 --- a/src/fscrypt-crypt-util.c +++ b/src/fscrypt-crypt-util.c @@ -975,7 +975,9 @@ static void test_hkdf_sha512(void) size_t ikmlen = 1 + (rand() % sizeof(ikm)); size_t saltlen = rand() % (1 + sizeof(salt)); size_t infolen = rand() % (1 + sizeof(info)); - size_t outlen = rand() % (1 + sizeof(actual_output)); + // Don't test zero-length outputs, since OpenSSL 3.0 and later + // returns an error for those. + size_t outlen = 1 + (rand() % sizeof(actual_output)); rand_bytes(ikm, ikmlen); rand_bytes(salt, saltlen); -- 2.40.0