diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2018-08-24 19:16:04 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2018-08-24 19:16:04 +0000 |
| commit | e0c7f01b2ffb360a59be0465839782fe4651f376 (patch) | |
| tree | 510b6674cdc540d244fd4eed477f7cd59d268eb4 /lib/libcrypto/crypto.h | |
| parent | ae00dd299649c3a36cad43977fa969629a2a7724 (diff) | |
Let CRYPTO_mem_leaks{,_fp,_cb}() return -1.
These functions are no-ops. Their signature was changed by OpenSSL
to allow error checking. This way we return an error and do not
indicate the (non-)existence of memory leaks.
tested in a bulk by sthen
ok jsing
Diffstat (limited to 'lib/libcrypto/crypto.h')
| -rw-r--r-- | lib/libcrypto/crypto.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libcrypto/crypto.h b/lib/libcrypto/crypto.h index be5f92b1a3c..e614c6ad659 100644 --- a/lib/libcrypto/crypto.h +++ b/lib/libcrypto/crypto.h @@ -1,4 +1,4 @@ -/* $OpenBSD: crypto.h,v 1.46 2018/05/13 13:48:08 jsing Exp $ */ +/* $OpenBSD: crypto.h,v 1.47 2018/08/24 19:16:03 tb Exp $ */ /* ==================================================================== * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. * @@ -495,11 +495,11 @@ long CRYPTO_dbg_get_options(void) __attribute__ ((deprecated)); -void CRYPTO_mem_leaks_fp(FILE *); -void CRYPTO_mem_leaks(struct bio_st *bio); +int CRYPTO_mem_leaks_fp(FILE *); +int CRYPTO_mem_leaks(struct bio_st *bio); /* unsigned long order, char *file, int line, int num_bytes, char *addr */ -typedef void *CRYPTO_MEM_LEAK_CB(unsigned long, const char *, int, int, void *); -void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb); +typedef int *CRYPTO_MEM_LEAK_CB(unsigned long, const char *, int, int, void *); +int CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb); /* die if we have to */ void OpenSSLDie(const char *file, int line, const char *assertion); |