From df5069cb97f5381fdce4f44949f400db9a5e7d9f Mon Sep 17 00:00:00 2001
From: Paul Bakker <p.j.bakker@polarssl.org>
Date: Sat, 24 Nov 2012 12:20:19 +0100
Subject: [PATCH] Updated for 1.2.2 release

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

diff --git a/ChangeLog b/ChangeLog
index d84a2a93e..af55e6476 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,14 @@
 PolarSSL ChangeLog
 
-= Version Master
+= Version 1.2.2 released 2012-11-24
 Changes
    * Added p_hw_data to ssl_context for context specific hardware acceleration
      data
+   * During verify trust-CA is only checked for expiration and CRL presence  
 
 Bugfixes
-   * Fixed client authentication compatibility with TLS 1.2
+   * Fixed client authentication compatibility
+   * Fixed dependency on POLARSSL_SHA4_C in SSL modules
 
 = Version 1.2.1 released 2012-11-20
 Changes
diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h
index 07dfdc2e1..4fe52ba30 100644
--- a/doxygen/input/doc_mainpage.h
+++ b/doxygen/input/doc_mainpage.h
@@ -4,7 +4,7 @@
  */
 
 /**
- * @mainpage PolarSSL v1.2.1 source code documentation
+ * @mainpage PolarSSL v1.2.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 008364eeb..7c3394762 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.2.1"
+PROJECT_NAME           = "PolarSSL v1.2.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 4fe84a939..f93238c6d 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  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         0x01020100
-#define POLARSSL_VERSION_STRING         "1.2.1"
-#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.2.1"
+#define POLARSSL_VERSION_NUMBER         0x01020200
+#define POLARSSL_VERSION_STRING         "1.2.2"
+#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.2.2"
 
 #if defined(POLARSSL_VERSION_C)
 
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 640cf82fb..e420437d8 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -57,7 +57,7 @@ add_library(polarssl STATIC ${src})
 else(NOT USE_SHARED_POLARSSL_LIBRARY)
 
 add_library(polarssl SHARED ${src})
-set_target_properties(polarssl PROPERTIES VERSION 1.2.1 SOVERSION 2)
+set_target_properties(polarssl PROPERTIES VERSION 1.2.2 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 c795cf9d8..3bc96b02f 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.1"
+check_compiletime_version:"1.2.2"
 
 Check runtime library version
-check_runtime_version:"1.2.1"
+check_runtime_version:"1.2.2"