From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 23 Aug 2011 23:35:30 +0000 (+0000)
Subject: Don't use some object files in FIPS build.
X-Git-Tag: OpenSSL-fips-2_0-rc1~200
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edd4d402c665c815680ae7cfa9bfc8ee96f9dc32;p=thirdparty%2Fopenssl.git

Don't use some object files in FIPS build.
---

diff --git a/Configure b/Configure
index fc793b02ed3..1c1b8ea2276 100755
--- a/Configure
+++ b/Configure
@@ -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;