Align with upstream on 'close STDOUT' lines.

When upstreaming c1d8c5b0e0 as
https://github.com/openssl/openssl/pull/10883 and then
https://github.com/openssl/openssl/pull/10930, we ended up diverging
slightly: in the upstream version, I ended up applying the same change
to the xlate files. Upstream also suggested "error closing STDOUT: $!".

Apply the same changes here.

Change-Id: I8a8cbc3944432e94a8844f9f628a900edfe77b30
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/48725
Reviewed-by: Adam Langley <agl@google.com>
grpc-202302
David Benjamin 3 years ago committed by Adam Langley
parent 7e265971c0
commit 549e4e7995
  1. 2
      crypto/chacha/asm/chacha-armv4.pl
  2. 2
      crypto/chacha/asm/chacha-armv8.pl
  3. 2
      crypto/chacha/asm/chacha-x86.pl
  4. 2
      crypto/chacha/asm/chacha-x86_64.pl
  5. 2
      crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl
  6. 2
      crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl
  7. 2
      crypto/fipsmodule/aes/asm/aesni-x86.pl
  8. 2
      crypto/fipsmodule/aes/asm/aesni-x86_64.pl
  9. 2
      crypto/fipsmodule/aes/asm/aesp8-ppc.pl
  10. 2
      crypto/fipsmodule/aes/asm/aesv8-armx.pl
  11. 2
      crypto/fipsmodule/aes/asm/bsaes-armv7.pl
  12. 2
      crypto/fipsmodule/aes/asm/vpaes-armv7.pl
  13. 2
      crypto/fipsmodule/aes/asm/vpaes-armv8.pl
  14. 2
      crypto/fipsmodule/aes/asm/vpaes-x86.pl
  15. 2
      crypto/fipsmodule/aes/asm/vpaes-x86_64.pl
  16. 2
      crypto/fipsmodule/bn/asm/armv4-mont.pl
  17. 2
      crypto/fipsmodule/bn/asm/armv8-mont.pl
  18. 2
      crypto/fipsmodule/bn/asm/bn-586.pl
  19. 2
      crypto/fipsmodule/bn/asm/co-586.pl
  20. 2
      crypto/fipsmodule/bn/asm/rsaz-avx2.pl
  21. 2
      crypto/fipsmodule/bn/asm/x86-mont.pl
  22. 2
      crypto/fipsmodule/bn/asm/x86_64-mont.pl
  23. 2
      crypto/fipsmodule/bn/asm/x86_64-mont5.pl
  24. 2
      crypto/fipsmodule/ec/asm/p256-x86_64-asm.pl
  25. 2
      crypto/fipsmodule/ec/asm/p256_beeu-x86_64-asm.pl
  26. 2
      crypto/fipsmodule/md5/asm/md5-586.pl
  27. 2
      crypto/fipsmodule/md5/asm/md5-x86_64.pl
  28. 2
      crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl
  29. 2
      crypto/fipsmodule/modes/asm/ghash-armv4.pl
  30. 2
      crypto/fipsmodule/modes/asm/ghash-neon-armv8.pl
  31. 2
      crypto/fipsmodule/modes/asm/ghash-ssse3-x86.pl
  32. 2
      crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl
  33. 2
      crypto/fipsmodule/modes/asm/ghash-x86.pl
  34. 2
      crypto/fipsmodule/modes/asm/ghash-x86_64.pl
  35. 2
      crypto/fipsmodule/modes/asm/ghashp8-ppc.pl
  36. 2
      crypto/fipsmodule/modes/asm/ghashv8-armx.pl
  37. 2
      crypto/fipsmodule/rand/asm/rdrand-x86_64.pl
  38. 2
      crypto/fipsmodule/sha/asm/sha1-586.pl
  39. 2
      crypto/fipsmodule/sha/asm/sha1-armv4-large.pl
  40. 2
      crypto/fipsmodule/sha/asm/sha1-armv8.pl
  41. 2
      crypto/fipsmodule/sha/asm/sha1-x86_64.pl
  42. 2
      crypto/fipsmodule/sha/asm/sha256-586.pl
  43. 2
      crypto/fipsmodule/sha/asm/sha256-armv4.pl
  44. 2
      crypto/fipsmodule/sha/asm/sha512-586.pl
  45. 2
      crypto/fipsmodule/sha/asm/sha512-armv4.pl
  46. 2
      crypto/fipsmodule/sha/asm/sha512-armv8.pl
  47. 2
      crypto/fipsmodule/sha/asm/sha512-x86_64.pl
  48. 2
      crypto/perlasm/arm-xlate.pl
  49. 2
      crypto/perlasm/ppc-xlate.pl
  50. 2
      crypto/perlasm/x86_64-xlate.pl
  51. 2
      crypto/test/asm/trampoline-armv4.pl
  52. 2
      crypto/test/asm/trampoline-armv8.pl
  53. 2
      crypto/test/asm/trampoline-ppc.pl
  54. 2
      crypto/test/asm/trampoline-x86.pl
  55. 2
      crypto/test/asm/trampoline-x86_64.pl

