From 19eef51487931784ba937b24ad1e7526d94fb7f3 Mon Sep 17 00:00:00 2001 From: Paul Bakker <p.j.bakker@polarssl.org> Date: Thu, 4 Jun 2015 14:49:19 +0200 Subject: [PATCH] Prepare for 1.3.11 release --- ChangeLog | 2 +- doxygen/input/doc_mainpage.h | 2 +- doxygen/mbedtls.doxyfile | 2 +- include/polarssl/version.h | 8 ++++---- library/CMakeLists.txt | 2 +- library/Makefile | 2 +- tests/suites/test_suite_version.data | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa02b5939..c67b35885 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ mbed TLS ChangeLog (Sorted per branch, date) -= mbed TLS 1.3 branch += mbed TLS 1.3.11 released 2015-06-04 Security * With authmode set to SSL_VERIFY_OPTIONAL, verification of keyUsage and diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h index b41e36e49..9837f8ddd 100644 --- a/doxygen/input/doc_mainpage.h +++ b/doxygen/input/doc_mainpage.h @@ -4,7 +4,7 @@ */ /** - * @mainpage mbed TLS v1.3.10 source code documentation + * @mainpage mbed TLS v1.3.11 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 49c81c347..d32ea0568 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.10" +PROJECT_NAME = "mbed TLS v1.3.11" # 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 9ffba2949..6d9e8accf 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 10 +#define POLARSSL_VERSION_PATCH 11 /** * The single version number has the following structure: * MMNNPP00 * Major version | Minor version | Patch version */ -#define POLARSSL_VERSION_NUMBER 0x01030A00 -#define POLARSSL_VERSION_STRING "1.3.10" -#define POLARSSL_VERSION_STRING_FULL "mbed TLS 1.3.10" +#define POLARSSL_VERSION_NUMBER 0x01030B00 +#define POLARSSL_VERSION_STRING "1.3.11" +#define POLARSSL_VERSION_STRING_FULL "mbed TLS 1.3.11" #if defined(POLARSSL_VERSION_C) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 57ebf8347..d4c5511ee 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.10 SOVERSION 8) + set_target_properties(mbedtls PROPERTIES VERSION 1.3.11 SOVERSION 9) target_link_libraries(mbedtls ${libs}) diff --git a/library/Makefile b/library/Makefile index d099471d2..20b9860f9 100644 --- a/library/Makefile +++ b/library/Makefile @@ -31,7 +31,7 @@ LOCAL_CFLAGS += -fPIC -fpic endif endif -SOEXT=so.8 +SOEXT=so.9 DLEXT=so # OSX shared library extension: diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data index bdce6e5d6..782e94dcb 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.10" +check_compiletime_version:"1.3.11" Check runtime library version -check_runtime_version:"1.3.10" +check_runtime_version:"1.3.11" Check for POLARSSL_VERSION_C check_feature:"POLARSSL_VERSION_C":0