diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2017-02-16 15:27:49 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2017-02-17 16:33:12 +0000 |
| commit | 31b238ad05ac2b0c637bb5347c5862aa1eb97576 (patch) | |
| tree | 9f66ef10b60c46f684f2b06f7612eb3e0069c01b /test/ssl-tests/18-dtls-renegotiate.conf.in | |
| parent | aa402e2ba408254c052b5750b14e7f01e48bced1 (diff) | |
Add and use function test_pem to work out test filenames.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2667)
Diffstat (limited to 'test/ssl-tests/18-dtls-renegotiate.conf.in')
| -rw-r--r-- | test/ssl-tests/18-dtls-renegotiate.conf.in | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/test/ssl-tests/18-dtls-renegotiate.conf.in b/test/ssl-tests/18-dtls-renegotiate.conf.in index 43046e3a02..c7020f0a6b 100644 --- a/test/ssl-tests/18-dtls-renegotiate.conf.in +++ b/test/ssl-tests/18-dtls-renegotiate.conf.in @@ -14,8 +14,6 @@ use warnings; package ssltests; -my $dir_sep = $^O ne "VMS" ? "/" : ""; - our @tests = ( { name => "renegotiate-client-no-resume", @@ -64,12 +62,12 @@ our @tests = ( { name => "renegotiate-client-auth-require", server => { - "VerifyCAFile" => "\${ENV::TEST_CERTS_DIR}${dir_sep}root-cert.pem", + "VerifyCAFile" => test_pem("root-cert.pem"), "VerifyMode" => "Require", }, client => { - "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 => { "Method" => "DTLS", @@ -81,12 +79,12 @@ our @tests = ( { name => "renegotiate-client-auth-once", server => { - "VerifyCAFile" => "\${ENV::TEST_CERTS_DIR}${dir_sep}root-cert.pem", + "VerifyCAFile" => test_pem("root-cert.pem"), "VerifyMode" => "Once", }, client => { - "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 => { "Method" => "DTLS", |