From 4fae386cb0563a0c05c2817a5ccb3c18e6d62d8d Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Wed, 16 Dec 2015 23:02:47 -0500 Subject: Cleanup CRYPTO_{push,pop}_info Rename to OPENSSL_mem_debug_{push,pop}. Remove simple calls; keep only calls used in recursive functions. Ensure we always push, to simplify so that we can always pop Reviewed-by: Richard Levitte --- include/openssl/crypto.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index 70feb7fa71..e71214e955 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -507,11 +507,12 @@ void OPENSSL_cleanse(void *ptr, size_t len); void CRYPTO_set_mem_debug_options(long bits); long CRYPTO_get_mem_debug_options(void); -# define CRYPTO_push_info(info) \ - CRYPTO_push_info_(info, __FILE__, __LINE__); -int CRYPTO_push_info_(const char *info, const char *file, int line); -int CRYPTO_pop_info(void); -int CRYPTO_remove_all_info(void); +# define OPENSSL_mem_debug_push(info) \ + CRYPTO_mem_debug_push(info, __FILE__, __LINE__) +# define OPENSSL_mem_debug_pop() \ + CRYPTO_mem_debug_pop() +int CRYPTO_mem_debug_push(const char *info, const char *file, int line); +int CRYPTO_mem_debug_pop(void); /* * Default debugging functions (enabled by CRYPTO_malloc_debug_init() macro; -- cgit v1.2.3