summaryrefslogtreecommitdiffstats
path: root/crypto/sha
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-02-10 08:47:51 +0100
committerRichard Levitte <levitte@openssl.org>2018-03-08 19:31:41 +0100
commit2bd3b626dddd57217faf7cc267f74754cce9bb58 (patch)
treecf7264ce0a26b01b2ebcb1551455ad109e7f238a /crypto/sha
parentConfigure: disallow the mixture of compiling flags and env / make variables (diff)
downloadopenssl-2bd3b626dddd57217faf7cc267f74754cce9bb58.tar.xz
openssl-2bd3b626dddd57217faf7cc267f74754cce9bb58.zip
Make a few more asm modules conform: last argument is output file
Fixes #5310 Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5315)
Diffstat (limited to 'crypto/sha')
-rwxr-xr-xcrypto/sha/asm/keccak1600-armv4.pl3
-rwxr-xr-xcrypto/sha/asm/keccak1600-avx2.pl2
-rwxr-xr-xcrypto/sha/asm/keccak1600-avx512.pl2
-rwxr-xr-xcrypto/sha/asm/keccak1600-avx512vl.pl2
-rwxr-xr-xcrypto/sha/asm/keccak1600-c64x.pl3
5 files changed, 12 insertions, 0 deletions
diff --git a/crypto/sha/asm/keccak1600-armv4.pl b/crypto/sha/asm/keccak1600-armv4.pl
index 16d2393134..a9ad3cbc3f 100755
--- a/crypto/sha/asm/keccak1600-armv4.pl
+++ b/crypto/sha/asm/keccak1600-armv4.pl
@@ -1573,6 +1573,9 @@ ___
}
}
+$output=pop;
+open STDOUT,">$output";
+
foreach (split($/,$code)) {
s/\`([^\`]*)\`/eval $1/ge;
diff --git a/crypto/sha/asm/keccak1600-avx2.pl b/crypto/sha/asm/keccak1600-avx2.pl
index 82ca67287b..2a63dd6cb7 100755
--- a/crypto/sha/asm/keccak1600-avx2.pl
+++ b/crypto/sha/asm/keccak1600-avx2.pl
@@ -476,5 +476,7 @@ iotas:
.asciz "Keccak-1600 absorb and squeeze for AVX2, CRYPTOGAMS by <appro\@openssl.org>"
___
+$output=pop;
+open STDOUT,">$output";
print $code;
close STDOUT;
diff --git a/crypto/sha/asm/keccak1600-avx512.pl b/crypto/sha/asm/keccak1600-avx512.pl
index 6766f97551..bde2aa134a 100755
--- a/crypto/sha/asm/keccak1600-avx512.pl
+++ b/crypto/sha/asm/keccak1600-avx512.pl
@@ -545,5 +545,7 @@ iotas:
.asciz "Keccak-1600 absorb and squeeze for AVX-512F, CRYPTOGAMS by <appro\@openssl.org>"
___
+$output=pop;
+open STDOUT,">$output";
print $code;
close STDOUT;
diff --git a/crypto/sha/asm/keccak1600-avx512vl.pl b/crypto/sha/asm/keccak1600-avx512vl.pl
index 53f1e847d1..9c202fbaae 100755
--- a/crypto/sha/asm/keccak1600-avx512vl.pl
+++ b/crypto/sha/asm/keccak1600-avx512vl.pl
@@ -386,5 +386,7 @@ iotas:
.asciz "Keccak-1600 absorb and squeeze for AVX512VL, CRYPTOGAMS by <appro\@openssl.org>"
___
+$output=pop;
+open STDOUT,">$output";
print $code;
close STDOUT;
diff --git a/crypto/sha/asm/keccak1600-c64x.pl b/crypto/sha/asm/keccak1600-c64x.pl
index 585f64b739..d13471fabd 100755
--- a/crypto/sha/asm/keccak1600-c64x.pl
+++ b/crypto/sha/asm/keccak1600-c64x.pl
@@ -879,4 +879,7 @@ iotas:
.align 4
___
+$output=pop;
+open STDOUT,">$output";
print $code;
+close STDOUT;