summaryrefslogtreecommitdiff
path: root/gio/giomodule.c
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2009-12-21 20:50:32 +0100
committerDan Winship <danw@gnome.org>2010-11-26 15:57:11 -0500
commit59d62726de8efdd478ca1c940134df1112a006f2 (patch)
treefbe246b1a5d0fcccf361c2da3b79ea3b4caf57df /gio/giomodule.c
parenta1690339c731cf037d3ed97eda864159f2ba9308 (diff)
downloadglib-59d62726de8efdd478ca1c940134df1112a006f2.tar.gz
glib-59d62726de8efdd478ca1c940134df1112a006f2.tar.bz2
glib-59d62726de8efdd478ca1c940134df1112a006f2.zip
Add initial TLS (SSL) support to gio
This adds an extension point for TLS connections to gio, with a gnutls-based implementation in glib-networking. Full TLS support is still a work in progress; the current API is missing some features, and parts of it may still be changed before 2.28. https://bugzilla.gnome.org/show_bug.cgi?id=588189
Diffstat (limited to 'gio/giomodule.c')
-rw-r--r--gio/giomodule.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/gio/giomodule.c b/gio/giomodule.c
index d1318933f..ecdaab4da 100644
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
@@ -35,6 +35,7 @@
#include "gsocks4proxy.h"
#include "gsocks4aproxy.h"
#include "gsocks5proxy.h"
+#include "gtlsbackend.h"
#include "gvfs.h"
#ifdef G_OS_WIN32
#include "gregistrysettingsbackend.h"
@@ -480,6 +481,7 @@ extern GType g_win32_directory_monitor_get_type (void);
extern GType _g_winhttp_vfs_get_type (void);
extern GType _g_dummy_proxy_resolver_get_type (void);
+extern GType _g_dummy_tls_backend_get_type (void);
#ifdef G_PLATFORM_WIN32
@@ -556,6 +558,9 @@ _g_io_modules_ensure_extension_points_registered (void)
ep = g_io_extension_point_register (G_PROXY_EXTENSION_POINT_NAME);
g_io_extension_point_set_required_type (ep, G_TYPE_PROXY);
+
+ ep = g_io_extension_point_register (G_TLS_BACKEND_EXTENSION_POINT_NAME);
+ g_io_extension_point_set_required_type (ep, G_TYPE_TLS_BACKEND);
}
G_UNLOCK (registered_extensions);
@@ -618,6 +623,7 @@ _g_io_modules_ensure_loaded (void)
_g_socks4a_proxy_get_type ();
_g_socks4_proxy_get_type ();
_g_socks5_proxy_get_type ();
+ _g_dummy_tls_backend_get_type ();
}
G_UNLOCK (loaded_dirs);