Patch php53_021.diff for OpenSSL related Bug #61404

Patch version 2012-03-15 19:33 UTC

• 2012-03-15 19:33 UTC [diff to current]

Developer: ab@php.net

Index: ext/openssl/tests/021.phpt
===================================================================
--- ext/openssl/tests/021.phpt	(Revision 324268)
+++ ext/openssl/tests/021.phpt	(Arbeitskopie)
@@ -8,6 +8,8 @@
 $priv = "file://" . dirname(__FILE__) . "/private.key";
 $wrong = "wrong";
 $pub = "file://" . dirname(__FILE__) . "/public.key";
+$config = __DIR__ . DIRECTORY_SEPARATOR . 'openssl.cnf';
+$config_arg = array('config' => $config);
 
 $dn = array(
 	"countryName" => "BR",
@@ -21,14 +23,15 @@
 	"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_sign($csr, null, $privkey, 365, $args));
-var_dump(openssl_csr_sign($csr, null, $privkey, 365));
-var_dump(openssl_csr_sign($csr, $cert, $priv, 365));
+var_dump(openssl_csr_sign($csr, null, $privkey, 365, $config_arg));
+var_dump(openssl_csr_sign($csr, $cert, $priv, 365, $config_arg));
 var_dump(openssl_csr_sign($csr, $wrong, $privkey, 365));
 var_dump(openssl_csr_sign($csr, null, $wrong, 365));
 var_dump(openssl_csr_sign($csr, null, $privkey, $wrong));
@@ -38,7 +41,7 @@
 var_dump(openssl_csr_sign($csr, array(), $privkey, 365));
 var_dump(openssl_csr_sign($csr, null, array(), 365));
 var_dump(openssl_csr_sign($csr, null, $privkey, array()));
-var_dump(openssl_csr_sign($csr, null, $privkey, 365, array()));
+var_dump(openssl_csr_sign($csr, null, $privkey, 365, $config_arg));
 ?>
 --EXPECTF--
 resource(%d) of type (OpenSSL X.509)