crypto: testmgr - make extra tests depend on cryptomgr
authorEric Biggers <ebiggers@google.com>
Mon, 20 May 2019 16:48:29 +0000 (09:48 -0700)
committerHerbert Xu <herbert@gondor.apana.org.au>
Thu, 30 May 2019 07:28:40 +0000 (15:28 +0800)
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>
crypto/Kconfig

index 3d056e7da65f675e77de8c436cf0c1366fe3e329..7009aff745cb7f2fc75796e0032778c29637711e 100644 (file)
@@ -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