From 73b9f4e50612a846d9f1d54c71129caba7be80ce Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Mon, 8 Aug 2011 20:02:47 +0200 Subject: [PATCH 2/6] Added note.GNU-stack to prevent marking the library as using an executable stack. Reported by Andreas Metzler. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cristian Rodríguez --- lib/accelerated/intel/asm/appro-aes-gcm-x86-64.s | 4 ++++ lib/accelerated/intel/asm/appro-aes-x86-64.s | 5 +++++ lib/accelerated/intel/asm/appro-aes-x86.s | 5 +++++ 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/lib/accelerated/intel/asm/appro-aes-gcm-x86-64.s b/lib/accelerated/intel/asm/appro-aes-gcm-x86-64.s index 009ec3d..7e3c407 100644 --- a/lib/accelerated/intel/asm/appro-aes-gcm-x86-64.s +++ b/lib/accelerated/intel/asm/appro-aes-gcm-x86-64.s @@ -1062,3 +1062,7 @@ gcm_ghash_clmul: .byte 71,72,65,83,72,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .align 64 + +#if defined(__linux__) && defined(__ELF__) +.section .note.GNU-stack,"",%progbits +#endif diff --git a/lib/accelerated/intel/asm/appro-aes-x86-64.s b/lib/accelerated/intel/asm/appro-aes-x86-64.s index f286fb1..675e112 100644 --- a/lib/accelerated/intel/asm/appro-aes-x86-64.s +++ b/lib/accelerated/intel/asm/appro-aes-x86-64.s @@ -2571,3 +2571,8 @@ __aesni_set_encrypt_key: .byte 65,69,83,32,102,111,114,32,73,110,116,101,108,32,65,69,83,45,78,73,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .align 64 + +#if defined(__linux__) && defined(__ELF__) +.section .note.GNU-stack,"",%progbits +#endif + diff --git a/lib/accelerated/intel/asm/appro-aes-x86.s b/lib/accelerated/intel/asm/appro-aes-x86.s index 2084749..f095a63 100644 --- a/lib/accelerated/intel/asm/appro-aes-x86.s +++ b/lib/accelerated/intel/asm/appro-aes-x86.s @@ -2179,3 +2179,8 @@ aesni_set_decrypt_key: .byte 83,45,78,73,44,32,67,82,89,80,84,79,71,65,77,83 .byte 32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115 .byte 115,108,46,111,114,103,62,0 + +#if defined(__linux__) && defined(__ELF__) +.section .note.GNU-stack,"",%progbits +#endif + -- 1.7.4.1