Remove call to the deprecated and stubbed gnutls_global_set_mem_functions(). Fixes #16702 release-2.x.y

Thu, 16 Jul 2015 16:32:40 -0400

author
Michael McConville <mmcconville@mykolab.com>
date
Thu, 16 Jul 2015 16:32:40 -0400
branch
release-2.x.y
changeset 38128
c8ea044247ac
parent 38091
be8d0f7d0041
child 38129
2beb4e2c7c92

Remove call to the deprecated and stubbed gnutls_global_set_mem_functions(). Fixes #16702

libpurple/plugins/ssl/ssl-gnutls.c file | annotate | diff | comparison | revisions
--- a/libpurple/plugins/ssl/ssl-gnutls.c	Wed Oct 05 16:19:47 2016 -0500
+++ b/libpurple/plugins/ssl/ssl-gnutls.c	Thu Jul 16 16:32:40 2015 -0400
@@ -69,20 +69,6 @@
 	const char *debug_level;
 	const char *host_priorities_str;
 
-	/* Configure GnuTLS to use glib memory management */
-	/* I expect that this isn't really necessary, but it may prevent
-	   some bugs */
-	/* TODO: It may be necessary to wrap this allocators for GnuTLS.
-	   If there are strange bugs, perhaps look here (yes, I am a
-	   hypocrite) */
-	gnutls_global_set_mem_functions(
-		(gnutls_alloc_function)   g_malloc, /* malloc */
-		(gnutls_alloc_function)   g_malloc, /* secure malloc */
-		NULL,      /* mem_is_secure */
-		(gnutls_realloc_function) g_realloc, /* realloc */
-		(gnutls_free_function)    g_free     /* free */
-		);
-
 	debug_level = g_getenv("PURPLE_GNUTLS_DEBUG");
 	if (debug_level) {
 		int level = atoi(debug_level);

mercurial