Commit 79495812 authored by Matt Caswell's avatar Matt Caswell
Browse files

Re-enable resumption for TLS1.3 CT tests 



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

test/ssl-tests/12-ct.conf

+0 −3
Original line number Diff line number Diff line
@@ -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

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

+0 −9
Original line number Diff line number Diff line
@@ -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",

            },