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>

secure_fw/services/crypto/crypto_init.c

diff --git a/secure_fw/services/crypto/crypto_init.c b/secure_fw/services/crypto/crypto_init.c
index e32ceb0..9e061b2 100644
--- a/secure_fw/services/crypto/crypto_init.c
+++ b/secure_fw/services/crypto/crypto_init.c
@@ -21,7 +21,7 @@
 #endif
 
 #ifdef TFM_PSA_API
-#include "psa_service.h"
+#include "psa/service.h"
 #include "tfm_crypto_signal.h"
 #include "secure_fw/core/tfm_memory_utils.h"
 

secure_fw/services/crypto/tfm_crypto_api.h

diff --git a/secure_fw/services/crypto/tfm_crypto_api.h b/secure_fw/services/crypto/tfm_crypto_api.h
index d74b251..da23f6f 100644
--- a/secure_fw/services/crypto/tfm_crypto_api.h
+++ b/secure_fw/services/crypto/tfm_crypto_api.h
@@ -15,9 +15,9 @@
 #include <stdint.h>
 #include "tfm_api.h"
 #include "tfm_crypto_defs.h"
-#include "psa_crypto.h"
+#include "psa/crypto.h"
 #ifdef TFM_PSA_API
-#include "psa_service.h"
+#include "psa/service.h"
 
 /**
  * \brief This define is a function pointer type to the Uniform Signature API

secure_fw/services/crypto/tfm_crypto_secure_api.c

diff --git a/secure_fw/services/crypto/tfm_crypto_secure_api.c b/secure_fw/services/crypto/tfm_crypto_secure_api.c
index 3ebe23c..21a16e9 100644
--- a/secure_fw/services/crypto/tfm_crypto_secure_api.c
+++ b/secure_fw/services/crypto/tfm_crypto_secure_api.c
@@ -7,12 +7,12 @@
 
 #include "tfm_veneers.h"
 #include "tfm_crypto_defs.h"
-#include "psa_crypto.h"
+#include "psa/crypto.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 */

secure_fw/services/crypto/tfm_mbedcrypto_include.h

diff --git a/secure_fw/services/crypto/tfm_mbedcrypto_include.h b/secure_fw/services/crypto/tfm_mbedcrypto_include.h
index b04b180..20f030d 100644
--- a/secure_fw/services/crypto/tfm_mbedcrypto_include.h
+++ b/secure_fw/services/crypto/tfm_mbedcrypto_include.h
@@ -9,7 +9,7 @@
 #define __TFM_MBEDCRYPTO_INCLUDE_H__
 
 /* FIXME: The PSA Crypto headers in Mbed Crypto define PSA_SUCCESS and typedef
- * psa_status_t. To prevent redefinition errors in psa_client.h, use the
+ * psa_status_t. To prevent redefinition errors in psa/client.h, use the
  * preprocessor to prefix psa_status_t in the Mbed Crypto headers, and then
  * undef psa_status_t and PSA_SUCCESS after the include.
  */