Re-enable resumption for TLS1.3 CT tests
authorMatt Caswell <matt@openssl.org>
Fri, 20 Jan 2017 13:48:41 +0000 (13:48 +0000)
committerMatt Caswell <matt@openssl.org>
Mon, 30 Jan 2017 10:18:23 +0000 (10:18 +0000)
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2259)

test/ssl-tests/12-ct.conf
test/ssl-tests/12-ct.conf.in

index 14b8e93..22fa18d 100644 (file)
@@ -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
 
index e7fe1b9..c27e091 100644 (file)
@@ -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",
             },