From 7af945e271d042a4991c9510f78b6ff7ac43ac34 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sun, 14 Oct 2018 15:37:22 +0200 Subject: Trim trailing whitespace in *.phpt --- ext/openssl/tests/001.phpt | 6 +++--- ext/openssl/tests/bug25614.phpt | 8 ++++---- ext/openssl/tests/bug28382.phpt | 2 +- ext/openssl/tests/bug36732.phpt | 4 ++-- ext/openssl/tests/bug37820.phpt | 6 +++--- ext/openssl/tests/bug38255.phpt | 8 ++++---- ext/openssl/tests/bug38261.phpt | 6 +++--- ext/openssl/tests/bug39217.phpt | 4 ++-- ext/openssl/tests/bug41033.phpt | 2 +- ext/openssl/tests/bug41353.phpt | 4 ++-- ext/openssl/tests/bug46127.phpt | 4 ++-- ext/openssl/tests/bug48182.phpt | 2 +- ext/openssl/tests/bug54992.phpt | 2 +- ext/openssl/tests/bug65729.phpt | 2 +- ext/openssl/tests/bug66501.phpt | 2 +- ext/openssl/tests/bug68912.phpt | 6 +++--- ext/openssl/tests/bug68920.phpt | 2 +- ext/openssl/tests/bug71475.phpt | 2 +- ext/openssl/tests/bug74903.phpt | 4 ++-- ext/openssl/tests/openssl_csr_get_subject_basic.phpt | 4 ++-- ext/openssl/tests/openssl_csr_new_basic.phpt | 2 +- ext/openssl/tests/openssl_decrypt_error.phpt | 2 +- ext/openssl/tests/openssl_peer_fingerprint_basic.phpt | 2 +- ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt | 14 +++++++------- ext/openssl/tests/openssl_seal_basic.phpt | 2 +- ext/openssl/tests/openssl_sign_basic.phpt | 2 +- ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt | 2 +- ext/openssl/tests/openssl_x509_read_basic.phpt | 2 +- ext/openssl/tests/peer_verification.phpt | 2 +- ext/openssl/tests/san_peer_matching.phpt | 2 +- ext/openssl/tests/tlsv1.0_wrapper.phpt | 2 +- ext/openssl/tests/tlsv1.1_wrapper.phpt | 2 +- ext/openssl/tests/tlsv1.2_wrapper.phpt | 2 +- 33 files changed, 59 insertions(+), 59 deletions(-) (limited to 'ext/openssl/tests') 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-- - --FILE-- --FILE-- - 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-- - --FILE-- diff --git a/ext/openssl/tests/bug36732.phpt b/ext/openssl/tests/bug36732.phpt index 5c1b70724d..105fd129d0 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-- - --FILE-- - "v3_req", "x509_extensions" => "usr_cert", diff --git a/ext/openssl/tests/bug37820.phpt b/ext/openssl/tests/bug37820.phpt index 994f9e412c..80a9f648a0 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-- - --FILE-- - --FILE-- --FILE-- --FILE-- - --FILE-- diff --git a/ext/openssl/tests/bug41353.phpt b/ext/openssl/tests/bug41353.phpt index 47fda89f7b..5f03c1c1ad 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-- - --FILE-- diff --git a/ext/openssl/tests/bug48182.phpt b/ext/openssl/tests/bug48182.phpt index d11cddf273..b509c7d858 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-- - 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-- - 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-- - diff --git a/ext/openssl/tests/bug66501.phpt b/ext/openssl/tests/bug66501.phpt index 3994ebdc3c..47a22dabdd 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-- - 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-- - 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-- - 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-- - --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-- - --FILE-- --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)); ?> ---EXPECTF-- +--EXPECTF-- 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 e0f52d739f..89d661d134 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, integer 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-- - diff --git a/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt b/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt index d4105db75a..d22501cc99 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"; ?> ---EXPECTF-- +--EXPECTF-- 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 - --SKIPIF-- - --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 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-- - 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-- - 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-- - 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-- - -- cgit v1.2.1