diff options
| author | Andy Polyakov <appro@openssl.org> | 2010-05-06 00:05:39 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2010-05-06 00:05:39 +0200 |
| commit | 3efe51a4071d864400888e91b66c34ac3e17e01d (patch) | |
| tree | 24e207ad6d35b9e545289f26053527e2449deadf | |
| parent | Non-executable stack in asm. (diff) | |
| download | openssl-3efe51a4071d864400888e91b66c34ac3e17e01d.tar.xz openssl-3efe51a4071d864400888e91b66c34ac3e17e01d.zip | |
Revert previous Linux-specific/centric commit#19629. If it really has to
be done, it's definitely not the way to do it. So far answer to the
question was to ./config -Wa,--noexecstack (adopted by RedHat).
| -rw-r--r-- | CHANGES | 3 | ||||
| -rwxr-xr-x | crypto/aes/asm/aes-x86_64.pl | 3 | ||||
| -rwxr-xr-x | crypto/bn/asm/x86_64-mont.pl | 1 | ||||
| -rwxr-xr-x | crypto/md5/asm/md5-x86_64.pl | 1 | ||||
| -rwxr-xr-x | crypto/rc4/asm/rc4-x86_64.pl | 1 | ||||
| -rwxr-xr-x | crypto/sha/asm/sha1-x86_64.pl | 1 | ||||
| -rwxr-xr-x | crypto/sha/asm/sha512-x86_64.pl | 2 | ||||
| -rw-r--r-- | crypto/x86_64cpuid.pl | 7 |
8 files changed, 1 insertions, 18 deletions
@@ -4,9 +4,6 @@ Changes between 1.0.0 and 1.1.0 [xx XXX xxxx] - *) Make generated asm have non-executable stack. - [Contributed by Google <agl@google.com>] - *) New function OPENSSL_gmtime_diff to find the difference in days and seconds between two tm structures. This will be used to provide additional functionality for ASN1_TIME. diff --git a/crypto/aes/asm/aes-x86_64.pl b/crypto/aes/asm/aes-x86_64.pl index a757b47146..a545e892ae 100755 --- a/crypto/aes/asm/aes-x86_64.pl +++ b/crypto/aes/asm/aes-x86_64.pl @@ -42,8 +42,7 @@ $verticalspin=1; # unlike 32-bit version $verticalspin performs # ~15% better on both AMD and Intel cores $speed_limit=512; # see aes-586.pl for details -$code=".section .note.GNU-stack,\"\",\@progbits\n"; -$code.=".text\n"; +$code=".text\n"; $s0="%eax"; $s1="%ebx"; diff --git a/crypto/bn/asm/x86_64-mont.pl b/crypto/bn/asm/x86_64-mont.pl index b62373f567..3b7a6f243f 100755 --- a/crypto/bn/asm/x86_64-mont.pl +++ b/crypto/bn/asm/x86_64-mont.pl @@ -45,7 +45,6 @@ $m0="%rbx"; $m1="%rbp"; $code=<<___; -.section .note.GNU-stack,"",\@progbits .text .globl bn_mul_mont diff --git a/crypto/md5/asm/md5-x86_64.pl b/crypto/md5/asm/md5-x86_64.pl index b75cf3b7a4..867885435e 100755 --- a/crypto/md5/asm/md5-x86_64.pl +++ b/crypto/md5/asm/md5-x86_64.pl @@ -123,7 +123,6 @@ no warnings qw(uninitialized); open STDOUT,"| $^X $xlate $flavour $output"; $code .= <<EOF; -.section .note.GNU-stack,"",\@progbits .text .align 16 diff --git a/crypto/rc4/asm/rc4-x86_64.pl b/crypto/rc4/asm/rc4-x86_64.pl index a134127e8c..677be5fe25 100755 --- a/crypto/rc4/asm/rc4-x86_64.pl +++ b/crypto/rc4/asm/rc4-x86_64.pl @@ -82,7 +82,6 @@ $YY="%r12"; $TY="%r13"; $code=<<___; -.section .note.GNU-stack,"",\@progbits .text .globl RC4 diff --git a/crypto/sha/asm/sha1-x86_64.pl b/crypto/sha/asm/sha1-x86_64.pl index a00f7c6799..35ab0e7e78 100755 --- a/crypto/sha/asm/sha1-x86_64.pl +++ b/crypto/sha/asm/sha1-x86_64.pl @@ -178,7 +178,6 @@ unshift(@xi,pop(@xi)); } $code.=<<___; -.section .note.GNU-stack,"",\@progbits .text .globl sha1_block_data_order diff --git a/crypto/sha/asm/sha512-x86_64.pl b/crypto/sha/asm/sha512-x86_64.pl index aaf9c57875..e6643f8cf6 100755 --- a/crypto/sha/asm/sha512-x86_64.pl +++ b/crypto/sha/asm/sha512-x86_64.pl @@ -178,8 +178,6 @@ ___ } $code=<<___; -.section .note.GNU-stack,"",\@progbits - .text .globl $func diff --git a/crypto/x86_64cpuid.pl b/crypto/x86_64cpuid.pl index 72010c9cbe..c96821a3c8 100644 --- a/crypto/x86_64cpuid.pl +++ b/crypto/x86_64cpuid.pl @@ -16,13 +16,6 @@ print<<___; .section .init call OPENSSL_cpuid_setup -___ - -if ($flavour =~ /elf/) { - print ".section .note.GNU-stack,\"\",\@progbits\n" -} - -print<<___; .text .globl OPENSSL_atomic_add |