aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Merge pull request #18 from ailin-nemui/ssl-verify

Browse Source 
fix reading of old config ssl_verify key
This commit is contained in:
ailin-nemui 2021-08-31 15:16:54 +02:00 committed by GitHub
commit d3115f3855
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/servers-setup.c
View File

@ -484,8 +484,9 @@ static SERVER_SETUP_REC *server_setup_read(CONFIG_NODE *node)
rec->password = g_strdup(config_node_get_str(node, "password", NULL)); rec->password = g_strdup(config_node_get_str(node, "password", NULL));
rec->use_tls = config_node_get_bool(node, "use_tls", FALSE) || config_node_get_bool(node, "use_ssl", FALSE); rec->use_tls = config_node_get_bool(node, "use_tls", FALSE) || config_node_get_bool(node, "use_ssl", FALSE);
rec->tls_verify = config_node_get_bool(node, "tls_verify", TRUE) || rec->tls_verify = config_node_find(node, "tls_verify") != NULL ?
config_node_get_bool(node, "ssl_verify", FALSE); config_node_get_bool(node, "tls_verify", TRUE) :
config_node_get_bool(node, "ssl_verify", TRUE);
value = config_node_get_str(node, "tls_cert", NULL); value = config_node_get_str(node, "tls_cert", NULL);
if (value == NULL) if (value == NULL)

1
src/fe-fuzz/server.c
View File

@ -152,6 +152,7 @@ int LLVMFuzzerInitialize(int *argc, char ***argv) {
args_execute(0, NULL); args_execute(0, NULL);
core_preinit((*argv)[0]); core_preinit((*argv)[0]);
core_init(); core_init();
irssi_ssl_init();
irc_init(); irc_init();
fe_common_core_init(); fe_common_core_init();
fe_common_irc_init(); fe_common_irc_init();