From 016a0d3b6f23130a7f26c32afb5df08efcf19967 Mon Sep 17 00:00:00 2001 From: Simon Butcher Date: Mon, 17 Oct 2016 15:44:26 +0100 Subject: [PATCH] Update library version number to 2.1.6 --- ChangeLog | 2 +- 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 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 27d36494c..92d7977e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ mbed TLS ChangeLog (Sorted per branch, date) -= mbed TLS 2.1.x branch released 2016-xx-xx += mbed TLS 2.1.6 branch released 2016-10-17 Security * Removed the MBEDTLS_SSL_AEAD_RANDOM_IV option, because it was not compliant diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h index da91cc50f..8400fccac 100644 --- a/doxygen/input/doc_mainpage.h +++ b/doxygen/input/doc_mainpage.h @@ -21,7 +21,7 @@ */ /** - * @mainpage mbed TLS v2.1.5 source code documentation + * @mainpage mbed TLS v2.1.6 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 c2e34b7f9..bfe59925e 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.5" +PROJECT_NAME = "mbed TLS v2.1.6" # 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 1b57908db..3d6d162e5 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 5 +#define MBEDTLS_VERSION_PATCH 6 /** * The single version number has the following structure: * MMNNPP00 * Major version | Minor version | Patch version */ -#define MBEDTLS_VERSION_NUMBER 0x02010500 -#define MBEDTLS_VERSION_STRING "2.1.5" -#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.1.5" +#define MBEDTLS_VERSION_NUMBER 0x02010600 +#define MBEDTLS_VERSION_STRING "2.1.6" +#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.1.6" #if defined(MBEDTLS_VERSION_C) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index e94b31606..ce128ef2a 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.5 SOVERSION 0) + set_target_properties(mbedcrypto PROPERTIES VERSION 2.1.6 SOVERSION 0) target_link_libraries(mbedcrypto ${libs}) add_library(mbedx509 SHARED ${src_x509}) - set_target_properties(mbedx509 PROPERTIES VERSION 2.1.5 SOVERSION 0) + set_target_properties(mbedx509 PROPERTIES VERSION 2.1.6 SOVERSION 0) target_link_libraries(mbedx509 ${libs} mbedcrypto) add_library(mbedtls SHARED ${src_tls}) - set_target_properties(mbedtls PROPERTIES VERSION 2.1.5 SOVERSION 10) + set_target_properties(mbedtls PROPERTIES VERSION 2.1.6 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 39c759879..13f7c666e 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.5" +check_compiletime_version:"2.1.6" Check runtime library version -check_runtime_version:"2.1.5" +check_runtime_version:"2.1.6" Check for MBEDTLS_VERSION_C check_feature:"MBEDTLS_VERSION_C":0