summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2019-05-20 09:48:29 -0700
committerHerbert Xu <herbert@gondor.apana.org.au>2019-05-30 15:28:40 +0800
commit929d34cac156a55bf9e5a88a1fa5191be1fcdc35 (patch)
tree0056a1c93ca09626fa70c4f3723a9dc827d0cbb0
parente944eab37a72bf171647d691dda4614f7151191f (diff)
downloadlinux-929d34cac156a55bf9e5a88a1fa5191be1fcdc35.tar.gz
linux-929d34cac156a55bf9e5a88a1fa5191be1fcdc35.tar.bz2
linux-929d34cac156a55bf9e5a88a1fa5191be1fcdc35.zip
crypto: testmgr - make extra tests depend on cryptomgr
The crypto self-tests are part of the "cryptomgr" module, which can technically be disabled (though it rarely is). If you do so, currently you can still enable CRYPTO_MANAGER_EXTRA_TESTS, which doesn't make sense since in that case testmgr.c isn't compiled at all. Fix it by making it CRYPTO_MANAGER_EXTRA_TESTS depend on CRYPTO_MANAGER2, like CRYPTO_MANAGER_DISABLE_TESTS already does. Fixes: 5b2706a4d459 ("crypto: testmgr - introduce CONFIG_CRYPTO_MANAGER_EXTRA_TESTS") Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--crypto/Kconfig5
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 3d056e7da65f..7009aff745cb 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -137,10 +137,11 @@ config CRYPTO_USER
Userspace configuration for cryptographic instantiations such as
cbc(aes).
+if CRYPTO_MANAGER2
+
config CRYPTO_MANAGER_DISABLE_TESTS
bool "Disable run-time self tests"
default y
- depends on CRYPTO_MANAGER2
help
Disable run-time self tests that normally take place at
algorithm registration.
@@ -155,6 +156,8 @@ config CRYPTO_MANAGER_EXTRA_TESTS
This is intended for developer use only, as these tests take much
longer to run than the normal self tests.
+endif # if CRYPTO_MANAGER2
+
config CRYPTO_GF128MUL
tristate "GF(2^128) multiplication functions"
help