Skip to content
Snippets Groups Projects
Commit dbcf5b35 authored by Felix Fietkau's avatar Felix Fietkau Committed by Kenneth Johansson
Browse files

kernel: prevent cryptomgr from pulling in useless extra dependencies for tests that are not run


Reduces kernel size after LZMA by about 5k on MIPS

lede-commit: 044c316167e076479a344c59905e5b435b84a77f
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 0bb3cd91
Branches
No related tags found
No related merge requests found
...@@ -132,12 +132,12 @@ config CRYPTO_MANAGER ...@@ -132,12 +132,12 @@ config CRYPTO_MANAGER
cbc(aes). cbc(aes).
config CRYPTO_MANAGER2 config CRYPTO_MANAGER2
def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y) def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y && !CRYPTO_MANAGER_DISABLE_TESTS)
select CRYPTO_AEAD2 select CRYPTO_AEAD2 if !CRYPTO_MANAGER_DISABLE_TESTS
select CRYPTO_HASH2 select CRYPTO_HASH2 if !CRYPTO_MANAGER_DISABLE_TESTS
select CRYPTO_BLKCIPHER2 select CRYPTO_BLKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS
select CRYPTO_AKCIPHER2 select CRYPTO_AKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS
select CRYPTO_KPP2 select CRYPTO_KPP2 if !CRYPTO_MANAGER_DISABLE_TESTS
config CRYPTO_USER config CRYPTO_USER
tristate "Userspace cryptographic algorithm configuration" tristate "Userspace cryptographic algorithm configuration"
...@@ -150,7 +150,6 @@ config CRYPTO_USER ...@@ -150,7 +150,6 @@ config CRYPTO_USER
config CRYPTO_MANAGER_DISABLE_TESTS config CRYPTO_MANAGER_DISABLE_TESTS
bool "Disable run-time self tests" bool "Disable run-time self tests"
default y default y
depends on CRYPTO_MANAGER2
help help
Disable run-time self tests that normally take place at Disable run-time self tests that normally take place at
algorithm registration. algorithm registration.
......
...@@ -248,12 +248,16 @@ static int cryptomgr_schedule_test(struct crypto_alg *alg) ...@@ -248,12 +248,16 @@ static int cryptomgr_schedule_test(struct crypto_alg *alg)
type = alg->cra_flags; type = alg->cra_flags;
/* This piece of crap needs to disappear into per-type test hooks. */ /* 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) & if (!((type ^ CRYPTO_ALG_TYPE_BLKCIPHER) &
CRYPTO_ALG_TYPE_BLKCIPHER_MASK) && !(type & CRYPTO_ALG_GENIV) && CRYPTO_ALG_TYPE_BLKCIPHER_MASK) && !(type & CRYPTO_ALG_GENIV) &&
((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) == ((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==
CRYPTO_ALG_TYPE_BLKCIPHER ? alg->cra_blkcipher.ivsize : CRYPTO_ALG_TYPE_BLKCIPHER ? alg->cra_blkcipher.ivsize :
alg->cra_ablkcipher.ivsize)) alg->cra_ablkcipher.ivsize))
type |= CRYPTO_ALG_TESTED; type |= CRYPTO_ALG_TESTED;
#endif
param->type = type; param->type = type;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment