From 0d1cf0fec1e315e44b069b659e3c7d500bcd4826 Mon Sep 17 00:00:00 2001 From: Simon Butcher Date: Thu, 5 Nov 2015 19:54:02 +0000 Subject: Change version number to 1.2.18 Changed for library version --- ChangeLog | 2 +- doxygen/input/doc_mainpage.h | 2 +- doxygen/polarssl.doxyfile | 2 +- include/polarssl/version.h | 8 ++++---- library/CMakeLists.txt | 2 +- tests/suites/test_suite_version.data | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8d3770b..0bb206f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ PolarSSL ChangeLog -= Version 1.2.18 released 2015-10-xx += Version 1.2.18 released 2015-11-04 Security * Fix potential heap corruption on Windows when diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h index dd359bb..dcb983f 100644 --- a/doxygen/input/doc_mainpage.h +++ b/doxygen/input/doc_mainpage.h @@ -4,7 +4,7 @@ */ /** - * @mainpage PolarSSL v1.2.17 source code documentation + * @mainpage PolarSSL v1.2.18 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 736dc8b..a09a870 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.17" +PROJECT_NAME = "PolarSSL v1.2.18" # 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 9b5de9b..c348b96 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 17 +#define POLARSSL_VERSION_PATCH 18 /** * The single version number has the following structure: * MMNNPP00 * Major version | Minor version | Patch version */ -#define POLARSSL_VERSION_NUMBER 0x01021100 -#define POLARSSL_VERSION_STRING "1.2.17" -#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.2.17" +#define POLARSSL_VERSION_NUMBER 0x01021200 +#define POLARSSL_VERSION_STRING "1.2.18" +#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.2.18" #if defined(POLARSSL_VERSION_C) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 6eb72cd..0104eac 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.17 SOVERSION 3) + set_target_properties(polarssl PROPERTIES VERSION 1.2.18 SOVERSION 3) target_link_libraries(polarssl ${libs}) diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data index 2ac1376..776f494 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.17" +check_compiletime_version:"1.2.18" Check runtime library version -check_runtime_version:"1.2.17" +check_runtime_version:"1.2.18" -- cgit v1.1