change the check of block size for all supported algorithms

This commit is contained in:
mohammad1603 2018-06-03 15:10:47 +03:00 committed by itayzafrir
parent 0f21465175
commit 4fc744f8af

View File

@ -1509,8 +1509,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_SYMMETRIC
&& PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type ) == 16 ) ) && PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type ) == cipher_info->block_size ) )
return( PSA_ERROR_INVALID_ARGUMENT ); return( PSA_ERROR_INVALID_ARGUMENT );
if( alg == PSA_ALG_GCM ) if( alg == PSA_ALG_GCM )
@ -1633,8 +1633,8 @@ psa_status_t psa_aead_decrypt( psa_key_slot_t key,
return( PSA_ERROR_NOT_SUPPORTED ); return( PSA_ERROR_NOT_SUPPORTED );
//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_SYMMETRIC
&& PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type ) == 16 ) ) && PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type ) == cipher_info->block_size ) )
return( PSA_ERROR_INVALID_ARGUMENT ); return( PSA_ERROR_INVALID_ARGUMENT );
if( alg == PSA_ALG_GCM ) if( alg == PSA_ALG_GCM )