--- 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 Wed Nov 1 13:15:36 2023 +++ include/openssl/ossl_typ.h Wed Nov 1 13:18:23 2023 @@ -82,6 +82,21 @@ 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__) +#if !defined(LIBRESSL_INTERNAL) && !defined(LIBRESSL_DISABLE_OVERRIDE_WINCRYPT_DEFINES_WARNING) +#ifdef _MSC_VER +#pragma message("Warning, overriding WinCrypt defines") +#else +#warning overriding WinCrypt defines +#endif +#endif +#undef X509_NAME +#undef X509_EXTENSIONS +#undef OCSP_REQUEST +#undef OCSP_RESPONSE +#undef PKCS7_ISSUER_AND_SERIAL +#endif + #ifdef BIGNUM #undef BIGNUM #endif --- 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__) +#if !defined(LIBRESSL_INTERNAL) && !defined(LIBRESSL_DISABLE_OVERRIDE_WINCRYPT_DEFINES_WARNING) +#ifdef _MSC_VER +#pragma message("Warning, overriding WinCrypt defines") +#else +#warning overriding WinCrypt defines +#endif +#endif +#undef PKCS7_ISSUER_AND_SERIAL +#undef PKCS7_SIGNER_INFO +#endif + /* Encryption_ID DES-CBC Digest_ID MD5 --- 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,18 @@ extern "C" { #endif +#if defined(_WIN32) && defined(__WINCRYPT_H__) +#if !defined(LIBRESSL_INTERNAL) && !defined(LIBRESSL_DISABLE_OVERRIDE_WINCRYPT_DEFINES_WARNING) +#ifdef _MSC_VER +#pragma message("Warning, overriding WinCrypt defines") +#else +#warning overriding WinCrypt defines +#endif +#endif +#undef X509_NAME +#undef X509_EXTENSIONS +#endif + #define X509_FILETYPE_PEM 1 #define X509_FILETYPE_ASN1 2 #define X509_FILETYPE_DEFAULT 3