Browse Source

Prefer using DIRECTORY_SEPARATOR in OpenSSL config path

pull/2499/head
Jakub Zelenka 9 years ago
parent
commit
7b392c7154
  1. 2
      ext/openssl/tests/bug36732.phpt
  2. 2
      ext/openssl/tests/bug55646.phpt
  3. 2
      ext/openssl/tests/bug73833.phpt

2
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(

2
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");

2
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);

Loading…
Cancel
Save