Add version info to FIPS DLL.

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 6ab1c644bdd180578610fedf621a79f7a0b658ca..75afae3c15d62cd891929af35c580dc5751ae780 100755 (executable)
--- 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 9f897aa4bbb5fdb5f72a6f245929f76671461e13..a4e74fa625ddefce31f1e197bfae613b0f505646 100644 (file)
--- 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";