lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00
Code Activity

Favor INVALID_ARGUMENT over NOT_SUPPORTED for bad algorithm types

Browse Source 
In psa_hash_start, psa_mac_start and psa_cipher_setup, return
PSA_ERROR_INVALID_ARGUMENT rather than PSA_ERROR_NOT_SUPPORTED when
the algorithm parameter is not the right category.
This commit is contained in:
Gilles Peskine
2018-06-20 16:21:04 +02:00
committed by itayzafrir
parent 248051acb6
commit c06e07128c
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
library/psa_crypto.c
View File

@ -865,7 +865,9 @@ psa_status_t psa_hash_start( psa_hash_operation_t *operation,
break;
#endif
default:
return( PSA_ERROR_NOT_SUPPORTED );
return( PSA_ALG_IS_HASH( alg ) ?
PSA_ERROR_NOT_SUPPORTED :
PSA_ERROR_INVALID_ARGUMENT );
}
if( ret == 0 )
operation->alg = alg;
@ -1166,7 +1168,8 @@ static psa_status_t psa_mac_init( psa_mac_operation_t *operation,
else
#endif /* MBEDTLS_MD_C */
{
/* fall through with NOT_SUPPORTED */
if( ! PSA_ALG_IS_MAC( alg ) )
status = PSA_ERROR_INVALID_ARGUMENT;
}
if( status != PSA_SUCCESS )
@ -1910,6 +1913,12 @@ psa_status_t psa_asymmetric_decrypt( psa_key_slot_t key,
static psa_status_t psa_cipher_init( psa_cipher_operation_t *operation,
psa_algorithm_t alg )
{
if( ! PSA_ALG_IS_CIPHER( alg ) )
{
memset( operation, 0, sizeof( *operation ) );
return( PSA_ERROR_INVALID_ARGUMENT );
}
operation->alg = alg;
operation->key_set = 0;
operation->iv_set = 0;