HSM: fix code indent, style

Apply comments from Jakub Zelenka <bukka@php.net>
Once reviewed, this commit will be squashed.

Author: vjardin

ext/openssl/openssl.c

@@ -940,8 +940,9 @@ static ENGINE *php_openssl_make_pkcs11_engine(const bool warn) /* {{{ */
 
 	engine = ENGINE_by_id("pkcs11");
 	if (engine == NULL) {
-		if (warn)
+		if (warn) {
 			php_error_docref(NULL, E_WARNING, "Cannot load PKCS11 engine");
+		}
 		php_openssl_store_errors();
 		return NULL;
 	}
@@ -960,8 +961,9 @@ static ENGINE *php_openssl_make_pkcs11_engine(const bool warn) /* {{{ */
 		}
 	}
 	if (!ENGINE_init(engine)) {
-		if (warn)
+		if (warn) {
 			php_error_docref(NULL, E_WARNING, "Cannot init PKCS11 engine");
+		}
 		php_openssl_store_errors();
 		return NULL;
 	}
@@ -1439,7 +1441,7 @@ X509 *php_openssl_x509_from_str(zend_string *cert_str) {
 		cert = PEM_read_bio_X509(in, NULL, NULL, NULL);
 	} else if (ZSTR_LEN(cert_str) > 7 && memcmp(ZSTR_VAL(cert_str), "pkcs11:", sizeof("pkcs11:") - 1) == 0) {
 		ENGINE *engine = php_openssl_make_pkcs11_engine(true);
-	        struct {
+		struct {
 			const char *s_slot_cert_id;
 			X509 *cert;
 		} parms = {
@@ -1448,8 +1450,9 @@ X509 *php_openssl_x509_from_str(zend_string *cert_str) {
 		};
 		int force_login = 0;
 
-		if (!engine)
+		if (!engine) {
 			return NULL;
+		}
 
 		if (!ENGINE_ctrl_cmd(engine, "LOAD_CERT_CTRL", 0, &parms, NULL, force_login)) {
 			ENGINE_finish(engine);
@@ -3644,9 +3647,10 @@ EVP_PKEY *php_openssl_pkey_from_zval(zval *val, int public_key, char *passphrase
 				ENGINE_finish(engine);
 				engine = NULL;
 			}
-			/* val could be a certificate (file, pkcs11:, etc., let's try to extract the key */
-			if (!key)
+			/* val could be a certificate (file, pkcs11:, etc., let's try to extract the key) */
+			if (!key) {
 				cert = php_openssl_x509_from_str(Z_STR_P(val));
+			}
 
 			if (cert) {
 				free_cert = 1;
@@ -3672,27 +3676,27 @@ EVP_PKEY *php_openssl_pkey_from_zval(zval *val, int public_key, char *passphrase
 				ENGINE_finish(engine);
 				engine = NULL;
 			} else {
-			BIO *in;
+				BIO *in;
 
-			if (filename) {
-				in = BIO_new_file(filename, PHP_OPENSSL_BIO_MODE_R(PKCS7_BINARY));
-			} else {
-				in = BIO_new_mem_buf(Z_STRVAL_P(val), (int)Z_STRLEN_P(val));
-			}
+				if (filename) {
+					in = BIO_new_file(filename, PHP_OPENSSL_BIO_MODE_R(PKCS7_BINARY));
+				} else {
+					in = BIO_new_mem_buf(Z_STRVAL_P(val), (int)Z_STRLEN_P(val));
+				}
 
-			if (in == NULL) {
-				TMP_CLEAN;
-			}
-			if (passphrase == NULL) {
-				key = PEM_read_bio_PrivateKey(in, NULL, NULL, NULL);
-			} else {
-				struct php_openssl_pem_password password;
-				password.key = passphrase;
-				password.len = passphrase_len;
-				key = PEM_read_bio_PrivateKey(in, NULL, php_openssl_pem_password_cb, &password);
+				if (in == NULL) {
+					TMP_CLEAN;
+				}
+				if (passphrase == NULL) {
+					key = PEM_read_bio_PrivateKey(in, NULL, NULL, NULL);
+				} else {
+					struct php_openssl_pem_password password;
+					password.key = passphrase;
+					password.len = passphrase_len;
+					key = PEM_read_bio_PrivateKey(in, NULL, php_openssl_pem_password_cb, &password);
+				}
+				BIO_free(in);
 			}
-			BIO_free(in);
-			} // TODO indent, just to please/ease the first round of code review
 		}
 	}
 

ext/openssl/xp_ssl.c

@@ -972,7 +972,7 @@ static int php_openssl_set_local_cert(SSL_CTX *ctx, php_stream *stream) /* {{{ *
 						return FAILURE;
 					}
 				} else if (GET_VER_OPT("local_pk")) /* fill val with local_pk if any */ {
-					EVP_PKEY *pkey = php_openssl_pkey_from_zval(val /* local_pk */, 0/* not public */, NULL, 0);
+					EVP_PKEY *pkey = php_openssl_pkey_from_zval(val /* local_pk */, 0 /* not public */, NULL, 0);
 					if (SSL_CTX_use_PrivateKey(ctx, pkey) != 1) {
 						EVP_PKEY_free(pkey);
 						php_error_docref(NULL, E_WARNING, "Unable to set private key `%s'", private_key);