OpenWrt – Blame information for rev 2
?pathlinks?
Rev | Author | Line No. | Line |
---|---|---|---|
1 | office | 1 | --- a/crypto/Kconfig |
2 | +++ b/crypto/Kconfig |
||
3 | @@ -96,10 +96,10 @@ config CRYPTO_MANAGER |
||
4 | |||
5 | config CRYPTO_MANAGER2 |
||
6 | def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y) |
||
7 | - select CRYPTO_AEAD2 |
||
8 | - select CRYPTO_HASH2 |
||
9 | - select CRYPTO_BLKCIPHER2 |
||
10 | - select CRYPTO_PCOMP2 |
||
11 | + select CRYPTO_AEAD2 if !CRYPTO_MANAGER_DISABLE_TESTS |
||
12 | + select CRYPTO_HASH2 if !CRYPTO_MANAGER_DISABLE_TESTS |
||
13 | + select CRYPTO_BLKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS |
||
14 | + select CRYPTO_PCOMP2 if !CRYPTO_MANAGER_DISABLE_TESTS |
||
15 | |||
16 | config CRYPTO_USER |
||
17 | tristate "Userspace cryptographic algorithm configuration" |
||
18 | --- a/crypto/algboss.c |
||
19 | +++ b/crypto/algboss.c |
||
20 | @@ -248,6 +248,9 @@ static int cryptomgr_schedule_test(struc |
||
21 | type = alg->cra_flags; |
||
22 | |||
23 | /* This piece of crap needs to disappear into per-type test hooks. */ |
||
24 | +#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS |
||
25 | + type |= CRYPTO_ALG_TESTED; |
||
26 | +#else |
||
27 | if ((!((type ^ CRYPTO_ALG_TYPE_BLKCIPHER) & |
||
28 | CRYPTO_ALG_TYPE_BLKCIPHER_MASK) && !(type & CRYPTO_ALG_GENIV) && |
||
29 | ((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) == |
||
30 | @@ -256,6 +259,7 @@ static int cryptomgr_schedule_test(struc |
||
31 | (!((type ^ CRYPTO_ALG_TYPE_AEAD) & CRYPTO_ALG_TYPE_MASK) && |
||
32 | alg->cra_type == &crypto_nivaead_type && alg->cra_aead.ivsize)) |
||
33 | type |= CRYPTO_ALG_TESTED; |
||
34 | +#endif |
||
35 | |||
36 | param->type = type; |
||
37 |