From bbd86bf5424a611cb6b77a3a17fc522931c4dcb8 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Thu, 7 Jan 2016 15:06:38 -0500 Subject: mem functions cleanup Only two macros CRYPTO_MDEBUG and CRYPTO_MDEBUG_ABORT to control this. If CRYPTO_MDEBUG is not set, #ifdef out the whole debug machinery. (Thanks to Jakob Bohm for the suggestion!) Make the "change wrapper functions" be the only paradigm. Wrote documentation! Format the 'set func' functions so their paramlists are legible. Format some multi-line comments. Remove ability to get/set the "memory debug" functions at runtme. Remove MemCheck_* and CRYPTO_malloc_debug_init macros. Add CRYPTO_mem_debug(int flag) function. Add test/memleaktest. Rename CRYPTO_malloc_init to OPENSSL_malloc_init; remove needless calls. Reviewed-by: Richard Levitte --- test/verify_extra_test.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'test/verify_extra_test.c') diff --git a/test/verify_extra_test.c b/test/verify_extra_test.c index 7cc673929c..005fae63c0 100644 --- a/test/verify_extra_test.c +++ b/test/verify_extra_test.c @@ -187,8 +187,7 @@ static int test_alt_chains_cert_forgery(const char *roots_f, int main(int argc, char **argv) { - CRYPTO_malloc_debug_init(); - CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL); + CRYPTO_set_mem_debug(1); CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); ERR_load_crypto_strings(); @@ -208,7 +207,9 @@ int main(int argc, char **argv) CRYPTO_cleanup_all_ex_data(); ERR_remove_thread_state(NULL); ERR_free_strings(); +#ifdef CRYPTO_MDEBUG CRYPTO_mem_leaks_fp(stderr); +#endif printf("PASS\n"); return 0; -- cgit v1.2.3