summaryrefslogtreecommitdiffstats
path: root/test/ssl_test.tmpl
diff options
context:
space:
mode:
authorTodd Short <tshort@akamai.com>2016-05-12 18:16:52 -0400
committerRich Salz <rsalz@openssl.org>2016-06-09 13:07:51 -0400
commit5c753de668322bf9903a49ba713b2cbc62667571 (patch)
treeb165b9fc4c4a67b7383e7794a4c010775ca98867 /test/ssl_test.tmpl
parent2a7de0fd5d9baf946ef4d2c51096b04dd47a8143 (diff)
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)
Diffstat (limited to 'test/ssl_test.tmpl')
-rw-r--r--test/ssl_test.tmpl8
1 files changed, 8 insertions, 0 deletions
diff --git a/test/ssl_test.tmpl b/test/ssl_test.tmpl
index b3c953a54b..d4c0c87616 100644
--- a/test/ssl_test.tmpl
+++ b/test/ssl_test.tmpl
@@ -3,6 +3,7 @@ ssl_conf = {-$testname-}-ssl
[{-$testname-}-ssl]
server = {-$testname-}-server
+server2 = {-$testname-}-server2
client = {-$testname-}-client
[{-$testname-}-server]
@@ -12,6 +13,13 @@ client = {-$testname-}-client
}
-}
+[{-$testname-}-server2]
+{-
+ foreach my $key (sort keys %server2) {
+ $OUT .= qq{$key} . " = " . qq{$server2{$key}\n} if defined $server2{$key};
+ }
+-}
+
[{-$testname-}-client]
{-
foreach my $key (sort keys %client) {