[libsoup/tls] Set GTlsConnection:use-system-certdb FALSE



commit ff54bc7cf364547ebe117e7a16e3d4cb9dfedae3
Author: Dan Winship <danw gnome org>
Date:   Wed Dec 1 14:42:40 2010 -0500

    Set GTlsConnection:use-system-certdb FALSE

 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 26176d1..2196883 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;
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]