Merge pull request #10963 from devran01/pr/10888/fix

PSA TESTS: Include mbedtls/config.h before evaluating MBEDTLS_PSA_CRYPTO_C

Author: Arto Kinnunen

TESTS/mbed-crypto/sanity/main.cpp

@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+#include "psa/crypto.h"
+
 #if ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)))
 #error [NOT_SUPPORTED] Mbed Crypto is OFF - skipping.
 #endif
@@ -24,7 +26,6 @@
 #include "greentea-client/test_env.h"
 #include "unity.h"
 #include "utest.h"
-#include "psa/crypto.h"
 #include "entropy.h"
 #include "entropy_poll.h"
 

TESTS/psa/attestation/main.cpp

@@ -16,6 +16,8 @@
 * limitations under the License.
 */
 
+#include "psa/crypto.h"
+
 #if ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)))
 #error [NOT_SUPPORTED] Mbed Crypto is OFF - skipping.
 #endif // TARGET_PSA

TESTS/psa/crypto_access_control/COMPONENT_NSPE/main.cpp

@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+#include "psa/crypto.h"
+
 #if ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)) || (!defined(COMPONENT_PSA_SRV_IPC)))
 #error [NOT_SUPPORTED] These tests can run only on SPM-enabled targets and where Mbed Crypto is ON - skipping.
 #endif
@@ -24,7 +26,6 @@
 #include "greentea-client/test_env.h"
 #include "unity.h"
 #include "utest.h"
-#include "psa/crypto.h"
 #include "entropy.h"
 #include "entropy_poll.h"
 #include "test_partition_proxy.h"

TESTS/psa/crypto_init/main.cpp

@@ -16,14 +16,15 @@
 * limitations under the License.
 */
 
+#include "psa/crypto.h"
+
 #if ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)))
 #error [NOT_SUPPORTED] Mbed Crypto is OFF - skipping.
 #endif // TARGET_PSA
 
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"
 #include "utest/utest.h"
-#include "crypto.h"
 #include "entropy.h"
 #include "entropy_poll.h"