From 145e68119b5c296f386d8346ecd51700196e955b Mon Sep 17 00:00:00 2001
From: Paul Bakker <p.j.bakker@polarssl.org>
Date: Fri, 20 Apr 2012 13:58:28 +0000
Subject: [PATCH]  - Ready for release 1.1.2

---
 ChangeLog                            | 3 ++-
 doxygen/input/doc_mainpage.h         | 2 +-
 doxygen/polarssl.doxyfile            | 2 +-
 include/polarssl/version.h           | 8 ++++----
 tests/suites/test_suite_version.data | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cbbfcc836..0c2b401be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,8 @@ Bugfix
 Security
    * Fixed potential memory corruption on miscrafted client messages (found by
      Frama-C team at CEA LIST)
-   * Fixed generation of DHM parameters to correct length
+   * Fixed generation of DHM parameters to correct length (found by Ruslan
+     Yushchenko)
 
 = Version 1.1.1 released on 2012-01-23
 Bugfix
diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h
index 456b5e617..08c19f919 100644
--- a/doxygen/input/doc_mainpage.h
+++ b/doxygen/input/doc_mainpage.h
@@ -4,7 +4,7 @@
  */
 
 /**
- * @mainpage PolarSSL v1.1.1 source code documentation
+ * @mainpage PolarSSL v1.1.2 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 41cb6e0fb..07882ed83 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.1"
+PROJECT_NAME           = "PolarSSL v1.1.2"
 
 # 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 98eb0b3f1..1ea35a190 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  1
+#define POLARSSL_VERSION_PATCH  2
 
 /**
  * The single version number has the following structure:
  *    MMNNPP00
  *    Major version | Minor version | Patch version
  */
-#define POLARSSL_VERSION_NUMBER         0x01010100
-#define POLARSSL_VERSION_STRING         "1.1.1"
-#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.1.1"
+#define POLARSSL_VERSION_NUMBER         0x01010200
+#define POLARSSL_VERSION_STRING         "1.1.2"
+#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.1.2"
 
 #if defined(POLARSSL_VERSION_C)
 
diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data
index 8809a5914..b20d22315 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.1"
+check_compiletime_version:"1.1.2"
 
 Check runtime library version
-check_runtime_version:"1.1.1"
+check_runtime_version:"1.1.2"