diff options
Diffstat (limited to 'src/lib/libcrypto/crypto.h')
-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 67e06a1509..be5f92b1a3 100644 --- a/src/lib/libcrypto/crypto.h +++ b/src/lib/libcrypto/crypto.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: crypto.h,v 1.45 2018/03/19 03:35:38 beck Exp $ */ | 1 | /* $OpenBSD: crypto.h,v 1.46 2018/05/13 13:48:08 jsing 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 | * |
@@ -299,6 +299,7 @@ DECLARE_STACK_OF(CRYPTO_EX_DATA_FUNCS) | |||
299 | * via CRYPTO_ex_data_new_class). */ | 299 | * via CRYPTO_ex_data_new_class). */ |
300 | #define CRYPTO_EX_INDEX_USER 100 | 300 | #define CRYPTO_EX_INDEX_USER 100 |
301 | 301 | ||
302 | #ifndef LIBRESSL_INTERNAL | ||
302 | #define CRYPTO_malloc_init() (0) | 303 | #define CRYPTO_malloc_init() (0) |
303 | #define CRYPTO_malloc_debug_init() (0) | 304 | #define CRYPTO_malloc_debug_init() (0) |
304 | 305 | ||
@@ -329,6 +330,7 @@ int CRYPTO_is_mem_check_on(void); | |||
329 | #define OPENSSL_malloc_locked(num) \ | 330 | #define OPENSSL_malloc_locked(num) \ |
330 | CRYPTO_malloc_locked((int)num,__FILE__,__LINE__) | 331 | CRYPTO_malloc_locked((int)num,__FILE__,__LINE__) |
331 | #define OPENSSL_free_locked(addr) CRYPTO_free_locked(addr) | 332 | #define OPENSSL_free_locked(addr) CRYPTO_free_locked(addr) |
333 | #endif | ||
332 | 334 | ||
333 | const char *OpenSSL_version(int type); | 335 | const char *OpenSSL_version(int type); |
334 | #define OPENSSL_VERSION 0 | 336 | #define OPENSSL_VERSION 0 |