Skip to content

Commit 4c5b427

Browse files
committed
Fix bug #61404 ext\openssl\tests\021.phpt fails
1 parent fa7f215 commit 4c5b427

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

ext/openssl/tests/021.phpt

+8-5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ $cert = "file://" . dirname(__FILE__) . "/cert.crt";
88
$priv = "file://" . dirname(__FILE__) . "/private.key";
99
$wrong = "wrong";
1010
$pub = "file://" . dirname(__FILE__) . "/public.key";
11+
$config = __DIR__ . DIRECTORY_SEPARATOR . 'openssl.cnf';
12+
$config_arg = array('config' => $config);
1113

1214
$dn = array(
1315
"countryName" => "BR",
@@ -21,14 +23,15 @@ $args = array(
2123
"digest_alg" => "sha1",
2224
"private_key_bits" => 2048,
2325
"private_key_type" => OPENSSL_KEYTYPE_DSA,
24-
"encrypt_key" => true
26+
"encrypt_key" => true,
27+
"config" => $config
2528
);
2629

27-
$privkey = openssl_pkey_new();
30+
$privkey = openssl_pkey_new($config_arg);
2831
$csr = openssl_csr_new($dn, $privkey, $args);
2932
var_dump(openssl_csr_sign($csr, null, $privkey, 365, $args));
30-
var_dump(openssl_csr_sign($csr, null, $privkey, 365));
31-
var_dump(openssl_csr_sign($csr, $cert, $priv, 365));
33+
var_dump(openssl_csr_sign($csr, null, $privkey, 365, $config_arg));
34+
var_dump(openssl_csr_sign($csr, $cert, $priv, 365, $config_arg));
3235
var_dump(openssl_csr_sign($csr, $wrong, $privkey, 365));
3336
var_dump(openssl_csr_sign($csr, null, $wrong, 365));
3437
var_dump(openssl_csr_sign($csr, null, $privkey, $wrong));
@@ -38,7 +41,7 @@ var_dump(openssl_csr_sign(array(), null, $privkey, 365));
3841
var_dump(openssl_csr_sign($csr, array(), $privkey, 365));
3942
var_dump(openssl_csr_sign($csr, null, array(), 365));
4043
var_dump(openssl_csr_sign($csr, null, $privkey, array()));
41-
var_dump(openssl_csr_sign($csr, null, $privkey, 365, array()));
44+
var_dump(openssl_csr_sign($csr, null, $privkey, 365, $config_arg));
4245
?>
4346
--EXPECTF--
4447
resource(%d) of type (OpenSSL X.509)

0 commit comments

Comments
 (0)