rebase patches

4 files changed, 24 insertions, 23 deletions

diff --git a/patches/bio.h.patch b/patches/bio.h.patch
index e726e20..29bba0c 100644
--- a/patches/bio.h.patch
+++ b/patches/bio.h.patch
@@ -1,12 +1,12 @@
---- 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 @@
-
+--- include/openssl/bio.h.orig  Fri Feb 18 16:30:39 2022
++++ include/openssl/bio.h       Mon Feb 21 05:39:35 2022
+@@ -666,8 +666,24 @@
+ 
  /*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,15 +20,17 @@
 +       __attribute__((__deprecated__, __format__(__MINGW_PRINTF_FORMAT, 3, 0),
 +           __nonnull__(3)));
 +#else
- int
- BIO_printf(BIO *bio, const char *format, ...)
++int
++BIO_printf(BIO *bio, const char *format, ...)
         __attribute__((__format__(__printf__, 2, 3), __nonnull__(2)));
-@@ -727,6 +743,8 @@
+ int
+ BIO_vprintf(BIO *bio, const char *format, va_list args)
+@@ -680,6 +696,8 @@
  BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args)
         __attribute__((__deprecated__, __format__(__printf__, 3, 0),
             __nonnull__(3)));
 +#endif
 +
-
+ 
  /* BEGIN ERROR CODES */
  /* The following lines are auto generated by the script mkerr.pl. Any changes
diff --git a/patches/bn_lcl.h.patch b/patches/bn_lcl.h.patch
index 184bbd7..84835ed 100644
--- a/patches/bn_lcl.h.patch
+++ b/patches/bn_lcl.h.patch
@@ -1,6 +1,6 @@
---- ./openbsd/src/lib/libcrypto/bn/bn_lcl.h     2018-12-17 06:59:43.067523154 -0600
-+++ ./crypto/bn/bn_lcl.h        2019-01-20 19:43:53.679717457 -0600
-@@ -239,7 +239,7 @@
+--- ./crypto/bn/bn_lcl.h.orig   Fri Feb 18 16:30:39 2022
++++ ./crypto/bn/bn_lcl.h        Mon Feb 21 05:39:35 2022
+@@ -283,7 +283,7 @@
              : "r"(a), "r"(b));         \
         ret;                    })
  #  endif       /* compiler */
diff --git a/patches/tlsexttest.c.patch b/patches/tlsexttest.c.patch
index be73102..b1b8652 100644
--- a/patches/tlsexttest.c.patch
+++ b/patches/tlsexttest.c.patch
@@ -1,5 +1,5 @@
---- tests/tlsexttest.c.orig     Sun Feb  6 20:37:16 2022
-+++ tests/tlsexttest.c  Sun Feb  6 21:07:42 2022
+--- tests/tlsexttest.c.orig     Fri Feb 18 16:30:40 2022
++++ tests/tlsexttest.c  Mon Feb 21 05:39:35 2022
 @@ -1658,7 +1658,9 @@
  };
  
@@ -39,7 +39,7 @@
         if (!tlsext_sni_client_parse(ssl, SSL_TLSEXT_MSG_SH, &cbs, &alert)) {
                 FAIL("failed to parse server SNI\n");
                 goto err;
-@@ -2746,7 +2748,10 @@
+@@ -2747,7 +2749,10 @@
         0x04, 0x03, 0x02, 0x01, 0x02, 0x03,
  };
  
@@ -51,7 +51,7 @@
  
  static int
  test_tlsext_clienthello_build(void)
-@@ -2823,18 +2828,18 @@
+@@ -2826,18 +2831,18 @@
                 goto err;
         }
  
diff --git a/patches/windows_headers.patch b/patches/windows_headers.patch
index 49e2a97..cfbed95 100644
--- a/patches/windows_headers.patch
+++ b/patches/windows_headers.patch
@@ -26,13 +26,12 @@ diff -u include/openssl.orig/dtls1.h include/openssl/dtls1.h
  #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
  #define OPENSSLDIR "/etc/ssl"
  #endif
-diff -u include/openssl.orig/ossl_typ.h include/openssl/ossl_typ.h
---- include/openssl.orig/ossl_typ.h     Mon Dec  7 07:58:32 2015
-+++ include/openssl/ossl_typ.h  Mon Dec  7 07:56:14 2015
-@@ -80,6 +80,22 @@
+--- include/openssl/ossl_typ.h.orig     Fri Feb 18 16:30:39 2022
++++ include/openssl/ossl_typ.h  Mon Feb 21 05:39:35 2022
+@@ -82,6 +82,22 @@
  typedef struct ASN1_ITEM_st ASN1_ITEM;
  typedef struct asn1_pctx_st ASN1_PCTX;
-
+ 
 +#if defined(_WIN32) && defined(__WINCRYPT_H__)
 +#ifndef LIBRESSL_INTERNAL
 +#ifdef _MSC_VER