Merge pull request #2991 from yanesca/bump-version-2.7.13

Bump version to Mbed TLS 2.7.13
This commit is contained in:
Janos Follath 2020-01-28 11:32:27 +00:00 committed by GitHub
commit 071b3e170e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 11 deletions

View File

@ -24,7 +24,7 @@
*/
/**
* @mainpage mbed TLS v2.7.12 source code documentation
* @mainpage mbed TLS v2.7.13 source code documentation
*
* This documentation describes the internal structure of mbed TLS. It was
* automatically generated from specially formatted comment blocks in

View File

@ -28,7 +28,7 @@ DOXYFILE_ENCODING = UTF-8
# identify the project. Note that if you do not use Doxywizard you need
# to put quotes around the project name if it contains spaces.
PROJECT_NAME = "mbed TLS v2.7.12"
PROJECT_NAME = "mbed TLS v2.7.13"
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or

View File

@ -40,16 +40,16 @@
*/
#define MBEDTLS_VERSION_MAJOR 2
#define MBEDTLS_VERSION_MINOR 7
#define MBEDTLS_VERSION_PATCH 12
#define MBEDTLS_VERSION_PATCH 13
/**
* The single version number has the following structure:
* MMNNPP00
* Major version | Minor version | Patch version
*/
#define MBEDTLS_VERSION_NUMBER 0x02070C00
#define MBEDTLS_VERSION_STRING "2.7.12"
#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.7.12"
#define MBEDTLS_VERSION_NUMBER 0x02070D00
#define MBEDTLS_VERSION_STRING "2.7.13"
#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.7.13"
#if defined(MBEDTLS_VERSION_C)

View File

@ -147,15 +147,15 @@ endif(USE_STATIC_MBEDTLS_LIBRARY)
if(USE_SHARED_MBEDTLS_LIBRARY)
add_library(mbedcrypto SHARED ${src_crypto})
set_target_properties(mbedcrypto PROPERTIES VERSION 2.7.12 SOVERSION 2)
set_target_properties(mbedcrypto PROPERTIES VERSION 2.7.13 SOVERSION 2)
target_link_libraries(mbedcrypto ${libs})
add_library(mbedx509 SHARED ${src_x509})
set_target_properties(mbedx509 PROPERTIES VERSION 2.7.12 SOVERSION 0)
set_target_properties(mbedx509 PROPERTIES VERSION 2.7.13 SOVERSION 0)
target_link_libraries(mbedx509 ${libs} mbedcrypto)
add_library(mbedtls SHARED ${src_tls})
set_target_properties(mbedtls PROPERTIES VERSION 2.7.12 SOVERSION 10)
set_target_properties(mbedtls PROPERTIES VERSION 2.7.13 SOVERSION 10)
target_link_libraries(mbedtls ${libs} mbedx509)
install(TARGETS mbedtls mbedx509 mbedcrypto

View File

@ -1,8 +1,8 @@
Check compiletime library version
check_compiletime_version:"2.7.12"
check_compiletime_version:"2.7.13"
Check runtime library version
check_runtime_version:"2.7.12"
check_runtime_version:"2.7.13"
Check for MBEDTLS_VERSION_C
check_feature:"MBEDTLS_VERSION_C":0