The branch master has been updated
via decdb980de7668214e8052c61704ba9f6b3583c5 (commit)
from ff988500c2f39ae61b2836167b6e0e7b2021220c (commit)
- Log -----------------------------------------------------------------
commit decdb980de7668214e8052c61704ba9f6b3583c5
Author: David von Oheimb <[email protected]>
Date: Tue Jul 30 08:40:32 2019 +0200
Fix deprecation inconsisteny w.r.t. CRYPTO_mem_debug_{push,pop}()
Reviewed-by: Richard Levitte <[email protected]>
Reviewed-by: Matthias St. Pierre <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/9483)
-----------------------------------------------------------------------
Summary of changes:
crypto/mem_dbg.c | 2 ++
1 file changed, 2 insertions(+)
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;
