From 5c17ccdf2a398f3bc65f43a3d7659e71fac9444b Mon Sep 17 00:00:00 2001
From: Paul Bakker <p.j.bakker@polarssl.org>
Date: Tue, 15 Oct 2013 13:12:41 +0200
Subject: [PATCH] Bumped version to 1.3.1

---
 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 939d4f5d4..d9f3edb9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 PolarSSL ChangeLog (Sorted per branch, date)
 
-= Branch 1.3
+= PolarSSL 1.3.1 released on 2013-10-15
 Features
    * Support for Brainpool curves and TLS ciphersuites (RFC 7027)
    * Support for ECDHE-PSK key-exchange and ciphersuites
@@ -22,7 +22,7 @@ Bugfix
    * threading_set_alt() name
    * Added missing x509write_crt_set_version()
 
-= PolarSSL-1.3.0 released on 2013-10-01
+= PolarSSL 1.3.0 released on 2013-10-01
 Features
    * Elliptic Curve Cryptography module added
    * Elliptic Curve Diffie Hellman module added
diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h
index 0043e1fe0..f04aac376 100644
--- a/doxygen/input/doc_mainpage.h
+++ b/doxygen/input/doc_mainpage.h
@@ -4,7 +4,7 @@
  */
 
 /**
- * @mainpage PolarSSL v1.3.0 source code documentation
+ * @mainpage PolarSSL v1.3.1 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 78cfc7290..49ea20710 100644
--- a/doxygen/polarssl.doxyfile
+++ b/doxygen/polarssl.doxyfile
@@ -28,7 +28,7 @@ DOXYFILE_ENCODING      = UTF-8
 # identify the project. Note that if you do not use Doxywizard you need
 # to put quotes around the project name if it contains spaces.
 
-PROJECT_NAME           = "PolarSSL v1.3.0"
+PROJECT_NAME           = "PolarSSL v1.3.1"
 
 # 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 1db8005cf..8a5fc81d7 100644
--- a/include/polarssl/version.h
+++ b/include/polarssl/version.h
@@ -39,16 +39,16 @@
  */
 #define POLARSSL_VERSION_MAJOR  1
 #define POLARSSL_VERSION_MINOR  3
-#define POLARSSL_VERSION_PATCH  0
+#define POLARSSL_VERSION_PATCH  1
 
 /**
  * The single version number has the following structure:
  *    MMNNPP00
  *    Major version | Minor version | Patch version
  */
-#define POLARSSL_VERSION_NUMBER         0x01030000
-#define POLARSSL_VERSION_STRING         "1.3.0"
-#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.3.0"
+#define POLARSSL_VERSION_NUMBER         0x01030100
+#define POLARSSL_VERSION_STRING         "1.3.1"
+#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.3.1"
 
 #if defined(POLARSSL_VERSION_C)
 
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index bc22f2682..ed08abba8 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -76,7 +76,7 @@ add_library(polarssl STATIC ${src})
 else(NOT USE_SHARED_POLARSSL_LIBRARY)
 
 add_library(polarssl SHARED ${src})
-set_target_properties(polarssl PROPERTIES VERSION 1.3.0 SOVERSION 4)
+set_target_properties(polarssl PROPERTIES VERSION 1.3.1 SOVERSION 5)
 
 endif(NOT USE_SHARED_POLARSSL_LIBRARY)
 
diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data
index ff844d9cf..12a79981b 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.3.0"
+check_compiletime_version:"1.3.1"
 
 Check runtime library version
-check_runtime_version:"1.3.0"
+check_runtime_version:"1.3.1"