commit b5f04e4d84966610a291483765cbd6871b7a6f43
author Guilhem Bryant <Guilhem.Bryant@arm.com> Wed Apr 01 11:23:58 2020 +0100
committer Guilhem Bryant <Guilhem.Bryant@arm.com> Wed Apr 01 11:25:12 2020 +0100
tree 3505d108403259918c999c05d3fb0ed4142646a8
parent 8a69ddd7ad7eb17b8daf9a7b0352314183c54c96

Properly initialise psk and psk_len

Signed-off-by: Guilhem Bryant <Guilhem.Bryant@arm.com>

include/mbedtls/ssl_internal.h

diff --git a/include/mbedtls/ssl_internal.h b/include/mbedtls/ssl_internal.h
index fb8c23f..1e58ca3 100644
--- a/include/mbedtls/ssl_internal.h
+++ b/include/mbedtls/ssl_internal.h
@@ -945,6 +945,8 @@
 
     else
     {
+        *psk = NULL;
+        *psk_len = 0;
         return( MBEDTLS_ERR_SSL_PRIVATE_KEY_REQUIRED );
     }
 

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 6dabd34..4a8686c 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1848,7 +1848,7 @@
 {
     unsigned char *p = ssl->handshake->premaster;
     unsigned char *end = p + sizeof( ssl->handshake->premaster );
-    const unsigned char *psk;
+    const unsigned char *psk = NULL;
     size_t psk_len = 0;
 
     if( mbedtls_ssl_get_psk( ssl, &psk, &psk_len )