mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-25 13:43:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Include psa/build_info.h instead of mbedtls/build_info.h

Browse Source 
In PSA headers include psa/build_info.h instead
of mbedtls/build_info.h. In Mbed TLS, both are
equivalent but not in TF-PSA-Crypto where
psa/build_info.h is the correct one.

Signed-off-by: Ronald Cron <ronald.cron@arm.com>
This commit is contained in:
Ronald Cron 2023-10-10 08:51:39 +02:00
parent 070e8652d5
commit 7871cb14a7
7 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/psa/crypto_platform.h
View File

@ -35,7 +35,7 @@
#include "mbedtls/private_access.h" #include "mbedtls/private_access.h"
/* /*
* Include the build-time configuration information file. Here, we do not * Include the build-time configuration information header. Here, we do not
* include `"mbedtls/build_info.h"` directly but `"psa/build_info.h"`, which * 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 * 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 * TF-PSA-Crypto repository which has a different build system and

2
include/psa/crypto_sizes.h
View File

@ -41,7 +41,7 @@
#define PSA_CRYPTO_SIZES_H #define PSA_CRYPTO_SIZES_H
/* /*
* Include the build-time configuration information file. Here, we do not * Include the build-time configuration information header. Here, we do not
* include `"mbedtls/build_info.h"` directly but `"psa/build_info.h"`, which * 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 * 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 * TF-PSA-Crypto repository which has a different build system and

11
include/psa/crypto_struct.h
View File

@ -66,9 +66,14 @@
extern "C" { extern "C" {
#endif #endif
/* Include the Mbed TLS configuration file, the way Mbed TLS does it /*
* in each of its header files. */ * Include the build-time configuration information header. Here, we do not
#include "mbedtls/build_info.h" * 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 the context definition for the compiled-in drivers for the primitive /* Include the context definition for the compiled-in drivers for the primitive
* algorithms. */ * algorithms. */

11
include/psa/crypto_types.h
View File

@ -33,8 +33,15 @@
#ifndef PSA_CRYPTO_TYPES_H #ifndef PSA_CRYPTO_TYPES_H
#define PSA_CRYPTO_TYPES_H #define PSA_CRYPTO_TYPES_H
/* Make sure the Mbed TLS configuration is visible. */ /*
#include "mbedtls/build_info.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"
/* Define the MBEDTLS_PRIVATE macro. */ /* Define the MBEDTLS_PRIVATE macro. */
#include "mbedtls/private_access.h" #include "mbedtls/private_access.h"

9
library/psa_crypto_core.h
View File

@ -21,7 +21,14 @@
#ifndef PSA_CRYPTO_CORE_H #ifndef PSA_CRYPTO_CORE_H
#define PSA_CRYPTO_CORE_H #define PSA_CRYPTO_CORE_H
#include "mbedtls/build_info.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 "psa/crypto.h" #include "psa/crypto.h"
#include "psa/crypto_se_driver.h" #include "psa/crypto_se_driver.h"

9
library/psa_crypto_invasive.h
View File

@ -28,7 +28,14 @@
#ifndef PSA_CRYPTO_INVASIVE_H #ifndef PSA_CRYPTO_INVASIVE_H
#define PSA_CRYPTO_INVASIVE_H #define PSA_CRYPTO_INVASIVE_H
#include "mbedtls/build_info.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 "psa/crypto.h" #include "psa/crypto.h"
#include "common.h" #include "common.h"

9
library/psa_crypto_se.h
View File

@ -21,7 +21,14 @@
#ifndef PSA_CRYPTO_SE_H #ifndef PSA_CRYPTO_SE_H
#define PSA_CRYPTO_SE_H #define PSA_CRYPTO_SE_H
#include "mbedtls/build_info.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 "psa/crypto.h" #include "psa/crypto.h"
#include "psa/crypto_se_driver.h" #include "psa/crypto_se_driver.h"