generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only use FIPS EC methods in FIPS mode.

Browse Source 
Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2014-08-07 01:08:14 +01:00
parent 204fb36a0e
commit 1433cac53c
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crypto/ec/ec2_smpl.c
View File

@ -80,9 +80,6 @@
const EC_METHOD *EC_GF2m_simple_method(void) const EC_METHOD *EC_GF2m_simple_method(void)
{ {
#ifdef OPENSSL_FIPS
return fips_ec_gf2m_simple_method();
#else
static const EC_METHOD ret = { static const EC_METHOD ret = {
EC_FLAGS_DEFAULT_OCT, EC_FLAGS_DEFAULT_OCT,
NID_X9_62_characteristic_two_field, NID_X9_62_characteristic_two_field,
@ -125,8 +122,12 @@ const EC_METHOD *EC_GF2m_simple_method(void)
0 /* field_decode */, 0 /* field_decode */,
0 /* field_set_to_one */ }; 0 /* field_set_to_one */ };
return &ret; #ifdef OPENSSL_FIPS
if (FIPS_mode())
return fips_ec_gf2m_simple_method();
#endif #endif
return &ret;
} }

9
crypto/ec/ecp_mont.c
View File

@ -72,9 +72,6 @@
const EC_METHOD *EC_GFp_mont_method(void) const EC_METHOD *EC_GFp_mont_method(void)
{ {
#ifdef OPENSSL_FIPS
return fips_ec_gfp_mont_method();
#else
static const EC_METHOD ret = { static const EC_METHOD ret = {
EC_FLAGS_DEFAULT_OCT, EC_FLAGS_DEFAULT_OCT,
NID_X9_62_prime_field, NID_X9_62_prime_field,
@ -114,8 +111,12 @@ const EC_METHOD *EC_GFp_mont_method(void)
ec_GFp_mont_field_decode, ec_GFp_mont_field_decode,
ec_GFp_mont_field_set_to_one }; ec_GFp_mont_field_set_to_one };
return &ret; #ifdef OPENSSL_FIPS
if (FIPS_mode())
return fips_ec_gfp_mont_method();
#endif #endif
return &ret;
} }

9
crypto/ec/ecp_nist.c
View File

@ -73,9 +73,6 @@
const EC_METHOD *EC_GFp_nist_method(void) const EC_METHOD *EC_GFp_nist_method(void)
{ {
#ifdef OPENSSL_FIPS
return fips_ec_gfp_nist_method();
#else
static const EC_METHOD ret = { static const EC_METHOD ret = {
EC_FLAGS_DEFAULT_OCT, EC_FLAGS_DEFAULT_OCT,
NID_X9_62_prime_field, NID_X9_62_prime_field,
@ -115,8 +112,12 @@ const EC_METHOD *EC_GFp_nist_method(void)
0 /* field_decode */, 0 /* field_decode */,
0 /* field_set_to_one */ }; 0 /* field_set_to_one */ };
return &ret; #ifdef OPENSSL_FIPS
if (FIPS_mode())
return fips_ec_gfp_nist_method();
#endif #endif
return &ret;
} }
int ec_GFp_nist_group_copy(EC_GROUP *dest, const EC_GROUP *src) int ec_GFp_nist_group_copy(EC_GROUP *dest, const EC_GROUP *src)

9
crypto/ec/ecp_smpl.c
View File

@ -73,9 +73,6 @@
const EC_METHOD *EC_GFp_simple_method(void) const EC_METHOD *EC_GFp_simple_method(void)
{ {
#ifdef OPENSSL_FIPS
return fips_ec_gfp_simple_method();
#else
static const EC_METHOD ret = { static const EC_METHOD ret = {
EC_FLAGS_DEFAULT_OCT, EC_FLAGS_DEFAULT_OCT,
NID_X9_62_prime_field, NID_X9_62_prime_field,
@ -115,8 +112,12 @@ const EC_METHOD *EC_GFp_simple_method(void)
0 /* field_decode */, 0 /* field_decode */,
0 /* field_set_to_one */ }; 0 /* field_set_to_one */ };
return &ret; #ifdef OPENSSL_FIPS
if (FIPS_mode())
return fips_ec_gfp_simple_method();
#endif #endif
return &ret;
} }