mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-25 04:43:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4469 from xiaoxiang781216/padlock

Browse Source 
aes: Check aes_padlock_ace > 0 before calling padlock
This commit is contained in:
Ronald Cron 2021-05-28 11:06:40 +02:00 committed by GitHub
commit f1eb425782
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/aes.c
View File

@ -1005,7 +1005,7 @@ int mbedtls_aes_crypt_ecb( mbedtls_aes_context *ctx,
#endif #endif
#if defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_HAVE_X86) #if defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_HAVE_X86)
if( aes_padlock_ace ) if( aes_padlock_ace > 0)
{ {
if( mbedtls_padlock_xcryptecb( ctx, mode, input, output ) == 0 ) if( mbedtls_padlock_xcryptecb( ctx, mode, input, output ) == 0 )
return( 0 ); return( 0 );
@ -1047,7 +1047,7 @@ int mbedtls_aes_crypt_cbc( mbedtls_aes_context *ctx,
return( MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH ); return( MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH );
#if defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_HAVE_X86) #if defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_HAVE_X86)
if( aes_padlock_ace ) if( aes_padlock_ace > 0 )
{ {
if( mbedtls_padlock_xcryptcbc( ctx, mode, length, iv, input, output ) == 0 ) if( mbedtls_padlock_xcryptcbc( ctx, mode, length, iv, input, output ) == 0 )
return( 0 ); return( 0 );