aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Buehler <tb@openbsd.org>2023-07-05 15:38:45 -0600
committerTheo Buehler <tb@openbsd.org>2023-07-05 15:38:45 -0600
commita47e39014e1596ffc94d5b64096f647596a1a581 (patch)
treeaa8d636ab8d1985caeaf5ca2adc0bd13f0c9c82f
parentb2b19236004c1c5a3baf0622074a3ddf7dbc7d69 (diff)
downloadportable-a47e39014e1596ffc94d5b64096f647596a1a581.tar.gz
portable-a47e39014e1596ffc94d5b64096f647596a1a581.tar.bz2
portable-a47e39014e1596ffc94d5b64096f647596a1a581.zip
Remove patches merged into upstream
Diffstat
-rw-r--r--patches/libcrypto.hidden.patch134
-rw-r--r--patches/libssl.hidden.patch15
2 files changed, 0 insertions, 149 deletions
diff --git a/patches/libcrypto.hidden.patch b/patches/libcrypto.hidden.patch
deleted file mode 100644
index f786576..0000000
--- a/patches/libcrypto.hidden.patch
+++ /dev/null
@@ -1,134 +0,0 @@
1diff -u openbsd/src/lib/libcrypto/hidden/openssl/hmac.h crypto/hidden/openssl/hmac.h
2--- openbsd/src/lib/libcrypto/hidden/openssl/hmac.h 2023-03-15 11:41:37.632580800 -0600
3+++ crypto/hidden/openssl/hmac.h 2023-03-15 16:49:29.144080400 -0600
4@@ -18,7 +18,11 @@
5 #ifndef _LIBCRYPTO_HMAC_H_
6 #define _LIBCRYPTO_HMAC_H_
7
8+#ifdef _MSC_VER
9+#include <../include/openssl/hmac.h>
10+#else
11 #include_next <openssl/hmac.h>
12+#endif
13 #include "crypto_namespace.h"
14
15 LCRYPTO_USED(HMAC_CTX_new);
16diff -u openbsd/src/lib/libcrypto/hidden/openssl/pkcs12.h crypto/hidden/openssl/pkcs12.h
17--- openbsd/src/lib/libcrypto/hidden/openssl/pkcs12.h 2023-03-15 11:41:37.648024900 -0600
18+++ crypto/hidden/openssl/pkcs12.h 2023-03-15 17:15:36.015981800 -0600
19@@ -18,7 +18,11 @@
20 #ifndef _LIBCRYPTO_PKCS12_H
21 #define _LIBCRYPTO_PKCS12_H
22
23+#ifdef _MSC_VER
24+#include <../include/openssl/pkcs12.h>
25+#else
26 #include_next <openssl/pkcs12.h>
27+#endif
28 #include "crypto_namespace.h"
29
30 LCRYPTO_USED(PKCS12_SAFEBAG_get0_attr);
31diff -u openbsd/src/lib/libcrypto/hidden/openssl/pkcs7.h crypto/hidden/openssl/pkcs7.h
32--- openbsd/src/lib/libcrypto/hidden/openssl/pkcs7.h 2023-03-15 11:41:37.663599200 -0600
33+++ crypto/hidden/openssl/pkcs7.h 2023-03-15 16:53:43.232866600 -0600
34@@ -18,7 +18,11 @@
35 #ifndef _LIBCRYPTO_PKCS7_H
36 #define _LIBCRYPTO_PKCS7_H
37
38+#ifdef _MSC_VER
39+#include <../include/openssl/pkcs7.h>
40+#else
41 #include_next <openssl/pkcs7.h>
42+#endif
43 #include "crypto_namespace.h"
44
45 LCRYPTO_USED(PKCS7_ISSUER_AND_SERIAL_new);
46diff -u openbsd/src/lib/libcrypto/hidden/openssl/stack.h crypto/hidden/openssl/stack.h
47--- openbsd/src/lib/libcrypto/hidden/openssl/stack.h 2023-03-15 11:41:37.680453800 -0600
48+++ crypto/hidden/openssl/stack.h 2023-03-15 16:49:29.200142600 -0600
49@@ -18,7 +18,11 @@
50 #ifndef _LIBCRYPTO_STACK_H
51 #define _LIBCRYPTO_STACK_H
52
53+#ifdef _MSC_VER
54+#include <../include/openssl/stack.h>
55+#else
56 #include_next <openssl/stack.h>
57+#endif
58 #include "crypto_namespace.h"
59
60 LCRYPTO_USED(sk_num);
61diff -u openbsd/src/lib/libcrypto/hidden/openssl/ui.h crypto/hidden/openssl/ui.h
62--- openbsd/src/lib/libcrypto/hidden/openssl/ui.h 2023-03-15 11:41:37.696291800 -0600
63+++ crypto/hidden/openssl/ui.h 2023-03-15 16:49:29.222310800 -0600
64@@ -18,7 +18,11 @@
65 #ifndef _LIBCRYPTO_UI_H
66 #define _LIBCRYPTO_UI_H
67
68+#ifdef _MSC_VER
69+#include <../include/openssl/ui.h>
70+#else
71 #include_next <openssl/ui.h>
72+#endif
73 #include "crypto_namespace.h"
74
75 LCRYPTO_USED(UI_new);
76diff -u openbsd/src/lib/libcrypto/hidden/openssl/x509.h crypto/hidden/openssl/x509.h
77--- openbsd/src/lib/libcrypto/hidden/openssl/x509.h 2023-03-15 11:41:37.713302600 -0600
78+++ crypto/hidden/openssl/x509.h 2023-03-15 16:49:29.238904200 -0600
79@@ -18,7 +18,11 @@
80 #ifndef _LIBCRYPTO_X509_H
81 #define _LIBCRYPTO_X509_H
82
83+#ifdef _MSC_VER
84+#include <../include/openssl/x509.h>
85+#else
86 #include_next <openssl/x509.h>
87+#endif
88 #include "crypto_namespace.h"
89
90 LCRYPTO_USED(X509_CRL_up_ref);
91diff -u openbsd/src/lib/libcrypto/hidden/openssl/x509v3.h crypto/hidden/openssl/x509v3.h
92--- openbsd/src/lib/libcrypto/hidden/openssl/x509v3.h 2023-03-15 11:41:37.756379100 -0600
93+++ crypto/hidden/openssl/x509v3.h 2023-03-15 16:49:29.264482800 -0600
94@@ -18,7 +18,11 @@
95 #ifndef _LIBCRYPTO_X509V3_H
96 #define _LIBCRYPTO_X509V3_H
97
98+#ifdef _MSC_VER
99+#include <../include/openssl/x509v3.h>
100+#else
101 #include_next <openssl/x509v3.h>
102+#endif
103 #include "crypto_namespace.h"
104
105 LCRYPTO_USED(BASIC_CONSTRAINTS_new);
106diff -u openbsd/src/lib/libcrypto/hidden/openssl/x509_vfy.h crypto/hidden/openssl/x509_vfy.h
107--- openbsd/src/lib/libcrypto/hidden/openssl/x509_vfy.h 2023-03-15 11:41:37.735995100 -0600
108+++ crypto/hidden/openssl/x509_vfy.h 2023-03-15 16:49:29.300450300 -0600
109@@ -18,7 +18,11 @@
110 #ifndef _LIBCRYPTO_X509_VFY_H
111 #define _LIBCRYPTO_X509_VFY_H
112
113+#ifdef _MSC_VER
114+#include <../include/openssl/x509_vfy.h>
115+#else
116 #include_next <openssl/x509_vfy.h>
117+#endif
118 #include "crypto_namespace.h"
119
120 LCRYPTO_USED(X509_STORE_set_depth);
121--- crypto/hidden/openssl/chacha.h.orig Wed Jul 5 13:42:44 2023
122+++ crypto/hidden/openssl/chacha.h Wed Jul 5 13:44:17 2023
123@@ -18,7 +18,11 @@
124 #ifndef _LIBCRYPTO_CHACHA_H
125 #define _LIBCRYPTO_CHACHA_H
126
127+#ifdef _MSC_VER
128+#include <../include/openssl/chacha.h>
129+#else
130 #include_next <openssl/chacha.h>
131+#endif
132 #include "crypto_namespace.h"
133
134 LCRYPTO_USED(ChaCha_set_key);
diff --git a/patches/libssl.hidden.patch b/patches/libssl.hidden.patch
deleted file mode 100644
index 5a8c2c8..0000000
--- a/patches/libssl.hidden.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1diff -u openbsd/src/lib/libssl/hidden/openssl/ssl.h ssl/hidden/openssl/ssl.h
2--- openbsd/src/lib/libssl/hidden/openssl/ssl.h 2023-03-15 11:41:52.466146400 -0600
3+++ ssl/hidden/openssl/ssl.h 2023-03-15 16:49:29.358377300 -0600
4@@ -18,7 +18,11 @@
5 #ifndef _LIBSSL_SSL_H_
6 #define _LIBSSL_SSL_H_
7
8+#ifdef _MSC_VER
9+#include <../include/openssl/ssl.h>
10+#else
11 #include_next <openssl/ssl.h>
12+#endif
13 #include "ssl_namespace.h"
14
15 LSSL_USED(BIO_f_ssl);
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2026-01-16 18:16:34 +0000