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
This commit is contained in:
Gilles Peskine 2020-11-09 20:44:08 +01:00 committed by GitHub
commit cac5536b45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -730,6 +730,7 @@ exit:
return( ret ); return( ret );
} }
#endif /* !MBEDTLS_AES_SETKEY_DEC_ALT */
#if defined(MBEDTLS_CIPHER_MODE_XTS) #if defined(MBEDTLS_CIPHER_MODE_XTS)
static int mbedtls_aes_xts_decode_keys( const unsigned char *key, static int mbedtls_aes_xts_decode_keys( const unsigned char *key,
@ -808,8 +809,6 @@ int mbedtls_aes_xts_setkey_dec( mbedtls_aes_xts_context *ctx,
} }
#endif /* MBEDTLS_CIPHER_MODE_XTS */ #endif /* MBEDTLS_CIPHER_MODE_XTS */
#endif /* !MBEDTLS_AES_SETKEY_DEC_ALT */
#define AES_FROUND(X0,X1,X2,X3,Y0,Y1,Y2,Y3) \ #define AES_FROUND(X0,X1,X2,X3,Y0,Y1,Y2,Y3) \
do \ do \
{ \ { \