projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fbab8ba
)
absent identity hint should be NULL
author
Dr. Stephen Henson
<steve@openssl.org>
Fri, 13 Nov 2015 16:00:29 +0000
(16:00 +0000)
committer
Dr. Stephen Henson
<steve@openssl.org>
Fri, 13 Nov 2015 16:00:29 +0000
(16:00 +0000)
Reviewed-by: Matt Caswell <matt@openssl.org>
ssl/statem/statem_clnt.c
patch
|
blob
|
history
diff --git
a/ssl/statem/statem_clnt.c
b/ssl/statem/statem_clnt.c
index 330cee13fc42b537e0c1cc5988455892917f9e0c..73716b5d9b5375afe7c80c1f55092e8be03a9fbb 100644
(file)
--- 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;