diff options
| author | marha <marha@users.sourceforge.net> | 2014-10-19 11:31:33 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-10-19 11:33:30 +0200 |
| commit | a14858a22f164b5accc4bd192a5d3de21d88e3d1 (patch) | |
| tree | 6a0005fed0f248559139016a7310add07fcb62df /openssl/crypto/ec/ecp_mont.c | |
| parent | fa5a6df66cfe9b19014ea9d2fca35b762f457041 (diff) | |
| download | vcxsrv-a14858a22f164b5accc4bd192a5d3de21d88e3d1.tar.gz vcxsrv-a14858a22f164b5accc4bd192a5d3de21d88e3d1.tar.bz2 vcxsrv-a14858a22f164b5accc4bd192a5d3de21d88e3d1.zip | |
Update to openssl-1.0.1j
Diffstat (limited to 'openssl/crypto/ec/ecp_mont.c')
| -rw-r--r-- | openssl/crypto/ec/ecp_mont.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/openssl/crypto/ec/ecp_mont.c b/openssl/crypto/ec/ecp_mont.c index f04f132c7..3c5ec1965 100644 --- a/openssl/crypto/ec/ecp_mont.c +++ b/openssl/crypto/ec/ecp_mont.c @@ -72,9 +72,6 @@ const EC_METHOD *EC_GFp_mont_method(void) { -#ifdef OPENSSL_FIPS - return fips_ec_gfp_mont_method(); -#else static const EC_METHOD ret = { EC_FLAGS_DEFAULT_OCT, 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_set_to_one }; - return &ret; +#ifdef OPENSSL_FIPS + if (FIPS_mode()) + return fips_ec_gfp_mont_method(); #endif + + return &ret; } |