From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 19 Oct 2014 00:14:21 +0000 (+0100)
Subject: remove FIPS module code from crypto/ecdh
X-Git-Tag: master-post-reformat~201
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1c98de6d81320ae256530df7d6a32135d56c9e6e;p=oweals%2Fopenssl.git

remove FIPS module code from crypto/ecdh

Reviewed-by: Tim Hudson <tjh@openssl.org>
---

diff --git a/crypto/ecdh/ech_ossl.c b/crypto/ecdh/ech_ossl.c
index e25fd4f1d3..1f0409feaf 100644
--- a/crypto/ecdh/ech_ossl.c
+++ b/crypto/ecdh/ech_ossl.c
@@ -119,14 +119,6 @@ static int ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
 	size_t buflen, len;
 	unsigned char *buf=NULL;
 
-#ifdef OPENSSL_FIPS
-	if(FIPS_selftest_failed())
-		{
-		FIPSerr(FIPS_F_ECDH_COMPUTE_KEY,FIPS_R_FIPS_SELFTEST_FAILED);
-		return -1;
-		}
-#endif
-
 	if (outlen > INT_MAX)
 		{
 		ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ERR_R_MALLOC_FAILURE); /* sort of, anyway */