diff options
author | Simon Butcher <simon.butcher@arm.com> | 2018-07-26 14:37:12 +0100 |
---|---|---|
committer | Simon Butcher <simon.butcher@arm.com> | 2018-07-26 14:37:12 +0100 |
commit | 2f7f2b1f1149e9cee5132afa88337df32436847c (patch) | |
tree | 8b42aa638c0de26398ddb2f1d487cc7e5cc58e95 | |
parent | d908494fe5675720ce2bd87d8875b9c113683717 (diff) | |
parent | dcec5bb5275d807a83e75561b70232bf7638823c (diff) | |
download | mbedtls-mbedtls-2.1.14.zip mbedtls-mbedtls-2.1.14.tar.gz mbedtls-mbedtls-2.1.14.tar.bz2 |
Merge remote-tracking branch 'restricted/pr/502' into mbedtls-2.1-restrictedmbedtls-2.1.14
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | doxygen/input/doc_mainpage.h | 2 | ||||
-rw-r--r-- | doxygen/mbedtls.doxyfile | 2 | ||||
-rw-r--r-- | include/mbedtls/version.h | 8 | ||||
-rw-r--r-- | library/CMakeLists.txt | 6 | ||||
-rw-r--r-- | tests/suites/test_suite_version.data | 4 | ||||
-rw-r--r-- | yotta/data/module.json | 2 |
7 files changed, 13 insertions, 13 deletions
@@ -1,6 +1,6 @@ mbed TLS ChangeLog (Sorted per branch, date) -= mbed TLS x.x.x branch released xxxx-xx-xx += mbed TLS 2.1.14 branch released 2018-07-25 Security * Fix a vulnerability in TLS ciphersuites based on CBC and using SHA-384, diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h index 46abad7..4e5c754 100644 --- a/doxygen/input/doc_mainpage.h +++ b/doxygen/input/doc_mainpage.h @@ -21,7 +21,7 @@ */ /** - * @mainpage mbed TLS v2.1.13 source code documentation + * @mainpage mbed TLS v2.1.14 source code documentation * * This documentation describes the internal structure of mbed TLS. It was * automatically generated from specially formatted comment blocks in diff --git a/doxygen/mbedtls.doxyfile b/doxygen/mbedtls.doxyfile index feffff3..57bc518 100644 --- a/doxygen/mbedtls.doxyfile +++ b/doxygen/mbedtls.doxyfile @@ -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.1.13" +PROJECT_NAME = "mbed TLS v2.1.14" # The PROJECT_NUMBER tag can be used to enter a project or revision number. # This could be handy for archiving the generated documentation or diff --git a/include/mbedtls/version.h b/include/mbedtls/version.h index 7404a1a..9ba56bc 100644 --- a/include/mbedtls/version.h +++ b/include/mbedtls/version.h @@ -39,16 +39,16 @@ */ #define MBEDTLS_VERSION_MAJOR 2 #define MBEDTLS_VERSION_MINOR 1 -#define MBEDTLS_VERSION_PATCH 13 +#define MBEDTLS_VERSION_PATCH 14 /** * The single version number has the following structure: * MMNNPP00 * Major version | Minor version | Patch version */ -#define MBEDTLS_VERSION_NUMBER 0x02010D00 -#define MBEDTLS_VERSION_STRING "2.1.13" -#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.1.13" +#define MBEDTLS_VERSION_NUMBER 0x02010E00 +#define MBEDTLS_VERSION_STRING "2.1.14" +#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.1.14" #if defined(MBEDTLS_VERSION_C) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 3f1ca6e..994d4bc 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -138,15 +138,15 @@ endif(USE_STATIC_MBEDTLS_LIBRARY) if(USE_SHARED_MBEDTLS_LIBRARY) add_library(mbedcrypto SHARED ${src_crypto}) - set_target_properties(mbedcrypto PROPERTIES VERSION 2.1.13 SOVERSION 0) + set_target_properties(mbedcrypto PROPERTIES VERSION 2.1.14 SOVERSION 0) target_link_libraries(mbedcrypto ${libs}) add_library(mbedx509 SHARED ${src_x509}) - set_target_properties(mbedx509 PROPERTIES VERSION 2.1.13 SOVERSION 0) + set_target_properties(mbedx509 PROPERTIES VERSION 2.1.14 SOVERSION 0) target_link_libraries(mbedx509 ${libs} mbedcrypto) add_library(mbedtls SHARED ${src_tls}) - set_target_properties(mbedtls PROPERTIES VERSION 2.1.13 SOVERSION 10) + set_target_properties(mbedtls PROPERTIES VERSION 2.1.14 SOVERSION 10) target_link_libraries(mbedtls ${libs} mbedx509) install(TARGETS mbedtls mbedx509 mbedcrypto diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data index 28edf3c..bef766c 100644 --- a/tests/suites/test_suite_version.data +++ b/tests/suites/test_suite_version.data @@ -1,8 +1,8 @@ Check compiletime library version -check_compiletime_version:"2.1.13" +check_compiletime_version:"2.1.14" Check runtime library version -check_runtime_version:"2.1.13" +check_runtime_version:"2.1.14" Check for MBEDTLS_VERSION_C check_feature:"MBEDTLS_VERSION_C":0 diff --git a/yotta/data/module.json b/yotta/data/module.json index 515d0d3..c27faa3 100644 --- a/yotta/data/module.json +++ b/yotta/data/module.json @@ -1,6 +1,6 @@ { "name": "mbedtls", - "version": "2.1.13", + "version": "2.1.14", "description": "The mbed TLS crypto/SSL/TLS library", "licenses": [ { |