The branch master has been updated
via 2bd3b626dddd57217faf7cc267f74754cce9bb58 (commit)
from b92013602b6666314ad200d48e10a1aaa2c5b2fa (commit)
- Log -----------------------------------------------------------------
commit 2bd3b626dddd57217faf7cc267f74754cce9bb58
Author: Richard Levitte <[email protected]>
Date: Sat Feb 10 08:47:51 2018 +0100
Make a few more asm modules conform: last argument is output file
Fixes #5310
Reviewed-by: Rich Salz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/5315)
-----------------------------------------------------------------------
Summary of changes:
crypto/rc4/asm/rc4-c64xplus.pl | 2 ++
crypto/sha/asm/keccak1600-armv4.pl | 3 +++
crypto/sha/asm/keccak1600-avx2.pl | 2 ++
crypto/sha/asm/keccak1600-avx512.pl | 2 ++
crypto/sha/asm/keccak1600-avx512vl.pl | 2 ++
crypto/sha/asm/keccak1600-c64x.pl | 3 +++
6 files changed, 14 insertions(+)
diff --git a/crypto/rc4/asm/rc4-c64xplus.pl b/crypto/rc4/asm/rc4-c64xplus.pl
index 9f282fe..8aa3fc4 100644
--- a/crypto/rc4/asm/rc4-c64xplus.pl
+++ b/crypto/rc4/asm/rc4-c64xplus.pl
@@ -186,5 +186,7 @@ rc4_options:
.align 4
___
+$output=pop;
+open STDOUT,">$output";
print $code;
close STDOUT;
diff --git a/crypto/sha/asm/keccak1600-armv4.pl
b/crypto/sha/asm/keccak1600-armv4.pl
index 16d2393..a9ad3cb 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 82ca672..2a63dd6 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 6766f97..bde2aa1 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 53f1e84..9c202fb 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 585f64b..d13471f 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;
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits