diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-12-16 22:31:02 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-12-17 04:23:57 +0100 |
| commit | 33eaf4c27e32ae163e1d36e7b4d8df28c2acb4f2 (patch) | |
| tree | 4536e5091c0d385cb1193cd6dd9d0867aa4f3c40 /crypto/mem.c | |
| parent | Rename sec_mem to mem_sec, like other files. (diff) | |
| download | openssl-33eaf4c27e32ae163e1d36e7b4d8df28c2acb4f2.tar.xz openssl-33eaf4c27e32ae163e1d36e7b4d8df28c2acb4f2.zip | |
mem-cleanup, cont'd.
Remove LEVITTE_DEBUG_MEM.
Remove {OPENSSL,CRYPTO}_remalloc.
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Diffstat (limited to 'crypto/mem.c')
| -rw-r--r-- | crypto/mem.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/crypto/mem.c b/crypto/mem.c index 83a1547dc9..a1a75a2ddc 100644 --- a/crypto/mem.c +++ b/crypto/mem.c @@ -291,9 +291,6 @@ void *CRYPTO_malloc(int num, const char *file, int line) malloc_debug_func(NULL, num, file, line, 0); } ret = malloc_ex_func(num, file, line); -#ifdef LEVITTE_DEBUG_MEM - fprintf(stderr, "LEVITTE_DEBUG_MEM: > 0x%p (%d)\n", ret, num); -#endif if (malloc_debug_func != NULL) malloc_debug_func(ret, num, file, line, 1); @@ -334,10 +331,6 @@ void *CRYPTO_realloc(void *str, int num, const char *file, int line) if (realloc_debug_func != NULL) realloc_debug_func(str, NULL, num, file, line, 0); ret = realloc_ex_func(str, num, file, line); -#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); @@ -369,11 +362,6 @@ void *CRYPTO_realloc_clean(void *str, int old_len, int num, const char *file, memcpy(ret, str, old_len); OPENSSL_clear_free(str, old_len); } -#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); @@ -384,9 +372,6 @@ void CRYPTO_free(void *str) { if (free_debug_func != NULL) free_debug_func(str, 0); -#ifdef LEVITTE_DEBUG_MEM - fprintf(stderr, "LEVITTE_DEBUG_MEM: < 0x%p\n", str); -#endif free_func(str); if (free_debug_func != NULL) free_debug_func(NULL, 1); @@ -401,13 +386,6 @@ void CRYPTO_clear_free(void *str, size_t num) CRYPTO_free(str); } -void *CRYPTO_remalloc(void *a, int num, const char *file, int line) -{ - OPENSSL_free(a); - a = OPENSSL_malloc(num); - return (a); -} - void CRYPTO_set_mem_debug_options(long bits) { if (set_debug_options_func != NULL) |