From f4dc1868182b49265d2511f8cabb4bd00db3f082 Mon Sep 17 00:00:00 2001
From: Paul Bakker
Date: Mon, 4 Nov 2013 17:29:42 +0100
Subject: [PATCH] Prep for PolarSSL 1.3.2
---
ChangeLog | 2 +-
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, 10 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 11781d54a..334d147fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
PolarSSL ChangeLog (Sorted per branch, date)
-= PolarSSL 1.3 branch
+= PolarSSL 1.3.2 released on 2013-11-04
Features
* PK tests added to test framework
* Added optional optimization for NIST MODP curves (POLARSSL_ECP_NIST_OPTIM)
diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h
index f04aac376..2256eb802 100644
--- a/doxygen/input/doc_mainpage.h
+++ b/doxygen/input/doc_mainpage.h
@@ -4,7 +4,7 @@
*/
/**
- * @mainpage PolarSSL v1.3.1 source code documentation
+ * @mainpage PolarSSL v1.3.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 49ea20710..4516070a1 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.1"
+PROJECT_NAME = "PolarSSL v1.3.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 8a5fc81d7..8e2ae7e67 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 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 0x01030100
-#define POLARSSL_VERSION_STRING "1.3.1"
-#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.3.1"
+#define POLARSSL_VERSION_NUMBER 0x01030200
+#define POLARSSL_VERSION_STRING "1.3.2"
+#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.3.2"
#if defined(POLARSSL_VERSION_C)
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index ed08abba8..baaf822b4 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.1 SOVERSION 5)
+set_target_properties(polarssl PROPERTIES VERSION 1.3.2 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 12a79981b..142d83af2 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.1"
+check_compiletime_version:"1.3.2"
Check runtime library version
-check_runtime_version:"1.3.1"
+check_runtime_version:"1.3.2"