diff options
author | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-01-15 11:27:29 +0100 |
---|---|---|
committer | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-01-17 14:52:46 +0100 |
commit | d1764ca33018f1f2e4a05926c879c67ad4aa8da5 (patch) | |
tree | 443cab099d2d5989a93a8102f599b51d36acc64e /ext/openssl/tests | |
parent | 117b18d22d14fb6a597b3cd6d52e75cef2d088bb (diff) | |
download | php-git-d1764ca33018f1f2e4a05926c879c67ad4aa8da5.tar.gz |
Make error messages more consistent by fixing capitalization
Closes GH-5066 As a first step, let's capitalize their initial letter when it is applicable.
Diffstat (limited to 'ext/openssl/tests')
29 files changed, 67 insertions, 67 deletions
diff --git a/ext/openssl/tests/bug38255.phpt b/ext/openssl/tests/bug38255.phpt index 03f9f29a03..d0e5d542cd 100644 --- a/ext/openssl/tests/bug38255.phpt +++ b/ext/openssl/tests/bug38255.phpt @@ -25,11 +25,11 @@ echo "Done\n"; ?> --EXPECTF-- -Warning: openssl_verify(): supplied key param cannot be coerced into a public key in %s on line %d +Warning: openssl_verify(): Supplied key param cannot be coerced into a public key in %s on line %d -Warning: openssl_verify(): supplied key param cannot be coerced into a public key in %s on line %d +Warning: openssl_verify(): Supplied key param cannot be coerced into a public key in %s on line %d bool(false) -Warning: openssl_verify(): supplied key param cannot be coerced into a public key in %s on line %d +Warning: openssl_verify(): Supplied key param cannot be coerced into a public key in %s on line %d bool(false) Done diff --git a/ext/openssl/tests/bug54992.phpt b/ext/openssl/tests/bug54992.phpt index fdd75680a3..9f559453e7 100644 --- a/ext/openssl/tests/bug54992.phpt +++ b/ext/openssl/tests/bug54992.phpt @@ -60,5 +60,5 @@ Warning: stream_socket_client(): Peer certificate CN=`bug54992_actual_peer_name' Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d bool(false) diff --git a/ext/openssl/tests/bug65538_002.phpt b/ext/openssl/tests/bug65538_002.phpt index 2a06d2d1b6..51d8f46f5b 100644 --- a/ext/openssl/tests/bug65538_002.phpt +++ b/ext/openssl/tests/bug65538_002.phpt @@ -22,4 +22,4 @@ Warning: remote cafile streams are disabled for security purposes in %s on line Warning: file_get_contents(): Failed to enable crypto in %s on line %d -Warning: file_get_contents(%s): failed to open stream: operation failed in %s on line %d +Warning: file_get_contents(%s): Failed to open stream: operation failed in %s on line %d diff --git a/ext/openssl/tests/bug65729.phpt b/ext/openssl/tests/bug65729.phpt index cffba43dfe..7a516d0be6 100644 --- a/ext/openssl/tests/bug65729.phpt +++ b/ext/openssl/tests/bug65729.phpt @@ -49,7 +49,7 @@ Warning: stream_socket_client(): Peer certificate CN=`*.test.com' did not match Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d bool(false) resource(%d) of type (stream) resource(%d) of type (stream) @@ -58,5 +58,5 @@ Warning: stream_socket_client(): Peer certificate CN=`*.test.com' did not match Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d bool(false) diff --git a/ext/openssl/tests/bug68920.phpt b/ext/openssl/tests/bug68920.phpt index 34e07a4532..3419c06bed 100644 --- a/ext/openssl/tests/bug68920.phpt +++ b/ext/openssl/tests/bug68920.phpt @@ -54,14 +54,14 @@ Warning: stream_socket_client(): Expected peer fingerprint must be a string or a Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to %s (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to %s (Unknown error) in %s on line %d bool(false) Warning: stream_socket_client(): Expected peer fingerprint must be a string or an array in %s on line %d Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to %s (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to %s (Unknown error) in %s on line %d bool(false) Warning: stream_socket_client(): Invalid peer_fingerprint array; [algo => fingerprint] form required in %s on line %d @@ -70,7 +70,7 @@ Warning: stream_socket_client(): peer_fingerprint match failure in %s on line %d Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to %s (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to %s (Unknown error) in %s on line %d bool(false) Warning: stream_socket_client(): Invalid peer_fingerprint array; [algo => fingerprint] form required in %s on line %d @@ -79,5 +79,5 @@ Warning: stream_socket_client(): peer_fingerprint match failure in %s on line %d Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to %s (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to %s (Unknown error) in %s on line %d bool(false) diff --git a/ext/openssl/tests/bug71475.phpt b/ext/openssl/tests/bug71475.phpt index 5df8ac27c6..6d4ca66580 100644 --- a/ext/openssl/tests/bug71475.phpt +++ b/ext/openssl/tests/bug71475.phpt @@ -11,5 +11,5 @@ openssl_seal($_, $_, $_, array_fill(0,64,0)); ?> DONE --EXPECTF-- -Warning: openssl_seal(): not a public key (1th member of pubkeys) in %s%ebug71475.php on line %d +Warning: openssl_seal(): Not a public key (1th member of pubkeys) in %s%ebug71475.php on line %d DONE diff --git a/ext/openssl/tests/cve-2013-6420.phpt b/ext/openssl/tests/cve-2013-6420.phpt index 4a4b28ca74..82cbf47ca8 100644 --- a/ext/openssl/tests/cve-2013-6420.phpt +++ b/ext/openssl/tests/cve-2013-6420.phpt @@ -10,7 +10,7 @@ var_dump($info['issuer']['emailAddress'], $info["validFrom_time_t"]); ?> Done --EXPECTF-- -%s openssl_x509_parse(): illegal length in timestamp in %s%ecve-2013-6420.php on line 3 +%s openssl_x509_parse(): Illegal length in timestamp in %s%ecve-2013-6420.php on line 3 string(27) "stefan.esser@sektioneins.de" int(-1) Done diff --git a/ext/openssl/tests/openssl_csr_new_basic.phpt b/ext/openssl/tests/openssl_csr_new_basic.phpt index 6774245dad..c18ac2a22e 100644 --- a/ext/openssl/tests/openssl_csr_new_basic.phpt +++ b/ext/openssl/tests/openssl_csr_new_basic.phpt @@ -23,7 +23,7 @@ var_dump(openssl_csr_new(["countryName" => "DE"], $x, $conf + ["x509_extensions" echo "Done\n"; ?> --EXPECTF-- -Warning: openssl_csr_new(): key array must be of the form array(0 => key, 1 => phrase) in %s on line %d +Warning: openssl_csr_new(): Key array must be of the form array(0 => key, 1 => phrase) in %s on line %d Warning: openssl_csr_new(): add1_attr_by_txt challengePassword_min -> 4 (failed; check error queue and value of string_mask OpenSSL option if illegal characters are reported) in %s on line %d bool(false) diff --git a/ext/openssl/tests/openssl_csr_sign_basic.phpt b/ext/openssl/tests/openssl_csr_sign_basic.phpt index 01306599ad..03e070e52b 100644 --- a/ext/openssl/tests/openssl_csr_sign_basic.phpt +++ b/ext/openssl/tests/openssl_csr_sign_basic.phpt @@ -47,23 +47,23 @@ resource(%d) of type (OpenSSL X.509) resource(%d) of type (OpenSSL X.509) resource(%d) of type (OpenSSL X.509) -Warning: openssl_csr_sign(): cannot get cert from parameter 2 in %s on line %d +Warning: openssl_csr_sign(): Cannot get cert from parameter 2 in %s on line %d bool(false) -Warning: openssl_csr_sign(): cannot get private key from parameter 3 in %s on line %d +Warning: openssl_csr_sign(): Cannot get private key from parameter 3 in %s on line %d bool(false) -Warning: openssl_csr_sign(): cannot get CSR from parameter 1 in %s on line %d +Warning: openssl_csr_sign(): Cannot get CSR from parameter 1 in %s on line %d bool(false) -Warning: openssl_csr_sign(): cannot get CSR from parameter 1 in %s on line %d +Warning: openssl_csr_sign(): Cannot get CSR from parameter 1 in %s on line %d bool(false) -Warning: openssl_csr_sign(): cannot get cert from parameter 2 in %s on line %d +Warning: openssl_csr_sign(): Cannot get cert from parameter 2 in %s on line %d bool(false) -Warning: openssl_csr_sign(): key array must be of the form array(0 => key, 1 => phrase) in %s on line %d +Warning: openssl_csr_sign(): Key array must be of the form array(0 => key, 1 => phrase) in %s on line %d -Warning: openssl_csr_sign(): cannot get private key from parameter 3 in %s on line %d +Warning: openssl_csr_sign(): Cannot get private key from parameter 3 in %s on line %d bool(false) resource(%d) of type (OpenSSL X.509) diff --git a/ext/openssl/tests/openssl_open_basic.phpt b/ext/openssl/tests/openssl_open_basic.phpt index d564bcf8e8..fc41022818 100644 --- a/ext/openssl/tests/openssl_open_basic.phpt +++ b/ext/openssl/tests/openssl_open_basic.phpt @@ -22,7 +22,7 @@ var_dump($output4); --EXPECTF-- string(19) "openssl_open() test" -Warning: openssl_open(): unable to coerce parameter 4 into a private key in %s on line %d +Warning: openssl_open(): Unable to coerce parameter 4 into a private key in %s on line %d NULL string(19) "openssl_open() test" NULL diff --git a/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt b/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt index 89741f29c4..18fbeb0fd6 100644 --- a/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt +++ b/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt @@ -74,6 +74,6 @@ Warning: stream_socket_client(): peer_fingerprint match failure in %s on line %d Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d bool(false) resource(%d) of type (stream) diff --git a/ext/openssl/tests/openssl_pkcs12_export_basic.phpt b/ext/openssl/tests/openssl_pkcs12_export_basic.phpt index c6082bc645..41d2fbdedd 100644 --- a/ext/openssl/tests/openssl_pkcs12_export_basic.phpt +++ b/ext/openssl/tests/openssl_pkcs12_export_basic.phpt @@ -48,11 +48,11 @@ bool(true) bool(true) int(3) -Warning: openssl_pkcs12_export(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_pkcs12_export(): Cannot get cert from parameter 1 in %s on line %d bool(false) -Warning: openssl_pkcs12_export(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_pkcs12_export(): Cannot get cert from parameter 1 in %s on line %d bool(false) -Warning: openssl_pkcs12_export(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_pkcs12_export(): Cannot get cert from parameter 1 in %s on line %d openssl_pkcs12_export(): supplied resource is not a valid OpenSSL X.509 resource diff --git a/ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt b/ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt index f079ec8aac..994a0f85d5 100644 --- a/ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt +++ b/ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt @@ -53,11 +53,11 @@ bool(true) bool(true) bool(true) -Warning: openssl_pkcs12_export_to_file(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_pkcs12_export_to_file(): Cannot get cert from parameter 1 in %s on line %d bool(false) -Warning: openssl_pkcs12_export_to_file(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_pkcs12_export_to_file(): Cannot get cert from parameter 1 in %s on line %d bool(false) -Warning: openssl_pkcs12_export_to_file(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_pkcs12_export_to_file(): Cannot get cert from parameter 1 in %s on line %d openssl_pkcs12_export_to_file(): supplied resource is not a valid OpenSSL X.509 resource diff --git a/ext/openssl/tests/openssl_pkcs12_export_to_file_error.phpt b/ext/openssl/tests/openssl_pkcs12_export_to_file_error.phpt index 407eb3aacd..92d7f2789e 100644 --- a/ext/openssl/tests/openssl_pkcs12_export_to_file_error.phpt +++ b/ext/openssl/tests/openssl_pkcs12_export_to_file_error.phpt @@ -27,11 +27,11 @@ if (file_exists($pkcsfile)) { } ?> --EXPECTF-- -Warning: openssl_pkcs12_export_to_file(): cannot get private key from parameter 3 in %s on line %d +Warning: openssl_pkcs12_export_to_file(): Cannot get private key from parameter 3 in %s on line %d bool(false) -Warning: openssl_pkcs12_export_to_file(): private key does not correspond to cert in %s on line %d +Warning: openssl_pkcs12_export_to_file(): Private key does not correspond to cert in %s on line %d bool(false) -Warning: openssl_pkcs12_export_to_file(): error opening file . in %s on line %d +Warning: openssl_pkcs12_export_to_file(): Error opening file . in %s on line %d bool(false) diff --git a/ext/openssl/tests/openssl_pkcs7_decrypt_basic.phpt b/ext/openssl/tests/openssl_pkcs7_decrypt_basic.phpt index 937180a22e..f96fd401cd 100644 --- a/ext/openssl/tests/openssl_pkcs7_decrypt_basic.phpt +++ b/ext/openssl/tests/openssl_pkcs7_decrypt_basic.phpt @@ -45,22 +45,22 @@ if (file_exists($outfile)) { bool(true) bool(true) -Warning: openssl_pkcs7_decrypt(): unable to get private key in %s on line %d +Warning: openssl_pkcs7_decrypt(): Unable to get private key in %s on line %d bool(false) -Warning: openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert in %s on line %d +Warning: openssl_pkcs7_decrypt(): Unable to coerce parameter 3 to x509 cert in %s on line %d bool(false) -Warning: openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert in %s on line %d +Warning: openssl_pkcs7_decrypt(): Unable to coerce parameter 3 to x509 cert in %s on line %d bool(false) bool(false) bool(false) bool(false) -Warning: openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert in %s on line %d +Warning: openssl_pkcs7_decrypt(): Unable to coerce parameter 3 to x509 cert in %s on line %d bool(false) -Warning: openssl_pkcs7_decrypt(): unable to get private key in %s on line %d +Warning: openssl_pkcs7_decrypt(): Unable to get private key in %s on line %d bool(false) true true diff --git a/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt b/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt index 63dabe8f32..d7ae715efb 100644 --- a/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt +++ b/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt @@ -33,12 +33,12 @@ echo "Done\n"; Object of class stdClass could not be converted to string object(stdClass)#1 (0) { } -string(66) "openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert" +string(66) "openssl_pkcs7_decrypt(): Unable to coerce parameter 3 to x509 cert" bool(false) -string(66) "openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert" +string(66) "openssl_pkcs7_decrypt(): Unable to coerce parameter 3 to x509 cert" bool(false) -string(66) "openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert" +string(66) "openssl_pkcs7_decrypt(): Unable to coerce parameter 3 to x509 cert" bool(false) -string(66) "openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert" +string(66) "openssl_pkcs7_decrypt(): Unable to coerce parameter 3 to x509 cert" bool(false) Done diff --git a/ext/openssl/tests/openssl_pkcs7_sign_basic.phpt b/ext/openssl/tests/openssl_pkcs7_sign_basic.phpt index 08c96f8069..9b9ff91ddd 100644 --- a/ext/openssl/tests/openssl_pkcs7_sign_basic.phpt +++ b/ext/openssl/tests/openssl_pkcs7_sign_basic.phpt @@ -40,21 +40,21 @@ bool(true) bool(true) bool(true) -Warning: openssl_pkcs7_sign(): error opening input file %s in %s on line %d +Warning: openssl_pkcs7_sign(): Error opening input file %s in %s on line %d bool(false) -Warning: openssl_pkcs7_sign(): error opening input file %s in %s on line %d +Warning: openssl_pkcs7_sign(): Error opening input file %s in %s on line %d bool(false) -Warning: openssl_pkcs7_sign(): error opening output file %s in %s on line %d +Warning: openssl_pkcs7_sign(): Error opening output file %s in %s on line %d bool(false) -Warning: openssl_pkcs7_sign(): error getting cert in %s on line %d +Warning: openssl_pkcs7_sign(): Error getting cert in %s on line %d bool(false) -Warning: openssl_pkcs7_sign(): error getting cert in %s on line %d +Warning: openssl_pkcs7_sign(): Error getting cert in %s on line %d bool(false) -Warning: openssl_pkcs7_sign(): error getting private key in %s on line %d +Warning: openssl_pkcs7_sign(): Error getting private key in %s on line %d bool(false) true diff --git a/ext/openssl/tests/openssl_private_decrypt_basic.phpt b/ext/openssl/tests/openssl_private_decrypt_basic.phpt index c318fe89b1..6c1401a99a 100644 --- a/ext/openssl/tests/openssl_private_decrypt_basic.phpt +++ b/ext/openssl/tests/openssl_private_decrypt_basic.phpt @@ -31,7 +31,7 @@ NULL bool(false) NULL -Warning: openssl_private_decrypt(): key array must be of the form array(0 => key, 1 => phrase) in %s on line %d +Warning: openssl_private_decrypt(): Key array must be of the form array(0 => key, 1 => phrase) in %s on line %d Warning: openssl_private_decrypt(): key parameter is not a valid private key in %s on line %d bool(false) diff --git a/ext/openssl/tests/openssl_public_decrypt_basic.phpt b/ext/openssl/tests/openssl_public_decrypt_basic.phpt index 6c6fdc90f8..f6cd0aa5f0 100644 --- a/ext/openssl/tests/openssl_public_decrypt_basic.phpt +++ b/ext/openssl/tests/openssl_public_decrypt_basic.phpt @@ -33,13 +33,13 @@ NULL bool(false) NULL -Warning: openssl_public_decrypt(): key array must be of the form array(0 => key, 1 => phrase) in %s on line %d +Warning: openssl_public_decrypt(): Key array must be of the form array(0 => key, 1 => phrase) in %s on line %d Warning: openssl_public_decrypt(): key parameter is not a valid public key in %s on line %d bool(false) NULL -Warning: openssl_public_decrypt(): key array must be of the form array(0 => key, 1 => phrase) in %s on line %d +Warning: openssl_public_decrypt(): Key array must be of the form array(0 => key, 1 => phrase) in %s on line %d Warning: openssl_public_decrypt(): key parameter is not a valid public key in %s on line %d bool(false) diff --git a/ext/openssl/tests/openssl_seal_basic.phpt b/ext/openssl/tests/openssl_seal_basic.phpt index 18d3808745..0914ab6df2 100644 --- a/ext/openssl/tests/openssl_seal_basic.phpt +++ b/ext/openssl/tests/openssl_seal_basic.phpt @@ -27,7 +27,7 @@ var_dump(openssl_seal($data, $sealed, $ekeys, array($wrong))); echo "Done\n"; ?> --EXPECTF-- -Warning: openssl_seal(): not a public key (1th member of pubkeys) in %s on line %d +Warning: openssl_seal(): Not a public key (1th member of pubkeys) in %s on line %d bool(false) Warning: openssl_seal(): Fourth argument to openssl_seal() must be a non-empty array in %s on line %d @@ -35,12 +35,12 @@ bool(false) int(19) int(19) -Warning: openssl_seal(): not a public key (2th member of pubkeys) in %s on line %d +Warning: openssl_seal(): Not a public key (2th member of pubkeys) in %s on line %d bool(false) Warning: openssl_seal(): Fourth argument to openssl_seal() must be a non-empty array in %s on line %d bool(false) -Warning: openssl_seal(): not a public key (1th member of pubkeys) in %s on line %d +Warning: openssl_seal(): Not a public key (1th member of pubkeys) in %s on line %d bool(false) Done diff --git a/ext/openssl/tests/openssl_sign_basic.phpt b/ext/openssl/tests/openssl_sign_basic.phpt index c88d79f323..bbccda64a4 100644 --- a/ext/openssl/tests/openssl_sign_basic.phpt +++ b/ext/openssl/tests/openssl_sign_basic.phpt @@ -14,5 +14,5 @@ var_dump(openssl_sign($data, $sign, $wrong)); --EXPECTF-- bool(true) -Warning: openssl_sign(): supplied key param cannot be coerced into a private key in %s on line %d +Warning: openssl_sign(): Supplied key param cannot be coerced into a private key in %s on line %d bool(false) diff --git a/ext/openssl/tests/openssl_verify_basic.phpt b/ext/openssl/tests/openssl_verify_basic.phpt index 84d69502bf..99ec78129d 100644 --- a/ext/openssl/tests/openssl_verify_basic.phpt +++ b/ext/openssl/tests/openssl_verify_basic.phpt @@ -19,10 +19,10 @@ var_dump(openssl_verify($wrong, $sign, $pubkey)); --EXPECTF-- int(1) -Warning: openssl_verify(): supplied key param cannot be coerced into a public key in %s on line %d +Warning: openssl_verify(): Supplied key param cannot be coerced into a public key in %s on line %d bool(false) -Warning: openssl_verify(): supplied key param cannot be coerced into a public key in %s on line %d +Warning: openssl_verify(): Supplied key param cannot be coerced into a public key in %s on line %d bool(false) int(0) int(0) diff --git a/ext/openssl/tests/openssl_x509_export_basic.phpt b/ext/openssl/tests/openssl_x509_export_basic.phpt index aecf569489..03baae9266 100644 --- a/ext/openssl/tests/openssl_x509_export_basic.phpt +++ b/ext/openssl/tests/openssl_x509_export_basic.phpt @@ -32,11 +32,11 @@ var_dump(strcmp($output, $output5)); // different bool(true) bool(true) -Warning: openssl_x509_export(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_x509_export(): Cannot get cert from parameter 1 in %s on line %d bool(false) bool(true) -Warning: openssl_x509_export(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_x509_export(): Cannot get cert from parameter 1 in %s on line %d bool(false) int(0) int(0) diff --git a/ext/openssl/tests/openssl_x509_export_to_file_basic.phpt b/ext/openssl/tests/openssl_x509_export_to_file_basic.phpt index 7fb6c02168..45037449a9 100644 --- a/ext/openssl/tests/openssl_x509_export_to_file_basic.phpt +++ b/ext/openssl/tests/openssl_x509_export_to_file_basic.phpt @@ -32,11 +32,11 @@ if (file_exists($outfilename)) { bool(true) bool(true) -Warning: openssl_x509_export_to_file(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_x509_export_to_file(): Cannot get cert from parameter 1 in %s on line %d bool(false) bool(true) -Warning: openssl_x509_export_to_file(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_x509_export_to_file(): Cannot get cert from parameter 1 in %s on line %d bool(false) --- bool(true) diff --git a/ext/openssl/tests/openssl_x509_fingerprint_basic.phpt b/ext/openssl/tests/openssl_x509_fingerprint_basic.phpt index b2a87faa83..14f8c0c1ce 100644 --- a/ext/openssl/tests/openssl_x509_fingerprint_basic.phpt +++ b/ext/openssl/tests/openssl_x509_fingerprint_basic.phpt @@ -36,7 +36,7 @@ string(32) "ac77008e172897e06c0b065294487a67" string(40) "6e6fd1ea10a5a23071d61c728ee9b40df6dbc33c" ** Testing bad certification ** -Warning: openssl_x509_fingerprint(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_x509_fingerprint(): Cannot get cert from parameter 1 in %s on line %d bool(false) ** Testing bad hash method ** diff --git a/ext/openssl/tests/openssl_x509_read_basic.phpt b/ext/openssl/tests/openssl_x509_read_basic.phpt index f7579c7e81..d3aeadd29b 100644 --- a/ext/openssl/tests/openssl_x509_read_basic.phpt +++ b/ext/openssl/tests/openssl_x509_read_basic.phpt @@ -25,12 +25,12 @@ var_dump(openssl_x509_read($f)); // read an array with the filename resource(%d) of type (OpenSSL X.509) resource(%d) of type (OpenSSL X.509) -Warning: openssl_x509_read(): supplied parameter cannot be coerced into an X509 certificate! in %s on line %d +Warning: openssl_x509_read(): Supplied parameter cannot be coerced into an X509 certificate! in %s on line %d bool(false) resource(%d) of type (OpenSSL X.509) -Warning: openssl_x509_read(): supplied parameter cannot be coerced into an X509 certificate! in %s on line %d +Warning: openssl_x509_read(): Supplied parameter cannot be coerced into an X509 certificate! in %s on line %d bool(false) -Warning: openssl_x509_read(): supplied parameter cannot be coerced into an X509 certificate! in %s on line %d +Warning: openssl_x509_read(): Supplied parameter cannot be coerced into an X509 certificate! in %s on line %d bool(false) diff --git a/ext/openssl/tests/san_peer_matching.phpt b/ext/openssl/tests/san_peer_matching.phpt index 87410dd16d..f981141f83 100644 --- a/ext/openssl/tests/san_peer_matching.phpt +++ b/ext/openssl/tests/san_peer_matching.phpt @@ -48,5 +48,5 @@ Warning: stream_socket_client(): Unable to locate peer certificate CN in %s on l Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d bool(false) diff --git a/ext/openssl/tests/stream_security_level.phpt b/ext/openssl/tests/stream_security_level.phpt index 8a8131542d..b47ab97adc 100644 --- a/ext/openssl/tests/stream_security_level.phpt +++ b/ext/openssl/tests/stream_security_level.phpt @@ -67,5 +67,5 @@ error:1416F086:SSL routines:tls_process_server_certificate:certificate verify fa Warning: stream_socket_client(): Failed to enable crypto in %s : eval()'d code on line %d -Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64322 (Unknown error) in %s : eval()'d code on line %d +Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64322 (Unknown error) in %s : eval()'d code on line %d bool(false) diff --git a/ext/openssl/tests/stream_verify_peer_name_003.phpt b/ext/openssl/tests/stream_verify_peer_name_003.phpt index 1770c357bd..a87b161b6a 100644 --- a/ext/openssl/tests/stream_verify_peer_name_003.phpt +++ b/ext/openssl/tests/stream_verify_peer_name_003.phpt @@ -58,5 +58,5 @@ Warning: stream_socket_client(): Peer certificate CN=`stream_verify_peer_name_00 Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d bool(false) |