Prepared for PolarSSL 1.2.6 release
diff --git a/ChangeLog b/ChangeLog
index cc65f07..50c270f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
PolarSSL ChangeLog
-= Master
+= Version 1.2.6 released 2013-03-11
Bugfix
* Fixed memory leak in ssl_free() and ssl_reset() for active session
* Corrected GCM counter incrementation to use only 32-bits instead of
diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h
index 118a12a..dc98951 100644
--- a/doxygen/input/doc_mainpage.h
+++ b/doxygen/input/doc_mainpage.h
@@ -4,7 +4,7 @@
*/
/**
- * @mainpage PolarSSL v1.2.5 source code documentation
+ * @mainpage PolarSSL v1.2.6 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 a82b90c..5fbc133 100644
--- a/doxygen/polarssl.doxyfile
+++ b/doxygen/polarssl.doxyfile
@@ -25,7 +25,7 @@
# 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.5"
+PROJECT_NAME = "PolarSSL v1.2.6"
# 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 ff76968..4f73ee2 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 5
+#define POLARSSL_VERSION_PATCH 6
/**
* The single version number has the following structure:
* MMNNPP00
* Major version | Minor version | Patch version
*/
-#define POLARSSL_VERSION_NUMBER 0x01020500
-#define POLARSSL_VERSION_STRING "1.2.5"
-#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.2.5"
+#define POLARSSL_VERSION_NUMBER 0x01020600
+#define POLARSSL_VERSION_STRING "1.2.6"
+#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.2.6"
#if defined(POLARSSL_VERSION_C)
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index c59f9f3..25802d7 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -57,7 +57,7 @@
else(NOT USE_SHARED_POLARSSL_LIBRARY)
add_library(polarssl SHARED ${src})
-set_target_properties(polarssl PROPERTIES VERSION 1.2.5 SOVERSION 2)
+set_target_properties(polarssl PROPERTIES VERSION 1.2.6 SOVERSION 2)
endif(NOT USE_SHARED_POLARSSL_LIBRARY)
diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data
index a41225a..267527a 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.5"
+check_compiletime_version:"1.2.6"
Check runtime library version
-check_runtime_version:"1.2.5"
+check_runtime_version:"1.2.6"
