From d36da11125a9c85c572a4fdf63e0a25e76d7bb18 Mon Sep 17 00:00:00 2001
From: Paul Bakker <p.j.bakker@polarssl.org>
Date: Thu, 31 May 2012 10:46:28 +0000
Subject: [PATCH] Version 1.1.4

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

diff --git a/ChangeLog b/ChangeLog
index ea4cf467a..3f1658db2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,8 @@
 PolarSSL ChangeLog
 
-= Version 1.1.4 released on 2012-05-30
+= Version 1.1.4 released on 2012-05-31
 Bugfix
-   * Correctly handle empty packets (Found by James Yonan)
+   * Correctly handle empty SSL/TLS packets (Found by James Yonan)
    * Fixed potential heap corruption in x509_name allocation
    * Fixed single RSA test that failed on Big Endian systems (Closes ticket #54)
 
diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h
index 30c2cb542..e99ab72ea 100644
--- a/doxygen/input/doc_mainpage.h
+++ b/doxygen/input/doc_mainpage.h
@@ -4,7 +4,7 @@
  */
 
 /**
- * @mainpage PolarSSL v1.1.3 source code documentation
+ * @mainpage PolarSSL v1.1.4 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 4266d1826..c36332cb1 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.3"
+PROJECT_NAME           = "PolarSSL v1.1.4"
 
 # 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 83fea5f1c..ade9d269a 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  3
+#define POLARSSL_VERSION_PATCH  4
 
 /**
  * The single version number has the following structure:
  *    MMNNPP00
  *    Major version | Minor version | Patch version
  */
-#define POLARSSL_VERSION_NUMBER         0x01010300
-#define POLARSSL_VERSION_STRING         "1.1.3"
-#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.1.3"
+#define POLARSSL_VERSION_NUMBER         0x01010400
+#define POLARSSL_VERSION_STRING         "1.1.4"
+#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.1.4"
 
 #if defined(POLARSSL_VERSION_C)
 
diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data
index 617b942ed..3b0e1f314 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.3"
+check_compiletime_version:"1.1.4"
 
 Check runtime library version
-check_runtime_version:"1.1.3"
+check_runtime_version:"1.1.4"