From 84a68336581b7d25fefe693bf92b5b3751f4b5f6 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Sun, 30 Oct 2016 08:38:52 +0000 Subject: [PATCH] Update Configure to know about tls1_3 Also we disable TLS1.3 by default (use enable-tls1_3 to re-enable). This is because this is a WIP and will not be interoperable with any other TLS1.3 implementation. Finally, we fix some tests that started failing when TLS1.3 was disabled by default. Reviewed-by: Rich Salz --- Configure | 6 +- INSTALL | 6 + test/recipes/80-test_ssl_new.t | 3 +- test/ssl-tests/02-protocol-version.conf | 388 +++--- test/ssl-tests/10-resumption.conf | 1438 ++++------------------- test/ssl-tests/protocol_version.pm | 5 +- 6 files changed, 388 insertions(+), 1458 deletions(-) diff --git a/Configure b/Configure index 2da2a1a8c3..958ac5cd0b 100755 --- a/Configure +++ b/Configure @@ -318,7 +318,7 @@ $config{sdirs} = [ ]; # Known TLS and DTLS protocols -my @tls = qw(ssl3 tls1 tls1_1 tls1_2); +my @tls = qw(ssl3 tls1 tls1_1 tls1_2 tls1_3); my @dtls = qw(dtls1 dtls1_2); # Explicitly known options that are possible to disable. They can @@ -440,6 +440,8 @@ our %disabled = ( # "what" => "comment" "ssl3" => "default", "ssl3-method" => "default", "ubsan" => "default", + #TODO(TLS1.3): Temporarily disabled while this is a WIP + "tls1_3" => "default", "unit-test" => "default", "weak-ssl-ciphers" => "default", "zlib" => "default", @@ -476,7 +478,7 @@ my @disable_cascades = ( sub { $disabled{rsa} && ($disabled{dsa} || $disabled{dh}) && ($disabled{ecdsa} || $disabled{ecdh}); } - => [ "tls1", "tls1_1", "tls1_2", + => [ "tls1", "tls1_1", "tls1_2", "tls1_3", "dtls1", "dtls1_2" ], "tls" => [ @tls ], diff --git a/INSTALL b/INSTALL index 44b3a1ca21..a3932258c0 100644 --- a/INSTALL +++ b/INSTALL @@ -457,6 +457,12 @@ specific configuration, e.g. "-m32" to build x86 code on an x64 system. + enable-tls1_3 + TODO(TLS1.3): Make this enabled by default + Build support for TLS1.3. Note: This is a WIP feature and + does not currently interoperate with other TLS1.3 + implementations! Use with caution!! + no- Don't build support for negotiating the specified SSL/TLS protocol (one of ssl, ssl3, tls, tls1, tls1_1, tls1_2, dtls, diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t index 54e32bb878..1e92907d56 100644 --- a/test/recipes/80-test_ssl_new.t +++ b/test/recipes/80-test_ssl_new.t @@ -34,7 +34,8 @@ plan tests => 18; # = scalar @conf_srcs # Some test results depend on the configuration of enabled protocols. We only # verify generated sources in the default configuration. my $is_default_tls = (disabled("ssl3") && !disabled("tls1") && - !disabled("tls1_1") && !disabled("tls1_2")); + !disabled("tls1_1") && !disabled("tls1_2") && + disabled("tls1_3")); my $is_default_dtls = (!disabled("dtls1") && !disabled("dtls1_2")); diff --git a/test/ssl-tests/02-protocol-version.conf b/test/ssl-tests/02-protocol-version.conf index cf618f4e28..d5e0779156 100644 --- a/test/ssl-tests/02-protocol-version.conf +++ b/test/ssl-tests/02-protocol-version.conf @@ -3515,7 +3515,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-108] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -3540,7 +3540,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-109] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -3674,7 +3674,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-114] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -3700,7 +3700,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-115] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -3808,7 +3808,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-119] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -3834,7 +3834,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-120] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -3915,7 +3915,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-123] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -3941,7 +3941,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-124] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -3995,7 +3995,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-126] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -4021,7 +4021,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-127] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -4048,8 +4048,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-128] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = ServerFail # =========================================================== @@ -4074,8 +4073,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-129] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = ServerFail # =========================================================== @@ -4198,7 +4196,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-134] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -4222,7 +4220,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-135] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -4351,7 +4349,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-140] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -4376,7 +4374,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-141] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -4480,7 +4478,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-145] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -4505,7 +4503,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-146] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -4583,7 +4581,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-149] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -4608,7 +4606,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-150] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -4660,7 +4658,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-152] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -4685,7 +4683,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-153] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -4711,8 +4709,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-154] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = ServerFail # =========================================================== @@ -4736,8 +4733,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-155] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = ServerFail # =========================================================== @@ -7686,7 +7682,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-264] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -7712,7 +7708,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-265] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -7851,7 +7847,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-270] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -7878,7 +7874,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-271] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -7990,7 +7986,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-275] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -8017,7 +8013,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-276] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -8101,7 +8097,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-279] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -8128,7 +8124,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-280] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -8184,7 +8180,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-282] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -8211,7 +8207,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-283] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -8239,8 +8235,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-284] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = ServerFail # =========================================================== @@ -8266,8 +8261,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-285] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = ServerFail # =========================================================== @@ -8395,7 +8389,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-290] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -8420,7 +8414,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-291] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -8554,7 +8548,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-296] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -8580,7 +8574,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-297] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -8688,7 +8682,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-301] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -8714,7 +8708,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-302] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -8795,7 +8789,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-305] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -8821,7 +8815,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-306] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -8875,7 +8869,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-308] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -8901,7 +8895,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-309] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -8928,8 +8922,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-310] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = ServerFail # =========================================================== @@ -8954,8 +8947,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-311] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = ServerFail # =========================================================== @@ -11214,7 +11206,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-394] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -11240,7 +11232,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-395] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -11379,7 +11371,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-400] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -11406,7 +11398,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-401] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -11518,7 +11510,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-405] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -11545,7 +11537,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-406] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -11629,7 +11621,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-409] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -11656,7 +11648,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-410] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -11712,7 +11704,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-412] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -11739,7 +11731,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-413] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -11767,8 +11759,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-414] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = ServerFail # =========================================================== @@ -11794,8 +11785,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-415] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = ServerFail # =========================================================== @@ -11923,7 +11913,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-420] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -11948,7 +11938,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-421] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -12082,7 +12072,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-426] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -12108,7 +12098,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-427] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -12216,7 +12206,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-431] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -12242,7 +12232,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-432] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -12323,7 +12313,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-435] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -12349,7 +12339,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-436] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -12403,7 +12393,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-438] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -12429,7 +12419,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-439] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -12456,8 +12446,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-440] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = ServerFail # =========================================================== @@ -12482,8 +12471,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-441] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = ServerFail # =========================================================== @@ -14030,7 +14018,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-498] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -14056,7 +14044,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-499] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -14194,7 +14182,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-504] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -14221,7 +14209,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-505] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -14332,7 +14320,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-509] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -14359,7 +14347,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-510] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -14443,7 +14431,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-513] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -14470,7 +14458,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-514] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -14526,7 +14514,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-516] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -14553,7 +14541,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-517] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -14581,8 +14569,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-518] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = ServerFail # =========================================================== @@ -14608,8 +14595,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-519] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = ServerFail # =========================================================== @@ -14736,7 +14722,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-524] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -14761,7 +14747,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-525] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -14894,7 +14880,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-530] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -14920,7 +14906,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-531] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -15027,7 +15013,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-535] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -15053,7 +15039,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-536] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -15134,7 +15120,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-539] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -15160,7 +15146,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-540] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -15214,7 +15200,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-542] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -15240,7 +15226,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-543] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -15267,8 +15253,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-544] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = ServerFail # =========================================================== @@ -15293,8 +15278,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-545] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = ServerFail # =========================================================== @@ -16130,7 +16114,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-576] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -16156,7 +16140,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-577] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -16293,7 +16277,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-582] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -16320,7 +16304,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-583] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -16430,7 +16414,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-587] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -16457,7 +16441,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-588] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -16540,7 +16524,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-591] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -16567,7 +16551,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-592] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -16623,7 +16607,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-594] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -16650,7 +16634,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-595] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -16678,8 +16662,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-596] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = ServerFail # =========================================================== @@ -16705,8 +16688,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-597] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = ServerFail # =========================================================== @@ -16832,7 +16814,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-602] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -16857,7 +16839,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-603] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -16989,7 +16971,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-608] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -17015,7 +16997,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-609] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -17121,7 +17103,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-613] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -17147,7 +17129,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-614] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -17227,7 +17209,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-617] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -17253,7 +17235,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-618] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -17307,7 +17289,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-620] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -17333,7 +17315,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-621] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 ExpectedResult = Success @@ -17360,8 +17342,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-622] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = ServerFail # =========================================================== @@ -17386,8 +17367,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-623] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = ServerFail # =========================================================== @@ -17413,7 +17393,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-624] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -17439,7 +17419,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-625] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -17465,7 +17445,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-626] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -17491,7 +17471,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-627] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -17517,8 +17497,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-628] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = InternalError # =========================================================== @@ -17543,8 +17522,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-629] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = InternalError # =========================================================== @@ -17571,7 +17549,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-630] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -17598,7 +17576,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-631] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -17625,7 +17603,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-632] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -17652,7 +17630,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-633] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -17679,8 +17657,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-634] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = InternalError # =========================================================== @@ -17706,8 +17683,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-635] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = InternalError # =========================================================== @@ -17734,7 +17710,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-636] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -17761,7 +17737,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-637] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -17788,7 +17764,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-638] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -17815,8 +17791,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-639] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = InternalError # =========================================================== @@ -17842,8 +17817,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-640] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = InternalError # =========================================================== @@ -17870,7 +17844,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-641] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -17897,7 +17871,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-642] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -17924,8 +17898,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-643] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = InternalError # =========================================================== @@ -17951,8 +17924,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-644] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = InternalError # =========================================================== @@ -17979,7 +17951,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-645] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -18006,8 +17978,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-646] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = InternalError # =========================================================== @@ -18033,8 +18004,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-647] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = InternalError # =========================================================== @@ -18061,8 +18031,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-648] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = InternalError # =========================================================== @@ -18088,8 +18057,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-649] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = InternalError # =========================================================== @@ -18114,7 +18082,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-650] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -18139,7 +18107,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-651] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -18164,7 +18132,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-652] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -18189,7 +18157,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-653] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -18214,8 +18182,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-654] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = InternalError # =========================================================== @@ -18239,8 +18206,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-655] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = InternalError # =========================================================== @@ -18266,7 +18232,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-656] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -18292,7 +18258,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-657] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -18318,7 +18284,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-658] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -18344,7 +18310,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-659] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -18370,8 +18336,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-660] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = InternalError # =========================================================== @@ -18396,8 +18361,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-661] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = InternalError # =========================================================== @@ -18423,7 +18387,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-662] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -18449,7 +18413,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-663] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -18475,7 +18439,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-664] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -18501,8 +18465,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-665] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = InternalError # =========================================================== @@ -18527,8 +18490,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-666] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = InternalError # =========================================================== @@ -18554,7 +18516,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-667] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -18580,7 +18542,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-668] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -18606,8 +18568,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-669] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = InternalError # =========================================================== @@ -18632,8 +18593,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-670] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = InternalError # =========================================================== @@ -18659,7 +18619,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-671] -ExpectedResult = ServerFail +ExpectedResult = InternalError # =========================================================== @@ -18685,8 +18645,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-672] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = InternalError # =========================================================== @@ -18711,8 +18670,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-673] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = InternalError # =========================================================== @@ -18738,8 +18696,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-674] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = InternalError # =========================================================== @@ -18764,7 +18721,6 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-675] -ExpectedProtocol = TLSv1.3 -ExpectedResult = Success +ExpectedResult = InternalError diff --git a/test/ssl-tests/10-resumption.conf b/test/ssl-tests/10-resumption.conf index 0a58f48f62..b2deee4209 100644 --- a/test/ssl-tests/10-resumption.conf +++ b/test/ssl-tests/10-resumption.conf @@ -1,6 +1,6 @@ # Generated with generate_ssl_tests.pl -num_tests = 64 +num_tests = 36 test-0 = 0-resumption test-1 = 1-resumption @@ -38,34 +38,6 @@ test-32 = 32-resumption test-33 = 33-resumption test-34 = 34-resumption test-35 = 35-resumption -test-36 = 36-resumption -test-37 = 37-resumption -test-38 = 38-resumption -test-39 = 39-resumption -test-40 = 40-resumption -test-41 = 41-resumption -test-42 = 42-resumption -test-43 = 43-resumption -test-44 = 44-resumption -test-45 = 45-resumption -test-46 = 46-resumption -test-47 = 47-resumption -test-48 = 48-resumption -test-49 = 49-resumption -test-50 = 50-resumption -test-51 = 51-resumption -test-52 = 52-resumption -test-53 = 53-resumption -test-54 = 54-resumption -test-55 = 55-resumption -test-56 = 56-resumption -test-57 = 57-resumption -test-58 = 58-resumption -test-59 = 59-resumption -test-60 = 60-resumption -test-61 = 61-resumption -test-62 = 62-resumption -test-63 = 63-resumption # =========================================================== [0-resumption] @@ -296,15 +268,15 @@ resume-client = 6-resumption-client [6-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1 -MinProtocol = TLSv1 +MaxProtocol = TLSv1.1 +MinProtocol = TLSv1.1 Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [6-resumption-resume-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1.3 +MaxProtocol = TLSv1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [6-resumption-client] @@ -313,7 +285,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-6] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1 HandshakeMode = Resume ResumptionExpected = No @@ -332,15 +304,15 @@ resume-client = 7-resumption-client [7-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1 -MinProtocol = TLSv1 +MaxProtocol = TLSv1.1 +MinProtocol = TLSv1.1 Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [7-resumption-resume-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1.3 +MaxProtocol = TLSv1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [7-resumption-client] @@ -349,7 +321,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-7] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1 HandshakeMode = Resume ResumptionExpected = No @@ -376,7 +348,7 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [8-resumption-resume-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1 +MaxProtocol = TLSv1.1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [8-resumption-client] @@ -385,9 +357,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-8] -ExpectedProtocol = TLSv1 +ExpectedProtocol = TLSv1.1 HandshakeMode = Resume -ResumptionExpected = No +ResumptionExpected = Yes # =========================================================== @@ -412,7 +384,7 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [9-resumption-resume-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1 +MaxProtocol = TLSv1.1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [9-resumption-client] @@ -421,9 +393,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-9] -ExpectedProtocol = TLSv1 +ExpectedProtocol = TLSv1.1 HandshakeMode = Resume -ResumptionExpected = No +ResumptionExpected = Yes # =========================================================== @@ -448,7 +420,7 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [10-resumption-resume-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1.1 +MaxProtocol = TLSv1.2 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [10-resumption-client] @@ -457,9 +429,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-10] -ExpectedProtocol = TLSv1.1 +ExpectedProtocol = TLSv1.2 HandshakeMode = Resume -ResumptionExpected = Yes +ResumptionExpected = No # =========================================================== @@ -484,7 +456,7 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [11-resumption-resume-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1.1 +MaxProtocol = TLSv1.2 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [11-resumption-client] @@ -493,9 +465,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-11] -ExpectedProtocol = TLSv1.1 +ExpectedProtocol = TLSv1.2 HandshakeMode = Resume -ResumptionExpected = Yes +ResumptionExpected = No # =========================================================== @@ -512,15 +484,15 @@ resume-client = 12-resumption-client [12-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1.1 -MinProtocol = TLSv1.1 +MaxProtocol = TLSv1.2 +MinProtocol = TLSv1.2 Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [12-resumption-resume-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1.2 +MaxProtocol = TLSv1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [12-resumption-client] @@ -529,7 +501,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-12] -ExpectedProtocol = TLSv1.2 +ExpectedProtocol = TLSv1 HandshakeMode = Resume ResumptionExpected = No @@ -548,15 +520,15 @@ resume-client = 13-resumption-client [13-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1.1 -MinProtocol = TLSv1.1 +MaxProtocol = TLSv1.2 +MinProtocol = TLSv1.2 Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [13-resumption-resume-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1.2 +MaxProtocol = TLSv1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [13-resumption-client] @@ -565,7 +537,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-13] -ExpectedProtocol = TLSv1.2 +ExpectedProtocol = TLSv1 HandshakeMode = Resume ResumptionExpected = No @@ -584,15 +556,15 @@ resume-client = 14-resumption-client [14-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1.1 -MinProtocol = TLSv1.1 +MaxProtocol = TLSv1.2 +MinProtocol = TLSv1.2 Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [14-resumption-resume-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1.3 +MaxProtocol = TLSv1.1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [14-resumption-client] @@ -601,7 +573,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-14] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.1 HandshakeMode = Resume ResumptionExpected = No @@ -620,15 +592,15 @@ resume-client = 15-resumption-client [15-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1.1 -MinProtocol = TLSv1.1 +MaxProtocol = TLSv1.2 +MinProtocol = TLSv1.2 Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [15-resumption-resume-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1.3 +MaxProtocol = TLSv1.1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [15-resumption-client] @@ -637,7 +609,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-15] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.1 HandshakeMode = Resume ResumptionExpected = No @@ -664,7 +636,7 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [16-resumption-resume-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1 +MaxProtocol = TLSv1.2 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [16-resumption-client] @@ -673,9 +645,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-16] -ExpectedProtocol = TLSv1 +ExpectedProtocol = TLSv1.2 HandshakeMode = Resume -ResumptionExpected = No +ResumptionExpected = Yes # =========================================================== @@ -700,7 +672,7 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [17-resumption-resume-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1 +MaxProtocol = TLSv1.2 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [17-resumption-client] @@ -709,9 +681,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-17] -ExpectedProtocol = TLSv1 +ExpectedProtocol = TLSv1.2 HandshakeMode = Resume -ResumptionExpected = No +ResumptionExpected = Yes # =========================================================== @@ -722,32 +694,32 @@ ssl_conf = 18-resumption-ssl [18-resumption-ssl] server = 18-resumption-server client = 18-resumption-client -resume-server = 18-resumption-resume-server -resume-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 CipherString = DEFAULT -MaxProtocol = TLSv1.2 -MinProtocol = TLSv1.2 Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[18-resumption-resume-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem +[18-resumption-client] CipherString = DEFAULT -MaxProtocol = TLSv1.1 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem +MaxProtocol = TLSv1 +MinProtocol = TLSv1 +VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem +VerifyMode = Peer -[18-resumption-client] +[18-resumption-resume-client] CipherString = DEFAULT +MaxProtocol = TLSv1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-18] -ExpectedProtocol = TLSv1.1 +ExpectedProtocol = TLSv1 HandshakeMode = Resume -ResumptionExpected = No +ResumptionExpected = Yes # =========================================================== @@ -758,32 +730,32 @@ ssl_conf = 19-resumption-ssl [19-resumption-ssl] server = 19-resumption-server client = 19-resumption-client -resume-server = 19-resumption-resume-server -resume-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 CipherString = DEFAULT -MaxProtocol = TLSv1.2 -MinProtocol = TLSv1.2 Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[19-resumption-resume-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem +[19-resumption-client] CipherString = DEFAULT -MaxProtocol = TLSv1.1 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem +MaxProtocol = TLSv1 +MinProtocol = TLSv1 +VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem +VerifyMode = Peer -[19-resumption-client] +[19-resumption-resume-client] CipherString = DEFAULT +MaxProtocol = TLSv1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-19] -ExpectedProtocol = TLSv1.1 +ExpectedProtocol = TLSv1 HandshakeMode = Resume -ResumptionExpected = No +ResumptionExpected = Yes # =========================================================== @@ -794,32 +766,32 @@ ssl_conf = 20-resumption-ssl [20-resumption-ssl] server = 20-resumption-server client = 20-resumption-client -resume-server = 20-resumption-resume-server -resume-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 CipherString = DEFAULT -MaxProtocol = TLSv1.2 -MinProtocol = TLSv1.2 Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[20-resumption-resume-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem +[20-resumption-client] CipherString = DEFAULT -MaxProtocol = TLSv1.2 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem +MaxProtocol = TLSv1 +MinProtocol = TLSv1 +VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem +VerifyMode = Peer -[20-resumption-client] +[20-resumption-resume-client] CipherString = DEFAULT +MaxProtocol = TLSv1.1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-20] -ExpectedProtocol = TLSv1.2 +ExpectedProtocol = TLSv1.1 HandshakeMode = Resume -ResumptionExpected = Yes +ResumptionExpected = No # =========================================================== @@ -830,32 +802,32 @@ ssl_conf = 21-resumption-ssl [21-resumption-ssl] server = 21-resumption-server client = 21-resumption-client -resume-server = 21-resumption-resume-server -resume-client = 21-resumption-client +resume-server = 21-resumption-server +resume-client = 21-resumption-resume-client [21-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1.2 -MinProtocol = TLSv1.2 Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[21-resumption-resume-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem +[21-resumption-client] CipherString = DEFAULT -MaxProtocol = TLSv1.2 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem +MaxProtocol = TLSv1 +MinProtocol = TLSv1 +VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem +VerifyMode = Peer -[21-resumption-client] +[21-resumption-resume-client] CipherString = DEFAULT +MaxProtocol = TLSv1.1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-21] -ExpectedProtocol = TLSv1.2 +ExpectedProtocol = TLSv1.1 HandshakeMode = Resume -ResumptionExpected = Yes +ResumptionExpected = No # =========================================================== @@ -866,30 +838,30 @@ ssl_conf = 22-resumption-ssl [22-resumption-ssl] server = 22-resumption-server client = 22-resumption-client -resume-server = 22-resumption-resume-server -resume-client = 22-resumption-client +resume-server = 22-resumption-server +resume-client = 22-resumption-resume-client [22-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1.2 -MinProtocol = TLSv1.2 Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[22-resumption-resume-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem +[22-resumption-client] CipherString = DEFAULT -MaxProtocol = TLSv1.3 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem +MaxProtocol = TLSv1 +MinProtocol = TLSv1 +VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem +VerifyMode = Peer -[22-resumption-client] +[22-resumption-resume-client] CipherString = DEFAULT +MaxProtocol = TLSv1.2 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-22] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 HandshakeMode = Resume ResumptionExpected = No @@ -902,30 +874,30 @@ ssl_conf = 23-resumption-ssl [23-resumption-ssl] server = 23-resumption-server client = 23-resumption-client -resume-server = 23-resumption-resume-server -resume-client = 23-resumption-client +resume-server = 23-resumption-server +resume-client = 23-resumption-resume-client [23-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1.2 -MinProtocol = TLSv1.2 Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[23-resumption-resume-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem +[23-resumption-client] CipherString = DEFAULT -MaxProtocol = TLSv1.3 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem +MaxProtocol = TLSv1 +MinProtocol = TLSv1 +VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem +VerifyMode = Peer -[23-resumption-client] +[23-resumption-resume-client] CipherString = DEFAULT +MaxProtocol = TLSv1.2 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-23] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1.2 HandshakeMode = Resume ResumptionExpected = No @@ -938,25 +910,25 @@ ssl_conf = 24-resumption-ssl [24-resumption-ssl] server = 24-resumption-server client = 24-resumption-client -resume-server = 24-resumption-resume-server -resume-client = 24-resumption-client +resume-server = 24-resumption-server +resume-client = 24-resumption-resume-client [24-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1.3 -MinProtocol = TLSv1.3 Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[24-resumption-resume-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem +[24-resumption-client] CipherString = DEFAULT -MaxProtocol = TLSv1 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem +MaxProtocol = TLSv1.1 +MinProtocol = TLSv1.1 +VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem +VerifyMode = Peer -[24-resumption-client] +[24-resumption-resume-client] CipherString = DEFAULT +MaxProtocol = TLSv1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer @@ -974,25 +946,25 @@ ssl_conf = 25-resumption-ssl [25-resumption-ssl] server = 25-resumption-server client = 25-resumption-client -resume-server = 25-resumption-resume-server -resume-client = 25-resumption-client +resume-server = 25-resumption-server +resume-client = 25-resumption-resume-client [25-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1.3 -MinProtocol = TLSv1.3 Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[25-resumption-resume-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem +[25-resumption-client] CipherString = DEFAULT -MaxProtocol = TLSv1 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem +MaxProtocol = TLSv1.1 +MinProtocol = TLSv1.1 +VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem +VerifyMode = Peer -[25-resumption-client] +[25-resumption-resume-client] CipherString = DEFAULT +MaxProtocol = TLSv1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer @@ -1010,32 +982,32 @@ ssl_conf = 26-resumption-ssl [26-resumption-ssl] server = 26-resumption-server client = 26-resumption-client -resume-server = 26-resumption-resume-server -resume-client = 26-resumption-client +resume-server = 26-resumption-server +resume-client = 26-resumption-resume-client [26-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1.3 -MinProtocol = TLSv1.3 Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[26-resumption-resume-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem +[26-resumption-client] CipherString = DEFAULT MaxProtocol = TLSv1.1 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem +MinProtocol = TLSv1.1 +VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem +VerifyMode = Peer -[26-resumption-client] +[26-resumption-resume-client] CipherString = DEFAULT +MaxProtocol = TLSv1.1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-26] ExpectedProtocol = TLSv1.1 HandshakeMode = Resume -ResumptionExpected = No +ResumptionExpected = Yes # =========================================================== @@ -1046,32 +1018,32 @@ ssl_conf = 27-resumption-ssl [27-resumption-ssl] server = 27-resumption-server client = 27-resumption-client -resume-server = 27-resumption-resume-server -resume-client = 27-resumption-client +resume-server = 27-resumption-server +resume-client = 27-resumption-resume-client [27-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1.3 -MinProtocol = TLSv1.3 Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[27-resumption-resume-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem +[27-resumption-client] CipherString = DEFAULT MaxProtocol = TLSv1.1 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem +MinProtocol = TLSv1.1 +VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem +VerifyMode = Peer -[27-resumption-client] +[27-resumption-resume-client] CipherString = DEFAULT +MaxProtocol = TLSv1.1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-27] ExpectedProtocol = TLSv1.1 HandshakeMode = Resume -ResumptionExpected = No +ResumptionExpected = Yes # =========================================================== @@ -1082,25 +1054,25 @@ ssl_conf = 28-resumption-ssl [28-resumption-ssl] server = 28-resumption-server client = 28-resumption-client -resume-server = 28-resumption-resume-server -resume-client = 28-resumption-client +resume-server = 28-resumption-server +resume-client = 28-resumption-resume-client [28-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1.3 -MinProtocol = TLSv1.3 Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[28-resumption-resume-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem +[28-resumption-client] CipherString = DEFAULT -MaxProtocol = TLSv1.2 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem +MaxProtocol = TLSv1.1 +MinProtocol = TLSv1.1 +VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem +VerifyMode = Peer -[28-resumption-client] +[28-resumption-resume-client] CipherString = DEFAULT +MaxProtocol = TLSv1.2 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer @@ -1118,25 +1090,25 @@ ssl_conf = 29-resumption-ssl [29-resumption-ssl] server = 29-resumption-server client = 29-resumption-client -resume-server = 29-resumption-resume-server -resume-client = 29-resumption-client +resume-server = 29-resumption-server +resume-client = 29-resumption-resume-client [29-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1.3 -MinProtocol = TLSv1.3 Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[29-resumption-resume-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem +[29-resumption-client] CipherString = DEFAULT -MaxProtocol = TLSv1.2 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem +MaxProtocol = TLSv1.1 +MinProtocol = TLSv1.1 +VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem +VerifyMode = Peer -[29-resumption-client] +[29-resumption-resume-client] CipherString = DEFAULT +MaxProtocol = TLSv1.2 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer @@ -1154,32 +1126,32 @@ ssl_conf = 30-resumption-ssl [30-resumption-ssl] server = 30-resumption-server client = 30-resumption-client -resume-server = 30-resumption-resume-server -resume-client = 30-resumption-client +resume-server = 30-resumption-server +resume-client = 30-resumption-resume-client [30-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1.3 -MinProtocol = TLSv1.3 Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[30-resumption-resume-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem +[30-resumption-client] CipherString = DEFAULT -MaxProtocol = TLSv1.3 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem +MaxProtocol = TLSv1.2 +MinProtocol = TLSv1.2 +VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem +VerifyMode = Peer -[30-resumption-client] +[30-resumption-resume-client] CipherString = DEFAULT +MaxProtocol = TLSv1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-30] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1 HandshakeMode = Resume -ResumptionExpected = Yes +ResumptionExpected = No # =========================================================== @@ -1190,32 +1162,32 @@ ssl_conf = 31-resumption-ssl [31-resumption-ssl] server = 31-resumption-server client = 31-resumption-client -resume-server = 31-resumption-resume-server -resume-client = 31-resumption-client +resume-server = 31-resumption-server +resume-client = 31-resumption-resume-client [31-resumption-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT -MaxProtocol = TLSv1.3 -MinProtocol = TLSv1.3 Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[31-resumption-resume-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem +[31-resumption-client] CipherString = DEFAULT -MaxProtocol = TLSv1.3 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem +MaxProtocol = TLSv1.2 +MinProtocol = TLSv1.2 +VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem +VerifyMode = Peer -[31-resumption-client] +[31-resumption-resume-client] CipherString = DEFAULT +MaxProtocol = TLSv1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-31] -ExpectedProtocol = TLSv1.3 +ExpectedProtocol = TLSv1 HandshakeMode = Resume -ResumptionExpected = Yes +ResumptionExpected = No # =========================================================== @@ -1237,21 +1209,21 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [32-resumption-client] CipherString = DEFAULT -MaxProtocol = TLSv1 -MinProtocol = TLSv1 +MaxProtocol = TLSv1.2 +MinProtocol = TLSv1.2 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [32-resumption-resume-client] CipherString = DEFAULT -MaxProtocol = TLSv1 +MaxProtocol = TLSv1.1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-32] -ExpectedProtocol = TLSv1 +ExpectedProtocol = TLSv1.1 HandshakeMode = Resume -ResumptionExpected = Yes +ResumptionExpected = No # =========================================================== @@ -1273,21 +1245,21 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [33-resumption-client] CipherString = DEFAULT -MaxProtocol = TLSv1 -MinProtocol = TLSv1 +MaxProtocol = TLSv1.2 +MinProtocol = TLSv1.2 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [33-resumption-resume-client] CipherString = DEFAULT -MaxProtocol = TLSv1 +MaxProtocol = TLSv1.1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-33] -ExpectedProtocol = TLSv1 +ExpectedProtocol = TLSv1.1 HandshakeMode = Resume -ResumptionExpected = Yes +ResumptionExpected = No # =========================================================== @@ -1309,21 +1281,21 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [34-resumption-client] CipherString = DEFAULT -MaxProtocol = TLSv1 -MinProtocol = TLSv1 +MaxProtocol = TLSv1.2 +MinProtocol = TLSv1.2 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [34-resumption-resume-client] CipherString = DEFAULT -MaxProtocol = TLSv1.1 +MaxProtocol = TLSv1.2 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-34] -ExpectedProtocol = TLSv1.1 +ExpectedProtocol = TLSv1.2 HandshakeMode = Resume -ResumptionExpected = No +ResumptionExpected = Yes # =========================================================== @@ -1345,1028 +1317,20 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [35-resumption-client] CipherString = DEFAULT -MaxProtocol = TLSv1 -MinProtocol = TLSv1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[35-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-35] -ExpectedProtocol = TLSv1.1 -HandshakeMode = Resume -ResumptionExpected = No - - -# =========================================================== - -[36-resumption] -ssl_conf = 36-resumption-ssl - -[36-resumption-ssl] -server = 36-resumption-server -client = 36-resumption-client -resume-server = 36-resumption-server -resume-client = 36-resumption-resume-client - -[36-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[36-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1 -MinProtocol = TLSv1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[36-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.2 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-36] -ExpectedProtocol = TLSv1.2 -HandshakeMode = Resume -ResumptionExpected = No - - -# =========================================================== - -[37-resumption] -ssl_conf = 37-resumption-ssl - -[37-resumption-ssl] -server = 37-resumption-server -client = 37-resumption-client -resume-server = 37-resumption-server -resume-client = 37-resumption-resume-client - -[37-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = -SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[37-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1 -MinProtocol = TLSv1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[37-resumption-resume-client] -CipherString = DEFAULT MaxProtocol = TLSv1.2 +MinProtocol = TLSv1.2 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer -[test-37] -ExpectedProtocol = TLSv1.2 -HandshakeMode = Resume -ResumptionExpected = No - - -# =========================================================== - -[38-resumption] -ssl_conf = 38-resumption-ssl - -[38-resumption-ssl] -server = 38-resumption-server -client = 38-resumption-client -resume-server = 38-resumption-server -resume-client = 38-resumption-resume-client - -[38-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[38-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1 -MinProtocol = TLSv1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[38-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.3 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-38] -ExpectedProtocol = TLSv1.3 -HandshakeMode = Resume -ResumptionExpected = No - - -# =========================================================== - -[39-resumption] -ssl_conf = 39-resumption-ssl - -[39-resumption-ssl] -server = 39-resumption-server -client = 39-resumption-client -resume-server = 39-resumption-server -resume-client = 39-resumption-resume-client - -[39-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = -SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[39-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1 -MinProtocol = TLSv1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[39-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.3 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-39] -ExpectedProtocol = TLSv1.3 -HandshakeMode = Resume -ResumptionExpected = No - - -# =========================================================== - -[40-resumption] -ssl_conf = 40-resumption-ssl - -[40-resumption-ssl] -server = 40-resumption-server -client = 40-resumption-client -resume-server = 40-resumption-server -resume-client = 40-resumption-resume-client - -[40-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[40-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.1 -MinProtocol = TLSv1.1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[40-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-40] -ExpectedProtocol = TLSv1 -HandshakeMode = Resume -ResumptionExpected = No - - -# =========================================================== - -[41-resumption] -ssl_conf = 41-resumption-ssl - -[41-resumption-ssl] -server = 41-resumption-server -client = 41-resumption-client -resume-server = 41-resumption-server -resume-client = 41-resumption-resume-client - -[41-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = -SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[41-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.1 -MinProtocol = TLSv1.1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[41-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-41] -ExpectedProtocol = TLSv1 -HandshakeMode = Resume -ResumptionExpected = No - - -# =========================================================== - -[42-resumption] -ssl_conf = 42-resumption-ssl - -[42-resumption-ssl] -server = 42-resumption-server -client = 42-resumption-client -resume-server = 42-resumption-server -resume-client = 42-resumption-resume-client - -[42-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[42-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.1 -MinProtocol = TLSv1.1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[42-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-42] -ExpectedProtocol = TLSv1.1 -HandshakeMode = Resume -ResumptionExpected = Yes - - -# =========================================================== - -[43-resumption] -ssl_conf = 43-resumption-ssl - -[43-resumption-ssl] -server = 43-resumption-server -client = 43-resumption-client -resume-server = 43-resumption-server -resume-client = 43-resumption-resume-client - -[43-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = -SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[43-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.1 -MinProtocol = TLSv1.1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[43-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-43] -ExpectedProtocol = TLSv1.1 -HandshakeMode = Resume -ResumptionExpected = Yes - - -# =========================================================== - -[44-resumption] -ssl_conf = 44-resumption-ssl - -[44-resumption-ssl] -server = 44-resumption-server -client = 44-resumption-client -resume-server = 44-resumption-server -resume-client = 44-resumption-resume-client - -[44-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[44-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.1 -MinProtocol = TLSv1.1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[44-resumption-resume-client] +[35-resumption-resume-client] CipherString = DEFAULT MaxProtocol = TLSv1.2 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer -[test-44] +[test-35] ExpectedProtocol = TLSv1.2 HandshakeMode = Resume -ResumptionExpected = No - - -# =========================================================== - -[45-resumption] -ssl_conf = 45-resumption-ssl - -[45-resumption-ssl] -server = 45-resumption-server -client = 45-resumption-client -resume-server = 45-resumption-server -resume-client = 45-resumption-resume-client - -[45-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = -SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[45-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.1 -MinProtocol = TLSv1.1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[45-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.2 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-45] -ExpectedProtocol = TLSv1.2 -HandshakeMode = Resume -ResumptionExpected = No - - -# =========================================================== - -[46-resumption] -ssl_conf = 46-resumption-ssl - -[46-resumption-ssl] -server = 46-resumption-server -client = 46-resumption-client -resume-server = 46-resumption-server -resume-client = 46-resumption-resume-client - -[46-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[46-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.1 -MinProtocol = TLSv1.1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[46-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.3 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-46] -ExpectedProtocol = TLSv1.3 -HandshakeMode = Resume -ResumptionExpected = No - - -# =========================================================== - -[47-resumption] -ssl_conf = 47-resumption-ssl - -[47-resumption-ssl] -server = 47-resumption-server -client = 47-resumption-client -resume-server = 47-resumption-server -resume-client = 47-resumption-resume-client - -[47-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = -SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[47-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.1 -MinProtocol = TLSv1.1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[47-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.3 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-47] -ExpectedProtocol = TLSv1.3 -HandshakeMode = Resume -ResumptionExpected = No - - -# =========================================================== - -[48-resumption] -ssl_conf = 48-resumption-ssl - -[48-resumption-ssl] -server = 48-resumption-server -client = 48-resumption-client -resume-server = 48-resumption-server -resume-client = 48-resumption-resume-client - -[48-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[48-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.2 -MinProtocol = TLSv1.2 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[48-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-48] -ExpectedProtocol = TLSv1 -HandshakeMode = Resume -ResumptionExpected = No - - -# =========================================================== - -[49-resumption] -ssl_conf = 49-resumption-ssl - -[49-resumption-ssl] -server = 49-resumption-server -client = 49-resumption-client -resume-server = 49-resumption-server -resume-client = 49-resumption-resume-client - -[49-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = -SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[49-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.2 -MinProtocol = TLSv1.2 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[49-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-49] -ExpectedProtocol = TLSv1 -HandshakeMode = Resume -ResumptionExpected = No - - -# =========================================================== - -[50-resumption] -ssl_conf = 50-resumption-ssl - -[50-resumption-ssl] -server = 50-resumption-server -client = 50-resumption-client -resume-server = 50-resumption-server -resume-client = 50-resumption-resume-client - -[50-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[50-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.2 -MinProtocol = TLSv1.2 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[50-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-50] -ExpectedProtocol = TLSv1.1 -HandshakeMode = Resume -ResumptionExpected = No - - -# =========================================================== - -[51-resumption] -ssl_conf = 51-resumption-ssl - -[51-resumption-ssl] -server = 51-resumption-server -client = 51-resumption-client -resume-server = 51-resumption-server -resume-client = 51-resumption-resume-client - -[51-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = -SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[51-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.2 -MinProtocol = TLSv1.2 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[51-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-51] -ExpectedProtocol = TLSv1.1 -HandshakeMode = Resume -ResumptionExpected = No - - -# =========================================================== - -[52-resumption] -ssl_conf = 52-resumption-ssl - -[52-resumption-ssl] -server = 52-resumption-server -client = 52-resumption-client -resume-server = 52-resumption-server -resume-client = 52-resumption-resume-client - -[52-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[52-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.2 -MinProtocol = TLSv1.2 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[52-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.2 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-52] -ExpectedProtocol = TLSv1.2 -HandshakeMode = Resume -ResumptionExpected = Yes - - -# =========================================================== - -[53-resumption] -ssl_conf = 53-resumption-ssl - -[53-resumption-ssl] -server = 53-resumption-server -client = 53-resumption-client -resume-server = 53-resumption-server -resume-client = 53-resumption-resume-client - -[53-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = -SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[53-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.2 -MinProtocol = TLSv1.2 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[53-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.2 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-53] -ExpectedProtocol = TLSv1.2 -HandshakeMode = Resume -ResumptionExpected = Yes - - -# =========================================================== - -[54-resumption] -ssl_conf = 54-resumption-ssl - -[54-resumption-ssl] -server = 54-resumption-server -client = 54-resumption-client -resume-server = 54-resumption-server -resume-client = 54-resumption-resume-client - -[54-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[54-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.2 -MinProtocol = TLSv1.2 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[54-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.3 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-54] -ExpectedProtocol = TLSv1.3 -HandshakeMode = Resume -ResumptionExpected = No - - -# =========================================================== - -[55-resumption] -ssl_conf = 55-resumption-ssl - -[55-resumption-ssl] -server = 55-resumption-server -client = 55-resumption-client -resume-server = 55-resumption-server -resume-client = 55-resumption-resume-client - -[55-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = -SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[55-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.2 -MinProtocol = TLSv1.2 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[55-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.3 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-55] -ExpectedProtocol = TLSv1.3 -HandshakeMode = Resume -ResumptionExpected = No - - -# =========================================================== - -[56-resumption] -ssl_conf = 56-resumption-ssl - -[56-resumption-ssl] -server = 56-resumption-server -client = 56-resumption-client -resume-server = 56-resumption-server -resume-client = 56-resumption-resume-client - -[56-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[56-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.3 -MinProtocol = TLSv1.3 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[56-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-56] -ExpectedProtocol = TLSv1 -HandshakeMode = Resume -ResumptionExpected = No - - -# =========================================================== - -[57-resumption] -ssl_conf = 57-resumption-ssl - -[57-resumption-ssl] -server = 57-resumption-server -client = 57-resumption-client -resume-server = 57-resumption-server -resume-client = 57-resumption-resume-client - -[57-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = -SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[57-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.3 -MinProtocol = TLSv1.3 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[57-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-57] -ExpectedProtocol = TLSv1 -HandshakeMode = Resume -ResumptionExpected = No - - -# =========================================================== - -[58-resumption] -ssl_conf = 58-resumption-ssl - -[58-resumption-ssl] -server = 58-resumption-server -client = 58-resumption-client -resume-server = 58-resumption-server -resume-client = 58-resumption-resume-client - -[58-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[58-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.3 -MinProtocol = TLSv1.3 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[58-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-58] -ExpectedProtocol = TLSv1.1 -HandshakeMode = Resume -ResumptionExpected = No - - -# =========================================================== - -[59-resumption] -ssl_conf = 59-resumption-ssl - -[59-resumption-ssl] -server = 59-resumption-server -client = 59-resumption-client -resume-server = 59-resumption-server -resume-client = 59-resumption-resume-client - -[59-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = -SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[59-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.3 -MinProtocol = TLSv1.3 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[59-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.1 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-59] -ExpectedProtocol = TLSv1.1 -HandshakeMode = Resume -ResumptionExpected = No - - -# =========================================================== - -[60-resumption] -ssl_conf = 60-resumption-ssl - -[60-resumption-ssl] -server = 60-resumption-server -client = 60-resumption-client -resume-server = 60-resumption-server -resume-client = 60-resumption-resume-client - -[60-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[60-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.3 -MinProtocol = TLSv1.3 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[60-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.2 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-60] -ExpectedProtocol = TLSv1.2 -HandshakeMode = Resume -ResumptionExpected = No - - -# =========================================================== - -[61-resumption] -ssl_conf = 61-resumption-ssl - -[61-resumption-ssl] -server = 61-resumption-server -client = 61-resumption-client -resume-server = 61-resumption-server -resume-client = 61-resumption-resume-client - -[61-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = -SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[61-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.3 -MinProtocol = TLSv1.3 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[61-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.2 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-61] -ExpectedProtocol = TLSv1.2 -HandshakeMode = Resume -ResumptionExpected = No - - -# =========================================================== - -[62-resumption] -ssl_conf = 62-resumption-ssl - -[62-resumption-ssl] -server = 62-resumption-server -client = 62-resumption-client -resume-server = 62-resumption-server -resume-client = 62-resumption-resume-client - -[62-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[62-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.3 -MinProtocol = TLSv1.3 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[62-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.3 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-62] -ExpectedProtocol = TLSv1.3 -HandshakeMode = Resume -ResumptionExpected = Yes - - -# =========================================================== - -[63-resumption] -ssl_conf = 63-resumption-ssl - -[63-resumption-ssl] -server = 63-resumption-server -client = 63-resumption-client -resume-server = 63-resumption-server -resume-client = 63-resumption-resume-client - -[63-resumption-server] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -Options = -SessionTicket -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[63-resumption-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.3 -MinProtocol = TLSv1.3 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[63-resumption-resume-client] -CipherString = DEFAULT -MaxProtocol = TLSv1.3 -VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem -VerifyMode = Peer - -[test-63] -ExpectedProtocol = TLSv1.3 -HandshakeMode = Resume ResumptionExpected = Yes diff --git a/test/ssl-tests/protocol_version.pm b/test/ssl-tests/protocol_version.pm index 7146b8a54e..9abcaae5e2 100644 --- a/test/ssl-tests/protocol_version.pm +++ b/test/ssl-tests/protocol_version.pm @@ -137,6 +137,7 @@ sub generate_resumption_tests { my @protocols = $dtls ? @dtls_protocols : @tls_protocols; my $min_enabled = $dtls ? $min_dtls_enabled : $min_tls_enabled; + my $max_enabled = $dtls ? $max_dtls_enabled : $max_tls_enabled; if (no_tests($dtls)) { return; @@ -146,10 +147,10 @@ sub generate_resumption_tests { my @client_tests = (); # Obtain the first session against a fixed-version server/client. - foreach my $original_protocol($min_enabled..$#protocols) { + foreach my $original_protocol($min_enabled..$max_enabled) { # Upgrade or downgrade the server/client max version support and test # that it upgrades, downgrades or resumes the session as well. - foreach my $resume_protocol($min_enabled..$#protocols) { + foreach my $resume_protocol($min_enabled..$max_enabled) { my $resumption_expected; # We should only resume on exact version match. if ($original_protocol eq $resume_protocol) { -- 2.25.1