Disable automatic initialization of GnuTLS

mcatanzaro · mcatanzaro · commit 8d22eacbcb97 · 2018-02-07T17:36:12.000-06:00
We have code here to ensure that GnuTLS does not get initialized just by
scanning GIO modules, but it's being defeated because GnuTLS has since
started initializing itself using a library constructor. To fix this we
have to define the symbol _gnutls_global_init_skip using the macro
GNUTLS_SKIP_GLOBAL_INIT.
diff --git a/glib-networking.map b/glib-networking.map
@@ -3,6 +3,7 @@ global:
   g_io_*_load;
   g_io_*_unload;
   g_io_*_query;
+  _gnutls_global_init_skip;
 local:
   *;
 };
diff --git a/tls/gnutls/gtlsbackend-gnutls.c b/tls/gnutls/gtlsbackend-gnutls.c
@@ -73,6 +73,8 @@ gtls_gnutls_init (gpointer data)
   return NULL;
 }
 
+GNUTLS_SKIP_GLOBAL_INIT
+
 static GOnce gnutls_inited = G_ONCE_INIT;
 
 static void

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,8 @@ gtls_gnutls_init (gpointer data)`
`73`	`73`	`return NULL;`
`74`	`74`	`}`
`75`	`75`
	`76`	`+GNUTLS_SKIP_GLOBAL_INIT`
	`77`	`+`
`76`	`78`	`static GOnce gnutls_inited = G_ONCE_INIT;`
`77`	`79`
`78`	`80`	`static void`