From: Simon Josefsson <simon@josefsson.org>
Date: Fri, 5 Dec 2008 13:21:46 +0000 (+0100)
Subject: Disable secmem rather than overriding libgcrypt memory allocators.
X-Git-Tag: gnutls_2_7_3~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c75014b0776eff5c907d028d2fcd945ff73fc63e;p=thirdparty%2Fgnutls.git

Disable secmem rather than overriding libgcrypt memory allocators.
Suggested by Werner Koch in
<http://permalink.gmane.org/gmane.comp.encryption.gpg.libgcrypt.devel/2056>.
---

diff --git a/lib/gnutls_global.c b/lib/gnutls_global.c
index f59a47f838..a5a964c15f 100644
--- a/lib/gnutls_global.c
+++ b/lib/gnutls_global.c
@@ -200,17 +200,18 @@ gnutls_global_init (void)
 
   bindtextdomain (PACKAGE, LOCALEDIR);
 
+  /* Initialize libgcrypt if it hasn't already been initialized. */
   if (gcry_control (GCRYCTL_ANY_INITIALIZATION_P) == 0)
     {
       const char *p;
 
 #ifdef DEBUG
-      /* applications may want to override that, so we only use
+      /* applications may want to override this, so we only use
        * it in debugging mode.
        */
       gcry_set_log_handler (_gnutls_gcry_log_handler, NULL);
 #endif
-      
+
       p = gcry_check_version (GCRYPT_VERSION);
 
       if (p == NULL)
@@ -222,22 +223,19 @@ gnutls_global_init (void)
 	}
 
       /* for gcrypt in order to be able to allocate memory */
-      gcry_set_allocation_handler (gnutls_malloc, gnutls_secure_malloc,
-	       _gnutls_is_secure_memory, gnutls_realloc, gnutls_free);
+      gcry_control (GCRYCTL_DISABLE_SECMEM, NULL, 0);
 
       gcry_control (GCRYCTL_INITIALIZATION_FINISHED, NULL, 0);
-
     }
 
 #ifdef DEBUG
   gnutls_global_set_log_function (dlog);
 #endif
 
-  /* initialize parser 
+  /* initialize ASN.1 parser
    * This should not deal with files in the final
    * version.
    */
-
   if (asn1_check_version (LIBTASN1_VERSION) == NULL)
     {
       gnutls_assert ();