From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 13 Nov 2015 16:00:29 +0000 (+0000)
Subject: absent identity hint should be NULL
X-Git-Tag: OpenSSL_1_1_0-pre1~288
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=558ceae7e82f8a7a636224f9d2d6ec214ee980a2;p=thirdparty%2Fopenssl.git

absent identity hint should be NULL

Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 330cee13fc4..73716b5d9b5 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;