diff options
| author | Jakub Zelenka <bukka@php.net> | 2017-04-27 15:10:55 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2017-04-27 15:10:55 +0100 |
| commit | 7b392c7154eb06d8dd19f4e06155b8a4633ac766 (patch) | |
| tree | 329f81c82b1606bdd472b74433777219ad662742 | |
| parent | e7166ea9be6ee6a9707b9c8d6145b3278e965743 (diff) | |
| download | php-git-7b392c7154eb06d8dd19f4e06155b8a4633ac766.tar.gz | |
Prefer using DIRECTORY_SEPARATOR in OpenSSL config path
| -rw-r--r-- | ext/openssl/tests/bug36732.phpt | 2 | ||||
| -rw-r--r-- | ext/openssl/tests/bug55646.phpt | 2 | ||||
| -rw-r--r-- | ext/openssl/tests/bug73833.phpt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ext/openssl/tests/bug36732.phpt b/ext/openssl/tests/bug36732.phpt index ec8fedb9d4..87fad9843e 100644 --- a/ext/openssl/tests/bug36732.phpt +++ b/ext/openssl/tests/bug36732.phpt @@ -10,7 +10,7 @@ if (OPENSSL_VERSION_NUMBER < 0x009070af) die("skip"); $configargs = array( "req_extensions" => "v3_req", "x509_extensions" => "usr_cert", - "config" => __DIR__."/openssl.cnf", + "config" => __DIR__. DIRECTORY_SEPARATOR . "openssl.cnf", ); $dn = array( diff --git a/ext/openssl/tests/bug55646.phpt b/ext/openssl/tests/bug55646.phpt index c11284d72d..6c504588c8 100644 --- a/ext/openssl/tests/bug55646.phpt +++ b/ext/openssl/tests/bug55646.phpt @@ -19,7 +19,7 @@ $csr_info = array( $private = openssl_pkey_new($config); while (openssl_error_string()) {} $csr_res = openssl_csr_new($csr_info, $private, - ['config' => __DIR__."/openssl.cnf"]); + ['config' => __DIR__. DIRECTORY_SEPARATOR . "openssl.cnf"]); if (!$csr_res) { while ($e = openssl_error_string()) { $err = $e; } die("Failed; last error: $err"); diff --git a/ext/openssl/tests/bug73833.phpt b/ext/openssl/tests/bug73833.phpt index cf46092a46..2ea5f9e411 100644 --- a/ext/openssl/tests/bug73833.phpt +++ b/ext/openssl/tests/bug73833.phpt @@ -7,7 +7,7 @@ if (!extension_loaded("openssl")) die("skip openssl not loaded"); --FILE-- <?php $passwords = ["abc\x00defghijkl", "abcdefghikjl"]; -$conf = ['config' => __DIR__.'/openssl.cnf']; +$conf = ['config' => __DIR__ . DIRECTORY_SEPARATOR . 'openssl.cnf']; foreach($passwords as $password) { $key = openssl_pkey_new($conf); |