Fix DTLS session ticket renewal
authorMatt Caswell <matt@openssl.org>
Thu, 13 Aug 2015 09:06:30 +0000 (10:06 +0100)
committerMatt Caswell <matt@openssl.org>
Wed, 26 Aug 2015 09:23:53 +0000 (10:23 +0100)
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 <tjh@openssl.org>
(cherry picked from commit ee4ffd6fccd169775ba74afb1dbfecff48ee413d)

Conflicts:
ssl/d1_clnt.c

ssl/d1_clnt.c

index c84df98ec314b27b3b6084dc553c638a3d1cc8f9..feeaf6d0656f5d0868121852d42b5037b8823111 100644 (file)
@@ -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;
             }