diff options
| author | Remi Collet <remi@php.net> | 2017-03-13 08:17:42 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2017-03-13 08:17:42 +0100 |
| commit | 1ffb1b95974e1eb3b0aedfb7a4278a89fc7a6326 (patch) | |
| tree | 28b107032e62de49c9200d19a5b708c694d86d9e | |
| parent | fbf0e0587f8455525466e6d4ab2c1f0fc24bfe26 (diff) | |
| download | php-git-1ffb1b95974e1eb3b0aedfb7a4278a89fc7a6326.tar.gz | |
rely on provided openssl.cnf to avoid possible failure with system defaults
| -rw-r--r-- | ext/openssl/tests/001.phpt | 5 | ||||
| -rw-r--r-- | ext/openssl/tests/openssl_free_key.phpt | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ext/openssl/tests/001.phpt b/ext/openssl/tests/001.phpt index d62612b734..2d0aa907fe 100644 --- a/ext/openssl/tests/001.phpt +++ b/ext/openssl/tests/001.phpt @@ -18,7 +18,8 @@ for ($z = "", $i = 0; $i < 1024; $i++) { usleep($i); } -$privkey = openssl_pkey_new(); +$conf = array('config' => dirname(__FILE__) . DIRECTORY_SEPARATOR . 'openssl.cnf'); +$privkey = openssl_pkey_new($conf); if ($privkey === false) die("failed to create private key"); @@ -30,7 +31,7 @@ if ($key_file_name === false) echo "Export key to file\n"; -openssl_pkey_export_to_file($privkey, $key_file_name, $passphrase) or die("failed to export to file $key_file_name"); +openssl_pkey_export_to_file($privkey, $key_file_name, $passphrase, $conf) or die("failed to export to file $key_file_name"); echo "Load key from file - array syntax\n"; diff --git a/ext/openssl/tests/openssl_free_key.phpt b/ext/openssl/tests/openssl_free_key.phpt index 816f7cf5eb..ea79ce703a 100644 --- a/ext/openssl/tests/openssl_free_key.phpt +++ b/ext/openssl/tests/openssl_free_key.phpt @@ -22,7 +22,8 @@ for ($z = "", $i = 0; $i < 1024; $i++) { usleep($i); } -$privkey = openssl_pkey_new(); +$conf = array('config' => dirname(__FILE__) . DIRECTORY_SEPARATOR . 'openssl.cnf'); +$privkey = openssl_pkey_new($conf); if ($privkey === false) die("failed to create private key"); @@ -34,7 +35,7 @@ if ($key_file_name === false) echo "Export key to file\n"; -openssl_pkey_export_to_file($privkey, $key_file_name, $passphrase) or die("failed to export to file $key_file_name"); +openssl_pkey_export_to_file($privkey, $key_file_name, $passphrase, $conf) or die("failed to export to file $key_file_name"); echo "Load key from file - array syntax\n"; |