libressl-portable/patches/windows_headers.patch

83 lines
2.1 KiB
Diff
Raw Normal View History

--- 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 <winsock2.h>
+#else
#include <sys/time.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
--- 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;
2022-02-27 05:37:43 -06:00
+#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_CERT_PAIR
+#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
2023-08-03 13:38:41 -06:00
@@ -100,6 +100,19 @@
extern "C" {
#endif
2023-04-18 03:33:46 -06:00
+#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_CERT_PAIR
+#undef X509_EXTENSIONS
+#endif
+
#define X509_FILETYPE_PEM 1
#define X509_FILETYPE_ASN1 2
#define X509_FILETYPE_DEFAULT 3