From f6d17ca13c1261843770cb6fc76373ab8a5f1dfd Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Wed, 6 Nov 2024 14:11:15 +0100 Subject: [PATCH] Switch to tf-psa-crypto/build_info.h Signed-off-by: Ronald Cron --- tests/Makefile | 5 +++-- tf-psa-crypto/core/common.h | 2 +- tf-psa-crypto/core/psa_crypto_core.h | 9 +-------- tf-psa-crypto/core/psa_crypto_invasive.h | 9 +-------- tf-psa-crypto/core/psa_crypto_se.h | 9 +-------- tf-psa-crypto/drivers/builtin/include/mbedtls/aes.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/aria.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/asn1.h | 2 +- .../drivers/builtin/include/mbedtls/asn1write.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/base64.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/bignum.h | 2 +- .../drivers/builtin/include/mbedtls/block_cipher.h | 2 +- .../drivers/builtin/include/mbedtls/camellia.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/ccm.h | 2 +- .../drivers/builtin/include/mbedtls/chacha20.h | 2 +- .../drivers/builtin/include/mbedtls/chachapoly.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/cipher.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/cmac.h | 2 +- .../drivers/builtin/include/mbedtls/ctr_drbg.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/des.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/dhm.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/ecdh.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/ecdsa.h | 2 +- .../drivers/builtin/include/mbedtls/ecjpake.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/ecp.h | 2 +- .../drivers/builtin/include/mbedtls/entropy.h | 2 +- .../drivers/builtin/include/mbedtls/error_common.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/gcm.h | 2 +- .../drivers/builtin/include/mbedtls/hmac_drbg.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/lms.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/md.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/md5.h | 2 +- .../builtin/include/mbedtls/memory_buffer_alloc.h | 2 +- .../drivers/builtin/include/mbedtls/nist_kw.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/oid.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/pem.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/pk.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/pkcs12.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/pkcs5.h | 2 +- .../drivers/builtin/include/mbedtls/platform.h | 2 +- .../drivers/builtin/include/mbedtls/platform_time.h | 2 +- .../drivers/builtin/include/mbedtls/platform_util.h | 2 +- .../drivers/builtin/include/mbedtls/poly1305.h | 2 +- .../drivers/builtin/include/mbedtls/psa_util.h | 2 +- .../drivers/builtin/include/mbedtls/ripemd160.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/rsa.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/sha1.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/sha256.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/sha3.h | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/sha512.h | 2 +- .../drivers/builtin/include/mbedtls/threading.h | 2 +- tf-psa-crypto/drivers/builtin/src/aesce.h | 1 - tf-psa-crypto/drivers/builtin/src/aesni.h | 2 +- .../drivers/builtin/src/block_cipher_internal.h | 2 +- tf-psa-crypto/drivers/builtin/src/bn_mul.h | 2 +- tf-psa-crypto/drivers/builtin/src/cipher_wrap.h | 2 +- tf-psa-crypto/drivers/builtin/src/entropy_poll.h | 2 +- tf-psa-crypto/drivers/builtin/src/lmots.h | 2 +- tf-psa-crypto/drivers/builtin/src/md_wrap.h | 2 +- tf-psa-crypto/drivers/builtin/src/pk_wrap.h | 2 +- tf-psa-crypto/drivers/builtin/src/pkwrite.h | 2 +- tf-psa-crypto/drivers/builtin/src/rsa_alt_helpers.h | 2 +- tf-psa-crypto/include/CMakeLists.txt | 5 +++++ tf-psa-crypto/include/psa/crypto_platform.h | 10 +--------- tf-psa-crypto/include/psa/crypto_sizes.h | 9 +-------- tf-psa-crypto/include/psa/crypto_struct.h | 9 +-------- tf-psa-crypto/include/psa/crypto_types.h | 9 +-------- .../include/{psa => tf-psa-crypto}/build_info.h | 2 +- 68 files changed, 73 insertions(+), 118 deletions(-) rename tf-psa-crypto/include/{psa => tf-psa-crypto}/build_info.h (92%) diff --git a/tests/Makefile b/tests/Makefile index 7063d81cbb..9254da00f2 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -315,9 +315,10 @@ define libtestdriver1_rewrite := s!^(\s*#\s*include\s*[\"<])mbedtls/check_config.h!$${1}libtestdriver1/include/mbedtls/check_config.h!; \ s!^(\s*#\s*include\s*[\"<])mbedtls/!$${1}libtestdriver1/tf-psa-crypto/drivers/builtin/include/mbedtls/!; \ s!^(\s*#\s*include\s*[\"<])psa/!$${1}libtestdriver1/tf-psa-crypto/include/psa/!; \ + s!^(\s*#\s*include\s*[\"<])tf-psa-crypto/!$${1}libtestdriver1/tf-psa-crypto/include/tf-psa-crypto/!; \ next if /^\s*#\s*include/; \ - s/\b(?=MBEDTLS_|PSA_)/LIBTESTDRIVER1_/g; \ - s/\b(?=mbedtls_|psa_)/libtestdriver1_/g; + s/\b(?=MBEDTLS_|PSA_|TF_PSA_CRYPTO_)/LIBTESTDRIVER1_/g; \ + s/\b(?=mbedtls_|psa_|tf_psa_crypto_)/libtestdriver1_/g; endef libtestdriver1.a: diff --git a/tf-psa-crypto/core/common.h b/tf-psa-crypto/core/common.h index 7bb2674293..ff57b47de4 100644 --- a/tf-psa-crypto/core/common.h +++ b/tf-psa-crypto/core/common.h @@ -11,7 +11,7 @@ #ifndef MBEDTLS_LIBRARY_COMMON_H #define MBEDTLS_LIBRARY_COMMON_H -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "alignment.h" #include diff --git a/tf-psa-crypto/core/psa_crypto_core.h b/tf-psa-crypto/core/psa_crypto_core.h index 1c670cd796..e4c7943e33 100644 --- a/tf-psa-crypto/core/psa_crypto_core.h +++ b/tf-psa-crypto/core/psa_crypto_core.h @@ -9,14 +9,7 @@ #ifndef PSA_CRYPTO_CORE_H #define PSA_CRYPTO_CORE_H -/* - * Include the build-time configuration information header. Here, we do not - * include `"mbedtls/build_info.h"` directly but `"psa/build_info.h"`, which - * is basically just an alias to it. This is to ease the maintenance of the - * TF-PSA-Crypto repository which has a different build system and - * configuration. - */ -#include "psa/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "psa/crypto.h" #include "psa/crypto_se_driver.h" diff --git a/tf-psa-crypto/core/psa_crypto_invasive.h b/tf-psa-crypto/core/psa_crypto_invasive.h index 51c90c64a4..32c7b15618 100644 --- a/tf-psa-crypto/core/psa_crypto_invasive.h +++ b/tf-psa-crypto/core/psa_crypto_invasive.h @@ -16,14 +16,7 @@ #ifndef PSA_CRYPTO_INVASIVE_H #define PSA_CRYPTO_INVASIVE_H -/* - * Include the build-time configuration information header. Here, we do not - * include `"mbedtls/build_info.h"` directly but `"psa/build_info.h"`, which - * is basically just an alias to it. This is to ease the maintenance of the - * TF-PSA-Crypto repository which has a different build system and - * configuration. - */ -#include "psa/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "psa/crypto.h" #include "common.h" diff --git a/tf-psa-crypto/core/psa_crypto_se.h b/tf-psa-crypto/core/psa_crypto_se.h index e0bd5acfb3..8407781302 100644 --- a/tf-psa-crypto/core/psa_crypto_se.h +++ b/tf-psa-crypto/core/psa_crypto_se.h @@ -9,14 +9,7 @@ #ifndef PSA_CRYPTO_SE_H #define PSA_CRYPTO_SE_H -/* - * Include the build-time configuration information header. Here, we do not - * include `"mbedtls/build_info.h"` directly but `"psa/build_info.h"`, which - * is basically just an alias to it. This is to ease the maintenance of the - * TF-PSA-Crypto repository which has a different build system and - * configuration. - */ -#include "psa/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "psa/crypto.h" #include "psa/crypto_se_driver.h" diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/aes.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/aes.h index aa4d99c22a..a4273757cb 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/aes.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/aes.h @@ -29,7 +29,7 @@ #define MBEDTLS_AES_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/platform_util.h" #include diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/aria.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/aria.h index fa175f07c1..8581b3d7ef 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/aria.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/aria.h @@ -18,7 +18,7 @@ #define MBEDTLS_ARIA_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include #include diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/asn1.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/asn1.h index e2d7311a79..80e0a17fac 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/asn1.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/asn1.h @@ -11,7 +11,7 @@ #define MBEDTLS_ASN1_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/platform_util.h" #include diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/asn1write.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/asn1write.h index 7081996223..c89e0da600 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/asn1write.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/asn1write.h @@ -10,7 +10,7 @@ #ifndef MBEDTLS_ASN1_WRITE_H #define MBEDTLS_ASN1_WRITE_H -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/asn1.h" diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/base64.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/base64.h index 8f459b74c5..591a80f8d6 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/base64.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/base64.h @@ -10,7 +10,7 @@ #ifndef MBEDTLS_BASE64_H #define MBEDTLS_BASE64_H -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/bignum.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/bignum.h index 40b7277d1b..b54b2391d2 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/bignum.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/bignum.h @@ -11,7 +11,7 @@ #define MBEDTLS_BIGNUM_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include #include diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/block_cipher.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/block_cipher.h index 3f60f6f7dd..87849a0ffb 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/block_cipher.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/block_cipher.h @@ -12,7 +12,7 @@ #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #if defined(MBEDTLS_AES_C) #include "mbedtls/aes.h" diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/camellia.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/camellia.h index 39266bf26c..535da61846 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/camellia.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/camellia.h @@ -11,7 +11,7 @@ #define MBEDTLS_CAMELLIA_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include #include diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/ccm.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/ccm.h index 67d173d7fc..c6ef1f0d34 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/ccm.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/ccm.h @@ -36,7 +36,7 @@ #define MBEDTLS_CCM_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/cipher.h" diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/chacha20.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/chacha20.h index ab7195e1c2..24f53cb6a5 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/chacha20.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/chacha20.h @@ -21,7 +21,7 @@ #define MBEDTLS_CHACHA20_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include #include diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/chachapoly.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/chachapoly.h index 6c236fe5e6..947a13d065 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/chachapoly.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/chachapoly.h @@ -21,7 +21,7 @@ #define MBEDTLS_CHACHAPOLY_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" /* for shared error codes */ #include "mbedtls/poly1305.h" diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/cipher.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/cipher.h index 75e95d3c4f..80095be15d 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/cipher.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/cipher.h @@ -16,7 +16,7 @@ #define MBEDTLS_CIPHER_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include #include "mbedtls/platform_util.h" diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/cmac.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/cmac.h index fd3d8a2bc7..ec217b7b56 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/cmac.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/cmac.h @@ -16,7 +16,7 @@ #define MBEDTLS_CMAC_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/cipher.h" diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/ctr_drbg.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/ctr_drbg.h index 0b7cce1923..98f39c1542 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/ctr_drbg.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/ctr_drbg.h @@ -30,7 +30,7 @@ #define MBEDTLS_CTR_DRBG_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" /* The CTR_DRBG implementation can either directly call the low-level AES * module (gated by MBEDTLS_AES_C) or call the PSA API to perform AES diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/des.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/des.h index dbe12edc9e..e40799f377 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/des.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/des.h @@ -16,7 +16,7 @@ #define MBEDTLS_DES_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/platform_util.h" #include diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/dhm.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/dhm.h index 01434052ea..11b0931536 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/dhm.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/dhm.h @@ -52,7 +52,7 @@ #define MBEDTLS_DHM_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/bignum.h" /* diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/ecdh.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/ecdh.h index 3d3e479fea..5528bb0b79 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/ecdh.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/ecdh.h @@ -21,7 +21,7 @@ #define MBEDTLS_ECDH_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/ecp.h" diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/ecdsa.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/ecdsa.h index fcb46e2a43..b900caa71e 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/ecdsa.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/ecdsa.h @@ -19,7 +19,7 @@ #define MBEDTLS_ECDSA_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/ecp.h" #include "mbedtls/md.h" diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/ecjpake.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/ecjpake.h index a75a8ec8f8..007041ecdb 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/ecjpake.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/ecjpake.h @@ -27,7 +27,7 @@ * The payloads are serialized in a way suitable for use in TLS, but could * also be use outside TLS. */ -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/ecp.h" #include "mbedtls/md.h" diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/ecp.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/ecp.h index 87d63ed13f..d0c99631b7 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/ecp.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/ecp.h @@ -23,7 +23,7 @@ #define MBEDTLS_ECP_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/platform_util.h" #include "mbedtls/bignum.h" diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/entropy.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/entropy.h index 964a996a55..cf5ec435b0 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/entropy.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/entropy.h @@ -11,7 +11,7 @@ #define MBEDTLS_ENTROPY_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/error_common.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/error_common.h index 58f1cde331..724da7aff0 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/error_common.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/error_common.h @@ -10,7 +10,7 @@ #ifndef MBEDTLS_ERROR_COMMON_H #define MBEDTLS_ERROR_COMMON_H -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/gcm.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/gcm.h index e620be7ba0..ce8a31cf54 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/gcm.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/gcm.h @@ -20,7 +20,7 @@ #define MBEDTLS_GCM_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/cipher.h" diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/hmac_drbg.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/hmac_drbg.h index 18b1b75a69..e00185e81b 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/hmac_drbg.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/hmac_drbg.h @@ -15,7 +15,7 @@ #define MBEDTLS_HMAC_DRBG_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/md.h" diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/lms.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/lms.h index 95fce21337..2ead973c97 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/lms.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/lms.h @@ -19,7 +19,7 @@ #include #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #define MBEDTLS_ERR_LMS_BAD_INPUT_DATA -0x0011 /**< Bad data has been input to an LMS function */ #define MBEDTLS_ERR_LMS_OUT_OF_PRIVATE_KEYS -0x0013 /**< Specified LMS key has utilised all of its private keys */ diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/md.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/md.h index 2c5af0b467..6a85fe465a 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/md.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/md.h @@ -17,7 +17,7 @@ #include -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/platform_util.h" /** The selected feature is not available. */ diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/md5.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/md5.h index ee39bc8251..2df058804c 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/md5.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/md5.h @@ -15,7 +15,7 @@ #define MBEDTLS_MD5_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include #include diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/memory_buffer_alloc.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/memory_buffer_alloc.h index b527d9b665..fa5ebe2731 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/memory_buffer_alloc.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/memory_buffer_alloc.h @@ -10,7 +10,7 @@ #ifndef MBEDTLS_MEMORY_BUFFER_ALLOC_H #define MBEDTLS_MEMORY_BUFFER_ALLOC_H -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/nist_kw.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/nist_kw.h index a99d925076..2a8ddc035e 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/nist_kw.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/nist_kw.h @@ -24,7 +24,7 @@ #define MBEDTLS_NIST_KW_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/cipher.h" diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/oid.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/oid.h index e0ad35e313..d4bbd09ff3 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/oid.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/oid.h @@ -11,7 +11,7 @@ #define MBEDTLS_OID_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/asn1.h" #include "mbedtls/pk.h" diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/pem.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/pem.h index 3c6a28d98d..38974c185b 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/pem.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/pem.h @@ -11,7 +11,7 @@ #define MBEDTLS_PEM_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/pk.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/pk.h index 3c0f6e17ce..4866ec565e 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/pk.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/pk.h @@ -12,7 +12,7 @@ #define MBEDTLS_PK_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/md.h" diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/pkcs12.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/pkcs12.h index 87f7681f29..bd684305f9 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/pkcs12.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/pkcs12.h @@ -10,7 +10,7 @@ #ifndef MBEDTLS_PKCS12_H #define MBEDTLS_PKCS12_H -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/md.h" #include "mbedtls/cipher.h" diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/pkcs5.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/pkcs5.h index 9ba5689d4a..c3f169642e 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/pkcs5.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/pkcs5.h @@ -12,7 +12,7 @@ #ifndef MBEDTLS_PKCS5_H #define MBEDTLS_PKCS5_H -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/platform_util.h" #include "mbedtls/asn1.h" diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/platform.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/platform.h index de3d71d9dc..f21a17ec58 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/platform.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/platform.h @@ -27,7 +27,7 @@ #define MBEDTLS_PLATFORM_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #if defined(MBEDTLS_HAVE_TIME) #include "mbedtls/platform_time.h" diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/platform_time.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/platform_time.h index 97f1963aba..bd976ff80b 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/platform_time.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/platform_time.h @@ -10,7 +10,7 @@ #ifndef MBEDTLS_PLATFORM_TIME_H #define MBEDTLS_PLATFORM_TIME_H -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #ifdef __cplusplus extern "C" { diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/platform_util.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/platform_util.h index 1b371ef3f4..1805914032 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/platform_util.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/platform_util.h @@ -11,7 +11,7 @@ #ifndef MBEDTLS_PLATFORM_UTIL_H #define MBEDTLS_PLATFORM_UTIL_H -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include #if defined(MBEDTLS_HAVE_TIME_DATE) diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/poly1305.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/poly1305.h index b70bfb8db0..3ee3514a16 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/poly1305.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/poly1305.h @@ -21,7 +21,7 @@ #define MBEDTLS_POLY1305_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include #include diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/psa_util.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/psa_util.h index bf2748a6d1..7fa0a83666 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/psa_util.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/psa_util.h @@ -12,7 +12,7 @@ #define MBEDTLS_PSA_UTIL_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "psa/crypto.h" diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/ripemd160.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/ripemd160.h index 42f29730d3..4b701877d0 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/ripemd160.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/ripemd160.h @@ -11,7 +11,7 @@ #define MBEDTLS_RIPEMD160_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include #include diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/rsa.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/rsa.h index cc839f2198..cd60af843d 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/rsa.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/rsa.h @@ -17,7 +17,7 @@ #define MBEDTLS_RSA_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/bignum.h" #include "mbedtls/md.h" diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/sha1.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/sha1.h index dd47d34bce..506941190c 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/sha1.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/sha1.h @@ -18,7 +18,7 @@ #define MBEDTLS_SHA1_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include #include diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/sha256.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/sha256.h index 05040ded86..fc2e31ed57 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/sha256.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/sha256.h @@ -14,7 +14,7 @@ #define MBEDTLS_SHA256_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include #include diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/sha3.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/sha3.h index 3eeee65e66..7d2df34d8c 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/sha3.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/sha3.h @@ -16,7 +16,7 @@ #define MBEDTLS_SHA3_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include #include diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/sha512.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/sha512.h index 9d0191870d..c0f1cbb9de 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/sha512.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/sha512.h @@ -13,7 +13,7 @@ #define MBEDTLS_SHA512_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include #include diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/threading.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/threading.h index b4df0e38be..f94d579ab5 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/threading.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/threading.h @@ -11,7 +11,7 @@ #define MBEDTLS_THREADING_H #include "mbedtls/private_access.h" -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/aesce.h b/tf-psa-crypto/drivers/builtin/src/aesce.h index a14d085efa..130f765749 100644 --- a/tf-psa-crypto/drivers/builtin/src/aesce.h +++ b/tf-psa-crypto/drivers/builtin/src/aesce.h @@ -14,7 +14,6 @@ #ifndef MBEDTLS_AESCE_H #define MBEDTLS_AESCE_H -#include "mbedtls/build_info.h" #include "common.h" #include "mbedtls/aes.h" diff --git a/tf-psa-crypto/drivers/builtin/src/aesni.h b/tf-psa-crypto/drivers/builtin/src/aesni.h index 59e27afd3e..5543d6910d 100644 --- a/tf-psa-crypto/drivers/builtin/src/aesni.h +++ b/tf-psa-crypto/drivers/builtin/src/aesni.h @@ -13,7 +13,7 @@ #ifndef MBEDTLS_AESNI_H #define MBEDTLS_AESNI_H -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/aes.h" diff --git a/tf-psa-crypto/drivers/builtin/src/block_cipher_internal.h b/tf-psa-crypto/drivers/builtin/src/block_cipher_internal.h index c57338b751..bd1f390732 100644 --- a/tf-psa-crypto/drivers/builtin/src/block_cipher_internal.h +++ b/tf-psa-crypto/drivers/builtin/src/block_cipher_internal.h @@ -11,7 +11,7 @@ #ifndef MBEDTLS_BLOCK_CIPHER_INTERNAL_H #define MBEDTLS_BLOCK_CIPHER_INTERNAL_H -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/cipher.h" diff --git a/tf-psa-crypto/drivers/builtin/src/bn_mul.h b/tf-psa-crypto/drivers/builtin/src/bn_mul.h index 0738469db4..77928240c2 100644 --- a/tf-psa-crypto/drivers/builtin/src/bn_mul.h +++ b/tf-psa-crypto/drivers/builtin/src/bn_mul.h @@ -24,7 +24,7 @@ #ifndef MBEDTLS_BN_MUL_H #define MBEDTLS_BN_MUL_H -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/bignum.h" diff --git a/tf-psa-crypto/drivers/builtin/src/cipher_wrap.h b/tf-psa-crypto/drivers/builtin/src/cipher_wrap.h index f22915120d..4d159ab846 100644 --- a/tf-psa-crypto/drivers/builtin/src/cipher_wrap.h +++ b/tf-psa-crypto/drivers/builtin/src/cipher_wrap.h @@ -12,7 +12,7 @@ #ifndef MBEDTLS_CIPHER_WRAP_H #define MBEDTLS_CIPHER_WRAP_H -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/cipher.h" diff --git a/tf-psa-crypto/drivers/builtin/src/entropy_poll.h b/tf-psa-crypto/drivers/builtin/src/entropy_poll.h index 6b4aec03e1..dd1ee2c0b3 100644 --- a/tf-psa-crypto/drivers/builtin/src/entropy_poll.h +++ b/tf-psa-crypto/drivers/builtin/src/entropy_poll.h @@ -10,7 +10,7 @@ #ifndef MBEDTLS_ENTROPY_POLL_H #define MBEDTLS_ENTROPY_POLL_H -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/lmots.h b/tf-psa-crypto/drivers/builtin/src/lmots.h index cf92d326c9..fc8763d11e 100644 --- a/tf-psa-crypto/drivers/builtin/src/lmots.h +++ b/tf-psa-crypto/drivers/builtin/src/lmots.h @@ -14,7 +14,7 @@ #ifndef MBEDTLS_LMOTS_H #define MBEDTLS_LMOTS_H -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "psa/crypto.h" diff --git a/tf-psa-crypto/drivers/builtin/src/md_wrap.h b/tf-psa-crypto/drivers/builtin/src/md_wrap.h index dad123540a..5d71c4978f 100644 --- a/tf-psa-crypto/drivers/builtin/src/md_wrap.h +++ b/tf-psa-crypto/drivers/builtin/src/md_wrap.h @@ -14,7 +14,7 @@ #ifndef MBEDTLS_MD_WRAP_H #define MBEDTLS_MD_WRAP_H -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/md.h" diff --git a/tf-psa-crypto/drivers/builtin/src/pk_wrap.h b/tf-psa-crypto/drivers/builtin/src/pk_wrap.h index 976ef7f472..870ff3acf7 100644 --- a/tf-psa-crypto/drivers/builtin/src/pk_wrap.h +++ b/tf-psa-crypto/drivers/builtin/src/pk_wrap.h @@ -11,7 +11,7 @@ #ifndef MBEDTLS_PK_WRAP_H #define MBEDTLS_PK_WRAP_H -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/pk.h" diff --git a/tf-psa-crypto/drivers/builtin/src/pkwrite.h b/tf-psa-crypto/drivers/builtin/src/pkwrite.h index f7fb18aa4f..4611643a58 100644 --- a/tf-psa-crypto/drivers/builtin/src/pkwrite.h +++ b/tf-psa-crypto/drivers/builtin/src/pkwrite.h @@ -11,7 +11,7 @@ #ifndef MBEDTLS_PK_WRITE_H #define MBEDTLS_PK_WRITE_H -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/pk.h" diff --git a/tf-psa-crypto/drivers/builtin/src/rsa_alt_helpers.h b/tf-psa-crypto/drivers/builtin/src/rsa_alt_helpers.h index f234036e61..ee60edff1c 100644 --- a/tf-psa-crypto/drivers/builtin/src/rsa_alt_helpers.h +++ b/tf-psa-crypto/drivers/builtin/src/rsa_alt_helpers.h @@ -47,7 +47,7 @@ #ifndef MBEDTLS_RSA_ALT_HELPERS_H #define MBEDTLS_RSA_ALT_HELPERS_H -#include "mbedtls/build_info.h" +#include "tf-psa-crypto/build_info.h" #include "mbedtls/bignum.h" diff --git a/tf-psa-crypto/include/CMakeLists.txt b/tf-psa-crypto/include/CMakeLists.txt index bca86ff4ee..bfdfb74165 100644 --- a/tf-psa-crypto/include/CMakeLists.txt +++ b/tf-psa-crypto/include/CMakeLists.txt @@ -2,12 +2,17 @@ option(INSTALL_TF_PSA_CRYPTO_HEADERS "Install TF PSA Crypto headers." ON) if(INSTALL_TF_PSA_CRYPTO_HEADERS) file(GLOB psa_headers "psa/*.h") + file(GLOB tf-psa-crypto_headers "tf-psa-crypto/*.h") file(GLOB mbedtls_crypto_headers "../drivers/builtin/include/mbedtls/*.h") install(FILES ${psa_headers} DESTINATION include/psa PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) + install(FILES ${tf-psa-crypto_headers} + DESTINATION include/tf-psa-crypto + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) + install(FILES ${mbedtls_crypto_headers} DESTINATION include/mbedtls PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) diff --git a/tf-psa-crypto/include/psa/crypto_platform.h b/tf-psa-crypto/include/psa/crypto_platform.h index a871ee1246..10f109e4c1 100644 --- a/tf-psa-crypto/include/psa/crypto_platform.h +++ b/tf-psa-crypto/include/psa/crypto_platform.h @@ -21,15 +21,7 @@ #ifndef PSA_CRYPTO_PLATFORM_H #define PSA_CRYPTO_PLATFORM_H #include "mbedtls/private_access.h" - -/* - * Include the build-time configuration information header. Here, we do not - * include `"mbedtls/build_info.h"` directly but `"psa/build_info.h"`, which - * is basically just an alias to it. This is to ease the maintenance of the - * TF-PSA-Crypto repository which has a different build system and - * configuration. - */ -#include "psa/build_info.h" +#include "tf-psa-crypto/build_info.h" /* PSA requires several types which C99 provides in stdint.h. */ #include diff --git a/tf-psa-crypto/include/psa/crypto_sizes.h b/tf-psa-crypto/include/psa/crypto_sizes.h index 87b8c39fa6..0b21fe799d 100644 --- a/tf-psa-crypto/include/psa/crypto_sizes.h +++ b/tf-psa-crypto/include/psa/crypto_sizes.h @@ -28,14 +28,7 @@ #ifndef PSA_CRYPTO_SIZES_H #define PSA_CRYPTO_SIZES_H -/* - * Include the build-time configuration information header. Here, we do not - * include `"mbedtls/build_info.h"` directly but `"psa/build_info.h"`, which - * is basically just an alias to it. This is to ease the maintenance of the - * TF-PSA-Crypto repository which has a different build system and - * configuration. - */ -#include "psa/build_info.h" +#include "tf-psa-crypto/build_info.h" #define PSA_BITS_TO_BYTES(bits) (((bits) + 7u) / 8u) #define PSA_BYTES_TO_BITS(bytes) ((bytes) * 8u) diff --git a/tf-psa-crypto/include/psa/crypto_struct.h b/tf-psa-crypto/include/psa/crypto_struct.h index ffaf6c2b66..38b067a2d0 100644 --- a/tf-psa-crypto/include/psa/crypto_struct.h +++ b/tf-psa-crypto/include/psa/crypto_struct.h @@ -54,14 +54,7 @@ extern "C" { #endif -/* - * Include the build-time configuration information header. Here, we do not - * include `"mbedtls/build_info.h"` directly but `"psa/build_info.h"`, which - * is basically just an alias to it. This is to ease the maintenance of the - * TF-PSA-Crypto repository which has a different build system and - * configuration. - */ -#include "psa/build_info.h" +#include "tf-psa-crypto/build_info.h" /* Include the context definition for the compiled-in drivers for the primitive * algorithms. */ diff --git a/tf-psa-crypto/include/psa/crypto_types.h b/tf-psa-crypto/include/psa/crypto_types.h index bb857abb09..cd74e14139 100644 --- a/tf-psa-crypto/include/psa/crypto_types.h +++ b/tf-psa-crypto/include/psa/crypto_types.h @@ -21,14 +21,7 @@ #ifndef PSA_CRYPTO_TYPES_H #define PSA_CRYPTO_TYPES_H -/* - * Include the build-time configuration information header. Here, we do not - * include `"mbedtls/build_info.h"` directly but `"psa/build_info.h"`, which - * is basically just an alias to it. This is to ease the maintenance of the - * TF-PSA-Crypto repository which has a different build system and - * configuration. - */ -#include "psa/build_info.h" +#include "tf-psa-crypto/build_info.h" /* Define the MBEDTLS_PRIVATE macro. */ #include "mbedtls/private_access.h" diff --git a/tf-psa-crypto/include/psa/build_info.h b/tf-psa-crypto/include/tf-psa-crypto/build_info.h similarity index 92% rename from tf-psa-crypto/include/psa/build_info.h rename to tf-psa-crypto/include/tf-psa-crypto/build_info.h index 3ee6cd7b1b..1dc4ebc180 100644 --- a/tf-psa-crypto/include/psa/build_info.h +++ b/tf-psa-crypto/include/tf-psa-crypto/build_info.h @@ -1,5 +1,5 @@ /** - * \file psa/build_info.h + * \file tf-psa-crypto/build_info.h * * \brief Build-time PSA configuration info *