@ -1163,4 +1163,4 @@ foreach (split("\n",$code)) {
print $_,"\n";
}
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -1141,4 +1141,4 @@ foreach (split("\n",$code)) {
print $_,"\n";
}
close STDOUT or die "error closing STDOUT"; # flush
close STDOUT or die "error closing STDOUT: $!"; # flush

@ -769,4 +769,4 @@ sub SSSE3ROUND { # critical path is 20 "SIMD ticks" per round
&asm_finish();
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -2782,4 +2782,4 @@ foreach (split("\n",$code)) {
print $_,"\n";
}
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -2253,4 +2253,4 @@ aes256gcmsiv_kdf();
print $code;
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -2559,4 +2559,4 @@ $code =~ s/\`([^\`]*)\`/eval $1/gem;
print $code;
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -2551,4 +2551,4 @@ if ($PREFIX eq $AESNI_PREFIX) {
&asm_finish();
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -5102,4 +5102,4 @@ $code =~ s/\bmovbe\s+%eax,\s*([0-9]+)\(%rsp\)/movbe($1)/gem;
print $code;
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -3804,4 +3804,4 @@ foreach(split("\n",$code)) {
print $_,"\n";
}
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -1044,4 +1044,4 @@ if ($flavour =~ /64/) { ######## 64-bit code
}
}
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -2433,4 +2433,4 @@ close SELF;
print $code;
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -1373,4 +1373,4 @@ foreach (split("\n",$code)) {
print $_,"\n";
}
close STDOUT;
close STDOUT or die "error closing STDOUT: $!";

@ -1382,4 +1382,4 @@ ___
print $code;
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -920,4 +920,4 @@ $k_dsbo=0x2c0; # decryption sbox final output
&asm_finish();
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -1546,4 +1546,4 @@ $code =~ s/\`([^\`]*)\`/eval($1)/gem;
print $code;
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -761,4 +761,4 @@ foreach (split("\n",$code)) {
print $_,"\n";
}
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -1520,4 +1520,4 @@ ___
print $code;
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -30,7 +30,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
&asm_finish();
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";
sub bn_mul_add_words
{

@ -22,7 +22,7 @@ open STDOUT,">$output";
&asm_finish();
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";
sub mul_add_c
{

@ -1940,4 +1940,4 @@ rsaz_1024_gather5_avx2:
___
}}}
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -628,4 +628,4 @@ $sbit=$num;
&asm_finish();
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -1578,4 +1578,4 @@ ___
}
print $code;
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -3930,4 +3930,4 @@ ___
$code =~ s/\`([^\`]*)\`/eval($1)/gem;
print $code;
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -4153,4 +4153,4 @@ ___
$code =~ s/\`([^\`]*)\`/eval $1/gem;
print $code;
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -400,4 +400,4 @@ beeu_mod_inverse_vartime:
___
print $code;
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -36,7 +36,7 @@ $X="esi";
&md5_block("md5_block_asm_data_order");
&asm_finish();
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";
sub Np
{

@ -380,4 +380,4 @@ ___
print $code;
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -1141,4 +1141,4 @@ $code =~ s/\`([^\`]*)\`/eval($1)/gem;
print $code;
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -297,4 +297,4 @@ foreach (split("\n",$code)) {
print $_,"\n";
}
close STDOUT or die "error closing STDOUT"; # enforce flush
close STDOUT or die "error closing STDOUT: $!"; # enforce flush

@ -291,4 +291,4 @@ foreach (split("\n",$code)) {
print $_,"\n";
}
close STDOUT or die "error closing STDOUT"; # enforce flush
close STDOUT or die "error closing STDOUT: $!"; # enforce flush

@ -285,4 +285,4 @@ ____
&asm_finish();
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -410,4 +410,4 @@ ____
}
print $code;
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -660,7 +660,7 @@ my ($Xhi,$Xi)=@_;
&asciz("GHASH for x86, CRYPTOGAMS by <appro\@openssl.org>");
&asm_finish();
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";
# A question was risen about choice of vanilla MMX. Or rather why wasn't
# SSE2 chosen instead? In addition to the fact that MMX runs on legacy

@ -1336,4 +1336,4 @@ $code =~ s/\`([^\`]*)\`/eval($1)/gem;
print $code;
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -667,4 +667,4 @@ foreach (split("\n",$code)) {
print $_,"\n";
}
close STDOUT or die "error closing STDOUT"; # enforce flush
close STDOUT or die "error closing STDOUT: $!"; # enforce flush

@ -428,4 +428,4 @@ if ($flavour =~ /64/) { ######## 64-bit code
}
}
close STDOUT or die "error closing STDOUT"; # enforce flush
close STDOUT or die "error closing STDOUT: $!"; # enforce flush

@ -84,4 +84,4 @@ CRYPTO_rdrand_multiple8_buf:
.size CRYPTO_rdrand_multiple8_buf,.-CRYPTO_rdrand_multiple8_buf
___
close STDOUT or die "error closing STDOUT"; # flush
close STDOUT or die "error closing STDOUT: $!"; # flush

@ -1483,4 +1483,4 @@ sub Xtail_avx()
&asm_finish();
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -742,4 +742,4 @@ foreach (split($/,$code)) {
print $_,$/;
}
close STDOUT or die "error closing STDOUT"; # enforce flush
close STDOUT or die "error closing STDOUT: $!"; # enforce flush

@ -359,4 +359,4 @@ foreach(split("\n",$code)) {
print $_,"\n";
}
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -2114,4 +2114,4 @@ foreach (split("\n",$code)) {
print $_,"\n";
}
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -1287,4 +1287,4 @@ sub bodyx_00_15 () { # +10%
&asm_finish();
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -737,4 +737,4 @@ foreach (split($/,$code)) {
print $_,"\n";
}
close STDOUT or die "error closing STDOUT"; # enforce flush
close STDOUT or die "error closing STDOUT: $!"; # enforce flush

@ -922,4 +922,4 @@ sub BODY_00_15_ssse3 { # "phase-less" copy of BODY_00_15_sse2
&asm_finish();
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -672,4 +672,4 @@ while(<SELF>) {
close SELF;
print $code;
close STDOUT or die "error closing STDOUT"; # enforce flush
close STDOUT or die "error closing STDOUT: $!"; # enforce flush

@ -459,4 +459,4 @@ foreach(split("\n",$code)) {
print $_,"\n";
}
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -2082,4 +2082,4 @@ foreach (split("\n",$code)) {
print $_,"\n";
}
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -245,4 +245,4 @@ print "#endif // !OPENSSL_NO_ASM\n";
# See https://www.airs.com/blog/archives/518.
print ".section\t.note.GNU-stack,\"\",\%progbits\n" if ($flavour =~ /linux/);
close STDOUT;
close STDOUT or die "error closing STDOUT: $!";

@ -314,4 +314,4 @@ print "#endif // !OPENSSL_NO_ASM && __powerpc64__\n";
# See https://www.airs.com/blog/archives/518.
print ".section\t.note.GNU-stack,\"\",\@progbits\n" if ($flavour =~ /linux/);
close STDOUT;
close STDOUT or die "error closing STDOUT: $!";

@ -1264,7 +1264,7 @@ print "#endif\n" if ($gas);
# See https://www.airs.com/blog/archives/518.
print ".section\t.note.GNU-stack,\"\",\@progbits\n" if ($elf);
close STDOUT;
close STDOUT or die "error closing STDOUT: $!";
#################################################
# Cross-reference x86_64 ABI "card"

@ -178,4 +178,4 @@ ____
}
print $code;
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -213,4 +213,4 @@ ____
}
print $code;
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -259,4 +259,4 @@ abi_test_clobber_lr:
____
print $code;
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -120,4 +120,4 @@ foreach (0..7) {
&asm_finish();
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

@ -556,4 +556,4 @@ ____
}
print $code;
close STDOUT or die "error closing STDOUT";
close STDOUT or die "error closing STDOUT: $!";

Loading…
Cancel
Save