Recognise fipscheck option and call fipsas for WIN64 builds.

[openssl.git] / util / pl / VC-32.pl

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index ce8cd733c73c2042f54a7130c4e9652d1637beba..6918e8898d1e0b3df3636d3b469b0695b1d2a130 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -23,6 +23,7 @@ if ($fipscanisterbuild)
 
 $o='\\';
 $cp='$(PERL) util/copy.pl';
+$cp2='$(PERL) util/copy.pl -stripcr';
 $mkdir='$(PERL) util/mkdir-p.pl';
 $rm='del /Q';
 
@@ -63,6 +64,10 @@ if ($FLAVOR =~ /WIN64/)
 \$(TMP_D)$o$bname.asm: $source
        set ASM=\$(ASM)
        \$(PERL) $source \$\@
+___
+       $ret .= "\t\$(PERL) util\\fipsas.pl . \$@ norunasm \$(CFLAG)\n" if $fipscanisterbuild;
+
+       $ret.=<<___;
 
 $target: \$(TMP_D)$o$bname.asm
        \$(ASM) $afile\$\@ \$(TMP_D)$o$bname.asm
@@ -239,6 +244,7 @@ if (!$no_asm)
        win32_import_asm($mf_sha_asm, "sha", \$sha1_asm_obj, \$sha1_asm_src);
        win32_import_asm($mf_rmd_asm, "ripemd", \$rmd160_asm_obj, \$rmd160_asm_src);
        win32_import_asm($mf_wp_asm, "whrlpool", \$whirlpool_asm_obj, \$whirlpool_asm_src);
+       win32_import_asm($mf_modes_asm, "modes", \$modes_asm_obj, \$modes_asm_src);
        win32_import_asm($mf_cpuid_asm, "", \$cpuid_asm_obj, \$cpuid_asm_src);
        $perl_asm = 1;
        }
@@ -305,6 +311,7 @@ sub do_lib_rule
        if (!$shlib)
                {
 #              $ret.="\t\$(RM) \$(O_$Name)\n";
+               $ret.="$target: $objs\n";
                $ret.="\t\$(MKLIB) $lfile$target @<<\n  $objs\n<<\n";
                }
        else