diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2014-10-15 17:32:57 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2014-10-15 17:32:57 +0000 |
| commit | 58ab7656b2c140e06d60a7831a9f5b6e1ddc2fe5 (patch) | |
| tree | 6195ffd39cd3e0b3d6c711f6531b3e7e13b85b44 /crypto/ec/ec2_smpl.c | |
| parent | cb6864802ed26a1031701a6a385961592a5cac25 (diff) | |
Import OpenSSL 1.0.1j.vendor/openssl/1.0.1j
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=273138
svn path=/vendor-crypto/openssl/1.0.1j/; revision=273139; tag=vendor/openssl/1.0.1j
Diffstat (limited to 'crypto/ec/ec2_smpl.c')
| -rw-r--r-- | crypto/ec/ec2_smpl.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crypto/ec/ec2_smpl.c b/crypto/ec/ec2_smpl.c index e0e59c7d8299..62223cbb01f2 100644 --- a/crypto/ec/ec2_smpl.c +++ b/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; } |