1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
|
diff --git a/src/openssl.c b/src/openssl.c
index fd7d28e..d200d0e 100644
--- a/src/openssl.c
+++ b/src/openssl.c
@@ -40,13 +40,21 @@
#include <sys/types.h> /* ssize_t pid_t */
#include <sys/time.h> /* struct timeval gettimeofday(2) */
#include <sys/stat.h> /* struct stat stat(2) */
+#ifdef _WIN32_WINNT
+#include <winsock2.h> /* struct in_addr */
+#include <windows.h>
+#include <ws2def.h> /* AF_INET AF_INET6 */
+#include <in6addr.h> /* struct in6_addr */
+#include <ws2tcpip.h> /* inet_pton */
+#else
#include <sys/socket.h> /* AF_INET AF_INET6 */
#include <sys/resource.h> /* RUSAGE_SELF struct rusage getrusage(2) */
#include <sys/utsname.h> /* struct utsname uname(3) */
-#include <fcntl.h> /* O_RDONLY O_CLOEXEC open(2) */
-#include <unistd.h> /* close(2) getpid(2) */
#include <netinet/in.h> /* struct in_addr struct in6_addr */
#include <arpa/inet.h> /* inet_pton(3) */
+#endif
+#include <fcntl.h> /* O_RDONLY O_CLOEXEC open(2) */
+#include <unistd.h> /* close(2) getpid(2) */
#include <pthread.h> /* pthread_mutex_init(3) pthread_mutex_lock(3) pthread_mutex_unlock(3) */
#include <dlfcn.h> /* dladdr(3) dlopen(3) */
@@ -117,39 +125,39 @@
#endif
#ifndef HAVE_ASN1_STRING_GET0_DATA
-#define HAVE_ASN1_STRING_GET0_DATA OPENSSL_PREREQ(1,1,0)
+#define HAVE_ASN1_STRING_GET0_DATA OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_DH_GET0_KEY
-#define HAVE_DH_GET0_KEY OPENSSL_PREREQ(1,1,0)
+#define HAVE_DH_GET0_KEY OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_DH_GET0_PQG
-#define HAVE_DH_GET0_PQG OPENSSL_PREREQ(1,1,0)
+#define HAVE_DH_GET0_PQG OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_DH_SET0_KEY
-#define HAVE_DH_SET0_KEY OPENSSL_PREREQ(1,1,0)
+#define HAVE_DH_SET0_KEY OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_DH_SET0_PQG
-#define HAVE_DH_SET0_PQG OPENSSL_PREREQ(1,1,0)
+#define HAVE_DH_SET0_PQG OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_DSA_GET0_KEY
-#define HAVE_DSA_GET0_KEY OPENSSL_PREREQ(1,1,0)
+#define HAVE_DSA_GET0_KEY OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_DSA_GET0_PQG
-#define HAVE_DSA_GET0_PQG OPENSSL_PREREQ(1,1,0)
+#define HAVE_DSA_GET0_PQG OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_DSA_SET0_KEY
-#define HAVE_DSA_SET0_KEY OPENSSL_PREREQ(1,1,0)
+#define HAVE_DSA_SET0_KEY OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_DSA_SET0_PQG
-#define HAVE_DSA_SET0_PQG OPENSSL_PREREQ(1,1,0)
+#define HAVE_DSA_SET0_PQG OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_DTLSV1_CLIENT_METHOD
@@ -168,7 +176,7 @@
#ifdef OPENSSL_NO_DTLS1
#define HAVE_DTLS_CLIENT_METHOD (0)
#else
-#define HAVE_DTLS_CLIENT_METHOD OPENSSL_PREREQ(1,0,2)
+#define HAVE_DTLS_CLIENT_METHOD OPENSSL_PREREQ(1,0,2) || LIBRESSL_PREREQ(3,1,0)
#endif
#endif
@@ -180,7 +188,7 @@
#ifdef OPENSSL_NO_DTLS1
#define HAVE_DTLSV1_2_CLIENT_METHOD (0)
#else
-#define HAVE_DTLSV1_2_CLIENT_METHOD OPENSSL_PREREQ(1,0,2)
+#define HAVE_DTLSV1_2_CLIENT_METHOD OPENSSL_PREREQ(1,0,2) || LIBRESSL_PREREQ(3,1,0)
#endif
#endif
@@ -189,19 +197,19 @@
#endif
#ifndef HAVE_EVP_CIPHER_CTX_FREE
-#define HAVE_EVP_CIPHER_CTX_FREE OPENSSL_PREREQ(1,1,0)
+#define HAVE_EVP_CIPHER_CTX_FREE OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_EVP_CIPHER_CTX_NEW
-#define HAVE_EVP_CIPHER_CTX_NEW OPENSSL_PREREQ(1,1,0)
+#define HAVE_EVP_CIPHER_CTX_NEW OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_EVP_MD_CTX_FREE
-#define HAVE_EVP_MD_CTX_FREE OPENSSL_PREREQ(1,1,0)
+#define HAVE_EVP_MD_CTX_FREE OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_EVP_MD_CTX_NEW
-#define HAVE_EVP_MD_CTX_NEW OPENSSL_PREREQ(1,1,0)
+#define HAVE_EVP_MD_CTX_NEW OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_EVP_PKEY_GET_DEFAULT_DIGEST_NID
@@ -209,7 +217,7 @@
#endif
#ifndef HAVE_EVP_PKEY_BASE_ID
-#define HAVE_EVP_PKEY_BASE_ID OPENSSL_PREREQ(1,1,0)
+#define HAVE_EVP_PKEY_BASE_ID OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_EVP_PKEY_CTX_NEW
@@ -217,55 +225,55 @@
#endif
#ifndef HAVE_EVP_PKEY_GET0
-#define HAVE_EVP_PKEY_GET0 OPENSSL_PREREQ(1,1,0)
+#define HAVE_EVP_PKEY_GET0 OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_EVP_PKEY_ID
-#define HAVE_EVP_PKEY_ID OPENSSL_PREREQ(1,1,0)
+#define HAVE_EVP_PKEY_ID OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_HMAC_CTX_FREE
-#define HAVE_HMAC_CTX_FREE OPENSSL_PREREQ(1,1,0)
+#define HAVE_HMAC_CTX_FREE OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_HMAC_CTX_NEW
-#define HAVE_HMAC_CTX_NEW OPENSSL_PREREQ(1,1,0)
+#define HAVE_HMAC_CTX_NEW OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_I2D_RE_X509_REQ_TBS
-#define HAVE_I2D_RE_X509_REQ_TBS OPENSSL_PREREQ(1,1,0)
+#define HAVE_I2D_RE_X509_REQ_TBS OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_RSA_GET0_CRT_PARAMS
-#define HAVE_RSA_GET0_CRT_PARAMS OPENSSL_PREREQ(1,1,0)
+#define HAVE_RSA_GET0_CRT_PARAMS OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_RSA_GET0_FACTORS
-#define HAVE_RSA_GET0_FACTORS OPENSSL_PREREQ(1,1,0)
+#define HAVE_RSA_GET0_FACTORS OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_RSA_GET0_KEY
-#define HAVE_RSA_GET0_KEY OPENSSL_PREREQ(1,1,0)
+#define HAVE_RSA_GET0_KEY OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_RSA_SET0_CRT_PARAMS
-#define HAVE_RSA_SET0_CRT_PARAMS OPENSSL_PREREQ(1,1,0)
+#define HAVE_RSA_SET0_CRT_PARAMS OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_RSA_SET0_FACTORS
-#define HAVE_RSA_SET0_FACTORS OPENSSL_PREREQ(1,1,0)
+#define HAVE_RSA_SET0_FACTORS OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_RSA_SET0_KEY
-#define HAVE_RSA_SET0_KEY OPENSSL_PREREQ(1,1,0)
+#define HAVE_RSA_SET0_KEY OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_SSL_CLIENT_VERSION
-#define HAVE_SSL_CLIENT_VERSION OPENSSL_PREREQ(1,1,0)
+#define HAVE_SSL_CLIENT_VERSION OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_SSL_CTX_GET0_PARAM
-#define HAVE_SSL_CTX_GET0_PARAM OPENSSL_PREREQ(1,0,2)
+#define HAVE_SSL_CTX_GET0_PARAM OPENSSL_PREREQ(1,0,2) || LIBRESSL_PREREQ(3,1,0)
#endif
#ifndef HAVE_SSL_CTX_SET_CURVES_LIST
@@ -301,11 +309,11 @@
#endif
#ifndef HAVE_SSL_CTX_SET_TLSEXT_STATUS_TYPE
-#define HAVE_SSL_CTX_SET_TLSEXT_STATUS_TYPE OPENSSL_PREREQ(1,1,0)
+#define HAVE_SSL_CTX_SET_TLSEXT_STATUS_TYPE OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_SSL_CTX_GET_TLSEXT_STATUS_TYPE
-#define HAVE_SSL_CTX_GET_TLSEXT_STATUS_TYPE OPENSSL_PREREQ(1,1,0)
+#define HAVE_SSL_CTX_GET_TLSEXT_STATUS_TYPE OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_SSL_GET0_ALPN_SELECTED
@@ -313,7 +321,7 @@
#endif
#ifndef HAVE_SSL_GET0_PARAM
-#define HAVE_SSL_GET0_PARAM OPENSSL_PREREQ(1,0,2)
+#define HAVE_SSL_GET0_PARAM OPENSSL_PREREQ(1,0,2) || LIBRESSL_PREREQ(3,1,0)
#endif
#ifndef HAVE_SSL_SET_ALPN_PROTOS
@@ -325,27 +333,27 @@
#endif
#ifndef HAVE_SSL_SET1_PARAM
-#define HAVE_SSL_SET1_PARAM OPENSSL_PREREQ(1,0,2)
+#define HAVE_SSL_SET1_PARAM OPENSSL_PREREQ(1,0,2) || LIBRESSL_PREREQ(3,1,0)
#endif
#ifndef HAVE_SSL_GET_CLIENT_RANDOM
-#define HAVE_SSL_GET_CLIENT_RANDOM OPENSSL_PREREQ(1,1,0)
+#define HAVE_SSL_GET_CLIENT_RANDOM OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_SSL_GET_TLSEXT_STATUS_TYPE
-#define HAVE_SSL_GET_TLSEXT_STATUS_TYPE OPENSSL_PREREQ(1,1,0)
+#define HAVE_SSL_GET_TLSEXT_STATUS_TYPE OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_SSL_UP_REF
-#define HAVE_SSL_UP_REF OPENSSL_PREREQ(1,1,0)
+#define HAVE_SSL_UP_REF OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_SSL_OP_NO_SSL_MASK
-#define HAVE_SSL_OP_NO_SSL_MASK OPENSSL_PREREQ(1,0,2)
+#define HAVE_SSL_OP_NO_SSL_MASK OPENSSL_PREREQ(1,0,2) || LIBRESSL_PREREQ(3,1,0)
#endif
#ifndef HAVE_SSL_OP_NO_DTLS_MASK
-#define HAVE_SSL_OP_NO_DTLS_MASK OPENSSL_PREREQ(1,1,0)
+#define HAVE_SSL_OP_NO_DTLS_MASK OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_STACK_OPENSSL_STRING_FUNCS
@@ -353,23 +361,23 @@
#endif
#ifndef HAVE_X509_CRL_GET0_LASTUPDATE
-#define HAVE_X509_CRL_GET0_LASTUPDATE OPENSSL_PREREQ(1,1,0)
+#define HAVE_X509_CRL_GET0_LASTUPDATE OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_X509_CRL_GET0_NEXTUPDATE
-#define HAVE_X509_CRL_GET0_NEXTUPDATE OPENSSL_PREREQ(1,1,0)
+#define HAVE_X509_CRL_GET0_NEXTUPDATE OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_X509_CRL_SET1_LASTUPDATE
-#define HAVE_X509_CRL_SET1_LASTUPDATE OPENSSL_PREREQ(1,1,0)
+#define HAVE_X509_CRL_SET1_LASTUPDATE OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_X509_CRL_SET1_NEXTUPDATE
-#define HAVE_X509_CRL_SET1_NEXTUPDATE OPENSSL_PREREQ(1,1,0)
+#define HAVE_X509_CRL_SET1_NEXTUPDATE OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_X509_GET_SIGNATURE_NID
-#define HAVE_X509_GET_SIGNATURE_NID OPENSSL_PREREQ(1,0,2)
+#define HAVE_X509_GET_SIGNATURE_NID OPENSSL_PREREQ(1,0,2) || LIBRESSL_PREREQ(3,1,0)
#endif
#ifndef HAVE_X509_STORE_REFERENCES
@@ -377,31 +385,31 @@
#endif
#ifndef HAVE_X509_STORE_UP_REF
-#define HAVE_X509_STORE_UP_REF OPENSSL_PREREQ(1,1,0)
+#define HAVE_X509_STORE_UP_REF OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_X509_UP_REF
-#define HAVE_X509_UP_REF OPENSSL_PREREQ(1,1,0)
+#define HAVE_X509_UP_REF OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_X509_VERIFY_PARAM_ADD1_HOST
-#define HAVE_X509_VERIFY_PARAM_ADD1_HOST OPENSSL_PREREQ(1,0,2)
+#define HAVE_X509_VERIFY_PARAM_ADD1_HOST OPENSSL_PREREQ(1,0,2) || LIBRESSL_PREREQ(3,1,0)
#endif
#ifndef HAVE_X509_VERIFY_PARAM_SET_AUTH_LEVEL
-#define HAVE_X509_VERIFY_PARAM_SET_AUTH_LEVEL OPENSSL_PREREQ(1,1,0)
+#define HAVE_X509_VERIFY_PARAM_SET_AUTH_LEVEL OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,0,1)
#endif
#ifndef HAVE_X509_VERIFY_PARAM_SET1_EMAIL
-#define HAVE_X509_VERIFY_PARAM_SET1_EMAIL OPENSSL_PREREQ(1,0,2)
+#define HAVE_X509_VERIFY_PARAM_SET1_EMAIL OPENSSL_PREREQ(1,0,2) || LIBRESSL_PREREQ(3,1,0)
#endif
#ifndef HAVE_X509_VERIFY_PARAM_SET1_HOST
-#define HAVE_X509_VERIFY_PARAM_SET1_HOST OPENSSL_PREREQ(1,0,2)
+#define HAVE_X509_VERIFY_PARAM_SET1_HOST OPENSSL_PREREQ(1,0,2) || LIBRESSL_PREREQ(3,1,0)
#endif
#ifndef HAVE_X509_VERIFY_PARAM_SET1_IP_ASC
-#define HAVE_X509_VERIFY_PARAM_SET1_IP_ASC OPENSSL_PREREQ(1,0,2)
+#define HAVE_X509_VERIFY_PARAM_SET1_IP_ASC OPENSSL_PREREQ(1,0,2) || LIBRESSL_PREREQ(3,1,0)
#endif
#ifndef HMAC_INIT_EX_INT
@@ -797,6 +805,14 @@ static const char *aux_strerror_r(int error, char *dst, size_t lim) {
static const char unknown[] = "Unknown error: ";
size_t n;
+#ifdef _WIN32_WINNT
+/*
+Vanilla strerr() is thread-safe on Windows:
+https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/strerror-strerror-wcserror-wcserror?view=msvc-170&viewFallbackFrom=vs-2019
+*/
+#define strerror_r(a,b,c) strerror_s(b,c,a)
+#endif
+
#if STRERROR_R_CHAR_P
char *rv = strerror_r(error, dst, lim);
@@ -10082,8 +10098,6 @@ error:;
struct {
struct timeval tv;
pid_t pid;
- struct rusage ru;
- struct utsname un;
uintptr_t aslr;
#if defined __APPLE__
uint64_t mt;
@@ -10094,8 +10108,6 @@ error:;
gettimeofday(&junk.tv, NULL);
junk.pid = getpid();
- getrusage(RUSAGE_SELF, &junk.ru);
- uname(&junk.un);
junk.aslr = (uintptr_t)&strcpy ^ (uintptr_t)&randL_stir;
#if defined __APPLE__
junk.mt = mach_absolute_time();
|
