com php-src: Rename private.key to private_rsa_1024 .key: ext/openssl/tests/009.phpt ext/openssl/te sts/013.phpt ext/openssl/tests/014.phpt ext
/openssl/tests/015.phpt ext/openssl/tests/016 .phpt ext/openssl/tests/017.phpt ext/openssl/test s/018.phpt ext/openssl/tests/019.phpt ext/o
penssl/tests/021.phpt ext/openssl/tests/023.p hpt ext/openssl/tests/024.phpt ext/openssl/tests/ 025.phpt ext/openssl/tests/private.key ext/openss
l/tests/private_rsa_1024.key

From: Date: Sun, 31 Jan 2016 13:54:16 +0000
Subject: com php-src: Rename private.key to private_rsa_1024 .key: ext/openssl/tests/009.phpt ext/openssl/te sts/013.phpt ext/openssl/tests/014.phpt ext
/openssl/tests/015.phpt ext/openssl/tests/016 .phpt ext/openssl/tests/017.phpt ext/openssl/test s/018.phpt ext/openssl/tests/019.phpt ext/o
penssl/tests/021.phpt ext/openssl/tests/023.p hpt ext/openssl/tests/024.phpt ext/openssl/tests/ 025.phpt ext/openssl/tests/private.key ext/openss
l/tests/private_rsa_1024.key
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-90841@lists.php.net to get a copy of this message
Commit: 148d013323989f12f0c338895e7ddae1414fdac6 Author: Jakub Zelenka <bukka@php.net> Sun, 31 Jan 2016 13:54:16 +0000 Parents: 6cc1c962f790203a41a236ae98edb5f226452950 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=148d013323989f12f0c338895e7ddae1414fdac6 Log: Rename private.key to private_rsa_1024.key Changed paths: M ext/openssl/tests/009.phpt M ext/openssl/tests/013.phpt M ext/openssl/tests/014.phpt M ext/openssl/tests/015.phpt M ext/openssl/tests/016.phpt M ext/openssl/tests/017.phpt M ext/openssl/tests/018.phpt M ext/openssl/tests/019.phpt M ext/openssl/tests/021.phpt M ext/openssl/tests/023.phpt M ext/openssl/tests/024.phpt M ext/openssl/tests/025.phpt D ext/openssl/tests/private.key A ext/openssl/tests/private_rsa_1024.key

diff --git a/ext/openssl/tests/009.phpt b/ext/openssl/tests/009.phpt index a7156dd..df18322 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 91bb73d..55bb9eb 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 6123964..72ac154 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 a89121d..7caa66f 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 2d772e7..42d72b9 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 65a7cd1..76a08b8 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 230c0a8..3d41ee1 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 c1f186c..a21dfed 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 391b6a5..ae948e3 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 1489613..5f74f97 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 0a61840..5589abb 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 ac567a5..46c3926 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.key deleted file mode 100644 index bce512e..0000000 --- a/ext/openssl/tests/private.key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXAIBAAKBgQDLXp6PkCtbpV+P1gwFQWH6Ez0U83uEmS8IGnpeI8Fk8rY/vHOZ -zZZaxRCw+loyc342qCDIQheMOCNm5Fkevz06q757/oooiLR3yryYGKiKG1IZIipl -mtsC95oKrzUSKk60wuI1mbgpMUP5LKi/Tvxes5PmkUtXfimz2qgkeUcPpQIDAQAB -AoGBAMcP/dp+fsI9FFYBaVC3mASlUjOwxKWdH3kqGb8N9p4uKRAoEWtp3hNJM7ZX -x3P8sn0jgrsiXlRFGvn65/T9shp8hj+CdJKg2jKCs7S58v60TLfSvOQSIYsw9Qm9 -Bsx4hKfz+d52ptuJRbv8tDxsYP3D/KjQfpX1OysiP/WBfeg9AkEA+AGT0goqjWOM -YgFtZGrefIegF31XSCQTaLIml6/2JwF+oBKjJUQFar2Rwn6qUwrsGtSPMM0Iz8ry -9uvUbs8PPwJBANHsuTVWzLf8TJNGc+xIlhvzKFkF0nJIWx4ozhlMNDQMMF/3FRSo -zvHIgUnpG9Vwa2GtjTDnD8jHtzTauAZmjBsCQCGDVQ5VAVsJ0LaNqtKe/mGlkiSa -c2j0Nws2x7BHvuOWeB35ZsJqZrD93OyDYVDHcRBPGOpnSoGJ0zs6swImSNECQHSH -0BgH4wSPDYMDrP4RHSLOzCr+zF+cQthvFll8r83kpkXfRth9DMOy5fI9cLH/Adzr -FmF7Iov2MYEpmNYUvtkCQHfW0ntkVY9xS2/VTs57F5tUkfNG2hG74pJM6vSfTNWn -R/oI5m2sDtRWQ88LCYJMEmIZhN00Ys4xOSoTs+SUakY= ------END RSA PRIVATE KEY----- diff --git a/ext/openssl/tests/private_rsa_1024.key b/ext/openssl/tests/private_rsa_1024.key new file mode 100644 index 0000000..bce512e --- /dev/null +++ b/ext/openssl/tests/private_rsa_1024.key @@ -0,0 +1,15 @@ +-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDLXp6PkCtbpV+P1gwFQWH6Ez0U83uEmS8IGnpeI8Fk8rY/vHOZ +zZZaxRCw+loyc342qCDIQheMOCNm5Fkevz06q757/oooiLR3yryYGKiKG1IZIipl +mtsC95oKrzUSKk60wuI1mbgpMUP5LKi/Tvxes5PmkUtXfimz2qgkeUcPpQIDAQAB +AoGBAMcP/dp+fsI9FFYBaVC3mASlUjOwxKWdH3kqGb8N9p4uKRAoEWtp3hNJM7ZX +x3P8sn0jgrsiXlRFGvn65/T9shp8hj+CdJKg2jKCs7S58v60TLfSvOQSIYsw9Qm9 +Bsx4hKfz+d52ptuJRbv8tDxsYP3D/KjQfpX1OysiP/WBfeg9AkEA+AGT0goqjWOM +YgFtZGrefIegF31XSCQTaLIml6/2JwF+oBKjJUQFar2Rwn6qUwrsGtSPMM0Iz8ry +9uvUbs8PPwJBANHsuTVWzLf8TJNGc+xIlhvzKFkF0nJIWx4ozhlMNDQMMF/3FRSo +zvHIgUnpG9Vwa2GtjTDnD8jHtzTauAZmjBsCQCGDVQ5VAVsJ0LaNqtKe/mGlkiSa +c2j0Nws2x7BHvuOWeB35ZsJqZrD93OyDYVDHcRBPGOpnSoGJ0zs6swImSNECQHSH +0BgH4wSPDYMDrP4RHSLOzCr+zF+cQthvFll8r83kpkXfRth9DMOy5fI9cLH/Adzr +FmF7Iov2MYEpmNYUvtkCQHfW0ntkVY9xS2/VTs57F5tUkfNG2hG74pJM6vSfTNWn +R/oI5m2sDtRWQ88LCYJMEmIZhN00Ys4xOSoTs+SUakY= +-----END RSA PRIVATE KEY-----
« previous php.cvs (#90841) next »