commit 5ad403f5b560ff8ec2f3467945eeeba5f0304c36
author Paul Bakker <p.j.bakker@polarssl.org> Wed Sep 18 21:21:30 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Wed Sep 18 21:21:30 2013 +0200
tree bcba44fa221ce118930ac19a20a6dcc263be659e
parent eaed9dffb7454377141b283f401a0c22669a3a71

Prepared for 1.3.0 RC0

library/CMakeLists.txt

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)
 

library/ssl_tls.c

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,