commit 9020426b14ab2a84d5f186d97cdf9ef524bf39e8
author Ben Taylor <ben.taylor@linaro.org> Mon Jun 09 11:51:28 2025 +0100
committer Ben Taylor <ben.taylor@linaro.org> Wed Jul 30 07:55:14 2025 +0100
tree f7a7357b8748df8173329418af8ace11f3225112
parent 0f21429af5422e764f5bba3e4e49e3cf5fcf0670

remove MBEDTLS_USE_PSA_CRYPTO from tests

Signed-off-by: Ben Taylor <ben.taylor@linaro.org>

tests/suites/test_suite_ssl.function

diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index 918edd5..c700803 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -3422,7 +3422,7 @@
 }
 /* END_CASE */
 
-/* BEGIN_CASE depends_on:MBEDTLS_SSL_HANDSHAKE_WITH_PSK_ENABLED:MBEDTLS_USE_PSA_CRYPTO */
+/* BEGIN_CASE depends_on:MBEDTLS_SSL_HANDSHAKE_WITH_PSK_ENABLED */
 void test_multiple_psks_opaque(int mode)
 {
     /*
@@ -3768,7 +3768,7 @@
 }
 /* END_CASE */
 
-/* BEGIN_CASE depends_on:MBEDTLS_PSA_CRYPTO_C:MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED:MBEDTLS_USE_PSA_CRYPTO:MBEDTLS_PKCS1_V15:MBEDTLS_SSL_PROTO_TLS1_2:PSA_WANT_ECC_SECP_R1_256:MBEDTLS_RSA_C:PSA_WANT_ECC_SECP_R1_384:PSA_HAVE_ALG_SOME_ECDSA:PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT */
+/* BEGIN_CASE depends_on:MBEDTLS_PSA_CRYPTO_C:MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED:MBEDTLS_PKCS1_V15:MBEDTLS_SSL_PROTO_TLS1_2:PSA_WANT_ECC_SECP_R1_256:MBEDTLS_RSA_C:PSA_WANT_ECC_SECP_R1_384:PSA_HAVE_ALG_SOME_ECDSA:PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT */
 void raw_key_agreement_fail(int bad_server_ecdhe_key)
 {
     enum { BUFFSIZE = 17000 };
@@ -3941,11 +3941,7 @@
 {
     mbedtls_ssl_context ssl;
     mbedtls_ssl_config conf;
-#if defined(MBEDTLS_USE_PSA_CRYPTO)
     mbedtls_svc_key_id_t pwd_slot = MBEDTLS_SVC_KEY_ID_INIT;
-#else   /* MBEDTLS_USE_PSA_CRYPTO */
-    (void) use_opaque_arg;
-#endif  /* MBEDTLS_USE_PSA_CRYPTO */
     unsigned char pwd_string[sizeof(ECJPAKE_TEST_PWD)] = "";
     size_t pwd_len = 0;
     int ret;
@@ -3971,7 +3967,6 @@
     pwd_len = strlen(ECJPAKE_TEST_PWD);
     memcpy(pwd_string, ECJPAKE_TEST_PWD, pwd_len);
 
-#if defined(MBEDTLS_USE_PSA_CRYPTO)
     if (use_opaque_arg) {
         psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
         psa_key_attributes_t check_attributes = PSA_KEY_ATTRIBUTES_INIT;
@@ -3998,16 +3993,13 @@
         PSA_ASSERT(psa_import_key(&attributes, pwd_string,
                                   pwd_len, &pwd_slot));
     }
-#endif  /* MBEDTLS_USE_PSA_CRYPTO */
 
     /* final check which should work without errors */
     ECJPAKE_TEST_SET_PASSWORD(0);
 
-#if defined(MBEDTLS_USE_PSA_CRYPTO)
     if (use_opaque_arg) {
         psa_destroy_key(pwd_slot);
     }
-#endif  /* MBEDTLS_USE_PSA_CRYPTO */
     mbedtls_ssl_free(&ssl);
     mbedtls_ssl_config_free(&conf);