From: Jakub Zelenka <bukka@php.net>
Date: Sun, 31 Jan 2016 13:54:16 +0000 (+0000)
Subject: Rename private.key to private_rsa_1024.key
X-Git-Tag: php-7.0.4RC1~20^2~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=148d013323989f12f0c338895e7ddae1414fdac6;p=php

Rename private.key to private_rsa_1024.key
---

diff --git a/ext/openssl/tests/009.phpt b/ext/openssl/tests/009.phpt
index a7156dd8d0..df18322453 100644
--- a/ext/openssl/tests/009.phpt
+++ b/ext/openssl/tests/009.phpt
@@ -8,12 +8,12 @@ $fp = fopen(dirname(__FILE__) . "/cert.crt","r");
 $a = fread($fp,8192);
 fclose($fp);
 
-$fp = fopen(dirname(__FILE__) . "/private.key","r");
+$fp = fopen(dirname(__FILE__) . "/private_rsa_1024.key","r");
 $b = fread($fp,8192);
 fclose($fp);
 
 $cert = "file://" . dirname(__FILE__) . "/cert.crt";
-$key = "file://" . dirname(__FILE__) . "/private.key";
+$key = "file://" . dirname(__FILE__) . "/private_rsa_1024.key";
 
 var_dump(openssl_x509_check_private_key($cert, $key));
 var_dump(openssl_x509_check_private_key("", $key));
diff --git a/ext/openssl/tests/013.phpt b/ext/openssl/tests/013.phpt
index 91bb73dab3..55bb9eb0e3 100644
--- a/ext/openssl/tests/013.phpt
+++ b/ext/openssl/tests/013.phpt
@@ -6,7 +6,7 @@ openssl_open() tests
 <?php
 $data = "openssl_open() test";
 $pub_key = "file://" . dirname(__FILE__) . "/public.key";
-$priv_key = "file://" . dirname(__FILE__) . "/private.key";
+$priv_key = "file://" . dirname(__FILE__) . "/private_rsa_1024.key";
 $wrong = "wrong";
 
 openssl_seal($data, $sealed, $ekeys, array($pub_key, $pub_key, $pub_key));
diff --git a/ext/openssl/tests/014.phpt b/ext/openssl/tests/014.phpt
index 6123964ee5..72ac154058 100644
--- a/ext/openssl/tests/014.phpt
+++ b/ext/openssl/tests/014.phpt
@@ -5,7 +5,7 @@ openssl_private_encrypt() tests
 --FILE--
 <?php
 $data = "Testing openssl_private_encrypt()";
