Recognise fipscheck option and call fipsas for WIN64 builds.
authorDr. Stephen Henson <steve@openssl.org>
Thu, 30 Jun 2011 19:18:41 +0000 (19:18 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Thu, 30 Jun 2011 19:18:41 +0000 (19:18 +0000)
util/mk1mf.pl
util/pl/VC-32.pl

index f00909a..4bf4a1a 100755 (executable)
@@ -1375,6 +1375,7 @@ sub read_options
                "fips" => \$fips,
                "fipscanisterbuild" => [\$fips, \$fipscanisterbuild],
                "fipscanisteronly" => [\$fips, \$fipscanisterbuild, \$fipscanisteronly],
+               "fipscheck" => [\$fips, \$fipscanisterbuild, \$fipscanisteronly],
                );
 
        if (exists $valid_options{$_})
index 693adae..6918e88 100644 (file)
@@ -64,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