From: Dr. Stephen Henson Date: Wed, 12 Oct 2011 12:55:58 +0000 (+0000) Subject: Only include one ECDH selftest. X-Git-Tag: OpenSSL-fips-2_0-rc1~83 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dafd5b5d74078ab35e6505bf0934dc6dbed44c4b;p=oweals%2Fopenssl.git Only include one ECDH selftest. --- diff --git a/fips/ecdh/fips_ecdh_selftest.c b/fips/ecdh/fips_ecdh_selftest.c index 70e24d326a..b46ae3b8e3 100644 --- a/fips/ecdh/fips_ecdh_selftest.c +++ b/fips/ecdh/fips_ecdh_selftest.c @@ -104,45 +104,6 @@ static const unsigned char p224_ziut[] = { 0x5c,0x1a,0xf2,0xdd }; -#ifndef OPENSSL_NO_EC2M -__fips_constseg -static const unsigned char b233_qcavsx[] = { - 0x00,0x00,0x01,0x2d,0x9a,0x82,0xfb,0x33,0xc2,0x53,0x10,0x97, - 0x27,0xd1,0xe4,0xd2,0x15,0xe3,0x9f,0x60,0xee,0x97,0xca,0xbf, - 0x2a,0x9f,0xb0,0x4a,0xd4,0xcf,0x14,0x73 -}; -__fips_constseg -static const unsigned char b233_qcavsy[] = { - 0x00,0x00,0x01,0xf7,0xd5,0x6e,0xbd,0x86,0x68,0xae,0xec,0x3b, - 0x2e,0x44,0x99,0x44,0x8d,0x4c,0x14,0x34,0xb8,0x37,0xa1,0x45, - 0xe7,0xc6,0x04,0xbd,0x7b,0x0b,0xa6,0x41 -}; -__fips_constseg -static const unsigned char b233_qiutx[] = { - 0x01,0x2b,0xfd,0x0c,0x9b,0x46,0x61,0xe9,0x4e,0x1f,0x97,0xa1, - 0x1d,0x1c,0x9b,0xc4,0xd3,0xfd,0xd0,0xb4,0xc9,0xfc,0xb3,0x34, - 0xc0,0x1f,0xf8,0x6a,0xec,0x56 -}; -__fips_constseg -static const unsigned char b233_qiuty[] = { - 0x01,0x5f,0xc3,0x77,0x7c,0xd9,0xa6,0xec,0xf3,0x19,0x70,0x96, - 0xc0,0xeb,0x2c,0xad,0xa3,0xba,0x39,0xb1,0x57,0x8d,0x62,0xdc, - 0xc7,0x87,0xde,0xa6,0x29,0xe4 -}; -__fips_constseg -static const unsigned char b233_qiutd[] = { - 0xed,0x50,0xf5,0x9c,0xf3,0x36,0xcb,0xa3,0x6d,0xe9,0x95,0x44, - 0xa2,0x87,0x0d,0xd8,0x3e,0x0e,0x4c,0x25,0x18,0x82,0x92,0xe6, - 0xca,0x90,0xff,0xa8,0x82 -}; -__fips_constseg -static const unsigned char b233_ziut[] = { - 0x00,0xe1,0x13,0x2d,0x94,0xef,0x03,0x79,0xc0,0xd1,0x5f,0xd9, - 0x2a,0xd3,0xfe,0x1c,0xfc,0x32,0x7e,0x0a,0x60,0xe6,0x23,0x1e, - 0xb0,0xfa,0x1b,0x9e,0x5a,0x8d -}; -#endif - typedef struct { int curve; @@ -171,9 +132,6 @@ typedef struct static ECDH_SELFTEST_DATA test_ecdh_data[] = { make_ecdh_test(NID_secp224r1, p224), -#ifndef OPENSSL_NO_EC2M - make_ecdh_test(NID_sect233r1, b233) -#endif }; int FIPS_selftest_ecdh(void)