From 1bc9e934e2b41ff92e996a267e934b45904a9601 Mon Sep 17 00:00:00 2001 From: Dave Rodgman Date: Thu, 1 Jul 2021 09:20:13 +0100 Subject: [PATCH] Manual updates to version information This covers a few files that were missed by scripts/bump_version.sh Signed-off-by: Dave Rodgman --- BRANCHES.md | 2 +- CMakeLists.txt | 2 +- include/mbedtls/build_info.h | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/BRANCHES.md b/BRANCHES.md index b9926ac9d..a63f07034 100644 --- a/BRANCHES.md +++ b/BRANCHES.md @@ -6,7 +6,7 @@ At any point in time, we have a number of maintained branches consisting of: this always contains the latest release, including all publicly available security fixes. - The [`development`](https://github.com/ARMmbed/mbedtls/tree/development) branch: - this is where the next major version of Mbed TLS (version 3.0) is being + this is where the current major version of Mbed TLS (version 3.x) is being prepared. It has API changes that make it incompatible with Mbed TLS 2.x, as well as all the new features and bug fixes and security fixes. - The [`development_2.x`](https://github.com/ARMmbed/mbedtls/tree/development_2.x) branch: diff --git a/CMakeLists.txt b/CMakeLists.txt index b92e0bb01..cf74af53c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -312,7 +312,7 @@ configure_package_config_file( write_basic_package_version_file( "cmake/MbedTLSConfigVersion.cmake" COMPATIBILITY SameMajorVersion - VERSION 2.26.0) + VERSION 3.0.0) install( FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake/MbedTLSConfig.cmake" diff --git a/include/mbedtls/build_info.h b/include/mbedtls/build_info.h index c7d4cdb6c..23f85ba01 100644 --- a/include/mbedtls/build_info.h +++ b/include/mbedtls/build_info.h @@ -36,8 +36,8 @@ * The version number x.y.z is split into three parts. * Major, Minor, Patchlevel */ -#define MBEDTLS_VERSION_MAJOR 2 -#define MBEDTLS_VERSION_MINOR 26 +#define MBEDTLS_VERSION_MAJOR 3 +#define MBEDTLS_VERSION_MINOR 0 #define MBEDTLS_VERSION_PATCH 0 /** @@ -45,9 +45,9 @@ * MMNNPP00 * Major version | Minor version | Patch version */ -#define MBEDTLS_VERSION_NUMBER 0x021A0000 -#define MBEDTLS_VERSION_STRING "2.26.0" -#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.26.0" +#define MBEDTLS_VERSION_NUMBER 0x03000000 +#define MBEDTLS_VERSION_STRING "3.0.0" +#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 3.0.0" #if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE) #define _CRT_SECURE_NO_DEPRECATE 1