This commit is contained in:
parent
8c6a59396d
commit
e9aefeb2f2
@ -1,49 +0,0 @@
|
||||
From 209c09a6b1b2151a6ce83a2c2a3cb49a5a9bacb6 Mon Sep 17 00:00:00 2001
|
||||
From: Ludwig Nussel <ludwig.nussel@suse.de>
|
||||
Date: Tue, 6 Aug 2013 15:12:04 +0200
|
||||
Subject: [PATCH] use system's default certificate store
|
||||
|
||||
---
|
||||
CMakeLists.txt | 7 +++----
|
||||
src/core/wee-config.c | 3 +++
|
||||
src/core/wee-network.c | 6 ++++++
|
||||
3 files changed, 12 insertions(+), 4 deletions(-)
|
||||
|
||||
Index: weechat-1.2/src/core/wee-config.c
|
||||
===================================================================
|
||||
--- weechat-1.2.orig/src/core/wee-config.c
|
||||
+++ weechat-1.2/src/core/wee-config.c
|
||||
@@ -61,7 +61,6 @@
|
||||
#include "../gui/gui-window.h"
|
||||
#include "../plugins/plugin.h"
|
||||
|
||||
-
|
||||
struct t_config_file *weechat_config_file = NULL;
|
||||
struct t_config_section *weechat_config_section_debug = NULL;
|
||||
struct t_config_section *weechat_config_section_color = NULL;
|
||||
@@ -3520,7 +3519,7 @@ config_weechat_init_options ()
|
||||
"gnutls_ca_file", "string",
|
||||
N_("file containing the certificate authorities (\"%h\" will be "
|
||||
"replaced by WeeChat home, \"~/.weechat\" by default)"),
|
||||
- NULL, 0, 0, CA_FILE, NULL, 0, NULL, NULL,
|
||||
+ NULL, 0, 0, NULL, NULL, 1, NULL, NULL,
|
||||
&config_change_network_gnutls_ca_file, NULL, NULL, NULL);
|
||||
config_network_gnutls_handshake_timeout = config_file_new_option (
|
||||
weechat_config_file, ptr_section,
|
||||
Index: weechat-1.2/src/core/wee-network.c
|
||||
===================================================================
|
||||
--- weechat-1.2.orig/src/core/wee-network.c
|
||||
+++ weechat-1.2/src/core/wee-network.c
|
||||
@@ -111,6 +111,12 @@ network_set_gnutls_ca_file ()
|
||||
}
|
||||
free (ca_path);
|
||||
}
|
||||
+#if LIBGNUTLS_VERSION_NUMBER >= 0x030013 // was introduced in 3.0.19
|
||||
+ else
|
||||
+ {
|
||||
+ gnutls_certificate_set_x509_system_trust(gnutls_xcred);
|
||||
+ }
|
||||
+#endif
|
||||
#endif /* HAVE_GNUTLS */
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user