diff --git a/ChangeLog b/ChangeLog index a6aa5b569..2deb77a93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ PolarSSL ChangeLog (Sorted per branch, date) -= PolarSSL 1.3 branch += PolarSSL 1.3.5 released on 2014-03-26 Features * HMAC-DRBG as a separate module * Option to set the Curve preference order (disabled by default) diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h index 4c4198a54..c2f7ace63 100644 --- a/doxygen/input/doc_mainpage.h +++ b/doxygen/input/doc_mainpage.h @@ -4,7 +4,7 @@ */ /** - * @mainpage PolarSSL v1.3.4 source code documentation + * @mainpage PolarSSL v1.3.5 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 7df37cc50..4fd96c105 100644 --- a/doxygen/polarssl.doxyfile +++ b/doxygen/polarssl.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 = "PolarSSL v1.3.4" +PROJECT_NAME = "PolarSSL v1.3.5" # 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 94ce3d1b5..89af9708b 100644 --- a/include/polarssl/version.h +++ b/include/polarssl/version.h @@ -39,16 +39,16 @@ */ #define POLARSSL_VERSION_MAJOR 1 #define POLARSSL_VERSION_MINOR 3 -#define POLARSSL_VERSION_PATCH 4 +#define POLARSSL_VERSION_PATCH 5 /** * The single version number has the following structure: * MMNNPP00 * Major version | Minor version | Patch version */ -#define POLARSSL_VERSION_NUMBER 0x01030400 -#define POLARSSL_VERSION_STRING "1.3.4" -#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.3.4" +#define POLARSSL_VERSION_NUMBER 0x01030500 +#define POLARSSL_VERSION_STRING "1.3.5" +#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.3.5" #if defined(POLARSSL_VERSION_C) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index cbcfd6953..cdc106980 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -108,7 +108,7 @@ endif() if(USE_SHARED_POLARSSL_LIBRARY) add_library(polarssl SHARED ${src}) - set_target_properties(polarssl PROPERTIES VERSION 1.3.4 SOVERSION 5) + set_target_properties(polarssl PROPERTIES VERSION 1.3.5 SOVERSION 5) target_link_libraries(polarssl ${libs}) diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data index d1cbff047..a575e64d3 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.3.4" +check_compiletime_version:"1.3.5" Check runtime library version -check_runtime_version:"1.3.4" +check_runtime_version:"1.3.5"