diff options
-rw-r--r-- | src/lib/libcrypto/crypto.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/libcrypto/crypto.h b/src/lib/libcrypto/crypto.h index 43950e3afc..f91374f496 100644 --- a/src/lib/libcrypto/crypto.h +++ b/src/lib/libcrypto/crypto.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: crypto.h,v 1.61 2023/07/01 09:04:19 tb Exp $ */ | 1 | /* $OpenBSD: crypto.h,v 1.62 2023/07/05 13:06:06 bcook 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 | * |
@@ -487,7 +487,15 @@ int CRYPTO_mem_leaks(struct bio_st *bio); | |||
487 | typedef int *CRYPTO_MEM_LEAK_CB(unsigned long, const char *, int, int, void *); | 487 | typedef int *CRYPTO_MEM_LEAK_CB(unsigned long, const char *, int, int, void *); |
488 | int CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb); | 488 | int CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb); |
489 | 489 | ||
490 | /* die if we have to */ | 490 | /* |
491 | * Because this is a public header, use a portable method of indicating the | ||
492 | * function does not return, rather than __dead. | ||
493 | */ | ||
494 | #ifdef _MSC_VER | ||
495 | __declspec(noreturn) | ||
496 | #else | ||
497 | __attribute__((__noreturn__)) | ||
498 | #endif | ||
491 | void OpenSSLDie(const char *file, int line, const char *assertion); | 499 | void OpenSSLDie(const char *file, int line, const char *assertion); |
492 | #define OPENSSL_assert(e) (void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1)) | 500 | #define OPENSSL_assert(e) (void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1)) |
493 | 501 | ||