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>
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"
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
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 */
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.
*/
diff --git a/secure_fw/services/initial_attestation/attestation.h b/secure_fw/services/initial_attestation/attestation.h
index f73ed0f..6a2fe0c 100644
--- a/secure_fw/services/initial_attestation/attestation.h
+++ b/secure_fw/services/initial_attestation/attestation.h
@@ -8,7 +8,7 @@
#ifndef __ATTESTATION_H__
#define __ATTESTATION_H__
-#include "psa_initial_attestation_api.h"
+#include "psa/initial_attestation.h"
#include "tfm_client.h"
#include "bl2/include/tfm_boot_status.h"
diff --git a/secure_fw/services/initial_attestation/attestation_key.c b/secure_fw/services/initial_attestation/attestation_key.c
index f122542..12e86cd 100644
--- a/secure_fw/services/initial_attestation/attestation_key.c
+++ b/secure_fw/services/initial_attestation/attestation_key.c
@@ -8,7 +8,7 @@
#include "attestation_key.h"
#include <stdint.h>
#include <stddef.h>
-#include "psa_initial_attestation_api.h"
+#include "psa/initial_attestation.h"
#include "platform/include/tfm_plat_defs.h"
#include "platform/include/tfm_plat_crypto_keys.h"
diff --git a/secure_fw/services/initial_attestation/attestation_key.h b/secure_fw/services/initial_attestation/attestation_key.h
index e9f3916..94c1d7e 100644
--- a/secure_fw/services/initial_attestation/attestation_key.h
+++ b/secure_fw/services/initial_attestation/attestation_key.h
@@ -8,8 +8,8 @@
#ifndef __ATTESTATION_KEY_H__
#define __ATTESTATION_KEY_H__
-#include "psa_initial_attestation_api.h"
-#include "psa_crypto.h"
+#include "psa/initial_attestation.h"
+#include "psa/crypto.h"
#ifdef __cplusplus
extern "C" {
diff --git a/secure_fw/services/initial_attestation/tfm_attestation.c b/secure_fw/services/initial_attestation/tfm_attestation.c
index f4b1acd..1b8757a 100644
--- a/secure_fw/services/initial_attestation/tfm_attestation.c
+++ b/secure_fw/services/initial_attestation/tfm_attestation.c
@@ -8,7 +8,7 @@
#include "tfm_api.h"
#include "tfm_secure_api.h"
#include "attestation.h"
-#include "psa_initial_attestation_api.h"
+#include "psa/initial_attestation.h"
#include "bl2/include/tfm_boot_status.h"
#ifdef TFM_PSA_API
diff --git a/secure_fw/services/initial_attestation/tfm_attestation_req_mngr.c b/secure_fw/services/initial_attestation/tfm_attestation_req_mngr.c
index d899bc6..97042bd 100644
--- a/secure_fw/services/initial_attestation/tfm_attestation_req_mngr.c
+++ b/secure_fw/services/initial_attestation/tfm_attestation_req_mngr.c
@@ -6,13 +6,13 @@
*/
#include <string.h>
-#include "psa_initial_attestation_api.h"
+#include "psa/initial_attestation.h"
#include "attestation.h"
#ifdef TFM_PSA_API
#include "tfm_attest_signal.h"
#include "tfm_client.h"
-#include "psa_service.h"
+#include "psa/service.h"
#include "region_defs.h"
#define IOVEC_LEN(x) (sizeof(x)/sizeof(x[0]))
diff --git a/secure_fw/services/initial_attestation/tfm_attestation_secure_api.c b/secure_fw/services/initial_attestation/tfm_attestation_secure_api.c
index d403839..1e426d7 100644
--- a/secure_fw/services/initial_attestation/tfm_attestation_secure_api.c
+++ b/secure_fw/services/initial_attestation/tfm_attestation_secure_api.c
@@ -5,7 +5,7 @@
*
*/
-#include "psa_initial_attestation_api.h"
+#include "psa/initial_attestation.h"
#include "tfm_veneers.h"
#include "tfm_memory_utils.h"
#include "tfm_client.h"
diff --git a/secure_fw/services/initial_attestation/tfm_client.h b/secure_fw/services/initial_attestation/tfm_client.h
index 78adb0d..9de6ae4 100644
--- a/secure_fw/services/initial_attestation/tfm_client.h
+++ b/secure_fw/services/initial_attestation/tfm_client.h
@@ -8,13 +8,13 @@
#ifndef __TFM_CLIENT_H__
#define __TFM_CLIENT_H__
-#include "psa_client.h" /* psa_invec, psa_outvec */
+#include "psa/client.h" /* psa_invec, psa_outvec */
#ifdef __cplusplus
extern "C" {
#endif
-/* Intentionally empty, the aim of this file to include psa_client.h, which
+/* Intentionally empty, the aim of this file to include psa/client.h, which
* contains the psa_invec and psa_outvec definitions in TF-M project, but these
* might has different location in another projects.
*/
diff --git a/secure_fw/services/secure_storage/crypto/sst_crypto_interface.c b/secure_fw/services/secure_storage/crypto/sst_crypto_interface.c
index ae898fc..de9d9d4 100644
--- a/secure_fw/services/secure_storage/crypto/sst_crypto_interface.c
+++ b/secure_fw/services/secure_storage/crypto/sst_crypto_interface.c
@@ -10,7 +10,7 @@
#include <stdbool.h>
#include "platform/include/tfm_plat_crypto_keys.h"
-#include "psa_crypto.h"
+#include "psa/crypto.h"
#include "secure_fw/core/tfm_memory_utils.h"
/* FIXME: HUK management should be part of Crypto service, with keys hidden from
diff --git a/secure_fw/services/secure_storage/crypto/sst_crypto_interface.h b/secure_fw/services/secure_storage/crypto/sst_crypto_interface.h
index a0c34dc..da9639a 100644
--- a/secure_fw/services/secure_storage/crypto/sst_crypto_interface.h
+++ b/secure_fw/services/secure_storage/crypto/sst_crypto_interface.h
@@ -11,7 +11,7 @@
#include <stddef.h>
#include <stdint.h>
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
#ifdef __cplusplus
extern "C" {
diff --git a/secure_fw/services/secure_storage/flash/sst_flash.h b/secure_fw/services/secure_storage/flash/sst_flash.h
index b461b07..8697e8b 100644
--- a/secure_fw/services/secure_storage/flash/sst_flash.h
+++ b/secure_fw/services/secure_storage/flash/sst_flash.h
@@ -9,7 +9,7 @@
#define __SST_FLASH_H__
#include <stdint.h>
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
#include "flash_layout.h"
#ifdef __cplusplus
diff --git a/secure_fw/services/secure_storage/flash_fs/sst_flash_fs.h b/secure_fw/services/secure_storage/flash_fs/sst_flash_fs.h
index 8694b22b..4af3f99 100644
--- a/secure_fw/services/secure_storage/flash_fs/sst_flash_fs.h
+++ b/secure_fw/services/secure_storage/flash_fs/sst_flash_fs.h
@@ -17,7 +17,7 @@
*/
#include <stdint.h>
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
/*!
* \struct sst_file_info_t
diff --git a/secure_fw/services/secure_storage/flash_fs/sst_flash_fs_dblock.h b/secure_fw/services/secure_storage/flash_fs/sst_flash_fs_dblock.h
index 05a682b..4ba4ea5 100644
--- a/secure_fw/services/secure_storage/flash_fs/sst_flash_fs_dblock.h
+++ b/secure_fw/services/secure_storage/flash_fs/sst_flash_fs_dblock.h
@@ -10,7 +10,7 @@
#include <stdint.h>
#include "sst_flash_fs_mblock.h"
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
#ifdef __cplusplus
extern "C" {
diff --git a/secure_fw/services/secure_storage/flash_fs/sst_flash_fs_mblock.h b/secure_fw/services/secure_storage/flash_fs/sst_flash_fs_mblock.h
index f42a957..bee15f9 100644
--- a/secure_fw/services/secure_storage/flash_fs/sst_flash_fs_mblock.h
+++ b/secure_fw/services/secure_storage/flash_fs/sst_flash_fs_mblock.h
@@ -12,7 +12,7 @@
#include "secure_fw/services/secure_storage/flash/sst_flash.h"
#include "secure_fw/services/secure_storage/sst_object_defs.h"
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
/*!
* \def SST_SUPPORTED_VERSION
diff --git a/secure_fw/services/secure_storage/nv_counters/sst_nv_counters.h b/secure_fw/services/secure_storage/nv_counters/sst_nv_counters.h
index b15ec65..2c3bfc1 100644
--- a/secure_fw/services/secure_storage/nv_counters/sst_nv_counters.h
+++ b/secure_fw/services/secure_storage/nv_counters/sst_nv_counters.h
@@ -17,7 +17,7 @@
*/
#include <stdint.h>
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
#include "platform/include/tfm_plat_nv_counters.h"
#define TFM_SST_NV_COUNTER_1 PLAT_NV_COUNTER_0
diff --git a/secure_fw/services/secure_storage/sst_encrypted_object.h b/secure_fw/services/secure_storage/sst_encrypted_object.h
index cd757e1..ce72f16 100644
--- a/secure_fw/services/secure_storage/sst_encrypted_object.h
+++ b/secure_fw/services/secure_storage/sst_encrypted_object.h
@@ -10,7 +10,7 @@
#include <stdint.h>
#include "sst_object_defs.h"
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
#ifdef __cplusplus
extern "C" {
diff --git a/secure_fw/services/secure_storage/sst_object_defs.h b/secure_fw/services/secure_storage/sst_object_defs.h
index fe0616f..56aedf2 100644
--- a/secure_fw/services/secure_storage/sst_object_defs.h
+++ b/secure_fw/services/secure_storage/sst_object_defs.h
@@ -11,7 +11,7 @@
#include <stdint.h>
#include "flash_layout.h"
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
#include "sst_utils.h"
#ifdef SST_ENCRYPTION
diff --git a/secure_fw/services/secure_storage/sst_object_system.h b/secure_fw/services/secure_storage/sst_object_system.h
index 46bcfca..668f329 100644
--- a/secure_fw/services/secure_storage/sst_object_system.h
+++ b/secure_fw/services/secure_storage/sst_object_system.h
@@ -10,7 +10,7 @@
#include <stdint.h>
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
#ifdef __cplusplus
extern "C" {
diff --git a/secure_fw/services/secure_storage/sst_object_table.h b/secure_fw/services/secure_storage/sst_object_table.h
index 68f6ec5..5e42e71 100644
--- a/secure_fw/services/secure_storage/sst_object_table.h
+++ b/secure_fw/services/secure_storage/sst_object_table.h
@@ -10,7 +10,7 @@
#include <stdint.h>
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
#ifdef __cplusplus
extern "C" {
diff --git a/secure_fw/services/secure_storage/sst_utils.h b/secure_fw/services/secure_storage/sst_utils.h
index b03b6c7..ade05b2 100644
--- a/secure_fw/services/secure_storage/sst_utils.h
+++ b/secure_fw/services/secure_storage/sst_utils.h
@@ -11,7 +11,7 @@
#include <stdint.h>
#include "flash_layout.h"
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
#ifdef __cplusplus
extern "C" {
diff --git a/secure_fw/services/secure_storage/tfm_protected_storage.h b/secure_fw/services/secure_storage/tfm_protected_storage.h
index e7fdd27..62dfb59 100644
--- a/secure_fw/services/secure_storage/tfm_protected_storage.h
+++ b/secure_fw/services/secure_storage/tfm_protected_storage.h
@@ -10,7 +10,7 @@
#include <stdint.h>
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
#ifdef __cplusplus
extern "C" {
diff --git a/secure_fw/services/secure_storage/tfm_sst_req_mngr.c b/secure_fw/services/secure_storage/tfm_sst_req_mngr.c
index d18b6b3..0ebadee 100644
--- a/secure_fw/services/secure_storage/tfm_sst_req_mngr.c
+++ b/secure_fw/services/secure_storage/tfm_sst_req_mngr.c
@@ -10,12 +10,12 @@
#include <stdbool.h>
#include <stdint.h>
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
#include "secure_fw/core/tfm_secure_api.h"
#include "tfm_api.h"
#include "tfm_protected_storage.h"
#ifdef TFM_PSA_API
-#include "psa_service.h"
+#include "psa/service.h"
#include "tfm_sst_signal.h"
#include "flash_layout.h"
#endif
diff --git a/secure_fw/services/secure_storage/tfm_sst_req_mngr.h b/secure_fw/services/secure_storage/tfm_sst_req_mngr.h
index 964d9f2..d6a611e 100644
--- a/secure_fw/services/secure_storage/tfm_sst_req_mngr.h
+++ b/secure_fw/services/secure_storage/tfm_sst_req_mngr.h
@@ -10,7 +10,7 @@
#include <stddef.h>
-#include "psa_client.h"
+#include "psa/client.h"
#ifdef __cplusplus
extern "C" {
diff --git a/secure_fw/services/secure_storage/tfm_sst_secure_api.c b/secure_fw/services/secure_storage/tfm_sst_secure_api.c
index 5cb6d60..d38cb77 100644
--- a/secure_fw/services/secure_storage/tfm_sst_secure_api.c
+++ b/secure_fw/services/secure_storage/tfm_sst_secure_api.c
@@ -5,7 +5,7 @@
*
*/
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
#include "tfm_veneers.h"
#include "tfm_sst_defs.h"