summaryrefslogtreecommitdiffstats
path: root/src/crypto/cipher/salsa20
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2014-01-07 20:43:54 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2014-01-25 07:12:48 +0100
commitf983154677dfa6940807783c0fa8f5fcecd339a2 (patch)
tree1dd408fb371cc22cc54a9ece67cec803d64392d7 /src/crypto/cipher/salsa20
parent29560ff76ae0f51646430f6490cd625a03c2e005 (diff)
downloadfastd-f983154677dfa6940807783c0fa8f5fcecd339a2.tar
fastd-f983154677dfa6940807783c0fa8f5fcecd339a2.zip
Mark assembler files as not needing executable stack
Diffstat (limited to 'src/crypto/cipher/salsa20')
-rw-r--r--src/crypto/cipher/salsa20/xmm/salsa20_amd64_xmm6.s5
-rw-r--r--src/crypto/cipher/salsa20/xmm/salsa20_x86_xmm5.s5
2 files changed, 10 insertions, 0 deletions
diff --git a/src/crypto/cipher/salsa20/xmm/salsa20_amd64_xmm6.s b/src/crypto/cipher/salsa20/xmm/salsa20_amd64_xmm6.s
index 82a897f..ce75445 100644
--- a/src/crypto/cipher/salsa20/xmm/salsa20_amd64_xmm6.s
+++ b/src/crypto/cipher/salsa20/xmm/salsa20_amd64_xmm6.s
@@ -4821,3 +4821,8 @@ add $64,%rsi
# qhasm: goto bytesbetween1and255
jmp ._bytesbetween1and255
+
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
diff --git a/src/crypto/cipher/salsa20/xmm/salsa20_x86_xmm5.s b/src/crypto/cipher/salsa20/xmm/salsa20_x86_xmm5.s
index 9e32ea4..408f201 100644
--- a/src/crypto/cipher/salsa20/xmm/salsa20_x86_xmm5.s
+++ b/src/crypto/cipher/salsa20/xmm/salsa20_x86_xmm5.s
@@ -5076,3 +5076,8 @@ add $64,%esi
# qhasm: goto bytesbetween1and255
jmp ._bytesbetween1and255
+
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif