diff options
Diffstat (limited to 'lib/libssl/src/crypto/ecdh/ech_lib.c')
| -rw-r--r-- | lib/libssl/src/crypto/ecdh/ech_lib.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/lib/libssl/src/crypto/ecdh/ech_lib.c b/lib/libssl/src/crypto/ecdh/ech_lib.c index 0644431b756..ddf226b1666 100644 --- a/lib/libssl/src/crypto/ecdh/ech_lib.c +++ b/lib/libssl/src/crypto/ecdh/ech_lib.c @@ -73,9 +73,6 @@ #include <openssl/engine.h> #endif #include <openssl/err.h> -#ifdef OPENSSL_FIPS -#include <openssl/fips.h> -#endif const char ECDH_version[]="ECDH" OPENSSL_VERSION_PTEXT; @@ -94,14 +91,7 @@ const ECDH_METHOD *ECDH_get_default_method(void) { if(!default_ECDH_method) { -#ifdef OPENSSL_FIPS - if (FIPS_mode()) - return FIPS_ecdh_openssl(); - else - return ECDH_OpenSSL(); -#else default_ECDH_method = ECDH_OpenSSL(); -#endif } return default_ECDH_method; } @@ -234,15 +224,6 @@ ECDH_DATA *ecdh_check(EC_KEY *key) } else ecdh_data = (ECDH_DATA *)data; -#ifdef OPENSSL_FIPS - if (FIPS_mode() && !(ecdh_data->flags & ECDH_FLAG_FIPS_METHOD) - && !(EC_KEY_get_flags(key) & EC_FLAG_NON_FIPS_ALLOW)) - { - ECDHerr(ECDH_F_ECDH_CHECK, ECDH_R_NON_FIPS_METHOD); - return NULL; - } -#endif - return ecdh_data; } |