From 7ca9c546d261b6ccaab11e68c677c3b6b6e9d49c Mon Sep 17 00:00:00 2001 From: Oskar Viljasaar <oskar.viljasaar@iopsys.eu> Date: Tue, 19 Jan 2021 10:47:04 +0100 Subject: [PATCH] Import openwrt hack patch 260-crypto_test_dependencies.patch --- crypto/Kconfig | 15 +++++++-------- crypto/algboss.c | 4 ++++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/crypto/Kconfig b/crypto/Kconfig index 069e95829d..163fbac967 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -144,13 +144,13 @@ 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_AKCIPHER2 - select CRYPTO_KPP2 - select CRYPTO_ACOMP2 + 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_AKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS + select CRYPTO_KPP2 if !CRYPTO_MANAGER_DISABLE_TESTS + select CRYPTO_ACOMP2 if !CRYPTO_MANAGER_DISABLE_TESTS config CRYPTO_USER tristate "Userspace cryptographic algorithm configuration" @@ -163,7 +163,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. diff --git a/crypto/algboss.c b/crypto/algboss.c index 445da4a061..34e5b2e1dc 100644 --- a/crypto/algboss.c +++ b/crypto/algboss.c @@ -245,8 +245,12 @@ static int cryptomgr_schedule_test(struct crypto_alg *alg) type = alg->cra_flags; /* Do not test internal algorithms. */ +#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS + type |= CRYPTO_ALG_TESTED; +#else if (type & CRYPTO_ALG_INTERNAL) type |= CRYPTO_ALG_TESTED; +#endif param->type = type; -- GitLab