Fix preprocessor logic for standalone TF-PSA-Crypto

Signed-off-by: Bence Szépkúti <bence.szepkuti@arm.com>

Author: bensze01

tests/include/test/psa_crypto_helpers.h

@@ -360,7 +360,7 @@ uint64_t mbedtls_test_parse_binary_string(data_t *bin_string);
 
 #endif /* MBEDTLS_PSA_CRYPTO_CLIENT || MBEDTLS_PSA_CRYPTO_C */
 
-#if defined(MBED_TLS_VERSION_MAJOR) && MBEDTLS_VERSION_MAJOR >= 4
+#if defined(TF_PSA_CRYPTO_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
 /* Legacy PSA_INIT() / PSA_DONE() variants from 3.6 */
 #define USE_PSA_INIT()          PSA_INIT()
 #define USE_PSA_DONE()          PSA_DONE()

tests/src/psa_exercise_key.c

@@ -703,7 +703,7 @@ psa_status_t mbedtls_test_psa_raw_key_agreement_with_self(
     uint8_t output[1024];
     size_t output_length;
 
-#if defined(MBEDTLS_VERSION_MAJOR) && MBEDTLS_VERSION_MAJOR >= 4
+#if defined(TF_PSA_CRYPTO_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
     uint8_t *exported = NULL;
     size_t exported_size = 0;
     size_t exported_length = 0;
@@ -757,7 +757,7 @@ psa_status_t mbedtls_test_psa_raw_key_agreement_with_self(
                     PSA_RAW_KEY_AGREEMENT_OUTPUT_MAX_SIZE);
     }
 
-#if defined(MBEDTLS_VERSION_MAJOR) && MBEDTLS_VERSION_MAJOR >= 4
+#if defined(TF_PSA_CRYPTO_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
     psa_status_t raw_status = status;
 
     psa_set_key_type(&shared_secret_attributes, PSA_KEY_TYPE_DERIVE);
@@ -871,7 +871,7 @@ psa_status_t mbedtls_test_psa_raw_key_agreement_with_self(
      */
     psa_reset_key_attributes(&attributes);
 
-#if defined(MBEDTLS_VERSION_MAJOR) && MBEDTLS_VERSION_MAJOR >= 4
+#if defined(TF_PSA_CRYPTO_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
     psa_reset_key_attributes(&export_attributes);
 
     /* Make sure to reset and free derived key attributes and slot. */