Commit 6889fc21 authored by Hui Tang's avatar Hui Tang Committed by Herbert Xu
Browse files

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: default avatarHui Tang <tanghui20@huawei.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 0dbcf1a2

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
@@ -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,

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[] = {









	{