diff options
author | Anatoliy Belsky <ab@php.net> | 2012-05-04 11:32:12 +0200 |
---|---|---|
committer | Anatoliy Belsky <ab@php.net> | 2012-05-04 11:32:12 +0200 |
commit | 16fdf86ea3b4edd22373951aee59a82dc241f62e (patch) | |
tree | 9cafbe2d05317b2dd20022ee87c6e24e8b3aa175 /ext/phar/tests | |
parent | 31ab04ee25bc9d4edfa524c2a11a33f8cbc8d1b6 (diff) | |
parent | 6c12252790cdd75bd79335013badc657fd78af1a (diff) | |
download | php-git-16fdf86ea3b4edd22373951aee59a82dc241f62e.tar.gz |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt
Diffstat (limited to 'ext/phar/tests')
-rw-r--r-- | ext/phar/tests/tar/phar_setsignaturealgo2.phpt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/phar/tests/tar/phar_setsignaturealgo2.phpt b/ext/phar/tests/tar/phar_setsignaturealgo2.phpt index 422ca90e8a..c16e7523f8 100644 --- a/ext/phar/tests/tar/phar_setsignaturealgo2.phpt +++ b/ext/phar/tests/tar/phar_setsignaturealgo2.phpt @@ -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) { |