optimizations and fixes in the TLS PRF calculation (and the SSL3 equivalent)

1 files changed, 10 insertions, 10 deletions

diff --git a/lib/gnutls_mem.h b/lib/gnutls_mem.h
index fbe0375cc6..84f9d32610 100644
--- a/lib/gnutls_mem.h
+++ b/lib/gnutls_mem.h
@@ -2,7 +2,7 @@
 # include <dmalloc.h>
 #endif
 
-typedef void svoid; /* for functions that allocate using secure_free */
+typedef void svoid; /* for functions that allocate using gnutls_secure_free */
 
 #ifdef USE_DMALLOC
 # define gnutls_malloc malloc
@@ -10,20 +10,20 @@ typedef void svoid; /* for functions that allocate using secure_free */
 # define gnutls_realloc_fast realloc
 # define gnutls_free free
 # define gnutls_calloc calloc
-# define secure_malloc malloc
-# define secure_realloc realloc
-# define secure_free free
-# define secure_calloc calloc
+# define gnutls_secure_malloc malloc
+# define gnutls_secure_realloc realloc
+# define gnutls_secure_free free
+# define gnutls_secure_calloc calloc
 # define gnutls_strdup strdup
 int _gnutls_is_secure_memory(const void*);
 
 #else
 
-svoid* secure_malloc( size_t size);
-svoid* secure_calloc( size_t nmemb, size_t size);
-size_t _secure_ptr_size( svoid* ptr);
-svoid* secure_realloc( svoid* ptr, size_t size);
-void secure_free( svoid* ptr);
+svoid* gnutls_secure_malloc( size_t size);
+svoid* gnutls_secure_calloc( size_t nmemb, size_t size);
+size_t _gnutls_secure_ptr_size( svoid* ptr);
+svoid* gnutls_secure_realloc( svoid* ptr, size_t size);
+void gnutls_secure_free( svoid* ptr);
 int _gnutls_is_secure_memory(const svoid* mem);
 
 void* gnutls_malloc( size_t size);