size_tification.

[openssl.git] / crypto / mem.c

diff --git a/crypto/mem.c b/crypto/mem.c
index effec714e8223cdf8a087d47332cc9e1f317895c..e868d645be13538a8893ca8365badd968c5048fe 100644 (file)
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -103,9 +103,9 @@ static void (*free_locked_func)(void *)     = free;
 /* XXX use correct function pointer types */
 #ifdef CRYPTO_MDEBUG
 /* use default functions from mem_dbg.c */
-static void (*malloc_debug_func)(void *,int,const char *,int,int)
+static void (*malloc_debug_func)(void *,size_t,const char *,int,int)
        = CRYPTO_dbg_malloc;
-static void (*realloc_debug_func)(void *,void *,int,const char *,int,int)
+static void (*realloc_debug_func)(void *,void *,size_t,const char *,int,int)
        = CRYPTO_dbg_realloc;
 static void (*free_debug_func)(void *,int) = CRYPTO_dbg_free;
 static void (*set_debug_options_func)(long) = CRYPTO_dbg_set_options;
@@ -178,8 +178,8 @@ int CRYPTO_set_locked_mem_ex_functions(
        return 1;
        }
 
-int CRYPTO_set_mem_debug_functions(void (*m)(void *,int,const char *,int,int),
-                                  void (*r)(void *,void *,int,const char *,int,int),
+int CRYPTO_set_mem_debug_functions(void (*m)(void *,size_t,const char *,int,int),
+                                  void (*r)(void *,void *,size_t,const char *,int,int),
                                   void (*f)(void *,int),
                                   void (*so)(long),
                                   long (*go)(void))
@@ -233,8 +233,8 @@ void CRYPTO_get_locked_mem_ex_functions(
        if (f != NULL) *f=free_locked_func;
        }
 
-void CRYPTO_get_mem_debug_functions(void (**m)(void *,int,const char *,int,int),
-                                   void (**r)(void *,void *,int,const char *,int,int),
+void CRYPTO_get_mem_debug_functions(void (**m)(void *,size_t,const char *,int,int),
+                                   void (**r)(void *,void *,size_t,const char *,int,int),
                                    void (**f)(void *,int),
                                    void (**so)(long),
                                    long (**go)(void))
@@ -247,10 +247,12 @@ void CRYPTO_get_mem_debug_functions(void (**m)(void *,int,const char *,int,int),
        }
 
 
-void *CRYPTO_malloc_locked(int num, const char *file, int line)
+void *CRYPTO_malloc_locked(size_t 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;
        }
 
@@ -279,10 +291,12 @@ void CRYPTO_free_locked(void *str)
                free_debug_func(NULL, 1);
        }
 
-void *CRYPTO_malloc(int num, const char *file, int line)
+void *CRYPTO_malloc(size_t num, const char *file, int line)
        {
        void *ret = NULL;
 
+       if (num <= 0) return NULL;
+
        allow_customize = 0;
        if (malloc_debug_func != NULL)
                {
@@ -296,13 +310,35 @@ 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;
        }
 
-void *CRYPTO_realloc(void *str, int num, const char *file, int line)
+void *CRYPTO_realloc(void *str, size_t 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, size_t old_len, size_t 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)
@@ -327,14 +393,13 @@ void CRYPTO_free(void *str)
                free_debug_func(NULL, 1);
        }
 
-void *CRYPTO_remalloc(void *a, int num, const char *file, int line)
+void *CRYPTO_remalloc(void *a, size_t num, const char *file, int line)
        {
        if (a != NULL) OPENSSL_free(a);
-       a=(char *)OPENSSL_malloc(num);
+       a=OPENSSL_malloc(num);
        return(a);
        }
 
-
 void CRYPTO_set_mem_debug_options(long bits)
        {
        if (set_debug_options_func != NULL)