From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 15 Apr 2012 16:48:34 +0000 (+0000)
Subject: use /fixed argument when linking FIPS targets to disable address space layout randomi... 
X-Git-Tag: OpenSSL_0_9_8v~4
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=af0c009d70ff28f6e90cc37da4b2987d5cbbbadb;p=oweals%2Fopenssl.git

use /fixed argument when linking FIPS targets to disable address space layout randomization
---

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index ab1449798e..5001557e7d 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -391,7 +391,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) /map $base_arg $efile$target ";
+			$ret.="\t\$(FIPSLINK) \$(MLFLAGS) /fixed /map $base_arg $efile$target ";
 			$ret.="$name @<<\n  \$(SHLIB_EX_OBJ) $objs ";
 			$ret.="\$(OBJ_D)${o}fips_premain.obj $ex\n<<\n";
 			}
@@ -434,7 +434,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) /map $efile$target @<<\n";
+		$ret.="\t\$(FIPSLINK) \$(LFLAGS) /fixed /map $efile$target @<<\n";
 		$ret.="\t\$(APP_EX_OBJ) $files \$(OBJ_D)${o}fips_premain.obj $libs\n<<\n";
 		}
 	else