From 558ceae7e82f8a7a636224f9d2d6ec214ee980a2 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Fri, 13 Nov 2015 16:00:29 +0000 Subject: [PATCH] absent identity hint should be NULL Reviewed-by: Matt Caswell --- ssl/statem/statem_clnt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c index 330cee13fc..73716b5d9b 100644 --- a/ssl/statem/statem_clnt.c +++ b/ssl/statem/statem_clnt.c @@ -1650,7 +1650,10 @@ MSG_PROCESS_RETURN tls_process_key_exchange(SSL *s, PACKET *pkt) goto f_err; } - if (!PACKET_strndup(&psk_identity_hint, + if (PACKET_remaining(&psk_identity_hint) == 0) { + OPENSSL_free(s->session->psk_identity_hint); + s->session->psk_identity_hint = NULL; + } else if (!PACKET_strndup(&psk_identity_hint, &s->session->psk_identity_hint)) { al = SSL_AD_INTERNAL_ERROR; goto f_err; -- GitLab