Fix indentation and formatting

mtrojnar · mtrojnar · commit 62fa4ee85421 · 2025-04-04T19:33:58.000+02:00
diff --git a/examples/decrypt.c b/examples/decrypt.c
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
 	PKCS11_CTX *ctx;
 	PKCS11_SLOT *slots, *slot;
 	PKCS11_CERT *certs;
-	
+
 	PKCS11_KEY *authkey;
 	PKCS11_CERT *authcert;
 	EVP_PKEY *pubkey = NULL;
diff --git a/examples/eckeygen.c b/examples/eckeygen.c
@@ -92,16 +92,16 @@ int main(int argc, char *argv[])
 	PKCS11_params params = {.sensitive = 1, .extractable = 0};
 	PKCS11_EC_KGEN ec = {.curve = "P-256"};
 	PKCS11_KGEN_ATTRS eckg = {0};
-	
+
 	if (argc < 6) {
 		fprintf(stderr, "usage: %s [module] [TOKEN] [KEY-LABEL] [KEY-ID] [PIN]\n", argv[0]);
 		return 1;
 	}
-	
+
 	key_id_len = strlen(argv[4]);
 	rc = parse_hex_key_id(argv[4], &key_id, &key_id_len);
 	CHECK_ERR(rc < 0, "Invalid key ID format", 1);
-	
+
 	ctx = PKCS11_CTX_new();
 	error_queue("PKCS11_CTX_new");
 
@@ -130,7 +130,7 @@ int main(int argc, char *argv[])
 	printf("Slot description.......: %s\n", slot->description);
 	printf("Slot token label.......: %s\n", slot->token->label);
 	printf("Slot token serialnr....: %s\n", slot->token->serialnr);
-	
+
 	rc = PKCS11_login(slot, 0, argv[5]);
 	error_queue("PKCS11_login");
 	CHECK_ERR(rc < 0, "PKCS11_login failed", 5);
diff --git a/examples/rsakeygen.c b/examples/rsakeygen.c
@@ -92,16 +92,16 @@ int main(int argc, char *argv[])
 	PKCS11_params params = {.sensitive = 1, .extractable = 0};
 	PKCS11_RSA_KGEN rsa = {.bits = 2048};
 	PKCS11_KGEN_ATTRS rsakg = {0};
-	
+
 	if (argc < 6) {
 		fprintf(stderr, "usage: %s [module] [TOKEN] [KEY-LABEL] [KEY-ID] [PIN]\n", argv[0]);
 		return 1;
 	}
-	
+
 	key_id_len = strlen(argv[4]);
 	rc = parse_hex_key_id(argv[4], &key_id, &key_id_len);
 	CHECK_ERR(rc < 0, "Invalid key ID format", 1);
-	
+
 	ctx = PKCS11_CTX_new();
 	error_queue("PKCS11_CTX_new");
 
@@ -130,7 +130,7 @@ int main(int argc, char *argv[])
 	printf("Slot description.......: %s\n", slot->description);
 	printf("Slot token label.......: %s\n", slot->token->label);
 	printf("Slot token serialnr....: %s\n", slot->token->serialnr);
-	
+
 	rc = PKCS11_login(slot, 0, argv[5]);
 	error_queue("PKCS11_login");
 	CHECK_ERR(rc < 0, "PKCS11_login failed", 5);
diff --git a/src/eng_front.c b/src/eng_front.c
@@ -84,7 +84,7 @@ static const ENGINE_CMD_DEFN engine_cmd_defns[] = {
 		"VLOG_A",
 		"Set the logging callback",
 		ENGINE_CMD_FLAG_INTERNAL},
-	 {CMD_DEBUG_LEVEL,
+	{CMD_DEBUG_LEVEL,
 		"DEBUG_LEVEL",
 		"Set the debug level: 0=emerg, 1=alert, 2=crit, 3=err, 4=warning, 5=notice (default), 6=info, 7=debug",
 		ENGINE_CMD_FLAG_NUMERIC},
diff --git a/src/p11_pthread.h b/src/p11_pthread.h
@@ -92,3 +92,5 @@ static int pthread_cond_signal(pthread_cond_t *cond)
 #error Locking not supported on this platform.
 
 #endif
+
+/* vim: set noexpandtab: */
diff --git a/src/p11_slot.c b/src/p11_slot.c
@@ -318,15 +318,17 @@ int pkcs11_init_token(PKCS11_SLOT_private *slot, const char *pin, const char *la
 			(CK_UTF8CHAR *) ck_label));
 	CRYPTOKI_checkerr(CKR_F_PKCS11_INIT_TOKEN, rv);
 
