Re-enable resumption for TLS1.3 CT tests

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2259)

diff --git a/test/ssl-tests/12-ct.conf b/test/ssl-tests/12-ct.conf
index 14b8e938c07b8becc5db6761551e97f8b0c3f305..22fa18dd45536396fc02e4df053f7d3bcd18f7f8 100644 (file)
--- 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 e7fe1b93d24c155fb2ed48271341f4e7aea5b47e..c27e0911ffc1148b8f705c33877f51817d003613 100644 (file)
--- 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",
             },