diff options
| author | Emilia Kasper <emilia@openssl.org> | 2016-07-21 16:29:48 +0200 |
|---|---|---|
| committer | Emilia Kasper <emilia@openssl.org> | 2016-08-08 12:06:26 +0200 |
| commit | 9f48bbacd8cac8d08dff146db438ab3e19908a7a (patch) | |
| tree | 7650dbd3d696d895c53b153a3d2b8c3881bade88 /test/ssl-tests/11-dtls_resumption.conf | |
| parent | a4a18b2f891c59fd78ad520da79146af13063892 (diff) | |
| download | openssl-9f48bbacd8cac8d08dff146db438ab3e19908a7a.tar.gz | |
Reorganize SSL test structures
Move custom server and client options from the test dictionary to an
"extra" section of each server/client. Rename test expectations to say
"Expected".
This is a big but straightforward change. Primarily, this allows us to
specify multiple server and client contexts without redefining the
custom options for each of them. For example, instead of
"ServerNPNProtocols", "Server2NPNProtocols", "ResumeServerNPNProtocols",
we now have, "NPNProtocols".
This simplifies writing resumption and SNI tests. The first application
will be resumption tests for NPN and ALPN.
Regrouping the options also makes it clearer which options apply to the
server, which apply to the client, which configure the test, and which
are test expectations.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'test/ssl-tests/11-dtls_resumption.conf')
| -rw-r--r-- | test/ssl-tests/11-dtls_resumption.conf | 32 |
1 files changed, 16 insertions, 16 deletions
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 |