diff options
author | Emilia Kasper <emilia@openssl.org> | 2016-06-13 17:46:12 +0200 |
---|---|---|
committer | Emilia Kasper <emilia@openssl.org> | 2016-06-13 18:31:33 +0200 |
commit | b02929802c1fc47daf268ec208ee113dcce3ed32 (patch) | |
tree | 6bf4fae4fd03c5bffffe9b94167416b0b66302ca /test/ssl-tests | |
parent | 25b9d11c002e5c71840c2a6733c5009d78f2c9db (diff) |
SSL test: only write out server2 when testing SNI
The SNI tests introduced a redundant "server2" section into every test
configuration. Copy this automatically from "server" unless testing SNI,
to reduce noise in the generated confs.
Also remove duplicate SSL_TEST_CTX_create (merge conflict error).
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test/ssl-tests')
-rw-r--r-- | test/ssl-tests/01-simple.conf | 18 | ||||
-rw-r--r-- | test/ssl-tests/02-protocol-version.conf | 3781 | ||||
-rw-r--r-- | test/ssl-tests/03-custom_verify.conf | 81 | ||||
-rw-r--r-- | test/ssl-tests/04-client_auth.conf | 219 | ||||
-rw-r--r-- | test/ssl-tests/05-sni.conf | 3 | ||||
-rw-r--r-- | test/ssl-tests/05-sni.conf.in | 1 | ||||
-rw-r--r-- | test/ssl-tests/06-sni-ticket.conf | 51 | ||||
-rw-r--r-- | test/ssl-tests/07-dtls-protocol-version.conf | 656 |
8 files changed, 1 insertions, 4809 deletions
diff --git a/test/ssl-tests/01-simple.conf b/test/ssl-tests/01-simple.conf index 29ac3e4ece..ab34e01378 100644 --- a/test/ssl-tests/01-simple.conf +++ b/test/ssl-tests/01-simple.conf @@ -11,7 +11,6 @@ ssl_conf = 0-default-ssl [0-default-ssl] server = 0-default-server -server2 = 0-default-server2 client = 0-default-client [0-default-server] @@ -19,19 +18,11 @@ Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[0-default-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [0-default-client] CipherString = DEFAULT VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-0] ExpectedResult = Success @@ -43,7 +34,6 @@ ssl_conf = 1-verify-cert-ssl [1-verify-cert-ssl] server = 1-verify-cert-server -server2 = 1-verify-cert-server2 client = 1-verify-cert-client [1-verify-cert-server] @@ -51,18 +41,10 @@ Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[1-verify-cert-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [1-verify-cert-client] CipherString = DEFAULT VerifyMode = Peer - [test-1] ClientAlert = UnknownCA ExpectedResult = ClientFail diff --git a/test/ssl-tests/02-protocol-version.conf b/test/ssl-tests/02-protocol-version.conf index 3c103dfc5d..1b9a41b43f 100644 --- a/test/ssl-tests/02-protocol-version.conf +++ b/test/ssl-tests/02-protocol-version.conf @@ -370,7 +370,6 @@ ssl_conf = 0-version-negotiation-ssl [0-version-negotiation-ssl] server = 0-version-negotiation-server -server2 = 0-version-negotiation-server2 client = 0-version-negotiation-client [0-version-negotiation-server] @@ -379,21 +378,12 @@ CipherString = DEFAULT MaxProtocol = SSLv3 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[0-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = SSLv3 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [0-version-negotiation-client] CipherString = DEFAULT MaxProtocol = SSLv3 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-0] ExpectedResult = InternalError @@ -405,7 +395,6 @@ ssl_conf = 1-version-negotiation-ssl [1-version-negotiation-ssl] server = 1-version-negotiation-server -server2 = 1-version-negotiation-server2 client = 1-version-negotiation-client [1-version-negotiation-server] @@ -414,21 +403,12 @@ CipherString = DEFAULT MaxProtocol = TLSv1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[1-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = TLSv1 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [1-version-negotiation-client] CipherString = DEFAULT MaxProtocol = SSLv3 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-1] ExpectedResult = InternalError @@ -440,7 +420,6 @@ ssl_conf = 2-version-negotiation-ssl [2-version-negotiation-ssl] server = 2-version-negotiation-server -server2 = 2-version-negotiation-server2 client = 2-version-negotiation-client [2-version-negotiation-server] @@ -449,21 +428,12 @@ CipherString = DEFAULT MaxProtocol = TLSv1.1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[2-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = TLSv1.1 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [2-version-negotiation-client] CipherString = DEFAULT MaxProtocol = SSLv3 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-2] ExpectedResult = InternalError @@ -475,7 +445,6 @@ ssl_conf = 3-version-negotiation-ssl [3-version-negotiation-ssl] server = 3-version-negotiation-server -server2 = 3-version-negotiation-server2 client = 3-version-negotiation-client [3-version-negotiation-server] @@ -484,21 +453,12 @@ CipherString = DEFAULT MaxProtocol = TLSv1.2 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[3-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = TLSv1.2 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [3-version-negotiation-client] CipherString = DEFAULT MaxProtocol = SSLv3 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-3] ExpectedResult = InternalError @@ -510,7 +470,6 @@ ssl_conf = 4-version-negotiation-ssl [4-version-negotiation-ssl] server = 4-version-negotiation-server -server2 = 4-version-negotiation-server2 client = 4-version-negotiation-client [4-version-negotiation-server] @@ -518,20 +477,12 @@ Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[4-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [4-version-negotiation-client] CipherString = DEFAULT MaxProtocol = SSLv3 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-4] ExpectedResult = InternalError @@ -543,7 +494,6 @@ ssl_conf = 5-version-negotiation-ssl [5-version-negotiation-ssl] server = 5-version-negotiation-server -server2 = 5-version-negotiation-server2 client = 5-version-negotiation-client [5-version-negotiation-server] @@ -553,22 +503,12 @@ MaxProtocol = SSLv3 MinProtocol = SSLv3 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[5-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = SSLv3 -MinProtocol = SSLv3 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [5-version-negotiation-client] CipherString = DEFAULT MaxProtocol = SSLv3 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-5] ExpectedResult = InternalError @@ -580,7 +520,6 @@ ssl_conf = 6-version-negotiation-ssl [6-version-negotiation-ssl] server = 6-version-negotiation-server -server2 = 6-version-negotiation-server2 client = 6-version-negotiation-client [6-version-negotiation-server] @@ -590,22 +529,12 @@ MaxProtocol = TLSv1 MinProtocol = SSLv3 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[6-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = TLSv1 -MinProtocol = SSLv3 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [6-version-negotiation-client] CipherString = DEFAULT MaxProtocol = SSLv3 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-6] ExpectedResult = InternalError @@ -617,7 +546,6 @@ ssl_conf = 7-version-negotiation-ssl [7-version-negotiation-ssl] server = 7-version-negotiation-server -server2 = 7-version-negotiation-server2 client = 7-version-negotiation-client [7-version-negotiation-server] @@ -627,22 +555,12 @@ MaxProtocol = TLSv1.1 MinProtocol = SSLv3 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[7-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = TLSv1.1 -MinProtocol = SSLv3 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [7-version-negotiation-client] CipherString = DEFAULT MaxProtocol = SSLv3 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-7] ExpectedResult = InternalError @@ -654,7 +572,6 @@ ssl_conf = 8-version-negotiation-ssl [8-version-negotiation-ssl] server = 8-version-negotiation-server -server2 = 8-version-negotiation-server2 client = 8-version-negotiation-client [8-version-negotiation-server] @@ -664,22 +581,12 @@ MaxProtocol = TLSv1.2 MinProtocol = SSLv3 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[8-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = TLSv1.2 -MinProtocol = SSLv3 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [8-version-negotiation-client] CipherString = DEFAULT MaxProtocol = SSLv3 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-8] ExpectedResult = InternalError @@ -691,7 +598,6 @@ ssl_conf = 9-version-negotiation-ssl [9-version-negotiation-ssl] server = 9-version-negotiation-server -server2 = 9-version-negotiation-server2 client = 9-version-negotiation-client [9-version-negotiation-server] @@ -700,21 +606,12 @@ CipherString = DEFAULT MinProtocol = SSLv3 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[9-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MinProtocol = SSLv3 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [9-version-negotiation-client] CipherString = DEFAULT MaxProtocol = SSLv3 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-9] ExpectedResult = InternalError @@ -726,7 +623,6 @@ ssl_conf = 10-version-negotiation-ssl [10-version-negotiation-ssl] server = 10-version-negotiation-server -server2 = 10-version-negotiation-server2 client = 10-version-negotiation-client [10-version-negotiation-server] @@ -736,22 +632,12 @@ MaxProtocol = TLSv1 MinProtocol = TLSv1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[10-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = TLSv1 -MinProtocol = TLSv1 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [10-version-negotiation-client] CipherString = DEFAULT MaxProtocol = SSLv3 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-10] ExpectedResult = InternalError @@ -763,7 +649,6 @@ ssl_conf = 11-version-negotiation-ssl [11-version-negotiation-ssl] server = 11-version-negotiation-server -server2 = 11-version-negotiation-server2 client = 11-version-negotiation-client [11-version-negotiation-server] @@ -773,22 +658,12 @@ MaxProtocol = TLSv1.1 MinProtocol = TLSv1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[11-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = TLSv1.1 -MinProtocol = TLSv1 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [11-version-negotiation-client] CipherString = DEFAULT MaxProtocol = SSLv3 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-11] ExpectedResult = InternalError @@ -800,7 +675,6 @@ ssl_conf = 12-version-negotiation-ssl [12-version-negotiation-ssl] server = 12-version-negotiation-server -server2 = 12-version-negotiation-server2 client = 12-version-negotiation-client [12-version-negotiation-server] @@ -810,22 +684,12 @@ MaxProtocol = TLSv1.2 MinProtocol = TLSv1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[12-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = TLSv1.2 -MinProtocol = TLSv1 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [12-version-negotiation-client] CipherString = DEFAULT MaxProtocol = SSLv3 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-12] ExpectedResult = InternalError @@ -837,7 +701,6 @@ ssl_conf = 13-version-negotiation-ssl [13-version-negotiation-ssl] server = 13-version-negotiation-server -server2 = 13-version-negotiation-server2 client = 13-version-negotiation-client [13-version-negotiation-server] @@ -846,21 +709,12 @@ CipherString = DEFAULT MinProtocol = TLSv1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[13-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MinProtocol = TLSv1 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [13-version-negotiation-client] CipherString = DEFAULT MaxProtocol = SSLv3 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-13] ExpectedResult = InternalError @@ -872,7 +726,6 @@ ssl_conf = 14-version-negotiation-ssl [14-version-negotiation-ssl] server = 14-version-negotiation-server -server2 = 14-version-negotiation-server2 client = 14-version-negotiation-client [14-version-negotiation-server] @@ -882,22 +735,12 @@ MaxProtocol = TLSv1.1 MinProtocol = TLSv1.1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[14-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = TLSv1.1 -MinProtocol = TLSv1.1 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [14-version-negotiation-client] CipherString = DEFAULT MaxProtocol = SSLv3 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-14] ExpectedResult = InternalError @@ -909,7 +752,6 @@ ssl_conf = 15-version-negotiation-ssl [15-version-negotiation-ssl] server = 15-version-negotiation-server -server2 = 15-version-negotiation-server2 client = 15-version-negotiation-client [15-version-negotiation-server] @@ -919,22 +761,12 @@ MaxProtocol = TLSv1.2 MinProtocol = TLSv1.1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[15-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = TLSv1.2 -MinProtocol = TLSv1.1 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [15-version-negotiation-client] CipherString = DEFAULT MaxProtocol = SSLv3 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-15] ExpectedResult = InternalError @@ -946,7 +778,6 @@ ssl_conf = 16-version-negotiation-ssl [16-version-negotiation-ssl] server = 16-version-negotiation-server -server2 = 16-version-negotiation-server2 client = 16-version-negotiation-client [16-version-negotiation-server] @@ -955,21 +786,12 @@ CipherString = DEFAULT MinProtocol = TLSv1.1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[16-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MinProtocol = TLSv1.1 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [16-version-negotiation-client] CipherString = DEFAULT MaxProtocol = SSLv3 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-16] ExpectedResult = InternalError @@ -981,7 +803,6 @@ ssl_conf = 17-version-negotiation-ssl [17-version-negotiation-ssl] server = 17-version-negotiation-server -server2 = 17-version-negotiation-server2 client = 17-version-negotiation-client [17-version-negotiation-server] @@ -991,22 +812,12 @@ MaxProtocol = TLSv1.2 MinProtocol = TLSv1.2 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[17-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = TLSv1.2 -MinProtocol = TLSv1.2 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [17-version-negotiation-client] CipherString = DEFAULT MaxProtocol = SSLv3 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-17] ExpectedResult = InternalError @@ -1018,7 +829,6 @@ ssl_conf = 18-version-negotiation-ssl [18-version-negotiation-ssl] server = 18-version-negotiation-server -server2 = 18-version-negotiation-server2 client = 18-version-negotiation-client [18-version-negotiation-server] @@ -1027,21 +837,12 @@ CipherString = DEFAULT MinProtocol = TLSv1.2 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[18-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MinProtocol = TLSv1.2 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [18-version-negotiation-client] CipherString = DEFAULT MaxProtocol = SSLv3 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-18] ExpectedResult = InternalError @@ -1053,7 +854,6 @@ ssl_conf = 19-version-negotiation-ssl [19-version-negotiation-ssl] server = 19-version-negotiation-server -server2 = 19-version-negotiation-server2 client = 19-version-negotiation-client [19-version-negotiation-server] @@ -1062,21 +862,12 @@ CipherString = DEFAULT MaxProtocol = SSLv3 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[19-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = SSLv3 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [19-version-negotiation-client] CipherString = DEFAULT MaxProtocol = TLSv1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-19] ExpectedResult = ServerFail @@ -1088,7 +879,6 @@ ssl_conf = 20-version-negotiation-ssl [20-version-negotiation-ssl] server = 20-version-negotiation-server -server2 = 20-version-negotiation-server2 client = 20-version-negotiation-client [20-version-negotiation-server] @@ -1097,21 +887,12 @@ CipherString = DEFAULT MaxProtocol = TLSv1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[20-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = TLSv1 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [20-version-negotiation-client] CipherString = DEFAULT MaxProtocol = TLSv1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-20] ExpectedResult = Success Protocol = TLSv1 @@ -1124,7 +905,6 @@ ssl_conf = 21-version-negotiation-ssl [21-version-negotiation-ssl] server = 21-version-negotiation-server -server2 = 21-version-negotiation-server2 client = 21-version-negotiation-client [21-version-negotiation-server] @@ -1133,21 +913,12 @@ CipherString = DEFAULT MaxProtocol = TLSv1.1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[21-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = TLSv1.1 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [21-version-negotiation-client] CipherString = DEFAULT MaxProtocol = TLSv1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-21] ExpectedResult = Success Protocol = TLSv1 @@ -1160,7 +931,6 @@ ssl_conf = 22-version-negotiation-ssl [22-version-negotiation-ssl] server = 22-version-negotiation-server -server2 = 22-version-negotiation-server2 client = 22-version-negotiation-client [22-version-negotiation-server] @@ -1169,21 +939,12 @@ CipherString = DEFAULT MaxProtocol = TLSv1.2 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[22-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = TLSv1.2 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [22-version-negotiation-client] CipherString = DEFAULT MaxProtocol = TLSv1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-22] ExpectedResult = Success Protocol = TLSv1 @@ -1196,7 +957,6 @@ ssl_conf = 23-version-negotiation-ssl [23-version-negotiation-ssl] server = 23-version-negotiation-server -server2 = 23-version-negotiation-server2 client = 23-version-negotiation-client [23-version-negotiation-server] @@ -1204,20 +964,12 @@ Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[23-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [23-version-negotiation-client] CipherString = DEFAULT MaxProtocol = TLSv1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-23] ExpectedResult = Success Protocol = TLSv1 @@ -1230,7 +982,6 @@ ssl_conf = 24-version-negotiation-ssl [24-version-negotiation-ssl] server = 24-version-negotiation-server -server2 = 24-version-negotiation-server2 client = 24-version-negotiation-client [24-version-negotiation-server] @@ -1240,22 +991,12 @@ MaxProtocol = SSLv3 MinProtocol = SSLv3 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[24-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = SSLv3 -MinProtocol = SSLv3 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [24-version-negotiation-client] CipherString = DEFAULT MaxProtocol = TLSv1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-24] ExpectedResult = ServerFail @@ -1267,7 +1008,6 @@ ssl_conf = 25-version-negotiation-ssl [25-version-negotiation-ssl] server = 25-version-negotiation-server -server2 = 25-version-negotiation-server2 client = 25-version-negotiation-client [25-version-negotiation-server] @@ -1277,22 +1017,12 @@ MaxProtocol = TLSv1 MinProtocol = SSLv3 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[25-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = TLSv1 -MinProtocol = SSLv3 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [25-version-negotiation-client] CipherString = DEFAULT MaxProtocol = TLSv1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-25] ExpectedResult = Success Protocol = TLSv1 @@ -1305,7 +1035,6 @@ ssl_conf = 26-version-negotiation-ssl [26-version-negotiation-ssl] server = 26-version-negotiation-server -server2 = 26-version-negotiation-server2 client = 26-version-negotiation-client [26-version-negotiation-server] @@ -1315,22 +1044,12 @@ MaxProtocol = TLSv1.1 MinProtocol = SSLv3 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[26-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = TLSv1.1 -MinProtocol = SSLv3 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [26-version-negotiation-client] CipherString = DEFAULT MaxProtocol = TLSv1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-26] ExpectedResult = Success Protocol = TLSv1 @@ -1343,7 +1062,6 @@ ssl_conf = 27-version-negotiation-ssl [27-version-negotiation-ssl] server = 27-version-negotiation-server -server2 = 27-version-negotiation-server2 client = 27-version-negotiation-client [27-version-negotiation-server] @@ -1353,22 +1071,12 @@ MaxProtocol = TLSv1.2 MinProtocol = SSLv3 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[27-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = TLSv1.2 -MinProtocol = SSLv3 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [27-version-negotiation-client] CipherString = DEFAULT MaxProtocol = TLSv1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-27] ExpectedResult = Success Protocol = TLSv1 @@ -1381,7 +1089,6 @@ ssl_conf = 28-version-negotiation-ssl [28-version-negotiation-ssl] server = 28-version-negotiation-server -server2 = 28-version-negotiation-server2 client = 28-version-negotiation-client [28-version-negotiation-server] @@ -1390,21 +1097,12 @@ CipherString = DEFAULT MinProtocol = SSLv3 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[28-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MinProtocol = SSLv3 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [28-version-negotiation-client] CipherString = DEFAULT MaxProtocol = TLSv1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-28] ExpectedResult = Success Protocol = TLSv1 @@ -1417,7 +1115,6 @@ ssl_conf = 29-version-negotiation-ssl [29-version-negotiation-ssl] server = 29-version-negotiation-server -server2 = 29-version-negotiation-server2 client = 29-version-negotiation-client [29-version-negotiation-server] @@ -1427,22 +1124,12 @@ MaxProtocol = TLSv1 MinProtocol = TLSv1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[29-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = TLSv1 -MinProtocol = TLSv1 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [29-version-negotiation-client] CipherString = DEFAULT MaxProtocol = TLSv1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-29] ExpectedResult = Success Protocol = TLSv1 @@ -1455,7 +1142,6 @@ ssl_conf = 30-version-negotiation-ssl [30-version-negotiation-ssl] server = 30-version-negotiation-server -server2 = 30-version-negotiation-server2 client = 30-version-negotiation-client [30-version-negotiation-server] @@ -1465,22 +1151,12 @@ MaxProtocol = TLSv1.1 MinProtocol = TLSv1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[30-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = TLSv1.1 -MinProtocol = TLSv1 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [30-version-negotiation-client] CipherString = DEFAULT MaxProtocol = TLSv1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-30] ExpectedResult = Success Protocol = TLSv1 @@ -1493,7 +1169,6 @@ ssl_conf = 31-version-negotiation-ssl [31-version-negotiation-ssl] server = 31-version-negotiation-server -server2 = 31-version-negotiation-server2 client = 31-version-negotiation-client [31-version-negotiation-server] @@ -1503,22 +1178,12 @@ MaxProtocol = TLSv1.2 MinProtocol = TLSv1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[31-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = TLSv1.2 -MinProtocol = TLSv1 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [31-version-negotiation-client] CipherString = DEFAULT MaxProtocol = TLSv1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-31] ExpectedResult = Success Protocol = TLSv1 @@ -1531,7 +1196,6 @@ ssl_conf = 32-version-negotiation-ssl [32-version-negotiation-ssl] server = 32-version-negotiation-server -server2 = 32-version-negotiation-server2 client = 32-version-negotiation-client [32-version-negotiation-server] @@ -1540,21 +1204,12 @@ CipherString = DEFAULT MinProtocol = TLSv1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[32-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MinProtocol = TLSv1 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [32-version-negotiation-client] CipherString = DEFAULT MaxProtocol = TLSv1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-32] ExpectedResult = Success Protocol = TLSv1 @@ -1567,7 +1222,6 @@ ssl_conf = 33-version-negotiation-ssl [33-version-negotiation-ssl] server = 33-version-negotiation-server -server2 = 33-version-negotiation-server2 client = 33-version-negotiation-client [33-version-negotiation-server] @@ -1577,22 +1231,12 @@ MaxProtocol = TLSv1.1 MinProtocol = TLSv1.1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[33-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = TLSv1.1 -MinProtocol = TLSv1.1 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [33-version-negotiation-client] CipherString = DEFAULT MaxProtocol = TLSv1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-33] ExpectedResult = ServerFail @@ -1604,7 +1248,6 @@ ssl_conf = 34-version-negotiation-ssl [34-version-negotiation-ssl] server = 34-version-negotiation-server -server2 = 34-version-negotiation-server2 client = 34-version-negotiation-client [34-version-negotiation-server] @@ -1614,22 +1257,12 @@ MaxProtocol = TLSv1.2 MinProtocol = TLSv1.1 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - -[34-version-negotiation-server2] -Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem -CipherString = DEFAULT -MaxProtocol = TLSv1.2 -MinProtocol = TLSv1.1 -PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - - [34-version-negotiation-client] CipherString = DEFAULT MaxProtocol = TLSv1 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-34] ExpectedResult = ServerFail @@ -1641,7 +1274,6 @@ ssl_conf = 35-version-negotiation-ssl [35-version-negotiation-ssl] server = 35-version-negotiation-server -server2 = 35-version-negotiation-server2 client = 35-version-negotiation-client |