From eed367e19c930472bc2d1c8026c1109afeea78d4 Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Wed, 1 Nov 2023 13:21:25 +0100 Subject: Allow disabling warning about WINCRYPT overrides Fixes #919 --- patches/windows_headers.patch | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/patches/windows_headers.patch b/patches/windows_headers.patch index 087d5ab..6eafa49 100644 --- a/patches/windows_headers.patch +++ b/patches/windows_headers.patch @@ -1,26 +1,25 @@ -diff -u include/openssl.orig/dtls1.h include/openssl/dtls1.h ---- include/openssl.orig/dtls1.h Mon Dec 7 07:58:32 2015 -+++ include/openssl/dtls1.h Mon Dec 7 07:56:14 2015 +--- include/openssl/dtls1.h.orig Wed Nov 1 13:15:36 2023 ++++ include/openssl/dtls1.h Wed Nov 1 13:15:54 2023 @@ -60,7 +60,11 @@ #ifndef HEADER_DTLS1_H #define HEADER_DTLS1_H - + +#if defined(_WIN32) +#include +#else #include +#endif - + #include #include ---- 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 @@ +--- include/openssl/ossl_typ.h.orig Wed Nov 1 13:15:36 2023 ++++ include/openssl/ossl_typ.h Wed Nov 1 13:18:23 2023 +@@ -82,6 +82,22 @@ typedef struct asn1_object_st ASN1_OBJECT; typedef struct ASN1_ITEM_st ASN1_ITEM; typedef struct asn1_pctx_st ASN1_PCTX; +#if defined(_WIN32) && defined(__WINCRYPT_H__) -+#ifndef LIBRESSL_INTERNAL ++#if !defined(LIBRESSL_INTERNAL) && !defined(LIBRESSL_DISABLE_OVERRIDE_WINCRYPT_DEFINES_WARNING) +#ifdef _MSC_VER +#pragma message("Warning, overriding WinCrypt defines") +#else @@ -38,15 +37,14 @@ diff -u include/openssl.orig/dtls1.h include/openssl/dtls1.h #ifdef BIGNUM #undef BIGNUM #endif -diff -u include/openssl.orig/pkcs7.h include/openssl/pkcs7.h ---- include/openssl.orig/pkcs7.h Mon Dec 7 07:58:32 2015 -+++ include/openssl/pkcs7.h Mon Dec 7 07:56:14 2015 +--- include/openssl/pkcs7.h.orig Wed Nov 1 13:15:36 2023 ++++ include/openssl/pkcs7.h Wed Nov 1 13:17:58 2023 @@ -69,6 +69,18 @@ extern "C" { #endif - + +#if defined(_WIN32) && defined(__WINCRYPT_H__) -+#ifndef LIBRESSL_INTERNAL ++#if !defined(LIBRESSL_INTERNAL) && !defined(LIBRESSL_DISABLE_OVERRIDE_WINCRYPT_DEFINES_WARNING) +#ifdef _MSC_VER +#pragma message("Warning, overriding WinCrypt defines") +#else @@ -60,14 +58,14 @@ diff -u include/openssl.orig/pkcs7.h include/openssl/pkcs7.h /* Encryption_ID DES-CBC Digest_ID MD5 ---- include/openssl/x509.h.orig Thu Aug 3 13:35:00 2023 -+++ include/openssl/x509.h Thu Aug 3 13:35:18 2023 +--- include/openssl/x509.h.orig Wed Nov 1 13:15:36 2023 ++++ include/openssl/x509.h Wed Nov 1 13:18:44 2023 @@ -100,6 +100,19 @@ extern "C" { #endif +#if defined(_WIN32) && defined(__WINCRYPT_H__) -+#ifndef LIBRESSL_INTERNAL ++#if !defined(LIBRESSL_INTERNAL) && !defined(LIBRESSL_DISABLE_OVERRIDE_WINCRYPT_DEFINES_WARNING) +#ifdef _MSC_VER +#pragma message("Warning, overriding WinCrypt defines") +#else -- cgit v1.2.3-55-g6feb