From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 22 Apr 2005 01:06:59 +0000 (+0000)
Subject: Remove defunct FIPS_allow_md5() and related functions.
X-Git-Tag: BEN_FIPS_TEST_8~68
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=92ad8e5c37f9d117f4dcc87e81723104bcba4911;p=oweals%2Fopenssl.git

Remove defunct FIPS_allow_md5() and related functions.
---

diff --git a/apps/openssl.c b/apps/openssl.c
index 65a9ee8a66..2080fa8816 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -250,8 +250,6 @@ int main(int Argc, char *Argv[])
 			EXIT(1);
 		}
 		in_FIPS_mode = 1;
-		if (getenv("OPENSSL_FIPS_MD5"))
-			FIPS_allow_md5(1);
 		}
 #endif
 	if (bio_err == NULL)
diff --git a/fips/fips.c b/fips/fips.c
index e879e0c3db..9e478b2fa2 100644
--- a/fips/fips.c
+++ b/fips/fips.c
@@ -63,7 +63,6 @@
 #define PATH_MAX 1024
 #endif
 
-static int fips_md5_allowed = 0;
 static int fips_selftest_fail = 0;
 static int fips_mode = 0;
 static const void *fips_rand_check = 0;
@@ -120,32 +119,6 @@ const void *FIPS_rand_check(void)
 	return ret;
 	}
 
-void FIPS_allow_md5(int onoff)
-    {
-    if (fips_is_started())
-	{
-	int owning_thread = fips_is_owning_thread();
-
-	if (!owning_thread) fips_w_lock();
-	fips_md5_allowed = onoff;
-	if (!owning_thread) fips_w_unlock();
-	}
-    }
-
-int FIPS_md5_allowed(void)
-    {
-    int ret = 1;
-    if (fips_is_started())
-	{
-	int owning_thread = fips_is_owning_thread();
-
-	if (!owning_thread) fips_r_lock();
-	ret = fips_md5_allowed;
-	if (!owning_thread) fips_r_unlock();
-	}
-    return ret;
-    }
-
 int FIPS_selftest_failed(void)
     {
     int ret = 0;
diff --git a/fips/fips.h b/fips/fips.h
index 15fa2d2c1b..e8ebaf3679 100644
--- a/fips/fips.h
+++ b/fips/fips.h
@@ -60,8 +60,6 @@ struct dsa_st;
 int FIPS_mode_set(int onoff,const char *path);
 int FIPS_mode(void);
 const void *FIPS_rand_check(void);
-void FIPS_allow_md5(int onoff);
-int FIPS_md5_allowed(void);
 int FIPS_selftest_failed(void);
 int FIPS_dsa_check(struct dsa_st *dsa);
 void FIPS_corrupt_sha1(void);
diff --git a/fips/fipshashes.c b/fips/fipshashes.c
index a9c3c2266b..8470c1f594 100644
--- a/fips/fipshashes.c
+++ b/fips/fipshashes.c
@@ -1,7 +1,7 @@
 const char * const FIPS_source_hashes[] = {
-"HMAC-SHA1(fips.c)= f14ae9175119f045f1c645a2458602ccd2b2a34e",
+"HMAC-SHA1(fips.c)= bce1e4b169f95f66b0eaf86847b41d9a2f62acd6",
 "HMAC-SHA1(fips_err_wrapper.c)= d3e2be316062510312269e98f964cb87e7577898",
-"HMAC-SHA1(fips.h)= 70f0181f269e6b09a9e3e6d9ff82f3461bd41222",
+"HMAC-SHA1(fips.h)= 564e34c12d6743a9be06d5da74608a71937c872a",
 "HMAC-SHA1(fips_err.h)= 03468e3b593f7528fd934e49bf052c23cc98d301",
 "HMAC-SHA1(aes/fips_aes_core.c)= b70bbbd675efe0613da0d57055310926a0104d55",
 "HMAC-SHA1(aes/asm/fips-ax86-elf.s)= 0d1c89f93cbf7bf4854bb238627c99ecda462f17",