remove MBEDTLS_USE_PSA_CRYPTO from tests

Signed-off-by: Ben Taylor <[email protected]>

Author: Ben Taylor

tests/include/test/psa_crypto_helpers.h

@@ -368,11 +368,6 @@ uint64_t mbedtls_test_parse_binary_string(data_t *bin_string);
 #else /* MBEDTLS_VERSION_MAJOR < 4 */
 
 /** \def USE_PSA_INIT
- *
- * Call this macro to initialize the PSA subsystem if #MBEDTLS_USE_PSA_CRYPTO
- * or #MBEDTLS_SSL_PROTO_TLS1_3 (In contrast to TLS 1.2 implementation, the
- * TLS 1.3 one uses PSA independently of the definition of
- * #MBEDTLS_USE_PSA_CRYPTO) is enabled and do nothing otherwise.
  *
  * If the initialization fails, mark the test case as failed and jump to the
  * \p exit label.
@@ -384,25 +379,8 @@ uint64_t mbedtls_test_parse_binary_string(data_t *bin_string);
  * This is like #PSA_DONE except it does nothing under the same conditions as
  * #USE_PSA_INIT.
  */
-#if defined(MBEDTLS_USE_PSA_CRYPTO)
 #define USE_PSA_INIT() PSA_INIT()
 #define USE_PSA_DONE() PSA_DONE()
-#elif defined(MBEDTLS_SSL_PROTO_TLS1_3)
-/* TLS 1.3 must work without having called psa_crypto_init(), for backward
- * compatibility with Mbed TLS <= 3.5 when connecting with a peer that
- * supports both TLS 1.2 and TLS 1.3. See mbedtls_ssl_tls13_crypto_init()
- * and https://github.com/Mbed-TLS/mbedtls/issues/9072 . */
-#define USE_PSA_INIT() ((void) 0)
-/* TLS 1.3 may have initialized the PSA subsystem. Shut it down cleanly,
- * otherwise Asan and Valgrind would notice a resource leak. */
-#define USE_PSA_DONE() PSA_DONE()
-#else /* MBEDTLS_USE_PSA_CRYPTO || MBEDTLS_SSL_PROTO_TLS1_3 */
-/* Define empty macros so that we can use them in the preamble and teardown
- * of every test function that uses PSA conditionally based on
- * MBEDTLS_USE_PSA_CRYPTO. */
-#define USE_PSA_INIT() ((void) 0)
-#define USE_PSA_DONE() ((void) 0)
-#endif /* !MBEDTLS_USE_PSA_CRYPTO && !MBEDTLS_SSL_PROTO_TLS1_3 */
 
 /** \def MD_PSA_INIT
  *
@@ -452,10 +430,6 @@ uint64_t mbedtls_test_parse_binary_string(data_t *bin_string);
 
 
 /** \def MD_OR_USE_PSA_INIT
- *
- * Call this macro to initialize the PSA subsystem if MD uses a driver,
- * or if #MBEDTLS_USE_PSA_CRYPTO or #MBEDTLS_SSL_PROTO_TLS1_3 is enabled,
- * and do nothing otherwise.
  *
  * If the initialization fails, mark the test case as failed and jump to the
  * \p exit label.
@@ -544,19 +518,11 @@ uint64_t mbedtls_test_parse_binary_string(data_t *bin_string);
 
 /* Helper macro for the PK module to check whether MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE
  * is large enough to contain 4096-bit 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
+ * necessary if PK relies on PSA 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_PK_ALLOW_RSA_KEY_PAIR_4096
 #endif
 
-#else /* MBEDTLS_USE_PSA_CRYPTO */
-
-#define MBEDTLS_TEST_PK_ALLOW_RSA_KEY_PAIR_4096
-
-#endif /* MBEDTLS_USE_PSA_CRYPTO */
-
 #endif /* PSA_CRYPTO_HELPERS_H */

tests/src/psa_exercise_key.c

@@ -1430,7 +1430,6 @@ int mbedtls_test_key_consistency_psa_pk(mbedtls_svc_key_id_t psa_key,
             break;
 #endif /* PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY && !MBEDTLS_PK_USE_PSA_EC_DATA */
 
-#if defined(MBEDTLS_USE_PSA_CRYPTO)
         case MBEDTLS_PK_OPAQUE:
             PSA_ASSERT(psa_get_key_attributes(pk->priv_id, &pk_attributes));
             psa_key_type_t pk_psa_type = psa_get_key_type(&pk_attributes);
@@ -1442,7 +1441,6 @@ int mbedtls_test_key_consistency_psa_pk(mbedtls_svc_key_id_t psa_key,
                                              &pk_public_length));
             pk_public = pk_public_buffer;
             break;
-#endif /* MBEDTLS_USE_PSA_CRYPTO */
 
         default:
             TEST_FAIL("pk type not supported");