Remove AESGCM and AEGIS test for AVX

enclave-alistair · Mar 12, 2024 · 186c557 · 186c557
1 parent 6d261b0
commit 186c557
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/libsodium/crypto_aead/aegis256/aead_aegis256.c b/src/libsodium/crypto_aead/aegis256/aead_aegis256.c
@@ -15,7 +15,7 @@
 #include "aegis256_armcrypto.h"
 #endif
 
-#if defined(HAVE_AVXINTRIN_H) && defined(HAVE_WMMINTRIN_H)
+#if defined(HAVE_WMMINTRIN_H)
 #include "aegis256_aesni.h"
 #endif
 
@@ -148,8 +148,8 @@ _crypto_aead_aegis256_pick_best_implementation(void)
     }
 #endif
 
-#if defined(HAVE_AVXINTRIN_H) && defined(HAVE_WMMINTRIN_H)
-    if (sodium_runtime_has_aesni() & sodium_runtime_has_avx()) {
+#if defined(HAVE_WMMINTRIN_H)
+    if (sodium_runtime_has_aesni()) {
         implementation = &aegis256_aesni_implementation;
         return 0;
     }

diff --git a/src/libsodium/crypto_aead/aegis256/aegis256_aesni.c b/src/libsodium/crypto_aead/aegis256/aegis256_aesni.c
@@ -18,9 +18,9 @@
 #include "aegis256_aesni.h"
 
 #ifdef __clang__
-#pragma clang attribute push(__attribute__((target("aes,avx"))), apply_to = function)
+#pragma clang attribute push(__attribute__((target("aes"))), apply_to = function)
 #elif defined(__GNUC__)
-#pragma GCC target("aes,avx")
+#pragma GCC target("aes")
 #endif
 
 #include "private/sse2_64_32.h"

diff --git a/src/libsodium/crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c b/src/libsodium/crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c
@@ -17,7 +17,7 @@
 #if defined(HAVE_TMMINTRIN_H) && defined(HAVE_WMMINTRIN_H)
 
 #ifdef __GNUC__
-#pragma GCC target("avx,aes,pclmul")
+#pragma GCC target("aes,pclmul")
 #endif
 
 #if !defined(_MSC_VER) || _MSC_VER < 1800
@@ -1003,7 +1003,7 @@ crypto_aead_aes256gcm_decrypt(unsigned char *m, unsigned long long *mlen_p, unsi
 int
 crypto_aead_aes256gcm_is_available(void)
 {
-    return sodium_runtime_has_pclmul() & sodium_runtime_has_aesni() & sodium_runtime_has_avx();
+    return sodium_runtime_has_pclmul() & sodium_runtime_has_aesni();
 }
 
 #endif