2
0

260-crypto_test_dependencies.patch 1.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354
  1. From fd1799b0bf5efa46dd3e6dfbbf3955564807e508 Mon Sep 17 00:00:00 2001
  2. From: Felix Fietkau <[email protected]>
  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. Reduces kernel size after LZMA by about 5k on MIPS
  6. lede-commit: 044c316167e076479a344c59905e5b435b84a77f
  7. Signed-off-by: Felix Fietkau <[email protected]>
  8. ---
  9. crypto/Kconfig | 13 ++++++-------
  10. crypto/algboss.c | 4 ++++
  11. 2 files changed, 10 insertions(+), 7 deletions(-)
  12. --- a/crypto/Kconfig
  13. +++ b/crypto/Kconfig
  14. @@ -148,15 +148,15 @@ config CRYPTO_MANAGER
  15. cbc(aes).
  16. config CRYPTO_MANAGER2
  17. - def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y)
  18. - select CRYPTO_ACOMP2
  19. - select CRYPTO_AEAD2
  20. - select CRYPTO_AKCIPHER2
  21. - select CRYPTO_SIG2
  22. - select CRYPTO_HASH2
  23. - select CRYPTO_KPP2
  24. - select CRYPTO_RNG2
  25. - select CRYPTO_SKCIPHER2
  26. + def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y && !CRYPTO_MANAGER_DISABLE_TESTS)
  27. + select CRYPTO_ACOMP2 if !CRYPTO_MANAGER_DISABLE_TESTS
  28. + select CRYPTO_AEAD2 if !CRYPTO_MANAGER_DISABLE_TESTS
  29. + select CRYPTO_AKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS
  30. + select CRYPTO_SIG2 if !CRYPTO_MANAGER_DISABLE_TESTS
  31. + select CRYPTO_HASH2 if !CRYPTO_MANAGER_DISABLE_TESTS
  32. + select CRYPTO_KPP2 if !CRYPTO_MANAGER_DISABLE_TESTS
  33. + select CRYPTO_RNG2 if !CRYPTO_MANAGER_DISABLE_TESTS
  34. + select CRYPTO_SKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS
  35. config CRYPTO_USER
  36. tristate "Userspace cryptographic algorithm configuration"
  37. --- a/crypto/algboss.c
  38. +++ b/crypto/algboss.c
  39. @@ -204,6 +204,10 @@ static int cryptomgr_schedule_test(struc
  40. memcpy(param->alg, alg->cra_name, sizeof(param->alg));
  41. param->type = alg->cra_flags;
  42. +#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
  43. + param->type |= CRYPTO_ALG_TESTED;
  44. +#endif
  45. +
  46. thread = kthread_run(cryptomgr_test, param, "cryptomgr_test");
  47. if (IS_ERR(thread))
  48. goto err_free_param;