commit ece803b0aeb1956d75f1b7fee557d63e45b71bf1
author Dave Rodgman <dave.rodgman@arm.com> Sun Oct 08 20:24:48 2023 +0100
committer Dave Rodgman <dave.rodgman@arm.com> Wed Oct 25 09:06:24 2023 +0100
tree a2db5a2e65e62f7a9e7e1b9da7c214507554b311
parent f82e0c470186a6489b182c184a087d3a512f566f

Fix behaviour for Armv8 targets without Neon

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

library/aesce.h

diff --git a/library/aesce.h b/library/aesce.h
index 97e2424..2cec2f3 100644
--- a/library/aesce.h
+++ b/library/aesce.h
@@ -2,7 +2,7 @@
  * \file aesce.h
  *
  * \brief Support hardware AES acceleration on Armv8-A processors with
- *        the Armv8-A Cryptographic Extension in AArch64 execution state.
+ *        the Armv8-A Cryptographic Extension.
  *
  * \warning These functions are only for internal use by other library
  *          functions; you must not call them directly.
@@ -31,7 +31,7 @@
 #include "mbedtls/aes.h"
 
 
-#if defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_ARCH_IS_ARMV8)
+#if defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_ARCH_IS_ARMV8) && defined(__ARM_NEON)
 
 #define MBEDTLS_AESCE_HAVE_CODE
 
@@ -128,6 +128,12 @@
 }
 #endif
 
-#endif /* MBEDTLS_AESCE_C && MBEDTLS_ARCH_IS_ARM64 */
+#else
+
+#if defined(MBEDTLS_AES_USE_HARDWARE_ONLY)
+#error "AES hardware acceleration not supported on this platform"
+#endif
+
+#endif /* MBEDTLS_AESCE_C && MBEDTLS_ARCH_IS_ARMV8 && __ARM_NEON */
 
 #endif /* MBEDTLS_AESCE_H */