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

5 files changed, 0 insertions, 41 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 @@
 
 #ifndef OPENSSL_NO_EC2M
 
-#ifdef OPENSSL_FIPS
-#include <openssl/fips.h>
-#endif
-
-
 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,
@@ -126,7 +118,6 @@ const EC_METHOD *EC_GF2m_simple_method(void)
                 0 /* field_set_to_one */ };
 
         return &ret;
-#endif
         }
 
 
diff --git a/src/lib/libcrypto/ec/ec_key.c b/src/lib/libcrypto/ec/ec_key.c
index 7fa247593d..d528601036 100644
--- a/src/lib/libcrypto/ec/ec_key.c
+++ b/src/lib/libcrypto/ec/ec_key.c
@@ -64,9 +64,6 @@
 #include <string.h>
 #include "ec_lcl.h"
 #include <openssl/err.h>
-#ifdef OPENSSL_FIPS
-#include <openssl/fips.h>
-#endif
 
 EC_KEY *EC_KEY_new(void)
         {
@@ -241,11 +238,6 @@ int EC_KEY_generate_key(EC_KEY *eckey)
         BIGNUM  *priv_key = NULL, *order = NULL;
         EC_POINT *pub_key = NULL;
 
-#ifdef OPENSSL_FIPS
-        if (FIPS_mode())
-                return FIPS_ec_key_generate_key(eckey);
-#endif
-
         if (!eckey || !eckey->group)
                 {
                 ECerr(EC_F_EC_KEY_GENERATE_KEY, ERR_R_PASSED_NULL_PARAMETER);
diff --git a/src/lib/libcrypto/ec/ecp_mont.c b/src/lib/libcrypto/ec/ecp_mont.c
index f04f132c7a..cee0fee12a 100644
--- a/src/lib/libcrypto/ec/ecp_mont.c
+++ b/src/lib/libcrypto/ec/ecp_mont.c
@@ -63,18 +63,11 @@
 
 #include <openssl/err.h>
 
-#ifdef OPENSSL_FIPS
-#include <openssl/fips.h>
-#endif
-
 #include "ec_lcl.h"
 
 
 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,
@@ -115,7 +108,6 @@ const EC_METHOD *EC_GFp_mont_method(void)
                 ec_GFp_mont_field_set_to_one };
 
         return &ret;
-#endif
         }
 
 
diff --git a/src/lib/libcrypto/ec/ecp_nist.c b/src/lib/libcrypto/ec/ecp_nist.c
index aad2d5f443..ac5b814238 100644
--- a/src/lib/libcrypto/ec/ecp_nist.c
+++ b/src/lib/libcrypto/ec/ecp_nist.c
@@ -67,15 +67,8 @@
 #include <openssl/obj_mac.h>
 #include "ec_lcl.h"
 
-#ifdef OPENSSL_FIPS
-#include <openssl/fips.h>
-#endif
-
 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,
@@ -116,7 +109,6 @@ const EC_METHOD *EC_GFp_nist_method(void)
                 0 /* field_set_to_one */ };
 
         return &ret;
-#endif
         }
 
 int ec_GFp_nist_group_copy(EC_GROUP *dest, const EC_GROUP *src)
diff --git a/src/lib/libcrypto/ec/ecp_smpl.c b/src/lib/libcrypto/ec/ecp_smpl.c
index cd05fd1251..bf0ad998dd 100644
--- a/src/lib/libcrypto/ec/ecp_smpl.c
+++ b/src/lib/libcrypto/ec/ecp_smpl.c
@@ -64,17 +64,10 @@
 
 #include <openssl/err.h>
 
-#ifdef OPENSSL_FIPS
-#include <openssl/fips.h>
-#endif
-
 #include "ec_lcl.h"
 
 const EC_METHOD *EC_GFp_simple_method(void)
         {
-#ifdef OPENSSL_FIPS
-        return fips_ec_gfp_simple_method();
-#else
         static const EC_METHOD ret = {
                 EC_FLAGS_DEFAULT_OCT,
                 NID_X9_62_prime_field,
@@ -115,7 +108,6 @@ const EC_METHOD *EC_GFp_simple_method(void)
                 0 /* field_set_to_one */ };
 
         return &ret;
-#endif
         }