From b5f04e4d84966610a291483765cbd6871b7a6f43 Mon Sep 17 00:00:00 2001 From: Guilhem Bryant Date: Wed, 1 Apr 2020 11:23:58 +0100 Subject: [PATCH] Properly initialise psk and psk_len Signed-off-by: Guilhem Bryant --- include/mbedtls/ssl_internal.h | 2 ++ library/ssl_tls.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/mbedtls/ssl_internal.h b/include/mbedtls/ssl_internal.h index fb8c23feea..1e58ca3eb7 100644 --- a/include/mbedtls/ssl_internal.h +++ b/include/mbedtls/ssl_internal.h @@ -945,6 +945,8 @@ static inline int mbedtls_ssl_get_psk( const mbedtls_ssl_context *ssl, else { + *psk = NULL; + *psk_len = 0; return( MBEDTLS_ERR_SSL_PRIVATE_KEY_REQUIRED ); } diff --git a/library/ssl_tls.c b/library/ssl_tls.c index 6dabd3409c..4a8686cc43 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -1848,7 +1848,7 @@ int mbedtls_ssl_psk_derive_premaster( mbedtls_ssl_context *ssl, mbedtls_key_exch { 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 )