Skip to content

Commit c552b44

Browse files
GirgiasGirgias
committed
Streamline errors
1 parent 20bae0e commit c552b44

17 files changed

+73
-75
lines changed

‎ext/openssl/openssl.c‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1497,7 +1497,7 @@ PHP_FUNCTION(openssl_x509_export_to_file)
14971497

14981498
cert = php_openssl_x509_from_param(cert_obj, cert_str);
14991499
if (cert == NULL) {
1500-
zend_argument_value_error(1, "X.509 Certificate cannot be retrieved");
1500+
zend_argument_type_error(1, "cannot be coerced into an X.509 Certificate");
15011501
RETURN_THROWS();
15021502
}
15031503

@@ -1811,7 +1811,7 @@ PHP_FUNCTION(openssl_x509_export)
18111811

18121812
cert = php_openssl_x509_from_param(cert_obj, cert_str);
18131813
if (cert == NULL) {
1814-
zend_argument_type_error(1, "X.509 Certificate cannot be retrieved");
1814+
zend_argument_type_error(1, "cannot be coerced into an X.509 Certificate");
18151815
RETURN_THROWS();
18161816
}
18171817

@@ -1889,7 +1889,7 @@ PHP_FUNCTION(openssl_x509_fingerprint)
18891889

18901890
cert = php_openssl_x509_from_param(cert_obj, cert_str);
18911891
if (cert == NULL) {
1892-
zend_argument_type_error(1, "X.509 Certificate cannot be retrieved");
1892+
zend_argument_type_error(1, "cannot be coerced into an X.509 Certificate");
18931893
RETURN_THROWS();
18941894
}
18951895

@@ -2087,7 +2087,7 @@ PHP_FUNCTION(openssl_x509_parse)
20872087

20882088
cert = php_openssl_x509_from_param(cert_obj, cert_str);
20892089
if (cert == NULL) {
2090-
zend_argument_type_error(1, "cannot be coerced into an X509 certificate");
2090+
zend_argument_type_error(1, "cannot be coerced into an X.509 Certificate");
20912091
RETURN_THROWS();
20922092
}
20932093
array_init(return_value);
@@ -2348,7 +2348,7 @@ PHP_FUNCTION(openssl_x509_checkpurpose)
23482348
}
23492349
cert = php_openssl_x509_from_param(cert_obj, cert_str);
23502350
if (cert == NULL) {
2351-
zend_argument_type_error(1, "cannot be coerced into an X509 certificate");
2351+
zend_argument_type_error(1, "cannot be coerced into an X.509 Certificate");
23522352
goto clean_exit;
23532353
}
23542354

@@ -2455,7 +2455,7 @@ PHP_FUNCTION(openssl_x509_read)
24552455

24562456
cert = php_openssl_x509_from_param(cert_obj, cert_str);
24572457
if (cert == NULL) {
2458-
zend_argument_type_error(1, "X.509 Certificate cannot be retrieved");
2458+
zend_argument_type_error(1, "cannot be coerced into an X.509 Certificate");
24592459
RETURN_THROWS();
24602460
}
24612461

@@ -2575,7 +2575,7 @@ PHP_FUNCTION(openssl_pkcs12_export_to_file)
25752575

25762576
cert = php_openssl_x509_from_param(cert_obj, cert_str);
25772577
if (cert == NULL) {
2578-
zend_argument_type_error(1, "X.509 Certificate cannot be retrieved");
2578+
zend_argument_type_error(1, "cannot be coerced into an X.509 Certificate");
25792579
RETURN_THROWS();
25802580
}
25812581

@@ -2678,7 +2678,7 @@ PHP_FUNCTION(openssl_pkcs12_export)
26782678

26792679
cert = php_openssl_x509_from_param(cert_obj, cert_str);
26802680
if (cert == NULL) {
2681-
zend_argument_type_error(1, "X.509 Certificate cannot be retrieved");
2681+
zend_argument_type_error(1, "cannot be coerced into an X.509 Certificate");
26822682
RETURN_THROWS();
26832683
}
26842684

@@ -3088,7 +3088,7 @@ PHP_FUNCTION(openssl_csr_export_to_file)
30883088

30893089
csr = php_openssl_csr_from_param(csr_obj, csr_str);
30903090
if (csr == NULL) {
3091-
zend_argument_value_error(1, "X.509 Certificate Signing Request cannot be retrieved");
3091+
zend_argument_type_error(1, "cannot be coerced into an X.509 Certificate Signing Request");
30923092
RETURN_THROWS();
30933093
}
30943094

