Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt
This commit is contained in:
Anatoliy Belsky 2012-05-04 11:32:12 +02:00
commit 16fdf86ea3

View File

@ -32,9 +32,11 @@ var_dump($p->getSignature());
echo $e->getMessage();
}
try {
$config = dirname(__FILE__) . '/../files/openssl.cnf';
$config_arg = array('config' => $config);
$private = openssl_get_privatekey(file_get_contents(dirname(dirname(__FILE__)) . '/files/private.pem'));
$pkey = '';
openssl_pkey_export($private, $pkey);
openssl_pkey_export($private, $pkey, NULL, $config_arg);
$p->setSignatureAlgorithm(Phar::OPENSSL, $pkey);
var_dump($p->getSignature());
} catch (Exception $e) {