summaryrefslogtreecommitdiff
path: root/surf.c
diff options
context:
space:
mode:
authorChristoph Lohmann <20h@r-36.net>2014-01-30 19:39:32 +0100
committerChristoph Lohmann <20h@r-36.net>2014-01-30 19:39:32 +0100
commite4869357f1c625a2b56ca1327ed8c89864341d77 (patch)
treeaf660a4259cd49f824c750411b800df60ea9ec28 /surf.c
parenta78aec66302f36341ab44ef2fbb7d7555eeb755c (diff)
downloadsurf-e4869357f1c625a2b56ca1327ed8c89864341d77.tar.gz
surf-e4869357f1c625a2b56ca1327ed8c89864341d77.tar.bz2
surf-e4869357f1c625a2b56ca1327ed8c89864341d77.zip
Replacing the deprecated ssl-ca-file with tls-database.
Thanks Steve Dee <mrdomino@gmail.com>!
Diffstat (limited to 'surf.c')
-rw-r--r--surf.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/surf.c b/surf.c
index 093bdf4..7b71f0e 100644
--- a/surf.c
+++ b/surf.c
@@ -80,6 +80,7 @@ static char winid[64];
static gboolean usingproxy = 0;
static char togglestat[7];
static char pagestat[3];
+static GTlsDatabase *tlsdb;
static void addaccelgroup(Client *c);
static void beforerequest(WebKitWebView *w, WebKitWebFrame *f,
@@ -1044,6 +1045,7 @@ setup(void) {
char *new_proxy;
SoupURI *puri;
SoupSession *s;
+ GError *error = NULL;
/* clean up any zombies immediately */
sigchld(0);
@@ -1070,7 +1072,13 @@ setup(void) {
FALSE)));
/* ssl */
- g_object_set(G_OBJECT(s), "ssl-ca-file", cafile, NULL);
+ tlsdb = g_tls_file_database_new(cafile, &error);
+
+ if (error) {
+ g_warning("Error loading SSL database %s: %s", cafile, error->message);
+ g_error_free(error);
+ }
+ g_object_set(G_OBJECT(s), "tls-database", tlsdb, NULL);
g_object_set(G_OBJECT(s), "ssl-strict", strictssl, NULL);
/* proxy */