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

Rename mbedtls_aesce_has_support macro to satisfy case rules

Browse source 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman 2023-08-04 14:27:58 +01:00
parent b30adce7fd
commit f2249ec905
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
library/aes.c
View file

@ -653,7 +653,7 @@ int mbedtls_aes_setkey_enc(mbedtls_aes_context *ctx, const unsigned char *key,
#endif #endif
#if defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_HAVE_ARM64) #if defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_HAVE_ARM64)
if (mbedtls_aesce_has_support()) { if (MBEDTLS_AESCE_HAS_SUPPORT()) {
return mbedtls_aesce_setkey_enc((unsigned char *) RK, key, keybits); return mbedtls_aesce_setkey_enc((unsigned char *) RK, key, keybits);
} }
#endif #endif
@ -765,7 +765,7 @@ int mbedtls_aes_setkey_dec(mbedtls_aes_context *ctx, const unsigned char *key,
#endif #endif
#if defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_HAVE_ARM64) #if defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_HAVE_ARM64)
if (mbedtls_aesce_has_support()) { if (MBEDTLS_AESCE_HAS_SUPPORT()) {
mbedtls_aesce_inverse_key( mbedtls_aesce_inverse_key(
(unsigned char *) RK, (unsigned char *) RK,
(const unsigned char *) (cty.buf + cty.rk_offset), (const unsigned char *) (cty.buf + cty.rk_offset),
@ -1092,7 +1092,7 @@ int mbedtls_aes_crypt_ecb(mbedtls_aes_context *ctx,
#endif #endif
#if defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_HAVE_ARM64) #if defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_HAVE_ARM64)
if (mbedtls_aesce_has_support()) { if (MBEDTLS_AESCE_HAS_SUPPORT()) {
return mbedtls_aesce_crypt_ecb(ctx, mode, input, output); return mbedtls_aesce_crypt_ecb(ctx, mode, input, output);
} }
#endif #endif
@ -1911,7 +1911,7 @@ int mbedtls_aes_self_test(int verbose)
} else } else
#endif #endif
#if defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_HAVE_ARM64) #if defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_HAVE_ARM64)
if (mbedtls_aesce_has_support()) { if (MBEDTLS_AESCE_HAS_SUPPORT()) {
mbedtls_printf(" AES note: using AESCE.\n"); mbedtls_printf(" AES note: using AESCE.\n");
} else } else
#endif #endif

4
library/aesce.h
View file

@ -53,7 +53,7 @@ extern signed char mbedtls_aesce_has_support_result;
*/ */
int mbedtls_aesce_has_support_impl(void); int mbedtls_aesce_has_support_impl(void);
#define mbedtls_aesce_has_support() (mbedtls_aesce_has_support_result == -1 ? \ #define MBEDTLS_AESCE_HAS_SUPPORT() (mbedtls_aesce_has_support_result == -1 ? \
mbedtls_aesce_has_support_impl() : \ mbedtls_aesce_has_support_impl() : \
mbedtls_aesce_has_support_result) mbedtls_aesce_has_support_result)
@ -62,7 +62,7 @@ int mbedtls_aesce_has_support_impl(void);
/* If we are not on Linux, we can't detect support so assume that it's supported. /* If we are not on Linux, we can't detect support so assume that it's supported.
* Similarly, assume support if MBEDTLS_AES_USE_HARDWARE_ONLY is set. * Similarly, assume support if MBEDTLS_AES_USE_HARDWARE_ONLY is set.
*/ */
#define mbedtls_aesce_has_support() 1 #define MBEDTLS_AESCE_HAS_SUPPORT() 1
#endif /* defined(__linux__) && !defined(MBEDTLS_AES_USE_HARDWARE_ONLY) */ #endif /* defined(__linux__) && !defined(MBEDTLS_AES_USE_HARDWARE_ONLY) */

6
library/gcm.c
View file

@ -98,7 +98,7 @@ static int gcm_gen_table(mbedtls_gcm_context *ctx)
#endif #endif
#if defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_HAVE_ARM64) #if defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_HAVE_ARM64)
if (mbedtls_aesce_has_support()) { if (MBEDTLS_AESCE_HAS_SUPPORT()) {
return 0; return 0;
} }
#endif #endif
@ -209,7 +209,7 @@ static void gcm_mult(mbedtls_gcm_context *ctx, const unsigned char x[16],
#endif /* MBEDTLS_AESNI_HAVE_CODE */ #endif /* MBEDTLS_AESNI_HAVE_CODE */
#if defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_HAVE_ARM64) #if defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_HAVE_ARM64)
if (mbedtls_aesce_has_support()) { if (MBEDTLS_AESCE_HAS_SUPPORT()) {
unsigned char h[16]; unsigned char h[16];
/* mbedtls_aesce_gcm_mult needs big-endian input */ /* mbedtls_aesce_gcm_mult needs big-endian input */
@ -886,7 +886,7 @@ int mbedtls_gcm_self_test(int verbose)
#endif #endif
#if defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_HAVE_ARM64) #if defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_HAVE_ARM64)
if (mbedtls_aesce_has_support()) { if (MBEDTLS_AESCE_HAS_SUPPORT()) {
mbedtls_printf(" GCM note: using AESCE.\n"); mbedtls_printf(" GCM note: using AESCE.\n");
} else } else
#endif #endif