diff options
author | Dan Winship <danw@gnome.org> | 2010-12-01 14:42:40 -0500 |
---|---|---|
committer | Dan Winship <danw@gnome.org> | 2010-12-01 14:42:40 -0500 |
commit | ff54bc7cf364547ebe117e7a16e3d4cb9dfedae3 (patch) | |
tree | d33aa96802482189a42faeda8ece443953ea724c | |
parent | 98b2ff3e7cba54cd9bdc3aadf91a60c011eee580 (diff) | |
download | libsoup-tls.tar.gz |
Set GTlsConnection:use-system-certdb FALSEtls
-rw-r--r-- | libsoup/soup-socket.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/libsoup/soup-socket.c b/libsoup/soup-socket.c index 26176d12..21968834 100644 --- a/libsoup/soup-socket.c +++ b/libsoup/soup-socket.c @@ -875,6 +875,7 @@ soup_socket_start_proxy_ssl (SoupSocket *sock, const char *ssl_host, GCancellable *cancellable) { SoupSocketPrivate *priv = SOUP_SOCKET_GET_PRIVATE (sock); + GTlsBackend *backend = g_tls_backend_get_default (); if (G_IS_TLS_CONNECTION (priv->conn)) return TRUE; @@ -886,7 +887,12 @@ soup_socket_start_proxy_ssl (SoupSocket *sock, const char *ssl_host, GSocketConnectable *identity; identity = g_network_address_new (ssl_host, 0); - conn = g_tls_client_connection_new (priv->conn, identity, NULL); + conn = g_initable_new (g_tls_backend_get_client_connection_type (backend), + NULL, NULL, + "base-io-stream", priv->conn, + "server-identity", identity, + "use-system-certdb", FALSE, + NULL); g_object_unref (identity); if (!conn) @@ -902,10 +908,12 @@ soup_socket_start_proxy_ssl (SoupSocket *sock, const char *ssl_host, } else { GTlsServerConnection *conn; - conn = g_tls_server_connection_new (priv->conn, - soup_ssl_credentials_get_certificate (priv->ssl_creds), - NULL); - + conn = g_initable_new (g_tls_backend_get_server_connection_type (backend), + NULL, NULL, + "base-io-stream", priv->conn, + "certificate", soup_ssl_credentials_get_certificate (priv->ssl_creds), + "use-system-certdb", FALSE, + NULL); if (!conn) return FALSE; |