Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 11:08:02 -06:00
Code Activity

Linux: fix executable stack in resulting binary which was caused by crypto assembly files missing the GNU-stack note.

Browse Source
This commit is contained in:
Mounir IDRASSI
2017-06-13 01:23:54 +02:00
parent 95bf8f8574
commit ba1fbb688e
5 changed files with 48 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Crypto/Aes_hw_cpu.asm
View File

@@ -331,3 +331,14 @@
%endif ; __BITS__ != 16 %endif ; __BITS__ != 16
%ifidn __OUTPUT_FORMAT__,elf
section .note.GNU-stack noalloc noexec nowrite progbits
%endif
%ifidn __OUTPUT_FORMAT__,elf32
section .note.GNU-stack noalloc noexec nowrite progbits
%endif
%ifidn __OUTPUT_FORMAT__,elf64
section .note.GNU-stack noalloc noexec nowrite progbits
%endif

11
src/Crypto/Aes_x64.asm
View File

@@ -905,3 +905,14 @@ end_prologue
%endif %endif
%endif %endif
%ifidn __OUTPUT_FORMAT__,elf
section .note.GNU-stack noalloc noexec nowrite progbits
%endif
%ifidn __OUTPUT_FORMAT__,elf32
section .note.GNU-stack noalloc noexec nowrite progbits
%endif
%ifidn __OUTPUT_FORMAT__,elf64
section .note.GNU-stack noalloc noexec nowrite progbits
%endif

11
src/Crypto/Aes_x86.asm
View File

@@ -644,3 +644,14 @@ stk_spc equ 20 ; stack space
do_exit do_exit
%endif %endif
%ifidn __OUTPUT_FORMAT__,elf
section .note.GNU-stack noalloc noexec nowrite progbits
%endif
%ifidn __OUTPUT_FORMAT__,elf32
section .note.GNU-stack noalloc noexec nowrite progbits
%endif
%ifidn __OUTPUT_FORMAT__,elf64
section .note.GNU-stack noalloc noexec nowrite progbits
%endif

5
src/Crypto/Twofish_x64.S
View File

@@ -312,3 +312,8 @@ movq %r8, %rdx;
.endif .endif
ret; ret;
#if defined(__linux__) && defined(__ELF__)
.section .note.GNU-stack,"",%progbits
#endif

10
src/Crypto/Twofish_x86.S
View File

@@ -0,0 +1,10 @@
%ifidn __OUTPUT_FORMAT__,elf
section .note.GNU-stack noalloc noexec nowrite progbits
%endif
%ifidn __OUTPUT_FORMAT__,elf32
section .note.GNU-stack noalloc noexec nowrite progbits
%endif
%ifidn __OUTPUT_FORMAT__,elf64
section .note.GNU-stack noalloc noexec nowrite progbits
%endif