-	/* FIXME: how to update the token?
-	 * PKCS11_CTX_private *cpriv;
-	 * int n;
-	 * cpriv = PRIVCTX(ctx);
-	 * for (n = 0; n < cpriv->nslots; n++) {
-	 * 	if (pkcs11_check_token(ctx, cpriv->slots + n) < 0)
-	 * 		return -1;
-	 * }
-	 */
+	/* FIXME: how to update the token? */
+#if 0
+	PKCS11_CTX_private *cpriv;
+	int n;
+	cpriv = PRIVCTX(ctx);
+
+	for (n = 0; n < cpriv->nslots; n++) {
+		if (pkcs11_check_token(ctx, cpriv->slots + n) < 0)
+			return -1;
+	}
+#endif
 
 	return 0;
 }
diff --git a/src/pkcs11.h b/src/pkcs11.h
@@ -96,8 +96,8 @@ extern "C" {
 #endif
 
 #ifdef CRYPTOKI_COMPAT
-  /* If we are in compatibility mode, switch all exposed names to the
-     PKCS #11 variant.  There are corresponding #undefs below.  */
+/* If we are in compatibility mode, switch all exposed names to the
+ * PKCS #11 variant.  There are corresponding #undefs below. */
 
 #define ck_flags_t CK_FLAGS
 #define ck_version _CK_VERSION
diff --git a/src/provider.c b/src/provider.c
@@ -288,7 +288,7 @@ static int PROVIDER_CTX_set_parameters(PROVIDER_CTX *prov_ctx)
 	if (!PROVIDER_CTX_get_specific_parameters(prov_ctx)) {
 		return 0;
 	}
-		
+
 	if (prov_ctx->p_debug_level && *prov_ctx->p_debug_level != '\0') {
 		prov_ctx->debug_level = atoi(prov_ctx->p_debug_level);
 	}
@@ -470,7 +470,7 @@ static int provider_init(const OSSL_CORE_HANDLE *handle, const OSSL_DISPATCH *in
 
 	/* Get all core functions and check existence of required ones */
 	PROVIDER_CTX_get_core_functions(prov_ctx, in);
-	
+
 	/* Get core default parameters */
 	if (!PROVIDER_CTX_get_core_parameters(prov_ctx))
 		goto err;
diff --git a/src/util_uri.c b/src/util_uri.c
@@ -85,7 +85,7 @@ UTIL_CTX *UTIL_CTX_new()
 
 	if (!ctx)
 		return NULL;
-	
+
 	memset(ctx, 0, sizeof(UTIL_CTX));
 	pthread_mutex_init(&ctx->lock, 0);
 	return ctx;
diff --git a/tests/check-all-prov.c b/tests/check-all-prov.c
@@ -46,10 +46,10 @@ int main(int argc, char *argv[])
 		return ret;
 
 	/* Load pkcs11prov and default providers */
-        if (!providers_load()) {
+	if (!providers_load()) {
 		display_openssl_errors();
 		return ret;
-        }
+	}
 
 	/* Load private key, public key and certificate */
 	load_objects(argv[1], NULL, obj_set);
diff --git a/tests/check-privkey-prov.c b/tests/check-privkey-prov.c
@@ -43,10 +43,10 @@ int main(int argc, char *argv[])
 	}
 
 	/* Load pkcs11prov and default providers */
-        if (!providers_load()) {
+	if (!providers_load()) {
 		display_openssl_errors();
 		return ret;
-        }
+	}
 
 	/* Load certificate */
 	cert = load_cert(argv[1]);
diff --git a/tests/check-privkey.c b/tests/check-privkey.c
@@ -34,7 +34,7 @@
 static void usage(char *argv[])
 {
 	fprintf(stderr, "%s [certificate (PEM or URL)] [private key URL] "
-            "[module] [conf]\n", argv[0]);
+		"[module] [conf]\n", argv[0]);
 }
 
 static void display_openssl_errors(int l)
