Commit 7ab0dfc5 authored Jul 22, 2021 by Hui Tang Committed by Zheng Zengkai Jul 22, 2021

crypto: ecdh - fix ecdh-nist-p192's entry in testmgr

mainline inclusion
from mainline-master
commit 6889fc21
category: bugfix
bugzilla: 173981
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=6889fc2104e5d20899b91e61daf07a7524b2010d



----------------------------------------------------------------------

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>
Signed-off-by: Mingqiang Ling <lingmingqiang@huawei.com>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>

parent 4b2a9b16

crypto/ecdh.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;

crypto/testmgr.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -4920,15 +4920,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,

crypto/testmgr.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -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[] = {
		{