From a470f02360b147fa73f94881ba96c367c593427f Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Fri, 13 Jan 2017 17:41:48 +0000 Subject: [PATCH] Add client cert type tests MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Emilia Käsper (Merged from https://github.com/openssl/openssl/pull/2224) --- test/ssl-tests/04-client_auth.conf | 4 ++++ test/ssl-tests/04-client_auth.conf.in | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) 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. -- 2.25.1