diff options
author | Hui Tang <tanghui20@huawei.com> | 2021-05-22 10:44:28 +0800 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2021-05-28 15:11:47 +0800 |
commit | f962e85df3b6cbf5232410721612c09c24c618a8 (patch) | |
tree | fef689aec54783a1c0e0ac03b6cc518bcb9b2f6d /crypto | |
parent | e866d9bcddb3e5a41dd19b1d3388b8f64664f760 (diff) | |
download | linux-crypto-f962e85df3b6cbf5232410721612c09c24c618a8.tar.gz linux-crypto-f962e85df3b6cbf5232410721612c09c24c618a8.zip |
crypto: ecdh - fix ecdh-nist-p192's entry in testmgr
Add a comment that p192 will fail to register in FIPS mode.
Fix ecdh-nist-p192's entry in testmgr by removing the ifdefs
and not setting fips_allowed.
Signed-off-by: Hui Tang <tanghui20@huawei.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to '')
-rw-r--r-- | crypto/ecdh.c | 1 | ||||
-rw-r--r-- | crypto/testmgr.c | 3 | ||||
-rw-r--r-- | crypto/testmgr.h | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/crypto/ecdh.c b/crypto/ecdh.c index 07eb34fe..19746750 100644 --- a/crypto/ecdh.c +++ b/crypto/ecdh.c @@ -179,6 +179,7 @@ static int ecdh_init(void) { int ret; + /* NIST p192 will fail to register in FIPS mode */ ret = crypto_register_kpp(&ecdh_nist_p192); ecdh_nist_p192_registered = ret == 0; diff --git a/crypto/testmgr.c b/crypto/testmgr.c index 10c5b3b0..26e40dba 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -4899,15 +4899,12 @@ static const struct alg_test_desc alg_test_descs[] = { } }, { #endif -#ifndef CONFIG_CRYPTO_FIPS .alg = "ecdh-nist-p192", .test = alg_test_kpp, - .fips_allowed = 1, .suite = { .kpp = __VECS(ecdh_p192_tv_template) } }, { -#endif .alg = "ecdh-nist-p256", .test = alg_test_kpp, .fips_allowed = 1, diff --git a/crypto/testmgr.h b/crypto/testmgr.h index aead75d9..b9cf5b81 100644 --- a/crypto/testmgr.h +++ b/crypto/testmgr.h @@ -2685,7 +2685,6 @@ static const struct kpp_testvec curve25519_tv_template[] = { } }; -#ifndef CONFIG_CRYPTO_FIPS static const struct kpp_testvec ecdh_p192_tv_template[] = { { .secret = @@ -2725,7 +2724,6 @@ static const struct kpp_testvec ecdh_p192_tv_template[] = { .expected_ss_size = 24 } }; -#endif static const struct kpp_testvec ecdh_p256_tv_template[] = { { |