Ticket #4979: gnutls-3.3.1-gnutls_secure_malloc-1.patch

lib/gnutls_mem.c

@@ -43 +43 @@
         return ret;
 }
 
+svoid *gnutls_secure_calloc(size_t nmemb, size_t size)
+{
+        svoid *ret;
+        size_t n = xtimes(nmemb, size);
+        ret = (size_in_bounds_p(n) ? gnutls_secure_malloc(n) : NULL);
+        if (ret != NULL)
+                memset(ret, 0, size);
+        return ret;
+}
+
 /* This realloc will free ptr in case realloc
  * fails.
  */
@@ -72 +82 @@
         return ret;
 }
 
+void _gnutls_bzero(void *mem, size_t size)
+{
+        /* The reason we use that function instead of directly
+         * calling memset is to prevent the compiler
+         * optimizing out certain calls that may look
+         * pointless to him, but needed to erase
+         * private keys. */
+        memset(mem, 0, size);
+}
+
 #if 0
 /* don't use them. They are included for documentation.
  */

lib/gnutls_mem.h

@@ -23 +23 @@
 #ifndef GNUTLS_MEM_H
 #define GNUTLS_MEM_H
 
+typedef void svoid;             /* for functions that allocate using gnutls_secure_malloc */
+
+extern int (*_gnutls_is_secure_memory) (const void *);
+
 /* this realloc function will return ptr if size==0, and
  * will free the ptr if the new allocation failed.
  */
 void *gnutls_realloc_fast(void *ptr, size_t size);
 
+svoid *gnutls_secure_calloc(size_t nmemb, size_t size);
+
 void *_gnutls_calloc(size_t nmemb, size_t size);
 char *_gnutls_strdup(const char *);
 
+void _gnutls_bzero(void *v, size_t n);
+
 #define zrelease_mpi_key(mpi) if (*mpi!=NULL) { \
                 _gnutls_mpi_clear(*mpi); \
                 _gnutls_mpi_release(mpi); \
         }
 
-void _gnutls_safe_memset(void *data, int c, size_t size);
-
-#define zeroize_key(x, size) _gnutls_safe_memset(x, 0, size)
+#define zeroize_key(x, size) _gnutls_bzero(x, size)
 
-#define zeroize_temp_key zeroize_key
-#define zrelease_temp_mpi_key zrelease_mpi_key
+#ifdef ENABLE_FIPS140
+# define zeroize_temp_key zeroize_key
+# define zrelease_temp_mpi_key zrelease_mpi_key
+#else
+# define zeroize_temp_key(x, size)
+# define zrelease_temp_mpi_key(mpi) _gnutls_mpi_release(mpi)
+#endif
 
 #endif                          /* GNUTLS_MEM_H */

lib/auth/rsa_psk.c

@@ -148 +145 @@
         gnutls_datum_t premaster_secret;
         premaster_secret.size = GNUTLS_MASTER_SIZE;
         premaster_secret.data =
-            gnutls_malloc(premaster_secret.size);
+            gnutls_secure_malloc(premaster_secret.size);
 
         if (premaster_secret.data == NULL) {
                 gnutls_assert();

lib/includes/gnutls/gnutls.h.in

@@ -1465 +1465 @@
 
 /* For use in callbacks */
 extern gnutls_alloc_function gnutls_malloc;
+extern gnutls_alloc_function gnutls_secure_malloc;
 extern gnutls_realloc_function gnutls_realloc;
 extern gnutls_calloc_function gnutls_calloc;
 extern gnutls_free_function gnutls_free;

lib/libgnutls.map

@@ -303 +303 @@
     gnutls_rsa_params_import_pkcs1;
     gnutls_rsa_params_import_raw;
     gnutls_rsa_params_init;
+    gnutls_secure_calloc;
     gnutls_secure_malloc;
     gnutls_server_name_get;
     gnutls_server_name_set;