Change the library version to 2.11.0
* Change the Mbed TLS library version to 2.11.0 * Increase the soversion of libmbedcrypto * Increase the soversion of libmbedtls
This commit is contained in:
parent
925568a595
commit
2fcd3e4441
7 changed files with 14 additions and 14 deletions
|
@ -1,6 +1,6 @@
|
||||||
mbed TLS ChangeLog (Sorted per branch, date)
|
mbed TLS ChangeLog (Sorted per branch, date)
|
||||||
|
|
||||||
= mbed TLS x.x.x branch released xxxx-xx-xx
|
= mbed TLS 2.11.0 branch released 2018-06-18
|
||||||
|
|
||||||
Features
|
Features
|
||||||
* Add additional block mode, OFB (Output Feedback), to the AES module and
|
* Add additional block mode, OFB (Output Feedback), to the AES module and
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @mainpage mbed TLS v2.10.0 source code documentation
|
* @mainpage mbed TLS v2.11.0 source code documentation
|
||||||
*
|
*
|
||||||
* This documentation describes the internal structure of mbed TLS. It was
|
* This documentation describes the internal structure of mbed TLS. It was
|
||||||
* automatically generated from specially formatted comment blocks in
|
* automatically generated from specially formatted comment blocks in
|
||||||
|
|
|
@ -28,7 +28,7 @@ DOXYFILE_ENCODING = UTF-8
|
||||||
# identify the project. Note that if you do not use Doxywizard you need
|
# identify the project. Note that if you do not use Doxywizard you need
|
||||||
# to put quotes around the project name if it contains spaces.
|
# to put quotes around the project name if it contains spaces.
|
||||||
|
|
||||||
PROJECT_NAME = "mbed TLS v2.10.0"
|
PROJECT_NAME = "mbed TLS v2.11.0"
|
||||||
|
|
||||||
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
|
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
|
||||||
# This could be handy for archiving the generated documentation or
|
# This could be handy for archiving the generated documentation or
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
* Major, Minor, Patchlevel
|
* Major, Minor, Patchlevel
|
||||||
*/
|
*/
|
||||||
#define MBEDTLS_VERSION_MAJOR 2
|
#define MBEDTLS_VERSION_MAJOR 2
|
||||||
#define MBEDTLS_VERSION_MINOR 10
|
#define MBEDTLS_VERSION_MINOR 11
|
||||||
#define MBEDTLS_VERSION_PATCH 0
|
#define MBEDTLS_VERSION_PATCH 0
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -47,9 +47,9 @@
|
||||||
* MMNNPP00
|
* MMNNPP00
|
||||||
* Major version | Minor version | Patch version
|
* Major version | Minor version | Patch version
|
||||||
*/
|
*/
|
||||||
#define MBEDTLS_VERSION_NUMBER 0x020A0000
|
#define MBEDTLS_VERSION_NUMBER 0x020B0000
|
||||||
#define MBEDTLS_VERSION_STRING "2.10.0"
|
#define MBEDTLS_VERSION_STRING "2.11.0"
|
||||||
#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.10.0"
|
#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.11.0"
|
||||||
|
|
||||||
#if defined(MBEDTLS_VERSION_C)
|
#if defined(MBEDTLS_VERSION_C)
|
||||||
|
|
||||||
|
|
|
@ -144,15 +144,15 @@ endif(USE_STATIC_MBEDTLS_LIBRARY)
|
||||||
|
|
||||||
if(USE_SHARED_MBEDTLS_LIBRARY)
|
if(USE_SHARED_MBEDTLS_LIBRARY)
|
||||||
add_library(mbedcrypto SHARED ${src_crypto})
|
add_library(mbedcrypto SHARED ${src_crypto})
|
||||||
set_target_properties(mbedcrypto PROPERTIES VERSION 2.10.0 SOVERSION 2)
|
set_target_properties(mbedcrypto PROPERTIES VERSION 2.11.0 SOVERSION 3)
|
||||||
target_link_libraries(mbedcrypto ${libs})
|
target_link_libraries(mbedcrypto ${libs})
|
||||||
|
|
||||||
add_library(mbedx509 SHARED ${src_x509})
|
add_library(mbedx509 SHARED ${src_x509})
|
||||||
set_target_properties(mbedx509 PROPERTIES VERSION 2.10.0 SOVERSION 0)
|
set_target_properties(mbedx509 PROPERTIES VERSION 2.11.0 SOVERSION 0)
|
||||||
target_link_libraries(mbedx509 ${libs} mbedcrypto)
|
target_link_libraries(mbedx509 ${libs} mbedcrypto)
|
||||||
|
|
||||||
add_library(mbedtls SHARED ${src_tls})
|
add_library(mbedtls SHARED ${src_tls})
|
||||||
set_target_properties(mbedtls PROPERTIES VERSION 2.10.0 SOVERSION 10)
|
set_target_properties(mbedtls PROPERTIES VERSION 2.11.0 SOVERSION 11)
|
||||||
target_link_libraries(mbedtls ${libs} mbedx509)
|
target_link_libraries(mbedtls ${libs} mbedx509)
|
||||||
|
|
||||||
install(TARGETS mbedtls mbedx509 mbedcrypto
|
install(TARGETS mbedtls mbedx509 mbedcrypto
|
||||||
|
|
|
@ -31,9 +31,9 @@ LOCAL_CFLAGS += -fPIC -fpic
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SOEXT_TLS=so.10
|
SOEXT_TLS=so.11
|
||||||
SOEXT_X509=so.0
|
SOEXT_X509=so.0
|
||||||
SOEXT_CRYPTO=so.2
|
SOEXT_CRYPTO=so.3
|
||||||
|
|
||||||
# Set DLEXT=dylib to compile as a shared library for Mac OS X
|
# Set DLEXT=dylib to compile as a shared library for Mac OS X
|
||||||
DLEXT ?= so
|
DLEXT ?= so
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
Check compiletime library version
|
Check compiletime library version
|
||||||
check_compiletime_version:"2.10.0"
|
check_compiletime_version:"2.11.0"
|
||||||
|
|
||||||
Check runtime library version
|
Check runtime library version
|
||||||
check_runtime_version:"2.10.0"
|
check_runtime_version:"2.11.0"
|
||||||
|
|
||||||
Check for MBEDTLS_VERSION_C
|
Check for MBEDTLS_VERSION_C
|
||||||
check_feature:"MBEDTLS_VERSION_C":0
|
check_feature:"MBEDTLS_VERSION_C":0
|
||||||
|
|
Loading…
Reference in a new issue