From 23d88b57c6153cb71725fa7f054597aa59b8dfdd Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Thu, 12 Jun 2025 23:00:00 +0200 Subject: [PATCH] tests: psa_exercise_key: fix guards for EC fields in PK context Signed-off-by: Valerio Setti --- tests/src/psa_exercise_key.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/src/psa_exercise_key.c b/tests/src/psa_exercise_key.c index 886acb4d5..e4029f7c7 100644 --- a/tests/src/psa_exercise_key.c +++ b/tests/src/psa_exercise_key.c @@ -1413,6 +1413,7 @@ int mbedtls_test_key_consistency_psa_pk(mbedtls_svc_key_id_t psa_key, #endif /* MBEDTLS_PK_USE_PSA_RSA_DATA */ #endif /* MBEDTLS_RSA_C || MBEDTLS_PK_USE_PSA_RSA_DATA */ +#if defined(PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY) #if defined(MBEDTLS_PK_USE_PSA_EC_DATA) case MBEDTLS_PK_ECKEY: case MBEDTLS_PK_ECKEY_DH: @@ -1422,9 +1423,7 @@ int mbedtls_test_key_consistency_psa_pk(mbedtls_svc_key_id_t psa_key, pk_public = pk->pub_raw; pk_public_length = pk->pub_raw_len; break; -#endif /* MBEDTLS_PK_USE_PSA_EC_DATA */ - -#if defined(PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY) && !defined(MBEDTLS_PK_USE_PSA_EC_DATA) +#else /* MBEDTLS_PK_USE_PSA_EC_DATA */ case MBEDTLS_PK_ECKEY: case MBEDTLS_PK_ECKEY_DH: case MBEDTLS_PK_ECDSA: @@ -1435,7 +1434,8 @@ int mbedtls_test_key_consistency_psa_pk(mbedtls_svc_key_id_t psa_key, pk_public_buffer, sizeof(pk_public_buffer)), 0); pk_public = pk_public_buffer; break; -#endif /* PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY && !MBEDTLS_PK_USE_PSA_EC_DATA */ +#endif /* MBEDTLS_PK_USE_PSA_EC_DATA */ +#endif /* PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY */ #if defined(MBEDTLS_USE_PSA_CRYPTO) case MBEDTLS_PK_OPAQUE: