commit cc31d4035bb613660ed8cba09401fb265c868ffa
author Jamie Fox <jamie.fox@arm.com> Mon Jan 28 17:13:52 2019 +0000
committer Antonio de Angelis <antonio.deangelis@arm.com> Fri Jul 12 10:22:46 2019 +0100
tree 0d4cf3f5835d1aadaf1cbf270b9ca260a4e5214c
parent ba1fa9ad23419edc6738f42fd6796bc3aeb5145e

Interface: Rename PSA headers

Renames PSA headers from psa_<api>.h to psa/<api>.h.

Change-Id: I3fc552c39f9a7e6d54e7a7a2f82f076bd03d30a7
Signed-off-by: Jamie Fox <jamie.fox@arm.com>

interface/src/tfm_crypto_api.c

diff --git a/interface/src/tfm_crypto_api.c b/interface/src/tfm_crypto_api.c
index a4cddbf..19bc52c 100644
--- a/interface/src/tfm_crypto_api.c
+++ b/interface/src/tfm_crypto_api.c
@@ -7,13 +7,13 @@
 
 #include "tfm_veneers.h"
 #include "tfm_crypto_defs.h"
-#include "psa_crypto.h"
+#include "psa/crypto.h"
 #include "tfm_ns_lock.h"
 
 #define ARRAY_SIZE(arr) (sizeof(arr)/sizeof(arr[0]))
 
 #ifdef TFM_PSA_API
-#include "psa_client.h"
+#include "psa/client.h"
 
 /* Macro to check for a valid PSA handle */
 /* FixMe: Here temporarily until it's added to the framework headers */

interface/src/tfm_initial_attestation_api.c

diff --git a/interface/src/tfm_initial_attestation_api.c b/interface/src/tfm_initial_attestation_api.c
index f9ab4ce..9d00214 100644
--- a/interface/src/tfm_initial_attestation_api.c
+++ b/interface/src/tfm_initial_attestation_api.c
@@ -5,10 +5,10 @@
  *
  */
 
-#include "psa_initial_attestation_api.h"
+#include "psa/initial_attestation.h"
 #include "tfm_veneers.h"
 #include "tfm_ns_lock.h"
-#include "psa_client.h"
+#include "psa/client.h"
 #ifdef TFM_PSA_API
 #include "tfm_attest_defs.h"
 #endif

interface/src/tfm_psa_ns_api.c

diff --git a/interface/src/tfm_psa_ns_api.c b/interface/src/tfm_psa_ns_api.c
index 159eef9..838e7b0 100644
--- a/interface/src/tfm_psa_ns_api.c
+++ b/interface/src/tfm_psa_ns_api.c
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
  */
 
-#include "interface/include/psa_client.h"
+#include "psa/client.h"
 #include "tfm_ns_lock.h"
 #include "tfm_api.h"
 
@@ -72,4 +72,3 @@
                          0,
                          0);
 }
-

interface/src/tfm_sst_api.c

diff --git a/interface/src/tfm_sst_api.c b/interface/src/tfm_sst_api.c
index 96afadd..34d19fe 100644
--- a/interface/src/tfm_sst_api.c
+++ b/interface/src/tfm_sst_api.c
@@ -5,7 +5,7 @@
  *
  */
 
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
 
 #include "tfm_ns_lock.h"
 #include "tfm_veneers.h"