@@ -3140,9 +3140,7 @@ PHP_FUNCTION(openssl_csr_export)
31403140

31413141
csr = php_openssl_csr_from_param(csr_obj, csr_str);
31423142
if (csr == NULL) {
3143-
if (!EG(exception)) {
3144-
zend_argument_type_error(1, "X.509 Certificate Signing Request cannot be retrieved");
3145-
}
3143+
zend_argument_type_error(1, "cannot be coerced into an X.509 Certificate Signing Request");
31463144
RETURN_THROWS();
31473145
}
31483146

@@ -3204,7 +3202,7 @@ PHP_FUNCTION(openssl_csr_sign)
32043202

32053203
csr = php_openssl_csr_from_param(csr_obj, csr_str);
32063204
if (csr == NULL) {
3207-
zend_argument_type_error(1, "X.509 Certificate Signing Request cannot be retrieved");
3205+
zend_argument_type_error(1, "cannot be coerced into an X.509 Certificate Signing Request");
32083206
RETURN_THROWS();
32093207
}
32103208

@@ -3213,7 +3211,7 @@ PHP_FUNCTION(openssl_csr_sign)
32133211
if (cert_str || cert_obj) {
32143212
cert = php_openssl_x509_from_param(cert_obj, cert_str);
32153213
if (cert == NULL) {
3216-
zend_argument_type_error(2, "X.509 Certificate cannot be retrieved");
3214+
zend_argument_type_error(2, "cannot be coerced into an X.509 Certificate");
32173215
goto cleanup;
32183216
}
32193217
}
@@ -5074,7 +5072,7 @@ PHP_FUNCTION(openssl_pkcs7_encrypt)
50745072

50755073
cert = php_openssl_x509_from_zval(zcertval, &free_cert);
50765074
if (cert == NULL) {
5077-
zend_argument_value_error(3, "must be a valid certificate");
5075+
zend_argument_value_error(3, "must be a valid X.509 Certificate");
50785076
goto clean_exit;
50795077
}
50805078

@@ -5095,7 +5093,7 @@ PHP_FUNCTION(openssl_pkcs7_encrypt)
50955093

50965094
cert = php_openssl_x509_from_zval(zrecipcerts, &free_cert);
50975095
if (cert == NULL) {
5098-
zend_argument_value_error(3, "must be a valid certificate");
5096+
zend_argument_value_error(3, "must be a valid X.509 Certificate");
50995097
goto clean_exit;
51005098
}
51015099

@@ -5317,7 +5315,7 @@ PHP_FUNCTION(openssl_pkcs7_sign)
53175315

53185316
cert = php_openssl_x509_from_param(cert_obj, cert_str);
53195317
if (cert == NULL) {
5320-
zend_argument_type_error(3, "cannot be coerced into an X509 certificate");
5318+
zend_argument_type_error(3, "cannot be coerced into an X.509 Certificate");
53215319
goto clean_exit;
53225320
}
53235321

@@ -5420,7 +5418,7 @@ PHP_FUNCTION(openssl_pkcs7_decrypt)
54205418

54215419
cert = php_openssl_x509_from_zval(recipcert, &free_recipcert);
54225420
if (cert == NULL) {
5423-
zend_argument_type_error(3, "X.509 Certificate cannot be retrieved");
5421+
zend_argument_type_error(3, "cannot be coerced into an X.509 Certificate");
54245422
goto clean_exit;
54255423
}
54265424

