diff options
| author | Brent Cook <busterb@gmail.com> | 2022-02-27 05:37:43 -0600 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2022-02-27 05:37:43 -0600 |
| commit | 115cf2d553e6310e02a117ebe9985b33c0be6245 (patch) | |
| tree | 2b80844597bd63aa3863a5cde11bb067caf0a369 /patches/windows_headers.patch | |
| parent | 2f43da43c1b0bf55881ab9cd61b3d90ce03c485d (diff) | |
| download | portable-115cf2d553e6310e02a117ebe9985b33c0be6245.tar.gz portable-115cf2d553e6310e02a117ebe9985b33c0be6245.tar.bz2 portable-115cf2d553e6310e02a117ebe9985b33c0be6245.zip | |
rebase patches
Diffstat (limited to '')
| -rw-r--r-- | patches/windows_headers.patch | 9 |
1 files changed, 4 insertions, 5 deletions
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 | |||
| 26 | #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) | 26 | #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) |
| 27 | #define OPENSSLDIR "/etc/ssl" | 27 | #define OPENSSLDIR "/etc/ssl" |
| 28 | #endif | 28 | #endif |
| 29 | diff -u include/openssl.orig/ossl_typ.h include/openssl/ossl_typ.h | 29 | --- include/openssl/ossl_typ.h.orig Fri Feb 18 16:30:39 2022 |
| 30 | --- include/openssl.orig/ossl_typ.h Mon Dec 7 07:58:32 2015 | 30 | +++ include/openssl/ossl_typ.h Mon Feb 21 05:39:35 2022 |
| 31 | +++ include/openssl/ossl_typ.h Mon Dec 7 07:56:14 2015 | 31 | @@ -82,6 +82,22 @@ |
| 32 | @@ -80,6 +80,22 @@ | ||
| 33 | typedef struct ASN1_ITEM_st ASN1_ITEM; | 32 | typedef struct ASN1_ITEM_st ASN1_ITEM; |
| 34 | typedef struct asn1_pctx_st ASN1_PCTX; | 33 | typedef struct asn1_pctx_st ASN1_PCTX; |
| 35 | 34 | ||
| 36 | +#if defined(_WIN32) && defined(__WINCRYPT_H__) | 35 | +#if defined(_WIN32) && defined(__WINCRYPT_H__) |
| 37 | +#ifndef LIBRESSL_INTERNAL | 36 | +#ifndef LIBRESSL_INTERNAL |
| 38 | +#ifdef _MSC_VER | 37 | +#ifdef _MSC_VER |