diff options
| author | Dan Winship <danw@gnome.org> | 2011-11-30 17:20:40 +0800 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2011-11-30 17:20:40 +0800 |
| commit | 1455bc2e97d8d1d2fe071b7fba99abb3abefb6e6 (patch) | |
| tree | 784be879b3823b30e6105eac3e344bddcf444090 /embed/ephy-embed-single.c | |
| parent | d1d329e512877f34d2109e65a267c883e0c87b06 (diff) | |
| download | gsoc2013-epiphany-1455bc2e97d8d1d2fe071b7fba99abb3abefb6e6.tar.gz gsoc2013-epiphany-1455bc2e97d8d1d2fe071b7fba99abb3abefb6e6.tar.zst gsoc2013-epiphany-1455bc2e97d8d1d2fe071b7fba99abb3abefb6e6.zip | |
Use SoupSession:ssl-use-system-ca-file property
Rather than copying glib-networking's logic for finding the system
trusted CA file and then telling libsoup to use it, just use the new
ssl-use-system-ca-file property.
https://bugzilla.gnome.org/show_bug.cgi?id=633109
Diffstat (limited to 'embed/ephy-embed-single.c')
| -rw-r--r-- | embed/ephy-embed-single.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c index 547f49283..74359ecbc 100644 --- a/embed/ephy-embed-single.c +++ b/embed/ephy-embed-single.c @@ -473,19 +473,11 @@ ephy_embed_single_initialize (EphyEmbedSingle *single) session = webkit_get_default_session (); -#ifdef GTLS_SYSTEM_CA_FILE /* Check SSL certificates */ - - if (g_file_test (GTLS_SYSTEM_CA_FILE, G_FILE_TEST_EXISTS)) { - g_object_set (session, - SOUP_SESSION_SSL_CA_FILE, GTLS_SYSTEM_CA_FILE, - SOUP_SESSION_SSL_STRICT, FALSE, - NULL); - } else { - g_warning (_("CA Certificates file we should use was not found, "\ - "all SSL sites will be considered to have a broken certificate.")); - } -#endif + g_object_set (session, + SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE, + SOUP_SESSION_SSL_STRICT, FALSE, + NULL); /* Store cookies in moz-compatible SQLite format */ filename = g_build_filename (ephy_dot_dir (), "cookies.sqlite", NULL); |