From 68514b09a1de6780a582c4d936c4f861f7919ca7 Mon Sep 17 00:00:00 2001
From: Paul Bakker <p.j.bakker@polarssl.org>
Date: Wed, 19 Jun 2013 12:15:10 +0200
Subject: [PATCH] Prepared for PolarSSL release 1.1.7

---
 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 23eb1a020..683ce2030 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 PolarSSL ChangeLog
 
-= Branch 1.1
+= Version 1.1.7 released on 2013-06-19
 Changes
    * HAVEGE random generator disabled by default
 
diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h
index 3434822bc..701c84be7 100644
--- a/doxygen/input/doc_mainpage.h
+++ b/doxygen/input/doc_mainpage.h
@@ -4,7 +4,7 @@
  */
 
 /**
- * @mainpage PolarSSL v1.1.6 source code documentation
+ * @mainpage PolarSSL v1.1.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 aa073bf03..769d5d25b 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.6"
+PROJECT_NAME           = "PolarSSL v1.1.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 c61dbee0b..756809cb8 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  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         0x01010600
-#define POLARSSL_VERSION_STRING         "1.1.6"
-#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.1.6"
+#define POLARSSL_VERSION_NUMBER         0x01010700
+#define POLARSSL_VERSION_STRING         "1.1.7"
+#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.1.7"
 
 #if defined(POLARSSL_VERSION_C)
 
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 35ddef51d..b91390ce9 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.6 SOVERSION 1)
+set_target_properties(polarssl PROPERTIES VERSION 1.1.7 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 a03289a47..ba13cf563 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.6"
+check_compiletime_version:"1.1.7"
 
 Check runtime library version
-check_runtime_version:"1.1.6"
+check_runtime_version:"1.1.7"