commit d0d777e6bc2bb5eafa125e96f60ae7603f96aa09
author Gilles Peskine <Gilles.Peskine@arm.com> Thu Apr 14 00:06:33 2022 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Tue May 17 16:26:29 2022 +0200
tree e1c7db1a425e9c3b8c8777ff74e5a0ee778a04a3
parent d48874f6575a5f97f3e9dde97fd66a35b6bcb819

Separate the validation of the size macros and of the function

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

tests/suites/test_suite_psa_crypto.function

diff --git a/tests/suites/test_suite_psa_crypto.function b/tests/suites/test_suite_psa_crypto.function
index 41488f6..62d87cc 100644
--- a/tests/suites/test_suite_psa_crypto.function
+++ b/tests/suites/test_suite_psa_crypto.function
@@ -5107,6 +5107,10 @@
     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 @@
                                        &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;