X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=Configure;h=ffb901898e68781ffb9c7301d350751abe8d000b;hp=22a5793e24502669e5834875a8ba9ac9ab692393;hb=e161120eff85a6e76b8b1add04827f30bfb75064;hpb=ccc5784e37ef124a8404db578da67842ece0b47b

diff --git a/Configure b/Configure
index 22a5793e24..ffb901898e 100755
--- a/Configure
+++ b/Configure
@@ -710,7 +710,7 @@ my %disabled = ( # "what"         => "comment" [or special keyword "experimental
 my @experimental = ();
 
 # If ssl directory missing assume truncated FIPS tarball
-if (! -d ssl)
+if (!-d "ssl")
 	{
 	print STDERR "Auto Configuring fipsonly\n";
 	$fips = 1;
@@ -1124,6 +1124,7 @@ my $exp_cflags = "";
 
 if ($fipscanisteronly == 2)
 	{
+print STDERR "ADDING FIPSSYM\n";
 	$exp_cflags .= " -DOPENSSL_FIPSSYMS";
 	}
 
@@ -1717,6 +1718,10 @@ while (<IN>)
 		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.\$(SHLIB_MAJOR).dylib .dylib/;
 		}
 	s/^SHARED_LDFLAGS=.*/SHARED_LDFLAGS=$shared_ldflag/;
+	if ($fipscanisteronly == 2 && exists $disabled{"ec2m"})
+		{
+		next if (/ec2_/ || /bn_gf2m/);
+		}
 	print OUT $_."\n";
 	}
 close(IN);
@@ -1964,7 +1969,7 @@ EOF
 	    &dofile("tools/c_rehash",'/usr/local/bin/perl','^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";',  '^my \$prefix;$', 'my $prefix = "' . $prefix . '";');
 	    &dofile("apps/CA.pl",'/usr/local/bin/perl','^#!/', '#!%s');
 	}
-	if ($depflags ne $default_depflags && !$make_depend) {
+	if ($depflags ne $default_depflags && !$make_depend && $fipscanisteronly != 2) {
 		print <<EOF;
 
 Since you've disabled or enabled at least one algorithm, you need to do
@@ -2078,7 +2083,7 @@ OpenSSL FIPS Object Module as identified by the CMVP
 (http://csrc.nist.gov/cryptval/) in any application requiring the use of FIPS
 140-2 validated software. 
 
-This is an OpenSSL 1.1.0 test version.
+This is a test OpenSSL 2.0 FIPS module.
 
 See the file README.FIPS for details of how to build a test library.