From 50122b6e40af7276602e35dd3932887957385113 Mon Sep 17 00:00:00 2001
From: Valerio Setti <valerio.setti@nordicsemi.no>
Date: Thu, 22 Feb 2024 14:45:02 +0100
Subject: [PATCH] pk/test_suite_pk: fix guards

pk: mbedtls_pk_can_do_ext() should be guarded by CRYPTO_CLIENT instead
    of CRYPTO_C.

test: since the functions using opaque keys are now guarded by CRYPTO_C
      and since CRYPTO_CLIENT is automatically enabled as soon as
      CRYPTO_C is, then CRYPTO_CLIENT guards can be removed.

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
---
 library/pk.c                        | 4 ++--
 tests/suites/test_suite_pk.function | 8 --------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/library/pk.c b/library/pk.c
index d52c77d408..0a8214aa18 100644
--- a/library/pk.c
+++ b/library/pk.c
@@ -238,7 +238,7 @@ int mbedtls_pk_can_do(const mbedtls_pk_context *ctx, mbedtls_pk_type_t type)
     return ctx->pk_info->can_do(type);
 }
 
-#if defined(MBEDTLS_PSA_CRYPTO_C)
+#if defined(MBEDTLS_PSA_CRYPTO_CLIENT)
 /*
  * Tell if a PK can do the operations of the given PSA algorithm
  */
@@ -376,7 +376,7 @@ int mbedtls_pk_can_do_ext(const mbedtls_pk_context *ctx, psa_algorithm_t alg,
 
     return 0;
 }
-#endif /* MBEDTLS_PSA_CRYPTO_C */
+#endif /* MBEDTLS_PSA_CRYPTO_CLIENT */
 
 #if defined(MBEDTLS_PSA_CRYPTO_C)
 #if defined(MBEDTLS_RSA_C)
diff --git a/tests/suites/test_suite_pk.function b/tests/suites/test_suite_pk.function
index a6b4b1b28d..f18dd7f6fb 100644
--- a/tests/suites/test_suite_pk.function
+++ b/tests/suites/test_suite_pk.function
@@ -741,10 +741,8 @@ exit:
 void mbedtls_pk_check_pair(char *pub_file, char *prv_file, int ret)
 {
     mbedtls_pk_context pub, prv, alt;
-#if defined(MBEDTLS_PSA_CRYPTO_CLIENT)
     mbedtls_svc_key_id_t opaque_key_id = MBEDTLS_SVC_KEY_ID_INIT;
     int opaque_ret = ret;
-#endif /* MBEDTLS_PSA_CRYPTO_CLIENT */
 
     mbedtls_pk_init(&pub);
     mbedtls_pk_init(&prv);
@@ -762,9 +760,7 @@ void mbedtls_pk_check_pair(char *pub_file, char *prv_file, int ret)
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
         ret = MBEDTLS_ERR_PK_BAD_INPUT_DATA;
 #endif /* MBEDTLS_USE_PSA_CRYPTO */
-#if defined(MBEDTLS_PSA_CRYPTO_CLIENT)
         opaque_ret = MBEDTLS_ERR_PK_BAD_INPUT_DATA;
-#endif
     }
 
     TEST_ASSERT(mbedtls_pk_parse_public_keyfile(&pub, pub_file) == 0);
@@ -786,7 +782,6 @@ void mbedtls_pk_check_pair(char *pub_file, char *prv_file, int ret)
                     == ret);
     }
 #endif
-#if defined(MBEDTLS_PSA_CRYPTO_CLIENT)
     if (mbedtls_pk_get_type(&prv) == MBEDTLS_PK_ECKEY) {
         if (ret == MBEDTLS_ERR_ECP_BAD_INPUT_DATA) {
             ret = MBEDTLS_ERR_PK_BAD_INPUT_DATA;
@@ -797,12 +792,9 @@ void mbedtls_pk_check_pair(char *pub_file, char *prv_file, int ret)
         TEST_EQUAL(mbedtls_pk_check_pair(&pub, &prv, mbedtls_test_rnd_std_rand,
                                          NULL), opaque_ret);
     }
-#endif
 
 exit:
-#if defined(MBEDTLS_PSA_CRYPTO_CLIENT)
     psa_destroy_key(opaque_key_id);
-#endif /* MBEDTLS_PSA_CRYPTO_CLIENT */
     mbedtls_pk_free(&pub);
     mbedtls_pk_free(&prv);
     mbedtls_pk_free(&alt);