diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-09-15 21:06:37 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-09-15 21:06:37 +0000 |
| commit | b63698b70d27f23c6e60ec614cb7f4eb0b477cff (patch) | |
| tree | 02a3388a646d32a704bb960ea4b720c81f0cc1c3 | |
| parent | 8ca28da0a798d2289b71b750dad191066600c166 (diff) | |
Don't use vpaes in fips builds and exclude from restricted tarball.
| -rwxr-xr-x | Configure | 1 | ||||
| -rw-r--r-- | util/fipsdist.pl | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -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)$/) { |