From 8a10f666923ee7e43cbfbc11243088bd7bb97e61 Mon Sep 17 00:00:00 2001
From: Nick Child <nick.child@ibm.com>
Date: Mon, 6 Jun 2022 12:18:40 -0500
Subject: [PATCH] test/pkcs7: Add init for PSA tests

Initialize the PSA subsystem in the test functions.

Signed-off-by: Nick Child <nick.child@ibm.com>
---
 tests/suites/test_suite_pkcs7.function | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/suites/test_suite_pkcs7.function b/tests/suites/test_suite_pkcs7.function
index 8b35c57559..01edadb5ff 100644
--- a/tests/suites/test_suite_pkcs7.function
+++ b/tests/suites/test_suite_pkcs7.function
@@ -200,6 +200,8 @@ void pkcs7_verify( char *pkcs7_file, char *crt, char *filetobesigned )
     mbedtls_pkcs7 pkcs7;
     mbedtls_x509_crt x509;
 
+    USE_PSA_INIT();
+
     mbedtls_pkcs7_init( &pkcs7 );
     mbedtls_x509_crt_init( &x509 );
 
@@ -233,6 +235,7 @@ exit:
     mbedtls_x509_crt_free( &x509 );
     mbedtls_free( data );
     mbedtls_pkcs7_free( &pkcs7 );
+    USE_PSA_DONE();
 }
 /* END_CASE */
 
@@ -253,6 +256,8 @@ void pkcs7_verify_hash( char *pkcs7_file, char *crt, char *filetobesigned )
     mbedtls_pkcs7 pkcs7;
     mbedtls_x509_crt x509;
 
+    USE_PSA_INIT();
+
     mbedtls_pkcs7_init( &pkcs7 );
     mbedtls_x509_crt_init( &x509 );
 
@@ -296,6 +301,7 @@ exit:
     mbedtls_free( data );
     mbedtls_pkcs7_free( &pkcs7 );
     mbedtls_free( pkcs7_buf );
+    USE_PSA_DONE();
 }
 /* END_CASE */
 
@@ -313,6 +319,8 @@ void pkcs7_verify_badcert( char *pkcs7_file, char *crt, char *filetobesigned )
     mbedtls_pkcs7 pkcs7;
     mbedtls_x509_crt x509;
 
+    USE_PSA_INIT();
+
     mbedtls_pkcs7_init( &pkcs7 );
     mbedtls_x509_crt_init( &x509 );
 
@@ -346,6 +354,7 @@ exit:
     mbedtls_free( data );
     mbedtls_pkcs7_free( &pkcs7 );
     mbedtls_free( pkcs7_buf );
+    USE_PSA_DONE();
 }
 /* END_CASE */
 
@@ -363,6 +372,8 @@ void pkcs7_verify_tampered_data( char *pkcs7_file, char *crt, char *filetobesign
     mbedtls_pkcs7 pkcs7;
     mbedtls_x509_crt x509;
 
+    USE_PSA_INIT();
+
     mbedtls_pkcs7_init( &pkcs7 );
     mbedtls_x509_crt_init( &x509 );
 
@@ -396,6 +407,7 @@ exit:
     mbedtls_pkcs7_free( &pkcs7 );
     mbedtls_free( data );
     mbedtls_free( pkcs7_buf );
+    USE_PSA_DONE();
 }
 /* END_CASE */