*/
static int allow_customize = 1;
-static void *(*malloc_wrapper)(size_t, const char *, int)
+static void *(*malloc_impl)(size_t, const char *, int)
= CRYPTO_malloc;
-static void *(*realloc_wrapper)(void *, size_t, const char *, int)
+static void *(*realloc_impl)(void *, size_t, const char *, int)
= CRYPTO_realloc;
-static void (*free_wrapper)(void *)
+static void (*free_impl)(void *, const char *, int)
= CRYPTO_free;
#ifndef OPENSSL_NO_CRYPTO_MDEBUG
int CRYPTO_set_mem_functions(
void *(*m)(size_t, const char *, int),
void *(*r)(void *, size_t, const char *, int),
- void (*f)(void *))
+ void (*f)(void *, const char *, int))
{
if (!allow_customize)
return 0;
if (m)
- malloc_wrapper = m;
+ malloc_impl = m;
if (r)
- realloc_wrapper = r;
+ realloc_impl = r;
if (f)
- free_wrapper = f;
+ free_impl = f;
return 1;
}
void CRYPTO_get_mem_functions(
void *(**m)(size_t, const char *, int),
void *(**r)(void *, size_t, const char *, int),
- void (**f)(void *))
+ void (**f)(void *, const char *, int))
{
if (m != NULL)
- *m = malloc_wrapper;
+ *m = malloc_impl;
if (r != NULL)
- *r = realloc_wrapper;
+ *r = realloc_impl;
if (f != NULL)
- *f = free_wrapper;
+ *f = free_impl;
}
void *CRYPTO_malloc(size_t num, const char *file, int line)
{
void *ret = NULL;
+ if (malloc_impl != NULL && malloc_impl != CRYPTO_malloc)
+ return malloc_impl(num, file, line);
+
if (num <= 0)
return NULL;
ret = malloc(num);
}
#else
- (void)file;
- (void)line;
+ osslargused(file); osslargused(line);
ret = malloc(num);
#endif
-#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;
}
void *CRYPTO_realloc(void *str, size_t num, const char *file, int line)
{
+ if (realloc_impl != NULL && realloc_impl != &CRYPTO_realloc)
+ return realloc_impl(str, num, file, line);
+
if (str == NULL)
return CRYPTO_malloc(num, file, line);
if (num == 0) {
- CRYPTO_free(str);
+ CRYPTO_free(str, file, line);
return NULL;
}
return ret;
}
#else
- (void)file;
- (void)line;
+ osslargused(file); osslargused(line);
#endif
return realloc(str, num);
return CRYPTO_malloc(num, file, line);
if (num == 0) {
- CRYPTO_clear_free(str, old_len);
+ CRYPTO_clear_free(str, old_len, file, line);
return NULL;
}
return str;
}
- /* Allocate new memory. Call malloc and do a copy, so that we can
- * cleanse the old buffer. */
-#ifndef OPENSSL_NO_CRYPTO_MDEBUG
- if (call_malloc_debug) {
- CRYPTO_mem_debug_realloc(str, NULL, num, 0, file, line);
- ret = malloc(num);
- CRYPTO_mem_debug_realloc(str, ret, num, 1, file, line);
- } else {
- ret = malloc(num);
- }
-#else
- (void)file;
- (void)line;
- ret = malloc(num);
-#endif
-
+ ret = CRYPTO_malloc(num, file, line);
if (ret)
memcpy(ret, str, old_len);
- CRYPTO_clear_free(str, old_len);
+ CRYPTO_clear_free(str, old_len, file, line);
return ret;
}
-void CRYPTO_free(void *str)
+void CRYPTO_free(void *str, const char *file, int line)
{
+ if (free_impl != NULL && free_impl != &CRYPTO_free) {
+ free_impl(str, file, line);
+ return;
+ }
+
#ifndef OPENSSL_NO_CRYPTO_MDEBUG
if (call_malloc_debug) {
- CRYPTO_mem_debug_free(str, 0);
+ CRYPTO_mem_debug_free(str, 0, file, line);
free(str);
- CRYPTO_mem_debug_free(str, 1);
+ CRYPTO_mem_debug_free(str, 1, file, line);
} else {
free(str);
}
#endif
}
-void CRYPTO_clear_free(void *str, size_t num)
+void CRYPTO_clear_free(void *str, size_t num, const char *file, int line)
{
if (str == NULL)
return;
if (num)
OPENSSL_cleanse(str, num);
- CRYPTO_free(str);
+ CRYPTO_free(str, file, line);
}