summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2019-01-29 14:40:54 +0000
committerderaadt <deraadt@openbsd.org>2019-01-29 14:40:54 +0000
commit89256ac29a2a22d1d5ba10f77a787bc2de1da059 (patch)
tree965ccee16fd90bb87e9caada9e29d831d744931f
parentAdd a dedicated sysctl(2) node for witness(4). (diff)
downloadwireguard-openbsd-89256ac29a2a22d1d5ba10f77a787bc2de1da059.tar.xz
wireguard-openbsd-89256ac29a2a22d1d5ba10f77a787bc2de1da059.zip
instead of calling abort() for 3 "must not use anymore" interfaces,
call OPENSSL_assert() with the specific message, which due to recent changes will end up syslog :) ok jsing
-rw-r--r--lib/libcrypto/mem_dbg.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/libcrypto/mem_dbg.c b/lib/libcrypto/mem_dbg.c
index 64bc46a5dc5..602b139d1cc 100644
--- a/lib/libcrypto/mem_dbg.c
+++ b/lib/libcrypto/mem_dbg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mem_dbg.c,v 1.23 2018/08/24 19:16:03 tb Exp $ */
+/* $OpenBSD: mem_dbg.c,v 1.24 2019/01/29 14:40:54 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -162,23 +162,20 @@ void
CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line,
int before_p)
{
- /* CRYPTO_dbg_malloc is no longer permitted */
- abort();
+ OPENSSL_assert("CRYPTO_dbg_malloc is no longer permitted");
}
void
CRYPTO_dbg_free(void *addr, int before_p)
{
- /* CRYPTO_dbg_free is no longer permitted */
- abort();
+ OPENSSL_assert("CRYPTO_dbg_free is no longer permitted");
}
void
CRYPTO_dbg_realloc(void *addr1, void *addr2, int num,
const char *file, int line, int before_p)
{
- /* CRYPTO_dbg_realloc is no longer permitted */
- abort();
+ OPENSSL_assert("CRYPTO_dbg_realloc is no longer permitted");
}
int