diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-11-14 09:52:32 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-11-14 09:52:32 +0100 |
| commit | b28828796ad6d65ac463b41bba153f74e4531a6b (patch) | |
| tree | 154b9f7436ae575e324f3374a5145e451bf649a8 /main/openssl/crypto/ec/ecp_mont.c | |
| parent | e7a6c1a987ebee1ddb2f908ca028d613a5c52490 (diff) | |
Update OpenSSL version
Diffstat (limited to 'main/openssl/crypto/ec/ecp_mont.c')
| -rw-r--r-- | main/openssl/crypto/ec/ecp_mont.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/main/openssl/crypto/ec/ecp_mont.c b/main/openssl/crypto/ec/ecp_mont.c index f04f132c..3c5ec196 100644 --- a/main/openssl/crypto/ec/ecp_mont.c +++ b/main/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; } |