diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2014-10-18 19:59:47 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2014-10-18 20:57:02 -0400 |
| commit | 8aa7b05b29941b07940857ff6f60bcc60eaa59a9 (patch) | |
| tree | acf3d988cfbd1977723f93285bda5152d096b92e /openssl/crypto/ec/ecp_nist.c | |
| parent | d2d01e39531d9fb823b2271244c324aad0a6575d (diff) | |
| download | vcxsrv-8aa7b05b29941b07940857ff6f60bcc60eaa59a9.tar.gz vcxsrv-8aa7b05b29941b07940857ff6f60bcc60eaa59a9.tar.bz2 vcxsrv-8aa7b05b29941b07940857ff6f60bcc60eaa59a9.zip | |
Update openssl to version openssl-1.0.1j
Conflicts:
openssl/Makefile
openssl/crypto/opensslconf.h
Diffstat (limited to 'openssl/crypto/ec/ecp_nist.c')
| -rw-r--r-- | openssl/crypto/ec/ecp_nist.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/openssl/crypto/ec/ecp_nist.c b/openssl/crypto/ec/ecp_nist.c index aad2d5f44..db3b99e06 100644 --- a/openssl/crypto/ec/ecp_nist.c +++ b/openssl/crypto/ec/ecp_nist.c @@ -73,9 +73,6 @@ const EC_METHOD *EC_GFp_nist_method(void) { -#ifdef OPENSSL_FIPS - return fips_ec_gfp_nist_method(); -#else static const EC_METHOD ret = { EC_FLAGS_DEFAULT_OCT, NID_X9_62_prime_field, @@ -115,8 +112,12 @@ const EC_METHOD *EC_GFp_nist_method(void) 0 /* field_decode */, 0 /* field_set_to_one */ }; - return &ret; +#ifdef OPENSSL_FIPS + if (FIPS_mode()) + return fips_ec_gfp_nist_method(); #endif + + return &ret; } int ec_GFp_nist_group_copy(EC_GROUP *dest, const EC_GROUP *src) |