From: Andy Polyakov <appro@openssl.org>
Date: Fri, 22 Apr 2005 12:15:38 +0000 (+0000)
Subject: Move some variables to .bss.
X-Git-Tag: BEN_FIPS_TEST_8~66
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=145878ca29ece029bcce79df3ca7b8c9fc574455;p=oweals%2Fopenssl.git

Move some variables to .bss.
---

diff --git a/fips/fips.c b/fips/fips.c
index 9e478b2fa2..8f19c0ecec 100644
--- a/fips/fips.c
+++ b/fips/fips.c
@@ -63,9 +63,9 @@
 #define PATH_MAX 1024
 #endif
 
-static int fips_selftest_fail = 0;
-static int fips_mode = 0;
-static const void *fips_rand_check = 0;
+static int fips_selftest_fail;
+static int fips_mode;
+static const void *fips_rand_check;
 
 static void fips_set_mode(int onoff)
 	{
diff --git a/fips/fips_err.h b/fips/fips_err.h
index b8e1f57bca..4f79f79862 100644
--- a/fips/fips_err.h
+++ b/fips/fips_err.h
@@ -108,11 +108,11 @@ static ERR_STRING_DATA FIPS_str_reasons[]=
 
 void ERR_load_FIPS_strings(void)
 	{
-	static int init=1;
+	static int init;
 
-	if (init)
+	if (!init)
 		{
-		init=0;
+		init=1;
 #ifndef OPENSSL_NO_ERR
 		ERR_load_strings(0,FIPS_str_functs);
 		ERR_load_strings(0,FIPS_str_reasons);
diff --git a/fips/fipshashes.c b/fips/fipshashes.c
index eeb94a317b..816694480c 100644
--- a/fips/fipshashes.c
+++ b/fips/fipshashes.c
@@ -1,8 +1,8 @@
 const char * const FIPS_source_hashes[] = {
-"HMAC-SHA1(fips.c)= bce1e4b169f95f66b0eaf86847b41d9a2f62acd6",
+"HMAC-SHA1(fips.c)= 2f46f538f12228814cfdc8c6b37261258686fc8c",
 "HMAC-SHA1(fips_err_wrapper.c)= d3e2be316062510312269e98f964cb87e7577898",
 "HMAC-SHA1(fips.h)= 564e34c12d6743a9be06d5da74608a71937c872a",
-"HMAC-SHA1(fips_err.h)= 03468e3b593f7528fd934e49bf052c23cc98d301",
+"HMAC-SHA1(fips_err.h)= 32ad0130f639b8f6ff417d3dfda553f5a1d7512d",
 "HMAC-SHA1(aes/fips_aes_core.c)= b70bbbd675efe0613da0d57055310926a0104d55",
 "HMAC-SHA1(aes/asm/fips-ax86-elf.s)= 36ea4b40665892c0a9d791b22437ed63cac64d53",
 "HMAC-SHA1(aes/fips_aes_selftest.c)= 98b01502221e7fe529fd981222f2cbb52eb4cbe0",