commit 7b1b9de1350f652c7a03f3189c14b91aa5c5fc61
author Valerio Setti <valerio.setti@nordicsemi.no> Thu Sep 26 13:51:39 2024 +0200
committer Valerio Setti <valerio.setti@nordicsemi.no> Tue Oct 22 13:31:19 2024 +0200
tree 82cd47eb74818ea9adedce17e8f6f64f83b4194a
parent 38efe85e9fc987af14f1aca6525478844e83bf37

psa_crypto_helpers: enhance definitions for static key slot related test symbols

- MBEDTLS_TEST_STATIC_KEY_SLOTS_SUPPORT_RSA_[2048/4096] are always
  defined because they are only used in test_suite_psa_crypto
  tests.

- MBEDTLS_TEST_ALLOW_RSA_4096 was renamed as
  MBEDTLS_TEST_PK_ALLOW_RSA_KEY_PAIR_4096 because this is only used in
  PK related test suites.

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>

tests/include/test/psa_crypto_helpers.h

diff --git a/tests/include/test/psa_crypto_helpers.h b/tests/include/test/psa_crypto_helpers.h
index 0becb4c..e7b41b2 100644
--- a/tests/include/test/psa_crypto_helpers.h
+++ b/tests/include/test/psa_crypto_helpers.h
@@ -468,10 +468,9 @@
 #define MBEDTLS_TEST_PSA_INTERNAL_KEYS          \
     MBEDTLS_TEST_PSA_INTERNAL_KEYS_FOR_DRBG
 
-/* Some helper macros to verify if MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE is
+/* A couple of helper macros to verify if MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE is
  * large enough to contain an RSA key pair of the given size. This is meant to be
  * 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 MBEDTLS_TEST_STATIC_KEY_SLOTS_SUPPORT_RSA_4096
 #endif
@@ -480,15 +479,21 @@
 #define MBEDTLS_TEST_STATIC_KEY_SLOTS_SUPPORT_RSA_2048
 #endif
 
+/* Helper macro for the PK module to check whether MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE
+ * is large enough to contain 4096 bits RSA key pairs. Of course this check is only
+ * necessary if PK relies on PSA (i.e. MBEDTLS_USE_PSA_CRYPTO) to store and manage
+ * the key. */
+#if defined(MBEDTLS_USE_PSA_CRYPTO)
+
 #if !defined(MBEDTLS_PSA_STATIC_KEY_SLOTS) || \
     defined(MBEDTLS_TEST_STATIC_KEY_SLOTS_SUPPORT_RSA_4096)
-#define MBEDTLS_TEST_ALLOW_RSA_4096
+#define MBEDTLS_TEST_PK_ALLOW_RSA_KEY_PAIR_4096
 #endif
 
-#else /* MBEDTLS_PSA_CRYPTO_C */
+#else /* MBEDTLS_USE_PSA_CRYPTO */
 
-#define MBEDTLS_TEST_ALLOW_RSA_4096
+#define MBEDTLS_TEST_PK_ALLOW_RSA_KEY_PAIR_4096
 
-#endif /* MBEDTLS_PSA_CRYPTO_C */
+#endif /* MBEDTLS_USE_PSA_CRYPTO */
 
 #endif /* PSA_CRYPTO_HELPERS_H */