diff options
author | marha <marha@users.sourceforge.net> | 2014-10-19 11:34:57 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-10-19 11:34:57 +0200 |
commit | 8cd093f61168a373d919c68e0ce4e04949fa4eb6 (patch) | |
tree | d1bc1dd33da84a22d6ab30aa9f7efb79b592ffda /openssl/crypto/ec/ec2_smpl.c | |
parent | 9fc852414dd4e841c4e2229f55a3e41abca64ac5 (diff) | |
parent | a14858a22f164b5accc4bd192a5d3de21d88e3d1 (diff) | |
download | vcxsrv-8cd093f61168a373d919c68e0ce4e04949fa4eb6.tar.gz vcxsrv-8cd093f61168a373d919c68e0ce4e04949fa4eb6.tar.bz2 vcxsrv-8cd093f61168a373d919c68e0ce4e04949fa4eb6.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Makefile
openssl/crypto/opensslconf.h
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; } |