-$privkey = "file://" . dirname(__FILE__) . "/private.key";
+$privkey = "file://" . dirname(__FILE__) . "/private_rsa_1024.key";
 $pubkey = "file://" . dirname(__FILE__) . "/public.key";
 $wrong = "wrong";
 class test {
diff --git a/ext/openssl/tests/015.phpt b/ext/openssl/tests/015.phpt
index a89121de10..7caa66fa3b 100644
--- a/ext/openssl/tests/015.phpt
+++ b/ext/openssl/tests/015.phpt
@@ -5,7 +5,7 @@ openssl_public_encrypt() tests
 --FILE--
 <?php
 $data = "Testing openssl_public_encrypt()";
-$privkey = "file://" . dirname(__FILE__) . "/private.key";
+$privkey = "file://" . dirname(__FILE__) . "/private_rsa_1024.key";
 $pubkey = "file://" . dirname(__FILE__) . "/public.key";
 $wrong = "wrong";
 class test {
diff --git a/ext/openssl/tests/016.phpt b/ext/openssl/tests/016.phpt
index 2d772e7a36..42d72b9cd4 100644
--- a/ext/openssl/tests/016.phpt
+++ b/ext/openssl/tests/016.phpt
@@ -5,7 +5,7 @@ openssl_public_decrypt() tests
 --FILE--
 <?php
 $data = "Testing openssl_public_decrypt()";
-$privkey = "file://" . dirname(__FILE__) . "/private.key";
+$privkey = "file://" . dirname(__FILE__) . "/private_rsa_1024.key";
 $pubkey = "file://" . dirname(__FILE__) . "/public.key";
 $wrong = "wrong";
 
diff --git a/ext/openssl/tests/017.phpt b/ext/openssl/tests/017.phpt
index 65a7cd1025..76a08b8d55 100644
--- a/ext/openssl/tests/017.phpt
+++ b/ext/openssl/tests/017.phpt
@@ -5,7 +5,7 @@ openssl_private_decrypt() tests
 --FILE--
 <?php
 $data = "Testing openssl_public_decrypt()";
-$privkey = "file://" . dirname(__FILE__) . "/private.key";
+$privkey = "file://" . dirname(__FILE__) . "/private_rsa_1024.key";
 $pubkey = "file://" . dirname(__FILE__) . "/public.key";
 $wrong = "wrong";
 
diff --git a/ext/openssl/tests/018.phpt b/ext/openssl/tests/018.phpt
index 230c0a89db..3d41ee1d34 100644
--- a/ext/openssl/tests/018.phpt
+++ b/ext/openssl/tests/018.phpt
@@ -5,7 +5,7 @@ openssl_sign() tests
 --FILE--
 <?php
 $data = "Testing openssl_sign()";
-$privkey = "file://" . dirname(__FILE__) . "/private.key";
+$privkey = "file://" . dirname(__FILE__) . "/private_rsa_1024.key";
 $wrong = "wrong";
 
 var_dump(openssl_sign($data, $sign, $privkey));                 // no output
diff --git a/ext/openssl/tests/019.phpt b/ext/openssl/tests/019.phpt
index c1f186c335..a21dfedb01 100644
--- a/ext/openssl/tests/019.phpt
+++ b/ext/openssl/tests/019.phpt
@@ -5,7 +5,7 @@ openssl_verify() tests
 --FILE--
 <?php
 $data = "Testing openssl_verify()";
-$privkey = "file://" . dirname(__FILE__) . "/private.key";
+$privkey = "file://" . dirname(__FILE__) . "/private_rsa_1024.key";
 $pubkey = "file://" . dirname(__FILE__) . "/public.key";
 $wrong = "wrong";
 
diff --git a/ext/openssl/tests/021.phpt b/ext/openssl/tests/021.phpt
index 391b6a5279..ae948e3d25 100644
--- a/ext/openssl/tests/021.phpt
+++ b/ext/openssl/tests/021.phpt
@@ -5,7 +5,7 @@ openssl_csr_sign() tests
 --FILE--
 <?php
 $cert = "file://" . dirname(__FILE__) . "/cert.crt";
-$priv = "file://" . dirname(__FILE__) . "/private.key";
+$priv = "file://" . dirname(__FILE__) . "/private_rsa_1024.key";
 $wrong = "wrong";
 $pub = "file://" . dirname(__FILE__) . "/public.key";
 $config = __DIR__ . DIRECTORY_SEPARATOR . 'openssl.cnf';
diff --git a/ext/openssl/tests/023.phpt b/ext/openssl/tests/023.phpt
index 1489613327..5f74f97b0c 100644
--- a/ext/openssl/tests/023.phpt
+++ b/ext/openssl/tests/023.phpt
@@ -13,7 +13,7 @@ if ($outfile2 === false)
 	die("failed to get a temporary filename!");
 
 $single_cert = "file://" . dirname(__FILE__) . "/cert.crt";
-$privkey = "file://" . dirname(__FILE__) . "/private.key";
+$privkey = "file://" . dirname(__FILE__) . "/private_rsa_1024.key";
 $multi_certs = array($single_cert, $single_cert);
 $assoc_headers = array("To" => "test@test", "Subject" => "testing openssl_pkcs7_encrypt()");
 $headers = array("test@test", "testing openssl_pkcs7_encrypt()");
diff --git a/ext/openssl/tests/024.phpt b/ext/openssl/tests/024.phpt
index 0a61840de3..5589abb039 100644
--- a/ext/openssl/tests/024.phpt
+++ b/ext/openssl/tests/024.phpt
@@ -5,7 +5,7 @@ openssl_pkcs7_decrypt() tests
 --FILE--
 <?php
 $infile = dirname(__FILE__) . "/cert.crt";
-$privkey = "file://" . dirname(__FILE__) . "/private.key";
+$privkey = "file://" . dirname(__FILE__) . "/private_rsa_1024.key";
 $encrypted = tempnam("/tmp", "ssl");
 if ($encrypted === false)
 	die("failed to get a temporary filename!");
diff --git a/ext/openssl/tests/025.phpt b/ext/openssl/tests/025.phpt
index ac567a517a..46c3926fe8 100644
--- a/ext/openssl/tests/025.phpt
+++ b/ext/openssl/tests/025.phpt
@@ -9,7 +9,7 @@ $outfile = tempnam("/tmp", "ssl");
 if ($outfile === false)
 	die("failed to get a temporary filename!");
 
-$privkey = "file://" . dirname(__FILE__) . "/private.key";
+$privkey = "file://" . dirname(__FILE__) . "/private_rsa_1024.key";
 $single_cert = "file://" . dirname(__FILE__) . "/cert.crt";
 $assoc_headers = array("To" => "test@test", "Subject" => "testing openssl_pkcs7_sign()");
 $headers = array("test@test", "testing openssl_pkcs7_sign()");
diff --git a/ext/openssl/tests/private.key b/ext/openssl/tests/private_rsa_1024.key
similarity index 100%
rename from ext/openssl/tests/private.key
rename to ext/openssl/tests/private_rsa_1024.key