Merge pull request #60 from mrueg/master

Add stackmarkings to stream_salsa20_amd64_xmm6.s
jedisct1 · Aug 4, 2013 · 63413db · 63413db
2 parents 5cb2c0b + 1f4b11d
commit 63413db
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/libsodium/crypto_stream/salsa20/amd64_xmm6/stream_salsa20_amd64_xmm6.s b/src/libsodium/crypto_stream/salsa20/amd64_xmm6/stream_salsa20_amd64_xmm6.s
@@ -1,4 +1,3 @@
-
 #if defined(__amd64) || defined(__amd64__) || defined(__x86_64__)
 
 .text
@@ -945,3 +944,7 @@ add  $64,%rsi
 jmp ._bytesbetween1and255
 
 #endif
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif