From 6397673cb8d06cf94160b9ec5444b951b5f736de Mon Sep 17 00:00:00 2001 From: Yanray Wang Date: Wed, 17 May 2023 12:41:25 +0800 Subject: [PATCH 1/3] build_info.h: change location of including config_psa.h In build_info.h, some macros are defined based on PSA_WANT_XXX symbol. This commit tweaks the location of including config_psa.h so that macros in build_info.h could imply config options correctly. Signed-off-by: Yanray Wang --- include/mbedtls/build_info.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/include/mbedtls/build_info.h b/include/mbedtls/build_info.h index ba5844fc63..d271049857 100644 --- a/include/mbedtls/build_info.h +++ b/include/mbedtls/build_info.h @@ -87,6 +87,12 @@ #define MBEDTLS_MD_C #endif +/* PSA crypto specific configuration options */ +#if defined(MBEDTLS_PSA_CRYPTO_CONFIG) /* PSA_WANT_xxx influences MBEDTLS_xxx */ || \ + defined(MBEDTLS_PSA_CRYPTO_C) /* MBEDTLS_xxx influences PSA_WANT_xxx */ +#include "mbedtls/config_psa.h" +#endif + /* Auto-enable MBEDTLS_MD_LIGHT based on MBEDTLS_MD_C. * This allows checking for MD_LIGHT rather than MD_LIGHT || MD_C. */ @@ -185,11 +191,6 @@ /* Make sure all configuration symbols are set before including check_config.h, * even the ones that are calculated programmatically. */ -#if defined(MBEDTLS_PSA_CRYPTO_CONFIG) /* PSA_WANT_xxx influences MBEDTLS_xxx */ || \ - defined(MBEDTLS_PSA_CRYPTO_C) /* MBEDTLS_xxx influences PSA_WANT_xxx */ -#include "mbedtls/config_psa.h" -#endif - #include "mbedtls/check_config.h" #endif /* MBEDTLS_BUILD_INFO_H */ From 419a55e9292ee3200905a6f5bd6366e6a86e7284 Mon Sep 17 00:00:00 2001 From: Yanray Wang Date: Wed, 17 May 2023 18:22:00 +0800 Subject: [PATCH 2/3] build_info.h: rewrite comment for inclusion of config_psa.h Signed-off-by: Yanray Wang --- include/mbedtls/build_info.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/mbedtls/build_info.h b/include/mbedtls/build_info.h index d271049857..1acf47759b 100644 --- a/include/mbedtls/build_info.h +++ b/include/mbedtls/build_info.h @@ -87,7 +87,13 @@ #define MBEDTLS_MD_C #endif -/* PSA crypto specific configuration options */ +/* PSA crypto specific configuration options + * - If config_psa.h reads a configuration option in preprocessor directive, + * this symbol should be consulted before its inclusion. (e.g. MBEDTLS_MD_C) + * - If config_psa.h writes a configuration option in conditional directive, + * this symbol should be consulted after its inclusion. + * (e.g. MBEDTLS_MD_LIGHT) + */ #if defined(MBEDTLS_PSA_CRYPTO_CONFIG) /* PSA_WANT_xxx influences MBEDTLS_xxx */ || \ defined(MBEDTLS_PSA_CRYPTO_C) /* MBEDTLS_xxx influences PSA_WANT_xxx */ #include "mbedtls/config_psa.h" From 37db33265821f36d6fc70112e5e86420cbb72d27 Mon Sep 17 00:00:00 2001 From: Yanray Wang Date: Mon, 22 May 2023 16:50:35 +0800 Subject: [PATCH 3/3] build_info.h: rewrite comment Signed-off-by: Yanray Wang --- include/mbedtls/build_info.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mbedtls/build_info.h b/include/mbedtls/build_info.h index 1acf47759b..0917bf72a0 100644 --- a/include/mbedtls/build_info.h +++ b/include/mbedtls/build_info.h @@ -89,7 +89,7 @@ /* PSA crypto specific configuration options * - If config_psa.h reads a configuration option in preprocessor directive, - * this symbol should be consulted before its inclusion. (e.g. MBEDTLS_MD_C) + * this symbol should be set before its inclusion. (e.g. MBEDTLS_MD_C) * - If config_psa.h writes a configuration option in conditional directive, * this symbol should be consulted after its inclusion. * (e.g. MBEDTLS_MD_LIGHT)