From 36d0196a4a27ee0962cff799ea898081b2bb23e1 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sun, 13 Nov 2022 20:56:21 +0100
Subject: [PATCH] Don't try ARM Crypto implementations on big-endian yet

---
 src/libsodium/crypto_aead/aegis128l/aead_aegis128l.c            | 2 +-
 .../crypto_aead/aegis128l/armcrypto/aead_aegis128l_armcrypto.c  | 2 +-
 src/libsodium/crypto_aead/aegis256/aead_aegis256.c              | 2 +-
 .../crypto_aead/aegis256/armcrypto/aead_aegis256_armcrypto.c    | 2 +-
 src/libsodium/crypto_aead/aes256gcm/aead_aes256gcm.c            | 2 +-
 .../crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/libsodium/crypto_aead/aegis128l/aead_aegis128l.c b/src/libsodium/crypto_aead/aegis128l/aead_aegis128l.c
index 796b1596..a07f881d 100644
--- a/src/libsodium/crypto_aead/aegis128l/aead_aegis128l.c
+++ b/src/libsodium/crypto_aead/aegis128l/aead_aegis128l.c
@@ -43,7 +43,7 @@ crypto_aead_aegis128l_keygen(unsigned char k[crypto_aead_aegis128l_KEYBYTES])
 }
 
 #if !((defined(HAVE_TMMINTRIN_H) && defined(HAVE_WMMINTRIN_H)) || \
-      defined(HAVE_ARMCRYPTO))
+      (defined(HAVE_ARMCRYPTO) && defined(NATIVE_LITTLE_ENDIAN)))
 
 #ifndef ENOSYS
 # define ENOSYS ENXIO
diff --git a/src/libsodium/crypto_aead/aegis128l/armcrypto/aead_aegis128l_armcrypto.c b/src/libsodium/crypto_aead/aegis128l/armcrypto/aead_aegis128l_armcrypto.c
index d823930e..0761d0f5 100644
--- a/src/libsodium/crypto_aead/aegis128l/armcrypto/aead_aegis128l_armcrypto.c
+++ b/src/libsodium/crypto_aead/aegis128l/armcrypto/aead_aegis128l_armcrypto.c
@@ -12,7 +12,7 @@
 
 #include "private/common.h"
 
-#ifdef HAVE_ARMCRYPTO
+#if defined(HAVE_ARMCRYPTO) && defined(NATIVE_LITTLE_ENDIAN)
 
 # include <arm_neon.h>
 
diff --git a/src/libsodium/crypto_aead/aegis256/aead_aegis256.c b/src/libsodium/crypto_aead/aegis256/aead_aegis256.c
index 9fff6aea..6ba2f5d4 100644
--- a/src/libsodium/crypto_aead/aegis256/aead_aegis256.c
+++ b/src/libsodium/crypto_aead/aegis256/aead_aegis256.c
@@ -43,7 +43,7 @@ crypto_aead_aegis256_keygen(unsigned char k[crypto_aead_aegis256_KEYBYTES])
 }
 
 #if !((defined(HAVE_TMMINTRIN_H) && defined(HAVE_WMMINTRIN_H)) || \
-      defined(HAVE_ARMCRYPTO))
+      (defined(HAVE_ARMCRYPTO) && defined(NATIVE_LITTLE_ENDIAN)))
 
 #ifndef ENOSYS
 # define ENOSYS ENXIO
diff --git a/src/libsodium/crypto_aead/aegis256/armcrypto/aead_aegis256_armcrypto.c b/src/libsodium/crypto_aead/aegis256/armcrypto/aead_aegis256_armcrypto.c
index e5cd054f..565e3c88 100644
--- a/src/libsodium/crypto_aead/aegis256/armcrypto/aead_aegis256_armcrypto.c
+++ b/src/libsodium/crypto_aead/aegis256/armcrypto/aead_aegis256_armcrypto.c
@@ -12,7 +12,7 @@
 
 #include "private/common.h"
 
-#ifdef HAVE_ARMCRYPTO
+#if defined(HAVE_ARMCRYPTO) && defined(NATIVE_LITTLE_ENDIAN)
 
 # include <arm_neon.h>
 
diff --git a/src/libsodium/crypto_aead/aes256gcm/aead_aes256gcm.c b/src/libsodium/crypto_aead/aes256gcm/aead_aes256gcm.c
index 9db14e86..98421525 100644
--- a/src/libsodium/crypto_aead/aes256gcm/aead_aes256gcm.c
+++ b/src/libsodium/crypto_aead/aes256gcm/aead_aes256gcm.c
@@ -47,7 +47,7 @@ crypto_aead_aes256gcm_keygen(unsigned char k[crypto_aead_aes256gcm_KEYBYTES])
     randombytes_buf(k, crypto_aead_aes256gcm_KEYBYTES);
 }
 
-#if !((defined(HAVE_ARMCRYPTO) && defined(__GNUC__)) || \
+#if !((defined(HAVE_ARMCRYPTO) && defined(__GNUC__) && defined(NATIVE_LITTLE_ENDIAN)) || \
       (defined(HAVE_TMMINTRIN_H) && defined(HAVE_WMMINTRIN_H)))
 
 #ifndef ENOSYS
diff --git a/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c b/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c
index e736ecda..540fbab1 100644
--- a/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c
+++ b/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c
@@ -13,7 +13,7 @@
 #include "runtime.h"
 #include "utils.h"
 
-#if defined(HAVE_ARMCRYPTO) && defined(__GNUC__)
+#if defined(HAVE_ARMCRYPTO) && defined(__GNUC__) && defined(NATIVE_LITTLE_ENDIAN)
 
 #include <arm_neon.h>