mirror of
https://github.com/torvalds/linux.git
synced 2026-03-08 01:04:41 +01:00
lib/crypto: tests: Depend on library options rather than selecting them
The convention for KUnit tests is to have the test kconfig options visible only when the code they depend on is already enabled. This way only the tests that are relevant to the particular kernel build can be enabled, either manually or via KUNIT_ALL_TESTS. Update lib/crypto/tests/Kconfig to follow that convention, i.e. depend on the corresponding library options rather than selecting them. This fixes an issue where enabling KUNIT_ALL_TESTS enabled non-test code. This does mean that it becomes a bit more difficult to enable *all* the crypto library tests (which is what I do as a maintainer of the code), since doing so will now require enabling other options that select the libraries. Regardless, we should follow the standard KUnit convention. I'll also add a .kunitconfig file that does enable all these options. Note: currently most of the crypto library options are selected by visible options in crypto/Kconfig, which can be used to enable them without too much trouble. If in the future we end up with more cases like CRYPTO_LIB_CURVE25519 which is selected only by WIREGUARD (thus making CRYPTO_LIB_CURVE25519_KUNIT_TEST effectively depend on WIREGUARD after this commit), we could consider adding a new kconfig option that enables all the library code specifically for testing. Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Closes: https://lore.kernel.org/r/CAMuHMdULzMdxuTVfg8_4jdgzbzjfx-PHkcgbGSthcUx_sHRNMg@mail.gmail.com Fixes:4dcf6cadda("lib/crypto: tests: Add KUnit tests for SHA-224 and SHA-256") Fixes:571eaeddb6("lib/crypto: tests: Add KUnit tests for SHA-384 and SHA-512") Fixes:6dd4d9f791("lib/crypto: tests: Add KUnit tests for Poly1305") Fixes:66b1306079("lib/crypto: tests: Add KUnit tests for SHA-1 and HMAC-SHA1") Fixes:d6b6aac0cd("lib/crypto: tests: Add KUnit tests for MD5 and HMAC-MD5") Fixes:afc4e4a5f1("lib/crypto: tests: Migrate Curve25519 self-test to KUnit") Fixes:6401fd334d("lib/crypto: tests: Add KUnit tests for BLAKE2b") Fixes:15c64c47e4("lib/crypto: tests: Add SHA3 kunit tests") Fixes:b3aed551b3("lib/crypto: tests: Add KUnit tests for POLYVAL") Fixes:ed894faccb("lib/crypto: tests: Add KUnit tests for ML-DSA verification") Fixes:7246fe6cd6("lib/crypto: tests: Add KUnit tests for NH") Cc: stable@vger.kernel.org Reviewed-by: David Gow <david@davidgow.net> Acked-by: Ard Biesheuvel <ardb@kernel.org> Link: https://lore.kernel.org/r/20260226191749.39397-1-ebiggers@kernel.org Signed-off-by: Eric Biggers <ebiggers@kernel.org>
This commit is contained in:
parent
201ceb94aa
commit
4478e8eeb8
1 changed files with 12 additions and 23 deletions
|
|
@ -2,10 +2,9 @@
|
|||
|
||||
config CRYPTO_LIB_BLAKE2B_KUNIT_TEST
|
||||
tristate "KUnit tests for BLAKE2b" if !KUNIT_ALL_TESTS
|
||||
depends on KUNIT
|
||||
depends on KUNIT && CRYPTO_LIB_BLAKE2B
|
||||
default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS
|
||||
select CRYPTO_LIB_BENCHMARK_VISIBLE
|
||||
select CRYPTO_LIB_BLAKE2B
|
||||
help
|
||||
KUnit tests for the BLAKE2b cryptographic hash function.
|
||||
|
||||
|
|
@ -14,71 +13,64 @@ config CRYPTO_LIB_BLAKE2S_KUNIT_TEST
|
|||
depends on KUNIT
|
||||
default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS
|
||||
select CRYPTO_LIB_BENCHMARK_VISIBLE
|
||||
# No need to select CRYPTO_LIB_BLAKE2S here, as that option doesn't
|
||||
# No need to depend on CRYPTO_LIB_BLAKE2S here, as that option doesn't
|
||||
# exist; the BLAKE2s code is always built-in for the /dev/random driver.
|
||||
help
|
||||
KUnit tests for the BLAKE2s cryptographic hash function.
|
||||
|
||||
config CRYPTO_LIB_CURVE25519_KUNIT_TEST
|
||||
tristate "KUnit tests for Curve25519" if !KUNIT_ALL_TESTS
|
||||
depends on KUNIT
|
||||
depends on KUNIT && CRYPTO_LIB_CURVE25519
|
||||
default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS
|
||||
select CRYPTO_LIB_BENCHMARK_VISIBLE
|
||||
select CRYPTO_LIB_CURVE25519
|
||||
help
|
||||
KUnit tests for the Curve25519 Diffie-Hellman function.
|
||||
|
||||
config CRYPTO_LIB_MD5_KUNIT_TEST
|
||||
tristate "KUnit tests for MD5" if !KUNIT_ALL_TESTS
|
||||
depends on KUNIT
|
||||
depends on KUNIT && CRYPTO_LIB_MD5
|
||||
default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS
|
||||
select CRYPTO_LIB_BENCHMARK_VISIBLE
|
||||
select CRYPTO_LIB_MD5
|
||||
help
|
||||
KUnit tests for the MD5 cryptographic hash function and its
|
||||
corresponding HMAC.
|
||||
|
||||
config CRYPTO_LIB_MLDSA_KUNIT_TEST
|
||||
tristate "KUnit tests for ML-DSA" if !KUNIT_ALL_TESTS
|
||||
depends on KUNIT
|
||||
depends on KUNIT && CRYPTO_LIB_MLDSA
|
||||
default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS
|
||||
select CRYPTO_LIB_BENCHMARK_VISIBLE
|
||||
select CRYPTO_LIB_MLDSA
|
||||
help
|
||||
KUnit tests for the ML-DSA digital signature algorithm.
|
||||
|
||||
config CRYPTO_LIB_NH_KUNIT_TEST
|
||||
tristate "KUnit tests for NH" if !KUNIT_ALL_TESTS
|
||||
depends on KUNIT
|
||||
depends on KUNIT && CRYPTO_LIB_NH
|
||||
default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS
|
||||
select CRYPTO_LIB_NH
|
||||
help
|
||||
KUnit tests for the NH almost-universal hash function.
|
||||
|
||||
config CRYPTO_LIB_POLY1305_KUNIT_TEST
|
||||
tristate "KUnit tests for Poly1305" if !KUNIT_ALL_TESTS
|
||||
depends on KUNIT
|
||||
depends on KUNIT && CRYPTO_LIB_POLY1305
|
||||
default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS
|
||||
select CRYPTO_LIB_BENCHMARK_VISIBLE
|
||||
select CRYPTO_LIB_POLY1305
|
||||
help
|
||||
KUnit tests for the Poly1305 library functions.
|
||||
|
||||
config CRYPTO_LIB_POLYVAL_KUNIT_TEST
|
||||
tristate "KUnit tests for POLYVAL" if !KUNIT_ALL_TESTS
|
||||
depends on KUNIT
|
||||
depends on KUNIT && CRYPTO_LIB_POLYVAL
|
||||
default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS
|
||||
select CRYPTO_LIB_BENCHMARK_VISIBLE
|
||||
select CRYPTO_LIB_POLYVAL
|
||||
help
|
||||
KUnit tests for the POLYVAL library functions.
|
||||
|
||||
config CRYPTO_LIB_SHA1_KUNIT_TEST
|
||||
tristate "KUnit tests for SHA-1" if !KUNIT_ALL_TESTS
|
||||
depends on KUNIT
|
||||
depends on KUNIT && CRYPTO_LIB_SHA1
|
||||
default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS
|
||||
select CRYPTO_LIB_BENCHMARK_VISIBLE
|
||||
select CRYPTO_LIB_SHA1
|
||||
help
|
||||
KUnit tests for the SHA-1 cryptographic hash function and its
|
||||
corresponding HMAC.
|
||||
|
|
@ -87,10 +79,9 @@ config CRYPTO_LIB_SHA1_KUNIT_TEST
|
|||
# included, for consistency with the naming used elsewhere (e.g. CRYPTO_SHA256).
|
||||
config CRYPTO_LIB_SHA256_KUNIT_TEST
|
||||
tristate "KUnit tests for SHA-224 and SHA-256" if !KUNIT_ALL_TESTS
|
||||
depends on KUNIT
|
||||
depends on KUNIT && CRYPTO_LIB_SHA256
|
||||
default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS
|
||||
select CRYPTO_LIB_BENCHMARK_VISIBLE
|
||||
select CRYPTO_LIB_SHA256
|
||||
help
|
||||
KUnit tests for the SHA-224 and SHA-256 cryptographic hash functions
|
||||
and their corresponding HMACs.
|
||||
|
|
@ -99,20 +90,18 @@ config CRYPTO_LIB_SHA256_KUNIT_TEST
|
|||
# included, for consistency with the naming used elsewhere (e.g. CRYPTO_SHA512).
|
||||
config CRYPTO_LIB_SHA512_KUNIT_TEST
|
||||
tristate "KUnit tests for SHA-384 and SHA-512" if !KUNIT_ALL_TESTS
|
||||
depends on KUNIT
|
||||
depends on KUNIT && CRYPTO_LIB_SHA512
|
||||
default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS
|
||||
select CRYPTO_LIB_BENCHMARK_VISIBLE
|
||||
select CRYPTO_LIB_SHA512
|
||||
help
|
||||
KUnit tests for the SHA-384 and SHA-512 cryptographic hash functions
|
||||
and their corresponding HMACs.
|
||||
|
||||
config CRYPTO_LIB_SHA3_KUNIT_TEST
|
||||
tristate "KUnit tests for SHA-3" if !KUNIT_ALL_TESTS
|
||||
depends on KUNIT
|
||||
depends on KUNIT && CRYPTO_LIB_SHA3
|
||||
default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS
|
||||
select CRYPTO_LIB_BENCHMARK_VISIBLE
|
||||
select CRYPTO_LIB_SHA3
|
||||
help
|
||||
KUnit tests for the SHA3 cryptographic hash and XOF functions,
|
||||
including SHA3-224, SHA3-256, SHA3-384, SHA3-512, SHAKE128 and
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue