factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rediffed patches for merge fuzz

Browse Source
This commit is contained in:
Brent Cook
2018-11-07 20:00:29 -06:00
parent 34394e7ee0
commit 11bb39ecf6
6 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/bio.h.patch
View File

@@ -1,12 +1,12 @@
--- include/openssl/bio.h.orig Mon Oct 3 06:09:28 2016
+++ include/openssl/bio.h Sun Nov 6 04:24:57 2016
@@ -713,8 +713,24 @@
--- include/openssl/bio.h.orig 2018-07-24 21:59:17.000000000 -0500
+++ include/openssl/bio.h 2018-11-07 18:44:43.000000000 -0600
@@ -713,6 +713,22 @@
/*long BIO_ghbn_ctrl(int cmd,int iarg,char *parg);*/
+#ifdef __MINGW_PRINTF_FORMAT
int
BIO_printf(BIO *bio, const char *format, ...)
+int
+BIO_printf(BIO *bio, const char *format, ...)
+ __attribute__((__format__(__MINGW_PRINTF_FORMAT, 2, 3), __nonnull__(2)));
+int
+BIO_vprintf(BIO *bio, const char *format, va_list args)
@@ -20,11 +20,9 @@
+ __attribute__((__deprecated__, __format__(__MINGW_PRINTF_FORMAT, 3, 0),
+ __nonnull__(3)));
+#else
+int
+BIO_printf(BIO *bio, const char *format, ...)
__attribute__((__format__(__printf__, 2, 3), __nonnull__(2)));
int
BIO_vprintf(BIO *bio, const char *format, va_list args)
BIO_printf(BIO *bio, const char *format, ...)
__attribute__((__format__(__printf__, 2, 3), __nonnull__(2)));
@@ -727,6 +743,8 @@
BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args)
__attribute__((__deprecated__, __format__(__printf__, 3, 0),