summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2022-11-13 16:12:36 -0800
committerHerbert Xu <herbert@gondor.apana.org.au>2022-11-25 17:39:18 +0800
commit0bf365c0efdd8fc03cb82e381ea4d76196c66bc2 (patch)
treee618c8bee9fb26fe4513fe52b88a3b904d897aa8
parent06bd9c967eaac5484c31c3dc6dfbef6183819508 (diff)
downloadlinux-stable-0bf365c0efdd8fc03cb82e381ea4d76196c66bc2.tar.gz
linux-stable-0bf365c0efdd8fc03cb82e381ea4d76196c66bc2.tar.bz2
linux-stable-0bf365c0efdd8fc03cb82e381ea4d76196c66bc2.zip
crypto: kdf - skip self-test when tests disabled
Make kdf_sp800108 honor the CONFIG_CRYPTO_MANAGER_DISABLE_TESTS kconfig option, so that it doesn't always waste time running its self-test. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--crypto/kdf_sp800108.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/crypto/kdf_sp800108.c b/crypto/kdf_sp800108.c
index 58edf7797abf..c6e3ad82d5f7 100644
--- a/crypto/kdf_sp800108.c
+++ b/crypto/kdf_sp800108.c
@@ -125,9 +125,13 @@ static const struct kdf_testvec kdf_ctr_hmac_sha256_tv_template[] = {
static int __init crypto_kdf108_init(void)
{
- int ret = kdf_test(&kdf_ctr_hmac_sha256_tv_template[0], "hmac(sha256)",
- crypto_kdf108_setkey, crypto_kdf108_ctr_generate);
+ int ret;
+ if (IS_ENABLED(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS))
+ return 0;
+
+ ret = kdf_test(&kdf_ctr_hmac_sha256_tv_template[0], "hmac(sha256)",
+ crypto_kdf108_setkey, crypto_kdf108_ctr_generate);
if (ret) {
if (fips_enabled)
panic("alg: self-tests for CTR-KDF (hmac(sha256)) failed (rc=%d)\n",