diff --git a/ChangeLog b/ChangeLog index fe8ea1990..1ff0658dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ PolarSSL ChangeLog -= Version 1.2.14 released 2015-04-?? += Version 1.2.14 released 2015-06-26 Security * Fix potential invalid memory read in the server, that allows a client to diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h index f7ab2d8b8..931dbd2fe 100644 --- a/doxygen/input/doc_mainpage.h +++ b/doxygen/input/doc_mainpage.h @@ -4,7 +4,7 @@ */ /** - * @mainpage PolarSSL v1.2.13 source code documentation + * @mainpage PolarSSL v1.2.14 source code documentation * * This documentation describes the internal structure of PolarSSL. It was * automatically generated from specially formatted comment blocks in diff --git a/doxygen/polarssl.doxyfile b/doxygen/polarssl.doxyfile index 01bee01fb..ce294375f 100644 --- a/doxygen/polarssl.doxyfile +++ b/doxygen/polarssl.doxyfile @@ -25,7 +25,7 @@ DOXYFILE_ENCODING = UTF-8 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. -PROJECT_NAME = "PolarSSL v1.2.13" +PROJECT_NAME = "PolarSSL v1.2.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/polarssl/version.h b/include/polarssl/version.h index aed3c75b9..367125516 100644 --- a/include/polarssl/version.h +++ b/include/polarssl/version.h @@ -36,16 +36,16 @@ */ #define POLARSSL_VERSION_MAJOR 1 #define POLARSSL_VERSION_MINOR 2 -#define POLARSSL_VERSION_PATCH 13 +#define POLARSSL_VERSION_PATCH 14 /** * The single version number has the following structure: * MMNNPP00 * Major version | Minor version | Patch version */ -#define POLARSSL_VERSION_NUMBER 0x01020D00 -#define POLARSSL_VERSION_STRING "1.2.13" -#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.2.13" +#define POLARSSL_VERSION_NUMBER 0x01020E00 +#define POLARSSL_VERSION_STRING "1.2.14" +#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.2.14" #if defined(POLARSSL_VERSION_C) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index db7435747..2ef1a8aae 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -90,7 +90,7 @@ endif() if(USE_SHARED_POLARSSL_LIBRARY) add_library(polarssl SHARED ${src}) - set_target_properties(polarssl PROPERTIES VERSION 1.2.13 SOVERSION 3) + set_target_properties(polarssl PROPERTIES VERSION 1.2.14 SOVERSION 3) target_link_libraries(polarssl ${libs}) diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data index f7d175c46..63a280401 100644 --- a/tests/suites/test_suite_version.data +++ b/tests/suites/test_suite_version.data @@ -1,5 +1,5 @@ Check compiletime library version -check_compiletime_version:"1.2.13" +check_compiletime_version:"1.2.14" Check runtime library version -check_runtime_version:"1.2.13" +check_runtime_version:"1.2.14"