summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/crypto.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lib/libcrypto/crypto.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/libcrypto/crypto.h b/src/lib/libcrypto/crypto.h
index 56e69cd35c..6ddcaff338 100644
--- a/src/lib/libcrypto/crypto.h
+++ b/src/lib/libcrypto/crypto.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: crypto.h,v 1.77 2025/01/20 17:50:12 tb Exp $ */ 1/* $OpenBSD: crypto.h,v 1.78 2025/03/09 15:12:18 tb 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 *
@@ -197,15 +197,15 @@ extern "C" {
197 197
198#ifndef CRYPTO_w_lock 198#ifndef CRYPTO_w_lock
199#define CRYPTO_w_lock(type) \ 199#define CRYPTO_w_lock(type) \
200 CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,NULL,0) 200 CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,OPENSSL_FILE,OPENSSL_LINE)
201#define CRYPTO_w_unlock(type) \ 201#define CRYPTO_w_unlock(type) \
202 CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,NULL,0) 202 CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,OPENSSL_FILE,OPENSSL_LINE)
203#define CRYPTO_r_lock(type) \ 203#define CRYPTO_r_lock(type) \
204 CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,NULL,0) 204 CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,OPENSSL_FILE,OPENSSL_LINE)
205#define CRYPTO_r_unlock(type) \ 205#define CRYPTO_r_unlock(type) \
206 CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,NULL,0) 206 CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,OPENSSL_FILE,OPENSSL_LINE)
207#define CRYPTO_add(addr,amount,type) \ 207#define CRYPTO_add(addr,amount,type) \
208 CRYPTO_add_lock(addr,amount,type,NULL,0) 208 CRYPTO_add_lock(addr,amount,type,OPENSSL_FILE,OPENSSL_LINE)
209#endif 209#endif
210 210
211/* Some applications as well as some parts of OpenSSL need to allocate 211/* Some applications as well as some parts of OpenSSL need to allocate
@@ -275,9 +275,9 @@ DECLARE_STACK_OF(void)
275 275
276int CRYPTO_mem_ctrl(int mode); 276int CRYPTO_mem_ctrl(int mode);
277 277
278#define OPENSSL_malloc(num) CRYPTO_malloc((num),NULL,0) 278#define OPENSSL_malloc(num) CRYPTO_malloc((num),OPENSSL_FILE,OPENSSL_LINE)
279#define OPENSSL_strdup(str) CRYPTO_strdup((str),NULL,0) 279#define OPENSSL_strdup(str) CRYPTO_strdup((str),OPENSSL_FILE,OPENSSL_LINE)
280#define OPENSSL_free(addr) CRYPTO_free((addr),NULL,0) 280#define OPENSSL_free(addr) CRYPTO_free((addr),OPENSSL_FILE,OPENSSL_LINE)
281 281
282const char *OpenSSL_version(int type); 282const char *OpenSSL_version(int type);
283#define OPENSSL_VERSION 0 283#define OPENSSL_VERSION 0
@@ -371,7 +371,7 @@ __declspec(noreturn)
371__attribute__((__noreturn__)) 371__attribute__((__noreturn__))
372#endif 372#endif
373void OpenSSLDie(const char *file, int line, const char *assertion); 373void OpenSSLDie(const char *file, int line, const char *assertion);
374#define OPENSSL_assert(e) (void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1)) 374#define OPENSSL_assert(e) (void)((e) ? 0 : (OpenSSLDie(OPENSSL_FILE, OPENSSL_LINE, #e),1))
375 375
376int FIPS_mode(void); 376int FIPS_mode(void);
377int FIPS_mode_set(int r); 377int FIPS_mode_set(int r);