yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge BoringSSL c48c8b6: Move no-exec-stack sections outside of #ifs.

Browse Source
This commit is contained in:
Brian Smith 2020-01-28 14:48:13 -06:00
commit b6daf733df
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/curve25519/asm/x25519-asm-arm.S
View File

@ -2131,8 +2131,8 @@ mov sp,r12
vpop {q4,q5,q6,q7}
bx lr
#endif /* !OPENSSL_NO_ASM && __arm__ && !__APPLE__ */
#if defined(__ELF__)
.section .note.GNU-stack,"",%progbits
#endif
#endif /* !OPENSSL_NO_ASM && __arm__ && !__APPLE__ */

8
crypto/perlasm/arm-xlate.pl
View File

@ -224,10 +224,10 @@ while(my $line=<>) {
print "\n";
}
# See https://www.airs.com/blog/archives/518.
print ".section\t.note.GNU-stack,\"\",\%progbits\n" if ($flavour =~ /linux/);
print "#endif\n" if ($flavour eq "linux32" || $flavour eq "linux64");
print "#endif // !OPENSSL_NO_ASM\n";
close STDOUT or die "error closing STDOUT";
# See https://www.airs.com/blog/archives/518.
print ".section\t.note.GNU-stack,\"\",\%progbits\n" if ($flavour =~ /linux/);
close STDOUT;

3
crypto/perlasm/x86_64-xlate.pl
View File

@ -1253,10 +1253,9 @@ while(defined(my $line=<>)) {
print "\n$current_segment\tENDS\n" if ($current_segment && $masm);
print "END\n" if ($masm);
print "#endif\n" if ($gas);
# See https://www.airs.com/blog/archives/518.
print ".section\t.note.GNU-stack,\"\",\@progbits\n" if ($elf);
print "#endif\n" if ($gas);
close STDOUT or die "error closing STDOUT";

2
crypto/perlasm/x86asm.pl
View File

@ -277,9 +277,9 @@ ___
___
}
print @out;
print "#endif\n" unless ($win32 || $netware);
# See https://www.airs.com/blog/archives/518.
print ".section\t.note.GNU-stack,\"\",\@progbits\n" if ($elf);
print "#endif\n" unless ($win32 || $netware);
}
sub ::asm_init