From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 15 Sep 2011 21:06:37 +0000 (+0000)
Subject: Don't use vpaes in fips builds and exclude from restricted tarball.
X-Git-Tag: OpenSSL-fips-2_0-rc1~141
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b63698b70d27f23c6e60ec614cb7f4eb0b477cff;p=oweals%2Fopenssl.git

Don't use vpaes in fips builds and exclude from restricted tarball.
---

diff --git a/Configure b/Configure
index d8c93e93ed..29068b0b50 100755
--- a/Configure
+++ b/Configure
@@ -1552,6 +1552,7 @@ if ($aes_obj =~ /\.o$/)
 	# module implements AES_ctr32_encrypt...
 	$cflags.=" -DAES_CTR_ASM" if ($aes_obj =~ s/\s*aes_ctr\.o//);
 	$aes_obj =~ s/\s*(vpaes|aesni)\-x86\.o// if ($no_sse2);
+	$aes_obj =~ s/\s*vpaes-\w*\.o// if ($fipscanisterinternal eq "y");
 	$cflags.=" -DVPAES_ASM" if ($aes_obj =~ m/vpaes/);
 	}
 else	{
diff --git a/util/fipsdist.pl b/util/fipsdist.pl
index 07a09ce93f..b191fbe41e 100644
--- a/util/fipsdist.pl
+++ b/util/fipsdist.pl
@@ -66,6 +66,7 @@ while (<STDIN>)
 		next if -d "crypto/$1" && !exists $cdirs{$1};
 		# Skip GF2m assembly language perl scripts
 		next if $noec2m && /gf2m\.pl/;
+		next if /vpaes-\w*\.pl/;
 		# Keep assembly language dir, Makefile or certain extensions
 		if (!/\/asm\// && !/\/Makefile$/ && !/\.(in|pl|h|S)$/)
 			{