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

fix condition over key type

Browse source
This commit is contained in:
mohammad1603 2018-05-09 04:58:32 -07:00 committed by itayzafrir
parent 17638efc46
commit e58e68458e
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
library/psa_crypto.c
View file

@ -1488,7 +1488,7 @@ psa_status_t psa_aead_encrypt( psa_key_slot_t key,
size_t key_bits; size_t key_bits;
unsigned char tag[16]; unsigned char tag[16];
mbedtls_cipher_id_t cipher_id; mbedtls_cipher_id_t cipher_id;
if( ciphertext_size < ( plaintext_length + sizeof( tag ) ) ) if( ciphertext_size < ( plaintext_length + sizeof( tag ) ) )
return( PSA_ERROR_INVALID_ARGUMENT ); return( PSA_ERROR_INVALID_ARGUMENT );
@ -1508,9 +1508,8 @@ psa_status_t psa_aead_encrypt( psa_key_slot_t key,
//TODO: check key policy //TODO: check key policy
if ( !( ( key_type & PSA_KEY_TYPE_CATEGORY_MASK ) == PSA_KEY_TYPE_CATEGORY_CIPHER
if ( ( key_type & PSA_KEY_TYPE_CATEGORY_MASK ) == PSA_KEY_TYPE_CATEGORY_CIPHER && PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type ) == 16 ) )
&& PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type ) == 16 )
return( PSA_ERROR_INVALID_ARGUMENT ); return( PSA_ERROR_INVALID_ARGUMENT );
if( alg == PSA_ALG_GCM ) if( alg == PSA_ALG_GCM )
@ -1609,9 +1608,8 @@ psa_status_t psa_aead_decrypt( psa_key_slot_t key,
//TODO: check key policy //TODO: check key policy
if ( !( ( key_type & PSA_KEY_TYPE_CATEGORY_MASK ) == PSA_KEY_TYPE_CATEGORY_CIPHER
if ( ( key_type & PSA_KEY_TYPE_CATEGORY_MASK ) == PSA_KEY_TYPE_CATEGORY_CIPHER && PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type ) == 16 ) )
&& PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type ) == 16 )
return( PSA_ERROR_INVALID_ARGUMENT ); return( PSA_ERROR_INVALID_ARGUMENT );
if( alg == PSA_ALG_GCM ) if( alg == PSA_ALG_GCM )