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

Error out if a driver tries to store more than ITS can handle

Browse source 
Cast explicitly for the sake of MSVC which otherwise (usefully!) warns
about the truncation.
This commit is contained in:
Gilles Peskine 2019-07-23 19:59:23 +02:00
parent 831ac72338
commit 573bbc1b4e
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
library/psa_crypto_se.c
View file

@ -127,6 +127,13 @@ static psa_status_t psa_get_se_driver_its_file_uid(
{ {
if( driver->lifetime > PSA_MAX_SE_LIFETIME ) if( driver->lifetime > PSA_MAX_SE_LIFETIME )
return( PSA_ERROR_NOT_SUPPORTED ); return( PSA_ERROR_NOT_SUPPORTED );
#if SIZE_MAX > UINT32_MAX
/* ITS file sizes are limited to 32 bits. */
if( driver->internal.persistent_data_size > UINT32_MAX )
return( PSA_ERROR_NOT_SUPPORTED );
#endif
*uid = PSA_CRYPTO_SE_DRIVER_ITS_UID_BASE + driver->lifetime; *uid = PSA_CRYPTO_SE_DRIVER_ITS_UID_BASE + driver->lifetime;
return( PSA_SUCCESS ); return( PSA_SUCCESS );
} }
@ -141,7 +148,8 @@ psa_status_t psa_load_se_persistent_data(
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( status ); return( status );
return( psa_its_get( uid, 0, driver->internal.persistent_data_size, return( psa_its_get( uid, 0,
(uint32_t) driver->internal.persistent_data_size,
driver->internal.persistent_data ) ); driver->internal.persistent_data ) );
} }
@ -155,7 +163,8 @@ psa_status_t psa_save_se_persistent_data(
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( status ); return( status );
return( psa_its_set( uid, driver->internal.persistent_data_size, return( psa_its_set( uid,
(uint32_t) driver->internal.persistent_data_size,
driver->internal.persistent_data, driver->internal.persistent_data,
0 ) ); 0 ) );
} }