From 1914b880ad98afdf9d32539485d95d1e43c72d06 Mon Sep 17 00:00:00 2001 From: beck <> Date: Wed, 10 Apr 2024 15:13:23 +0000 Subject: Re-guard the crypto_malloc macros. accidentally not included in crypto.h commit requested and ok tb@ --- src/lib/libcrypto/crypto.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') 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 @@ -/* $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 */ -- cgit v1.2.3-55-g6feb