From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F0776190473; Fri, 6 Mar 2026 00:20:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772756426; cv=none; b=mZWgCTGxJuWPhRMucXUxeMmW+5sxNOl1J0BEdvh1SJ0JeK/x3DGlwBdOD5+Z+rW0ZkI7fRK3DcQV5AokndbvsmH2ZFaqZDQyCl/uJrtYLcCCDsjetHu0n5wdFybLiUMC5Ls+K/3gh7I1WaR4JYX4KGr2XHnBVbqYFFM8VGbTeUE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772756426; c=relaxed/simple; bh=2m9nF0p0OdbUjR6hTYp5NFma5L+MqoxNyXQslnug9Fc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=tpnUtuYcrBY3ozecCSUe+jUOpyU1ut7oxipumdshFFV3KdcVyYQigcgw39so2+F2TgFFhse+ZqIJYtIfASKEHYx+cf/XSTh3wn8XuPIGohrXmE8tbFNSrSiKj/oeNxbOEz0/QzExmf243QLc3n5H/KGzz9h2BbZI6KeaSCJ8c0k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=THSO5Q3g; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="THSO5Q3g" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5E5F4C116C6; Fri, 6 Mar 2026 00:20:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772756425; bh=2m9nF0p0OdbUjR6hTYp5NFma5L+MqoxNyXQslnug9Fc=; h=From:To:Cc:Subject:Date:From; b=THSO5Q3gO+MhZrcgPJB4/Y/csZjJ01vCahW2vteLlFrdA0phpOd3BrxDtVERFaHZJ ibQyZCSEcFfjAkCt1LGZOFMAtqbJu0GaZkISKolot8EMMlF4TxtIUW2WtJ4s5wieya jfQZCRjUUw9FbZvtw6Npzy17LTwkqwXjTBGsEvd2qya/6EXSmjfLVcrxie/4MW4QdL L0gUBDogghcSwuZciit5qb0NceFMj05CnKf1gNY0Cn4+MMjzZ6c5w6w4yTDIgN2nMv Q/MujS+pJZ6kGWfZ4LpMKU931HNo5uUc2IXbeZFJCMiEnnWkxZbGCf8J2iwflzkgiB l7D8eujcvtLYQ== From: Eric Biggers To: linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Ard Biesheuvel , "Jason A . Donenfeld" , Herbert Xu , Eric Biggers Subject: [PATCH] lib/crypto: tests: Fix aes_cbc_macs dependency and add to kunitconfig Date: Thu, 5 Mar 2026 16:19:17 -0800 Message-ID: <20260306001917.24105-1-ebiggers@kernel.org> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Update the dependency of CRYPTO_LIB_AES_CBC_MACS_KUNIT_TEST to match the new convention established by commit 4478e8eeb871 ("lib/crypto: tests: Depend on library options rather than selecting them"), and add this test to the kunitconfig file added by commit 20d6f07004d6 ("lib/crypto: tests: Add a .kunitconfig file"). Signed-off-by: Eric Biggers --- This is targeting libcrypto-next. This patch is needed because the aes_cbc_macs test is queued for 7.1 and wasn't handled by the commits mentioned above which were merged into 7.0. lib/crypto/.kunitconfig | 3 +++ lib/crypto/tests/Kconfig | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/crypto/.kunitconfig b/lib/crypto/.kunitconfig index 6b2ce28ae509..8cfd213bded9 100644 --- a/lib/crypto/.kunitconfig +++ b/lib/crypto/.kunitconfig @@ -3,12 +3,14 @@ CONFIG_KUNIT=y # These kconfig options select all the CONFIG_CRYPTO_LIB_* symbols that have a # corresponding KUnit test. Those symbols cannot be directly enabled here, # since they are hidden symbols. CONFIG_CRYPTO=y CONFIG_CRYPTO_ADIANTUM=y +CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_BLAKE2B=y CONFIG_CRYPTO_CHACHA20POLY1305=y +CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_HCTR2=y CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MLDSA=y CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA256=y @@ -18,10 +20,11 @@ CONFIG_INET=y CONFIG_IPV6=y CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_WIREGUARD=y +CONFIG_CRYPTO_LIB_AES_CBC_MACS_KUNIT_TEST=y CONFIG_CRYPTO_LIB_BLAKE2B_KUNIT_TEST=y CONFIG_CRYPTO_LIB_BLAKE2S_KUNIT_TEST=y CONFIG_CRYPTO_LIB_CURVE25519_KUNIT_TEST=y CONFIG_CRYPTO_LIB_MD5_KUNIT_TEST=y CONFIG_CRYPTO_LIB_MLDSA_KUNIT_TEST=y diff --git a/lib/crypto/tests/Kconfig b/lib/crypto/tests/Kconfig index f6b842cad97e..0d71de3da15d 100644 --- a/lib/crypto/tests/Kconfig +++ b/lib/crypto/tests/Kconfig @@ -1,13 +1,12 @@ # SPDX-License-Identifier: GPL-2.0-or-later config CRYPTO_LIB_AES_CBC_MACS_KUNIT_TEST tristate "KUnit tests for AES-CMAC, AES-XCBC-MAC, and AES-CBC-MAC" if !KUNIT_ALL_TESTS - depends on KUNIT + depends on KUNIT && CRYPTO_LIB_AES_CBC_MACS default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS select CRYPTO_LIB_BENCHMARK_VISIBLE - select CRYPTO_LIB_AES_CBC_MACS help KUnit tests for the AES-CMAC, AES-XCBC-MAC, and AES-CBC-MAC message authentication codes. config CRYPTO_LIB_BLAKE2B_KUNIT_TEST base-commit: 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f