diff options
| author | tb <> | 2023-07-05 19:25:01 +0000 |
|---|---|---|
| committer | tb <> | 2023-07-05 19:25:01 +0000 |
| commit | 194f7bef0ed9b3c0ed5bf1624fcc3d50b1004cb1 (patch) | |
| tree | fe543e3ee5d9a7906dff49f9881a0903cd0ee24d | |
| parent | 1b9cfd8fd3700a5020daafcea0793af1d5342c40 (diff) | |
| download | openbsd-194f7bef0ed9b3c0ed5bf1624fcc3d50b1004cb1.tar.gz openbsd-194f7bef0ed9b3c0ed5bf1624fcc3d50b1004cb1.tar.bz2 openbsd-194f7bef0ed9b3c0ed5bf1624fcc3d50b1004cb1.zip | |
Merge bio.h patch from libressl-portable
ok beck@
| -rw-r--r-- | src/lib/libcrypto/bio/bio.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/lib/libcrypto/bio/bio.h b/src/lib/libcrypto/bio/bio.h index 82c4d68f12..124690b1ee 100644 --- a/src/lib/libcrypto/bio/bio.h +++ b/src/lib/libcrypto/bio/bio.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bio.h,v 1.57 2023/07/05 17:32:51 beck Exp $ */ | 1 | /* $OpenBSD: bio.h,v 1.58 2023/07/05 19:25:01 tb Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -663,6 +663,8 @@ void BIO_copy_next_retry(BIO *b); | |||
| 663 | 663 | ||
| 664 | /*long BIO_ghbn_ctrl(int cmd,int iarg,char *parg);*/ | 664 | /*long BIO_ghbn_ctrl(int cmd,int iarg,char *parg);*/ |
| 665 | 665 | ||
| 666 | /* Needed for libressl-portable. */ | ||
| 667 | #ifndef __MINGW_PRINTF_FORMAT | ||
| 666 | int BIO_printf(BIO *bio, const char *format, ...) | 668 | int BIO_printf(BIO *bio, const char *format, ...) |
| 667 | __attribute__((__format__(__printf__, 2, 3), __nonnull__(2))); | 669 | __attribute__((__format__(__printf__, 2, 3), __nonnull__(2))); |
| 668 | int BIO_vprintf(BIO *bio, const char *format, va_list args) | 670 | int BIO_vprintf(BIO *bio, const char *format, va_list args) |
| @@ -673,6 +675,18 @@ int BIO_snprintf(char *buf, size_t n, const char *format, ...) | |||
| 673 | int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args) | 675 | int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args) |
| 674 | __attribute__((__deprecated__, __format__(__printf__, 3, 0), | 676 | __attribute__((__deprecated__, __format__(__printf__, 3, 0), |
| 675 | __nonnull__(3))); | 677 | __nonnull__(3))); |
| 678 | #else | ||
| 679 | int BIO_printf(BIO *bio, const char *format, ...) | ||
| 680 | __attribute__((__format__(__MINGW_PRINTF_FORMAT, 2, 3), __nonnull__(2))); | ||
| 681 | int BIO_vprintf(BIO *bio, const char *format, va_list args) | ||
| 682 | __attribute__((__format__(__MINGW_PRINTF_FORMAT, 2, 0), __nonnull__(2))); | ||
| 683 | int BIO_snprintf(char *buf, size_t n, const char *format, ...) | ||
| 684 | __attribute__((__deprecated__, __format__(__MINGW_PRINTF_FORMAT, 3, 4), | ||
| 685 | __nonnull__(3))); | ||
| 686 | int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args) | ||
| 687 | __attribute__((__deprecated__, __format__(__MINGW_PRINTF_FORMAT, 3, 0), | ||
| 688 | __nonnull__(3))); | ||
| 689 | #endif | ||
| 676 | 690 | ||
| 677 | void ERR_load_BIO_strings(void); | 691 | void ERR_load_BIO_strings(void); |
| 678 | 692 | ||