From: Richard Levitte <levitte@openssl.org>
Date: Sat, 10 Feb 2018 07:47:51 +0000 (+0100)
Subject: Make a few more asm modules conform: last argument is output file
X-Git-Tag: OpenSSL_1_1_1-pre3~156
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2bd3b626dddd57217faf7cc267f74754cce9bb58;p=oweals%2Fopenssl.git

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)
---

diff --git a/crypto/rc4/asm/rc4-c64xplus.pl b/crypto/rc4/asm/rc4-c64xplus.pl
index 9f282fe45e..8aa3fc4ce8 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 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;