make update

[openssl.git] / Configure

diff --git a/Configure b/Configure
index fc793b02ed35ec13e765f36456b31da4dc96e6d1..9bbe36df9ecf82e1c26dad06072e54963854b738 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -728,7 +728,7 @@ if (!-d "ssl")
 
 # This is what $depflags will look like with the above defaults
 # (we need this to see if we should advise the user to run "make depend"):
-my $default_depflags = " -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_STORE";
+my $default_depflags = " -DOPENSSL_NO_EC_NISTP224_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_STORE";
 
 # Explicit "no-..." options will be collected in %disabled along with the defaults.
 # To remove something from %disabled, use "enable-foo" (unless it's experimental).
@@ -1630,6 +1630,13 @@ unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "
 open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n";
 print OUT "### Generated automatically from $mforg by Configure.\n\n";
 my $sdirs=0;
+
+if ($fipscanisteronly)
+       {
+       $aes_obj =~ s/aesni-sha1-x86_64.o//;
+       $bn_obj =~ s/modexp512-x86_64.o//;
+       }
+
 while (<IN>)
        {
        chomp;