Commit b63698b7 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

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

parent 8ca28da0

Configure

+1 −0
Original line number Diff line number Diff line
@@ -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	{

util/fipsdist.pl

+1 −0
Original line number Diff line number Diff line
@@ -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)$/)

			{