commit 3da3c0a0009dca7abd26c387d1754f8c56a431e6
author Gilles Peskine <Gilles.Peskine@arm.com> Tue Jan 30 10:22:29 2024 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> Tue Jan 30 10:22:29 2024 +0100
tree d34cc4ec85d14587c8df99e0dfca78c2cbb9345d
parent f8c2cd14896d0047926a3e242896ece3b580c0b1

Always call psa_crypto_init when testing mbedtls_pk_get_psa_attributes

mbedtls_pk_get_psa_attributes() actually works without having initialized
the PSA subsystem, because it doesn't call any non-client PSA API functions.
But the function is only useful in conjunction with the PSA API: it's
meant to be followed by importing a key with the resulting attributes. We
don't advertize it to work without an up-and-running PSA subsystem, and
there's no need to test it without an up-and-running PSA subsystem as we
were (accidentally) doing.

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

tests/suites/test_suite_pk.function

diff --git a/tests/suites/test_suite_pk.function b/tests/suites/test_suite_pk.function
index 23a7b25..225ead4 100644
--- a/tests/suites/test_suite_pk.function
+++ b/tests/suites/test_suite_pk.function
@@ -1711,7 +1711,7 @@
     psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
     psa_key_usage_t usage = usage_arg;
 
-    MD_OR_USE_PSA_INIT();
+    PSA_INIT();
 
     psa_key_type_t expected_psa_type = 0;
     if (!pk_setup_for_type(pk_type, from_pair, &pk, &expected_psa_type)) {
@@ -1772,7 +1772,7 @@
 exit:
     mbedtls_pk_free(&pk);
     psa_reset_key_attributes(&attributes);
-    MD_OR_USE_PSA_DONE();
+    PSA_DONE();
 }
 /* END_CASE */
 
@@ -1786,7 +1786,7 @@
     psa_key_usage_t usage = usage_arg;
     psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
 
-    MD_OR_USE_PSA_INIT();
+    PSA_INIT();
 
     psa_key_type_t expected_psa_type = 0;
     if (!pk_setup_for_type(MBEDTLS_PK_RSA, from_pair, &pk, &expected_psa_type)) {
@@ -1833,7 +1833,7 @@
 exit:
     mbedtls_pk_free(&pk);
     psa_reset_key_attributes(&attributes);
-    MD_OR_USE_PSA_DONE();
+    PSA_DONE();
 }
 /* END_CASE */
 
@@ -1847,7 +1847,7 @@
     psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
     psa_key_usage_t usage = usage_arg;
 
-    MD_OR_USE_PSA_INIT();
+    PSA_INIT();
 
     psa_key_type_t expected_psa_type;
     if (!pk_setup_for_type(pk_type, from_pair, &pk, &expected_psa_type)) {
@@ -1860,7 +1860,7 @@
 exit:
     mbedtls_pk_free(&pk);
     psa_reset_key_attributes(&attributes);
-    MD_OR_USE_PSA_DONE();
+    PSA_DONE();
 }
 /* END_CASE */