diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2014-10-18 19:59:47 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-02-28 07:16:10 -0500 |
| commit | a1babdda61e8cb3f8d0608d87120ba46ca91a21d (patch) | |
| tree | 633a4386cd59bc6ef0b809b67ca1cc0bb494218f /openssl/crypto/ec/ec2_smpl.c | |
| parent | 8fafe3481b134a4d368ba57e3698754a6a45c4c1 (diff) | |
| download | vcxsrv-a1babdda61e8cb3f8d0608d87120ba46ca91a21d.tar.gz vcxsrv-a1babdda61e8cb3f8d0608d87120ba46ca91a21d.tar.bz2 vcxsrv-a1babdda61e8cb3f8d0608d87120ba46ca91a21d.zip | |
Update openssl to version openssl-1.0.1j
Diffstat (limited to 'openssl/crypto/ec/ec2_smpl.c')
| -rw-r--r-- | openssl/crypto/ec/ec2_smpl.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/openssl/crypto/ec/ec2_smpl.c b/openssl/crypto/ec/ec2_smpl.c index e0e59c7d8..62223cbb0 100644 --- a/openssl/crypto/ec/ec2_smpl.c +++ b/openssl/crypto/ec/ec2_smpl.c @@ -80,9 +80,6 @@ const EC_METHOD *EC_GF2m_simple_method(void) { -#ifdef OPENSSL_FIPS - return fips_ec_gf2m_simple_method(); -#else static const EC_METHOD ret = { EC_FLAGS_DEFAULT_OCT, NID_X9_62_characteristic_two_field, @@ -125,8 +122,12 @@ const EC_METHOD *EC_GF2m_simple_method(void) 0 /* field_decode */, 0 /* field_set_to_one */ }; - return &ret; +#ifdef OPENSSL_FIPS + if (FIPS_mode()) + return fips_ec_gf2m_simple_method(); #endif + + return &ret; } |