Extend and speed up pkey export tests

diff --git a/ext/openssl/tests/001.phpt b/ext/openssl/tests/001.phpt
index 627077e8f4f952618600cceb378de269ec120a1e..1baa9588950408b19020879c4e06c3d84b64236d 100644 (file)
--- a/ext/openssl/tests/001.phpt
+++ b/ext/openssl/tests/001.phpt
@@ -9,15 +9,6 @@ if (!@openssl_pkey_new()) die("skip cannot create private key");
 <?php
 echo "Creating private key\n";
 
-/* stack up some entropy; performance is not critical,
- * and being slow will most likely even help the test.
- */
-for ($z = "", $i = 0; $i < 1024; $i++) {
-       $z .= $i * $i;
-       if (function_exists("usleep"))
-               usleep($i);
-}
-
 $conf = array('config' => dirname(__FILE__) . DIRECTORY_SEPARATOR . 'openssl.cnf');
 $privkey = openssl_pkey_new($conf);
 
@@ -32,6 +23,7 @@ if ($key_file_name === false)
 echo "Export key to file\n";
 
 openssl_pkey_export_to_file($privkey, $key_file_name, $passphrase, $conf) or die("failed to export to file $key_file_name");
+var_dump(is_resource($privkey));
 
 echo "Load key from file - array syntax\n";
 
@@ -69,6 +61,7 @@ echo "OK!\n";
 --EXPECT--
 Creating private key
 Export key to file
+bool(true)
 Load key from file - array syntax
 Load key using direct syntax
 Load key manually and use string syntax

diff --git a/ext/openssl/tests/openssl_pkey_export_basic.phpt b/ext/openssl/tests/openssl_pkey_export_basic.phpt
index d229d6b13529bd4c9308452bf035a68f8e285997..b591bfecd323771e6f9196e698047a48b3c3b3ca 100644 (file)
--- a/ext/openssl/tests/openssl_pkey_export_basic.phpt
+++ b/ext/openssl/tests/openssl_pkey_export_basic.phpt
@@ -37,7 +37,7 @@ $tempname = tempnam(sys_get_temp_dir(), 'openssl_ec');
 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']);
-
+var_dump(is_resource($key));
 // Clean the temporary file
 @unlink($tempname);
 
@@ -52,3 +52,4 @@ resource(%d) of type (OpenSSL key)
 bool(true)
 bool(true)
 bool(true)
+bool(true)