diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-11-13 16:00:29 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-11-13 16:00:29 +0000 |
| commit | 558ceae7e82f8a7a636224f9d2d6ec214ee980a2 (patch) | |
| tree | 4500f0a3aafd81eaf334f9278d2257f11fb832ca | |
| parent | fbab8baddef8d3346ae40ff068871e2ddaf10270 (diff) | |
| download | openssl-558ceae7e82f8a7a636224f9d2d6ec214ee980a2.zip openssl-558ceae7e82f8a7a636224f9d2d6ec214ee980a2.tar.gz openssl-558ceae7e82f8a7a636224f9d2d6ec214ee980a2.tar.bz2 | |
absent identity hint should be NULL
Reviewed-by: Matt Caswell <matt@openssl.org>
| -rw-r--r-- | ssl/statem/statem_clnt.c | 5 |
1 files changed, 4 insertions, 1 deletions
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; |