summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorderaadt <>2019-01-29 14:40:54 +0000
committerderaadt <>2019-01-29 14:40:54 +0000
commit44d441a36180f7a025ae35b21cac5108b547d1ea (patch)
treee9b389dbd8649a28bc2ebbdc00c9eb8989b99bf9 /src/lib
parent18bedd41c4865ae531314fe336ad0b7c1596ef2f (diff)
downloadopenbsd-44d441a36180f7a025ae35b21cac5108b547d1ea.tar.gz
openbsd-44d441a36180f7a025ae35b21cac5108b547d1ea.tar.bz2
openbsd-44d441a36180f7a025ae35b21cac5108b547d1ea.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
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/mem_dbg.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/libcrypto/mem_dbg.c b/src/lib/libcrypto/mem_dbg.c
index 64bc46a5dc..602b139d1c 100644
--- a/src/lib/libcrypto/mem_dbg.c
+++ b/src/lib/libcrypto/mem_dbg.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: mem_dbg.c,v 1.23 2018/08/24 19:16:03 tb Exp $ */ 1/* $OpenBSD: mem_dbg.c,v 1.24 2019/01/29 14:40:54 deraadt Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -162,23 +162,20 @@ void
162CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line, 162CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line,
163 int before_p) 163 int before_p)
164{ 164{
165 /* CRYPTO_dbg_malloc is no longer permitted */ 165 OPENSSL_assert("CRYPTO_dbg_malloc is no longer permitted");
166 abort();
167} 166}
168 167
169void 168void
170CRYPTO_dbg_free(void *addr, int before_p) 169CRYPTO_dbg_free(void *addr, int before_p)
171{ 170{
172 /* CRYPTO_dbg_free is no longer permitted */ 171 OPENSSL_assert("CRYPTO_dbg_free is no longer permitted");
173 abort();
174} 172}
175 173
176void 174void
177CRYPTO_dbg_realloc(void *addr1, void *addr2, int num, 175CRYPTO_dbg_realloc(void *addr1, void *addr2, int num,
178 const char *file, int line, int before_p) 176 const char *file, int line, int before_p)
179{ 177{
180 /* CRYPTO_dbg_realloc is no longer permitted */ 178 OPENSSL_assert("CRYPTO_dbg_realloc is no longer permitted");
181 abort();
182} 179}
183 180
184int 181int