Revert "Build correctly with IBT and Shadow Stack (#1289)"

This reverts commit 5fe02c8.
jedisct1 · Jul 19, 2023 · f3bd149 · f3bd149
1 parent 5fe02c8
commit f3bd149
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 36 deletions.
diff --git a/src/libsodium/crypto_scalarmult/curve25519/sandy2x/sandy2x.S b/src/libsodium/crypto_scalarmult/curve25519/sandy2x/sandy2x.S
@@ -10,24 +10,6 @@
 #include "ladder.S"
 
 #if defined(__linux__) && defined(__ELF__)
-#if defined(__CET__)
-.section	.note.gnu.property,"a"
-.p2align 3
-.long	1f - 0f
-.long	4f - 1f
-.long	5
-0:
-.string	"GNU"
-1:
-.p2align 3
-.long	0xc0000002
-.long	3f - 2f
-2:
-.long	__CET__
-3:
-.p2align 3
-4:
-#endif
 .section .note.GNU-stack,"",%progbits
 #endif
 

diff --git a/src/libsodium/crypto_stream/salsa20/xmm6/salsa20_xmm6-asm.S b/src/libsodium/crypto_stream/salsa20/xmm6/salsa20_xmm6-asm.S
@@ -956,23 +956,5 @@ jmp ._bytesbetween1and255
 #endif
 
 #if defined(__linux__) && defined(__ELF__)
-#if defined(__CET__)
-.section	.note.gnu.property,"a"
-.p2align 3
-.long	1f - 0f
-.long	4f - 1f
-.long	5
-0:
-.string	"GNU"
-1:
-.p2align 3
-.long	0xc0000002
-.long	3f - 2f
-2:
-.long	__CET__
-3:
-.p2align 3
-4:
-#endif
 .section .note.GNU-stack,"",%progbits
 #endif