mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-21 01:15:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dr. Stephen Henson 2011-09-15 21:06:37 +00:00
parent 8ca28da0a7
commit b63698b70d
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Configure
View File

@ -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 {

1
util/fipsdist.pl
View File

@ -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)$/)
{