summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2017-01-13 17:41:48 +0000
committerDr. Stephen Henson <steve@openssl.org>2017-01-15 00:23:34 +0000
commita470f02360b147fa73f94881ba96c367c593427f (patch)
treefe8ecd2376af0b14a913f5765dec89b77871c567
parentedb8a5eb54ee54452a410a6072c584ee94ed3ebb (diff)
Add client cert type tests
Reviewed-by: Emilia Käsper <emilia@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2224)
-rw-r--r--test/ssl-tests/04-client_auth.conf4
-rw-r--r--test/ssl-tests/04-client_auth.conf.in4
2 files changed, 7 insertions, 1 deletions
diff --git a/test/ssl-tests/04-client_auth.conf b/test/ssl-tests/04-client_auth.conf
index 0e91bed9f1..5b725c76b1 100644
--- a/test/ssl-tests/04-client_auth.conf
+++ b/test/ssl-tests/04-client_auth.conf
@@ -119,6 +119,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-3]
+ExpectedClientCertType = RSA
ExpectedResult = Success
@@ -262,6 +263,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-8]
+ExpectedClientCertType = RSA
ExpectedResult = Success
@@ -409,6 +411,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-13]
+ExpectedClientCertType = RSA
ExpectedResult = Success
@@ -556,6 +559,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-18]
+ExpectedClientCertType = RSA
ExpectedResult = Success
diff --git a/test/ssl-tests/04-client_auth.conf.in b/test/ssl-tests/04-client_auth.conf.in
index cd3d42f416..8738f908de 100644
--- a/test/ssl-tests/04-client_auth.conf.in
+++ b/test/ssl-tests/04-client_auth.conf.in
@@ -96,7 +96,9 @@ sub generate_tests() {
"Certificate" => "\${ENV::TEST_CERTS_DIR}${dir_sep}ee-client-chain.pem",
"PrivateKey" => "\${ENV::TEST_CERTS_DIR}${dir_sep}ee-key.pem",
},
- test => { "ExpectedResult" => "Success" },
+ test => { "ExpectedResult" => "Success",
+ "ExpectedClientCertType" => "RSA",
+ },
};
# Handshake with client authentication but without the root certificate.