Use ca-bundle.crt from res on Windows

System-wide certificates don't work.
This commit is contained in:
Paweł Forysiuk 2012-07-10 23:19:34 +02:00 committed by Christian Dywan
parent 7a6bc50d0a
commit 33cede91a7

View file

@ -951,6 +951,7 @@ midori_load_soup_session (gpointer settings)
{ {
SoupSession* session = webkit_get_default_session (); SoupSession* session = webkit_get_default_session ();
#ifndef G_OS_WIN32
#if defined (HAVE_LIBSOUP_2_37_1) #if defined (HAVE_LIBSOUP_2_37_1)
g_object_set (session, g_object_set (session,
"ssl-use-system-ca-file", TRUE, "ssl-use-system-ca-file", TRUE,
@ -981,6 +982,17 @@ midori_load_soup_session (gpointer settings)
g_warning (_("No root certificate file is available. " g_warning (_("No root certificate file is available. "
"SSL certificates cannot be verified.")); "SSL certificates cannot be verified."));
#endif #endif
#else /* G_OS_WIN32 */
/* We cannot use "ssl-use-system-ca-file" on Windows
* some GTLS backend pieces are missing currently.
* Instead we specify the bundle we ship ourselves */
gchar* certificate_file = midori_app_find_res_filename ("ca-bundle.crt");
g_object_set (session,
"ssl-ca-file", certificate_file,
"ssl-strict", FALSE,
NULL);
g_free (certificate_file);
#endif
#if !WEBKIT_CHECK_VERSION (1, 3, 5) #if !WEBKIT_CHECK_VERSION (1, 3, 5)
/* See http://stevesouders.com/ua/index.php */ /* See http://stevesouders.com/ua/index.php */