diff options
| author | tb <> | 2018-08-24 19:16:03 +0000 |
|---|---|---|
| committer | tb <> | 2018-08-24 19:16:03 +0000 |
| commit | 17fd6127db3f4731a9a58d39b41ce040a426348e (patch) | |
| tree | 749ad996bc15435c83b92e7fe56f7384345ffdf0 /src/lib/libcrypto/crypto.h | |
| parent | bd152865293238e345b3bcf266d4a67afea8f9ad (diff) | |
| download | openbsd-17fd6127db3f4731a9a58d39b41ce040a426348e.tar.gz openbsd-17fd6127db3f4731a9a58d39b41ce040a426348e.tar.bz2 openbsd-17fd6127db3f4731a9a58d39b41ce040a426348e.zip | |
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 'src/lib/libcrypto/crypto.h')
| -rw-r--r-- | src/lib/libcrypto/crypto.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/crypto.h b/src/lib/libcrypto/crypto.h index be5f92b1a3..e614c6ad65 100644 --- a/src/lib/libcrypto/crypto.h +++ b/src/lib/libcrypto/crypto.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: crypto.h,v 1.46 2018/05/13 13:48:08 jsing Exp $ */ | 1 | /* $OpenBSD: crypto.h,v 1.47 2018/08/24 19:16:03 tb Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -495,11 +495,11 @@ long CRYPTO_dbg_get_options(void) | |||
| 495 | __attribute__ ((deprecated)); | 495 | __attribute__ ((deprecated)); |
| 496 | 496 | ||
| 497 | 497 | ||
| 498 | void CRYPTO_mem_leaks_fp(FILE *); | 498 | int CRYPTO_mem_leaks_fp(FILE *); |
| 499 | void CRYPTO_mem_leaks(struct bio_st *bio); | 499 | int CRYPTO_mem_leaks(struct bio_st *bio); |
| 500 | /* unsigned long order, char *file, int line, int num_bytes, char *addr */ | 500 | /* unsigned long order, char *file, int line, int num_bytes, char *addr */ |
| 501 | typedef void *CRYPTO_MEM_LEAK_CB(unsigned long, const char *, int, int, void *); | 501 | typedef int *CRYPTO_MEM_LEAK_CB(unsigned long, const char *, int, int, void *); |
| 502 | void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb); | 502 | int CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb); |
| 503 | 503 | ||
| 504 | /* die if we have to */ | 504 | /* die if we have to */ |
| 505 | void OpenSSLDie(const char *file, int line, const char *assertion); | 505 | void OpenSSLDie(const char *file, int line, const char *assertion); |
