diff --git a/ChangeLog b/ChangeLog index 18f1c9265..bf31b70c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ mbed TLS ChangeLog (Sorted per branch, date) -= mbed TLS 1.3.15 released 2015-10-xx += mbed TLS 1.3.15 released 2015-11-04 Security * Fix potential double free if ssl_set_psk() is called more than once and diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h index 2fb694cd7..35839391e 100644 --- a/doxygen/input/doc_mainpage.h +++ b/doxygen/input/doc_mainpage.h @@ -4,7 +4,7 @@ */ /** - * @mainpage mbed TLS v1.3.14 source code documentation + * @mainpage mbed TLS v1.3.15 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 a8fb690c1..ba6a00bd7 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 v1.3.14" +PROJECT_NAME = "mbed TLS v1.3.15" # 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/polarssl/version.h b/include/polarssl/version.h index 641127b98..f33966067 100644 --- a/include/polarssl/version.h +++ b/include/polarssl/version.h @@ -40,16 +40,16 @@ */ #define POLARSSL_VERSION_MAJOR 1 #define POLARSSL_VERSION_MINOR 3 -#define POLARSSL_VERSION_PATCH 14 +#define POLARSSL_VERSION_PATCH 15 /** * The single version number has the following structure: * MMNNPP00 * Major version | Minor version | Patch version */ -#define POLARSSL_VERSION_NUMBER 0x01030E00 -#define POLARSSL_VERSION_STRING "1.3.14" -#define POLARSSL_VERSION_STRING_FULL "mbed TLS 1.3.14" +#define POLARSSL_VERSION_NUMBER 0x01030F00 +#define POLARSSL_VERSION_STRING "1.3.15" +#define POLARSSL_VERSION_STRING_FULL "mbed TLS 1.3.15" #if defined(POLARSSL_VERSION_C) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 6f84f7178..8024b94d8 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -117,7 +117,7 @@ endif() if(USE_SHARED_MBEDTLS_LIBRARY) add_library(mbedtls SHARED ${src}) - set_target_properties(mbedtls PROPERTIES VERSION 1.3.14 SOVERSION 9) + set_target_properties(mbedtls PROPERTIES VERSION 1.3.15 SOVERSION 9) target_link_libraries(mbedtls ${libs}) diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data index 40b50ab70..081cf0a5d 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:"1.3.14" +check_compiletime_version:"1.3.15" Check runtime library version -check_runtime_version:"1.3.14" +check_runtime_version:"1.3.15" Check for POLARSSL_VERSION_C check_feature:"POLARSSL_VERSION_C":0