From 543e4366bc102d59623717b9053547d10605e725 Mon Sep 17 00:00:00 2001 From: Simon Butcher Date: Mon, 4 Jan 2016 22:41:11 +0000 Subject: [PATCH] Change version number to 2.1.4 Changed version for library files and yotta module --- ChangeLog | 5 ++--- doxygen/input/doc_mainpage.h | 2 +- doxygen/mbedtls.doxyfile | 2 +- include/mbedtls/version.h | 8 ++++---- library/CMakeLists.txt | 6 +++--- tests/suites/test_suite_version.data | 4 ++-- yotta/data/module.json | 2 +- 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0113d41d1..a31eb3916 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,8 @@ mbed TLS ChangeLog (Sorted per branch, date) -= mbed TLS 2.1.4 released 2015-12-xx += mbed TLS 2.1.4 released 2016-01-05 Security - * Fix potential double free when mbedtls_asn1_store_named_data() fails to allocate memory. Only used for certificate generation, not triggerable remotely in SSL/TLS. Found by Rafał Przywara. #367 @@ -13,7 +12,7 @@ Bugfix * Fix over-restrictive length limit in GCM. Found by Andreas-N. #362 * Fix bug in certificate validation that caused valid chains to be rejected when the first intermediate certificate has pathLenConstraint=0. Found by - Nicholas Wilson. Introduced in mbed TLS 2.1.4. #280 + Nicholas Wilson. Introduced in mbed TLS 2.1.3. #280 * Removed potential leak in mbedtls_rsa_rsassa_pkcs1_v15_sign(), found by JayaraghavendranK. #372 * Fix suboptimal handling of unexpected records that caused interop issues diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h index e43996549..4c62ac449 100644 --- a/doxygen/input/doc_mainpage.h +++ b/doxygen/input/doc_mainpage.h @@ -21,7 +21,7 @@ */ /** - * @mainpage mbed TLS v2.1.3 source code documentation + * @mainpage mbed TLS v2.1.4 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 201288ddd..25cbc6121 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.3" +PROJECT_NAME = "mbed TLS v2.1.4" # 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 466bd1c01..b3d9fc4b4 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 3 +#define MBEDTLS_VERSION_PATCH 4 /** * The single version number has the following structure: * MMNNPP00 * Major version | Minor version | Patch version */ -#define MBEDTLS_VERSION_NUMBER 0x02010300 -#define MBEDTLS_VERSION_STRING "2.1.3" -#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.1.3" +#define MBEDTLS_VERSION_NUMBER 0x02010400 +#define MBEDTLS_VERSION_STRING "2.1.4" +#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.1.4" #if defined(MBEDTLS_VERSION_C) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index bf3c00c04..712c88992 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.3 SOVERSION 0) + set_target_properties(mbedcrypto PROPERTIES VERSION 2.1.4 SOVERSION 0) target_link_libraries(mbedcrypto ${libs}) add_library(mbedx509 SHARED ${src_x509}) - set_target_properties(mbedx509 PROPERTIES VERSION 2.1.3 SOVERSION 0) + set_target_properties(mbedx509 PROPERTIES VERSION 2.1.4 SOVERSION 0) target_link_libraries(mbedx509 ${libs} mbedcrypto) add_library(mbedtls SHARED ${src_tls}) - set_target_properties(mbedtls PROPERTIES VERSION 2.1.3 SOVERSION 10) + set_target_properties(mbedtls PROPERTIES VERSION 2.1.4 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 c70613c15..6e4b3e399 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.3" +check_compiletime_version:"2.1.4" Check runtime library version -check_runtime_version:"2.1.3" +check_runtime_version:"2.1.4" Check for MBEDTLS_VERSION_C check_feature:"MBEDTLS_VERSION_C":0 diff --git a/yotta/data/module.json b/yotta/data/module.json index 1a65834cc..aef538f48 100644 --- a/yotta/data/module.json +++ b/yotta/data/module.json @@ -1,6 +1,6 @@ { "name": "mbedtls", - "version": "2.1.3", + "version": "2.1.4", "description": "The mbed TLS crypto/SSL/TLS library", "licenses": [ {