diff options
| author | Matt Caswell <matt@openssl.org> | 2017-01-20 13:48:41 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-01-30 10:18:23 +0000 |
| commit | 79495812fbf7804609157510657fae4a11fec0b7 (patch) | |
| tree | beba6a481c3db705bc9009029c764170ec7e6a6a /test | |
| parent | a23bb15abe873dc1ba6c7e5b49dfb8286eab1490 (diff) | |
Re-enable resumption for TLS1.3 CT tests
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2259)
Diffstat (limited to 'test')
| -rw-r--r-- | test/ssl-tests/12-ct.conf | 3 | ||||
| -rw-r--r-- | test/ssl-tests/12-ct.conf.in | 9 |
2 files changed, 0 insertions, 12 deletions
diff --git a/test/ssl-tests/12-ct.conf b/test/ssl-tests/12-ct.conf index 14b8e938c0..22fa18dd45 100644 --- a/test/ssl-tests/12-ct.conf +++ b/test/ssl-tests/12-ct.conf @@ -79,7 +79,6 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [2-ct-permissive-resumption-client] CipherString = DEFAULT -MaxProtocol = TLSv1.2 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer @@ -112,13 +111,11 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [3-ct-strict-resumption-client] CipherString = DEFAULT -MaxProtocol = TLSv1.2 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [3-ct-strict-resumption-resume-client] CipherString = DEFAULT -MaxProtocol = TLSv1.2 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer diff --git a/test/ssl-tests/12-ct.conf.in b/test/ssl-tests/12-ct.conf.in index e7fe1b93d2..c27e0911ff 100644 --- a/test/ssl-tests/12-ct.conf.in +++ b/test/ssl-tests/12-ct.conf.in @@ -46,9 +46,6 @@ our @tests = ( name => "ct-permissive-resumption", server => { }, client => { - #TODO(TLS1.3): Temporarily set to TLSv1.2 until we implement TLS1.3 - # resumption - MaxProtocol => "TLSv1.2", extra => { "CTValidation" => "Permissive", }, @@ -63,9 +60,6 @@ our @tests = ( name => "ct-strict-resumption", server => { }, client => { - #TODO(TLS1.3): Temporarily set to TLSv1.2 until we implement TLS1.3 - # resumption - MaxProtocol => "TLSv1.2", extra => { "CTValidation" => "Permissive", }, @@ -73,9 +67,6 @@ our @tests = ( # SCTs are not present during resumption, so the resumption # should succeed. resume_client => { - #TODO(TLS1.3): Temporarily set to TLSv1.2 until we implement TLS1.3 - # resumption - MaxProtocol => "TLSv1.2", extra => { "CTValidation" => "Strict", }, |