HSM: quiet engine

vjardin · vjardin · commit 921b6baf3e6c · 2021-04-27T15:43:43.000Z
By default, we should avoid all the logs from the output streams.
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
@@ -1423,6 +1423,12 @@ X509 *php_openssl_x509_from_str(zend_string *cert_str) {
 				php_openssl_store_errors();
 				return NULL;
 			}
+		} else {
+			if (!ENGINE_ctrl_cmd_string(engine, "QUIET", NULL, 0)) {
+				ENGINE_free(engine);
+				php_openssl_store_errors();
+				return NULL;
+			}
 		}
 		if (!ENGINE_init(engine)) {
 			ENGINE_free(engine);
@@ -3623,6 +3629,11 @@ EVP_PKEY *php_openssl_pkey_from_zval(zval *val, int public_key, char *passphrase
 					ENGINE_free(engine);
 					TMP_CLEAN;
 				}
+			} else {
+				if (!ENGINE_ctrl_cmd_string(engine, "QUIET", NULL, 0)) {
+					ENGINE_free(engine);
+					TMP_CLEAN;
+				}
 			}
 			if (!ENGINE_init(engine)) {
 				ENGINE_free(engine);

Original file line number	Diff line number	Diff line change
`@@ -1423,6 +1423,12 @@ X509 php_openssl_x509_from_str(zend_string cert_str) {`
`1423`	`1423`	`php_openssl_store_errors();`
`1424`	`1424`	`return NULL;`
`1425`	`1425`	`}`
	`1426`	`+ } else {`
	`1427`	`+ if (!ENGINE_ctrl_cmd_string(engine, "QUIET", NULL, 0)) {`
	`1428`	`+ ENGINE_free(engine);`
	`1429`	`+ php_openssl_store_errors();`
	`1430`	`+ return NULL;`
	`1431`	`+ }`
`1426`	`1432`	`}`
`1427`	`1433`	`if (!ENGINE_init(engine)) {`
`1428`	`1434`	`ENGINE_free(engine);`
`@@ -3623,6 +3629,11 @@ EVP_PKEY php_openssl_pkey_from_zval(zval val, int public_key, char *passphrase`
`3623`	`3629`	`ENGINE_free(engine);`
`3624`	`3630`	`TMP_CLEAN;`
`3625`	`3631`	`}`
	`3632`	`+ } else {`
	`3633`	`+ if (!ENGINE_ctrl_cmd_string(engine, "QUIET", NULL, 0)) {`
	`3634`	`+ ENGINE_free(engine);`
	`3635`	`+ TMP_CLEAN;`
	`3636`	`+ }`
`3626`	`3637`	`}`
`3627`	`3638`	`if (!ENGINE_init(engine)) {`
`3628`	`3639`	`ENGINE_free(engine);`