Add and use function test_pem to work out test filenames.

[openssl.git] / test / ssl-tests / 04-client_auth.conf.in

diff --git a/test/ssl-tests/04-client_auth.conf.in b/test/ssl-tests/04-client_auth.conf.in
index be601a9b1b8fc1602da02a88fd46cac516827b52..8b92836e69de3574ec05b800f3f2e8beb18292d9 100644 (file)
--- a/test/ssl-tests/04-client_auth.conf.in
+++ b/test/ssl-tests/04-client_auth.conf.in
@@ -19,8 +19,6 @@ push @is_disabled, anydisabled("ssl3", "tls1", "tls1_1", "tls1_2");
 
 our @tests = ();
 
 
 our @tests = ();
 

-my $dir_sep = $^O ne "VMS" ? "/" : "";
-

 sub generate_tests() {
 
     foreach (0..$#protocols) {
 sub generate_tests() {
 
     foreach (0..$#protocols) {


@@ -77,7 +75,7 @@ sub generate_tests() {
                 server => {
                     "MinProtocol" => $protocol,
                     "MaxProtocol" => $protocol,
                 server => {
                     "MinProtocol" => $protocol,
                     "MaxProtocol" => $protocol,

-                    "VerifyCAFile" => "\${ENV::TEST_CERTS_DIR}${dir_sep}root-cert.pem",
+                    "VerifyCAFile" => test_pem("root-cert.pem"),

                     "VerifyMode" => "Require",
                 },
                 client => {
                     "VerifyMode" => "Require",
                 },
                 client => {


@@ -97,14 +95,14 @@ sub generate_tests() {
                     "MinProtocol" => $protocol,
                     "MaxProtocol" => $protocol,
                     "ClientSignatureAlgorithms" => $clisigalgs,
                     "MinProtocol" => $protocol,
                     "MaxProtocol" => $protocol,
                     "ClientSignatureAlgorithms" => $clisigalgs,

-                    "VerifyCAFile" => "\${ENV::TEST_CERTS_DIR}${dir_sep}root-cert.pem",
+                    "VerifyCAFile" => test_pem("root-cert.pem"),

                     "VerifyMode" => "Request",
                 },
                 client => {
                     "MinProtocol" => $protocol,
                     "MaxProtocol" => $protocol,
                     "VerifyMode" => "Request",
                 },
                 client => {
                     "MinProtocol" => $protocol,
                     "MaxProtocol" => $protocol,

-                    "Certificate" => "\${ENV::TEST_CERTS_DIR}${dir_sep}ee-client-chain.pem",
-                    "PrivateKey"  => "\${ENV::TEST_CERTS_DIR}${dir_sep}ee-key.pem",
+                    "Certificate" => test_pem("ee-client-chain.pem"),
+                    "PrivateKey"  => test_pem("ee-key.pem"),

                 },
                 test   => { "ExpectedResult" => "Success",
                             "ExpectedClientCertType" => "RSA",
                 },
                 test   => { "ExpectedResult" => "Success",
                             "ExpectedClientCertType" => "RSA",


@@ -124,8 +122,8 @@ sub generate_tests() {
                 client => {
                     "MinProtocol" => $protocol,
                     "MaxProtocol" => $protocol,
                 client => {
                     "MinProtocol" => $protocol,
                     "MaxProtocol" => $protocol,

-                    "Certificate" => "\${ENV::TEST_CERTS_DIR}${dir_sep}ee-client-chain.pem",
-                    "PrivateKey"  => "\${ENV::TEST_CERTS_DIR}${dir_sep}ee-key.pem",
+                    "Certificate" => test_pem("ee-client-chain.pem"),
+                    "PrivateKey"  => test_pem("ee-key.pem"),

                 },
                 test   => {
                     "ExpectedResult" => "ServerFail",
                 },
                 test   => {
                     "ExpectedResult" => "ServerFail",