diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-12-20 12:06:03 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-12-20 12:06:03 +0100 |
| commit | 5f6cb652dbd2ef0879673cf7338520dc2be236b9 (patch) | |
| tree | bc47c8ccbcd48bfc5aee6b404c8ef3f1d9a359cb /app/openssl/crypto/ec/ecp_mont.c | |
| parent | 576b0c26baf9b5b1418650a572604325ca7fb3af (diff) | |
| parent | f347c871d0433ef3efb85beb5e386b58d700faad (diff) | |
Merge branch 'develop'
Diffstat (limited to 'app/openssl/crypto/ec/ecp_mont.c')
| -rw-r--r-- | app/openssl/crypto/ec/ecp_mont.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/openssl/crypto/ec/ecp_mont.c b/app/openssl/crypto/ec/ecp_mont.c index f04f132c..3c5ec196 100644 --- a/app/openssl/crypto/ec/ecp_mont.c +++ b/app/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; } |