From 13b8a267303af716bb05ab20c900c90677c7fa7c Mon Sep 17 00:00:00 2001 From: gabor-mezei-arm Date: Mon, 26 Oct 2020 11:35:23 +0100 Subject: [PATCH] Make the aes xts methods independent from MBEDTLS_AES_SETKEY_DEC_ALT This is fix for the MBEDTLS_AES_SETKEY_DEC_ALT macro switch is including the aes xts methods and building with a custom mbedtls_aes_setkey_dec function will disable the aes xts methods. The fix is separating the aes xts methods and the MBEDTLS_AES_SETKEY_DEC_ALT can only switch the presence of the mbedtls_aes_setkey_dec function. Signed-off-by: gabor-mezei-arm --- library/aes.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/library/aes.c b/library/aes.c index 02a7986b5..2e5c302f9 100644 --- a/library/aes.c +++ b/library/aes.c @@ -735,6 +735,7 @@ exit: return( ret ); } +#endif /* !MBEDTLS_AES_SETKEY_DEC_ALT */ #if defined(MBEDTLS_CIPHER_MODE_XTS) static int mbedtls_aes_xts_decode_keys( const unsigned char *key, @@ -813,8 +814,6 @@ int mbedtls_aes_xts_setkey_dec( mbedtls_aes_xts_context *ctx, } #endif /* MBEDTLS_CIPHER_MODE_XTS */ -#endif /* !MBEDTLS_AES_SETKEY_DEC_ALT */ - #define AES_FROUND(X0,X1,X2,X3,Y0,Y1,Y2,Y3) \ do \ { \