diff options
author | Theo Buehler <tb@openbsd.org> | 2023-12-19 20:12:20 +0100 |
---|---|---|
committer | Theo Buehler <tb@openbsd.org> | 2023-12-19 20:13:32 +0100 |
commit | ee791f9d2aa7bc727607a5692ed42179f3b95906 (patch) | |
tree | dbe88318f0c68e54271615dcbb3a30b4fa622531 /patches | |
parent | 1862efa835a8f290bd423989c8802c2445d428d0 (diff) | |
download | portable-ee791f9d2aa7bc727607a5692ed42179f3b95906.tar.gz portable-ee791f9d2aa7bc727607a5692ed42179f3b95906.tar.bz2 portable-ee791f9d2aa7bc727607a5692ed42179f3b95906.zip |
Stop undefining X509_CERT_PAIR
Pointed out in #910
Diffstat (limited to 'patches')
-rw-r--r-- | patches/windows_headers.patch | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/patches/windows_headers.patch b/patches/windows_headers.patch index 6eafa49..2e257be 100644 --- a/patches/windows_headers.patch +++ b/patches/windows_headers.patch | |||
@@ -14,7 +14,7 @@ | |||
14 | #include <stdlib.h> | 14 | #include <stdlib.h> |
15 | --- include/openssl/ossl_typ.h.orig Wed Nov 1 13:15:36 2023 | 15 | --- include/openssl/ossl_typ.h.orig Wed Nov 1 13:15:36 2023 |
16 | +++ include/openssl/ossl_typ.h Wed Nov 1 13:18:23 2023 | 16 | +++ include/openssl/ossl_typ.h Wed Nov 1 13:18:23 2023 |
17 | @@ -82,6 +82,22 @@ typedef struct asn1_object_st ASN1_OBJECT; | 17 | @@ -82,6 +82,21 @@ typedef struct asn1_object_st ASN1_OBJECT; |
18 | typedef struct ASN1_ITEM_st ASN1_ITEM; | 18 | typedef struct ASN1_ITEM_st ASN1_ITEM; |
19 | typedef struct asn1_pctx_st ASN1_PCTX; | 19 | typedef struct asn1_pctx_st ASN1_PCTX; |
20 | 20 | ||
@@ -27,7 +27,6 @@ | |||
27 | +#endif | 27 | +#endif |
28 | +#endif | 28 | +#endif |
29 | +#undef X509_NAME | 29 | +#undef X509_NAME |
30 | +#undef X509_CERT_PAIR | ||
31 | +#undef X509_EXTENSIONS | 30 | +#undef X509_EXTENSIONS |
32 | +#undef OCSP_REQUEST | 31 | +#undef OCSP_REQUEST |
33 | +#undef OCSP_RESPONSE | 32 | +#undef OCSP_RESPONSE |
@@ -60,7 +59,7 @@ | |||
60 | Digest_ID MD5 | 59 | Digest_ID MD5 |
61 | --- include/openssl/x509.h.orig Wed Nov 1 13:15:36 2023 | 60 | --- include/openssl/x509.h.orig Wed Nov 1 13:15:36 2023 |
62 | +++ include/openssl/x509.h Wed Nov 1 13:18:44 2023 | 61 | +++ include/openssl/x509.h Wed Nov 1 13:18:44 2023 |
63 | @@ -100,6 +100,19 @@ | 62 | @@ -100,6 +100,18 @@ |
64 | extern "C" { | 63 | extern "C" { |
65 | #endif | 64 | #endif |
66 | 65 | ||
@@ -73,7 +72,6 @@ | |||
73 | +#endif | 72 | +#endif |
74 | +#endif | 73 | +#endif |
75 | +#undef X509_NAME | 74 | +#undef X509_NAME |
76 | +#undef X509_CERT_PAIR | ||
77 | +#undef X509_EXTENSIONS | 75 | +#undef X509_EXTENSIONS |
78 | +#endif | 76 | +#endif |
79 | + | 77 | + |