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/interface/include/psa_client.h b/interface/include/psa/client.h
similarity index 100%
rename from interface/include/psa_client.h
rename to interface/include/psa/client.h
diff --git a/interface/include/psa_crypto.h b/interface/include/psa/crypto.h
similarity index 99%
rename from interface/include/psa_crypto.h
rename to interface/include/psa/crypto.h
index 35acbc1..1e0c9d0 100644
--- a/interface/include/psa_crypto.h
+++ b/interface/include/psa/crypto.h
@@ -5,14 +5,14 @@
*
*/
/**
- * \file psa_crypto.h
+ * \file psa/crypto.h
* \brief Platform Security Architecture cryptography module
*/
#ifndef PSA_CRYPTO_H
#define PSA_CRYPTO_H
-#include "psa_crypto_platform.h"
+#include "psa/crypto_platform.h"
#include <stddef.h>
@@ -45,11 +45,11 @@
/* The file "crypto_types.h" declares types that encode errors,
* algorithms, key types, policies, etc. */
-#include "psa_crypto_types.h"
+#include "psa/crypto_types.h"
/* The file "crypto_values.h" declares macros to build and analyze values
* of integral types defined in "crypto_types.h". */
-#include "psa_crypto_values.h"
+#include "psa/crypto_values.h"
/** \defgroup initialization Library initialization
* @{
@@ -2365,14 +2365,14 @@
/* The file "crypto_sizes.h" contains definitions for size calculation
* macros whose definitions are implementation-specific. */
-#include "psa_crypto_sizes.h"
+#include "psa/crypto_sizes.h"
/* The file "crypto_struct.h" contains definitions for
* implementation-specific structs that are declared above. */
-#include "psa_crypto_struct.h"
+#include "psa/crypto_struct.h"
/* The file "crypto_extra.h" contains vendor-specific definitions. This
* can include vendor-defined algorithms, extra functions, etc. */
-#include "psa_crypto_extra.h"
+#include "psa/crypto_extra.h"
#endif /* PSA_CRYPTO_H */
diff --git a/interface/include/psa_crypto_extra.h b/interface/include/psa/crypto_extra.h
similarity index 91%
rename from interface/include/psa_crypto_extra.h
rename to interface/include/psa/crypto_extra.h
index 7c8ba5f..3f08fa7 100644
--- a/interface/include/psa_crypto_extra.h
+++ b/interface/include/psa/crypto_extra.h
@@ -5,12 +5,12 @@
*
*/
/**
- * \file psa_crypto_extra.h
+ * \file psa/crypto_extra.h
*
* \brief PSA cryptography module: vendor extensions
*
* \note This file may not be included directly. Applications must
- * include psa_crypto.h.
+ * include psa/crypto.h.
*
* This file is reserved for vendor-specific definitions.
*/
diff --git a/interface/include/psa_crypto_platform.h b/interface/include/psa/crypto_platform.h
similarity index 93%
rename from interface/include/psa_crypto_platform.h
rename to interface/include/psa/crypto_platform.h
index 5033471..c5def6f 100644
--- a/interface/include/psa_crypto_platform.h
+++ b/interface/include/psa/crypto_platform.h
@@ -5,12 +5,12 @@
*
*/
/**
- * \file psa_crypto_platform.h
+ * \file psa/crypto_platform.h
*
* \brief PSA cryptography module: platform definitions
*
* \note This file may not be included directly. Applications must
- * include psa_crypto.h.
+ * include psa/crypto.h.
*
* This file contains platform-dependent type definitions.
*
diff --git a/interface/include/psa_crypto_sizes.h b/interface/include/psa/crypto_sizes.h
similarity index 99%
rename from interface/include/psa_crypto_sizes.h
rename to interface/include/psa/crypto_sizes.h
index f0983b0..4c62239 100644
--- a/interface/include/psa_crypto_sizes.h
+++ b/interface/include/psa/crypto_sizes.h
@@ -5,12 +5,12 @@
*
*/
/**
- * \file psa_crypto_sizes.h
+ * \file psa/crypto_sizes.h
*
* \brief PSA cryptography module: buffer size macros
*
* \note This file may not be included directly. Applications must
- * include psa_crypto.h.
+ * include psa/crypto.h.
*
* This file contains the definitions of macros that are useful to
* compute buffer sizes. The signatures and semantics of these macros
diff --git a/interface/include/psa_crypto_struct.h b/interface/include/psa/crypto_struct.h
similarity index 96%
rename from interface/include/psa_crypto_struct.h
rename to interface/include/psa/crypto_struct.h
index 8e252a0..3502bdc 100644
--- a/interface/include/psa_crypto_struct.h
+++ b/interface/include/psa/crypto_struct.h
@@ -5,12 +5,12 @@
*
*/
/**
- * \file psa_crypto_struct.h
+ * \file psa/crypto_struct.h
*
* \brief PSA cryptography module: structured type implementations
*
* \note This file may not be included directly. Applications must
- * include psa_crypto.h.
+ * include psa/crypto.h.
*
* This file contains the definitions of some data structures with
* implementation-specific definitions.
diff --git a/interface/include/psa_crypto_types.h b/interface/include/psa/crypto_types.h
similarity index 95%
rename from interface/include/psa_crypto_types.h
rename to interface/include/psa/crypto_types.h
index 58c3523..bf5b824 100644
--- a/interface/include/psa_crypto_types.h
+++ b/interface/include/psa/crypto_types.h
@@ -5,12 +5,12 @@
*
*/
/**
- * \file psa_crypto_types.h
+ * \file psa/crypto_types.h
*
* \brief PSA cryptography module: type aliases.
*
* \note This file may not be included directly. Applications must
- * include psa_crypto.h. Drivers must include the appropriate driver
+ * include psa/crypto.h. Drivers must include the appropriate driver
* header file.
*
* This file contains portable definitions of integral types for properties
diff --git a/interface/include/psa_crypto_values.h b/interface/include/psa/crypto_values.h
similarity index 99%
rename from interface/include/psa_crypto_values.h
rename to interface/include/psa/crypto_values.h
index d564334..315cd10 100644
--- a/interface/include/psa_crypto_values.h
+++ b/interface/include/psa/crypto_values.h
@@ -5,12 +5,12 @@
*
*/
/**
- * \file psa_crypto_values.h
+ * \file psa/crypto_values.h
*
* \brief PSA cryptography module: macros to build and analyze integer values.
*
* \note This file may not be included directly. Applications must
- * include psa_crypto.h. Drivers must include the appropriate driver
+ * include psa/crypto.h. Drivers must include the appropriate driver
* header file.
*
* This file contains portable definitions of macros to build and analyze
diff --git a/interface/include/psa_initial_attestation_api.h b/interface/include/psa/initial_attestation.h
similarity index 98%
rename from interface/include/psa_initial_attestation_api.h
rename to interface/include/psa/initial_attestation.h
index 1a7636f..133c6dd 100644
--- a/interface/include/psa_initial_attestation_api.h
+++ b/interface/include/psa/initial_attestation.h
@@ -12,8 +12,8 @@
/* to a stable set of APIs once all the feedback has been considered. */
/***************************************************************************/
-#ifndef __PSA_INITIAL_ATTESTATION_API_H__
-#define __PSA_INITIAL_ATTESTATION_API_H__
+#ifndef __PSA_INITIAL_ATTESTATION_H__
+#define __PSA_INITIAL_ATTESTATION_H__
#include <limits.h>
#include <stdint.h>
@@ -225,4 +225,4 @@
}
#endif
-#endif /* __PSA_INITIAL_ATTESTATION_API_H__ */
+#endif /* __PSA_INITIAL_ATTESTATION_H__ */
diff --git a/interface/include/psa_protected_storage.h b/interface/include/psa/protected_storage.h
similarity index 100%
rename from interface/include/psa_protected_storage.h
rename to interface/include/psa/protected_storage.h
diff --git a/interface/include/psa_service.h b/interface/include/psa/service.h
similarity index 99%
rename from interface/include/psa_service.h
rename to interface/include/psa/service.h
index e72d0df..2e8558a 100644
--- a/interface/include/psa_service.h
+++ b/interface/include/psa/service.h
@@ -14,7 +14,7 @@
#include <inttypes.h>
-#include "psa_client.h"
+#include "psa/client.h"
/********************** PSA Secure Partition Macros and Types ****************/
diff --git a/interface/include/tfm_api.h b/interface/include/tfm_api.h
index 8e152ff..5a56ec7 100644
--- a/interface/include/tfm_api.h
+++ b/interface/include/tfm_api.h
@@ -13,7 +13,7 @@
#endif
#include <stdint.h>
-#include "psa_client.h"
+#include "psa/client.h"
#define TFM_INVALID_CLIENT_ID 0
diff --git a/interface/include/tfm_crypto_defs.h b/interface/include/tfm_crypto_defs.h
index 23154a6..f5fd674 100644
--- a/interface/include/tfm_crypto_defs.h
+++ b/interface/include/tfm_crypto_defs.h
@@ -15,7 +15,7 @@
#include <stdint.h>
#include <limits.h>
#include "tfm_api.h"
-#include "psa_crypto.h"
+#include "psa/crypto.h"
/**
* \brief This type is used to overcome a limitation in the number of maximum
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 */
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
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);
}
-
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"