commit 02b1519ab6f7ab297161a2212dd2d6cf95d1a71e
author Jerry Yu <jerry.h.yu@arm.com> Sun Apr 23 14:43:19 2023 +0800
committer Jerry Yu <jerry.h.yu@arm.com> Wed Aug 02 17:44:02 2023 +0800
tree adc751e2ed0db4a88657ee8eafdf96e3c09378e5
parent 4dfbb2e7476d93f0f20cedc1a180be6cc51166d2

move accelerator checks to `aes.c`

Origin position is always validate due to conflict
between the guards in `aes.c` and module undef check

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>

library/aes.c

diff --git a/library/aes.c b/library/aes.c
index 6d718f4..d6ecdcc 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -33,6 +33,33 @@
 #include "mbedtls/platform.h"
 #include "mbedtls/platform_util.h"
 #include "mbedtls/error.h"
+
+#if defined(MBEDTLS_HAVE_ASM) && defined(__GNUC__) && \
+    defined(__aarch64__) && !defined(MBEDTLS_HAVE_ARM64)
+#define MBEDTLS_HAVE_ARM64
+#if !defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_AES_USE_HARDWARE_ONLY)
+#error "MBEDTLS_AES_C defined, but not all prerequisites"
+#endif
+#endif
+
+#if defined(MBEDTLS_HAVE_ASM) && defined(__GNUC__) && \
+    (defined(__amd64__) || defined(__x86_64__))   &&  \
+    !defined(MBEDTLS_HAVE_X86_64)
+#define MBEDTLS_HAVE_X86_64
+#if !defined(MBEDTLS_AESNI_C) && defined(MBEDTLS_AES_USE_HARDWARE_ONLY)
+#error "MBEDTLS_AES_C defined, but not all prerequisites"
+#endif
+#endif
+
+#if defined(MBEDTLS_HAVE_ASM) && defined(__GNUC__) && defined(__i386__) && \
+    !defined(MBEDTLS_HAVE_ASAN)
+#define MBEDTLS_HAVE_X86
+
+#if !defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_AES_USE_HARDWARE_ONLY)
+#error "MBEDTLS_AES_C defined, but not all prerequisites"
+#endif
+#endif
+
 #if defined(MBEDTLS_PADLOCK_C)
 #include "padlock.h"
 #endif

library/aesce.h

diff --git a/library/aesce.h b/library/aesce.h
index 7e9c12a..fbf5456 100644
--- a/library/aesce.h
+++ b/library/aesce.h
@@ -33,9 +33,6 @@
 #if !defined(MBEDTLS_HAVE_ARM64)
 #if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
 #define MBEDTLS_HAVE_ARM64
-#if !defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_AES_USE_HARDWARE_ONLY)
-#error "MBEDTLS_AES_C defined, but not all prerequisites"
-#endif
 #endif
 #endif
 

library/aesni.h

diff --git a/library/aesni.h b/library/aesni.h
index c17b613..6b5afb9 100644
--- a/library/aesni.h
+++ b/library/aesni.h
@@ -39,9 +39,6 @@
     (defined(__amd64__) || defined(__x86_64__))   &&  \
     !defined(MBEDTLS_HAVE_X86_64)
 #define MBEDTLS_HAVE_X86_64
-#if !defined(MBEDTLS_AESNI_C) && defined(MBEDTLS_AES_USE_HARDWARE_ONLY)
-#error "MBEDTLS_AES_C defined, but not all prerequisites"
-#endif
 #endif
 
 #if defined(MBEDTLS_AESNI_C)

library/padlock.h

diff --git a/library/padlock.h b/library/padlock.h
index 4de462c..c031f4b 100644
--- a/library/padlock.h
+++ b/library/padlock.h
@@ -48,10 +48,6 @@
 
 #include <stdint.h>
 
-#if !defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_AES_USE_HARDWARE_ONLY)
-#error "MBEDTLS_AES_C defined, but not all prerequisites"
-#endif
-
 #define MBEDTLS_PADLOCK_RNG 0x000C
 #define MBEDTLS_PADLOCK_ACE 0x00C0
 #define MBEDTLS_PADLOCK_PHE 0x0C00