From 4961d4a52dfe0ae3e7d448decbb7f825ede29f69 Mon Sep 17 00:00:00 2001
From: Jaeden Amero <jaeden.amero@arm.com>
Date: Fri, 12 Jun 2020 17:52:13 +0100
Subject: [PATCH] psa: Configure Mbed TLS to use PSA as needed

Configure Mbed TLS to automatically enable PSA as needed. When Mbed OS
is configured to use PSA, configure Mbed TLS to use PSA. This prevents
leaking of the "how to make Mbed TLS use PSA" knowledge up into
targets.json, and thus makes porting simpler. There is now one place
where "how to make TLS use PSA" exists rather than repeated throughout
targets.json for each target that can't inherit from PSA_Target.
---
 features/mbedtls/importer/adjust-config.sh |  5 +++++
 targets/targets.json                       | 24 ++++------------------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/features/mbedtls/importer/adjust-config.sh b/features/mbedtls/importer/adjust-config.sh
index 0ee94c6df0..f172d5dc2e 100755
--- a/features/mbedtls/importer/adjust-config.sh
+++ b/features/mbedtls/importer/adjust-config.sh
@@ -83,6 +83,11 @@ prepend_code
     "#error \"No entropy source was found at build time, so TLS \" \\\\\n"                                     \
     "    \"functionality is not available\"\n"                                                                 \
     "#endif\n"                                                                                                 \
+    "\n"                                                                                                       \
+    "#if defined(FEATURE_EXPERIMENTAL_API) && defined(FEATURE_PSA)\n"                                          \
+    "    #define MBEDTLS_PSA_HAS_ITS_IO\n"                                                                     \
+    "    #define MBEDTLS_USE_PSA_CRYPTO\n"                                                                     \
+    "#endif\n"                                                                                                 \
     "\n"
 
 # not supported on mbed OS, nor used by mbed Client
diff --git a/targets/targets.json b/targets/targets.json
index b1d2d6ce1f..70c15e90da 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -93,10 +93,6 @@
         "features": [
             "PSA"
         ],
-        "macros_add": [
-            "MBEDTLS_PSA_HAS_ITS_IO",
-            "MBEDTLS_USE_PSA_CRYPTO"
-        ],
         "public": false,
         "config": {}
     },
@@ -6273,10 +6269,6 @@
         "features_add": [
             "PSA"
         ],
-        "macros_add": [
-            "MBEDTLS_PSA_HAS_ITS_IO",
-            "MBEDTLS_USE_PSA_CRYPTO"
-        ],
         "extra_labels_add": [
             "MBED_PSA_SRV"
         ],
@@ -6621,9 +6613,7 @@
         ],
         "macros_add": [
             "CY8C624ABZI_D44",
-            "CYBSP_WIFI_CAPABLE",
-            "MBEDTLS_PSA_HAS_ITS_IO",
-            "MBEDTLS_USE_PSA_CRYPTO"
+            "CYBSP_WIFI_CAPABLE"
         ],
         "device_name": "CY8C624ABZI-D44",
         "mbed_ram_start": "0x08002000",
@@ -6752,9 +6742,7 @@
         "macros_add": [
             "CYB0644ABZI_S2D44",
             "CYBSP_WIFI_CAPABLE",
-            "TFM_MULTI_CORE_MULTI_CLIENT_CALL=1",
-            "MBEDTLS_PSA_HAS_ITS_IO",
-            "MBEDTLS_USE_PSA_CRYPTO"
+            "TFM_MULTI_CORE_MULTI_CLIENT_CALL=1"
         ],
         "detect_code": [
             "190A"
@@ -6809,9 +6797,7 @@
         "macros_add": [
             "CYB0644ABZI_S2D44",
             "CYBSP_WIFI_CAPABLE",
-            "TFM_MULTI_CORE_MULTI_CLIENT_CALL=1",
-            "MBEDTLS_PSA_HAS_ITS_IO",
-            "MBEDTLS_USE_PSA_CRYPTO"
+            "TFM_MULTI_CORE_MULTI_CLIENT_CALL=1"
         ],
         "detect_code": [
             "190A"
@@ -7179,9 +7165,7 @@
             "1702"
         ],
         "macros_add": [
-            "GD32F450",
-            "MBEDTLS_PSA_HAS_ITS_IO",
-            "MBEDTLS_USE_PSA_CRYPTO"
+            "GD32F450"
         ],
         "bootloader_supported": true,
         "release_versions": [