‎ext/openssl/tests/bug38261.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ try {
4646

4747
?>
4848
--EXPECT--
49-
openssl_x509_parse(): Argument #1 ($x509) cannot be coerced into an X509 certificate
50-
openssl_x509_parse(): Argument #1 ($x509) cannot be coerced into an X509 certificate
49+
openssl_x509_parse(): Argument #1 ($x509) cannot be coerced into an X.509 Certificate
50+
openssl_x509_parse(): Argument #1 ($x509) cannot be coerced into an X.509 Certificate
5151
openssl_x509_parse(): Argument #1 ($x509) must be of type OpenSSLCertificate|string, array given
52-
openssl_x509_parse(): Argument #1 ($x509) cannot be coerced into an X509 certificate
52+
openssl_x509_parse(): Argument #1 ($x509) cannot be coerced into an X.509 Certificate
5353
openssl_x509_parse(): Argument #1 ($x509) must be of type OpenSSLCertificate|string, stdClass given

‎ext/openssl/tests/openssl_csr_export_basic.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ var_dump(openssl_csr_export($csr, $output, false));
4141
?>
4242
--EXPECT--
4343
bool(true)
44-
openssl_csr_export(): Argument #1 ($csr) X.509 Certificate Signing Request cannot be retrieved
44+
openssl_csr_export(): Argument #1 ($csr) cannot be coerced into an X.509 Certificate Signing Request
4545
openssl_csr_export(): Argument #1 ($csr) must be of type OpenSSLCertificateSigningRequest|string, OpenSSLAsymmetricKey given
4646
bool(true)

‎ext/openssl/tests/openssl_csr_export_to_file_basic.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ var_dump(file_get_contents($csrfile));
3939

4040
try {
4141
var_dump(openssl_csr_export_to_file($wrong, $csrfile));
42-
} catch (ValueError $e) {
42+
} catch (TypeError $e) {
4343
echo $e->getMessage(), "\n";
4444
}
4545

@@ -78,6 +78,6 @@ sfBgVeqg0P4SWez5fHXqBNcjMdMI5f0bikcDZSIfTHS8FX+PMurLBC8UPB0YNIOl
7878
JViHkCA9x6m8RJXAFvqmgLlWlUzbDv/cRrDfjWjR
7979
-----END CERTIFICATE REQUEST-----
8080
"
81-
openssl_csr_export_to_file(): Argument #1 ($csr) X.509 Certificate Signing Request cannot be retrieved
81+
openssl_csr_export_to_file(): Argument #1 ($csr) cannot be coerced into an X.509 Certificate Signing Request
8282
openssl_csr_export_to_file(): Argument #1 ($csr) must be of type OpenSSLCertificateSigningRequest|string, OpenSSLAsymmetricKey given
8383
bool(true)

‎ext/openssl/tests/openssl_csr_sign_basic.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ object(OpenSSLCertificate)#3 (0) {
8181
}
8282
object(OpenSSLCertificate)#4 (0) {
8383
}
84-
openssl_csr_sign(): Argument #2 ($cacert) X.509 Certificate cannot be retrieved
84+
openssl_csr_sign(): Argument #2 ($cacert) cannot be coerced into an X.509 Certificate
8585

8686
Warning: openssl_csr_sign(): Cannot get private key from parameter 3 in %s on line %d
8787
bool(false)
88-
openssl_csr_sign(): Argument #1 ($csr) X.509 Certificate Signing Request cannot be retrieved
88+
openssl_csr_sign(): Argument #1 ($csr) cannot be coerced into an X.509 Certificate Signing Request
8989
openssl_csr_sign(): Argument #1 ($csr) must be of type OpenSSLCertificateSigningRequest|string, array given
9090
openssl_csr_sign(): Argument #2 ($cacert) must be of type OpenSSLCertificate|string|null, array given
9191
Key array must be of the form array(0 => key, 1 => phrase)

‎ext/openssl/tests/openssl_error_string_basic.phpt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,15 +153,15 @@ echo "X509 errors\n";
153153
try {
154154
openssl_x509_export_to_file("file://" . $invalid_file_for_read, $output_file);
155155
expect_openssl_errors('openssl_x509_export_to_file open', ['02001002']);
156-
} catch (\ValueError $e) {
156+
} catch (\TypeError $e) {
157157
echo $e->getMessage() . \PHP_EOL;
158158
}
159159

160160
// file or str cert is not correct PEM - failing PEM_read_bio_X509 or PEM_ASN1_read_bio
161161
try {
162162
openssl_x509_export_to_file($csr_file, $output_file);
163163
expect_openssl_errors('openssl_x509_export_to_file pem', [$err_pem_no_start_line]);
164-
} catch (\ValueError $e) {
164+
} catch (\TypeError $e) {
165165
echo $e->getMessage() . \PHP_EOL;
166166
}
167167

