| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748 |
- --- a/crypto/Kconfig
- +++ b/crypto/Kconfig
- @@ -118,12 +118,12 @@ config CRYPTO_MANAGER
- cbc(aes).
-
- config CRYPTO_MANAGER2
- - def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y)
- - select CRYPTO_AEAD2
- - select CRYPTO_HASH2
- - select CRYPTO_BLKCIPHER2
- - select CRYPTO_PCOMP2
- - select CRYPTO_AKCIPHER2
- + def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y && !CRYPTO_MANAGER_DISABLE_TESTS)
- + select CRYPTO_AEAD2 if !CRYPTO_MANAGER_DISABLE_TESTS
- + select CRYPTO_HASH2 if !CRYPTO_MANAGER_DISABLE_TESTS
- + select CRYPTO_BLKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS
- + select CRYPTO_PCOMP2 if !CRYPTO_MANAGER_DISABLE_TESTS
- + select CRYPTO_AKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS
-
- config CRYPTO_USER
- tristate "Userspace cryptographic algorithm configuration"
- @@ -136,7 +136,6 @@ config CRYPTO_USER
- 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.
- --- a/crypto/algboss.c
- +++ b/crypto/algboss.c
- @@ -248,12 +248,16 @@ static int cryptomgr_schedule_test(struc
- type = alg->cra_flags;
-
- /* This piece of crap needs to disappear into per-type test hooks. */
- +#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
- + type |= CRYPTO_ALG_TESTED;
- +#else
- if (!((type ^ CRYPTO_ALG_TYPE_BLKCIPHER) &
- CRYPTO_ALG_TYPE_BLKCIPHER_MASK) && !(type & CRYPTO_ALG_GENIV) &&
- ((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==
- CRYPTO_ALG_TYPE_BLKCIPHER ? alg->cra_blkcipher.ivsize :
- alg->cra_ablkcipher.ivsize))
- type |= CRYPTO_ALG_TESTED;
- +#endif
-
- param->type = type;
-
|
