Merge pull request #8573 from daverodgman/iar-aesce2
Disable hw AES on Arm for IAR
This commit is contained in:
commit
10dfe76425
2 changed files with 10 additions and 4 deletions
|
@ -45,7 +45,7 @@
|
||||||
|
|
||||||
#include "aesce.h"
|
#include "aesce.h"
|
||||||
|
|
||||||
#if defined(MBEDTLS_ARCH_IS_ARMV8_A) && defined(__ARM_NEON)
|
#if defined(MBEDTLS_AESCE_HAVE_CODE)
|
||||||
|
|
||||||
/* Compiler version checks. */
|
/* Compiler version checks. */
|
||||||
#if defined(__clang__)
|
#if defined(__clang__)
|
||||||
|
|
|
@ -15,12 +15,17 @@
|
||||||
#define MBEDTLS_AESCE_H
|
#define MBEDTLS_AESCE_H
|
||||||
|
|
||||||
#include "mbedtls/build_info.h"
|
#include "mbedtls/build_info.h"
|
||||||
|
#include "common.h"
|
||||||
|
|
||||||
#include "mbedtls/aes.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
|
#define MBEDTLS_AESCE_HAVE_CODE
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
@ -121,9 +126,10 @@ int mbedtls_aesce_setkey_enc(unsigned char *rk,
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#if defined(MBEDTLS_AES_USE_HARDWARE_ONLY) && defined(MBEDTLS_ARCH_IS_ARMV8_A)
|
#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
|
||||||
|
|
||||||
#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 */
|
#endif /* MBEDTLS_AESCE_H */
|
||||||
|
|
Loading…
Reference in a new issue