]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Fix build when enabling mdebug options.
authorRich Salz <rsalz@akamai.com>
Sat, 14 Dec 2019 23:54:14 +0000 (18:54 -0500)
committerShane Lontis <shane.lontis@oracle.com>
Wed, 18 Dec 2019 05:06:15 +0000 (15:06 +1000)
Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/10629)

crypto/mem.c

index f5e8f2445ae69a507aa653f33766da71e5cef2e4..640107be409b346b87437e58ef77a093dc360d2a 100644 (file)
@@ -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;