From f3bd149feb9cf6335490720a0618f63783940815 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Wed, 19 Jul 2023 15:10:52 +0200 Subject: [PATCH] Revert "Build correctly with IBT and Shadow Stack (#1289)" This reverts commit 5fe02c89a7dc1d0ba78f69717d78de304b4a2021. --- .../curve25519/sandy2x/sandy2x.S | 18 ------------------ .../salsa20/xmm6/salsa20_xmm6-asm.S | 18 ------------------ 2 files changed, 36 deletions(-) diff --git a/src/libsodium/crypto_scalarmult/curve25519/sandy2x/sandy2x.S b/src/libsodium/crypto_scalarmult/curve25519/sandy2x/sandy2x.S index eb4fe671..585804fb 100644 --- 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 index b53a4f4a..6d9f354e 100644 --- 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