Update from 1.0.0-stable

[openssl.git] / crypto / mem.c

diff --git a/crypto/mem.c b/crypto/mem.c
index effec714e8223cdf8a087d47332cc9e1f317895c..6f80dd33eb740a3822390bae39a40fa7d40d1e80 100644 (file)
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -251,6 +251,8 @@ void *CRYPTO_malloc_locked(int num, const char *file, int line)
        {
        void *ret = NULL;
 
+       if (num <= 0) return NULL;
+
        allow_customize = 0;
        if (malloc_debug_func != NULL)
                {
@@ -264,6 +266,16 @@ void *CRYPTO_malloc_locked(int num, const char *file, int line)
        if (malloc_debug_func != NULL)
                malloc_debug_func(ret, num, file, line, 1);
 
+#ifndef OPENSSL_CPUID_OBJ
+        /* Create a dependency on the value of 'cleanse_ctr' so our memory
+         * sanitisation function can't be optimised out. NB: We only do
+         * this for >2Kb so the overhead doesn't bother us. */
+        if(ret && (num > 2048))
+       {       extern unsigned char cleanse_ctr;
+               ((unsigned char *)ret)[0] = cleanse_ctr;
+       }
+#endif
+
        return ret;
        }
 
@@ -283,6 +295,8 @@ void *CRYPTO_malloc(int num, const char *file, int line)
        {
        void *ret = NULL;
 
+       if (num <= 0) return NULL;
+
        allow_customize = 0;
        if (malloc_debug_func != NULL)
                {
@@ -296,6 +310,23 @@ void *CRYPTO_malloc(int num, const char *file, int line)
        if (malloc_debug_func != NULL)
                malloc_debug_func(ret, num, file, line, 1);
 
+#ifndef OPENSSL_CPUID_OBJ
+        /* Create a dependency on the value of 'cleanse_ctr' so our memory
+         * sanitisation function can't be optimised out. NB: We only do
+         * this for >2Kb so the overhead doesn't bother us. */
+        if(ret && (num > 2048))
+       {       extern unsigned char cleanse_ctr;
+                ((unsigned char *)ret)[0] = cleanse_ctr;
+       }
+#endif
+
+       return ret;
+       }
+char *CRYPTO_strdup(const char *str, const char *file, int line)
+       {
+       char *ret = CRYPTO_malloc(strlen(str)+1, file, line);
+
+       strcpy(ret, str);
        return ret;
        }
 
@@ -303,6 +334,11 @@ void *CRYPTO_realloc(void *str, int num, const char *file, int line)
        {
        void *ret = NULL;
 
+       if (str == NULL)
+               return CRYPTO_malloc(num, file, line);
+
+       if (num <= 0) return NULL;
+
        if (realloc_debug_func != NULL)
                realloc_debug_func(str, NULL, num, file, line, 0);
        ret = realloc_ex_func(str,num,file,line);
@@ -315,6 +351,36 @@ void *CRYPTO_realloc(void *str, int num, const char *file, int line)
        return ret;
        }
 
+void *CRYPTO_realloc_clean(void *str, int old_len, int num, const char *file,
+                          int line)
+       {
+       void *ret = NULL;
+
+       if (str == NULL)
+               return CRYPTO_malloc(num, file, line);
+
+       if (num <= 0) return NULL;
+
+       if (realloc_debug_func != NULL)
+               realloc_debug_func(str, NULL, num, file, line, 0);
+       ret=malloc_ex_func(num,file,line);
+       if(ret)
+               {
+               memcpy(ret,str,old_len);
+               OPENSSL_cleanse(str,old_len);
+               free_func(str);
+               }
+#ifdef LEVITTE_DEBUG_MEM
+       fprintf(stderr,
+               "LEVITTE_DEBUG_MEM:         | 0x%p -> 0x%p (%d)\n",
+               str, ret, num);
+#endif
+       if (realloc_debug_func != NULL)
+               realloc_debug_func(str, ret, num, file, line, 1);
+
+       return ret;
+       }
+
 void CRYPTO_free(void *str)
        {
        if (free_debug_func != NULL)
@@ -334,7 +400,6 @@ void *CRYPTO_remalloc(void *a, int num, const char *file, int line)
        return(a);
        }
 
-
 void CRYPTO_set_mem_debug_options(long bits)
        {
        if (set_debug_options_func != NULL)