Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch '5.3' into 5.4

* 5.3:
  Fix bug #61405 ext\openssl\tests\022.phpt fails
  Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
  • Loading branch information...
commit 8d7a489b97eb436a5e99c008e57fdb068c86ec67 2 parents 7fdd35d + b638d30
@weltling weltling authored
Showing with 5 additions and 2 deletions.
  1. +5 −2 ext/openssl/tests/022.phpt
View
7 ext/openssl/tests/022.phpt
@@ -5,6 +5,8 @@ openssl_csr_export() tests
--FILE--
<?php
$wrong = "wrong";
+$config = __DIR__ . DIRECTORY_SEPARATOR . 'openssl.cnf';
+$config_arg = array('config' => $config);
$dn = array(
"countryName" => "BR",
@@ -18,10 +20,11 @@ $args = array(
"digest_alg" => "sha1",
"private_key_bits" => 2048,
"private_key_type" => OPENSSL_KEYTYPE_DSA,
- "encrypt_key" => true
+ "encrypt_key" => true,
+ "config" => $config,
);
-$privkey = openssl_pkey_new();
+$privkey = openssl_pkey_new($config_arg);
$csr = openssl_csr_new($dn, $privkey, $args);
var_dump(openssl_csr_export($csr, $output));
var_dump(openssl_csr_export($wrong, $output));
Please sign in to comment.
Something went wrong with that request. Please try again.