From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 21 Apr 2011 16:58:51 +0000 (+0000)
Subject: Make fipscanisteronly auto detect work on WIN32.
X-Git-Tag: OpenSSL-fips-2_0-rc1~517
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e161120eff85a6e76b8b1add04827f30bfb75064;p=oweals%2Fopenssl.git

Make fipscanisteronly auto detect work on WIN32.
---

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index afad229ebc..eec5d41fba 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -58,7 +58,8 @@ my %mf_import = (
 	RMD160_ASM_OBJ => \$mf_rmd_asm,
 	WP_ASM_OBJ     => \$mf_wp_asm,
 	CMLL_ENC       => \$mf_cm_asm,
-	MODES_ASM_OBJ  => \$mf_modes_asm
+	MODES_ASM_OBJ  => \$mf_modes_asm,
+	FIPSCANISTERONLY  => \$mf_fipscanisteronly
 );
 
 open(IN,"<Makefile") || die "unable to open Makefile!\n";
@@ -74,6 +75,13 @@ close(IN);
 
 $debug = 1 if $mf_platform =~ /^debug-/;
 
+if ($mf_fipscanisteronly eq "y") {
+	$fips = 1;
+	$fipscanisterbuild = 1;
+	$fipscanisteronly = 1;
+}
+
+
 die "Makefile is not the toplevel Makefile!\n" if $ssl_version eq "";
 
 $infile="MINFO";
diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index 1c8493ae22..94ab502f8d 100755
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -155,7 +155,7 @@ if ($dir eq "." && defined($sym{"BUILDENV"}))
 print "RELATIVE_DIRECTORY=\n";
 
 close (IN);
-if ($dir eq "." && $sym{CONFIGURE_ARGS} =~ /fipscanisteronly/)
+if ($dir eq "." && $sym{FIPSCANISTERONLY} eq "y")
 	{
 	$fipscanisteronly = 1;
 	}