diff options
author | Peter Kokot <peterkokot@gmail.com> | 2018-10-14 17:45:48 +0200 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2018-10-14 19:45:12 +0200 |
commit | 782352c54ad69c517e3c32b0dd2c25d74842647a (patch) | |
tree | 220bdc1e814e9f44b3578d49b3f239a3fdefa1d0 /ext/openssl | |
parent | 604d4bdae5037e021c1f9d35f08cbeddd610d84c (diff) | |
download | php-git-782352c54ad69c517e3c32b0dd2c25d74842647a.tar.gz |
Trim trailing whitespace in *.phpt
Diffstat (limited to 'ext/openssl')
34 files changed, 60 insertions, 60 deletions
diff --git a/ext/openssl/tests/001.phpt b/ext/openssl/tests/001.phpt index 7f5af24ae6..77b0f32183 100644 --- a/ext/openssl/tests/001.phpt +++ b/ext/openssl/tests/001.phpt @@ -1,9 +1,9 @@ --TEST-- OpenSSL private key functions --SKIPIF-- -<?php -if (!extension_loaded("openssl")) die("skip"); -if (!@openssl_pkey_new()) die("skip cannot create private key"); +<?php +if (!extension_loaded("openssl")) die("skip"); +if (!@openssl_pkey_new()) die("skip cannot create private key"); ?> --FILE-- <?php diff --git a/ext/openssl/tests/bug25614.phpt b/ext/openssl/tests/bug25614.phpt index a43130708b..6adc0f39c1 100644 --- a/ext/openssl/tests/bug25614.phpt +++ b/ext/openssl/tests/bug25614.phpt @@ -1,12 +1,12 @@ --TEST-- openssl: get public key from generated private key --SKIPIF-- -<?php -if (!extension_loaded("openssl")) die("skip"); -if (!@openssl_pkey_new()) die("skip cannot create private key"); +<?php +if (!extension_loaded("openssl")) die("skip"); +if (!@openssl_pkey_new()) die("skip cannot create private key"); ?> --FILE-- -<?php +<?php $priv = openssl_pkey_new(); $pub = openssl_pkey_get_public($priv); ?> diff --git a/ext/openssl/tests/bug28382.phpt b/ext/openssl/tests/bug28382.phpt index c3888e962b..1ff839bf4c 100644 --- a/ext/openssl/tests/bug28382.phpt +++ b/ext/openssl/tests/bug28382.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #28382 (openssl_x509_parse extensions support) --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip"); ?> --FILE-- diff --git a/ext/openssl/tests/bug36732.phpt b/ext/openssl/tests/bug36732.phpt index 72ca6904a9..2de0346bae 100644 --- a/ext/openssl/tests/bug36732.phpt +++ b/ext/openssl/tests/bug36732.phpt @@ -1,11 +1,11 @@ --TEST-- Bug #36732 (add support for req_extensions in openss_csr_new and sign) --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip"); ?> --FILE-- -<?php +<?php $configargs = array( "req_extensions" => "v3_req", "x509_extensions" => "usr_cert", diff --git a/ext/openssl/tests/bug37820.phpt b/ext/openssl/tests/bug37820.phpt index d85a935ff3..9eb27fa0f0 100644 --- a/ext/openssl/tests/bug37820.phpt +++ b/ext/openssl/tests/bug37820.phpt @@ -1,11 +1,11 @@ --TEST-- -openssl_sign/verify: accept different algos +openssl_sign/verify: accept different algos --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip"); ?> --FILE-- -<?php +<?php $dir = dirname(__FILE__); $file_pub = $dir . '/bug37820cert.pem'; $file_key = $dir . '/bug37820key.pem'; diff --git a/ext/openssl/tests/bug38255.phpt b/ext/openssl/tests/bug38255.phpt index 9eca6594a9..f49b77485c 100644 --- a/ext/openssl/tests/bug38255.phpt +++ b/ext/openssl/tests/bug38255.phpt @@ -1,12 +1,12 @@ --TEST-- -openssl key from zval leaks +openssl key from zval leaks --SKIPIF-- -<?php -if (!extension_loaded("openssl")) die("skip"); +<?php +if (!extension_loaded("openssl")) die("skip"); ?> --FILE-- <?php -$pub_key_id = false; +$pub_key_id = false; $signature = ''; $ok = openssl_verify("foo", $signature, $pub_key_id, OPENSSL_ALGO_MD5); diff --git a/ext/openssl/tests/bug38261.phpt b/ext/openssl/tests/bug38261.phpt index 6691947320..fa25d93d62 100644 --- a/ext/openssl/tests/bug38261.phpt +++ b/ext/openssl/tests/bug38261.phpt @@ -1,8 +1,8 @@ --TEST-- -openssl key from zval leaks +openssl key from zval leaks --SKIPIF-- -<?php -if (!extension_loaded("openssl")) die("skip"); +<?php +if (!extension_loaded("openssl")) die("skip"); ?> --FILE-- <?php diff --git a/ext/openssl/tests/bug39217.phpt b/ext/openssl/tests/bug39217.phpt index 47f234d769..b9c5e50a73 100644 --- a/ext/openssl/tests/bug39217.phpt +++ b/ext/openssl/tests/bug39217.phpt @@ -1,11 +1,11 @@ --TEST-- Bug #39217 (Large serial number return -1) --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip"); ?> --FILE-- -<?php +<?php $dir = dirname(__FILE__); $certs = array('bug39217cert2.txt', 'bug39217cert1.txt'); foreach($certs as $cert) { diff --git a/ext/openssl/tests/bug41033.phpt b/ext/openssl/tests/bug41033.phpt index f52a4c7d27..6f8ebc64c3 100644 --- a/ext/openssl/tests/bug41033.phpt +++ b/ext/openssl/tests/bug41033.phpt @@ -1,7 +1,7 @@ --TEST-- #41033, enable signing with DSA keys --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip, openssl required"); ?> --FILE-- diff --git a/ext/openssl/tests/bug41353.phpt b/ext/openssl/tests/bug41353.phpt index 2f5ca2007e..36a7be6e22 100644 --- a/ext/openssl/tests/bug41353.phpt +++ b/ext/openssl/tests/bug41353.phpt @@ -1,8 +1,8 @@ --TEST-- Bug #41353 (openssl_pkcs12_read() does not verify the type of the first arg) --SKIPIF-- -<?php -if (!extension_loaded("openssl")) die("skip"); +<?php +if (!extension_loaded("openssl")) die("skip"); ?> --FILE-- <?php diff --git a/ext/openssl/tests/bug46127.phpt b/ext/openssl/tests/bug46127.phpt index f11d8baf0b..5bfa0cebb0 100644 --- a/ext/openssl/tests/bug46127.phpt +++ b/ext/openssl/tests/bug46127.phpt @@ -1,7 +1,7 @@ --TEST-- -#46127, openssl_sign/verify: accept different algos +#46127, openssl_sign/verify: accept different algos --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); if (!function_exists("proc_open")) die("skip no proc_open"); ?> diff --git a/ext/openssl/tests/bug48182.phpt b/ext/openssl/tests/bug48182.phpt index dcadaaa6b9..0357720003 100644 --- a/ext/openssl/tests/bug48182.phpt +++ b/ext/openssl/tests/bug48182.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #48182: ssl handshake fails during asynchronous socket connection --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); if (!function_exists("proc_open")) die("skip no proc_open"); ?> diff --git a/ext/openssl/tests/bug54992.phpt b/ext/openssl/tests/bug54992.phpt index 01369dca00..c07bbf8cba 100644 --- a/ext/openssl/tests/bug54992.phpt +++ b/ext/openssl/tests/bug54992.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #54992: Stream not closed and error not returned when SSL CN_match fails --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); if (!function_exists("proc_open")) die("skip no proc_open"); ?> diff --git a/ext/openssl/tests/bug61124.phpt b/ext/openssl/tests/bug61124.phpt index 4b6194bdb4..9c7d0ac483 100644 --- a/ext/openssl/tests/bug61124.phpt +++ b/ext/openssl/tests/bug61124.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #61124: Segmentation fault with openssl_decrypt --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip"); --FILE-- <?php diff --git a/ext/openssl/tests/bug65729.phpt b/ext/openssl/tests/bug65729.phpt index 5e91197b70..cffba43dfe 100644 --- a/ext/openssl/tests/bug65729.phpt +++ b/ext/openssl/tests/bug65729.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #65729: CN_match gives false positive when wildcard is used --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); if (!function_exists("proc_open")) die("skip no proc_open"); ?> diff --git a/ext/openssl/tests/bug66501.phpt b/ext/openssl/tests/bug66501.phpt index 34dac6d44a..e023ee1480 100644 --- a/ext/openssl/tests/bug66501.phpt +++ b/ext/openssl/tests/bug66501.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #66501: EC private key support in openssl_sign --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip"); if (!defined('OPENSSL_KEYTYPE_EC')) die("skip no EC available"); ?> diff --git a/ext/openssl/tests/bug68912.phpt b/ext/openssl/tests/bug68912.phpt index c18291a6ec..963e660ee6 100644 --- a/ext/openssl/tests/bug68912.phpt +++ b/ext/openssl/tests/bug68912.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #68912 (Segmentation fault at openssl_spki_new) --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip"); if (!extension_loaded("xml")) die("skip xml extension not loaded"); if (!@openssl_pkey_new()) die("skip cannot create private key"); @@ -10,8 +10,8 @@ if (!@openssl_pkey_new()) die("skip cannot create private key"); <?php $var1=xml_parser_create_ns(); -$var2=2; -$var3=3; +$var2=2; +$var3=3; openssl_spki_new($var1, $var2, $var3); ?> diff --git a/ext/openssl/tests/bug68920.phpt b/ext/openssl/tests/bug68920.phpt index 4c6271819b..34e07a4532 100644 --- a/ext/openssl/tests/bug68920.phpt +++ b/ext/openssl/tests/bug68920.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #68920: peer_fingerprint input checks should be strict --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); if (!function_exists("proc_open")) die("skip no proc_open"); ?> diff --git a/ext/openssl/tests/bug71475.phpt b/ext/openssl/tests/bug71475.phpt index e959371c4c..659544297b 100644 --- a/ext/openssl/tests/bug71475.phpt +++ b/ext/openssl/tests/bug71475.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #71475: openssl_seal() uninitialized memory usage --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); ?> --FILE-- diff --git a/ext/openssl/tests/bug74903.phpt b/ext/openssl/tests/bug74903.phpt index 40b14f0acf..7a20b8693d 100644 --- a/ext/openssl/tests/bug74903.phpt +++ b/ext/openssl/tests/bug74903.phpt @@ -1,8 +1,8 @@ --TEST-- Bug #74903 openssl_pkcs7_encrypt() uses different EOL than before --SKIPIF-- -<?php -if (!extension_loaded("openssl")) die("skip"); +<?php +if (!extension_loaded("openssl")) die("skip"); ?> --FILE-- <?php diff --git a/ext/openssl/tests/openssl_csr_get_subject_basic.phpt b/ext/openssl/tests/openssl_csr_get_subject_basic.phpt index 7046085618..eba4a7ac8d 100644 --- a/ext/openssl/tests/openssl_csr_get_subject_basic.phpt +++ b/ext/openssl/tests/openssl_csr_get_subject_basic.phpt @@ -1,7 +1,7 @@ --TEST-- openssl_csr_get_subject() tests --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip"); ?> --FILE-- @@ -39,7 +39,7 @@ $csr_file = file_get_contents(dirname(__FILE__) . '/cert.csr'); var_dump(openssl_csr_get_subject($csr_file)); var_dump(openssl_csr_get_subject($csr, false)); ?> ---EXPECT-- +--EXPECT-- array(6) { ["C"]=> string(2) "NL" diff --git a/ext/openssl/tests/openssl_csr_new_basic.phpt b/ext/openssl/tests/openssl_csr_new_basic.phpt index 24db4a4afc..816c6f9d90 100644 --- a/ext/openssl/tests/openssl_csr_new_basic.phpt +++ b/ext/openssl/tests/openssl_csr_new_basic.phpt @@ -25,7 +25,7 @@ var_dump(openssl_csr_new(["countryName" => "DE"], $x, $conf + ["x509_extensions" echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: openssl_csr_new() expects parameter 1 to be array, int given in %s on line %d NULL diff --git a/ext/openssl/tests/openssl_decrypt_error.phpt b/ext/openssl/tests/openssl_decrypt_error.phpt index b34397a651..eab67f403c 100644 --- a/ext/openssl/tests/openssl_decrypt_error.phpt +++ b/ext/openssl/tests/openssl_decrypt_error.phpt @@ -12,7 +12,7 @@ $iv = str_repeat("\0", openssl_cipher_iv_length($method)); $encrypted = openssl_encrypt($data, $method, $password); var_dump($encrypted); /* Not passing $iv should be the same as all-NULL iv, but with a warning */ -var_dump(openssl_encrypt($data, $method, $password, 0, $iv)); +var_dump(openssl_encrypt($data, $method, $password, 0, $iv)); var_dump(openssl_decrypt($encrypted, $method, $wrong)); var_dump(openssl_decrypt($encrypted, $wrong, $password)); var_dump(openssl_decrypt($wrong, $method, $password)); diff --git a/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt b/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt index 430de54dfd..0a745e8c3d 100644 --- a/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt +++ b/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt @@ -1,7 +1,7 @@ --TEST-- Testing peer fingerprint on connection --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); if (!function_exists("proc_open")) die("skip no proc_open"); ?> diff --git a/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt b/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt index 3e76efe22d..f892c6854f 100644 --- a/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt +++ b/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt @@ -7,13 +7,13 @@ openssl_pkcs7_decrypt() and invalid parameters function myErrorHandler($errno, $errstr, $errfile, $errline) { var_dump($errstr); -} -set_error_handler("myErrorHandler"); +} +set_error_handler("myErrorHandler"); -$a = 1; -$b = 1; -$c = new stdclass; -$d = new stdclass; +$a = 1; +$b = 1; +$c = new stdclass; +$d = new stdclass; var_dump(openssl_pkcs7_decrypt($a, $b, $c, $d)); var_dump($c); @@ -25,7 +25,7 @@ var_dump(openssl_pkcs7_decrypt($a, $b, 0, 0)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(57) "Object of class stdClass could not be converted to string" string(66) "openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert" bool(false) diff --git a/ext/openssl/tests/openssl_seal_basic.phpt b/ext/openssl/tests/openssl_seal_basic.phpt index 4f1958a365..1899ebac3b 100644 --- a/ext/openssl/tests/openssl_seal_basic.phpt +++ b/ext/openssl/tests/openssl_seal_basic.phpt @@ -29,7 +29,7 @@ var_dump(openssl_seal($data, $sealed, $ekeys, array($wrong))); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: openssl_seal(): not a public key (1th member of pubkeys) in %s on line %d bool(false) diff --git a/ext/openssl/tests/openssl_sign_basic.phpt b/ext/openssl/tests/openssl_sign_basic.phpt index 3d41ee1d34..0200e5ba6e 100644 --- a/ext/openssl/tests/openssl_sign_basic.phpt +++ b/ext/openssl/tests/openssl_sign_basic.phpt @@ -12,7 +12,7 @@ var_dump(openssl_sign($data, $sign, $privkey)); // no output var_dump(openssl_sign($data, $sign, $wrong)); var_dump(openssl_sign(array(), $sign, $privkey)); ?> ---EXPECTF-- +--EXPECTF-- bool(true) Warning: openssl_sign(): supplied key param cannot be coerced into a private key in %s on line %d diff --git a/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt b/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt index 677f4d8905..9634663556 100644 --- a/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt +++ b/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt @@ -3,7 +3,7 @@ int openssl_x509_checkpurpose ( mixed $x509cert , int $purpose [, array $cainfo --CREDITS-- marcosptf - <marcosptf@yahoo.com.br> --SKIPIF-- -<?php if (!extension_loaded("openssl")) print "skip"; +<?php if (!extension_loaded("openssl")) print "skip"; if (OPENSSL_VERSION_NUMBER < 0x10000000) die("skip Output requires OpenSSL 1.0"); ?> --FILE-- diff --git a/ext/openssl/tests/openssl_x509_read_basic.phpt b/ext/openssl/tests/openssl_x509_read_basic.phpt index 5f530534ff..72a62f7079 100644 --- a/ext/openssl/tests/openssl_x509_read_basic.phpt +++ b/ext/openssl/tests/openssl_x509_read_basic.phpt @@ -6,7 +6,7 @@ openssl_x509_read() tests <?php $fp = fopen(dirname(__FILE__) . "/cert.crt","r"); $a = fread($fp,8192); -fclose($fp); +fclose($fp); $b = "file://" . dirname(__FILE__) . "/cert.crt"; $c = "invalid cert"; diff --git a/ext/openssl/tests/peer_verification.phpt b/ext/openssl/tests/peer_verification.phpt index 3abc191667..db2a773465 100644 --- a/ext/openssl/tests/peer_verification.phpt +++ b/ext/openssl/tests/peer_verification.phpt @@ -1,7 +1,7 @@ --TEST-- Peer verification enabled for client streams --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); if (!function_exists("proc_open")) die("skip no proc_open"); ?> diff --git a/ext/openssl/tests/san_peer_matching.phpt b/ext/openssl/tests/san_peer_matching.phpt index f048c4e0f1..87410dd16d 100644 --- a/ext/openssl/tests/san_peer_matching.phpt +++ b/ext/openssl/tests/san_peer_matching.phpt @@ -1,7 +1,7 @@ --TEST-- Peer verification matches SAN names --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); if (!function_exists("proc_open")) die("skip no proc_open"); ?> diff --git a/ext/openssl/tests/tlsv1.0_wrapper.phpt b/ext/openssl/tests/tlsv1.0_wrapper.phpt index 952a288305..6be29848bc 100644 --- a/ext/openssl/tests/tlsv1.0_wrapper.phpt +++ b/ext/openssl/tests/tlsv1.0_wrapper.phpt @@ -1,7 +1,7 @@ --TEST-- tlsv1.0 stream wrapper --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); if (!function_exists("proc_open")) die("skip no proc_open"); ?> diff --git a/ext/openssl/tests/tlsv1.1_wrapper.phpt b/ext/openssl/tests/tlsv1.1_wrapper.phpt index eedf54fea7..cbc9474ca8 100644 --- a/ext/openssl/tests/tlsv1.1_wrapper.phpt +++ b/ext/openssl/tests/tlsv1.1_wrapper.phpt @@ -1,7 +1,7 @@ --TEST-- tlsv1.1 stream wrapper --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); if (!function_exists("proc_open")) die("skip no proc_open"); ?> diff --git a/ext/openssl/tests/tlsv1.2_wrapper.phpt b/ext/openssl/tests/tlsv1.2_wrapper.phpt index 3d7b3ba26c..d1ec44053b 100644 --- a/ext/openssl/tests/tlsv1.2_wrapper.phpt +++ b/ext/openssl/tests/tlsv1.2_wrapper.phpt @@ -1,7 +1,7 @@ --TEST-- tlsv1.2 stream wrapper --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); if (!function_exists("proc_open")) die("skip no proc_open"); ?> |