GH Reviews

Author: Girgias

ext/openssl/openssl.c

@@ -1497,7 +1497,7 @@ PHP_FUNCTION(openssl_x509_export_to_file)
 
 	cert = php_openssl_x509_from_param(cert_obj, cert_str);
 	if (cert == NULL) {
-		zend_argument_type_error(1, "X.509 Certificate cannot be retrieved");
+		zend_argument_value_error(1, "X.509 Certificate cannot be retrieved");
 		RETURN_THROWS();
 	}
 
@@ -1922,8 +1922,7 @@ PHP_FUNCTION(openssl_x509_check_private_key)
 
 	cert = php_openssl_x509_from_param(cert_obj, cert_str);
 	if (cert == NULL) {
-		zend_argument_type_error(1, "cannot be coerced into an X509 certificate");
-		RETURN_THROWS();
+		RETURN_FALSE;
 	}
 
 	RETVAL_FALSE;
@@ -1961,8 +1960,7 @@ PHP_FUNCTION(openssl_x509_verify)
 
 	cert = php_openssl_x509_from_param(cert_obj, cert_str);
 	if (cert == NULL) {
-		zend_argument_type_error(1, "cannot be coerced into an X509 certificate");
-		RETURN_THROWS();
+		RETURN_LONG(err);
 	}
 
 	key = php_openssl_pkey_from_zval(zkey, 1, NULL, 0, &free_pkey);
@@ -3090,9 +3088,7 @@ PHP_FUNCTION(openssl_csr_export_to_file)
 
 	csr = php_openssl_csr_from_param(csr_obj, csr_str);
 	if (csr == NULL) {
-		if (!EG(exception)) {
-			zend_argument_type_error(1, "X.509 Certificate Signing Request cannot be retrieved");
-		}
+		zend_argument_value_error(1, "X.509 Certificate Signing Request cannot be retrieved");
 		RETURN_THROWS();
 	}
 
@@ -3208,9 +3204,7 @@ PHP_FUNCTION(openssl_csr_sign)
 
 	csr = php_openssl_csr_from_param(csr_obj, csr_str);
 	if (csr == NULL) {
-		if (!EG(exception)) {
-			zend_argument_type_error(1, "X.509 Certificate Signing Request cannot be retrieved");
-		}
+		zend_argument_type_error(1, "X.509 Certificate Signing Request cannot be retrieved");
 		RETURN_THROWS();
 	}
 

ext/openssl/tests/openssl_csr_export_to_file_basic.phpt

@@ -39,7 +39,7 @@ var_dump(file_get_contents($csrfile));
 
 try {
     var_dump(openssl_csr_export_to_file($wrong, $csrfile));
-} catch (TypeError $e) {
+} catch (ValueError $e) {
     echo $e->getMessage(), "\n";
 }
 

ext/openssl/tests/openssl_error_string_basic.phpt

@@ -153,15 +153,15 @@ echo "X509 errors\n";
 try {
     openssl_x509_export_to_file("file://" . $invalid_file_for_read, $output_file);
     expect_openssl_errors('openssl_x509_export_to_file open', ['02001002']);
-} catch (\TypeError $e) {
+} catch (\ValueError $e) {
     echo $e->getMessage() . \PHP_EOL;
 }
 
 // file or str cert is not correct PEM - failing PEM_read_bio_X509 or PEM_ASN1_read_bio
 try {
     openssl_x509_export_to_file($csr_file, $output_file);
     expect_openssl_errors('openssl_x509_export_to_file pem', [$err_pem_no_start_line]);
-} catch (\TypeError $e) {
+} catch (\ValueError $e) {
     echo $e->getMessage() . \PHP_EOL;
 }
 

ext/openssl/tests/openssl_x509_check_private_key_basic.phpt

@@ -31,7 +31,7 @@ var_dump(openssl_x509_check_private_key(openssl_x509_read($a), $b));
 ?>
 --EXPECT--
 bool(true)
-openssl_x509_check_private_key(): Argument #1 ($x509) cannot be coerced into an X509 certificate
 bool(false)
-openssl_x509_check_private_key(): Argument #1 ($x509) cannot be coerced into an X509 certificate
+bool(false)
+bool(false)
 bool(true)

ext/openssl/tests/openssl_x509_export_to_file_basic.phpt

@@ -18,15 +18,15 @@ var_dump(openssl_x509_export_to_file($b, $outfilename)); // read cert from a fil
 
 try {
     var_dump(openssl_x509_export_to_file($c, $outfilename)); // read an invalid cert, fails
-} catch (\TypeError $e) {
+} catch (\ValueError $e) {
     echo $e->getMessage() . \PHP_EOL;
 }
 
 var_dump(openssl_x509_export_to_file($d, $outfilename)); // read cert from a resource
 
 try {
     openssl_x509_export_to_file($e, $outfilename); // read an array, fails
-} catch (TypeError $exception) {
+} catch (ValueError $exception) {
     echo $exception->getMessage() . "\n";
 }
 echo "---\n";

ext/openssl/tests/openssl_x509_verify.phpt

@@ -37,8 +37,8 @@ var_dump(openssl_x509_verify($cert, $wrongKey));
 ?>
 --EXPECT--
 int(1)
-openssl_x509_verify(): Argument #1 ($x509) cannot be coerced into an X509 certificate
 int(-1)
-openssl_x509_verify(): Argument #1 ($x509) cannot be coerced into an X509 certificate
+int(-1)
+int(-1)
 int(1)
 int(0)