From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 30 Jun 2011 19:18:41 +0000 (+0000)
Subject: Recognise fipscheck option and call fipsas for WIN64 builds.
X-Git-Tag: OpenSSL-fips-2_0-rc1~278
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=01f06617b113932c06523cbd89e5272dce2fda34;hp=be6ddecb8b88c33b2cac3c9a311110413ec70998

Recognise fipscheck option and call fipsas for WIN64 builds.
---

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index f00909a0a3..4bf4a1aea2 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -1375,6 +1375,7 @@ sub read_options
 		"fips" => \$fips,
 		"fipscanisterbuild" => [\$fips, \$fipscanisterbuild],
 		"fipscanisteronly" => [\$fips, \$fipscanisterbuild, \$fipscanisteronly],
+		"fipscheck" => [\$fips, \$fipscanisterbuild, \$fipscanisteronly],
 		);
 
 	if (exists $valid_options{$_})
diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 693adae6e4..6918e8898d 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -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