Prepared for 1.3.0 RC0
diff --git a/ChangeLog b/ChangeLog
index 82c7ab4..8b33ff9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
PolarSSL ChangeLog
-= Development
+= PolarSSL-1.3 branch
Features
* Elliptic Curve Cryptography module added
* Elliptic Curve Diffie Hellman module added
@@ -12,8 +12,7 @@
* PSK and DHE-PSK based ciphersuites added
* Memory allocation abstraction layer added
* Buffer-based memory allocator added (no malloc() / free() / HEAP usage)
- * Public Key abstration layer added
- * Also compiles / runs without time-based functions (!POLARSSL_HAVE_TIME)
+ * Public Key abstraction layer added
* Parsing Elliptic Curve keys
* Parsing Elliptic Curve certificates
* Support for max_fragment_length extension (RFC 6066)
@@ -46,7 +45,7 @@
* All RSA operations require a random generator for blinding purposes
* X509 core refactored
* x509_crt_verify() now case insensitive for cn (RFC 6125 6.4)
-
+ * Also compiles / runs without time-based functions (!POLARSSL_HAVE_TIME)
Bugfix
* Fixed parse error in ssl_parse_certificate_request()
diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h
index 44d961f..0043e1f 100644
--- a/doxygen/input/doc_mainpage.h
+++ b/doxygen/input/doc_mainpage.h
@@ -4,7 +4,7 @@
*/
/**
- * @mainpage PolarSSL v1.2.6 source code documentation
+ * @mainpage PolarSSL v1.3.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 5182743..78cfc72 100644
--- a/doxygen/polarssl.doxyfile
+++ b/doxygen/polarssl.doxyfile
@@ -28,7 +28,7 @@
# 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.2.6"
+PROJECT_NAME = "PolarSSL v1.3.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 9bab3ca..1db8005 100644
--- a/include/polarssl/version.h
+++ b/include/polarssl/version.h
@@ -38,17 +38,17 @@
* Major, Minor, Patchlevel
*/
#define POLARSSL_VERSION_MAJOR 1
-#define POLARSSL_VERSION_MINOR 2
-#define POLARSSL_VERSION_PATCH 6
+#define POLARSSL_VERSION_MINOR 3
+#define POLARSSL_VERSION_PATCH 0
/**
* The single version number has the following structure:
* MMNNPP00
* Major version | Minor version | Patch version
*/
-#define POLARSSL_VERSION_NUMBER 0x01020600
-#define POLARSSL_VERSION_STRING "1.2.6"
-#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.2.6"
+#define POLARSSL_VERSION_NUMBER 0x01030000
+#define POLARSSL_VERSION_STRING "1.3.0"
+#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.3.0"
#if defined(POLARSSL_VERSION_C)
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 0550189..f9ffdf9 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -75,7 +75,7 @@
else(NOT USE_SHARED_POLARSSL_LIBRARY)
add_library(polarssl SHARED ${src})
-set_target_properties(polarssl PROPERTIES VERSION 1.2.6 SOVERSION 2)
+set_target_properties(polarssl PROPERTIES VERSION 1.3.0 SOVERSION 3)
endif(NOT USE_SHARED_POLARSSL_LIBRARY)
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 020d0e8..c01ee36 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -3547,6 +3547,8 @@
memcpy( ssl->psk, psk, ssl->psk_len );
memcpy( ssl->psk_identity, psk_identity, ssl->psk_identity_len );
+
+ return( 0 );
}
void ssl_set_psk_cb( ssl_context *ssl,
diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data
index 267527a..ff844d9 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.6"
+check_compiletime_version:"1.3.0"
Check runtime library version
-check_runtime_version:"1.2.6"
+check_runtime_version:"1.3.0"