commit fc04aa2be587b983177e8992d8408b296439b486
author Bence Szépkúti <bence.szepkuti@arm.com> Tue Jun 22 09:14:25 2021 +0200
committer Bence Szépkúti <bence.szepkuti@arm.com> Mon Jun 28 09:28:48 2021 +0100
tree 1e665a22a454a5c270d9f5655cbb54ba0400c68e
parent 36da4ccc5144279325530ef01d38e4b55673628a

Remove MBEDTLS_USER_CONFIG_VERSION handling

Signed-off-by: Bence Szépkúti <bence.szepkuti@arm.com>

include/mbedtls/build_info.h

diff --git a/include/mbedtls/build_info.h b/include/mbedtls/build_info.h
index 1bb133d..d07f6ac 100644
--- a/include/mbedtls/build_info.h
+++ b/include/mbedtls/build_info.h
@@ -65,16 +65,11 @@
 #include MBEDTLS_CONFIG_FILE
 #endif
 
-#if !defined(MBEDTLS_CONFIG_VERSION)
-#define MBEDTLS_CONFIG_VERSION MBEDTLS_CONFIG_VERSION_LATEST
-#elif MBEDTLS_CONFIG_VERSION != MBEDTLS_CONFIG_VERSION_LATEST
+#if defined(MBEDTLS_CONFIG_VERSION) && \
+    MBEDTLS_CONFIG_VERSION != MBEDTLS_CONFIG_VERSION_LATEST
 #error "Invalid config version, defined value of MBEDTLS_CONFIG_VERSION is unsupported"
 #endif
 
-#if defined(MBEDTLS_USER_CONFIG_VERSION)
-#error "MBEDTLS_USER_CONFIG_VERSION defined outside MBEDTLS_USER_CONFIG_FILE"
-#endif
-
 /* Target and application specific configurations
  *
  * Allow user to override any previous default.
@@ -82,10 +77,6 @@
  */
 #if defined(MBEDTLS_USER_CONFIG_FILE)
 #include MBEDTLS_USER_CONFIG_FILE
-#if defined(MBEDTLS_USER_CONFIG_VERSION) && \
-    MBEDTLS_USER_CONFIG_VERSION != MBEDTLS_CONFIG_VERSION
-#error "Version mismatch between config file and MBEDTLS_USER_CONFIG_FILE"
-#endif
 #endif
 
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)

tests/scripts/check-names.sh

diff --git a/tests/scripts/check-names.sh b/tests/scripts/check-names.sh
index 7649970..2a06adc 100755
--- a/tests/scripts/check-names.sh
+++ b/tests/scripts/check-names.sh
@@ -102,7 +102,7 @@
     | sed -n 's/MBED..._[A-Z0-9_]*/\'"$NL"'&\'"$NL"/gp \
     | grep MBEDTLS | sort -u > _MBEDTLS_XXX
 TYPOS=$( diff _caps _MBEDTLS_XXX | sed -n 's/^> //p' \
-            | egrep -v 'XXX|__|_$|^MBEDTLS_.*CONFIG_FILE$|^MBEDTLS_USER_CONFIG_VERSION$' || true )
+            | egrep -v 'XXX|__|_$|^MBEDTLS_.*CONFIG_FILE$' || true )
 rm _MBEDTLS_XXX _caps
 if [ "x$TYPOS" = "x" ]; then
     echo "PASS"