480b9efaa3
- add patch from Dhiru Kholia for the AES-NI implementations to allow libk5crypto to be properly marked as not needing an executable stack on arches where they're used (#1045699, and so many others)
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
diff --git a/src/lib/crypto/builtin/aes/iaesx64.s b/src/lib/crypto/builtin/aes/iaesx64.s
|
|
index 1c091c1..3a3d6fc 100644
|
|
--- a/src/lib/crypto/builtin/aes/iaesx64.s
|
|
+++ b/src/lib/crypto/builtin/aes/iaesx64.s
|
|
@@ -834,3 +834,13 @@ lp256encsingle_CBC:
|
|
movdqu [r9],xmm1
|
|
add rsp,16*16+8
|
|
ret
|
|
+
|
|
+%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
|
|
diff --git a/src/lib/crypto/builtin/aes/iaesx86.s b/src/lib/crypto/builtin/aes/iaesx86.s
|
|
index b667acd..03a8670 100644
|
|
--- a/src/lib/crypto/builtin/aes/iaesx86.s
|
|
+++ b/src/lib/crypto/builtin/aes/iaesx86.s
|
|
@@ -871,3 +871,13 @@ lp256encsingle_CBC:
|
|
movdqu [ecx],xmm1 ; store last iv for chaining
|
|
|
|
ret
|
|
+
|
|
+%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
|