From: David von Oheimb <David.von.Oheimb@siemens.com>
Date: Tue, 30 Jul 2019 06:40:32 +0000 (+0200)
Subject: Fix deprecation inconsisteny w.r.t. CRYPTO_mem_debug_{push,pop}()
X-Git-Tag: openssl-3.0.0-alpha1~1676
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=decdb980de7668214e8052c61704ba9f6b3583c5;p=oweals%2Fopenssl.git

Fix deprecation inconsisteny w.r.t. CRYPTO_mem_debug_{push,pop}()

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/9483)
---

diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c
index 3b1e37f301..1a08b2bb9e 100644
--- a/crypto/mem_dbg.c
+++ b/crypto/mem_dbg.c
@@ -209,6 +209,7 @@ static unsigned long mem_hash(const MEM *a)
     return ret;
 }
 
+#if !OPENSSL_API_3
 int CRYPTO_mem_debug_push(const char *info, const char *file, int line)
 {
     return 0;
@@ -218,6 +219,7 @@ int CRYPTO_mem_debug_pop(void)
 {
     return 0;
 }
+#endif
 
 static unsigned long break_order_num = 0;