diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-06-16 20:11:54 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-06-16 20:11:54 +0100 |
| commit | 307e546e1a41b51b0ff5fd918315c3626d7b6385 (patch) | |
| tree | 765a4c92606cace2f873f55978809bc3cfd25fd2 | |
| parent | cc8ffa6911f7426fa8021483a47ec1dd02f17202 (diff) | |
| parent | 0c34f53c93d65ef4741a9c6493f84a13ab68cb72 (diff) | |
| download | php-git-307e546e1a41b51b0ff5fd918315c3626d7b6385.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
| -rw-r--r-- | ext/openssl/tests/bug55259.phpt | 8 | ||||
| -rw-r--r-- | ext/openssl/tests/openssl_error_string_basic.phpt | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ext/openssl/tests/bug55259.phpt b/ext/openssl/tests/bug55259.phpt index 27ededdb18..b58d28ad73 100644 --- a/ext/openssl/tests/bug55259.phpt +++ b/ext/openssl/tests/bug55259.phpt @@ -16,14 +16,14 @@ $dh = openssl_pkey_new(array( 'dh'=> array( 'p' => hex2bin($phex), 'g' => '2' )) $details = openssl_pkey_get_details($dh); var_dump(bin2hex($details['dh']['p'])); var_dump($details['dh']['g']); -var_dump(strlen($details['dh']['pub_key'])); -var_dump(strlen($details['dh']['priv_key'])); +var_dump(strlen($details['dh']['pub_key']) > 0); +var_dump(strlen($details['dh']['priv_key']) > 0); echo "Done"; ?> --EXPECT-- bool(false) string(256) "dcf93a0b883972ec0e19989ac5a2ce310e1d37717e8d9571bb7623731866e61ef75a2e27898b057f9891c2e27a639c3f29b60814581cd3b2ca3986d2683705577d45c2e7e52dc81c7a171876e5cea74b1448bfdfaf18828efd2519f14e45e3826634af1949e5b535cc829a483b8a76223e5d490a257f05bdff16f2fb22c583ab" string(1) "2" -int(128) -int(128) +bool(true) +bool(true) Done diff --git a/ext/openssl/tests/openssl_error_string_basic.phpt b/ext/openssl/tests/openssl_error_string_basic.phpt index 76bc2d570a..82f3099264 100644 --- a/ext/openssl/tests/openssl_error_string_basic.phpt +++ b/ext/openssl/tests/openssl_error_string_basic.phpt @@ -128,8 +128,8 @@ echo "CSR errors\n"; @openssl_csr_get_subject("file://" . $invalid_file_for_read); expect_openssl_errors('openssl_csr_get_subject open', ['02001002', '2006D080', '20068079', '0906D06C']); // file or str csr is not correct PEM - failing PEM_read_bio_X509_REQ -openssl_csr_get_subject($crt_file); -@expect_openssl_errors('openssl_csr_get_subjec pem', ['0906D06C']); +@openssl_csr_get_subject($crt_file); +expect_openssl_errors('openssl_csr_get_subjec pem', ['0906D06C']); // other possible cuases that are difficult to catch: // - ASN1_STRING_to_UTF8 fails in add_assoc_name_entry |