commit 410ad44725ebd85a84fd3b8a2db0f69519e596cf
author Dave Rodgman <dave.rodgman@arm.com> Tue Nov 28 13:42:17 2023 +0000
committer Dave Rodgman <dave.rodgman@arm.com> Tue Nov 28 13:42:17 2023 +0000
tree 598383545c0cfef8a71ddc579eccedb12a162389
parent 11c3fd1f73c40108c2d5a432c598a7ff1a120970

Disable hw AES on Arm for IAR

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>

library/aesce.c

diff --git a/library/aesce.c b/library/aesce.c
index e1e0a15..279c5a2 100644
--- a/library/aesce.c
+++ b/library/aesce.c
@@ -45,7 +45,7 @@
 
 #include "aesce.h"
 
-#if defined(MBEDTLS_ARCH_IS_ARMV8_A) && defined(__ARM_NEON)
+#if defined(MBEDTLS_AESCE_HAVE_CODE)
 
 /* Compiler version checks. */
 #if defined(__clang__)

library/aesce.h

diff --git a/library/aesce.h b/library/aesce.h
index cf12d7f..e2bf58a 100644
--- a/library/aesce.h
+++ b/library/aesce.h
@@ -15,12 +15,17 @@
 #define MBEDTLS_AESCE_H
 
 #include "mbedtls/build_info.h"
+#include "common.h"
 
 #include "mbedtls/aes.h"
 
 
-#if defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_ARCH_IS_ARMV8_A) && defined(__ARM_NEON)
+#if defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_ARCH_IS_ARMV8_A) && defined(__ARM_NEON) \
+    && (defined(MBEDTLS_COMPILER_IS_GCC) || defined(__clang__) || defined(MSC_VER))
 
+/* MBEDTLS_AESCE_HAVE_CODE is defined if we have a suitable target platform, and a
+ * potentially suitable compiler (compiler version & flags are not checked when defining
+ * this). */
 #define MBEDTLS_AESCE_HAVE_CODE
 
 #ifdef __cplusplus
@@ -121,9 +126,10 @@
 #else
 
 #if defined(MBEDTLS_AES_USE_HARDWARE_ONLY) && defined(MBEDTLS_ARCH_IS_ARMV8_A)
-#error "AES hardware acceleration not supported on this platform"
+#error "AES hardware acceleration not supported on this platform / compiler"
 #endif
 
-#endif /* MBEDTLS_AESCE_C && MBEDTLS_ARCH_IS_ARMV8_A && __ARM_NEON */
+#endif /* MBEDTLS_AESCE_C && MBEDTLS_ARCH_IS_ARMV8_A && __ARM_NEON &&
+          (MBEDTLS_COMPILER_IS_GCC || __clang__ || MSC_VER) */
 
 #endif /* MBEDTLS_AESCE_H */