Commit 4b7ffd8b authored by Matt Caswell's avatar Matt Caswell
Browse files

Re-enable ALPN resumption tests where we are using TLSv1.3 



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

test/ssl-tests/09-alpn.conf

+0 −8
Original line number Diff line number Diff line
@@ -383,7 +383,6 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem 


[10-alpn-simple-resumption-client]

CipherString = DEFAULT

MaxProtocol = TLSv1.2

VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem

VerifyMode = Peer
@@ -426,7 +425,6 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem 


[11-alpn-server-switch-resumption-client]

CipherString = DEFAULT

MaxProtocol = TLSv1.2

VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem

VerifyMode = Peer
@@ -467,13 +465,11 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem 


[12-alpn-client-switch-resumption-client]

CipherString = DEFAULT

MaxProtocol = TLSv1.2

VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem

VerifyMode = Peer



[12-alpn-client-switch-resumption-resume-client]

CipherString = DEFAULT

MaxProtocol = TLSv1.2

VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem

VerifyMode = Peer
@@ -519,7 +515,6 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem 


[13-alpn-alert-on-mismatch-resumption-client]

CipherString = DEFAULT

MaxProtocol = TLSv1.2

VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem

VerifyMode = Peer
@@ -565,7 +560,6 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem 


[14-alpn-no-server-support-resumption-client]

CipherString = DEFAULT

MaxProtocol = TLSv1.2

VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem

VerifyMode = Peer
@@ -601,13 +595,11 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem 


[15-alpn-no-client-support-resumption-client]

CipherString = DEFAULT

MaxProtocol = TLSv1.2

VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem

VerifyMode = Peer



[15-alpn-no-client-support-resumption-resume-client]

CipherString = DEFAULT

MaxProtocol = TLSv1.2

VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem

VerifyMode = Peer

test/ssl-tests/09-alpn.conf.in

+0 −16
Original line number Diff line number Diff line
@@ -204,8 +204,6 @@ our @tests = ( 
            },

        },

        client => {

            #TODO(TLS1.3): Temporary until we support TLSv1.3 resumption

            MaxProtocol => "TLSv1.2",

            extra => {

                "ALPNProtocols" => "foo",

            },
@@ -229,8 +227,6 @@ our @tests = ( 
            },

        },

        client => {

            #TODO(TLS1.3): Temporary until we support TLSv1.3 resumption

            MaxProtocol => "TLSv1.2",

            extra => {

                "ALPNProtocols" => "foo,bar,baz",

            },
@@ -249,15 +245,11 @@ our @tests = ( 
            },

        },

        client => {

            #TODO(TLS1.3): Temporary until we support TLSv1.3 resumption

            MaxProtocol => "TLSv1.2",

            extra => {

                "ALPNProtocols" => "foo,baz",

            },

        },

        resume_client => {

            #TODO(TLS1.3): Temporary until we support TLSv1.3 resumption

            MaxProtocol => "TLSv1.2",

            extra => {

                "ALPNProtocols" => "bar,baz",

            },
@@ -281,8 +273,6 @@ our @tests = ( 
            },

        },

        client => {

            #TODO(TLS1.3): Temporary until we support TLSv1.3 resumption

            MaxProtocol => "TLSv1.2",

            extra => {

                "ALPNProtocols" => "foo,bar",

            },
@@ -302,8 +292,6 @@ our @tests = ( 
        },

        resume_server => { },

        client => {

            #TODO(TLS1.3): Temporary until we support TLSv1.3 resumption

            MaxProtocol => "TLSv1.2",

            extra => {

                "ALPNProtocols" => "foo",

            },
@@ -322,15 +310,11 @@ our @tests = ( 
            },

        },

        client => {

            #TODO(TLS1.3): Temporary until we support TLSv1.3 resumption

            MaxProtocol => "TLSv1.2",

            extra => {

                "ALPNProtocols" => "foo",

            },

        },

        resume_client => {

            #TODO(TLS1.3): Temporary until we support TLSv1.3 resumption

            MaxProtocol => "TLSv1.2"

        },

        test => {

            "HandshakeMode" => "Resume",