3 @@ -119,11 +119,11 @@ config CRYPTO_MANAGER
6 def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y)
9 - select CRYPTO_BLKCIPHER2
10 - select CRYPTO_PCOMP2
11 - select CRYPTO_AKCIPHER2
12 + select CRYPTO_AEAD2 if !CRYPTO_MANAGER_DISABLE_TESTS
13 + select CRYPTO_HASH2 if !CRYPTO_MANAGER_DISABLE_TESTS
14 + select CRYPTO_BLKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS
15 + select CRYPTO_PCOMP2 if !CRYPTO_MANAGER_DISABLE_TESTS
16 + select CRYPTO_AKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS
19 tristate "Userspace cryptographic algorithm configuration"
20 --- a/crypto/algboss.c
21 +++ b/crypto/algboss.c
22 @@ -248,12 +248,16 @@ static int cryptomgr_schedule_test(struc
23 type = alg->cra_flags;
25 /* This piece of crap needs to disappear into per-type test hooks. */
26 +#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
27 + type |= CRYPTO_ALG_TESTED;
29 if (!((type ^ CRYPTO_ALG_TYPE_BLKCIPHER) &
30 CRYPTO_ALG_TYPE_BLKCIPHER_MASK) && !(type & CRYPTO_ALG_GENIV) &&
31 ((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==
32 CRYPTO_ALG_TYPE_BLKCIPHER ? alg->cra_blkcipher.ivsize :
33 alg->cra_ablkcipher.ivsize))
34 type |= CRYPTO_ALG_TESTED;