generic: 6.6: manually refresh hack patches
[openwrt/staging/981213.git] / target / linux / generic / hack-6.6 / 260-crypto_test_dependencies.patch
1 From fd1799b0bf5efa46dd3e6dfbbf3955564807e508 Mon Sep 17 00:00:00 2001
2 From: Felix Fietkau <nbd@nbd.name>
3 Date: Fri, 7 Jul 2017 17:12:51 +0200
4 Subject: kernel: prevent cryptomgr from pulling in useless extra dependencies for tests that are not run
5
6 Reduces kernel size after LZMA by about 5k on MIPS
7
8 lede-commit: 044c316167e076479a344c59905e5b435b84a77f
9 Signed-off-by: Felix Fietkau <nbd@nbd.name>
10 ---
11 crypto/Kconfig | 13 ++++++-------
12 crypto/algboss.c | 4 ++++
13 2 files changed, 10 insertions(+), 7 deletions(-)
14
15 --- a/crypto/Kconfig
16 +++ b/crypto/Kconfig
17 @@ -148,15 +148,15 @@ config CRYPTO_MANAGER
18 cbc(aes).
19
20 config CRYPTO_MANAGER2
21 - def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y)
22 - select CRYPTO_ACOMP2
23 - select CRYPTO_AEAD2
24 - select CRYPTO_AKCIPHER2
25 - select CRYPTO_SIG2
26 - select CRYPTO_HASH2
27 - select CRYPTO_KPP2
28 - select CRYPTO_RNG2
29 - select CRYPTO_SKCIPHER2
30 + def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y && !CRYPTO_MANAGER_DISABLE_TESTS)
31 + select CRYPTO_ACOMP2 if !CRYPTO_MANAGER_DISABLE_TESTS
32 + select CRYPTO_AEAD2 if !CRYPTO_MANAGER_DISABLE_TESTS
33 + select CRYPTO_AKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS
34 + select CRYPTO_SIG2 if !CRYPTO_MANAGER_DISABLE_TESTS
35 + select CRYPTO_HASH2 if !CRYPTO_MANAGER_DISABLE_TESTS
36 + select CRYPTO_KPP2 if !CRYPTO_MANAGER_DISABLE_TESTS
37 + select CRYPTO_RNG2 if !CRYPTO_MANAGER_DISABLE_TESTS
38 + select CRYPTO_SKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS
39
40 config CRYPTO_USER
41 tristate "Userspace cryptographic algorithm configuration"
42 --- a/crypto/algboss.c
43 +++ b/crypto/algboss.c
44 @@ -204,6 +204,10 @@ static int cryptomgr_schedule_test(struc
45 memcpy(param->alg, alg->cra_name, sizeof(param->alg));
46 param->type = alg->cra_flags;
47
48 +#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
49 + param->type |= CRYPTO_ALG_TESTED;
50 +#endif
51 +
52 thread = kthread_run(cryptomgr_test, param, "cryptomgr_test");
53 if (IS_ERR(thread))
54 goto err_free_param;