diff options
| author | Jakub Zelenka <bukka@php.net> | 2018-04-15 20:43:17 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2018-04-15 20:43:17 +0100 |
| commit | 8327c4c3bd8844f3b312ac9d72cb940e73e48109 (patch) | |
| tree | 78d7b7a6f77320db87f1e4de249f9bc8a235659a /ext/openssl | |
| parent | 193c02875aceb459b1e8332dbf9fda95d76ef67f (diff) | |
| parent | 98e43a33c88b2d0839ca0857385a7bd0ee545880 (diff) | |
| download | php-git-8327c4c3bd8844f3b312ac9d72cb940e73e48109.tar.gz | |
Merge branch 'PHP-7.2'
Diffstat (limited to 'ext/openssl')
| -rw-r--r-- | ext/openssl/tests/openssl_error_string_basic.phpt | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/ext/openssl/tests/openssl_error_string_basic.phpt b/ext/openssl/tests/openssl_error_string_basic.phpt index 9293a704d2..69b05572e0 100644 --- a/ext/openssl/tests/openssl_error_string_basic.phpt +++ b/ext/openssl/tests/openssl_error_string_basic.phpt @@ -79,6 +79,9 @@ while (($enc_error_new = openssl_error_string()) !== false) { var_dump($error_queue_size); echo "\n"; +$is_111 = OPENSSL_VERSION_NUMBER >= 0x10101000; +$err_pem_no_start_line = $is_111 ? '0909006C': '0906D06C'; + // PKEY echo "PKEY errors\n"; // file for pkey (file:///) fails when opennig (BIO_new_file) @@ -86,7 +89,7 @@ echo "PKEY errors\n"; expect_openssl_errors('openssl_pkey_export_to_file opening', ['02001002', '2006D080']); // file or private pkey is not correct PEM - failing PEM_read_bio_PrivateKey @openssl_pkey_export_to_file($csr_file, $output_file); -expect_openssl_errors('openssl_pkey_export_to_file pem', ['0906D06C']); +expect_openssl_errors('openssl_pkey_export_to_file pem', [$err_pem_no_start_line]); // file to export cannot be written @openssl_pkey_export_to_file($private_key_file, $invalid_file_for_write); expect_openssl_errors('openssl_pkey_export_to_file write', ['2006D002']); @@ -95,7 +98,7 @@ expect_openssl_errors('openssl_pkey_export_to_file write', ['2006D002']); expect_openssl_errors('openssl_pkey_export', ['06065064', '0906A065']); // invalid x509 for getting public key @openssl_pkey_get_public($private_key_file); -expect_openssl_errors('openssl_pkey_get_public', ['0906D06C']); +expect_openssl_errors('openssl_pkey_get_public', [$err_pem_no_start_line]); // private encrypt with unknown padding @openssl_private_encrypt("data", $crypted, $private_key_file, 1000); expect_openssl_errors('openssl_private_encrypt', ['04066076']); @@ -105,7 +108,7 @@ expect_openssl_errors('openssl_private_decrypt', ['04065072']); // public encrypt and decrypt with failed padding check and padding @openssl_public_encrypt("data", $crypted, $public_key_file, 1000); @openssl_public_decrypt("data", $crypted, $public_key_file); -expect_openssl_errors('openssl_private_(en|de)crypt padding', ['0906D06C', '04068076', '04067072']); +expect_openssl_errors('openssl_private_(en|de)crypt padding', [$err_pem_no_start_line, '04068076', '04067072']); // X509 echo "X509 errors\n"; @@ -114,7 +117,7 @@ echo "X509 errors\n"; expect_openssl_errors('openssl_x509_export_to_file open', ['02001002']); // file or str cert is not correct PEM - failing PEM_read_bio_X509 or PEM_ASN1_read_bio @openssl_x509_export_to_file($csr_file, $output_file); -expect_openssl_errors('openssl_x509_export_to_file pem', ['0906D06C']); +expect_openssl_errors('openssl_x509_export_to_file pem', [$err_pem_no_start_line]); // file to export cannot be written @openssl_x509_export_to_file($crt_file, $invalid_file_for_write); expect_openssl_errors('openssl_x509_export_to_file write', ['2006D002']); @@ -129,7 +132,7 @@ echo "CSR errors\n"; expect_openssl_errors('openssl_csr_get_subject open', ['02001002', '2006D080']); // 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']); +expect_openssl_errors('openssl_csr_get_subjec pem', [$err_pem_no_start_line]); // other possible cuases that are difficult to catch: // - ASN1_STRING_to_UTF8 fails in add_assoc_name_entry |