diff options
| author | Matt Caswell <matt@openssl.org> | 2019-03-01 15:40:20 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-03-05 14:28:27 +0000 |
| commit | c9a826d28f8211e86b3b866809e1b30a2de48740 (patch) | |
| tree | e9fb567553d4ad67191b204dc8d218edbd8d77c3 /ssl/statem/statem_clnt.c | |
| parent | 99f0c7a8a6999e2f78fc065e4da78643ae14c14c (diff) | |
Don't write the tick_identity to the session
Sessions must be immutable once they can be shared with multiple threads.
We were breaking that rule by writing the ticket index into it during the
handshake. This can lead to incorrect behaviour, including failed
connections in multi-threaded environments.
Reported by David Benjamin.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8383)
(cherry picked from commit c96ce52ce293785b54a42d119c457aef739cc2ce)
Diffstat (limited to 'ssl/statem/statem_clnt.c')
| -rw-r--r-- | ssl/statem/statem_clnt.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c index e56d24dfff..87800cd835 100644 --- a/ssl/statem/statem_clnt.c +++ b/ssl/statem/statem_clnt.c @@ -1613,10 +1613,7 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL *s, PACKET *pkt) * so the PAC-based session secret is always preserved. It'll be * overwritten if the server refuses resumption. */ - if (s->session->session_id_length > 0 - || (SSL_IS_TLS13(s) - && s->session->ext.tick_identity - != TLSEXT_PSK_BAD_IDENTITY)) { + if (s->session->session_id_length > 0) { tsan_counter(&s->session_ctx->stats.sess_miss); if (!ssl_get_new_session(s, 0)) { /* SSLfatal() already called */ |