commit b2e23de0f3c63e8cd7e49836c2e3f1243e95996f
author Bence Szépkúti <bence.szepkuti@arm.com> Mon Jun 21 15:53:07 2021 +0200
committer Bence Szépkúti <bence.szepkuti@arm.com> Mon Jun 28 09:28:48 2021 +0100
tree 04e490ded237f4d9831aa2a2c8df2bf8bd2be816
parent 04982f7b6bacc7ef552dc5afafc3c3adb980813e

Make config version symbols optional

Also remove them from the example configs, but keep the one in
mbedtls_config.h.

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 2f34365..6ccbc00 100644
--- a/include/mbedtls/build_info.h
+++ b/include/mbedtls/build_info.h
@@ -49,6 +49,8 @@
 #define MBEDTLS_VERSION_STRING         "2.26.0"
 #define MBEDTLS_VERSION_STRING_FULL    "mbed TLS 2.26.0"
 
+#define MBEDTLS_CONFIG_VERSION_LATEST 1
+
 #if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
 #define _CRT_SECURE_NO_DEPRECATE 1
 #endif
@@ -59,9 +61,10 @@
 #include MBEDTLS_CONFIG_FILE
 #endif
 
-#if !defined(MBEDTLS_CONFIG_VERSION) || \
-    MBEDTLS_CONFIG_VERSION != 1
-#error "Invalid config version, MBEDTLS_CONFIG_VERSION != 1"
+#if !defined(MBEDTLS_CONFIG_VERSION)
+#define MBEDTLS_CONFIG_VERSION MBEDTLS_CONFIG_VERSION_LATEST
+#elif 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)
@@ -75,7 +78,7 @@
  */
 #if defined(MBEDTLS_USER_CONFIG_FILE)
 #include MBEDTLS_USER_CONFIG_FILE
-#if !defined(MBEDTLS_USER_CONFIG_VERSION) || \
+#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