From 60c863411cf4284ee22bfe0c5db2dff3aee79773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bence=20Sz=C3=A9pk=C3=BAti?= Date: Tue, 22 Jun 2021 10:03:02 +0200 Subject: [PATCH] Remove references to MBEDTLS_USER_CONFIG_VERSION MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Bence Szépkúti --- ChangeLog.d/split-config.txt | 13 +++++-------- docs/3.0-migration-guide.d/split_config.md | 13 +++++-------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/ChangeLog.d/split-config.txt b/ChangeLog.d/split-config.txt index 9a1c67830..5d1201c8a 100644 --- a/ChangeLog.d/split-config.txt +++ b/ChangeLog.d/split-config.txt @@ -5,12 +5,9 @@ Changes change the build configuration, and should generally only be included from build_info.h. * The handling of MBEDTLS_CONFIG_FILE has been moved into build_info.h. - * Config file symbols MBEDTLS_CONFIG_VERSION and MBEDTLS_USER_CONFIG_VERSION - were introduced for use in MBEDTLS_CONFIG_FILE and - MBEDTLS_USER_CONFIG_FILE respectively. - Defining them to a particular value will ensure that mbedtls interprets + * A config file version symbol, MBEDTLS_CONFIG_VERSION was introduced. + Defining it to a particular value will ensure that mbedtls interprets the config file in a way that's compatible with the config file format - indicated by the value. - The config file versions are based on the value of MBEDTLS_VERSION_NUMBER - of the mbedtls version that first introduced that config file format. - The only value currently supported is 0x03000000. + used by the mbedtls release whose MBEDTLS_VERSION_NUMBER has the same + value. + The only value supported by mbedtls 3.0.0 is 0x03000000. diff --git a/docs/3.0-migration-guide.d/split_config.md b/docs/3.0-migration-guide.d/split_config.md index fc809258d..b011ad77c 100644 --- a/docs/3.0-migration-guide.d/split_config.md +++ b/docs/3.0-migration-guide.d/split_config.md @@ -9,12 +9,9 @@ change the build configuration, and should generally only be included from into `build_info.h`, including the handling of the `MBEDTLS_CONFIG_FILE` macro. -Config file symbols `MBEDTLS_CONFIG_VERSION` and `MBEDTLS_USER_CONFIG_VERSION` -were introduced for use in `MBEDTLS_CONFIG_FILE` and -`MBEDTLS_USER_CONFIG_FILE` respectively. -Defining them to a particular value will ensure that mbedtls interprets +A config file version symbol, `MBEDTLS_CONFIG_VERSION` was introduced. +Defining it to a particular value will ensure that mbedtls interprets the config file in a way that's compatible with the config file format -indicated by the value. -The config file versions are based on the value of `MBEDTLS_VERSION_NUMBER` -of the mbedtls version that first introduced that config file format. -The only value currently supported is `0x03000000`. +used by the mbedtls release whose `MBEDTLS_VERSION_NUMBER` has the same +value. +The only value supported by mbedtls 3.0.0 is `0x03000000`.