From 9cd70653077bf652b0cbf0e0bff7d3b066080c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bence=20Sz=C3=A9pk=C3=BAti?= Date: Mon, 28 Jun 2021 14:22:39 +0100 Subject: [PATCH] No other headers are included by mbedtls_config.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These have been moved to build_info.h. Update the documentation to reflect this. Signed-off-by: Bence Szépkúti --- docs/3.0-migration-guide.d/split_config.md | 2 +- include/mbedtls/check_config.h | 5 ----- include/mbedtls/mbedtls_config.h | 4 ---- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/docs/3.0-migration-guide.d/split_config.md b/docs/3.0-migration-guide.d/split_config.md index 989326122..6f433c5f7 100644 --- a/docs/3.0-migration-guide.d/split_config.md +++ b/docs/3.0-migration-guide.d/split_config.md @@ -9,7 +9,7 @@ Introduce a level of indirection and versioning in the config files Also, if you have a custom configuration file: -* Don't include `check_config.h` anymore. +* Don't include `check_config.h` or `config_psa.h` anymore. * Don't define `MBEDTLS_CONFIG_H` anymore. A config file version symbol, `MBEDTLS_CONFIG_VERSION` was introduced. diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h index aa8bcd253..e38892d8f 100644 --- a/include/mbedtls/check_config.h +++ b/include/mbedtls/check_config.h @@ -20,11 +20,6 @@ * limitations under the License. */ -/* - * It is recommended to include this file from your mbedtls_config.h - * in order to catch dependency issues early. - */ - #ifndef MBEDTLS_CHECK_CONFIG_H #define MBEDTLS_CHECK_CONFIG_H diff --git a/include/mbedtls/mbedtls_config.h b/include/mbedtls/mbedtls_config.h index 3a4189d18..a60db7e93 100644 --- a/include/mbedtls/mbedtls_config.h +++ b/include/mbedtls/mbedtls_config.h @@ -1743,10 +1743,6 @@ * Uncomment this to enable use of PSA Crypto configuration settings which * can be found in include/psa/crypto_config.h. * - * If you enable this option and write your own configuration file, you must - * include mbedtls/config_psa.h in your configuration file. The default - * provided mbedtls/mbedtls_config.h contains the necessary inclusion. - * * This feature is still experimental and is not ready for production since * it is not completed. */