diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/crypto.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/libcrypto/crypto.h b/src/lib/libcrypto/crypto.h index ea475e3bf4..f8cae75943 100644 --- a/src/lib/libcrypto/crypto.h +++ b/src/lib/libcrypto/crypto.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: crypto.h,v 1.52 2021/11/01 08:14:36 tb Exp $ */ | 1 | /* $OpenBSD: crypto.h,v 1.53 2021/12/11 07:38:03 anton 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 | * |
| @@ -205,15 +205,15 @@ typedef struct openssl_item_st { | |||
| 205 | 205 | ||
| 206 | #ifndef CRYPTO_w_lock | 206 | #ifndef CRYPTO_w_lock |
| 207 | #define CRYPTO_w_lock(type) \ | 207 | #define CRYPTO_w_lock(type) \ |
| 208 | CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__) | 208 | CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,NULL,0) |
| 209 | #define CRYPTO_w_unlock(type) \ | 209 | #define CRYPTO_w_unlock(type) \ |
| 210 | CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__) | 210 | CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,NULL,0) |
| 211 | #define CRYPTO_r_lock(type) \ | 211 | #define CRYPTO_r_lock(type) \ |
| 212 | CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__) | 212 | CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,NULL,0) |
| 213 | #define CRYPTO_r_unlock(type) \ | 213 | #define CRYPTO_r_unlock(type) \ |
| 214 | CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__) | 214 | CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,NULL,0) |
| 215 | #define CRYPTO_add(addr,amount,type) \ | 215 | #define CRYPTO_add(addr,amount,type) \ |
| 216 | CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__) | 216 | CRYPTO_add_lock(addr,amount,type,NULL,0) |
| 217 | #endif | 217 | #endif |
| 218 | 218 | ||
| 219 | /* Some applications as well as some parts of OpenSSL need to allocate | 219 | /* Some applications as well as some parts of OpenSSL need to allocate |
| @@ -309,19 +309,19 @@ int CRYPTO_is_mem_check_on(void); | |||
| 309 | #define MemCheck_start() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON) | 309 | #define MemCheck_start() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON) |
| 310 | #define MemCheck_stop() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_OFF) | 310 | #define MemCheck_stop() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_OFF) |
| 311 | 311 | ||
| 312 | #define OPENSSL_malloc(num) CRYPTO_malloc((int)num,__FILE__,__LINE__) | 312 | #define OPENSSL_malloc(num) CRYPTO_malloc((int)num,NULL,0) |
| 313 | #define OPENSSL_strdup(str) CRYPTO_strdup((str),__FILE__,__LINE__) | 313 | #define OPENSSL_strdup(str) CRYPTO_strdup((str),NULL,0) |
| 314 | #define OPENSSL_realloc(addr,num) \ | 314 | #define OPENSSL_realloc(addr,num) \ |
| 315 | CRYPTO_realloc((char *)addr,(int)num,__FILE__,__LINE__) | 315 | CRYPTO_realloc((char *)addr,(int)num,NULL,0) |
| 316 | #define OPENSSL_realloc_clean(addr,old_num,num) \ | 316 | #define OPENSSL_realloc_clean(addr,old_num,num) \ |
| 317 | CRYPTO_realloc_clean(addr,old_num,num,__FILE__,__LINE__) | 317 | CRYPTO_realloc_clean(addr,old_num,num,NULL,0) |
| 318 | #define OPENSSL_remalloc(addr,num) \ | 318 | #define OPENSSL_remalloc(addr,num) \ |
| 319 | CRYPTO_remalloc((char **)addr,(int)num,__FILE__,__LINE__) | 319 | CRYPTO_remalloc((char **)addr,(int)num,NULL,0) |
| 320 | #define OPENSSL_freeFunc CRYPTO_free | 320 | #define OPENSSL_freeFunc CRYPTO_free |
| 321 | #define OPENSSL_free(addr) CRYPTO_free(addr) | 321 | #define OPENSSL_free(addr) CRYPTO_free(addr) |
| 322 | 322 | ||
| 323 | #define OPENSSL_malloc_locked(num) \ | 323 | #define OPENSSL_malloc_locked(num) \ |
| 324 | CRYPTO_malloc_locked((int)num,__FILE__,__LINE__) | 324 | CRYPTO_malloc_locked((int)num,NULL,0) |
| 325 | #define OPENSSL_free_locked(addr) CRYPTO_free_locked(addr) | 325 | #define OPENSSL_free_locked(addr) CRYPTO_free_locked(addr) |
| 326 | #endif | 326 | #endif |
| 327 | 327 | ||
| @@ -457,7 +457,7 @@ void CRYPTO_set_mem_debug_options(long bits); | |||
| 457 | long CRYPTO_get_mem_debug_options(void); | 457 | long CRYPTO_get_mem_debug_options(void); |
| 458 | 458 | ||
| 459 | #define CRYPTO_push_info(info) \ | 459 | #define CRYPTO_push_info(info) \ |
| 460 | CRYPTO_push_info_(info, __FILE__, __LINE__); | 460 | CRYPTO_push_info_(info, NULL, 0); |
| 461 | int CRYPTO_push_info_(const char *info, const char *file, int line); | 461 | int CRYPTO_push_info_(const char *info, const char *file, int line); |
| 462 | int CRYPTO_pop_info(void); | 462 | int CRYPTO_pop_info(void); |
| 463 | int CRYPTO_remove_all_info(void); | 463 | int CRYPTO_remove_all_info(void); |
