| Message ID | 20190520164829.167433-1-ebiggers@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | crypto: testmgr - make extra tests depend on cryptomgr | expand |
On Mon, May 20, 2019 at 09:48:29AM -0700, Eric Biggers wrote: > From: Eric Biggers <ebiggers@google.com> > > 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> > --- > crypto/Kconfig | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) Patch applied. Thanks.
diff --git a/crypto/Kconfig b/crypto/Kconfig index 3d056e7da65f6..7009aff745cb7 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