summaryrefslogtreecommitdiff
path: root/lib/libcrypto/dh/dh_lib.c
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2014-04-15 20:06:11 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2014-04-15 20:06:11 +0000
commit1acffe56a9410893729c63d8ba655c60f52dd70d (patch)
tree2f0b14116a8fbd6f5539e4e3ce50ce644948fc6d /lib/libcrypto/dh/dh_lib.c
parent5bdd68a22c7a5658ad11b9a9f5242513f1abe74c (diff)
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 'lib/libcrypto/dh/dh_lib.c')
-rw-r--r--lib/libcrypto/dh/dh_lib.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/lib/libcrypto/dh/dh_lib.c b/lib/libcrypto/dh/dh_lib.c
index 00218f2b92b..a40caaf75b1 100644
--- a/lib/libcrypto/dh/dh_lib.c
+++ b/lib/libcrypto/dh/dh_lib.c
@@ -64,10 +64,6 @@
#include <openssl/engine.h>
#endif
-#ifdef OPENSSL_FIPS
-#include <openssl/fips.h>
-#endif
-
const char DH_version[]="Diffie-Hellman" OPENSSL_VERSION_PTEXT;
static const DH_METHOD *default_DH_method = NULL;
@@ -81,14 +77,7 @@ const DH_METHOD *DH_get_default_method(void)
{
if(!default_DH_method)
{
-#ifdef OPENSSL_FIPS
- if (FIPS_mode())
- return FIPS_dh_openssl();
- else
- return DH_OpenSSL();
-#else
default_DH_method = DH_OpenSSL();
-#endif
}
return default_DH_method;
}