From d0d777e6bc2bb5eafa125e96f60ae7603f96aa09 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Thu, 14 Apr 2022 00:06:33 +0200 Subject: [PATCH] Separate the validation of the size macros and of the function Signed-off-by: Gilles Peskine --- tests/suites/test_suite_psa_crypto.function | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/suites/test_suite_psa_crypto.function b/tests/suites/test_suite_psa_crypto.function index 41488f623..62d87ccbc 100644 --- a/tests/suites/test_suite_psa_crypto.function +++ b/tests/suites/test_suite_psa_crypto.function @@ -5107,6 +5107,10 @@ void raw_key_agreement( int alg_arg, key_bits = psa_get_key_bits( &attributes ); /* 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 */ ASSERT_ALLOC( output, expected_output->len ); @@ -5116,10 +5120,6 @@ void raw_key_agreement( int alg_arg, &output_length ) ); ASSERT_COMPARE( output, output_length, 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 ); output = NULL; output_length = ~0;