]> git.ipfire.org Git - thirdparty/openssl.git/commit - test/handshake_helper.h
Fix session ticket and SNI
authorTodd Short <tshort@akamai.com>
Thu, 12 May 2016 22:16:52 +0000 (18:16 -0400)
committerRich Salz <rsalz@openssl.org>
Thu, 9 Jun 2016 17:07:51 +0000 (13:07 -0400)
commit5c753de668322bf9903a49ba713b2cbc62667571
treeb165b9fc4c4a67b7383e7794a4c010775ca98867
parent2a7de0fd5d9baf946ef4d2c51096b04dd47a8143
Fix session ticket and SNI

When session tickets are used, it's possible that SNI might swtich the
SSL_CTX on an SSL. Normally, this is not a problem, because the
initial_ctx/session_ctx are used for all session ticket/id processes.

However, when the SNI callback occurs, it's possible that the callback
may update the options in the SSL from the SSL_CTX, and this could
cause SSL_OP_NO_TICKET to be set. If this occurs, then two bad things
can happen:

1. The session ticket TLSEXT may not be written when the ticket expected
flag is set. The state machine transistions to writing the ticket, and
the client responds with an error as its not expecting a ticket.
2. When creating the session ticket, if the ticket key cb returns 0
the crypto/hmac contexts are not initialized, and the code crashes when
trying to encrypt the session ticket.

To fix 1, if the ticket TLSEXT is not written out, clear the expected
ticket flag.
To fix 2, consider a return of 0 from the ticket key cb a recoverable
error, and write a 0 length ticket and continue. The client-side code
can explicitly handle this case.

Fix these two cases, and add unit test code to validate ticket behavior.

Reviewed-by: Emilia Käsper <emilia@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1098)
21 files changed:
ssl/statem/statem_srvr.c
ssl/t1_lib.c
test/README.ssltest.md
test/generate_ssl_tests.pl
test/handshake_helper.c
test/handshake_helper.h
test/recipes/80-test_ssl_new.t
test/ssl-tests/01-simple.conf
test/ssl-tests/02-protocol-version.conf
test/ssl-tests/03-custom_verify.conf
test/ssl-tests/04-client_auth.conf
test/ssl-tests/05-sni.conf [new file with mode: 0644]
test/ssl-tests/05-sni.conf.in [new file with mode: 0644]
test/ssl-tests/06-sni-ticket.conf [new file with mode: 0644]
test/ssl-tests/06-sni-ticket.conf.in [new file with mode: 0644]
test/ssl_test.c
test/ssl_test.tmpl
test/ssl_test_ctx.c
test/ssl_test_ctx.h
test/ssl_test_ctx_test.c
test/ssl_test_ctx_test.conf