a84e5c9aa8
When an SSL's context is swtiched from a ticket-enabled context to a ticket-disabled context in the servername callback, no session-id is generated, so the session can't be resumed. If a servername callback changes the SSL_OP_NO_TICKET option, check to see if it's changed to disable, and whether a session ticket is expected (i.e. the client indicated ticket support and the SSL had tickets enabled at the time), and whether we already have a previous session (i.e. s->hit is set). In this case, clear the ticket-expected flag, remove any ticket data and generate a session-id in the session. If the SSL hit (resumed) and switched to a ticket-disabled context, assume that the resumption was via session-id, and don't bother to update the session. Before this fix, the updated unit-tests in 06-sni-ticket.conf would fail test #4 (server1 = SNI, server2 = no SNI). Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/1529) |
||
---|---|---|
.. | ||
extensions.c | ||
extensions_clnt.c | ||
extensions_cust.c | ||
extensions_srvr.c | ||
README | ||
statem.c | ||
statem.h | ||
statem_clnt.c | ||
statem_dtls.c | ||
statem_lib.c | ||
statem_locl.h | ||
statem_srvr.c |
State Machine Design ==================== This file provides some guidance on the thinking behind the design of the state machine code to aid future maintenance. The state machine code replaces an older state machine present in OpenSSL versions 1.0.2 and below. The new state machine has the following objectives: - Remove duplication of state code between client and server - Remove duplication of state code between TLS and DTLS - Simplify transitions and bring the logic together in a single location so that it is easier to validate - Remove duplication of code between each of the message handling functions - Receive a message first and then work out whether that is a valid transition - not the other way around (the other way causes lots of issues where we are expecting one type of message next but actually get something else) - Separate message flow state from handshake state (in order to better understand each) - message flow state = when to flush buffers; handling restarts in the event of NBIO events; handling the common flow of steps for reading a message and the common flow of steps for writing a message etc - handshake state = what handshake message are we working on now - Control complexity: only the state machine can change state: keep all the state changes local to the state machine component The message flow state machine is divided into a reading sub-state machine and a writing sub-state machine. See the source comments in statem.c for a more detailed description of the various states and transitions possible. Conceptually the state machine component is designed as follows: libssl | ---------------------------|-----statem.h-------------------------------------- | _______V____________________ | | | statem.c | | | | Core state machine code | |____________________________| statem_locl.h ^ ^ _________| |_______ | | _____________|____________ _____________|____________ | | | | | statem_clnt.c | | statem_srvr.c | | | | | | TLS/DTLS client specific | | TLS/DTLS server specific | | state machine code | | state machine code | |__________________________| |__________________________| | |_______________|__ | | ________________| | | | | | | ____________V_______V________ ________V______V_______________ | | | | | statem_both.c | | statem_dtls.c | | | | | | Non core functions common | | Non core functions common to | | to both servers and clients | | both DTLS servers and clients | |_____________________________| |_______________________________|