From da13016d845eb2ec1603854982d9e8a45f42da8e Mon Sep 17 00:00:00 2001 From: Paul Bakker Date: Thu, 1 May 2014 14:27:19 +0200 Subject: [PATCH] Prepped for 1.3.7 release --- 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 25a9fb40e..48085615c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ PolarSSL ChangeLog (Sorted per branch, date) -= PolarSSL 1.3 branch += PolarSSL 1.3.7 released on 2014-05-01 Features * debug_set_log_mode() added to determine raw or full logging * debug_set_threshold() added to ignore messages over threshold level diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h index bf651c92f..df88d2fb1 100644 --- a/doxygen/input/doc_mainpage.h +++ b/doxygen/input/doc_mainpage.h @@ -4,7 +4,7 @@ */ /** - * @mainpage PolarSSL v1.3.6 source code documentation + * @mainpage PolarSSL v1.3.7 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 9aa19f153..18362d595 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.6" +PROJECT_NAME = "PolarSSL v1.3.7" # 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 8527dd2b8..2e1e64af6 100644 --- a/include/polarssl/version.h +++ b/include/polarssl/version.h @@ -43,16 +43,16 @@ */ #define POLARSSL_VERSION_MAJOR 1 #define POLARSSL_VERSION_MINOR 3 -#define POLARSSL_VERSION_PATCH 6 +#define POLARSSL_VERSION_PATCH 7 /** * The single version number has the following structure: * MMNNPP00 * Major version | Minor version | Patch version */ -#define POLARSSL_VERSION_NUMBER 0x01030600 -#define POLARSSL_VERSION_STRING "1.3.6" -#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.3.6" +#define POLARSSL_VERSION_NUMBER 0x01030700 +#define POLARSSL_VERSION_STRING "1.3.7" +#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.3.7" #if defined(POLARSSL_VERSION_C) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 8b595cf13..86ccee19e 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -109,7 +109,7 @@ endif() if(USE_SHARED_POLARSSL_LIBRARY) add_library(polarssl SHARED ${src}) - set_target_properties(polarssl PROPERTIES VERSION 1.3.6 SOVERSION 6) + set_target_properties(polarssl PROPERTIES VERSION 1.3.7 SOVERSION 6) target_link_libraries(polarssl ${libs}) diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data index 44a70ca9c..20ceb19dd 100644 --- a/tests/suites/test_suite_version.data +++ b/tests/suites/test_suite_version.data @@ -1,8 +1,8 @@ Check compiletime library version -check_compiletime_version:"1.3.6" +check_compiletime_version:"1.3.7" Check runtime library version -check_runtime_version:"1.3.6" +check_runtime_version:"1.3.7" Check for POLARSSL_VERSION_C check_feature:"POLARSSL_VERSION_C":0