diff --git a/ChangeLog b/ChangeLog index 72da50166..ecd4769eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ PolarSSL ChangeLog -= Branch 1.2 += Version 1.2.10 released 2013-10-04 Bugfix * Fixed memory leak in RSA as a result of introduction of blinding * Fixed ssl_pkcs11_decrypt() prototype diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h index 015d874ea..9593279e8 100644 --- a/doxygen/input/doc_mainpage.h +++ b/doxygen/input/doc_mainpage.h @@ -4,7 +4,7 @@ */ /** - * @mainpage PolarSSL v1.2.9 source code documentation + * @mainpage PolarSSL v1.2.10 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 380d863bb..c8e516420 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.9" +PROJECT_NAME = "PolarSSL v1.2.10" # 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 a9d18f6f0..4e75d8729 100644 --- a/include/polarssl/version.h +++ b/include/polarssl/version.h @@ -39,16 +39,16 @@ */ #define POLARSSL_VERSION_MAJOR 1 #define POLARSSL_VERSION_MINOR 2 -#define POLARSSL_VERSION_PATCH 9 +#define POLARSSL_VERSION_PATCH 10 /** * The single version number has the following structure: * MMNNPP00 * Major version | Minor version | Patch version */ -#define POLARSSL_VERSION_NUMBER 0x01020900 -#define POLARSSL_VERSION_STRING "1.2.9" -#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.2.9" +#define POLARSSL_VERSION_NUMBER 0x01020A00 +#define POLARSSL_VERSION_STRING "1.2.10" +#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.2.10" #if defined(POLARSSL_VERSION_C) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 18aa20037..17b403fb4 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -59,7 +59,7 @@ add_library(polarssl STATIC ${src}) else(NOT USE_SHARED_POLARSSL_LIBRARY) add_library(polarssl SHARED ${src}) -set_target_properties(polarssl PROPERTIES VERSION 1.2.9 SOVERSION 3) +set_target_properties(polarssl PROPERTIES VERSION 1.2.10 SOVERSION 3) endif(NOT USE_SHARED_POLARSSL_LIBRARY) diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data index 65f041219..5a6c07078 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.9" +check_compiletime_version:"1.2.10" Check runtime library version -check_runtime_version:"1.2.9" +check_runtime_version:"1.2.10"