From 053e07b6dc7a2db6c4225e082e3ddb118aade882 Mon Sep 17 00:00:00 2001
From: Netanel Gonen <netanel.gonen@arm.com>
Date: Mon, 11 Mar 2019 18:31:07 +0200
Subject: [PATCH 1/3] change the include to mbedtls/config.h

---
 features/frameworks/TARGET_PSA/pal/pal_crypto_config.h | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/features/frameworks/TARGET_PSA/pal/pal_crypto_config.h b/features/frameworks/TARGET_PSA/pal/pal_crypto_config.h
index eecb6c0b8a..388c02fb42 100644
--- a/features/frameworks/TARGET_PSA/pal/pal_crypto_config.h
+++ b/features/frameworks/TARGET_PSA/pal/pal_crypto_config.h
@@ -27,11 +27,7 @@
 #ifndef _PAL_CRYPTO_CONFIG_H_
 #define _PAL_CRYPTO_CONFIG_H_
 
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "mbedtls/config.h"
 
 /**
  * \def ARCH_TEST_RSA
@@ -408,4 +404,4 @@
 
 #include "pal_crypto_config_check.h"
 
-#endif /* _PAL_CRYPTO_CONFIG_H_ */
+#endif

From 24244b5a29170810facb9e70386daf7ddfed6358 Mon Sep 17 00:00:00 2001
From: Netanel Gonen <netanel.gonen@arm.com>
Date: Mon, 11 Mar 2019 19:05:03 +0200
Subject: [PATCH 2/3] update crypto complience tests importer, fix include to
 mbedtls config

---
 tools/importer/psa_compliance_importer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/importer/psa_compliance_importer.json b/tools/importer/psa_compliance_importer.json
index ef3a820c3c..ea9dead075 100644
--- a/tools/importer/psa_compliance_importer.json
+++ b/tools/importer/psa_compliance_importer.json
@@ -316,7 +316,8 @@
                  "1650a923eb6f79051544b2c57fb72140eaae4f65",
                  "2982907e37b695d9dee9db7026a3ae0ecbd04451",
                  "16a59cb9926bc96792cc9d1b7a996689f7bf1b86",
-                 "c437c9f0b80a3f4177a23a2a6f2399d9e8bd162b"
+                 "c437c9f0b80a3f4177a23a2a6f2399d9e8bd162b",
+	             "053e07b6dc7a2db6c4225e082e3ddb118aade882"
                  
   ]
 }

From 0f5147c8b9f5b7a9028787238d97b6fd7d15a941 Mon Sep 17 00:00:00 2001
From: Alexander Zilberkant <alexander.zilberkant@arm.com>
Date: Mon, 11 Mar 2019 19:30:51 +0200
Subject: [PATCH 3/3] remove hidden tad

Co-Authored-By: netanelgonen <netanel.gonen@arm.com>
---
 tools/importer/psa_compliance_importer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/importer/psa_compliance_importer.json b/tools/importer/psa_compliance_importer.json
index ea9dead075..bff2ca7b22 100644
--- a/tools/importer/psa_compliance_importer.json
+++ b/tools/importer/psa_compliance_importer.json
@@ -317,7 +317,7 @@
                  "2982907e37b695d9dee9db7026a3ae0ecbd04451",
                  "16a59cb9926bc96792cc9d1b7a996689f7bf1b86",
                  "c437c9f0b80a3f4177a23a2a6f2399d9e8bd162b",
-	             "053e07b6dc7a2db6c4225e082e3ddb118aade882"
+                 "053e07b6dc7a2db6c4225e082e3ddb118aade882"
                  
   ]
 }