diff options
author | beck <> | 2024-04-10 15:13:23 +0000 |
---|---|---|
committer | beck <> | 2024-04-10 15:13:23 +0000 |
commit | 1914b880ad98afdf9d32539485d95d1e43c72d06 (patch) | |
tree | cc04b5c3679b9d60fbf21dfe07091ff1ee3ef07f /src | |
parent | e569c2916cc01347d10e72523732a457eabf0997 (diff) | |
download | openbsd-1914b880ad98afdf9d32539485d95d1e43c72d06.tar.gz openbsd-1914b880ad98afdf9d32539485d95d1e43c72d06.tar.bz2 openbsd-1914b880ad98afdf9d32539485d95d1e43c72d06.zip |
Re-guard the crypto_malloc macros.
accidentally not included in crypto.h commit
requested and ok tb@
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/crypto.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libcrypto/crypto.h b/src/lib/libcrypto/crypto.h index aad88aef07..40d3a43f4f 100644 --- a/src/lib/libcrypto/crypto.h +++ b/src/lib/libcrypto/crypto.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: crypto.h,v 1.73 2024/04/10 14:51:02 beck Exp $ */ | 1 | /* $OpenBSD: crypto.h,v 1.74 2024/04/10 15:13:23 beck 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 | * |
@@ -262,8 +262,10 @@ DECLARE_STACK_OF(void) | |||
262 | #define CRYPTO_EX_INDEX_X509_STORE_CTX 14 | 262 | #define CRYPTO_EX_INDEX_X509_STORE_CTX 14 |
263 | #define CRYPTO_EX_INDEX__COUNT 15 | 263 | #define CRYPTO_EX_INDEX__COUNT 15 |
264 | 264 | ||
265 | #ifndef LIBRESSL_INTERNAL | ||
265 | #define CRYPTO_malloc_init() (0) | 266 | #define CRYPTO_malloc_init() (0) |
266 | #define CRYPTO_malloc_debug_init() (0) | 267 | #define CRYPTO_malloc_debug_init() (0) |
268 | #endif /* LIBRESSL_INTERNAL */ | ||
267 | 269 | ||
268 | #if defined CRYPTO_MDEBUG_ALL || defined CRYPTO_MDEBUG_TIME || defined CRYPTO_MDEBUG_THREAD | 270 | #if defined CRYPTO_MDEBUG_ALL || defined CRYPTO_MDEBUG_TIME || defined CRYPTO_MDEBUG_THREAD |
269 | # ifndef CRYPTO_MDEBUG /* avoid duplicate #define */ | 271 | # ifndef CRYPTO_MDEBUG /* avoid duplicate #define */ |