mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-27 05:38:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove MBEDTLS_USER_CONFIG_VERSION handling

Browse Source 
Signed-off-by: Bence Szépkúti <bence.szepkuti@arm.com>
This commit is contained in:
Bence Szépkúti 2021-06-22 09:14:25 +02:00
parent 36da4ccc51
commit fc04aa2be5
2 changed files with 3 additions and 12 deletions
include/mbedtls
build_info.h
tests/scripts
check-names.sh

13
include/mbedtls/build_info.h

@ -65,16 +65,11 @@
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif
#if !defined(MBEDTLS_CONFIG_VERSION) #if defined(MBEDTLS_CONFIG_VERSION) && \
#define MBEDTLS_CONFIG_VERSION MBEDTLS_CONFIG_VERSION_LATEST 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" #error "Invalid config version, defined value of MBEDTLS_CONFIG_VERSION is unsupported"
#endif #endif
#if defined(MBEDTLS_USER_CONFIG_VERSION)
#error "MBEDTLS_USER_CONFIG_VERSION defined outside MBEDTLS_USER_CONFIG_FILE"
#endif
/* Target and application specific configurations /* Target and application specific configurations
* *
* Allow user to override any previous default. * Allow user to override any previous default.
@ -82,10 +77,6 @@
*/ */
#if defined(MBEDTLS_USER_CONFIG_FILE) #if defined(MBEDTLS_USER_CONFIG_FILE)
#include 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 #endif
#if defined(MBEDTLS_PSA_CRYPTO_CONFIG) #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)

2
tests/scripts/check-names.sh

@ -102,7 +102,7 @@ cat $HEADERS $LIBRARY \
| sed -n 's/MBED..._[A-Z0-9_]*/\'"$NL"'&\'"$NL"/gp \ | sed -n 's/MBED..._[A-Z0-9_]*/\'"$NL"'&\'"$NL"/gp \
| grep MBEDTLS | sort -u > _MBEDTLS_XXX | grep MBEDTLS | sort -u > _MBEDTLS_XXX
TYPOS=$( diff _caps _MBEDTLS_XXX | sed -n 's/^> //p' \ 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 rm _MBEDTLS_XXX _caps
if [ "x$TYPOS" = "x" ]; then if [ "x$TYPOS" = "x" ]; then
echo "PASS" echo "PASS"