commit cac5536b4545f5affadb461254ff15bccf176083
author Gilles Peskine <gilles.peskine@arm.com> Mon Nov 09 20:44:08 2020 +0100
committer GitHub <noreply@github.com> Mon Nov 09 20:44:08 2020 +0100
tree ecd3900fafa3410181724b26b58800fd3e46e793
parent e3994d72690e1cc27a6efed8754e204effc33e49
parent 95db3012c8d97b3ca7ff848ff4c9c1a30a7c8de7

Merge pull request #3823 from gabor-mezei-arm/3818_MBEDTLS_AES_SETKEY_DEC_ALT_excludes_MBEDTLS_CIPHER_MODE_XTS

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 8b54e7e..3f61642 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -730,6 +730,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,
@@ -808,8 +809,6 @@
 }
 #endif /* MBEDTLS_CIPHER_MODE_XTS */
 
-#endif /* !MBEDTLS_AES_SETKEY_DEC_ALT */
-
 #define AES_FROUND(X0,X1,X2,X3,Y0,Y1,Y2,Y3)                     \
     do                                                          \
     {                                                           \