diff options
| author | tedu <> | 2014-04-15 20:06:10 +0000 |
|---|---|---|
| committer | tedu <> | 2014-04-15 20:06:10 +0000 |
| commit | 3c7d2178681a2741a8cc8a042cb2ea6ee28528b8 (patch) | |
| tree | 11be20c8110348001494179db4f9b0b67ce149ba /src/lib/libcrypto/ec/ec2_smpl.c | |
| parent | 4c8a9a73429ac4a1d79f4bab6a397df643934861 (diff) | |
| download | openbsd-3c7d2178681a2741a8cc8a042cb2ea6ee28528b8.tar.gz openbsd-3c7d2178681a2741a8cc8a042cb2ea6ee28528b8.tar.bz2 openbsd-3c7d2178681a2741a8cc8a042cb2ea6ee28528b8.zip | |
remove FIPS mode support. people who require FIPS can buy something that
meets their needs, but dumping it in here only penalizes the rest of us.
ok beck deraadt
Diffstat (limited to 'src/lib/libcrypto/ec/ec2_smpl.c')
| -rw-r--r-- | src/lib/libcrypto/ec/ec2_smpl.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/lib/libcrypto/ec/ec2_smpl.c b/src/lib/libcrypto/ec/ec2_smpl.c index e0e59c7d82..0cf681fa9d 100644 --- a/src/lib/libcrypto/ec/ec2_smpl.c +++ b/src/lib/libcrypto/ec/ec2_smpl.c | |||
| @@ -73,16 +73,8 @@ | |||
| 73 | 73 | ||
| 74 | #ifndef OPENSSL_NO_EC2M | 74 | #ifndef OPENSSL_NO_EC2M |
| 75 | 75 | ||
| 76 | #ifdef OPENSSL_FIPS | ||
| 77 | #include <openssl/fips.h> | ||
| 78 | #endif | ||
| 79 | |||
| 80 | |||
| 81 | const EC_METHOD *EC_GF2m_simple_method(void) | 76 | const EC_METHOD *EC_GF2m_simple_method(void) |
| 82 | { | 77 | { |
| 83 | #ifdef OPENSSL_FIPS | ||
| 84 | return fips_ec_gf2m_simple_method(); | ||
| 85 | #else | ||
| 86 | static const EC_METHOD ret = { | 78 | static const EC_METHOD ret = { |
| 87 | EC_FLAGS_DEFAULT_OCT, | 79 | EC_FLAGS_DEFAULT_OCT, |
| 88 | NID_X9_62_characteristic_two_field, | 80 | NID_X9_62_characteristic_two_field, |
| @@ -126,7 +118,6 @@ const EC_METHOD *EC_GF2m_simple_method(void) | |||
| 126 | 0 /* field_set_to_one */ }; | 118 | 0 /* field_set_to_one */ }; |
| 127 | 119 | ||
| 128 | return &ret; | 120 | return &ret; |
| 129 | #endif | ||
| 130 | } | 121 | } |
| 131 | 122 | ||
| 132 | 123 | ||
