diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2024-04-10 15:13:24 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2024-04-10 15:13:24 +0000 |
| commit | 2bf5d61dc158b953807ec7e8db98c5b96c8a8644 (patch) | |
| tree | 12296a6ccc95f386d535b30f29889ca69747634c /lib | |
| parent | 90f2dae8fbf30d43e2b4a0654a9a5fcb45a72cad (diff) | |
Re-guard the crypto_malloc macros.
accidentally not included in crypto.h commit
requested and ok tb@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libcrypto/crypto.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libcrypto/crypto.h b/lib/libcrypto/crypto.h index aad88aef079..40d3a43f4ff 100644 --- a/lib/libcrypto/crypto.h +++ b/lib/libcrypto/crypto.h @@ -1,4 +1,4 @@ -/* $OpenBSD: crypto.h,v 1.73 2024/04/10 14:51:02 beck Exp $ */ +/* $OpenBSD: crypto.h,v 1.74 2024/04/10 15:13:23 beck Exp $ */ /* ==================================================================== * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. * @@ -262,8 +262,10 @@ DECLARE_STACK_OF(void) #define CRYPTO_EX_INDEX_X509_STORE_CTX 14 #define CRYPTO_EX_INDEX__COUNT 15 +#ifndef LIBRESSL_INTERNAL #define CRYPTO_malloc_init() (0) #define CRYPTO_malloc_debug_init() (0) +#endif /* LIBRESSL_INTERNAL */ #if defined CRYPTO_MDEBUG_ALL || defined CRYPTO_MDEBUG_TIME || defined CRYPTO_MDEBUG_THREAD # ifndef CRYPTO_MDEBUG /* avoid duplicate #define */ |