@@ -210,8 +210,8 @@ openssl_private_encrypt: ok
210210
openssl_private_decrypt: ok
211211
openssl_private_(en|de)crypt padding: ok
212212
X509 errors
213-
openssl_x509_export_to_file(): Argument #1 ($x509) X.509 Certificate cannot be retrieved
214-
openssl_x509_export_to_file(): Argument #1 ($x509) X.509 Certificate cannot be retrieved
213+
openssl_x509_export_to_file(): Argument #1 ($x509) cannot be coerced into an X.509 Certificate
214+
openssl_x509_export_to_file(): Argument #1 ($x509) cannot be coerced into an X.509 Certificate
215215
openssl_x509_export_to_file write: ok
216216
openssl_x509_checkpurpose purpose: ok
217217
CSR errors

‎ext/openssl/tests/openssl_pkcs12_export_basic.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ bool(true)
5656
bool(true)
5757
bool(true)
5858
int(3)
59-
openssl_pkcs12_export(): Argument #1 ($x509) X.509 Certificate cannot be retrieved
60-
openssl_pkcs12_export(): Argument #1 ($x509) X.509 Certificate cannot be retrieved
59+
openssl_pkcs12_export(): Argument #1 ($x509) cannot be coerced into an X.509 Certificate
60+
openssl_pkcs12_export(): Argument #1 ($x509) cannot be coerced into an X.509 Certificate
6161
openssl_pkcs12_export(): Argument #1 ($x509) must be of type OpenSSLCertificate|string, OpenSSLAsymmetricKey given

‎ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,6 @@ bool(true)
6363
bool(true)
6464
bool(true)
6565
bool(true)
66-
openssl_pkcs12_export_to_file(): Argument #1 ($x509cert) X.509 Certificate cannot be retrieved
67-
openssl_pkcs12_export_to_file(): Argument #1 ($x509cert) X.509 Certificate cannot be retrieved
66+
openssl_pkcs12_export_to_file(): Argument #1 ($x509cert) cannot be coerced into an X.509 Certificate
67+
openssl_pkcs12_export_to_file(): Argument #1 ($x509cert) cannot be coerced into an X.509 Certificate
6868
openssl_pkcs12_export_to_file(): Argument #1 ($x509cert) must be of type OpenSSLCertificate|string, OpenSSLAsymmetricKey given

‎ext/openssl/tests/openssl_pkcs7_decrypt_basic.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ bool(true)
6363

6464
Warning: openssl_pkcs7_decrypt(): Unable to get private key in %s on line %d
6565
bool(false)
66-
openssl_pkcs7_decrypt(): Argument #3 ($recipcert) X.509 Certificate cannot be retrieved
67-
openssl_pkcs7_decrypt(): Argument #3 ($recipcert) X.509 Certificate cannot be retrieved
66+
openssl_pkcs7_decrypt(): Argument #3 ($recipcert) cannot be coerced into an X.509 Certificate
67+
openssl_pkcs7_decrypt(): Argument #3 ($recipcert) cannot be coerced into an X.509 Certificate
6868
bool(false)
6969
bool(false)
7070
bool(false)
71-
openssl_pkcs7_decrypt(): Argument #3 ($recipcert) X.509 Certificate cannot be retrieved
71+
openssl_pkcs7_decrypt(): Argument #3 ($recipcert) cannot be coerced into an X.509 Certificate
7272

7373
Warning: openssl_pkcs7_decrypt(): Unable to get private key in %s on line %d
7474
bool(false)

‎ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ try {
4343
Object of class stdClass could not be converted to string
4444
object(stdClass)#1 (0) {
4545
}
46-
openssl_pkcs7_decrypt(): Argument #3 ($recipcert) X.509 Certificate cannot be retrieved
47-
openssl_pkcs7_decrypt(): Argument #3 ($recipcert) X.509 Certificate cannot be retrieved
48-
openssl_pkcs7_decrypt(): Argument #3 ($recipcert) X.509 Certificate cannot be retrieved
49-
openssl_pkcs7_decrypt(): Argument #3 ($recipcert) X.509 Certificate cannot be retrieved
46+
openssl_pkcs7_decrypt(): Argument #3 ($recipcert) cannot be coerced into an X.509 Certificate
47+
openssl_pkcs7_decrypt(): Argument #3 ($recipcert) cannot be coerced into an X.509 Certificate
48+
openssl_pkcs7_decrypt(): Argument #3 ($recipcert) cannot be coerced into an X.509 Certificate
49+
openssl_pkcs7_decrypt(): Argument #3 ($recipcert) cannot be coerced into an X.509 Certificate

0 commit comments

Comments
 (0)