mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-18 13:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2259)
This commit is contained in:
Matt Caswell 2017-01-19 15:02:16 +00:00
parent 534a43ffea
commit 4b7ffd8bbe
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/ssl-tests/09-alpn.conf
View File

@ -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

16
test/ssl-tests/09-alpn.conf.in
View File

@ -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",