Add -show_chain option to print out verified chain.

[openssl.git] / crypto / mem.c

diff --git a/crypto/mem.c b/crypto/mem.c
index a4a78807f7a54c99188cb887aed1454c1853f438..f7984fa958eb1edd6c61f6667f3f2b29753be662 100644 (file)
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -121,10 +121,11 @@ static void (*set_debug_options_func)(long) = NULL;
 static long (*get_debug_options_func)(void) = NULL;
 #endif
 
-
 int CRYPTO_set_mem_functions(void *(*m)(size_t), void *(*r)(void *, size_t),
        void (*f)(void *))
        {
+       /* Dummy call just to ensure OPENSSL_init() gets linked in */
+       OPENSSL_init();
        if (!allow_customize)
                return 0;
        if ((m == 0) || (r == 0) || (f == 0))
@@ -198,8 +199,10 @@ int CRYPTO_set_mem_debug_functions(void (*m)(void *,int,const char *,int,int),
 void CRYPTO_get_mem_functions(void *(**m)(size_t), void *(**r)(void *, size_t),
        void (**f)(void *))
        {
-       if (m != NULL) *m=malloc_func;
-       if (r != NULL) *r=realloc_func;
+       if (m != NULL) *m = (malloc_ex_func == default_malloc_ex) ? 
+                            malloc_func : 0;
+       if (r != NULL) *r = (realloc_ex_func == default_realloc_ex) ? 
+                            realloc_func : 0;
        if (f != NULL) *f=free_func;
        }
 
@@ -217,7 +220,8 @@ void CRYPTO_get_mem_ex_functions(
 
 void CRYPTO_get_locked_mem_functions(void *(**m)(size_t), void (**f)(void *))
        {
-       if (m != NULL) *m=malloc_locked_func;
+       if (m != NULL) *m = (malloc_locked_ex_func == default_malloc_locked_ex) ? 
+                            malloc_locked_func : 0;
        if (f != NULL) *f=free_locked_func;
        }
 
@@ -248,6 +252,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)
                {
@@ -261,6 +267,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;
        }
 
@@ -280,6 +296,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)
                {
@@ -293,6 +311,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;
        }
 
@@ -300,6 +335,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);
@@ -312,6 +352,40 @@ 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;
+
+       /* We don't support shrinking the buffer. Note the memcpy that copies
+        * |old_len| bytes to the new buffer, below. */
+       if (num < old_len) 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)
@@ -331,7 +405,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)