Crypto: Don't prefix psa/ to header inclusions from main
Reduces the degrees of freedom when including PSA crypto
headers. The PSA Crypto headers are always guaranteed to
be in the same directory of the main psa/crypto.h.
Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com>
Change-Id: I5b2e4400f1cf885d507e3f755602b60051a1b9ab
diff --git a/interface/include/psa/crypto.h b/interface/include/psa/crypto.h
index a32c5bd..290cfe7 100644
--- a/interface/include/psa/crypto.h
+++ b/interface/include/psa/crypto.h
@@ -15,7 +15,7 @@
#if defined(MBEDTLS_PSA_CRYPTO_PLATFORM_FILE)
#include MBEDTLS_PSA_CRYPTO_PLATFORM_FILE
#else
-#include "psa/crypto_platform.h"
+#include "crypto_platform.h"
#endif
#include <stddef.h>
@@ -39,7 +39,7 @@
/* The file "crypto_types.h" declares types that encode errors,
* algorithms, key types, policies, etc. */
-#include "psa/crypto_types.h"
+#include "crypto_types.h"
/** \defgroup version API version
* @{
@@ -59,7 +59,7 @@
/* 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 "crypto_values.h"
/** \defgroup initialization Library initialization
* @{
@@ -4045,18 +4045,18 @@
/* The file "crypto_sizes.h" contains definitions for size calculation
* macros whose definitions are implementation-specific. */
-#include "psa/crypto_sizes.h"
+#include "crypto_sizes.h"
/* The file "crypto_struct.h" contains definitions for
* implementation-specific structs that are declared above. */
#if defined(MBEDTLS_PSA_CRYPTO_STRUCT_FILE)
#include MBEDTLS_PSA_CRYPTO_STRUCT_FILE
#else
-#include "psa/crypto_struct.h"
+#include "crypto_struct.h"
#endif
/* The file "crypto_extra.h" contains vendor-specific definitions. This
* can include vendor-defined algorithms, extra functions, etc. */
-#include "psa/crypto_extra.h"
+#include "crypto_extra.h"
#endif /* PSA_CRYPTO_H */
diff --git a/interface/include/psa/crypto_extra.h b/interface/include/psa/crypto_extra.h
index 6310859..9e19261 100644
--- a/interface/include/psa/crypto_extra.h
+++ b/interface/include/psa/crypto_extra.h
@@ -18,8 +18,8 @@
#ifndef PSA_CRYPTO_EXTRA_H
#define PSA_CRYPTO_EXTRA_H
-#include "psa/crypto_types.h"
-#include "psa/crypto_compat.h"
+#include "crypto_types.h"
+#include "crypto_compat.h"
#ifdef __cplusplus
extern "C" {
diff --git a/interface/include/psa/crypto_sizes.h b/interface/include/psa/crypto_sizes.h
index 18a4b1f..82ec099 100644
--- a/interface/include/psa/crypto_sizes.h
+++ b/interface/include/psa/crypto_sizes.h
@@ -182,7 +182,7 @@
#if defined(MBEDTLS_PSA_CRYPTO_CONFIG_FILE)
#include MBEDTLS_PSA_CRYPTO_CONFIG_FILE
#else
-#include "psa/crypto_config.h"
+#include "crypto_config.h"
#endif
#if defined(PSA_WANT_ECC_SECP_R1_521)
#define PSA_VENDOR_ECC_MAX_CURVE_BITS 521
diff --git a/interface/include/psa/crypto_struct.h b/interface/include/psa/crypto_struct.h
index 50a4cf2..21d4e90 100644
--- a/interface/include/psa/crypto_struct.h
+++ b/interface/include/psa/crypto_struct.h
@@ -121,7 +121,7 @@
* The server has a different definition of psa_key_attributes_s which
* maintains more attributes.
*/
-#include "psa/crypto_client_struct.h"
+#include "crypto_client_struct.h"
struct psa_key_attributes_s {
struct psa_client_key_attributes_s client;
};
diff --git a/interface/include/psa/crypto_types.h b/interface/include/psa/crypto_types.h
index aaa7e05..99dae56 100644
--- a/interface/include/psa/crypto_types.h
+++ b/interface/include/psa/crypto_types.h
@@ -37,7 +37,7 @@
#if defined(MBEDTLS_PSA_CRYPTO_PLATFORM_FILE)
#include MBEDTLS_PSA_CRYPTO_PLATFORM_FILE
#else
-#include "psa/crypto_platform.h"
+#include "crypto_platform.h"
#endif
#include <stdint.h>