yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/development' into msft-aarch64

Browse source 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman 2023-11-30 11:01:04 +00:00
commit 6eee57bc07
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
library/aesce.c
View file

@ -45,7 +45,7 @@
#include "aesce.h" #include "aesce.h"
#if defined(MBEDTLS_ARCH_IS_ARMV8_A) && defined(MBEDTLS_HAVE_NEON_INTRINSICS) #if defined(MBEDTLS_AESCE_HAVE_CODE)
/* Compiler version checks. */ /* Compiler version checks. */
#if defined(__clang__) #if defined(__clang__)
@ -617,6 +617,6 @@ void mbedtls_aesce_gcm_mult(unsigned char c[16],
#undef MBEDTLS_POP_TARGET_PRAGMA #undef MBEDTLS_POP_TARGET_PRAGMA
#endif #endif
#endif /* MBEDTLS_ARCH_IS_ARMV8_A */ #endif /* MBEDTLS_AESCE_HAVE_CODE */
#endif /* MBEDTLS_AESCE_C */ #endif /* MBEDTLS_AESCE_C */

13
library/aesce.h
View file

@ -20,9 +20,13 @@
#include "mbedtls/aes.h" #include "mbedtls/aes.h"
#if defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_ARCH_IS_ARMV8_A) && \ #if defined(MBEDTLS_AESCE_C) \
defined(MBEDTLS_HAVE_NEON_INTRINSICS) && defined(MBEDTLS_ARCH_IS_ARMV8_A) && defined(MBEDTLS_HAVE_NEON_INTRINSICS) \
&& (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
@ -123,9 +127,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 && MBEDTLS_HAVE_NEON_INTRINSICS */ #endif /* MBEDTLS_AESCE_C && MBEDTLS_ARCH_IS_ARMV8_A && MBEDTLS_HAVE_NEON_INTRINSICS &&
(MBEDTLS_COMPILER_IS_GCC || __clang__ || MSC_VER) */
#endif /* MBEDTLS_AESCE_H */ #endif /* MBEDTLS_AESCE_H */