fix PSA_BLOCK_CIPHER_BLOCK_SIZE() argument in test code

This commit is contained in:
Mohammad AboMokh 2018-06-28 01:52:54 -07:00 committed by itayzafrir
parent 1f6643b20e
commit adb9b2372b

View file

@ -108,9 +108,9 @@ static int exercise_cipher_key( psa_key_slot_t key,
if( usage & PSA_KEY_USAGE_DECRYPT ) if( usage & PSA_KEY_USAGE_DECRYPT )
{ {
psa_status_t status; psa_status_t status;
psa_key_type_t type = PSA_KEY_TYPE_NONE;
if( ! ( usage & PSA_KEY_USAGE_ENCRYPT ) ) if( ! ( usage & PSA_KEY_USAGE_ENCRYPT ) )
{ {
psa_key_type_t type;
size_t bits; size_t bits;
TEST_ASSERT( psa_get_key_information( key, &type, &bits ) ); TEST_ASSERT( psa_get_key_information( key, &type, &bits ) );
iv_length = PSA_BLOCK_CIPHER_BLOCK_SIZE( type ); iv_length = PSA_BLOCK_CIPHER_BLOCK_SIZE( type );
@ -130,7 +130,7 @@ static int exercise_cipher_key( psa_key_slot_t key,
* if the input is some aribtrary data rather than an actual * if the input is some aribtrary data rather than an actual
ciphertext, a padding error is likely. */ ciphertext, a padding error is likely. */
if( ( usage & PSA_KEY_USAGE_DECRYPT ) || if( ( usage & PSA_KEY_USAGE_DECRYPT ) ||
PSA_BLOCK_CIPHER_BLOCK_SIZE( alg ) == 1 ) PSA_BLOCK_CIPHER_BLOCK_SIZE( type ) == 1 )
TEST_ASSERT( status == PSA_SUCCESS ); TEST_ASSERT( status == PSA_SUCCESS );
else else
TEST_ASSERT( status == PSA_SUCCESS || TEST_ASSERT( status == PSA_SUCCESS ||