com php-src: use bundled openssl.cnf: ext/openssl/tests/027.phpt ext/openssl/tests/bug60632.phpt

Commit: aba42e3dda6e3210cf26e667badd2eb7766dae4e Author: Anatol Belski <ab@php.net> Wed, 23 Sep 2015 17:14:23 +0200 Parents: c256649d63322630ce2e9665ba4b57d4b0eee01e Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=aba42e3dda6e3210cf26e667badd2eb7766dae4e Log: use bundled openssl.cnf Changed paths: M ext/openssl/tests/027.phpt M ext/openssl/tests/bug60632..phpt Diff: diff --git a/ext/openssl/tests/027.phpt b/ext/openssl/tests/027.phpt index 8311ab1..d229d6b 100644 --- a/ext/openssl/tests/027.phpt +++ b/ext/openssl/tests/027.phpt @@ -10,7 +10,9 @@ if (!defined('OPENSSL_KEYTYPE_EC')) die("skip no EC available"); $key = openssl_pkey_get_private('file://' . dirname(__FILE__) . '/private_ec.key'); var_dump($key); -var_dump(openssl_pkey_export($key, $output)); +$config_arg = array("config" => __DIR__ . DIRECTORY_SEPARATOR . "openssl.cnf"); + +var_dump(openssl_pkey_export($key, $output, NULL, $config_arg)); echo $output; // Load the private key from the exported pem string @@ -18,7 +20,7 @@ $details = openssl_pkey_get_details(openssl_pkey_get_private($output)); var_dump(OPENSSL_KEYTYPE_EC === $details['type']); // Export key with passphrase -openssl_pkey_export($key, $output, 'passphrase'); +openssl_pkey_export($key, $output, 'passphrase', $config_arg); $details = openssl_pkey_get_details(openssl_pkey_get_private($output, 'passphrase')); var_dump(OPENSSL_KEYTYPE_EC === $details['type']); @@ -32,7 +34,7 @@ var_dump($details === openssl_pkey_get_details($pKey)); // Export to file $tempname = tempnam(sys_get_temp_dir(), 'openssl_ec'); -var_dump(openssl_pkey_export_to_file($key, $tempname)); +var_dump(openssl_pkey_export_to_file($key, $tempname, NULL, $config_arg)); $details = openssl_pkey_get_details(openssl_pkey_get_private('file://' . $tempname)); var_dump(OPENSSL_KEYTYPE_EC === $details['type']); diff --git a/ext/openssl/tests/bug60632.phpt b/ext/openssl/tests/bug60632.phpt index 972c20e..eb51276 100644 --- a/ext/openssl/tests/bug60632.phpt +++ b/ext/openssl/tests/bug60632.phpt @@ -6,11 +6,13 @@ if (!extension_loaded("openssl")) die("skip openssl not loaded"); ?> --FILE-- <?php + $pkey = openssl_pkey_new(array( 'digest_alg' => 'sha256', 'private_key_bits' => 1024, 'private_key_type' => OPENSSL_KEYTYPE_RSA, - 'encrypt_key' => false + 'encrypt_key' => false, + 'config' => __DIR__ . DIRECTORY_SEPARATOR . 'openssl.cnf', )); $details = openssl_pkey_get_details($pkey); $test_pubkey = $details['key'];