From afa5e516698fd1b874ab766c88d4ec625082c1a2 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 13 Aug 2015 10:06:30 +0100 Subject: Fix DTLS session ticket renewal A DTLS client will abort a handshake if the server attempts to renew the session ticket. This is caused by a state machine discrepancy between DTLS and TLS discovered during the state machine rewrite work. The bug can be demonstrated as follows: Start a DTLS s_server instance: openssl s_server -dtls Start a client and obtain a session but no ticket: openssl s_client -dtls -sess_out session.pem -no_ticket Now start a client reusing the session, but allow a ticket: openssl s_client -dtls -sess_in session.pem The client will abort the handshake. Reviewed-by: Tim Hudson (cherry picked from commit ee4ffd6fccd169775ba74afb1dbfecff48ee413d) Conflicts: ssl/d1_clnt.c --- ssl/d1_clnt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ssl/d1_clnt.c b/ssl/d1_clnt.c index c84df98..feeaf6d 100644 --- a/ssl/d1_clnt.c +++ b/ssl/d1_clnt.c @@ -382,6 +382,10 @@ int dtls1_connect(SSL *s) #endif s->state = SSL3_ST_CR_FINISHED_A; + if (s->tlsext_ticket_expected) { + /* receive renewed session ticket */ + s->state = SSL3_ST_CR_SESSION_TICKET_A; + } } else s->state = DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A; } -- 1.7.12.1