diff options
| author | Matt Caswell <matt@openssl.org> | 2017-01-19 15:02:16 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-01-30 10:18:22 +0000 |
| commit | 4b7ffd8bbeb1c64261e10ef2050312bd183abeed (patch) | |
| tree | a318d20f03a1496d352c272600760fac0e161552 /test/ssl-tests | |
| parent | 534a43ffeaec03e50768ccf84d431f96f11256e3 (diff) | |
Re-enable ALPN resumption tests where we are using TLSv1.3
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2259)
Diffstat (limited to 'test/ssl-tests')
| -rw-r--r-- | test/ssl-tests/09-alpn.conf | 8 | ||||
| -rw-r--r-- | test/ssl-tests/09-alpn.conf.in | 16 |
2 files changed, 0 insertions, 24 deletions
diff --git a/test/ssl-tests/09-alpn.conf b/test/ssl-tests/09-alpn.conf index fc3c8da154..e7e6cb9534 100644 --- a/test/ssl-tests/09-alpn.conf +++ b/test/ssl-tests/09-alpn.conf @@ -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 diff --git a/test/ssl-tests/09-alpn.conf.in b/test/ssl-tests/09-alpn.conf.in index ff931a9425..6e86375af1 100644 --- a/test/ssl-tests/09-alpn.conf.in +++ b/test/ssl-tests/09-alpn.conf.in @@ -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", |