Fix _arg argument not being cast to correct type

Also change to TEST_EQUAL, as this is now possible.

Signed-off-by: Paul Elliott <paul.elliott@arm.com>
This commit is contained in:
Paul Elliott 2021-07-23 17:40:41 +01:00
parent 56e4aa6ae2
commit 693bf312d9

View file

@ -3685,6 +3685,7 @@ void aead_multipart_generate_nonce( int key_type_arg, data_t *key_data,
uint8_t nonce_buffer[PSA_AEAD_NONCE_MAX_SIZE];
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
psa_status_t status = PSA_ERROR_GENERIC_ERROR;
psa_status_t expected_status = expected_status_arg;
size_t nonce_generated_len = 0;
size_t expected_generated_len = expected_generated_len_arg;
unsigned char *output_data = NULL;
@ -3735,13 +3736,13 @@ void aead_multipart_generate_nonce( int key_type_arg, data_t *key_data,
nonce_len,
&nonce_generated_len );
TEST_ASSERT( status == expected_status_arg );
TEST_EQUAL( status, expected_status );
TEST_EQUAL( nonce_generated_len, expected_generated_len );
TEST_ASSERT( nonce_generated_len < PSA_AEAD_NONCE_MAX_SIZE );
if( expected_status_arg == PSA_SUCCESS )
if( expected_status == PSA_SUCCESS )
{
/* Ensure we can still complete operation. */
@ -3837,7 +3838,7 @@ void aead_multipart_set_nonce( int key_type_arg, data_t *key_data,
status = psa_aead_set_nonce( &operation, nonce_buffer, nonce_len );
TEST_ASSERT( status == expected_status );
TEST_EQUAL( status, expected_status );
if( expected_status == PSA_SUCCESS )
{