Commit 57999ed1 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

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: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 6f9d0f53

crypto/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -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)

crypto/algapi.c

+1 −2
Original line number Diff line number Diff line
@@ -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 */