diff options
author | Emilia Kasper <emilia@openssl.org> | 2016-07-21 19:19:07 +0200 |
---|---|---|
committer | Emilia Kasper <emilia@openssl.org> | 2016-07-22 15:54:26 +0200 |
commit | d0c4415de5eaa555ead6eb99660e46410b45e181 (patch) | |
tree | 406104d1c38ddde3a256d7c4a6d6fec9e023eaab /test | |
parent | d972af2b5e6b8c266f878ce28e60badcbc402311 (diff) |
SSL tests: compress generated output a little
Don't emit duplicate server/client sections when they are
identical. Instead, just point to the same section.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test')
-rw-r--r-- | test/generate_ssl_tests.pl | 31 | ||||
-rw-r--r-- | test/ssl-tests/05-sni.conf | 35 | ||||
-rw-r--r-- | test/ssl-tests/06-sni-ticket.conf | 34 | ||||
-rw-r--r-- | test/ssl-tests/08-npn.conf | 10 | ||||
-rw-r--r-- | test/ssl-tests/09-alpn.conf | 8 | ||||
-rw-r--r-- | test/ssl-tests/10-resumption.conf | 342 | ||||
-rw-r--r-- | test/ssl-tests/11-dtls_resumption.conf | 152 | ||||
-rw-r--r-- | test/ssl_test.tmpl | 10 |
8 files changed, 160 insertions, 462 deletions
diff --git a/test/generate_ssl_tests.pl b/test/generate_ssl_tests.pl index 951421bb2c..f103e8efb5 100644 --- a/test/generate_ssl_tests.pl +++ b/test/generate_ssl_tests.pl @@ -45,32 +45,35 @@ sub print_templates { $test->{"server"} = { (%ssltests::base_server, %{$test->{"server"}}) }; if (defined $test->{"server2"}) { $test->{"server2"} = { (%ssltests::base_server, %{$test->{"server2"}}) }; - } elsif (defined $test->{"test"}->{"ServerNameCallback"}) { - # Default is the same as server. - $test->{"server2"} = { (%ssltests::base_server, %{$test->{"server"}}) }; } else { - # Do not emit an empty "server2" section. + if (defined $test->{"test"}->{"ServerNameCallback"}) { + # Default is the same as server. + $test->{"reuse_server2"} = 1; + } + # Do not emit an empty/duplicate "server2" section. $test->{"server2"} = { }; } if (defined $test->{"resume_server"}) { $test->{"resume_server"} = { (%ssltests::base_server, %{$test->{"resume_server"}}) }; - } elsif (defined $test->{"test"}->{"HandshakeMode"} && - $test->{"test"}->{"HandshakeMode"} eq "Resume") { - # Default is the same as server. - $test->{"resume_server"} = { (%ssltests::base_server, %{$test->{"server"}}) }; } else { - # Do not emit an empty "resume-server" section. + if (defined $test->{"test"}->{"HandshakeMode"} && + $test->{"test"}->{"HandshakeMode"} eq "Resume") { + # Default is the same as server. + $test->{"reuse_resume_server"} = 1; + } + # Do not emit an empty/duplicate "resume-server" section. $test->{"resume_server"} = { }; } $test->{"client"} = { (%ssltests::base_client, %{$test->{"client"}}) }; if (defined $test->{"resume_client"}) { $test->{"resume_client"} = { (%ssltests::base_client, %{$test->{"resume_client"}}) }; - } elsif (defined $test->{"test"}->{"HandshakeMode"} && - $test->{"test"}->{"HandshakeMode"} eq "Resume") { - # Default is the same as client. - $test->{"resume_client"} = { (%ssltests::base_client, %{$test->{"client"}}) }; } else { - # Do not emit an empty "resume-client" section. + if (defined $test->{"test"}->{"HandshakeMode"} && + $test->{"test"}->{"HandshakeMode"} eq "Resume") { + # Default is the same as client. + $test->{"reuse_resume_client"} = 1; + } + # Do not emit an empty/duplicate "resume-client" section. $test->{"resume_client"} = { }; } } diff --git a/test/ssl-tests/05-sni.conf b/test/ssl-tests/05-sni.conf index ef6db27ca1..3fbb169e82 100644 --- a/test/ssl-tests/05-sni.conf +++ b/test/ssl-tests/05-sni.conf @@ -15,19 +15,14 @@ ssl_conf = 0-SNI-switch-context-ssl [0-SNI-switch-context-ssl] server = 0-SNI-switch-context-server -server2 = 0-SNI-switch-context-server2 client = 0-SNI-switch-context-client +server2 = 0-SNI-switch-context-server [0-SNI-switch-context-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[0-SNI-switch-context-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [0-SNI-switch-context-client] CipherString = DEFAULT VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem @@ -47,19 +42,14 @@ ssl_conf = 1-SNI-keep-context-ssl [1-SNI-keep-context-ssl] server = 1-SNI-keep-context-server -server2 = 1-SNI-keep-context-server2 client = 1-SNI-keep-context-client +server2 = 1-SNI-keep-context-server [1-SNI-keep-context-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[1-SNI-keep-context-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [1-SNI-keep-context-client] CipherString = DEFAULT VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem @@ -103,19 +93,14 @@ ssl_conf = 3-SNI-no-client-support-ssl [3-SNI-no-client-support-ssl] server = 3-SNI-no-client-support-server -server2 = 3-SNI-no-client-support-server2 client = 3-SNI-no-client-support-client +server2 = 3-SNI-no-client-support-server [3-SNI-no-client-support-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[3-SNI-no-client-support-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [3-SNI-no-client-support-client] CipherString = DEFAULT VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem @@ -134,19 +119,14 @@ ssl_conf = 4-SNI-bad-sni-ignore-mismatch-ssl [4-SNI-bad-sni-ignore-mismatch-ssl] server = 4-SNI-bad-sni-ignore-mismatch-server -server2 = 4-SNI-bad-sni-ignore-mismatch-server2 client = 4-SNI-bad-sni-ignore-mismatch-client +server2 = 4-SNI-bad-sni-ignore-mismatch-server [4-SNI-bad-sni-ignore-mismatch-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[4-SNI-bad-sni-ignore-mismatch-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [4-SNI-bad-sni-ignore-mismatch-client] CipherString = DEFAULT VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem @@ -166,19 +146,14 @@ ssl_conf = 5-SNI-bad-sni-reject-mismatch-ssl [5-SNI-bad-sni-reject-mismatch-ssl] server = 5-SNI-bad-sni-reject-mismatch-server -server2 = 5-SNI-bad-sni-reject-mismatch-server2 client = 5-SNI-bad-sni-reject-mismatch-client +server2 = 5-SNI-bad-sni-reject-mismatch-server [5-SNI-bad-sni-reject-mismatch-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[5-SNI-bad-sni-reject-mismatch-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [5-SNI-bad-sni-reject-mismatch-client] CipherString = DEFAULT VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem diff --git a/test/ssl-tests/06-sni-ticket.conf b/test/ssl-tests/06-sni-ticket.conf index b3bfda0b91..1d8d604d10 100644 --- a/test/ssl-tests/06-sni-ticket.conf +++ b/test/ssl-tests/06-sni-ticket.conf @@ -26,8 +26,8 @@ ssl_conf = 0-sni-session-ticket-ssl [0-sni-session-ticket-ssl] server = 0-sni-session-ticket-server -server2 = 0-sni-session-ticket-server2 client = 0-sni-session-ticket-client +server2 = 0-sni-session-ticket-server2 [0-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -60,8 +60,8 @@ ssl_conf = 1-sni-session-ticket-ssl [1-sni-session-ticket-ssl] server = 1-sni-session-ticket-server -server2 = 1-sni-session-ticket-server2 client = 1-sni-session-ticket-client +server2 = 1-sni-session-ticket-server2 [1-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -96,8 +96,8 @@ ssl_conf = 2-sni-session-ticket-ssl [2-sni-session-ticket-ssl] server = 2-sni-session-ticket-server -server2 = 2-sni-session-ticket-server2 client = 2-sni-session-ticket-client +server2 = 2-sni-session-ticket-server2 [2-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -132,8 +132,8 @@ ssl_conf = 3-sni-session-ticket-ssl [3-sni-session-ticket-ssl] server = 3-sni-session-ticket-server -server2 = 3-sni-session-ticket-server2 client = 3-sni-session-ticket-client +server2 = 3-sni-session-ticket-server2 [3-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -168,8 +168,8 @@ ssl_conf = 4-sni-session-ticket-ssl [4-sni-session-ticket-ssl] server = 4-sni-session-ticket-server -server2 = 4-sni-session-ticket-server2 client = 4-sni-session-ticket-client +server2 = 4-sni-session-ticket-server2 [4-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -204,8 +204,8 @@ ssl_conf = 5-sni-session-ticket-ssl [5-sni-session-ticket-ssl] server = 5-sni-session-ticket-server -server2 = 5-sni-session-ticket-server2 client = 5-sni-session-ticket-client +server2 = 5-sni-session-ticket-server2 [5-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -240,8 +240,8 @@ ssl_conf = 6-sni-session-ticket-ssl [6-sni-session-ticket-ssl] server = 6-sni-session-ticket-server -server2 = 6-sni-session-ticket-server2 client = 6-sni-session-ticket-client +server2 = 6-sni-session-ticket-server2 [6-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -276,8 +276,8 @@ ssl_conf = 7-sni-session-ticket-ssl [7-sni-session-ticket-ssl] server = 7-sni-session-ticket-server -server2 = 7-sni-session-ticket-server2 client = 7-sni-session-ticket-client +server2 = 7-sni-session-ticket-server2 [7-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -312,8 +312,8 @@ ssl_conf = 8-sni-session-ticket-ssl [8-sni-session-ticket-ssl] server = 8-sni-session-ticket-server -server2 = 8-sni-session-ticket-server2 client = 8-sni-session-ticket-client +server2 = 8-sni-session-ticket-server2 [8-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -348,8 +348,8 @@ ssl_conf = 9-sni-session-ticket-ssl [9-sni-session-ticket-ssl] server = 9-sni-session-ticket-server -server2 = 9-sni-session-ticket-server2 client = 9-sni-session-ticket-client +server2 = 9-sni-session-ticket-server2 [9-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -384,8 +384,8 @@ ssl_conf = 10-sni-session-ticket-ssl [10-sni-session-ticket-ssl] server = 10-sni-session-ticket-server -server2 = 10-sni-session-ticket-server2 client = 10-sni-session-ticket-client +server2 = 10-sni-session-ticket-server2 [10-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -420,8 +420,8 @@ ssl_conf = 11-sni-session-ticket-ssl [11-sni-session-ticket-ssl] server = 11-sni-session-ticket-server -server2 = 11-sni-session-ticket-server2 client = 11-sni-session-ticket-client +server2 = 11-sni-session-ticket-server2 [11-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -456,8 +456,8 @@ ssl_conf = 12-sni-session-ticket-ssl [12-sni-session-ticket-ssl] server = 12-sni-session-ticket-server -server2 = 12-sni-session-ticket-server2 client = 12-sni-session-ticket-client +server2 = 12-sni-session-ticket-server2 [12-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -492,8 +492,8 @@ ssl_conf = 13-sni-session-ticket-ssl [13-sni-session-ticket-ssl] server = 13-sni-session-ticket-server -server2 = 13-sni-session-ticket-server2 client = 13-sni-session-ticket-client +server2 = 13-sni-session-ticket-server2 [13-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -528,8 +528,8 @@ ssl_conf = 14-sni-session-ticket-ssl [14-sni-session-ticket-ssl] server = 14-sni-session-ticket-server -server2 = 14-sni-session-ticket-server2 client = 14-sni-session-ticket-client +server2 = 14-sni-session-ticket-server2 [14-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -564,8 +564,8 @@ ssl_conf = 15-sni-session-ticket-ssl [15-sni-session-ticket-ssl] server = 15-sni-session-ticket-server -server2 = 15-sni-session-ticket-server2 client = 15-sni-session-ticket-client +server2 = 15-sni-session-ticket-server2 [15-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -600,8 +600,8 @@ ssl_conf = 16-sni-session-ticket-ssl [16-sni-session-ticket-ssl] server = 16-sni-session-ticket-server -server2 = 16-sni-session-ticket-server2 client = 16-sni-session-ticket-client +server2 = 16-sni-session-ticket-server2 [16-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem diff --git a/test/ssl-tests/08-npn.conf b/test/ssl-tests/08-npn.conf index a76aa21c1e..959b489295 100644 --- a/test/ssl-tests/08-npn.conf +++ b/test/ssl-tests/08-npn.conf @@ -167,8 +167,8 @@ ssl_conf = 6-npn-with-sni-no-context-switch-ssl [6-npn-with-sni-no-context-switch-ssl] server = 6-npn-with-sni-no-context-switch-server -server2 = 6-npn-with-sni-no-context-switch-server2 client = 6-npn-with-sni-no-context-switch-client +server2 = 6-npn-with-sni-no-context-switch-server2 [6-npn-with-sni-no-context-switch-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -202,8 +202,8 @@ ssl_conf = 7-npn-with-sni-context-switch-ssl [7-npn-with-sni-context-switch-ssl] server = 7-npn-with-sni-context-switch-server -server2 = 7-npn-with-sni-context-switch-server2 client = 7-npn-with-sni-context-switch-client +server2 = 7-npn-with-sni-context-switch-server2 [7-npn-with-sni-context-switch-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -237,8 +237,8 @@ ssl_conf = 8-npn-selected-sni-server-supports-npn-ssl [8-npn-selected-sni-server-supports-npn-ssl] server = 8-npn-selected-sni-server-supports-npn-server -server2 = 8-npn-selected-sni-server-supports-npn-server2 client = 8-npn-selected-sni-server-supports-npn-client +server2 = 8-npn-selected-sni-server-supports-npn-server2 [8-npn-selected-sni-server-supports-npn-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -271,8 +271,8 @@ ssl_conf = 9-npn-selected-sni-server-does-not-support-npn-ssl [9-npn-selected-sni-server-does-not-support-npn-ssl] server = 9-npn-selected-sni-server-does-not-support-npn-server -server2 = 9-npn-selected-sni-server-does-not-support-npn-server2 client = 9-npn-selected-sni-server-does-not-support-npn-client +server2 = 9-npn-selected-sni-server-does-not-support-npn-server2 [9-npn-selected-sni-server-does-not-support-npn-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -331,8 +331,8 @@ ssl_conf = 11-sni-npn-preferred-over-alpn-ssl [11-sni-npn-preferred-over-alpn-ssl] server = 11-sni-npn-preferred-over-alpn-server -server2 = 11-sni-npn-preferred-over-alpn-server2 client = 11-sni-npn-preferred-over-alpn-client +server2 = 11-sni-npn-preferred-over-alpn-server2 [11-sni-npn-preferred-over-alpn-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem diff --git a/test/ssl-tests/09-alpn.conf b/test/ssl-tests/09-alpn.conf index 73fee872c2..10ddc6036b 100644 --- a/test/ssl-tests/09-alpn.conf +++ b/test/ssl-tests/09-alpn.conf @@ -166,8 +166,8 @@ ssl_conf = 6-alpn-with-sni-no-context-switch-ssl [6-alpn-with-sni-no-context-switch-ssl] server = 6-alpn-with-sni-no-context-switch-server -server2 = 6-alpn-with-sni-no-context-switch-server2 client = 6-alpn-with-sni-no-context-switch-client +server2 = 6-alpn-with-sni-no-context-switch-server2 [6-alpn-with-sni-no-context-switch-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -201,8 +201,8 @@ ssl_conf = 7-alpn-with-sni-context-switch-ssl [7-alpn-with-sni-context-switch-ssl] server = 7-alpn-with-sni-context-switch-server -server2 = 7-alpn-with-sni-context-switch-server2 client = 7-alpn-with-sni-context-switch-client +server2 = 7-alpn-with-sni-context-switch-server2 [7-alpn-with-sni-context-switch-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -236,8 +236,8 @@ ssl_conf = 8-alpn-selected-sni-server-supports-alpn-ssl [8-alpn-selected-sni-server-supports-alpn-ssl] server = 8-alpn-selected-sni-server-supports-alpn-server -server2 = 8-alpn-selected-sni-server-supports-alpn-server2 client = 8-alpn-selected-sni-server-supports-alpn-client +server2 = 8-alpn-selected-sni-server-supports-alpn-server2 [8-alpn-selected-sni-server-supports-alpn-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -270,8 +270,8 @@ ssl_conf = 9-alpn-selected-sni-server-does-not-support-alpn-ssl [9-alpn-selected-sni-server-does-not-support-alpn-ssl] server = 9-alpn-selected-sni-server-does-not-support-alpn-server -server2 = 9-alpn-selected-sni-server-does-not-support-alpn-server2 client = 9-alpn-selected-sni-server-does-not-support-alpn-client +server2 = 9-alpn-selected-sni-server-does-not-support-alpn-server2 [9-alpn-selected-sni-server-does-not-support-alpn-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem diff --git a/test/ssl-tests/10-resumption.conf b/test/ssl-tests/10-resumption.conf index bea91fecc0..2410cd0924 100644 --- a/test/ssl-tests/10-resumption.conf +++ b/test/ssl-tests/10-resumption.conf @@ -45,9 +45,9 @@ ssl_conf = 0-resumption-ssl [0-resumption-ssl] server = 0-resumption-server -resume-server = 0-resumption-resume-server -resume-client = 0-resumption-resume-client client = 0-resumption-client +resume-server = 0-resumption-resume-server +resume-client = 0-resumption-client [0-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -68,11 +68,6 @@ CipherString = DEFAULT VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer -[0-resumption-resume-client] -CipherString = DEFAULT -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - [test-0] HandshakeMode = Resume Protocol = TLSv1 @@ -86,9 +81,9 @@ ssl_conf = 1-resumption-ssl [1-resumption-ssl] server = 1-resumption-server -resume-server = 1-resumption-resume-server -resume-client = 1-resumption-resume-client client = 1-resumption-client +resume-server = 1-resumption-resume-server +resume-client = 1-resumption-client [1-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -109,11 +104,6 @@ CipherString = DEFAULT VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer -[1-resumption-resume-client] -CipherString = DEFAULT -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - [test-1] HandshakeMode = Resume Protocol = TLSv1 @@ -127,9 +117,9 @@ ssl_conf = 2-resumption-ssl [2-resumption-ssl] server = 2-resumption-server -resume-server = 2-resumption-resume-server -resume-client = 2-resumption-resume-client client = 2-resumption-client +resume-server = 2-resumption-resume-server +resume-client = 2-resumption-client [2-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -150,11 +140,6 @@ CipherString = DEFAULT VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer -[2-resumption-resume-client] -CipherString = DEFAULT -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - [test-2] HandshakeMode = Resume Protocol = TLSv1.1 @@ -168,9 +153,9 @@ ssl_conf = 3-resumption-ssl [3-resumption-ssl] server = 3-resumption-server -resume-server = 3-resumption-resume-server -resume-client = 3-resumption-resume-client client = 3-resumption-client +resume-server = 3-resumption-resume-server +resume-client = 3-resumption-client [3-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -191,11 +176,6 @@ CipherString = DEFAULT VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer -[3-resumption-resume-client] -CipherString = DEFAULT -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - [test-3] HandshakeMode = Resume Protocol = TLSv1.1 @@ -209,9 +189,9 @@ ssl_conf = 4-resumption-ssl [4-resumption-ssl] server = 4-resumption-server -resume-server = 4-resumption-resume-server -resume-client = 4-resumption-resume-client client = 4-resumption-client +resume-server = 4-resumption-resume-server +resume-client = 4-resumption-client [4-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -232,11 +212,6 @@ CipherString = DEFAULT VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer -[4-resumption-resume-client] -CipherString = DEFAULT -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - [test-4] HandshakeMode = Resume Protocol = TLSv1.2 @@ -250,9 +225,9 @@ ssl_conf = 5-resumption-ssl [5-resumption-ssl] server = 5-resumption-server -resume-server = 5-resumption-resume-server -resume-client = 5-resumption-resume-client client = 5-resumption-client +resume-server = 5-resumption-resume-server +resume-client = 5-resumption-client [5-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -273,11 +248,6 @@ CipherString = DEFAULT VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer -[5-resumption-resume-client] -CipherString = DEFAULT -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - [test-5] HandshakeMode = Resume Protocol = TLSv1.2 @@ -291,9 +261,9 @@ ssl_conf = 6-resumption-ssl [6-resumption-ssl] server = 6-resumption-server -resume-server = 6-resumption-resume-server -resume-client = 6-resumption-resume-client client = 6-resumption-client +resume-server = 6-resumption-resume-server +resume-client = 6-resumption-client [6-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -314,11 +284,6 @@ CipherString = DEFAULT VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer -[6-resumption-resume-client] -CipherString = DEFAULT -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - [test-6] HandshakeMode = Resume Protocol = TLSv1 @@ -332,9 +297,9 @@ ssl_conf = 7-resumption-ssl [7-resumption-ssl] server = 7-resumption-server -resume-server = 7-resumption-resume-server -resume-client = 7-resumption-resume-client client = 7-resumption-client +resume-server = 7-resumption-resume-server +resume-client = 7-resumption-client [7-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -355,11 +320,6 @@ CipherString = DEFAULT VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer -[7-resumption-resume-client] -CipherString = DEFAULT -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - [test-7] HandshakeMode = Resume Protocol = TLSv1 @@ -373,9 +333,9 @@ ssl_conf = 8-resumption-ssl [8-resumption-ssl] server = 8-resumption-server -resume-server = 8-resumption-resume-server -resume-client = 8-resumption-resume-client client = 8-resumption-client +resume-server = 8-resumption-resume-server +resume-client = 8-resumption-client [8-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -396,11 +356,6 @@ CipherString = DEFAULT VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer -[8-resumption-resume-client] -CipherString = DEFAULT -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - [test-8] HandshakeMode = Resume Protocol = TLSv1.1 @@ -414,9 +369,9 @@ ssl_conf = 9-resumption-ssl [9-resumption-ssl] server = 9-resumption-server -resume-server = 9-resumption-resume-server -resume-client = 9-resumption-resume-client client = 9-resumption-client +resume-server = 9-resumption-resume-server +resume-client = 9-resumption-client [9-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -437,11 +392,6 @@ CipherString = DEFAULT VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer -[9-resumption-resume-client] -CipherString = DEFAULT -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - [test-9] HandshakeMode = Resume Protocol = TLSv1.1 @@ -455,9 +405,9 @@ ssl_conf = 10-resumption-ssl [10-resumption-ssl] server = 10-resumption-server -resume-server = 10-resumption-resume-server -resume-client = 10-resumption-resume-client client = 10-resumption-client +resume-server = 10-resumption-resume-server +resume-client = 10-resumption-client [10-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -478,11 +428,6 @@ CipherString = DEFAULT VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer -[10-resumption-resume-client] -CipherString = DEFAULT -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - [test-10] HandshakeMode = Resume Protocol = TLSv1.2 @@ -496,9 +441,9 @@ ssl_conf = 11-resumption-ssl [11-resumption-ssl] server = 11-resumption-server -resume-server = 11-resumption-resume-server -resume-client = 11-resumption-resume-client client = 11-resumption-client +resume-server = 11-resumption-resume-server +resume-client = 11-resumption-client [11-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -519,11 +464,6 @@ CipherString = DEFAULT VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer -[11-resumption-resume-client] -CipherString = DEFAULT -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - [test-11] HandshakeMode = Resume Protocol = TLSv1.2 @@ -537,9 +477,9 @@ ssl_conf = 12-resumption-ssl [12-resumption-ssl] server = 12-resumption-server -resume-server = 12-resumption-resume-server -resume-client = 12-resumption-resume-client client = 12-resumption-client +resume-server = 12-resumption-resume-server +resume-client = 12-resumption-client [12-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -560,11 +500,6 @@ CipherString = DEFAULT VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer -[12-resumption-resume-client] -CipherString = DEFAULT -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - [test-12] HandshakeMode = Resume Protocol = TLSv1 @@ -578,9 +513,9 @@ ssl_conf = 13-resumption-ssl [13-resumption-ssl] server = 13-resumption-server -resume-server = 13-resumption-resume-server -resume-client = 13-resumption-resume-client client = 13-resumption-client +resume-server = 13-resumption-resume-server +resume-client = 13-resumption-client [13-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -601,11 +536,6 @@ CipherString = DEFAULT VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer -[13-resumption-resume-client] -CipherString = DEFAULT -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - [test-13] HandshakeMode = Resume Protocol = TLSv1 @@ -619,9 +549,9 @@ ssl_conf = 14-resumption-ssl [14-resumption-ssl] server = 14-resumption-server -resume-server = 14-resumption-resume-server -resume-client = 14-resumption-resume-client client = 14-resumption-client +resume-server = 14-resumption-resume-server +resume-client = 14-resumption-client [14-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -642,11 +572,6 @@ CipherString = DEFAULT VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer -[14-resumption-resume-client] -CipherString = DEFAULT -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - [test-14] HandshakeMode = Resume Protocol = TLSv1.1 @@ -660,9 +585,9 @@ ssl_conf = 15-resumption-ssl [15-resumption-ssl] server = 15-resumption-server -resume-server = 15-resumption-resume-server -resume-client = 15-resumption-resume-client client = 15-resumption-client +resume-server = 15-resumption-resume-server +resume-client = 15-resumption-client [15-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -683,11 +608,6 @@ CipherString = DEFAULT VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer -[15-resumption-resume-client] -CipherString = DEFAULT -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - [test-15] HandshakeMode = Resume Protocol = TLSv1.1 @@ -701,9 +621,9 @@ ssl_conf = 16-resumption-ssl [16-resumption-ssl] server = 16-resumption-server -resume-server = 16-resumption-resume-server -resume-client = 16-resumption-resume-client client = 16-resumption-client +resume-server = 16-resumption-resume-server +resume-client = 16-resumption-client [16-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -724,11 +644,6 @@ CipherString = DEFAULT VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer -[16-resumption-resume-client] -CipherString = DEFAULT -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - [test-16] HandshakeMode = Resume Protocol = TLSv1.2 @@ -742,9 +657,9 @@ ssl_conf = 17-resumption-ssl [17-resumption-ssl] server = 17-resumption-server -resume-server = 17-resumption-resume-server -resume-client = 17-resumption-resume-client client = 17-resumption-client +resume-server = 17-resumption-resume-server +resume-client = 17-resumption-client [17-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -765,11 +680,6 @@ CipherString = DEFAULT VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer -[17-resumption-resume-client] -CipherString = DEFAULT -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - [test-17] HandshakeMode = Resume Protocol = TLSv1.2 @@ -783,9 +693,9 @@ ssl_conf = 18-resumption-ssl [18-resumption-ssl] server = 18-resumption-server -resume-server = 18-resumption-resume-server -resume-client = 18-resumption-resume-client client = 18-resumption-client +resume-server = 18-resumption-server +resume-client = 18-resumption-resume-client [18-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -793,12 +703,6 @@ CipherString = DEFAULT Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[18-resumption-resume-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [18-resumption-client] CipherString = DEFAULT MaxProtocol = TLSv1 @@ -825,9 +729,9 @@ ssl_conf = 19-resumption-ssl [19-resumption-ssl] server = 19-resumption-server -resume-server = 19-resumption-resume-server -resume-client = 19-resumption-resume-client client = 19-resumption-client +resume-server = 19-resumption-server +resume-client = 19-resumption-resume-client [19-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -835,12 +739,6 @@ CipherString = DEFAULT Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[19-resumption-resume-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = -SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [19-resumption-client] CipherString = DEFAULT MaxProtocol = TLSv1 @@ -867,9 +765,9 @@ ssl_conf = 20-resumption-ssl [20-resumption-ssl] server = 20-resumption-server -resume-server = 20-resumption-resume-server -resume-client = 20-resumption-resume-client client = 20-resumption-client +resume-server = 20-resumption-server +resume-client = 20-resumption-resume-client [20-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -877,12 +775,6 @@ CipherString = DEFAULT Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[20-resumption-resume-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [20-resumption-client] CipherString = DEFAULT MaxProtocol = TLSv1 @@ -909,9 +801,9 @@ ssl_conf = 21-resumption-ssl [21-resumption-ssl] server = 21-resumptio |