@@ -187,3 +187,5 @@ int main(int argc, char *argv[])
 
 	return ret;
 }
+
+/* vim: set noexpandtab: */
diff --git a/tests/dup-key-prov.c b/tests/dup-key-prov.c
@@ -43,10 +43,10 @@ int main(int argc, char *argv[])
 	}
 
 	/* Load pkcs11prov and default providers */
-        if (!providers_load()) {
+	if (!providers_load()) {
 		display_openssl_errors();
 		return ret;
-        }
+	}
 
 	/* Load private key */
 	private_key = load_pkey(argv[1], NULL);
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
 		fprintf(stderr, "Cannot duplicate private key\n");
 		display_openssl_errors();
 		goto cleanup;
-	}	
+	}
 	printf("Duplicate private key created.\n");
 
 	EVP_PKEY_free(private_key_dup);
diff --git a/tests/dup-key.c b/tests/dup-key.c
@@ -181,3 +181,4 @@ int main(int argc, char *argv[])
 	return ret;
 }
 
+/* vim: set noexpandtab: */
diff --git a/tests/ec-keygen.c b/tests/ec-keygen.c
@@ -225,3 +225,5 @@ int main(int argc, char* argv[])
 
 	return ret;
 }
+
+/* vim: set noexpandtab: */
diff --git a/tests/evp-sign-prov.c b/tests/evp-sign-prov.c
@@ -68,7 +68,7 @@ static int setup_ui()
 	UI_method_set_writer(ui_console_with_default, UI_method_get_writer(default_method));
 	UI_method_set_flusher(ui_console_with_default, UI_method_get_flusher(default_method));
 	UI_method_set_closer(ui_console_with_default, UI_method_get_closer(default_method));
-    return 1; /* OK */
+	return 1; /* OK */
 }
 
 int main(int argc, char **argv)
@@ -102,7 +102,7 @@ int main(int argc, char **argv)
 		display_openssl_errors();
 		goto cleanup;
 	}
-	
+
 	switch (pin_method) {
 	case BY_DEFAULT:
 		ui_method = ui_console_with_default;
@@ -115,10 +115,10 @@ int main(int argc, char **argv)
 	}
 
 	/* Load pkcs11prov and default providers */
-        if (!providers_load()) {
+	if (!providers_load()) {
 		display_openssl_errors();
 		return ret;
-        }
+	}
 
 	/* Load keys */
 	private_key = load_pkey(argv[2], ui_method);
diff --git a/tests/fork-change-slot-prov.c b/tests/fork-change-slot-prov.c
@@ -71,7 +71,7 @@ static int do_wait(pid_t pids[], int num)
 			perror("waitpid");
 		}
 	}
-    return 0;
+	return 0;
 }
 
 static int spawn_processes(int num)
@@ -153,10 +153,10 @@ int main(int argc, char *argv[])
 	printf("pid %d is the parent\n", pid);
 
 	/* Load pkcs11prov and default providers */
-        if (!providers_load()) {
+	if (!providers_load()) {
 		display_openssl_errors();
 		return ret;
-        }
+	}
 
 	/* Load private key */
 	private_key = load_pkey(argv[1], NULL);
diff --git a/tests/fork-change-slot.c b/tests/fork-change-slot.c
diff --git a/tests/fork-test.c b/tests/fork-test.c
diff --git a/tests/helpers_prov.c b/tests/helpers_prov.c
diff --git a/tests/rsa-keygen.c b/tests/rsa-keygen.c
diff --git a/tests/rsa-oaep-prov.c b/tests/rsa-oaep-prov.c
diff --git a/tests/rsa-pss-sign-prov.c b/tests/rsa-pss-sign-prov.c
diff --git a/tests/store-cert-prov.c b/tests/store-cert-prov.c
diff --git a/tests/store-cert.c b/tests/store-cert.c
