diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h index c5d5507b1..456b5e617 100644 --- a/doxygen/input/doc_mainpage.h +++ b/doxygen/input/doc_mainpage.h @@ -1,10 +1,10 @@ -l/** +/** * @file * Main page documentation file. */ /** - * @mainpage PolarSSL v1.1.0 source code documentation + * @mainpage PolarSSL v1.1.1 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 29f3656e1..41cb6e0fb 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.1.0" +PROJECT_NAME = "PolarSSL v1.1.1" # 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 13f14208a..98eb0b3f1 100644 --- a/include/polarssl/version.h +++ b/include/polarssl/version.h @@ -39,16 +39,16 @@ */ #define POLARSSL_VERSION_MAJOR 1 #define POLARSSL_VERSION_MINOR 1 -#define POLARSSL_VERSION_PATCH 0 +#define POLARSSL_VERSION_PATCH 1 /** * The single version number has the following structure: * MMNNPP00 * Major version | Minor version | Patch version */ -#define POLARSSL_VERSION_NUMBER 0x01010000 -#define POLARSSL_VERSION_STRING "1.1.0" -#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.1.0" +#define POLARSSL_VERSION_NUMBER 0x01010100 +#define POLARSSL_VERSION_STRING "1.1.1" +#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.1.1" #if defined(POLARSSL_VERSION_C) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index bd676d2b8..de7273571 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -47,7 +47,7 @@ add_library(polarssl STATIC ${src}) else(NOT USE_SHARED_POLARSSL_LIBRARY) add_library(polarssl SHARED ${src}) -set_target_properties(polarssl PROPERTIES VERSION 1.1.0 SOVERSION 1) +set_target_properties(polarssl PROPERTIES VERSION 1.1.1 SOVERSION 1) endif(NOT USE_SHARED_POLARSSL_LIBRARY) diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data index 0ac11252a..8809a5914 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.1.0" +check_compiletime_version:"1.1.1" Check runtime library version -check_runtime_version:"1.1.0" +check_runtime_version:"1.1.1"