#14465: Update openssl to tag android-4.0.4_r2.1
diff --git a/jni/openssl/crypto/dh/dh_lib.c b/jni/openssl/crypto/dh/dh_lib.c
index 00218f2..7aef080 100644
--- a/jni/openssl/crypto/dh/dh_lib.c
+++ b/jni/openssl/crypto/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;
@@ -80,16 +76,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;
}
@@ -169,7 +156,7 @@
ret->counter = NULL;
ret->method_mont_p=NULL;
ret->references = 1;
- ret->flags=ret->meth->flags & ~DH_FLAG_NON_FIPS_ALLOW;
+ ret->flags=ret->meth->flags;
CRYPTO_new_ex_data(CRYPTO_EX_INDEX_DH, ret, &ret->ex_data);
if ((ret->meth->init != NULL) && !ret->meth->init(ret))
{