From c50132d4fa23d2c57f3a93a70dbac5744a760c66 Mon Sep 17 00:00:00 2001
From: Paul Bakker <p.j.bakker@polarssl.org>
Date: Mon, 5 Dec 2011 14:38:36 +0000
Subject: [PATCH]  - Updated version of PolarSSL to 1.1.0

---
 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 719c8126d..82871cd0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 PolarSSL ChangeLog
 
-= Version Trunk
+= Version 1.1.0 released on 2011-12-05
 Features
    * Added ssl_session_reset() to allow better multi-connection pools of
      SSL contexts without needing to set all non-connection-specific
@@ -53,7 +53,7 @@ Bugfix
      appended with '....' after first 28 octets
    * Improved build support for s390x and sparc64 in bignum.h
    * Fixed MS Visual C++ name clash with int64 in sha4.h
-   * Corrected removal of leading '00:' in printing serial numbers in
+   * Corrected removal of leading "00:" in printing serial numbers in
      certificates and CRLs
 
 = Version 1.0.0 released on 2011-07-27
diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h
index db769731a..c5d5507b1 100644
--- a/doxygen/input/doc_mainpage.h
+++ b/doxygen/input/doc_mainpage.h
@@ -4,7 +4,7 @@ l/**
  */
 
 /**
- * @mainpage PolarSSL v1.0.0 source code documentation
+ * @mainpage PolarSSL v1.1.0 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 a1395fc5f..29f3656e1 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.0.0"
+PROJECT_NAME           = "PolarSSL v1.1.0"
 
 # 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 a12fdd1f7..13f14208a 100644
--- a/include/polarssl/version.h
+++ b/include/polarssl/version.h
@@ -38,7 +38,7 @@
  * Major, Minor, Patchlevel
  */
 #define POLARSSL_VERSION_MAJOR  1
-#define POLARSSL_VERSION_MINOR  0
+#define POLARSSL_VERSION_MINOR  1
 #define POLARSSL_VERSION_PATCH  0
 
 /**
@@ -46,9 +46,9 @@
  *    MMNNPP00
  *    Major version | Minor version | Patch version
  */
-#define POLARSSL_VERSION_NUMBER         0x01000000
-#define POLARSSL_VERSION_STRING         "1.0.0"
-#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.0.0"
+#define POLARSSL_VERSION_NUMBER         0x01010000
+#define POLARSSL_VERSION_STRING         "1.1.0"
+#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.1.0"
 
 #if defined(POLARSSL_VERSION_C)
 
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 4cfaf33fb..195c2cea9 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.0.0 SOVERSION 0)
+SET_TARGET_PROPERTIES(polarssl PROPERTIES VERSION 1.1.0 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 2f5c18871..0ac11252a 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.0.0"
+check_compiletime_version:"1.1.0"
 
 Check runtime library version
-check_runtime_version:"1.0.0"
+check_runtime_version:"1.1.0"