com php-src: Prefer using DIRECTORY_SEPARATOR in OpenSSL config path: ext/openssl/tests/bug36732.ph pt ext/openssl/tests/bug55646.phpt ext/openssl/ tests/bug73833.phpt
[email protected] (Jakub Zelenka)
| Newsgroups | php.cvs |
|---|---|
| Message-ID | <[email protected]> |
Commit: 7b392c7154eb06d8dd19f4e06155b8a4633ac766 Author: Jakub Zelenka <[email protected]> Thu, 27 Apr 2017 15:10:55 +0100 Parents: e7166ea9be6ee6a9707b9c8d6145b3278e965743 Branches: PHP-7.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7b392c7154eb06d8dd19f4e06155b8a4633ac766 Log: Prefer using DIRECTORY_SEPARATOR in OpenSSL config path Changed paths: M ext/openssl/tests/bug36732.phpt M ext/openssl/tests/bug55646.phpt M ext/openssl/tests/bug73833.phpt Diff: diff --git a/ext/openssl/tests/bug36732.phpt b/ext/openssl/tests/bug36732.phpt index ec8fedb..87fad98 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 c11284d..6c50458 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 cf46092..2ea5f9e 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);