mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-09-05 14:24:02 +03:00
Separate the validation of the size macros and of the function
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
@@ -5107,6 +5107,10 @@ void raw_key_agreement( int alg_arg,
|
|||||||
key_bits = psa_get_key_bits( &attributes );
|
key_bits = psa_get_key_bits( &attributes );
|
||||||
|
|
||||||
/* Validate size macros */
|
/* Validate size macros */
|
||||||
|
TEST_ASSERT( expected_output->len <=
|
||||||
|
PSA_RAW_KEY_AGREEMENT_OUTPUT_SIZE( our_key_type, key_bits ) );
|
||||||
|
TEST_ASSERT( PSA_RAW_KEY_AGREEMENT_OUTPUT_SIZE( our_key_type, key_bits ) <=
|
||||||
|
PSA_RAW_KEY_AGREEMENT_OUTPUT_MAX_SIZE );
|
||||||
|
|
||||||
/* Good case with exact output size */
|
/* Good case with exact output size */
|
||||||
ASSERT_ALLOC( output, expected_output->len );
|
ASSERT_ALLOC( output, expected_output->len );
|
||||||
@@ -5116,10 +5120,6 @@ void raw_key_agreement( int alg_arg,
|
|||||||
&output_length ) );
|
&output_length ) );
|
||||||
ASSERT_COMPARE( output, output_length,
|
ASSERT_COMPARE( output, output_length,
|
||||||
expected_output->x, expected_output->len );
|
expected_output->x, expected_output->len );
|
||||||
TEST_ASSERT( output_length <=
|
|
||||||
PSA_RAW_KEY_AGREEMENT_OUTPUT_SIZE( our_key_type, key_bits ) );
|
|
||||||
TEST_ASSERT( PSA_RAW_KEY_AGREEMENT_OUTPUT_SIZE( our_key_type, key_bits ) <=
|
|
||||||
PSA_RAW_KEY_AGREEMENT_OUTPUT_MAX_SIZE );
|
|
||||||
mbedtls_free( output );
|
mbedtls_free( output );
|
||||||
output = NULL;
|
output = NULL;
|
||||||
output_length = ~0;
|
output_length = ~0;
|
||||||
|
Reference in New Issue
Block a user