From d3cd5c1129e5dde4f324b0ffb41e4a7e6f8cf185 Mon Sep 17 00:00:00 2001
From: Paul Bakker <p.j.bakker@polarssl.org>
Date: Mon, 11 Mar 2013 17:02:58 +0100
Subject: [PATCH] Prepared for PolarSSL 1.1.6 release

---
 ChangeLog                            | 4 ++--
 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, 11 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ea2c7512d6..767764f6e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 PolarSSL ChangeLog
 
-= Branch 1.1
+= Version 1.1.6 released on 2013-03-11
 Bugfix
    * Fixed net_bind() for specified IP addresses on little endian systems
 
@@ -10,7 +10,7 @@ Changes
      disabled by default and can be enabled with POLARSSL_SSL_DEBUG_ALL
 
 Security
-   * Removed further timing differences during SSL message decryption in
+   * Removed timing differences during SSL message decryption in
      ssl_decrypt_buf()
    * Removed timing differences due to bad padding from
      rsa_rsaes_pkcs1_v15_decrypt() and rsa_pkcs1_decrypt() for PKCS#1 v1.5
diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h
index b8570f093d..3434822bce 100644
--- a/doxygen/input/doc_mainpage.h
+++ b/doxygen/input/doc_mainpage.h
@@ -4,7 +4,7 @@
  */
 
 /**
- * @mainpage PolarSSL v1.1.5 source code documentation
+ * @mainpage PolarSSL v1.1.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 ea7310c872..aa073bf03d 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.5"
+PROJECT_NAME           = "PolarSSL v1.1.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 9d61cfb3ab..c61dbee0bb 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  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         0x01010500
-#define POLARSSL_VERSION_STRING         "1.1.5"
-#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.1.5"
+#define POLARSSL_VERSION_NUMBER         0x01010600
+#define POLARSSL_VERSION_STRING         "1.1.6"
+#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.1.6"
 
 #if defined(POLARSSL_VERSION_C)
 
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index aac270024c..35ddef51de 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.5 SOVERSION 1)
+set_target_properties(polarssl PROPERTIES VERSION 1.1.6 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 47115b2f1a..a03289a475 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.5"
+check_compiletime_version:"1.1.6"
 
 Check runtime library version
-check_runtime_version:"1.1.5"
+check_runtime_version:"1.1.6"