commit 23cb65e32fffdc9d82cdb72732a0cb3dd052634d
author Gilles Peskine <gilles.peskine@arm.com> Mon Nov 09 20:44:12 2020 +0100
committer GitHub <noreply@github.com> Mon Nov 09 20:44:12 2020 +0100
tree 0cf8828ad5e52c2f8562a220cfe6429bd2fe498d
parent 22c4385e255a85e7e88b646f4656279fdb636c5b
parent 13b8a267303af716bb05ab20c900c90677c7fa7c

Merge pull request #3863 from gabor-mezei-arm/3818_bp216_MBEDTLS_AES_SETKEY_DEC_ALT_excludes_MBEDTLS_CIPHER_MODE_XTS

[Backport 2.16] Make the aes xts methods independent from MBEDTLS_AES_SETKEY_DEC_ALT

library/aes.c

diff --git a/library/aes.c b/library/aes.c
index 183cedc..da0e5b6 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -760,6 +760,7 @@
 
     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,
@@ -838,8 +839,6 @@
 }
 #endif /* MBEDTLS_CIPHER_MODE_XTS */
 
-#endif /* !MBEDTLS_AES_SETKEY_DEC_ALT */
-
 #define AES_FROUND(X0,X1,X2,X3,Y0,Y1,Y2,Y3)                     \
     do                                                          \
     {                                                           \