commit 892c4aa295f84e8c0b4acccf2b89538b75a56c0f
author Gabor Mezei <gabor.mezei@arm.com> Mon Mar 21 12:21:43 2022 +0100
committer Gabor Mezei <gabor.mezei@arm.com> Mon Mar 21 17:00:54 2022 +0100
tree 7a9039c007cea50fda3c49136b45f3f906502657
parent 1bf075fffd15ea852928a541b605f0a4dd940a68

Update hkdf test cases to handle PSA code

Signed-off-by: Gabor Mezei <gabor.mezei@arm.com>

tests/suites/test_suite_ssl.function

diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index 855cfc7..2e0f95b 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -4062,6 +4062,8 @@
     TEST_ASSERT( (size_t) desired_length <= sizeof(dst) );
     TEST_ASSERT( (size_t) desired_length == expected->len );
 
+    USE_PSA_INIT( );
+
     TEST_ASSERT( mbedtls_ssl_tls13_hkdf_expand_label(
                       (mbedtls_md_type_t) hash_alg,
                       secret->x, secret->len,
@@ -4071,6 +4073,8 @@
 
     ASSERT_COMPARE( dst, (size_t) desired_length,
                     expected->x, (size_t) expected->len );
+
+    USE_PSA_DONE( );
 }
 /* END_CASE */
 
@@ -4094,6 +4098,8 @@
     TEST_ASSERT( expected_client_write_key->len == expected_server_write_key->len &&
                  expected_client_write_key->len == (size_t) desired_key_len );
 
+    USE_PSA_INIT( );
+
     TEST_ASSERT( mbedtls_ssl_tls13_make_traffic_keys(
                      (mbedtls_md_type_t) hash_alg,
                      client_secret->x,
@@ -4118,6 +4124,8 @@
                     keys.iv_len,
                     expected_server_write_iv->x,
                     (size_t) desired_iv_len );
+
+    USE_PSA_DONE( );
 }
 /* END_CASE */
 
@@ -4148,6 +4156,8 @@
     TEST_ASSERT( (size_t) desired_length <= sizeof(dst) );
     TEST_ASSERT( (size_t) desired_length == expected->len );
 
+    USE_PSA_INIT( );
+
     TEST_ASSERT( mbedtls_ssl_tls13_derive_secret(
                       (mbedtls_md_type_t) hash_alg,
                       secret->x, secret->len,
@@ -4158,6 +4168,8 @@
 
     ASSERT_COMPARE( dst, desired_length,
                     expected->x, desired_length );
+
+    USE_PSA_DONE( );
 }
 /* END_CASE */
 
@@ -4180,6 +4192,8 @@
                  traffic_expected->len == md_size  &&
                  exporter_expected->len == md_size );
 
+    USE_PSA_INIT( );
+
     TEST_ASSERT( mbedtls_ssl_tls13_derive_early_secrets(
                      md_type, secret->x, transcript->x, transcript->len,
                      &secrets ) == 0 );
@@ -4188,6 +4202,8 @@
                     traffic_expected->x, traffic_expected->len );
     ASSERT_COMPARE( secrets.early_exporter_master_secret, md_size,
                     exporter_expected->x, exporter_expected->len );
+
+    USE_PSA_DONE( );
 }
 /* END_CASE */
 
@@ -4210,6 +4226,8 @@
                  client_expected->len == md_size   &&
                  server_expected->len == md_size );
 
+    USE_PSA_INIT( );
+
     TEST_ASSERT( mbedtls_ssl_tls13_derive_handshake_secrets(
                      md_type, secret->x, transcript->x, transcript->len,
                      &secrets ) == 0 );
@@ -4218,6 +4236,8 @@
                     client_expected->x, client_expected->len );
     ASSERT_COMPARE( secrets.server_handshake_traffic_secret, md_size,
                     server_expected->x, server_expected->len );
+
+    USE_PSA_DONE( );
 }
 /* END_CASE */
 
@@ -4242,6 +4262,8 @@
                  server_expected->len == md_size   &&
                  exporter_expected->len == md_size );
 
+    USE_PSA_INIT( );
+
     TEST_ASSERT( mbedtls_ssl_tls13_derive_application_secrets(
                      md_type, secret->x, transcript->x, transcript->len,
                      &secrets ) == 0 );
@@ -4252,6 +4274,8 @@
                     server_expected->x, server_expected->len );
     ASSERT_COMPARE( secrets.exporter_master_secret, md_size,
                     exporter_expected->x, exporter_expected->len );
+
+    USE_PSA_DONE( );
 }
 /* END_CASE */
 
@@ -4272,12 +4296,16 @@
                  transcript->len == md_size          &&
                  resumption_expected->len == md_size );
 
+    USE_PSA_INIT( );
+
     TEST_ASSERT( mbedtls_ssl_tls13_derive_resumption_master_secret(
                      md_type, secret->x, transcript->x, transcript->len,
                      &secrets ) == 0 );
 
     ASSERT_COMPARE( secrets.resumption_master_secret, md_size,
                     resumption_expected->x, resumption_expected->len );
+
+    USE_PSA_DONE( );
 }
 /* END_CASE */
 
@@ -4298,6 +4326,8 @@
                  transcript->len == md_size      &&
                  binder_expected->len == md_size );
 
+    USE_PSA_INIT( );
+
     TEST_ASSERT( mbedtls_ssl_tls13_create_psk_binder(
                      NULL, /* SSL context for debugging only */
                      md_type,
@@ -4308,6 +4338,8 @@
 
     ASSERT_COMPARE( binder, md_size,
                     binder_expected->x, binder_expected->len );
+
+    USE_PSA_DONE( );
 }
 /* END_CASE */
 
@@ -4420,6 +4452,8 @@
 {
     unsigned char secret_new[ MBEDTLS_MD_MAX_SIZE ];
 
+    USE_PSA_INIT();
+
     TEST_ASSERT( mbedtls_ssl_tls13_evolve_secret(
                       (mbedtls_md_type_t) hash_alg,
                       secret->len ? secret->x : NULL,
@@ -4428,6 +4462,8 @@
 
     ASSERT_COMPARE( secret_new, (size_t) expected->len,
                     expected->x, (size_t) expected->len );
+
+    USE_PSA_DONE();
 }
 /* END_CASE */