From: Andy Polyakov <appro@openssl.org>
Date: Sun, 22 Jul 2007 20:53:17 +0000 (+0000)
Subject: Framework updates.
X-Git-Tag: FIPS_098_TEST_3~45
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dfe42a131fd0d990f6af03403d4742472ee1d319;p=oweals%2Fopenssl.git

Framework updates.
---

diff --git a/fips-1.0/fips_premain.c b/fips-1.0/fips_premain.c
index a39f976eca..165d2c5dc9 100644
--- a/fips-1.0/fips_premain.c
+++ b/fips-1.0/fips_premain.c
@@ -27,7 +27,12 @@
 # endif
   void FINGERPRINT_premain(void);
   static int premain_wrapper(void) { FINGERPRINT_premain(); return 0; }
+# ifdef _WIN64
+# pragma section(".CRT$XCU",read)
+  __declspec(allocate(".CRT$XCU"))
+# else
 # pragma data_seg(".CRT$XCU")
+# endif
   static int (*p)(void) = premain_wrapper;
   /* This results in pointer to premain to appear in .CRT segment,
    * which is traversed by Visual C run-time initialization code.
diff --git a/fips-1.0/fips_premain.c.sha1 b/fips-1.0/fips_premain.c.sha1
index a83f59346d..c16f964bb8 100644
--- a/fips-1.0/fips_premain.c.sha1
+++ b/fips-1.0/fips_premain.c.sha1
@@ -1 +1 @@
-HMAC-SHA1(fips_premain.c)= 6ea1418b49f4c9f2f76ca61e116f9d41e9b6a0e5
+HMAC-SHA1(fips_premain.c)= 9e5ddba185ac446e0cf36fcf8e1b3acffe5d0b2c
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index b774e19d0d..c4f49575ce 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -968,7 +968,7 @@ if ($fips)
 					"\$(FIPS_SHA1_EXE)", "");
 		$rules.=&do_link_rule("\$(FIPS_SHA1_EXE)",
 					"\$(OBJ_D)${o}fips_standalone_sha1$obj \$(OBJ_D)${o}sha1dgst$obj \$(SHA1_ASM_OBJ)",
-					"","", 1);
+					"","\$(EX_LIBS)", 1);
 		}
 	else
 		{
diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 9145df7ac5..6da2a31c15 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -343,7 +343,7 @@ sub do_lib_rule
 			$ret.="\tSET FIPS_SHA1_EXE=\$(FIPS_SHA1_EXE)\n";
 			$ret.="\tSET FIPS_TARGET=$target\n";
 			$ret.="\tSET FIPSLIB_D=\$(FIPSLIB_D)\n";
-			$ret.="\t\$(FIPSLINK) \$(MLFLAGS) $base_arg $efile$target ";
+			$ret.="\t\$(FIPSLINK) \$(MLFLAGS) /map $base_arg $efile$target ";
 			$ret.="$name @<<\n  \$(SHLIB_EX_OBJ) $objs ";
 			$ret.="\$(OBJ_D)${o}fips_premain.obj $ex\n<<\n";
 			}
@@ -386,7 +386,7 @@ sub do_link_rule
 		$ret.="\tSET FIPS_TARGET=$target\n";
 		$ret.="\tSET FIPS_SHA1_EXE=\$(FIPS_SHA1_EXE)\n";
 		$ret.="\tSET FIPSLIB_D=\$(FIPSLIB_D)\n";
-		$ret.="\t\$(FIPSLINK) \$(LFLAGS) $efile$target @<<\n";
+		$ret.="\t\$(FIPSLINK) \$(LFLAGS) /map $efile$target @<<\n";
 		$ret.="\t\$(APP_EX_OBJ) $files \$(OBJ_D)${o}fips_premain.obj $libs\n<<\n";
 		}
 	else