From 69d19e7bdda51e2e4af98b694915884bef1243be Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Thu, 26 Sep 2024 13:01:53 +0200 Subject: [PATCH] psa_crypto_helpers: add MBEDTLS_TEST_ prefix to newly created symbols Signed-off-by: Valerio Setti --- tests/include/test/psa_crypto_helpers.h | 7 ++++--- tf-psa-crypto/tests/suites/test_suite_psa_crypto.data | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/include/test/psa_crypto_helpers.h b/tests/include/test/psa_crypto_helpers.h index e151e3a400..981f234f12 100644 --- a/tests/include/test/psa_crypto_helpers.h +++ b/tests/include/test/psa_crypto_helpers.h @@ -466,14 +466,15 @@ uint64_t mbedtls_test_parse_binary_string(data_t *bin_string); * used in test cases where MBEDTLS_PSA_STATIC_KEY_SLOTS is enabled. */ #if defined(MBEDTLS_PSA_CRYPTO_C) #if (MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE >= PSA_KEY_EXPORT_RSA_KEY_PAIR_MAX_SIZE(4096)) -#define STATIC_KEY_SLOTS_SUPPORT_RSA_4096 +#define MBEDTLS_TEST_STATIC_KEY_SLOTS_SUPPORT_RSA_4096 #endif #if (MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE >= PSA_KEY_EXPORT_RSA_KEY_PAIR_MAX_SIZE(2048)) -#define STATIC_KEY_SLOTS_SUPPORT_RSA_2048 +#define MBEDTLS_TEST_STATIC_KEY_SLOTS_SUPPORT_RSA_2048 #endif -#if !defined(MBEDTLS_PSA_STATIC_KEY_SLOTS) || defined(STATIC_KEY_SLOTS_SUPPORT_RSA_4096) +#if !defined(MBEDTLS_PSA_STATIC_KEY_SLOTS) || \ + defined(MBEDTLS_TEST_STATIC_KEY_SLOTS_SUPPORT_RSA_4096) #define MBEDTLS_TEST_ALLOW_RSA_4096 #endif diff --git a/tf-psa-crypto/tests/suites/test_suite_psa_crypto.data b/tf-psa-crypto/tests/suites/test_suite_psa_crypto.data index 198770ad90..fffe49851d 100644 --- a/tf-psa-crypto/tests/suites/test_suite_psa_crypto.data +++ b/tf-psa-crypto/tests/suites/test_suite_psa_crypto.data @@ -7485,11 +7485,11 @@ generate_key:PSA_KEY_TYPE_RSA_KEY_PAIR:PSA_VENDOR_RSA_MAX_KEY_BITS+8:PSA_KEY_USA # test component. There MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE is intentionally set to a value # that is OK for all public RSA key bit sizes, but only valid up to 2048 bits for key pairs. PSA generate key: RSA, key pair size does not fit in static key buffer -depends_on:PSA_WANT_ALG_RSA_PKCS1V15_CRYPT:PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE:MBEDTLS_PSA_STATIC_KEY_SLOTS:!STATIC_KEY_SLOTS_SUPPORT_RSA_4096:PSA_VENDOR_RSA_MAX_KEY_BITS>=4096 +depends_on:PSA_WANT_ALG_RSA_PKCS1V15_CRYPT:PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE:MBEDTLS_PSA_STATIC_KEY_SLOTS:!MBEDTLS_TEST_STATIC_KEY_SLOTS_SUPPORT_RSA_4096:PSA_VENDOR_RSA_MAX_KEY_BITS>=4096 generate_key:PSA_KEY_TYPE_RSA_KEY_PAIR:4096:PSA_KEY_USAGE_EXPORT:PSA_ALG_RSA_PKCS1V15_CRYPT:PSA_ERROR_NOT_SUPPORTED:0 PSA generate key: RSA, key pair size fits in static key buffer -depends_on:PSA_WANT_ALG_RSA_PKCS1V15_CRYPT:PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE:MBEDTLS_PSA_STATIC_KEY_SLOTS:STATIC_KEY_SLOTS_SUPPORT_RSA_2048:PSA_VENDOR_RSA_MAX_KEY_BITS>=2048 +depends_on:PSA_WANT_ALG_RSA_PKCS1V15_CRYPT:PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE:MBEDTLS_PSA_STATIC_KEY_SLOTS:MBEDTLS_TEST_STATIC_KEY_SLOTS_SUPPORT_RSA_2048:PSA_VENDOR_RSA_MAX_KEY_BITS>=2048 generate_key:PSA_KEY_TYPE_RSA_KEY_PAIR:2048:PSA_KEY_USAGE_EXPORT:PSA_ALG_RSA_PKCS1V15_CRYPT:PSA_SUCCESS:0 PSA generate key: ECC, SECP256R1, good