[hackers] [surf] Replacing the deprecated ssl-ca-file with tls-database. || Christoph Lohmann

From: <git_AT_suckless.org>
Date: Thu, 30 Jan 2014 19:42:49 +0100

commit e4869357f1c625a2b56ca1327ed8c89864341d77
Author: Christoph Lohmann <20h_AT_r-36.net>
Date: Thu Jan 30 19:39:32 2014 +0100

    Replacing the deprecated ssl-ca-file with tls-database.
    
    Thanks Steve Dee <mrdomino_AT_gmail.com>!

diff --git a/surf.c b/surf.c
index 093bdf4..7b71f0e 100644
--- a/surf.c
+++ b/surf.c
_AT_@ -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,
_AT_@ -1044,6 +1045,7 @@ setup(void) {
         char *new_proxy;
         SoupURI *puri;
         SoupSession *s;
+ GError *error = NULL;
 
         /* clean up any zombies immediately */
         sigchld(0);
_AT_@ -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 */
Received on Thu Jan 30 2014 - 19:42:49 CET