commit 3ec8ed8b512fcd573100859cbe519ec411cbb7d5
author Gilles Peskine <Gilles.Peskine@arm.com> Thu Oct 25 22:37:15 2018 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Wed Nov 14 21:15:37 2018 +0100
tree 307817a05810eadef4b8dae2e3e3598d554eb70f
parent bf49197c9bb1b8d5086d7ee9f39ccdd1ad74da18

Add multipart key agreement tests

Add test cases that do key agreement with raw selection in pieces, to
validate that selection works even when the application doesn't read
everything in one chunk.

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 a0f0381..bcd07c1 100644
--- a/tests/suites/test_suite_psa_crypto.function
+++ b/tests/suites/test_suite_psa_crypto.function
@@ -3867,16 +3867,17 @@
 void key_agreement_output( int alg_arg,
                            int our_key_type_arg, data_t *our_key_data,
                            data_t *peer_key_data,
-                           data_t *expected_output )
+                           data_t *expected_output1, data_t *expected_output2 )
 {
     psa_key_slot_t our_key = 1;
     psa_algorithm_t alg = alg_arg;
     psa_key_type_t our_key_type = our_key_type_arg;
     psa_crypto_generator_t generator = PSA_CRYPTO_GENERATOR_INIT;
     psa_key_policy_t policy;
-    uint8_t *actual_output = mbedtls_calloc( 1, expected_output->len );
+    uint8_t *actual_output = NULL;
 
-    TEST_ASSERT( actual_output != NULL );
+    ASSERT_ALLOC( actual_output, MAX( expected_output1->len,
+                                      expected_output2->len ) );
 
     TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
 
@@ -3892,11 +3893,21 @@
                                     peer_key_data->x, peer_key_data->len,
                                     alg ) == PSA_SUCCESS );
 
-    TEST_ASSERT( psa_generator_read( &generator,
-                                     actual_output,
-                                     expected_output->len ) == PSA_SUCCESS );
-    TEST_ASSERT( memcmp( actual_output, expected_output->x,
-                         expected_output->len ) == 0 );
+    TEST_ASSERT(
+        psa_generator_read( &generator,
+                            actual_output,
+                            expected_output1->len ) == PSA_SUCCESS );
+    TEST_ASSERT( memcmp( actual_output, expected_output1->x,
+                         expected_output1->len ) == 0 );
+    if( expected_output2->len != 0 )
+    {
+        TEST_ASSERT(
+            psa_generator_read( &generator,
+                                actual_output,
+                                expected_output2->len ) == PSA_SUCCESS );
+        TEST_ASSERT( memcmp( actual_output, expected_output2->x,
+                             expected_output2->len ) == 0 );
+    }
 
 exit:
     psa_generator_abort( &generator );