mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-27 05:21:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add certificate_authorities tests client to server.

Browse Source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3015)
This commit is contained in:
Dr. Stephen Henson 2017-03-31 23:06:15 +01:00
parent f15b50c4cb
commit 25a9fabbef
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/ssl-tests/20-cert-select.conf
View File

@ -34,11 +34,13 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
[0-ECDSA CipherString Selection-client] [0-ECDSA CipherString Selection-client]
CipherString = aECDSA CipherString = aECDSA
RequestCAFile = ${ENV::TEST_CERTS_DIR}/root-cert.pem
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer VerifyMode = Peer
[test-0] [test-0]
ExpectedResult = Success ExpectedResult = Success
ExpectedServerCANames = empty
ExpectedServerCertType = P-256 ExpectedServerCertType = P-256
ExpectedServerSignType = EC ExpectedServerSignType = EC

8
test/ssl-tests/20-cert-select.conf.in
View File

@ -21,10 +21,13 @@ our @tests = (
server => $server, server => $server,
client => { client => {
"CipherString" => "aECDSA", "CipherString" => "aECDSA",
"RequestCAFile" => test_pem("root-cert.pem"),
}, },
test => { test => {
"ExpectedServerCertType" =>, "P-256", "ExpectedServerCertType" =>, "P-256",
"ExpectedServerSignType" =>, "EC", "ExpectedServerSignType" =>, "EC",
# Note: certificate_authorities not sent for TLS < 1.3
"ExpectedServerCANames" =>, "empty",
"ExpectedResult" => "Success" "ExpectedResult" => "Success"
}, },
}, },
@ -214,6 +217,7 @@ my @tests_tls_1_3 = (
"ExpectedServerCertType" => "P-256", "ExpectedServerCertType" => "P-256",
"ExpectedServerSignHash" => "SHA256", "ExpectedServerSignHash" => "SHA256",
"ExpectedServerSignType" => "EC", "ExpectedServerSignType" => "EC",
"ExpectedServerCANames" => "empty",
"ExpectedResult" => "Success" "ExpectedResult" => "Success"
}, },
}, },
@ -247,11 +251,13 @@ my @tests_tls_1_3 = (
server => $server_tls_1_3, server => $server_tls_1_3,
client => { client => {
"SignatureAlgorithms" => "ECDSA+SHA256:RSA-PSS+SHA256", "SignatureAlgorithms" => "ECDSA+SHA256:RSA-PSS+SHA256",
"RequestCAFile" => test_pem("root-cert.pem"),
}, },
test => { test => {
"ExpectedServerCertType" => "P-256", "ExpectedServerCertType" => "P-256",
"ExpectedServerSignHash" => "SHA256", "ExpectedServerSignHash" => "SHA256",
"ExpectedServerSignType" => "EC", "ExpectedServerSignType" => "EC",
"ExpectedServerCANames" => test_pem("root-cert.pem"),
"ExpectedResult" => "Success" "ExpectedResult" => "Success"
}, },
}, },
@ -325,7 +331,7 @@ my @tests_tls_1_3 = (
server => { server => {
"ClientSignatureAlgorithms" => "PSS+SHA256", "ClientSignatureAlgorithms" => "PSS+SHA256",
"VerifyCAFile" => test_pem("root-cert.pem"), "VerifyCAFile" => test_pem("root-cert.pem"),
"ClientCAFile" => test_pem("root-cert.pem"), "RequestCAFile" => test_pem("root-cert.pem"),
"VerifyMode" => "Require" "VerifyMode" => "Require"
}, },
client => $client_tls_1_3, client => $client_tls_1_3,