mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-01-31 09:32:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Introduce versioning in the config files

Browse Source 
Signed-off-by: Bence Szépkúti <bence.szepkuti@arm.com>
This commit is contained in:
Bence Szépkúti 2021-05-31 16:53:56 +02:00
parent dba968f59b
commit ba7248abc4
8 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/config-ccm-psk-tls1_2.h
View File

@ -30,6 +30,8 @@
* See README.txt for usage instructions.
*/
#define MBEDTLS_CONFIG_VERSION 1
/* System support */
//#define MBEDTLS_HAVE_TIME /* Optionally used in Hello messages */
/* Other MBEDTLS_HAVE_XXX flags irrelevant for this configuration */

2
configs/config-no-entropy.h
View File

@ -29,6 +29,8 @@
* See README.txt for usage instructions.
*/
#define MBEDTLS_CONFIG_VERSION 1
/* System support */
#define MBEDTLS_HAVE_ASM
#define MBEDTLS_HAVE_TIME

2
configs/config-suite-b.h
View File

@ -33,6 +33,8 @@
* See README.txt for usage instructions.
*/
#define MBEDTLS_CONFIG_VERSION 1
/* System support */
#define MBEDTLS_HAVE_ASM
#define MBEDTLS_HAVE_TIME

2
configs/config-symmetric-only.h
View File

@ -20,6 +20,8 @@
* limitations under the License.
*/
#define MBEDTLS_CONFIG_VERSION 1
/* System support */
//#define MBEDTLS_HAVE_ASM
#define MBEDTLS_HAVE_TIME

2
configs/config-thread.h
View File

@ -32,6 +32,8 @@
* See README.txt for usage instructions.
*/
#define MBEDTLS_CONFIG_VERSION 1
/* System support */
#define MBEDTLS_HAVE_ASM

13
include/mbedtls/build_info.h
View File

@ -36,13 +36,26 @@
#include MBEDTLS_CONFIG_FILE
#endif
#if !defined(MBEDTLS_CONFIG_VERSION) || \
MBEDTLS_CONFIG_VERSION != 1
#error "Invalid config version, MBEDTLS_CONFIG_VERSION != 1"
#endif
/* Target and application specific configurations
*
* Allow user to override any previous default.
*
*/
#if defined(MBEDTLS_USER_CONFIG_VERSION)
#error "MBEDTLS_USER_CONFIG_VERSION defined outside MBEDTLS_USER_CONFIG_FILE"
#endif
#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)

2
include/mbedtls/mbedtls_config.h
View File

@ -24,6 +24,8 @@
* limitations under the License.
*/
#define MBEDTLS_CONFIG_VERSION 1
/**
* \name SECTION: System support
*

2
tests/scripts/check-names.sh
View File

@ -102,7 +102,7 @@ cat $HEADERS $LIBRARY \
| 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$' || true )
| egrep -v 'XXX|__|_$|^MBEDTLS_.*CONFIG_FILE$|^MBEDTLS_USER_CONFIG_VERSION$' || true )
rm _MBEDTLS_XXX _caps
if [ "x$TYPOS" = "x" ]; then
echo "PASS"