deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-26 07:10:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Win cert gen with temp openssl.cnf

Browse Source
This commit is contained in:
deepend-tildeclub
2026-03-25 00:26:23 -06:00
parent 86aca30744
commit 2defd0ed42
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/fe-gtk/servlistgui.c
View File

@@ -152,6 +152,8 @@ servlist_generate_client_cert_cb (GtkWidget *button, gpointer userdata)
char *key_file; char *key_file;
char *crt_file; char *crt_file;
char *subject; char *subject;
char *openssl_conf;
const char *conf_data;
char *key_data; char *key_data;
char *crt_data; char *crt_data;
char *pem_data; char *pem_data;
@@ -162,7 +164,7 @@ servlist_generate_client_cert_cb (GtkWidget *button, gpointer userdata)
gboolean spawned; gboolean spawned;
gboolean success; gboolean success;
gint status; gint status;
char *argv[18]; char *argv[20];
if (!net || !net->name || !net->name[0]) if (!net || !net->name || !net->name[0])
return; return;
@@ -172,6 +174,10 @@ servlist_generate_client_cert_cb (GtkWidget *button, gpointer userdata)
key_file = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s.key", cert_dir, net->name); key_file = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s.key", cert_dir, net->name);
crt_file = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s.crt", cert_dir, net->name); crt_file = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s.crt", cert_dir, net->name);
subject = g_strdup_printf ("/CN=%s", net->name); subject = g_strdup_printf ("/CN=%s", net->name);
openssl_conf = g_build_filename (cert_dir, "openssl.cnf", NULL);
conf_data = "[req]\n"
"distinguished_name=req_distinguished_name\n"
"[req_distinguished_name]\n";
key_data = NULL; key_data = NULL;
crt_data = NULL; crt_data = NULL;
pem_data = NULL; pem_data = NULL;
@@ -182,7 +188,8 @@ servlist_generate_client_cert_cb (GtkWidget *button, gpointer userdata)
success = FALSE; success = FALSE;
status = 0; status = 0;
if (g_mkdir_with_parents (cert_dir, 0700) == 0) if (g_mkdir_with_parents (cert_dir, 0700) == 0 &&
g_file_set_contents (openssl_conf, conf_data, -1, NULL))
{ {
argv[0] = "openssl"; argv[0] = "openssl";
argv[1] = "req"; argv[1] = "req";
@@ -199,9 +206,11 @@ servlist_generate_client_cert_cb (GtkWidget *button, gpointer userdata)
argv[12] = key_file; argv[12] = key_file;
argv[13] = "-out"; argv[13] = "-out";
argv[14] = crt_file; argv[14] = crt_file;
argv[15] = "-subj"; argv[15] = "-config";
argv[16] = subject; argv[16] = openssl_conf;
argv[17] = NULL; argv[17] = "-subj";
argv[18] = subject;
argv[19] = NULL;
spawned = g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, spawned = g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL,
&stdout_data, &stderr_data, &status, NULL); &stdout_data, &stderr_data, &status, NULL);
@@ -220,6 +229,7 @@ servlist_generate_client_cert_cb (GtkWidget *button, gpointer userdata)
g_remove (key_file); g_remove (key_file);
g_remove (crt_file); g_remove (crt_file);
g_remove (openssl_conf);
if (success) if (success)
{ {
@@ -254,6 +264,7 @@ servlist_generate_client_cert_cb (GtkWidget *button, gpointer userdata)
g_free (subject); g_free (subject);
g_free (crt_file); g_free (crt_file);
g_free (key_file); g_free (key_file);
g_free (openssl_conf);
g_free (cert_file); g_free (cert_file);
g_free (cert_dir); g_free (cert_dir);
#else #else