commit 26909f348f142aa9be55e5a6c4725821956b1eec
author Andrzej Kurek <Andrzej.Kurek@arm.com> Wed Aug 31 15:10:50 2022 -0400
committer Andrzej Kurek <Andrzej.Kurek@arm.com> Fri Sep 02 04:05:37 2022 -0400
tree ccc94aba3eed378e04a38bd0e59c32303e883bab
parent a57267c758b4db66576a8ce687e25b26bab4b6d3

Add PSA initialization and teardown to tests using pkcs5

If PSA is defined and there is no MD - an initialization
is required.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>

tests/suites/test_suite_pkcs5.function

diff --git a/tests/suites/test_suite_pkcs5.function b/tests/suites/test_suite_pkcs5.function
index d00d94f..e2347cc 100644
--- a/tests/suites/test_suite_pkcs5.function
+++ b/tests/suites/test_suite_pkcs5.function
@@ -14,12 +14,14 @@
 {
     unsigned char key[100];
 
+    PSA_INIT();
     TEST_ASSERT( mbedtls_pkcs5_pbkdf2_hmac_ext( hash, pw_str->x, pw_str->len,
                                                 salt_str->x, salt_str->len,
                                                 it_cnt, key_len, key ) == 0 );
 
     TEST_ASSERT( mbedtls_test_hexcmp( key, result_key_string->x,
                                       key_len, result_key_string->len ) == 0 );
+    PSA_DONE();
 }
 /* END_CASE */
 
@@ -31,6 +33,8 @@
     mbedtls_asn1_buf params;
     unsigned char *my_out = NULL;
 
+    PSA_INIT();
+
     params.tag = params_tag;
     params.p = params_hex->x;
     params.len = params_hex->len;
@@ -46,6 +50,7 @@
 
 exit:
     mbedtls_free( my_out );
+    PSA_DONE();
 }
 /* END_CASE */
 

tests/suites/test_suite_pkparse.function

diff --git a/tests/suites/test_suite_pkparse.function b/tests/suites/test_suite_pkparse.function
index 0a77988..1e003b9 100644
--- a/tests/suites/test_suite_pkparse.function
+++ b/tests/suites/test_suite_pkparse.function
@@ -17,6 +17,7 @@
     int res;
     char *pwd = password;
 
+    PSA_INIT();
     mbedtls_pk_init( &ctx );
 
     if( strcmp( pwd, "NULL" ) == 0 )
@@ -37,6 +38,7 @@
 
 exit:
     mbedtls_pk_free( &ctx );
+    PSA_DONE();
 }
 /* END_CASE */
 
@@ -46,6 +48,7 @@
     mbedtls_pk_context ctx;
     int res;
 
+    PSA_INIT();
     mbedtls_pk_init( &ctx );
 
     res = mbedtls_pk_parse_public_keyfile( &ctx, key_file );
@@ -62,6 +65,7 @@
 
 exit:
     mbedtls_pk_free( &ctx );
+    PSA_DONE();
 }
 /* END_CASE */