aboutsummaryrefslogtreecommitdiffstats
path: root/test/ssl-tests
diff options
context:
space:
mode:
Diffstat (limited to 'test/ssl-tests')
-rw-r--r--test/ssl-tests/01-simple.conf2
-rw-r--r--test/ssl-tests/01-simple.conf.in2
-rw-r--r--test/ssl-tests/02-protocol-version.conf486
-rw-r--r--test/ssl-tests/03-custom_verify.conf36
-rw-r--r--test/ssl-tests/03-custom_verify.conf.in39
-rw-r--r--test/ssl-tests/04-client_auth.conf16
-rw-r--r--test/ssl-tests/04-client_auth.conf.in4
-rw-r--r--test/ssl-tests/05-sni.conf45
-rw-r--r--test/ssl-tests/05-sni.conf.in96
-rw-r--r--test/ssl-tests/06-sni-ticket.conf169
-rw-r--r--test/ssl-tests/06-sni-ticket.conf.in19
-rw-r--r--test/ssl-tests/07-dtls-protocol-version.conf112
-rw-r--r--test/ssl-tests/08-npn.conf144
-rw-r--r--test/ssl-tests/08-npn.conf.in208
-rw-r--r--test/ssl-tests/09-alpn.conf145
-rw-r--r--test/ssl-tests/09-alpn.conf.in167
-rw-r--r--test/ssl-tests/10-resumption.conf72
-rw-r--r--test/ssl-tests/11-dtls_resumption.conf32
-rw-r--r--test/ssl-tests/protocol_version.pm6
19 files changed, 1148 insertions, 652 deletions
diff --git a/test/ssl-tests/01-simple.conf b/test/ssl-tests/01-simple.conf
index ab34e01378..6f2f6c4893 100644
--- a/test/ssl-tests/01-simple.conf
+++ b/test/ssl-tests/01-simple.conf
@@ -46,7 +46,7 @@ CipherString = DEFAULT
VerifyMode = Peer
[test-1]
-ClientAlert = UnknownCA
+ExpectedClientAlert = UnknownCA
ExpectedResult = ClientFail
diff --git a/test/ssl-tests/01-simple.conf.in b/test/ssl-tests/01-simple.conf.in
index e3a6330bde..45ddd61921 100644
--- a/test/ssl-tests/01-simple.conf.in
+++ b/test/ssl-tests/01-simple.conf.in
@@ -28,7 +28,7 @@ our @tests = (
},
test => {
"ExpectedResult" => "ClientFail",
- "ClientAlert" => "UnknownCA",
+ "ExpectedClientAlert" => "UnknownCA",
},
},
);
diff --git a/test/ssl-tests/02-protocol-version.conf b/test/ssl-tests/02-protocol-version.conf
index 1b9a41b43f..cb89dbc10a 100644
--- a/test/ssl-tests/02-protocol-version.conf
+++ b/test/ssl-tests/02-protocol-version.conf
@@ -894,8 +894,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-20]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -920,8 +920,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-21]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -946,8 +946,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-22]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -971,8 +971,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-23]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -1024,8 +1024,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-25]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -1051,8 +1051,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-26]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -1078,8 +1078,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-27]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -1104,8 +1104,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-28]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -1131,8 +1131,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-29]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -1158,8 +1158,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-30]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -1185,8 +1185,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-31]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -1211,8 +1211,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-32]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -1390,8 +1390,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-39]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -1416,8 +1416,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-40]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -1442,8 +1442,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-41]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -1467,8 +1467,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-42]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -1520,8 +1520,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-44]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -1547,8 +1547,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-45]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -1574,8 +1574,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-46]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -1600,8 +1600,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-47]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -1627,8 +1627,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-48]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -1654,8 +1654,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-49]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -1681,8 +1681,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-50]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -1707,8 +1707,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-51]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -1734,8 +1734,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-52]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -1761,8 +1761,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-53]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -1787,8 +1787,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-54]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -1889,8 +1889,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-58]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -1915,8 +1915,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-59]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -1941,8 +1941,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-60]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -1966,8 +1966,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-61]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -2019,8 +2019,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-63]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -2046,8 +2046,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-64]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -2073,8 +2073,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-65]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -2099,8 +2099,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-66]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -2126,8 +2126,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-67]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -2153,8 +2153,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-68]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -2180,8 +2180,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-69]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -2206,8 +2206,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-70]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -2233,8 +2233,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-71]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -2260,8 +2260,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-72]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -2286,8 +2286,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-73]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -2313,8 +2313,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-74]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -2339,8 +2339,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-75]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -2388,8 +2388,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-77]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -2413,8 +2413,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-78]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -2438,8 +2438,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-79]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -2462,8 +2462,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-80]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -2513,8 +2513,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-82]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -2539,8 +2539,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-83]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -2565,8 +2565,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-84]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -2590,8 +2590,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-85]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -2616,8 +2616,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-86]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -2642,8 +2642,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-87]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -2668,8 +2668,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-88]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -2693,8 +2693,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-89]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -2719,8 +2719,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-90]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -2745,8 +2745,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-91]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -2770,8 +2770,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-92]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -2796,8 +2796,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-93]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -2821,8 +2821,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-94]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -3377,8 +3377,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-115]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -3404,8 +3404,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-116]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -3431,8 +3431,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-117]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -3457,8 +3457,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-118]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -3512,8 +3512,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-120]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -3540,8 +3540,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-121]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -3568,8 +3568,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-122]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -3595,8 +3595,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-123]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -3623,8 +3623,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-124]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -3651,8 +3651,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-125]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -3679,8 +3679,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-126]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -3706,8 +3706,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-127]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -3892,8 +3892,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-134]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -3919,8 +3919,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-135]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -3946,8 +3946,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-136]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -3972,8 +3972,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-137]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -4027,8 +4027,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-139]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -4055,8 +4055,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-140]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -4083,8 +4083,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-141]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -4110,8 +4110,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-142]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -4138,8 +4138,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-143]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -4166,8 +4166,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-144]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -4194,8 +4194,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-145]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -4221,8 +4221,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-146]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -4249,8 +4249,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-147]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -4277,8 +4277,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-148]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -4304,8 +4304,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-149]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -4410,8 +4410,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-153]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -4437,8 +4437,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-154]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -4464,8 +4464,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-155]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -4490,8 +4490,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-156]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -4545,8 +4545,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-158]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -4573,8 +4573,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-159]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -4601,8 +4601,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-160]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -4628,8 +4628,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-161]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -4656,8 +4656,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-162]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -4684,8 +4684,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-163]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -4712,8 +4712,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-164]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -4739,8 +4739,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-165]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -4767,8 +4767,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-166]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -4795,8 +4795,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-167]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -4822,8 +4822,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-168]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -4850,8 +4850,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-169]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -4877,8 +4877,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-170]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -4928,8 +4928,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-172]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -4954,8 +4954,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-173]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -4980,8 +4980,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-174]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -5005,8 +5005,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-175]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -5058,8 +5058,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-177]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -5085,8 +5085,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-178]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -5112,8 +5112,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-179]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -5138,8 +5138,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-180]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -5165,8 +5165,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-181]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -5192,8 +5192,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-182]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -5219,8 +5219,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-183]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -5245,8 +5245,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-184]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -5272,8 +5272,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-185]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -5299,8 +5299,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-186]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -5325,8 +5325,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-187]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -5352,8 +5352,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-188]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -5378,8 +5378,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-189]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -5431,8 +5431,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-191]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -5458,8 +5458,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-192]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -5485,8 +5485,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-193]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -5511,8 +5511,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-194]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -5566,8 +5566,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-196]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -5594,8 +5594,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-197]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -5622,8 +5622,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-198]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -5649,8 +5649,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-199]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -5677,8 +5677,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-200]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -5705,8 +5705,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-201]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -5733,8 +5733,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-202]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -5760,8 +5760,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-203]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -5946,8 +5946,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-210]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -5973,8 +5973,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-211]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -6000,8 +6000,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-212]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -6026,8 +6026,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-213]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -6081,8 +6081,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-215]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -6109,8 +6109,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-216]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -6137,8 +6137,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-217]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -6164,8 +6164,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-218]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -6192,8 +6192,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-219]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -6220,8 +6220,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-220]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -6248,8 +6248,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-221]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -6275,8 +6275,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-222]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -6303,8 +6303,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-223]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -6331,8 +6331,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-224]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -6358,8 +6358,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-225]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -6464,8 +6464,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-229]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -6491,8 +6491,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-230]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -6518,8 +6518,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-231]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -6544,8 +6544,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-232]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -6599,8 +6599,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-234]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -6627,8 +6627,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-235]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -6655,8 +6655,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-236]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -6682,8 +6682,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-237]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -6710,8 +6710,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-238]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -6738,8 +6738,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-239]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -6766,8 +6766,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-240]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -6793,8 +6793,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-241]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -6821,8 +6821,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-242]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -6849,8 +6849,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-243]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -6876,8 +6876,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-244]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -6904,8 +6904,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-245]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -6931,8 +6931,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-246]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -6982,8 +6982,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-248]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -7008,8 +7008,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-249]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -7034,8 +7034,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-250]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -7059,8 +7059,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-251]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -7112,8 +7112,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-253]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -7139,8 +7139,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-254]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -7166,8 +7166,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-255]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -7192,8 +7192,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-256]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -7219,8 +7219,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-257]
+ExpectedProtocol = TLSv1
ExpectedResult = Success
-Protocol = TLSv1
# ===========================================================
@@ -7246,8 +7246,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-258]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -7273,8 +7273,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-259]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -7299,8 +7299,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-260]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -7326,8 +7326,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-261]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -7353,8 +7353,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-262]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -7379,8 +7379,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-263]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -7406,8 +7406,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-264]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -7432,8 +7432,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-265]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -7511,8 +7511,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-268]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -7538,8 +7538,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-269]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -7564,8 +7564,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-270]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -7646,8 +7646,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-273]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -7674,8 +7674,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-274]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -7701,8 +7701,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-275]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -7756,8 +7756,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-277]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -7784,8 +7784,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-278]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -7811,8 +7811,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-279]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -7839,8 +7839,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-280]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -7867,8 +7867,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-281]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -7894,8 +7894,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-282]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -8026,8 +8026,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-287]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -8053,8 +8053,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-288]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -8079,8 +8079,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-289]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -8161,8 +8161,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-292]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -8189,8 +8189,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-293]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -8216,8 +8216,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-294]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -8271,8 +8271,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-296]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -8299,8 +8299,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-297]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -8326,8 +8326,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-298]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -8354,8 +8354,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-299]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -8382,8 +8382,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-300]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -8409,8 +8409,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-301]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -8437,8 +8437,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-302]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -8464,8 +8464,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-303]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -8540,8 +8540,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-306]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -8566,8 +8566,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-307]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -8591,8 +8591,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-308]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -8670,8 +8670,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-311]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -8697,8 +8697,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-312]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -8723,8 +8723,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-313]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -8776,8 +8776,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-315]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -8803,8 +8803,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-316]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -8829,8 +8829,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-317]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -8856,8 +8856,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-318]
+ExpectedProtocol = TLSv1.1
ExpectedResult = Success
-Protocol = TLSv1.1
# ===========================================================
@@ -8883,8 +8883,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-319]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -8909,8 +8909,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-320]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -8936,8 +8936,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-321]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -8962,8 +8962,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-322]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -9067,8 +9067,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-326]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -9093,8 +9093,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-327]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -9202,8 +9202,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-331]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -9229,8 +9229,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-332]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -9311,8 +9311,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-335]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -9338,8 +9338,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-336]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -9393,8 +9393,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-338]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -9420,8 +9420,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-339]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -9448,8 +9448,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-340]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -9475,8 +9475,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-341]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -9576,8 +9576,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-345]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -9601,8 +9601,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-346]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -9706,8 +9706,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-350]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -9732,8 +9732,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-351]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -9811,8 +9811,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-354]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -9837,8 +9837,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-355]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -9890,8 +9890,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-357]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -9916,8 +9916,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-358]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -9943,8 +9943,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-359]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
# ===========================================================
@@ -9969,7 +9969,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-360]
+ExpectedProtocol = TLSv1.2
ExpectedResult = Success
-Protocol = TLSv1.2
diff --git a/test/ssl-tests/03-custom_verify.conf b/test/ssl-tests/03-custom_verify.conf
index 835ce91afd..8dca715e74 100644
--- a/test/ssl-tests/03-custom_verify.conf
+++ b/test/ssl-tests/03-custom_verify.conf
@@ -54,9 +54,12 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-1]
-ClientAlert = HandshakeFailure
-ClientVerifyCallback = RejectAll
+ExpectedClientAlert = HandshakeFailure
ExpectedResult = ClientFail
+client = 1-verify-custom-reject-client-extra
+
+[1-verify-custom-reject-client-extra]
+VerifyCallback = RejectAll
# ===========================================================
@@ -79,8 +82,11 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-2]
-ClientVerifyCallback = AcceptAll
ExpectedResult = Success
+client = 2-verify-custom-allow-client-extra
+
+[2-verify-custom-allow-client-extra]
+VerifyCallback = AcceptAll
# ===========================================================
@@ -122,8 +128,11 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
CipherString = DEFAULT
[test-4]
-ClientVerifyCallback = RejectAll
ExpectedResult = Success
+client = 4-noverify-ignore-custom-reject-client-extra
+
+[4-noverify-ignore-custom-reject-client-extra]
+VerifyCallback = RejectAll
# ===========================================================
@@ -144,8 +153,11 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
CipherString = DEFAULT
[test-5]
-ClientVerifyCallback = AcceptAll
ExpectedResult = Success
+client = 5-noverify-accept-custom-allow-client-extra
+
+[5-noverify-accept-custom-allow-client-extra]
+VerifyCallback = AcceptAll
# ===========================================================
@@ -167,7 +179,7 @@ CipherString = DEFAULT
VerifyMode = Peer
[test-6]
-ClientAlert = UnknownCA
+ExpectedClientAlert = UnknownCA
ExpectedResult = ClientFail
@@ -190,8 +202,11 @@ CipherString = DEFAULT
VerifyMode = Peer
[test-7]
-ClientVerifyCallback = AcceptAll
ExpectedResult = Success
+client = 7-verify-custom-success-no-root-client-extra
+
+[7-verify-custom-success-no-root-client-extra]
+VerifyCallback = AcceptAll
# ===========================================================
@@ -213,8 +228,11 @@ CipherString = DEFAULT
VerifyMode = Peer
[test-8]
-ClientAlert = HandshakeFailure
-ClientVerifyCallback = RejectAll
+ExpectedClientAlert = HandshakeFailure
ExpectedResult = ClientFail
+client = 8-verify-custom-fail-no-root-client-extra
+
+[8-verify-custom-fail-no-root-client-extra]
+VerifyCallback = RejectAll
diff --git a/test/ssl-tests/03-custom_verify.conf.in b/test/ssl-tests/03-custom_verify.conf.in
index 1cd4273c7a..287ca9bc86 100644
--- a/test/ssl-tests/03-custom_verify.conf.in
+++ b/test/ssl-tests/03-custom_verify.conf.in
@@ -26,11 +26,14 @@ our @tests = (
{
name => "verify-custom-reject",
server => { },
- client => { },
+ client => {
+ extra => {
+ "VerifyCallback" => "RejectAll",
+ },
+ },
test => {
- "ClientVerifyCallback" => "RejectAll",
"ExpectedResult" => "ClientFail",
- "ClientAlert" => "HandshakeFailure",
+ "ExpectedClientAlert" => "HandshakeFailure",
},
},
@@ -38,9 +41,12 @@ our @tests = (
{
name => "verify-custom-allow",
server => { },
- client => { },
+ client => {
+ extra => {
+ "VerifyCallback" => "AcceptAll",
+ },
+ },
test => {
- "ClientVerifyCallback" => "AcceptAll",
"ExpectedResult" => "Success",
},
},
@@ -65,9 +71,11 @@ our @tests = (
client => {
"VerifyMode" => undef,
"VerifyCAFile" => undef,
+ extra => {
+ "VerifyCallback" => "RejectAll",
+ },
},
test => {
- "ClientVerifyCallback" => "RejectAll",
"ExpectedResult" => "Success",
},
},
@@ -80,9 +88,11 @@ our @tests = (
client => {
"VerifyMode" => undef,
"VerifyCAFile" => undef,
+ extra => {
+ "VerifyCallback" => "AcceptAll",
+ },
},
test => {
- "ClientVerifyCallback" => "AcceptAll",
"ExpectedResult" => "Success",
},
},
@@ -98,7 +108,7 @@ our @tests = (
},
test => {
"ExpectedResult" => "ClientFail",
- "ClientAlert" => "UnknownCA",
+ "ExpectedClientAlert" => "UnknownCA",
},
},
@@ -108,9 +118,11 @@ our @tests = (
server => { },
client => {
"VerifyCAFile" => undef,
+ extra => {
+ "VerifyCallback" => "AcceptAll",
+ },
},
test => {
- "ClientVerifyCallback" => "AcceptAll",
"ExpectedResult" => "Success"
},
},
@@ -121,14 +133,13 @@ our @tests = (
server => { },
client => {
"VerifyCAFile" => undef,
+ extra => {
+ "VerifyCallback" => "RejectAll",
+ },
},
test => {
- "ClientVerifyCallback" => "RejectAll",
"ExpectedResult" => "ClientFail",
- "ClientAlert" => "HandshakeFailure",
+ "ExpectedClientAlert" => "HandshakeFailure",
},
},
-
-
-
);
diff --git a/test/ssl-tests/04-client_auth.conf b/test/ssl-tests/04-client_auth.conf
index 04bb2345b9..0e91bed9f1 100644
--- a/test/ssl-tests/04-client_auth.conf
+++ b/test/ssl-tests/04-client_auth.conf
@@ -92,7 +92,7 @@ VerifyMode = Peer
[test-2]
ExpectedResult = ServerFail
-ServerAlert = HandshakeFailure
+ExpectedServerAlert = HandshakeFailure
# ===========================================================
@@ -146,7 +146,7 @@ VerifyMode = Peer
[test-4]
ExpectedResult = ServerFail
-ServerAlert = UnknownCA
+ExpectedServerAlert = UnknownCA
# ===========================================================
@@ -231,7 +231,7 @@ VerifyMode = Peer
[test-7]
ExpectedResult = ServerFail
-ServerAlert = HandshakeFailure
+ExpectedServerAlert = HandshakeFailure
# ===========================================================
@@ -293,7 +293,7 @@ VerifyMode = Peer
[test-9]
ExpectedResult = ServerFail
-ServerAlert = UnknownCA
+ExpectedServerAlert = UnknownCA
# ===========================================================
@@ -378,7 +378,7 @@ VerifyMode = Peer
[test-12]
ExpectedResult = ServerFail
-ServerAlert = HandshakeFailure
+ExpectedServerAlert = HandshakeFailure
# ===========================================================
@@ -440,7 +440,7 @@ VerifyMode = Peer
[test-14]
ExpectedResult = ServerFail
-ServerAlert = UnknownCA
+ExpectedServerAlert = UnknownCA
# ===========================================================
@@ -525,7 +525,7 @@ VerifyMode = Peer
[test-17]
ExpectedResult = ServerFail
-ServerAlert = HandshakeFailure
+ExpectedServerAlert = HandshakeFailure
# ===========================================================
@@ -587,6 +587,6 @@ VerifyMode = Peer
[test-19]
ExpectedResult = ServerFail
-ServerAlert = UnknownCA
+ExpectedServerAlert = UnknownCA
diff --git a/test/ssl-tests/04-client_auth.conf.in b/test/ssl-tests/04-client_auth.conf.in
index 495db02c5f..cd3d42f416 100644
--- a/test/ssl-tests/04-client_auth.conf.in
+++ b/test/ssl-tests/04-client_auth.conf.in
@@ -77,7 +77,7 @@ sub generate_tests() {
},
test => {
"ExpectedResult" => "ServerFail",
- "ServerAlert" => "HandshakeFailure",
+ "ExpectedServerAlert" => "HandshakeFailure",
},
};
@@ -115,7 +115,7 @@ sub generate_tests() {
},
test => {
"ExpectedResult" => "ServerFail",
- "ServerAlert" => $caalert,
+ "ExpectedServerAlert" => $caalert,
},
};
}
diff --git a/test/ssl-tests/05-sni.conf b/test/ssl-tests/05-sni.conf
index 3fbb169e82..e1fb3d9d89 100644
--- a/test/ssl-tests/05-sni.conf
+++ b/test/ssl-tests/05-sni.conf
@@ -31,9 +31,16 @@ VerifyMode = Peer
[test-0]
ExpectedResult = Success
ExpectedServerName = server2
-ServerName = server2
+server = 0-SNI-switch-context-server-extra
+server2 = 0-SNI-switch-context-server-extra
+client = 0-SNI-switch-context-client-extra
+
+[0-SNI-switch-context-server-extra]
ServerNameCallback = IgnoreMismatch
+[0-SNI-switch-context-client-extra]
+ServerName = server2
+
# ===========================================================
@@ -58,9 +65,16 @@ VerifyMode = Peer
[test-1]
ExpectedResult = Success
ExpectedServerName = server1
-ServerName = server1
+server = 1-SNI-keep-context-server-extra
+server2 = 1-SNI-keep-context-server-extra
+client = 1-SNI-keep-context-client-extra
+
+[1-SNI-keep-context-server-extra]
ServerNameCallback = IgnoreMismatch
+[1-SNI-keep-context-client-extra]
+ServerName = server1
+
# ===========================================================
@@ -83,6 +97,9 @@ VerifyMode = Peer
[test-2]
ExpectedResult = Success
+client = 2-SNI-no-server-support-client-extra
+
+[2-SNI-no-server-support-client-extra]
ServerName = server1
@@ -109,6 +126,10 @@ VerifyMode = Peer
[test-3]
ExpectedResult = Success
ExpectedServerName = server1
+server = 3-SNI-no-client-support-server-extra
+server2 = 3-SNI-no-client-support-server-extra
+
+[3-SNI-no-client-support-server-extra]
ServerNameCallback = IgnoreMismatch
@@ -135,9 +156,16 @@ VerifyMode = Peer
[test-4]
ExpectedResult = Success
ExpectedServerName = server1
-ServerName = invalid
+server = 4-SNI-bad-sni-ignore-mismatch-server-extra
+server2 = 4-SNI-bad-sni-ignore-mismatch-server-extra
+client = 4-SNI-bad-sni-ignore-mismatch-client-extra
+
+[4-SNI-bad-sni-ignore-mismatch-server-extra]
ServerNameCallback = IgnoreMismatch
+[4-SNI-bad-sni-ignore-mismatch-client-extra]
+ServerName = invalid
+
# ===========================================================
@@ -161,8 +189,15 @@ VerifyMode = Peer
[test-5]
ExpectedResult = ServerFail
-ServerAlert = UnrecognizedName
-ServerName = invalid
+ExpectedServerAlert = UnrecognizedName
+server = 5-SNI-bad-sni-reject-mismatch-server-extra
+server2 = 5-SNI-bad-sni-reject-mismatch-server-extra
+client = 5-SNI-bad-sni-reject-mismatch-client-extra
+
+[5-SNI-bad-sni-reject-mismatch-server-extra]
ServerNameCallback = RejectMismatch
+[5-SNI-bad-sni-reject-mismatch-client-extra]
+ServerName = invalid
+
diff --git a/test/ssl-tests/05-sni.conf.in b/test/ssl-tests/05-sni.conf.in
index 0a8378e7a0..76003e7623 100644
--- a/test/ssl-tests/05-sni.conf.in
+++ b/test/ssl-tests/05-sni.conf.in
@@ -17,58 +17,96 @@ package ssltests;
our @tests = (
{
name => "SNI-switch-context",
- server => { },
- client => { },
- test => { "ServerName" => "server2",
- "ExpectedServerName" => "server2",
- "ServerNameCallback" => "IgnoreMismatch",
- "ExpectedResult" => "Success" },
+ server => {
+ extra => {
+ "ServerNameCallback" => "IgnoreMismatch",
+ },
+ },
+ client => {
+ extra => {
+ "ServerName" => "server2",
+ },
+ },
+ test => {
+ "ExpectedServerName" => "server2",
+ "ExpectedResult" => "Success"
+ },
},
{
name => "SNI-keep-context",
- server => { },
- client => { },
- test => { "ServerName" => "server1",
- "ExpectedServerName" => "server1",
- "ServerNameCallback" => "IgnoreMismatch",
- "ExpectedResult" => "Success" },
+ server => {
+ extra => {
+ "ServerNameCallback" => "IgnoreMismatch",
+ },
+ },
+ client => {
+ extra => {
+ "ServerName" => "server1",
+ },
+ },
+ test => {
+ "ExpectedServerName" => "server1",
+ "ExpectedResult" => "Success"
+ },
},
{
name => "SNI-no-server-support",
server => { },
- client => { },
- test => { "ServerName" => "server1",
- "ExpectedResult" => "Success" },
+ client => {
+ extra => {
+ "ServerName" => "server1",
+ },
+ },
+ test => { "ExpectedResult" => "Success" },
},
{
name => "SNI-no-client-support",
- server => { },
+ server => {
+ extra => {
+ "ServerNameCallback" => "IgnoreMismatch",
+ },
+ },
client => { },
test => {
# We expect that the callback is still called
# to let the application decide whether they tolerate
# missing SNI (as our test callback does).
"ExpectedServerName" => "server1",
- "ServerNameCallback" => "IgnoreMismatch",
"ExpectedResult" => "Success"
},
},
{
name => "SNI-bad-sni-ignore-mismatch",
- server => { },
- client => { },
- test => { "ServerName" => "invalid",
- "ExpectedServerName" => "server1",
- "ServerNameCallback" => "IgnoreMismatch",
- "ExpectedResult" => "Success" },
+ server => {
+ extra => {
+ "ServerNameCallback" => "IgnoreMismatch",
+ },
+ },
+ client => {
+ extra => {
+ "ServerName" => "invalid",
+ },
+ },
+ test => {
+ "ExpectedServerName" => "server1",
+ "ExpectedResult" => "Success"
+ },
},
{
name => "SNI-bad-sni-reject-mismatch",
- server => { },
- client => { },
- test => { "ServerName" => "invalid",
- "ServerNameCallback" => "RejectMismatch",
- "ExpectedResult" => "ServerFail",
- "ServerAlert" => "UnrecognizedName"},
+ server => {
+ extra => {
+ "ServerNameCallback" => "RejectMismatch",
+ },
+ },
+ client => {
+ extra => {
+ "ServerName" => "invalid",
+ },
+ },
+ test => {
+ "ExpectedResult" => "ServerFail",
+ "ExpectedServerAlert" => "UnrecognizedName"
+ },
},
);
diff --git a/test/ssl-tests/06-sni-ticket.conf b/test/ssl-tests/06-sni-ticket.conf
index 1d8d604d10..9620e015a1 100644
--- a/test/ssl-tests/06-sni-ticket.conf
+++ b/test/ssl-tests/06-sni-ticket.conf
@@ -49,8 +49,15 @@ VerifyMode = Peer
[test-0]
ExpectedResult = Success
+SessionTicketExpected = No
+server = 0-sni-session-ticket-server-extra
+client = 0-sni-session-ticket-client-extra
+
+[0-sni-session-ticket-server-extra]
+BrokenSessionTicket = Yes
+
+[0-sni-session-ticket-client-extra]
ServerName = server1
-SessionTicketExpected = Broken
# ===========================================================
@@ -84,9 +91,15 @@ VerifyMode = Peer
[test-1]
ExpectedResult = Success
ExpectedServerName = server1
-ServerName = server1
-ServerNameCallback = IgnoreMismatch
SessionTicketExpected = Yes
+server = 1-sni-session-ticket-server-extra
+client = 1-sni-session-ticket-client-extra
+
+[1-sni-session-ticket-server-extra]
+ServerNameCallback = IgnoreMismatch
+
+[1-sni-session-ticket-client-extra]
+ServerName = server1
# ===========================================================
@@ -120,9 +133,15 @@ VerifyMode = Peer
[test-2]
ExpectedResult = Success
ExpectedServerName = server2
-ServerName = server2
-ServerNameCallback = IgnoreMismatch
SessionTicketExpected = Yes
+server = 2-sni-session-ticket-server-extra
+client = 2-sni-session-ticket-client-extra
+
+[2-sni-session-ticket-server-extra]
+ServerNameCallback = IgnoreMismatch
+
+[2-sni-session-ticket-client-extra]
+ServerName = server2
# ===========================================================
@@ -156,9 +175,15 @@ VerifyMode = Peer
[test-3]
ExpectedResult = Success
ExpectedServerName = server1
-ServerName = server1
-ServerNameCallback = IgnoreMismatch
SessionTicketExpected = Yes
+server = 3-sni-session-ticket-server-extra
+client = 3-sni-session-ticket-client-extra
+
+[3-sni-session-ticket-server-extra]
+ServerNameCallback = IgnoreMismatch
+
+[3-sni-session-ticket-client-extra]
+ServerName = server1
# ===========================================================
@@ -192,9 +217,15 @@ VerifyMode = Peer
[test-4]
ExpectedResult = Success
ExpectedServerName = server2
-ServerName = server2
-ServerNameCallback = IgnoreMismatch
SessionTicketExpected = No
+server = 4-sni-session-ticket-server-extra
+client = 4-sni-session-ticket-client-extra
+
+[4-sni-session-ticket-server-extra]
+ServerNameCallback = IgnoreMismatch
+
+[4-sni-session-ticket-client-extra]
+ServerName = server2
# ===========================================================
@@ -228,9 +259,15 @@ VerifyMode = Peer
[test-5]
ExpectedResult = Success
ExpectedServerName = server1
-ServerName = server1
-ServerNameCallback = IgnoreMismatch
SessionTicketExpected = No
+server = 5-sni-session-ticket-server-extra
+client = 5-sni-session-ticket-client-extra
+
+[5-sni-session-ticket-server-extra]
+ServerNameCallback = IgnoreMismatch
+
+[5-sni-session-ticket-client-extra]
+ServerName = server1
# ===========================================================
@@ -264,9 +301,15 @@ VerifyMode = Peer
[test-6]
ExpectedResult = Success
ExpectedServerName = server2
-ServerName = server2
-ServerNameCallback = IgnoreMismatch
SessionTicketExpected = No
+server = 6-sni-session-ticket-server-extra
+client = 6-sni-session-ticket-client-extra
+
+[6-sni-session-ticket-server-extra]
+ServerNameCallback = IgnoreMismatch
+
+[6-sni-session-ticket-client-extra]
+ServerName = server2
# ===========================================================
@@ -300,9 +343,15 @@ VerifyMode = Peer
[test-7]
ExpectedResult = Success
ExpectedServerName = server1
-ServerName = server1
-ServerNameCallback = IgnoreMismatch
SessionTicketExpected = No
+server = 7-sni-session-ticket-server-extra
+client = 7-sni-session-ticket-client-extra
+
+[7-sni-session-ticket-server-extra]
+ServerNameCallback = IgnoreMismatch
+
+[7-sni-session-ticket-client-extra]
+ServerName = server1
# ===========================================================
@@ -336,9 +385,15 @@ VerifyMode = Peer
[test-8]
ExpectedResult = Success
ExpectedServerName = server2
-ServerName = server2
-ServerNameCallback = IgnoreMismatch
SessionTicketExpected = No
+server = 8-sni-session-ticket-server-extra
+client = 8-sni-session-ticket-client-extra
+
+[8-sni-session-ticket-server-extra]
+ServerNameCallback = IgnoreMismatch
+
+[8-sni-session-ticket-client-extra]
+ServerName = server2
# ===========================================================
@@ -372,9 +427,15 @@ VerifyMode = Peer
[test-9]
ExpectedResult = Success
ExpectedServerName = server1
-ServerName = server1
-ServerNameCallback = IgnoreMismatch
SessionTicketExpected = No
+server = 9-sni-session-ticket-server-extra
+client = 9-sni-session-ticket-client-extra
+
+[9-sni-session-ticket-server-extra]
+ServerNameCallback = IgnoreMismatch
+
+[9-sni-session-ticket-client-extra]
+ServerName = server1
# ===========================================================
@@ -408,9 +469,15 @@ VerifyMode = Peer
[test-10]
ExpectedResult = Success
ExpectedServerName = server2
-ServerName = server2
-ServerNameCallback = IgnoreMismatch
SessionTicketExpected = No
+server = 10-sni-session-ticket-server-extra
+client = 10-sni-session-ticket-client-extra
+
+[10-sni-session-ticket-server-extra]
+ServerNameCallback = IgnoreMismatch
+
+[10-sni-session-ticket-client-extra]
+ServerName = server2
# ===========================================================
@@ -444,9 +511,15 @@ VerifyMode = Peer
[test-11]
ExpectedResult = Success
ExpectedServerName = server1
-ServerName = server1
-ServerNameCallback = IgnoreMismatch
SessionTicketExpected = No
+server = 11-sni-session-ticket-server-extra
+client = 11-sni-session-ticket-client-extra
+
+[11-sni-session-ticket-server-extra]
+ServerNameCallback = IgnoreMismatch
+
+[11-sni-session-ticket-client-extra]
+ServerName = server1
# ===========================================================
@@ -480,9 +553,15 @@ VerifyMode = Peer
[test-12]
ExpectedResult = Success
ExpectedServerName = server2
-ServerName = server2
-ServerNameCallback = IgnoreMismatch
SessionTicketExpected = No
+server = 12-sni-session-ticket-server-extra
+client = 12-sni-session-ticket-client-extra
+
+[12-sni-session-ticket-server-extra]
+ServerNameCallback = IgnoreMismatch
+
+[12-sni-session-ticket-client-extra]
+ServerName = server2
# ===========================================================
@@ -516,9 +595,15 @@ VerifyMode = Peer
[test-13]
ExpectedResult = Success
ExpectedServerName = server1
-ServerName = server1
-ServerNameCallback = IgnoreMismatch
SessionTicketExpected = No
+server = 13-sni-session-ticket-server-extra
+client = 13-sni-session-ticket-client-extra
+
+[13-sni-session-ticket-server-extra]
+ServerNameCallback = IgnoreMismatch
+
+[13-sni-session-ticket-client-extra]
+ServerName = server1
# ===========================================================
@@ -552,9 +637,15 @@ VerifyMode = Peer
[test-14]
ExpectedResult = Success
ExpectedServerName = server2
-ServerName = server2
-ServerNameCallback = IgnoreMismatch
SessionTicketExpected = No
+server = 14-sni-session-ticket-server-extra
+client = 14-sni-session-ticket-client-extra
+
+[14-sni-session-ticket-server-extra]
+ServerNameCallback = IgnoreMismatch
+
+[14-sni-session-ticket-client-extra]
+ServerName = server2
# ===========================================================
@@ -588,9 +679,15 @@ VerifyMode = Peer
[test-15]
ExpectedResult = Success
ExpectedServerName = server1
-ServerName = server1
-ServerNameCallback = IgnoreMismatch
SessionTicketExpected = No
+server = 15-sni-session-ticket-server-extra
+client = 15-sni-session-ticket-client-extra
+
+[15-sni-session-ticket-server-extra]
+ServerNameCallback = IgnoreMismatch
+
+[15-sni-session-ticket-client-extra]
+ServerName = server1
# ===========================================================
@@ -624,8 +721,14 @@ VerifyMode = Peer
[test-16]
ExpectedResult = Success
ExpectedServerName = server2
-ServerName = server2
-ServerNameCallback = IgnoreMismatch
SessionTicketExpected = No
+server = 16-sni-session-ticket-server-extra
+client = 16-sni-session-ticket-client-extra
+
+[16-sni-session-ticket-server-extra]
+ServerNameCallback = IgnoreMismatch
+
+[16-sni-session-ticket-client-extra]
+ServerName = server2
diff --git a/test/ssl-tests/06-sni-ticket.conf.in b/test/ssl-tests/06-sni-ticket.conf.in
index 8c95827a52..ccb9cbdb7b 100644
--- a/test/ssl-tests/06-sni-ticket.conf.in
+++ b/test/ssl-tests/06-sni-ticket.conf.in
@@ -27,18 +27,22 @@ sub generate_tests() {
"name" => "sni-session-ticket",
"client" => {
"Options" => $c,
+ "extra" => {
+ "ServerName" => $n,
+ },
},
"server" => {
"Options" => $s1,
+ "extra" => {
+ # We don't test mismatch here.
+ "ServerNameCallback" => "IgnoreMismatch",
+ },
},
"server2" => {
"Options" => $s2,
},
"test" => {
- "ServerName" => $n,
"ExpectedServerName" => $n,
- # We don't test mismatch here.
- "ServerNameCallback" => "IgnoreMismatch",
"ExpectedResult" => "Success",
"SessionTicketExpected" => $result,
}
@@ -69,17 +73,22 @@ push @tests, {
"name" => "sni-session-ticket",
"client" => {
"Options" => "SessionTicket",
+ "extra" => {
+ "ServerName" => "server1",
+ }
},
"server" => {
"Options" => "SessionTicket",
+ "extra" => {
+ "BrokenSessionTicket" => "Yes",
+ },
},
"server2" => {
"Options" => "SessionTicket",
},
"test" => {
- "ServerName" => "server1",
"ExpectedResult" => "Success",
- "SessionTicketExpected" => "Broken",
+ "SessionTicketExpected" => "No",
}
};
diff --git a/test/ssl-tests/07-dtls-protocol-version.conf b/test/ssl-tests/07-dtls-protocol-version.conf
index df7e4df84a..3304a3bbaa 100644
--- a/test/ssl-tests/07-dtls-protocol-version.conf
+++ b/test/ssl-tests/07-dtls-protocol-version.conf
@@ -88,9 +88,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-0]
+ExpectedProtocol = DTLSv1
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1
# ===========================================================
@@ -115,9 +115,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-1]
+ExpectedProtocol = DTLSv1
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1
# ===========================================================
@@ -141,9 +141,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-2]
+ExpectedProtocol = DTLSv1
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1
# ===========================================================
@@ -169,9 +169,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-3]
+ExpectedProtocol = DTLSv1
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1
# ===========================================================
@@ -197,9 +197,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-4]
+ExpectedProtocol = DTLSv1
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1
# ===========================================================
@@ -224,9 +224,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-5]
+ExpectedProtocol = DTLSv1
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1
# ===========================================================
@@ -304,9 +304,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-8]
+ExpectedProtocol = DTLSv1
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1
# ===========================================================
@@ -331,9 +331,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-9]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -357,9 +357,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-10]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -385,9 +385,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-11]
+ExpectedProtocol = DTLSv1
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1
# ===========================================================
@@ -413,9 +413,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-12]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -440,9 +440,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-13]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -468,9 +468,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-14]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -495,9 +495,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-15]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -521,9 +521,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-16]
+ExpectedProtocol = DTLSv1
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1
# ===========================================================
@@ -547,9 +547,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-17]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -572,9 +572,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-18]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -599,9 +599,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-19]
+ExpectedProtocol = DTLSv1
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1
# ===========================================================
@@ -626,9 +626,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-20]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -652,9 +652,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-21]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -679,9 +679,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-22]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -705,9 +705,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-23]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -733,9 +733,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-24]
+ExpectedProtocol = DTLSv1
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1
# ===========================================================
@@ -761,9 +761,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-25]
+ExpectedProtocol = DTLSv1
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1
# ===========================================================
@@ -788,9 +788,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-26]
+ExpectedProtocol = DTLSv1
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1
# ===========================================================
@@ -817,9 +817,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-27]
+ExpectedProtocol = DTLSv1
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1
# ===========================================================
@@ -846,9 +846,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-28]
+ExpectedProtocol = DTLSv1
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1
# ===========================================================
@@ -874,9 +874,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-29]
+ExpectedProtocol = DTLSv1
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1
# ===========================================================
@@ -957,9 +957,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-32]
+ExpectedProtocol = DTLSv1
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1
# ===========================================================
@@ -985,9 +985,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-33]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -1012,9 +1012,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-34]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -1041,9 +1041,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-35]
+ExpectedProtocol = DTLSv1
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1
# ===========================================================
@@ -1070,9 +1070,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-36]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -1098,9 +1098,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-37]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -1127,9 +1127,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-38]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -1155,9 +1155,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-39]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -1182,9 +1182,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-40]
+ExpectedProtocol = DTLSv1
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1
# ===========================================================
@@ -1209,9 +1209,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-41]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -1235,9 +1235,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-42]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -1263,9 +1263,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-43]
+ExpectedProtocol = DTLSv1
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1
# ===========================================================
@@ -1291,9 +1291,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-44]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -1318,9 +1318,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-45]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -1346,9 +1346,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-46]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -1373,9 +1373,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-47]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -1428,9 +1428,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-49]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -1455,9 +1455,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-50]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -1512,9 +1512,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-52]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -1540,9 +1540,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-53]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -1569,9 +1569,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-54]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -1597,9 +1597,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-55]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -1650,9 +1650,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-57]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -1676,9 +1676,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-58]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -1731,9 +1731,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-60]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -1758,9 +1758,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-61]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -1786,9 +1786,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-62]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
# ===========================================================
@@ -1813,8 +1813,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-63]
+ExpectedProtocol = DTLSv1.2
ExpectedResult = Success
Method = DTLS
-Protocol = DTLSv1.2
diff --git a/test/ssl-tests/08-npn.conf b/test/ssl-tests/08-npn.conf
index 959b489295..97d1d9fe69 100644
--- a/test/ssl-tests/08-npn.conf
+++ b/test/ssl-tests/08-npn.conf
@@ -34,9 +34,15 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-0]
-ClientNPNProtocols = foo
ExpectedNPNProtocol = foo
-ServerNPNProtocols = foo
+server = 0-npn-simple-server-extra
+client = 0-npn-simple-client-extra
+
+[0-npn-simple-server-extra]
+NPNProtocols = foo
+
+[0-npn-simple-client-extra]
+NPNProtocols = foo
# ===========================================================
@@ -59,9 +65,15 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-1]
-ClientNPNProtocols = foo,bar
ExpectedNPNProtocol = bar
-ServerNPNProtocols = baz,bar
+server = 1-npn-client-finds-match-server-extra
+client = 1-npn-client-finds-match-client-extra
+
+[1-npn-client-finds-match-server-extra]
+NPNProtocols = baz,bar
+
+[1-npn-client-finds-match-client-extra]
+NPNProtocols = foo,bar
# ===========================================================
@@ -84,9 +96,15 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-2]
-ClientNPNProtocols = foo,bar
ExpectedNPNProtocol = bar
-ServerNPNProtocols = bar,foo
+server = 2-npn-client-honours-server-pref-server-extra
+client = 2-npn-client-honours-server-pref-client-extra
+
+[2-npn-client-honours-server-pref-server-extra]
+NPNProtocols = bar,foo
+
+[2-npn-client-honours-server-pref-client-extra]
+NPNProtocols = foo,bar
# ===========================================================
@@ -109,9 +127,15 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-3]
-ClientNPNProtocols = foo,bar
ExpectedNPNProtocol = foo
-ServerNPNProtocols = baz
+server = 3-npn-client-first-pref-on-mismatch-server-extra
+client = 3-npn-client-first-pref-on-mismatch-client-extra
+
+[3-npn-client-first-pref-on-mismatch-server-extra]
+NPNProtocols = baz
+
+[3-npn-client-first-pref-on-mismatch-client-extra]
+NPNProtocols = foo,bar
# ===========================================================
@@ -134,7 +158,10 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-4]
-ClientNPNProtocols = foo
+client = 4-npn-no-server-support-client-extra
+
+[4-npn-no-server-support-client-extra]
+NPNProtocols = foo
# ===========================================================
@@ -157,7 +184,10 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-5]
-ServerNPNProtocols = foo
+server = 5-npn-no-client-support-server-extra
+
+[5-npn-no-client-support-server-extra]
+NPNProtocols = foo
# ===========================================================
@@ -186,14 +216,23 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-6]
-ClientNPNProtocols = foo,bar
ExpectedNPNProtocol = foo
ExpectedServerName = server1
-Server2NPNProtocols = bar
-ServerNPNProtocols = foo
-ServerName = server1
+server = 6-npn-with-sni-no-context-switch-server-extra
+server2 = 6-npn-with-sni-no-context-switch-server2-extra
+client = 6-npn-with-sni-no-context-switch-client-extra
+
+[6-npn-with-sni-no-context-switch-server-extra]
+NPNProtocols = foo
ServerNameCallback = IgnoreMismatch
+[6-npn-with-sni-no-context-switch-server2-extra]
+NPNProtocols = bar
+
+[6-npn-with-sni-no-context-switch-client-extra]
+NPNProtocols = foo,bar
+ServerName = server1
+
# ===========================================================
@@ -221,14 +260,23 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-7]
-ClientNPNProtocols = foo,bar
ExpectedNPNProtocol = bar
ExpectedServerName = server2
-Server2NPNProtocols = bar
-ServerNPNProtocols = foo
-ServerName = server2
+server = 7-npn-with-sni-context-switch-server-extra
+server2 = 7-npn-with-sni-context-switch-server2-extra
+client = 7-npn-with-sni-context-switch-client-extra
+
+[7-npn-with-sni-context-switch-server-extra]
+NPNProtocols = foo
ServerNameCallback = IgnoreMismatch
+[7-npn-with-sni-context-switch-server2-extra]
+NPNProtocols = bar
+
+[7-npn-with-sni-context-switch-client-extra]
+NPNProtocols = foo,bar
+ServerName = server2
+
# ===========================================================
@@ -256,13 +304,22 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-8]
-ClientNPNProtocols = foo,bar
ExpectedNPNProtocol = bar
ExpectedServerName = server2
-Server2NPNProtocols = bar
-ServerName = server2
+server = 8-npn-selected-sni-server-supports-npn-server-extra
+server2 = 8-npn-selected-sni-server-supports-npn-server2-extra
+client = 8-npn-selected-sni-server-supports-npn-client-extra
+
+[8-npn-selected-sni-server-supports-npn-server-extra]
ServerNameCallback = IgnoreMismatch
+[8-npn-selected-sni-server-supports-npn-server2-extra]
+NPNProtocols = bar
+
+[8-npn-selected-sni-server-supports-npn-client-extra]
+NPNProtocols = foo,bar
+ServerName = server2
+
# ===========================================================
@@ -290,12 +347,18 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-9]
-ClientNPNProtocols = foo,bar
ExpectedServerName = server2
-ServerNPNProtocols = foo
-ServerName = server2
+server = 9-npn-selected-sni-server-does-not-support-npn-server-extra
+client = 9-npn-selected-sni-server-does-not-support-npn-client-extra
+
+[9-npn-selected-sni-server-does-not-support-npn-server-extra]
+NPNProtocols = bar
ServerNameCallback = IgnoreMismatch
+[9-npn-selected-sni-server-does-not-support-npn-client-extra]
+NPNProtocols = foo,bar
+ServerName = server2
+
# ===========================================================
@@ -317,11 +380,17 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-10]
-ClientALPNProtocols = foo
-ClientNPNProtocols = bar
ExpectedALPNProtocol = foo
-ServerALPNProtocols = foo
-ServerNPNProtocols = bar
+server = 10-alpn-preferred-over-npn-server-extra
+client = 10-alpn-preferred-over-npn-client-extra
+
+[10-alpn-preferred-over-npn-server-extra]
+ALPNProtocols = foo
+NPNProtocols = bar
+
+[10-alpn-preferred-over-npn-client-extra]
+ALPNProtocols = foo
+NPNProtocols = bar
# ===========================================================
@@ -350,13 +419,22 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-11]
-ClientALPNProtocols = foo
-ClientNPNProtocols = bar
ExpectedNPNProtocol = bar
ExpectedServerName = server2
-Server2NPNProtocols = bar
-ServerALPNProtocols = foo
-ServerName = server2
+server = 11-sni-npn-preferred-over-alpn-server-extra
+server2 = 11-sni-npn-preferred-over-alpn-server2-extra
+client = 11-sni-npn-preferred-over-alpn-client-extra
+
+[11-sni-npn-preferred-over-alpn-server-extra]
+ALPNProtocols = foo
ServerNameCallback = IgnoreMismatch
+[11-sni-npn-preferred-over-alpn-server2-extra]
+NPNProtocols = bar
+
+[11-sni-npn-preferred-over-alpn-client-extra]
+ALPNProtocols = foo
+NPNProtocols = bar
+ServerName = server2
+
diff --git a/test/ssl-tests/08-npn.conf.in b/test/ssl-tests/08-npn.conf.in
index 9b0dcba999..56ccaea1f0 100644
--- a/test/ssl-tests/08-npn.conf.in
+++ b/test/ssl-tests/08-npn.conf.in
@@ -18,148 +18,226 @@ package ssltests;
our @tests = (
{
name => "npn-simple",
- server => { },
- client => { },
+ server => {
+ extra => {
+ "NPNProtocols" => "foo",
+ },
+ },
+ client => {
+ extra => {
+ "NPNProtocols" => "foo",
+ },
+ },
test => {
- "ClientNPNProtocols" => "foo",
- "ServerNPNProtocols" => "foo",
"ExpectedNPNProtocol" => "foo",
},
},
{
name => "npn-client-finds-match",
- server => { },
- client => { },
+ server => {
+ extra => {
+ "NPNProtocols" => "baz,bar",
+ },
+ },
+ client => {
+ extra => {
+ "NPNProtocols" => "foo,bar",
+ },
+ },
test => {
- "ClientNPNProtocols" => "foo,bar",
- "ServerNPNProtocols" => "baz,bar",
"ExpectedNPNProtocol" => "bar",
},
},
{
name => "npn-client-honours-server-pref",
- server => { },
- client => { },
+ server => {
+ extra => {
+ "NPNProtocols" => "bar,foo",
+ },
+ },
+ client => {
+ extra => {
+ "NPNProtocols" => "foo,bar",
+ },
+ },
test => {
- "ClientNPNProtocols" => "foo,bar",
- "ServerNPNProtocols" => "bar,foo",
"ExpectedNPNProtocol" => "bar",
},
},
{
name => "npn-client-first-pref-on-mismatch",
- server => { },
- client => { },
+ server => {
+ extra => {
+ "NPNProtocols" => "baz",
+ },
+ },
+ client => {
+ extra => {
+ "NPNProtocols" => "foo,bar",
+ },
+ },
test => {
- "ClientNPNProtocols" => "foo,bar",
- "ServerNPNProtocols" => "baz",
"ExpectedNPNProtocol" => "foo",
},
},
{
name => "npn-no-server-support",
server => { },
- client => { },
+ client => {
+ extra => {
+ "NPNProtocols" => "foo",
+ },
+ },
test => {
- "ClientNPNProtocols" => "foo",
"ExpectedNPNProtocol" => undef,
},
},
{
name => "npn-no-client-support",
- server => { },
+ server => {
+ extra => {
+ "NPNProtocols" => "foo",
+ },
+ },
client => { },
test => {
- "ServerNPNProtocols" => "foo",
"ExpectedNPNProtocol" => undef,
},
},
{
name => "npn-with-sni-no-context-switch",
- server => { },
- server2 => { },
- client => { },
+ server => {
+ extra => {
+ "NPNProtocols" => "foo",
+ "ServerNameCallback" => "IgnoreMismatch",
+ },
+ },
+ server2 => {
+ extra => {
+ "NPNProtocols" => "bar",
+ },
+ },
+ client => {
+ extra => {
+ "NPNProtocols" => "foo,bar",
+ "ServerName" => "server1",
+ },
+ },
test => {
- "ClientNPNProtocols" => "foo,bar",
- "ServerNPNProtocols" => "foo",
- "Server2NPNProtocols" => "bar",
- "ServerName" => "server1",
- "ServerNameCallback" => "IgnoreMismatch",
"ExpectedServerName" => "server1",
"ExpectedNPNProtocol" => "foo",
},
},
{
name => "npn-with-sni-context-switch",
- server => { },
- server2 => { },
- client => { },
+ server => {
+ extra => {
+ "NPNProtocols" => "foo",
+ "ServerNameCallback" => "IgnoreMismatch",
+ },
+ },
+ server2 => {
+ extra => {
+ "NPNProtocols" => "bar",
+ },
+ },
+ client => {
+ extra => {
+ "NPNProtocols" => "foo,bar",
+ "ServerName" => "server2",
+ },
+ },
test => {
- "ClientNPNProtocols" => "foo,bar",
- "ServerNPNProtocols" => "foo",
- "Server2NPNProtocols" => "bar",
- "ServerName" => "server2",
- "ServerNameCallback" => "IgnoreMismatch",
"ExpectedServerName" => "server2",
"ExpectedNPNProtocol" => "bar",
},
},
{
name => "npn-selected-sni-server-supports-npn",
- server => { },
- server2 => { },
- client => { },
+ server => {
+ extra => {
+ "ServerNameCallback" => "IgnoreMismatch",
+ },
+ },
+ server2 => {
+ extra => {
+ "NPNProtocols" => "bar",
+ },
+ },
+ client => {
+ extra => {
+ "NPNProtocols" => "foo,bar",
+ "ServerName" => "server2",
+ },
+ },
test => {
- "ClientNPNProtocols" => "foo,bar",
- "Server2NPNProtocols" => "bar",
- "ServerName" => "server2",
- "ServerNameCallback" => "IgnoreMismatch",
"ExpectedServerName" => "server2",
"ExpectedNPNProtocol" => "bar",
},
},
{
name => "npn-selected-sni-server-does-not-support-npn",
- server => { },
+ server => {
+ extra => {
+ "NPNProtocols" => "bar",
+ "ServerNameCallback" => "IgnoreMismatch",
+ },
+ },
server2 => { },
- client => { },
+ client => {
+ extra => {
+ "NPNProtocols" => "foo,bar",
+ "ServerName" => "server2",
+ },
+ },
test => {
- "ClientNPNProtocols" => "foo,bar",
- "ServerNPNProtocols" => "foo",
- "ServerName" => "server2",
- "ServerNameCallback" => "IgnoreMismatch",
"ExpectedServerName" => "server2",
"ExpectedNPNProtocol" => undef,
},
},
{
name => "alpn-preferred-over-npn",
- server => { },
- client => { },
+ server => {
+ extra => {
+ "ALPNProtocols" => "foo",
+ "NPNProtocols" => "bar",
+ },
+ },
+ client => {
+ extra => {
+ "ALPNProtocols" => "foo",
+ "NPNProtocols" => "bar",
+ },
+ },
test => {
- "ClientALPNProtocols" => "foo",
- "ClientNPNProtocols" => "bar",
- "ServerALPNProtocols" => "foo",
- "ServerNPNProtocols" => "bar",
"ExpectedALPNProtocol" => "foo",
"ExpectedNPNProtocol" => undef,
},
},
{
name => "sni-npn-preferred-over-alpn",
- server => { },
- server2 => { },
- client => { },
+ server => {
+ extra => {
+ "ServerNameCallback" => "IgnoreMismatch",
+ "ALPNProtocols" => "foo",
+ },
+ },
+ server2 => {
+ extra => {
+ "NPNProtocols" => "bar",
+ },
+ },
+ client => {
+ extra => {
+ "ServerName" => "server2",
+ "ALPNProtocols" => "foo",
+ "NPNProtocols" => "bar",
+ },
+ },
test => {
- "ClientALPNProtocols" => "foo",
- "ClientNPNProtocols" => "bar",
- "ServerALPNProtocols" => "foo",
- "Server2NPNProtocols" => "bar",
- "ServerName" => "server2",
- "ServerNameCallback" => "IgnoreMismatch",
- "ExpectedServerName" => "server2",
"ExpectedALPNProtocol" => undef,
"ExpectedNPNProtocol" => "bar",
+ "ExpectedServerName" => "server2",
},
},
);
diff --git a/test/ssl-tests/09-alpn.conf b/test/ssl-tests/09-alpn.conf
index 10ddc6036b..58ddff3ab9 100644
--- a/test/ssl-tests/09-alpn.conf
+++ b/test/ssl-tests/09-alpn.conf
@@ -3,8 +3,8 @@
num_tests = 10
test-0 = 0-alpn-simple
-test-1 = 1-alpn-client-finds-match
-test-2 = 2-alpn-client-honours-server-pref
+test-1 = 1-alpn-server-finds-match
+test-2 = 2-alpn-server-honours-server-pref
test-3 = 3-alpn-alert-on-mismatch
test-4 = 4-alpn-no-server-support
test-5 = 5-alpn-no-client-support
@@ -32,59 +32,77 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-0]
-ClientALPNProtocols = foo
ExpectedALPNProtocol = foo
-ServerALPNProtocols = foo
+server = 0-alpn-simple-server-extra
+client = 0-alpn-simple-client-extra
+
+[0-alpn-simple-server-extra]
+ALPNProtocols = foo
+
+[0-alpn-simple-client-extra]
+ALPNProtocols = foo
# ===========================================================
-[1-alpn-client-finds-match]
-ssl_conf = 1-alpn-client-finds-match-ssl
+[1-alpn-server-finds-match]
+ssl_conf = 1-alpn-server-finds-match-ssl
-[1-alpn-client-finds-match-ssl]
-server = 1-alpn-client-finds-match-server
-client = 1-alpn-client-finds-match-client
+[1-alpn-server-finds-match-ssl]
+server = 1-alpn-server-finds-match-server
+client = 1-alpn-server-finds-match-client
-[1-alpn-client-finds-match-server]
+[1-alpn-server-finds-match-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[1-alpn-client-finds-match-client]
+[1-alpn-server-finds-match-client]
CipherString = DEFAULT
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-1]
-ClientALPNProtocols = foo,bar
ExpectedALPNProtocol = bar
-ServerALPNProtocols = baz,bar
+server = 1-alpn-server-finds-match-server-extra
+client = 1-alpn-server-finds-match-client-extra
+
+[1-alpn-server-finds-match-server-extra]
+ALPNProtocols = baz,bar
+
+[1-alpn-server-finds-match-client-extra]
+ALPNProtocols = foo,bar
# ===========================================================
-[2-alpn-client-honours-server-pref]
-ssl_conf = 2-alpn-client-honours-server-pref-ssl
+[2-alpn-server-honours-server-pref]
+ssl_conf = 2-alpn-server-honours-server-pref-ssl
-[2-alpn-client-honours-server-pref-ssl]
-server = 2-alpn-client-honours-server-pref-server
-client = 2-alpn-client-honours-server-pref-client
+[2-alpn-server-honours-server-pref-ssl]
+server = 2-alpn-server-honours-server-pref-server
+client = 2-alpn-server-honours-server-pref-client
-[2-alpn-client-honours-server-pref-server]
+[2-alpn-server-honours-server-pref-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[2-alpn-client-honours-server-pref-client]
+[2-alpn-server-honours-server-pref-client]
CipherString = DEFAULT
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-2]
-ClientALPNProtocols = foo,bar
ExpectedALPNProtocol = bar
-ServerALPNProtocols = bar,foo
+server = 2-alpn-server-honours-server-pref-server-extra
+client = 2-alpn-server-honours-server-pref-client-extra
+
+[2-alpn-server-honours-server-pref-server-extra]
+ALPNProtocols = bar,foo
+
+[2-alpn-server-honours-server-pref-client-extra]
+ALPNProtocols = foo,bar
# ===========================================================
@@ -107,10 +125,16 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-3]
-ClientALPNProtocols = foo,bar
ExpectedResult = ServerFail
-ServerALPNProtocols = baz
-ServerAlert = NoApplicationProtocol
+ExpectedServerAlert = NoApplicationProtocol
+server = 3-alpn-alert-on-mismatch-server-extra
+client = 3-alpn-alert-on-mismatch-client-extra
+
+[3-alpn-alert-on-mismatch-server-extra]
+ALPNProtocols = baz
+
+[3-alpn-alert-on-mismatch-client-extra]
+ALPNProtocols = foo,bar
# ===========================================================
@@ -133,7 +157,10 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-4]
-ClientALPNProtocols = foo
+client = 4-alpn-no-server-support-client-extra
+
+[4-alpn-no-server-support-client-extra]
+ALPNProtocols = foo
# ===========================================================
@@ -156,7 +183,10 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-5]
-ServerALPNProtocols = foo
+server = 5-alpn-no-client-support-server-extra
+
+[5-alpn-no-client-support-server-extra]
+ALPNProtocols = foo
# ===========================================================
@@ -185,14 +215,23 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-6]
-ClientALPNProtocols = foo,bar
ExpectedALPNProtocol = foo
ExpectedServerName = server1
-Server2ALPNProtocols = bar
-ServerALPNProtocols = foo
-ServerName = server1
+server = 6-alpn-with-sni-no-context-switch-server-extra
+server2 = 6-alpn-with-sni-no-context-switch-server2-extra
+client = 6-alpn-with-sni-no-context-switch-client-extra
+
+[6-alpn-with-sni-no-context-switch-server-extra]
+ALPNProtocols = foo
ServerNameCallback = IgnoreMismatch
+[6-alpn-with-sni-no-context-switch-server2-extra]
+ALPNProtocols = bar
+
+[6-alpn-with-sni-no-context-switch-client-extra]
+ALPNProtocols = foo,bar
+ServerName = server1
+
# ===========================================================
@@ -220,14 +259,23 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-7]
-ClientALPNProtocols = foo,bar
ExpectedALPNProtocol = bar
ExpectedServerName = server2
-Server2ALPNProtocols = bar
-ServerALPNProtocols = foo
-ServerName = server2
+server = 7-alpn-with-sni-context-switch-server-extra
+server2 = 7-alpn-with-sni-context-switch-server2-extra
+client = 7-alpn-with-sni-context-switch-client-extra
+
+[7-alpn-with-sni-context-switch-server-extra]
+ALPNProtocols = foo
ServerNameCallback = IgnoreMismatch
+[7-alpn-with-sni-context-switch-server2-extra]
+ALPNProtocols = bar
+
+[7-alpn-with-sni-context-switch-client-extra]
+ALPNProtocols = foo,bar
+ServerName = server2
+
# ===========================================================
@@ -255,13 +303,22 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-8]
-ClientALPNProtocols = foo,bar
ExpectedALPNProtocol = bar
ExpectedServerName = server2
-Server2ALPNProtocols = bar
-ServerName = server2
+server = 8-alpn-selected-sni-server-supports-alpn-server-extra
+server2 = 8-alpn-selected-sni-server-supports-alpn-server2-extra
+client = 8-alpn-selected-sni-server-supports-alpn-client-extra
+
+[8-alpn-selected-sni-server-supports-alpn-server-extra]
ServerNameCallback = IgnoreMismatch
+[8-alpn-selected-sni-server-supports-alpn-server2-extra]
+ALPNProtocols = bar
+
+[8-alpn-selected-sni-server-supports-alpn-client-extra]
+ALPNProtocols = foo,bar
+ServerName = server2
+
# ===========================================================
@@ -289,10 +346,16 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-9]
-ClientALPNProtocols = foo,bar
ExpectedServerName = server2
-ServerALPNProtocols = foo
-ServerName = server2
+server = 9-alpn-selected-sni-server-does-not-support-alpn-server-extra
+client = 9-alpn-selected-sni-server-does-not-support-alpn-client-extra
+
+[9-alpn-selected-sni-server-does-not-support-alpn-server-extra]
+ALPNProtocols = bar
ServerNameCallback = IgnoreMismatch
+[9-alpn-selected-sni-server-does-not-support-alpn-client-extra]
+ALPNProtocols = foo,bar
+ServerName = server2
+
diff --git a/test/ssl-tests/09-alpn.conf.in b/test/ssl-tests/09-alpn.conf.in
index 2a7b1f97c2..c637b3a11c 100644
--- a/test/ssl-tests/09-alpn.conf.in
+++ b/test/ssl-tests/09-alpn.conf.in
@@ -18,117 +18,180 @@ package ssltests;
our @tests = (
{
name => "alpn-simple",
- server => { },
- client => { },
+ server => {
+ extra => {
+ "ALPNProtocols" => "foo",
+ },
+ },
+ client => {
+ extra => {
+ "ALPNProtocols" => "foo",
+ },
+ },
test => {
- "ClientALPNProtocols" => "foo",
- "ServerALPNProtocols" => "foo",
"ExpectedALPNProtocol" => "foo",
},
},
{
- name => "alpn-client-finds-match",
- server => { },
- client => { },
+ name => "alpn-server-finds-match",
+ server => {
+ extra => {
+ "ALPNProtocols" => "baz,bar",
+ },
+ },
+ client => {
+ extra => {
+ "ALPNProtocols" => "foo,bar",
+ },
+ },
test => {
- "ClientALPNProtocols" => "foo,bar",
- "ServerALPNProtocols" => "baz,bar",
"ExpectedALPNProtocol" => "bar",
},
},
{
- name => "alpn-client-honours-server-pref",
- server => { },
- client => { },
+ name => "alpn-server-honours-server-pref",
+ server => {
+ extra => {
+ "ALPNProtocols" => "bar,foo",
+ },
+ },
+ client => {
+ extra => {
+ "ALPNProtocols" => "foo,bar",
+ },
+ },
test => {
- "ClientALPNProtocols" => "foo,bar",
- "ServerALPNProtocols" => "bar,foo",
"ExpectedALPNProtocol" => "bar",
},
},
{
name => "alpn-alert-on-mismatch",
- server => { },
- client => { },
+ server => {
+ extra => {
+ "ALPNProtocols" => "baz",
+ },
+ },
+ client => {
+ extra => {
+ "ALPNProtocols" => "foo,bar",
+ },
+ },
test => {
- "ClientALPNProtocols" => "foo,bar",
- "ServerALPNProtocols" => "baz",
"ExpectedResult" => "ServerFail",
- "ServerAlert" => "NoApplicationProtocol",
+ "ExpectedServerAlert" => "NoApplicationProtocol",
},
},
{
name => "alpn-no-server-support",
server => { },
- client => { },
+ client => {
+ extra => {
+ "ALPNProtocols" => "foo",
+ },
+ },
test => {
- "ClientALPNProtocols" => "foo",
"ExpectedALPNProtocol" => undef,
},
},
{
name => "alpn-no-client-support",
- server => { },
+ server => {
+ extra => {
+ "ALPNProtocols" => "foo",
+ },
+ },
client => { },
test => {
- "ServerALPNProtocols" => "foo",
"ExpectedALPNProtocol" => undef,
},
},
{
name => "alpn-with-sni-no-context-switch",
- server => { },
- server2 => { },
- client => { },
+ server => {
+ extra => {
+ "ALPNProtocols" => "foo",
+ "ServerNameCallback" => "IgnoreMismatch",
+ },
+ },
+ server2 => {
+ extra => {
+ "ALPNProtocols" => "bar",
+ },
+ },
+ client => {
+ extra => {
+ "ALPNProtocols" => "foo,bar",
+ "ServerName" => "server1",
+ },
+ },
test => {
- "ClientALPNProtocols" => "foo,bar",
- "ServerALPNProtocols" => "foo",
- "Server2ALPNProtocols" => "bar",
- "ServerName" => "server1",
- "ServerNameCallback" => "IgnoreMismatch",
"ExpectedServerName" => "server1",
"ExpectedALPNProtocol" => "foo",
},
},
{
name => "alpn-with-sni-context-switch",
- server => { },
- server2 => { },
- client => { },
+ server => {
+ extra => {
+ "ALPNProtocols" => "foo",
+ "ServerNameCallback" => "IgnoreMismatch",
+ },
+ },
+ server2 => {
+ extra => {
+ "ALPNProtocols" => "bar",
+ },
+ },
+ client => {
+ extra => {
+ "ALPNProtocols" => "foo,bar",
+ "ServerName" => "server2",
+ },
+ },
test => {
- "ClientALPNProtocols" => "foo,bar",
- "ServerALPNProtocols" => "foo",
- "Server2ALPNProtocols" => "bar",
- "ServerName" => "server2",
- "ServerNameCallback" => "IgnoreMismatch",
"ExpectedServerName" => "server2",
"ExpectedALPNProtocol" => "bar",
},
},
{
name => "alpn-selected-sni-server-supports-alpn",
- server => { },
- server2 => { },
- client => { },
+ server => {
+ extra => {
+ "ServerNameCallback" => "IgnoreMismatch",
+ },
+ },
+ server2 => {
+ extra => {
+ "ALPNProtocols" => "bar",
+ },
+ },
+ client => {
+ extra => {
+ "ALPNProtocols" => "foo,bar",
+ "ServerName" => "server2",
+ },
+ },
test => {
- "ClientALPNProtocols" => "foo,bar",
- "Server2ALPNProtocols" => "bar",
- "ServerName" => "server2",
- "ServerNameCallback" => "IgnoreMismatch",
"ExpectedServerName" => "server2",
"ExpectedALPNProtocol" => "bar",
},
},
{
name => "alpn-selected-sni-server-does-not-support-alpn",
- server => { },
+ server => {
+ extra => {
+ "ALPNProtocols" => "bar",
+ "ServerNameCallback" => "IgnoreMismatch",
+ },
+ },
server2 => { },
- client => { },
+ client => {
+ extra => {
+ "ALPNProtocols" => "foo,bar",
+ "ServerName" => "server2",
+ },
+ },
test => {
- "ClientALPNProtocols" => "foo,bar",
- "ServerALPNProtocols" => "foo",
- "ServerName" => "server2",
- "ServerNameCallback" => "IgnoreMismatch",
"ExpectedServerName" => "server2",
"ExpectedALPNProtocol" => undef,
},
diff --git a/test/ssl-tests/10-resumption.conf b/test/ssl-tests/10-resumption.conf
index 2410cd0924..b2deee4209 100644
--- a/test/ssl-tests/10-resumption.conf
+++ b/test/ssl-tests/10-resumption.conf
@@ -69,8 +69,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-0]
+ExpectedProtocol = TLSv1
HandshakeMode = Resume
-Protocol = TLSv1
ResumptionExpected = Yes
@@ -105,8 +105,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-1]
+ExpectedProtocol = TLSv1
HandshakeMode = Resume
-Protocol = TLSv1
ResumptionExpected = Yes
@@ -141,8 +141,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-2]
+ExpectedProtocol = TLSv1.1
HandshakeMode = Resume
-Protocol = TLSv1.1
ResumptionExpected = No
@@ -177,8 +177,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-3]
+ExpectedProtocol = TLSv1.1
HandshakeMode = Resume
-Protocol = TLSv1.1
ResumptionExpected = No
@@ -213,8 +213,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-4]
+ExpectedProtocol = TLSv1.2
HandshakeMode = Resume
-Protocol = TLSv1.2
ResumptionExpected = No
@@ -249,8 +249,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-5]
+ExpectedProtocol = TLSv1.2
HandshakeMode = Resume
-Protocol = TLSv1.2
ResumptionExpected = No
@@ -285,8 +285,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-6]
+ExpectedProtocol = TLSv1
HandshakeMode = Resume
-Protocol = TLSv1
ResumptionExpected = No
@@ -321,8 +321,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-7]
+ExpectedProtocol = TLSv1
HandshakeMode = Resume
-Protocol = TLSv1
ResumptionExpected = No
@@ -357,8 +357,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-8]
+ExpectedProtocol = TLSv1.1
HandshakeMode = Resume
-Protocol = TLSv1.1
ResumptionExpected = Yes
@@ -393,8 +393,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-9]
+ExpectedProtocol = TLSv1.1
HandshakeMode = Resume
-Protocol = TLSv1.1
ResumptionExpected = Yes
@@ -429,8 +429,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-10]
+ExpectedProtocol = TLSv1.2
HandshakeMode = Resume
-Protocol = TLSv1.2
ResumptionExpected = No
@@ -465,8 +465,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-11]
+ExpectedProtocol = TLSv1.2
HandshakeMode = Resume
-Protocol = TLSv1.2
ResumptionExpected = No
@@ -501,8 +501,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-12]
+ExpectedProtocol = TLSv1
HandshakeMode = Resume
-Protocol = TLSv1
ResumptionExpected = No
@@ -537,8 +537,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-13]
+ExpectedProtocol = TLSv1
HandshakeMode = Resume
-Protocol = TLSv1
ResumptionExpected = No
@@ -573,8 +573,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-14]
+ExpectedProtocol = TLSv1.1
HandshakeMode = Resume
-Protocol = TLSv1.1
ResumptionExpected = No
@@ -609,8 +609,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-15]
+ExpectedProtocol = TLSv1.1
HandshakeMode = Resume
-Protocol = TLSv1.1
ResumptionExpected = No
@@ -645,8 +645,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-16]
+ExpectedProtocol = TLSv1.2
HandshakeMode = Resume
-Protocol = TLSv1.2
ResumptionExpected = Yes
@@ -681,8 +681,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-17]
+ExpectedProtocol = TLSv1.2
HandshakeMode = Resume
-Protocol = TLSv1.2
ResumptionExpected = Yes
@@ -717,8 +717,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-18]
+ExpectedProtocol = TLSv1
HandshakeMode = Resume
-Protocol = TLSv1
ResumptionExpected = Yes
@@ -753,8 +753,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-19]
+ExpectedProtocol = TLSv1
HandshakeMode = Resume
-Protocol = TLSv1
ResumptionExpected = Yes
@@ -789,8 +789,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-20]
+ExpectedProtocol = TLSv1.1
HandshakeMode = Resume
-Protocol = TLSv1.1
ResumptionExpected = No
@@ -825,8 +825,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-21]
+ExpectedProtocol = TLSv1.1
HandshakeMode = Resume
-Protocol = TLSv1.1
ResumptionExpected = No
@@ -861,8 +861,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-22]
+ExpectedProtocol = TLSv1.2
HandshakeMode = Resume
-Protocol = TLSv1.2
ResumptionExpected = No
@@ -897,8 +897,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-23]
+ExpectedProtocol = TLSv1.2
HandshakeMode = Resume
-Protocol = TLSv1.2
ResumptionExpected = No
@@ -933,8 +933,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-24]
+ExpectedProtocol = TLSv1
HandshakeMode = Resume
-Protocol = TLSv1
ResumptionExpected = No
@@ -969,8 +969,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-25]
+ExpectedProtocol = TLSv1
HandshakeMode = Resume
-Protocol = TLSv1
ResumptionExpected = No
@@ -1005,8 +1005,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-26]
+ExpectedProtocol = TLSv1.1
HandshakeMode = Resume
-Protocol = TLSv1.1
ResumptionExpected = Yes
@@ -1041,8 +1041,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-27]
+ExpectedProtocol = TLSv1.1
HandshakeMode = Resume
-Protocol = TLSv1.1
ResumptionExpected = Yes
@@ -1077,8 +1077,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-28]
+ExpectedProtocol = TLSv1.2
HandshakeMode = Resume
-Protocol = TLSv1.2
ResumptionExpected = No
@@ -1113,8 +1113,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-29]
+ExpectedProtocol = TLSv1.2
HandshakeMode = Resume
-Protocol = TLSv1.2
ResumptionExpected = No
@@ -1149,8 +1149,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-30]
+ExpectedProtocol = TLSv1
HandshakeMode = Resume
-Protocol = TLSv1
ResumptionExpected = No
@@ -1185,8 +1185,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-31]
+ExpectedProtocol = TLSv1
HandshakeMode = Resume
-Protocol = TLSv1
ResumptionExpected = No
@@ -1221,8 +1221,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-32]
+ExpectedProtocol = TLSv1.1
HandshakeMode = Resume
-Protocol = TLSv1.1
ResumptionExpected = No
@@ -1257,8 +1257,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-33]
+ExpectedProtocol = TLSv1.1
HandshakeMode = Resume
-Protocol = TLSv1.1
ResumptionExpected = No
@@ -1293,8 +1293,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-34]
+ExpectedProtocol = TLSv1.2
HandshakeMode = Resume
-Protocol = TLSv1.2
ResumptionExpected = Yes
@@ -1329,8 +1329,8 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-35]
+ExpectedProtocol = TLSv1.2
HandshakeMode = Resume
-Protocol = TLSv1.2
ResumptionExpected = Yes
diff --git a/test/ssl-tests/11-dtls_resumption.conf b/test/ssl-tests/11-dtls_resumption.conf
index 0822f1e467..ceed959744 100644
--- a/test/ssl-tests/11-dtls_resumption.conf
+++ b/test/ssl-tests/11-dtls_resumption.conf
@@ -49,9 +49,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-0]
+ExpectedProtocol = DTLSv1
HandshakeMode = Resume
Method = DTLS
-Protocol = DTLSv1
ResumptionExpected = Yes
@@ -86,9 +86,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-1]
+ExpectedProtocol = DTLSv1
HandshakeMode = Resume
Method = DTLS
-Protocol = DTLSv1
ResumptionExpected = Yes
@@ -123,9 +123,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-2]
+ExpectedProtocol = DTLSv1.2
HandshakeMode = Resume
Method = DTLS
-Protocol = DTLSv1.2
ResumptionExpected = No
@@ -160,9 +160,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-3]
+ExpectedProtocol = DTLSv1.2
HandshakeMode = Resume
Method = DTLS
-Protocol = DTLSv1.2
ResumptionExpected = No
@@ -197,9 +197,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-4]
+ExpectedProtocol = DTLSv1
HandshakeMode = Resume
Method = DTLS
-Protocol = DTLSv1
ResumptionExpected = No
@@ -234,9 +234,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-5]
+ExpectedProtocol = DTLSv1
HandshakeMode = Resume
Method = DTLS
-Protocol = DTLSv1
ResumptionExpected = No
@@ -271,9 +271,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-6]
+ExpectedProtocol = DTLSv1.2
HandshakeMode = Resume
Method = DTLS
-Protocol = DTLSv1.2
ResumptionExpected = Yes
@@ -308,9 +308,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-7]
+ExpectedProtocol = DTLSv1.2
HandshakeMode = Resume
Method = DTLS
-Protocol = DTLSv1.2
ResumptionExpected = Yes
@@ -345,9 +345,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-8]
+ExpectedProtocol = DTLSv1
HandshakeMode = Resume
Method = DTLS
-Protocol = DTLSv1
ResumptionExpected = Yes
@@ -382,9 +382,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-9]
+ExpectedProtocol = DTLSv1
HandshakeMode = Resume
Method = DTLS
-Protocol = DTLSv1
ResumptionExpected = Yes
@@ -419,9 +419,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-10]
+ExpectedProtocol = DTLSv1.2
HandshakeMode = Resume
Method = DTLS
-Protocol = DTLSv1.2
ResumptionExpected = No
@@ -456,9 +456,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-11]
+ExpectedProtocol = DTLSv1.2
HandshakeMode = Resume
Method = DTLS
-Protocol = DTLSv1.2
ResumptionExpected = No
@@ -493,9 +493,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-12]
+ExpectedProtocol = DTLSv1
HandshakeMode = Resume
Method = DTLS
-Protocol = DTLSv1
ResumptionExpected = No
@@ -530,9 +530,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-13]
+ExpectedProtocol = DTLSv1
HandshakeMode = Resume
Method = DTLS
-Protocol = DTLSv1
ResumptionExpected = No
@@ -567,9 +567,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-14]
+ExpectedProtocol = DTLSv1.2
HandshakeMode = Resume
Method = DTLS
-Protocol = DTLSv1.2
ResumptionExpected = Yes
@@ -604,9 +604,9 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-15]
+ExpectedProtocol = DTLSv1.2
HandshakeMode = Resume
Method = DTLS
-Protocol = DTLSv1.2
ResumptionExpected = Yes
diff --git a/test/ssl-tests/protocol_version.pm b/test/ssl-tests/protocol_version.pm
index 059b1d059e..c711362949 100644
--- a/test/ssl-tests/protocol_version.pm
+++ b/test/ssl-tests/protocol_version.pm
@@ -117,7 +117,7 @@ sub generate_version_tests {
},
"test" => {
"ExpectedResult" => $result,
- "Protocol" => $protocol,
+ "ExpectedProtocol" => $protocol,
"Method" => $method,
}
};
@@ -172,7 +172,7 @@ sub generate_resumption_tests {
"MaxProtocol" => $protocols[$resume_protocol],
},
"test" => {
- "Protocol" => $protocols[$resume_protocol],
+ "ExpectedProtocol" => $protocols[$resume_protocol],
"Method" => $method,
"HandshakeMode" => "Resume",
"ResumptionExpected" => $resumption_expected,
@@ -192,7 +192,7 @@ sub generate_resumption_tests {
"MaxProtocol" => $protocols[$resume_protocol],
},
"test" => {
- "Protocol" => $protocols[$resume_protocol],
+ "ExpectedProtocol" => $protocols[$resume_protocol],
"Method" => $method,
"HandshakeMode" => "Resume",
"ResumptionExpected" => $resumption_expected,
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-22 05:52:18 +0000