The branch master has been updated
via 558ceae7e82f8a7a636224f9d2d6ec214ee980a2 (commit)
from fbab8baddef8d3346ae40ff068871e2ddaf10270 (commit)
- Log -----------------------------------------------------------------
commit 558ceae7e82f8a7a636224f9d2d6ec214ee980a2
Author: Dr. Stephen Henson <[email protected]>
Date: Fri Nov 13 16:00:29 2015 +0000
absent identity hint should be NULL
Reviewed-by: Matt Caswell <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
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 330cee1..73716b5 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;
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
