diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-05-04 11:42:05 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-05-04 11:42:05 +0200 |
| commit | f5936cceeb26d6094f0e142fcaed510ba5549c4f (patch) | |
| tree | 5f9209fa6f94295f3cd4022a8d3c3e6c00caba17 | |
| parent | 16fdf86ea3b4edd22373951aee59a82dc241f62e (diff) | |
| parent | 8a10259642f05b11f5fefa1399605a08957f5e59 (diff) | |
| download | php-git-f5936cceeb26d6094f0e142fcaed510ba5549c4f.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails
| -rw-r--r-- | ext/phar/tests/zip/phar_setsignaturealgo2.phpt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/phar/tests/zip/phar_setsignaturealgo2.phpt b/ext/phar/tests/zip/phar_setsignaturealgo2.phpt index 372f7ddc8e..7d3730c416 100644 --- a/ext/phar/tests/zip/phar_setsignaturealgo2.phpt +++ b/ext/phar/tests/zip/phar_setsignaturealgo2.phpt @@ -49,8 +49,10 @@ var_dump($p->getSignature()); echo $e->getMessage(); } try { -$keys=openssl_pkey_new(); -openssl_pkey_export($keys, $privkey); +$config = dirname(__FILE__) . '/../files/openssl.cnf'; +$config_arg = array('config' => $config); +$keys=openssl_pkey_new($config_arg); +openssl_pkey_export($keys, $privkey, NULL, $config_arg); $pubkey=openssl_pkey_get_details($keys); $p->setSignatureAlgorithm(Phar::OPENSSL, $privkey); |