com php-src: yet two test fixes in openssl in 5.6: ext/openssl/tests/bug60632.phpt ext/openssl/tests/openssl_pke y_export_basic.phpt

Commit: 343307000e1bdb2a50200069df9d6faed3a960c3 Author: Anatol Belski <ab@php.net> Tue, 16 Feb 2016 08:28:10 +0100 Parents: 974dea5e88c689320190dd91f5c51fc4dff07e49 Branches: PHP-5.6 PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=343307000e1bdb2a50200069df9d6faed3a960c3 Log: yet two test fixes in openssl in 5.6 Changed paths: M ext/openssl/tests/bug60632.phpt M ext/openssl/tests/openssl_pkey_export_basic.phpt Diff: diff --git a/ext/openssl/tests/bug60632.phpt b/ext/openssl/tests/bug60632.phpt index c718fed..a4b4731 100644 --- a/ext/openssl/tests/bug60632.phpt +++ b/ext/openssl/tests/bug60632.phpt @@ -10,7 +10,8 @@ $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']; diff --git a/ext/openssl/tests/openssl_pkey_export_basic.phpt b/ext/openssl/tests/openssl_pkey_export_basic.phpt index 8311ab1..d229d6b 100644 --- a/ext/openssl/tests/openssl_pkey_export_basic.phpt +++ b/ext/openssl/tests/openssl_pkey_export_basic.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']);