crypto: testmgr - enable CRYPTO_MANAGER when CRYPTO_SELFTESTS

crypto/testmgr.c is compiled only when CRYPTO_MANAGER is enabled.  To
make CRYPTO_SELFTESTS work as expected when CRYPTO_MANAGER doesn't get
enabled for another reason, automatically set CRYPTO_MANAGER to the
value of CRYPTO_ALGAPI when CRYPTO_SELFTESTS is enabled.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 50f6e285b92ab7bcbaa5267bc142822d0c718a74..e9fee7818e270652470ca3d3b1ad5d9f99048874 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -149,10 +149,11 @@ config CRYPTO_HKDF
 
 config CRYPTO_MANAGER
        tristate
+       default CRYPTO_ALGAPI if CRYPTO_SELFTESTS
        select CRYPTO_MANAGER2
        help
-         Create default cryptographic template instantiations such as
-         cbc(aes).
+         This provides the support for instantiating templates such as
+         cbc(aes), and the support for the crypto self-tests.
 
 config CRYPTO_MANAGER2
        def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y)

diff --git a/crypto/algapi.c b/crypto/algapi.c
index 9030a30c89e84aa02a4105d30aa87330c38edcac..25b5519e3b711545929a709964ab5036eb85608b 100644 (file)
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -274,8 +274,7 @@ static struct crypto_larval *crypto_alloc_test_larval(struct crypto_alg *alg)
 {
        struct crypto_larval *larval;
 
-       if (!IS_ENABLED(CONFIG_CRYPTO_MANAGER) ||
-           !IS_ENABLED(CONFIG_CRYPTO_SELFTESTS) ||
+       if (!IS_ENABLED(CONFIG_CRYPTO_SELFTESTS) ||
            (alg->cra_flags & CRYPTO_ALG_INTERNAL))
                return NULL; /* No self-test needed */