From f64f26220442db3c6913188e6014e5bc5bc34653 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Sat, 14 Dec 2019 18:54:14 -0500 Subject: [PATCH] Fix build when enabling mdebug options. Reviewed-by: Nicola Tuveri Reviewed-by: Richard Levitte Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/10629) --- crypto/mem.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/crypto/mem.c b/crypto/mem.c index f5e8f2445a..640107be40 100644 --- a/crypto/mem.c +++ b/crypto/mem.c @@ -145,14 +145,6 @@ static int shouldfail(void) len = strlen(buff); if (write(md_tracefd, buff, len) != len) perror("shouldfail write failed"); -# ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE - if (shoulditfail) { - void *addrs[30]; - int num = backtrace(addrs, OSSL_NELEM(addrs)); - - backtrace_symbols_fd(addrs, num, md_tracefd); - } -# endif } # endif @@ -305,6 +297,24 @@ int CRYPTO_mem_debug_pop(void) return -1; } +void CRYPTO_mem_debug_malloc(void *addr, size_t num, int flag, + const char *file, int line) +{ + (void)addr; (void)num; (void)flag; (void)file; (void)line; +} + +void CRYPTO_mem_debug_realloc(void *addr1, void *addr2, size_t num, int flag, + const char *file, int line) +{ + (void)addr1; (void)addr2; (void)num; (void)flag; (void)file; (void)line; +} + +void CRYPTO_mem_debug_free(void *addr, int flag, + const char *file, int line) +{ + (void)addr; (void)flag; (void)file; (void)line; +} + int CRYPTO_mem_leaks(BIO *b) { (void)b;