提交 0e2c7b3e 编写于 作者: D Dr. Stephen Henson

Add missing MinProtocol/MaxProtocol

Reviewed-by: NRich Salz <rsalz@openssl.org>
Reviewed-by: NMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2339)
上级 53f08737
...@@ -78,6 +78,7 @@ client = 2-ECDSA CipherString Selection, no ECDSA certificate-client ...@@ -78,6 +78,7 @@ client = 2-ECDSA CipherString Selection, no ECDSA certificate-client
[2-ECDSA CipherString Selection, no ECDSA certificate-server] [2-ECDSA CipherString Selection, no ECDSA certificate-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT CipherString = DEFAULT
MaxProtocol = TLSv1.2
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
[2-ECDSA CipherString Selection, no ECDSA certificate-client] [2-ECDSA CipherString Selection, no ECDSA certificate-client]
...@@ -161,6 +162,7 @@ client = 5-ECDSA Signature Algorithm Selection, no ECDSA certificate-client ...@@ -161,6 +162,7 @@ client = 5-ECDSA Signature Algorithm Selection, no ECDSA certificate-client
[5-ECDSA Signature Algorithm Selection, no ECDSA certificate-server] [5-ECDSA Signature Algorithm Selection, no ECDSA certificate-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT CipherString = DEFAULT
MaxProtocol = TLSv1.2
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
[5-ECDSA Signature Algorithm Selection, no ECDSA certificate-client] [5-ECDSA Signature Algorithm Selection, no ECDSA certificate-client]
......
...@@ -44,7 +44,9 @@ our @tests = ( ...@@ -44,7 +44,9 @@ our @tests = (
}, },
{ {
name => "ECDSA CipherString Selection, no ECDSA certificate", name => "ECDSA CipherString Selection, no ECDSA certificate",
server => { }, server => {
"MaxProtocol" => "TLSv1.2"
},
client => { client => {
"CipherString" => "aECDSA" "CipherString" => "aECDSA"
}, },
...@@ -80,7 +82,9 @@ our @tests = ( ...@@ -80,7 +82,9 @@ our @tests = (
}, },
{ {
name => "ECDSA Signature Algorithm Selection, no ECDSA certificate", name => "ECDSA Signature Algorithm Selection, no ECDSA certificate",
server => { }, server => {
"MaxProtocol" => "TLSv1.2"
},
client => { client => {
"SignatureAlgorithms" => "ECDSA+SHA256", "SignatureAlgorithms" => "ECDSA+SHA256",
}, },
...@@ -166,7 +170,10 @@ my @tests_tls_1_3 = ( ...@@ -166,7 +170,10 @@ my @tests_tls_1_3 = (
}, },
{ {
name => "TLS 1.3 ECDSA Signature Algorithm Selection, no ECDSA certificate", name => "TLS 1.3 ECDSA Signature Algorithm Selection, no ECDSA certificate",
server => { }, server => {
"MinProtocol" => "TLSv1.3",
"MaxProtocol" => "TLSv1.3"
},
client => { client => {
"SignatureAlgorithms" => "ECDSA+SHA256", "SignatureAlgorithms" => "ECDSA+SHA256",
}, },
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册