nilix/surf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replacing the deprecated ssl-ca-file with tls-database.

Browse source 
Thanks Steve Dee <mrdomino@gmail.com>!
This commit is contained in:
Christoph Lohmann 2014-01-30 19:39:32 +01:00
parent a78aec6630
commit e4869357f1
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
surf.c
View file

@ -80,6 +80,7 @@ static char winid[64];
static gboolean usingproxy = 0; static gboolean usingproxy = 0;
static char togglestat[7]; static char togglestat[7];
static char pagestat[3]; static char pagestat[3];
static GTlsDatabase *tlsdb;
static void addaccelgroup(Client *c); static void addaccelgroup(Client *c);
static void beforerequest(WebKitWebView *w, WebKitWebFrame *f, static void beforerequest(WebKitWebView *w, WebKitWebFrame *f,
@ -1044,6 +1045,7 @@ setup(void) {
char *new_proxy; char *new_proxy;
SoupURI *puri; SoupURI *puri;
SoupSession *s; SoupSession *s;
GError *error = NULL;
/* clean up any zombies immediately */ /* clean up any zombies immediately */
sigchld(0); sigchld(0);
@ -1070,7 +1072,13 @@ setup(void) {
FALSE))); FALSE)));
/* ssl */ /* 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); g_object_set(G_OBJECT(s), "ssl-strict", strictssl, NULL);
/* proxy */ /* proxy */