From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 22 Mar 2007 19:07:31 +0000 (+0000)
Subject: Add version info to FIPS DLL.
X-Git-Tag: FIPS_098_TEST_1~50
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5068d7dda4783ef4164da95e40642a6effaa9f20;p=oweals%2Fopenssl.git

Add version info to FIPS DLL.
---

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 6ab1c644bd..75afae3c15 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -850,6 +850,9 @@ if (($platform eq "VC-WIN32") || ($platform eq "VC-NT")) {
 \$(OBJ_D)\\\$(SSL).res: ms\\version32.rc
 	\$(RSC) /fo"\$(OBJ_D)\\\$(SSL).res" /d SSL ms\\version32.rc
 
+\$(OBJ_D)\\\$(LIBFIPS).res: ms\\version32.rc
+	\$(RSC) /fo"\$(OBJ_D)\\\$(LIBFIPS).res" /d FIPS ms\\version32.rc
+
 EOF
 }
 
diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 9f897aa4bb..a4e74fa625 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -321,7 +321,12 @@ sub do_lib_rule
 			{
 			$ex.= $mwex unless $fipscanisterbuild;
 			$ret.="$target: $objs \$(PREMAIN_DSO_EXE)";
-			$ret.=" ms/\$(LIBFIPS).def" if $fipsdso;
+			if ($fipsdso)
+				{
+				$ex.=" \$(OBJ_D)\\\$(LIBFIPS).res";
+				$ret.=" \$(OBJ_D)\\\$(LIBFIPS).res";
+				$ret.=" ms/\$(LIBFIPS).def";
+				}
 			$ret.="\n\tSET FIPS_LINK=\$(LINK)\n";
 			$ret.="\tSET FIPS_CC=\$(CC)\n";
 			$ret.="\tSET FIPS_CC_ARGS=/Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\n";