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

1 files changed, 0 insertions, 16 deletions

diff --git a/src/lib/libcrypto/dh/dh_key.c b/src/lib/libcrypto/dh/dh_key.c
index 89a74db4e6..9596270f7d 100644
--- a/src/lib/libcrypto/dh/dh_key.c
+++ b/src/lib/libcrypto/dh/dh_key.c
@@ -73,27 +73,11 @@ static int dh_finish(DH *dh);
 
 int DH_generate_key(DH *dh)
         {
-#ifdef OPENSSL_FIPS
-        if (FIPS_mode() && !(dh->meth->flags & DH_FLAG_FIPS_METHOD)
-                        && !(dh->flags & DH_FLAG_NON_FIPS_ALLOW))
-                {
-                DHerr(DH_F_DH_GENERATE_KEY, DH_R_NON_FIPS_METHOD);
-                return 0;
-                }
-#endif
         return dh->meth->generate_key(dh);
         }
 
 int DH_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
         {
-#ifdef OPENSSL_FIPS
-        if (FIPS_mode() && !(dh->meth->flags & DH_FLAG_FIPS_METHOD)
-                        && !(dh->flags & DH_FLAG_NON_FIPS_ALLOW))
-                {
-                DHerr(DH_F_DH_COMPUTE_KEY, DH_R_NON_FIPS_METHOD);
-                return 0;
-                }
-#endif
         return dh->meth->compute_key(key, pub_key, dh);
         }