yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add fallback when rk unaligned with padlock

Browse source 
Signed-off-by: Werner Lewis <werner.lewis@arm.com>
This commit is contained in:
Werner Lewis 2022-07-05 11:55:15 +01:00
parent ec0193d019
commit c1999d5746
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
library/padlock.c
View file

@ -82,7 +82,11 @@ int mbedtls_padlock_xcryptecb( mbedtls_aes_context *ctx,
uint32_t *ctrl; uint32_t *ctrl;
unsigned char buf[256]; unsigned char buf[256];
rk = ctx->buf + ctx->rk_offset; rk = ctx->buf + ctx->rk_offset;
if( ( (long) rk & 15 ) != 0 )
return( MBEDTLS_ERR_PADLOCK_DATA_MISALIGNED );
blk = MBEDTLS_PADLOCK_ALIGN16( buf ); blk = MBEDTLS_PADLOCK_ALIGN16( buf );
memcpy( blk, input, 16 ); memcpy( blk, input, 16 );
@ -125,11 +129,13 @@ int mbedtls_padlock_xcryptcbc( mbedtls_aes_context *ctx,
uint32_t *ctrl; uint32_t *ctrl;
unsigned char buf[256]; unsigned char buf[256];
rk = ctx->buf + ctx->rk_offset;
if( ( (long) input & 15 ) != 0 || if( ( (long) input & 15 ) != 0 ||
( (long) output & 15 ) != 0 ) ( (long) output & 15 ) != 0 ||
( (long) rk & 15 ) != 0 )
return( MBEDTLS_ERR_PADLOCK_DATA_MISALIGNED ); return( MBEDTLS_ERR_PADLOCK_DATA_MISALIGNED );
rk = ctx->buf + ctx->rk_offset;
iw = MBEDTLS_PADLOCK_ALIGN16( buf ); iw = MBEDTLS_PADLOCK_ALIGN16( buf );
memcpy( iw, iv, 16 ); memcpy( iw, iv, 16 );