mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-02-25 09:41:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make ecjpake_do_round() return void and use TEST_ASSERT with a descriptive text instead of returning a value

Browse Source 
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
This commit is contained in:
Neil Armstrong 2022-09-05 18:08:13 +02:00
parent 51009d7297
commit 78c4e8e9cb
1 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
tests/suites/test_suite_psa_crypto.function
View File

@ -706,11 +706,11 @@ exit:
}
#if defined(PSA_WANT_ALG_JPAKE)
static int ecjpake_do_round( psa_algorithm_t alg, unsigned int primitive,
psa_pake_operation_t *server,
psa_pake_operation_t *client,
int client_input_first,
int round, int inject_error )
static void ecjpake_do_round( psa_algorithm_t alg, unsigned int primitive,
psa_pake_operation_t *server,
psa_pake_operation_t *client,
int client_input_first,
int round, int inject_error )
{
unsigned char *buffer0 = NULL, *buffer1 = NULL;
size_t buffer_length = (
@ -733,7 +733,6 @@ static int ecjpake_do_round( psa_algorithm_t alg, unsigned int primitive,
size_t c_x1_pr_off, c_x2_pr_off, c_x2s_pr_off;
psa_status_t expected_status = PSA_SUCCESS;
psa_status_t status;
int ret = 0;
ASSERT_ALLOC( buffer0, buffer_length );
ASSERT_ALLOC( buffer1, buffer_length );
@ -868,9 +867,9 @@ static int ecjpake_do_round( psa_algorithm_t alg, unsigned int primitive,
TEST_EQUAL( status, PSA_SUCCESS );
}
/* Error didn't trigger, exit with error */
/* Error didn't trigger, make test fail */
if( inject_error == 1 )
goto exit;
TEST_ASSERT( ! "One of the last psa_pake_input() calls should have returned the expected error." );
}
/* Client first round Output */
@ -985,9 +984,9 @@ static int ecjpake_do_round( psa_algorithm_t alg, unsigned int primitive,
TEST_EQUAL( status, PSA_SUCCESS );
}
/* Error didn't trigger, exit with error */
/* Error didn't trigger, make test fail */
if( inject_error == 1 )
goto exit;
TEST_ASSERT( ! "One of the last psa_pake_input() calls should have returned the expected error." );
}
if( inject_error == 2 )
@ -1070,9 +1069,9 @@ static int ecjpake_do_round( psa_algorithm_t alg, unsigned int primitive,
TEST_EQUAL( status, PSA_SUCCESS );
}
/* Error didn't trigger, exit with error */
/* Error didn't trigger, make test fail */
if( inject_error == 2 )
goto exit;
TEST_ASSERT( ! "One of the last psa_pake_input() calls should have returned the expected error." );
break;
@ -1143,9 +1142,9 @@ static int ecjpake_do_round( psa_algorithm_t alg, unsigned int primitive,
TEST_EQUAL( status, PSA_SUCCESS );
}
/* Error didn't trigger, exit with error */
/* Error didn't trigger, make test fail */
if( inject_error == 3 )
goto exit;
TEST_ASSERT( ! "One of the last psa_pake_input() calls should have returned the expected error." );
}
/* Client second round Output */
@ -1208,9 +1207,9 @@ static int ecjpake_do_round( psa_algorithm_t alg, unsigned int primitive,
TEST_EQUAL( status, PSA_SUCCESS );
}
/* Error didn't trigger, exit with error */
/* Error didn't trigger, make test fail */
if( inject_error == 3 )
goto exit;
TEST_ASSERT( ! "One of the last psa_pake_input() calls should have returned the expected error." );
}
if( inject_error == 4 )
@ -1256,20 +1255,17 @@ static int ecjpake_do_round( psa_algorithm_t alg, unsigned int primitive,
TEST_EQUAL( status, PSA_SUCCESS );
}
/* Error didn't trigger, exit with error */
/* Error didn't trigger, make test fail */
if( inject_error == 4 )
goto exit;
TEST_ASSERT( ! "One of the last psa_pake_input() calls should have returned the expected error." );
break;
}
ret = 1;
exit:
mbedtls_free( buffer0 );
mbedtls_free( buffer1 );
return( ret );
}
#endif /* PSA_WANT_ALG_JPAKE */
@ -8868,16 +8864,14 @@ void ecjpake_rounds_inject( int alg_arg, int primitive_arg, int hash_arg,
PSA_ASSERT( psa_pake_set_password_key( &server, key ) );
PSA_ASSERT( psa_pake_set_password_key( &client, key ) );
TEST_EQUAL( ecjpake_do_round( alg, primitive_arg, &server, &client,
client_input_first, 1,
inject_error ), 1 );
ecjpake_do_round( alg, primitive_arg, &server, &client,
client_input_first, 1, inject_error );
if( inject_error == 1 || inject_error == 2 )
goto exit;
TEST_EQUAL( ecjpake_do_round( alg, primitive_arg, &server, &client,
client_input_first, 2,
inject_error ), 1 );
ecjpake_do_round( alg, primitive_arg, &server, &client,
client_input_first, 2, inject_error );
exit:
psa_destroy_key( key );
@ -8947,8 +8941,8 @@ void ecjpake_rounds( int alg_arg, int primitive_arg, int hash_arg,
PSA_ERROR_BAD_STATE );
/* First round */
TEST_EQUAL( ecjpake_do_round( alg, primitive_arg, &server, &client,
client_input_first, 1, 0 ), 1 );
ecjpake_do_round( alg, primitive_arg, &server, &client,
client_input_first, 1, 0 );
TEST_EQUAL( psa_pake_get_implicit_key( &server, &server_derive ),
PSA_ERROR_BAD_STATE );
@ -8956,8 +8950,8 @@ void ecjpake_rounds( int alg_arg, int primitive_arg, int hash_arg,
PSA_ERROR_BAD_STATE );
/* Second round */
TEST_EQUAL( ecjpake_do_round( alg, primitive_arg, &server, &client,
client_input_first, 2, 0 ), 1 );
ecjpake_do_round( alg, primitive_arg, &server, &client,
client_input_first, 2, 0 );
PSA_ASSERT( psa_pake_get_implicit_key( &server, &server_derive ) );
PSA_ASSERT( psa_pake_get_implicit_key( &client, &client_derive ) );