xref: /trunk/main/openssl/openssl.patch (revision 4c5b548fb6ece87dd30bbf720aca0d994a749167)
1*4c5b548fSDamjan Jovanovicdiff --git misc/build/openssl-3.0.13/crypto/bio/bio_sock2.c misc/build/openssl-3.0.13/crypto/bio/bio_sock2.c
2*4c5b548fSDamjan Jovanovicindex 8bdad0c0b6..e52cd4f00e 100644
3*4c5b548fSDamjan Jovanovic--- misc/build/openssl-3.0.13/crypto/bio/bio_sock2.c
4*4c5b548fSDamjan Jovanovic+++ misc/build/openssl-3.0.13/crypto/bio/bio_sock2.c
5*4c5b548fSDamjan Jovanovic@@ -270,6 +270,10 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int options)
6*4c5b548fSDamjan Jovanovic          * Therefore we always have to use setsockopt here.
7*4c5b548fSDamjan Jovanovic          */
8*4c5b548fSDamjan Jovanovic         on = options & BIO_SOCK_V6_ONLY ? 1 : 0;
9*4c5b548fSDamjan Jovanovic+/* Windows < XP needs this: */
10*4c5b548fSDamjan Jovanovic+#  if !defined(IPPROTO_IPV6)
11*4c5b548fSDamjan Jovanovic+#    define IPPROTO_IPV6 41
12*4c5b548fSDamjan Jovanovic+#  endif
13*4c5b548fSDamjan Jovanovic         if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
14*4c5b548fSDamjan Jovanovic                        (const void *)&on, sizeof(on)) != 0) {
15*4c5b548fSDamjan Jovanovic             ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
16*4c5b548fSDamjan Jovanovicdiff --git misc/build/openssl-3.0.13/crypto/init.c misc/build/openssl-3.0.13/crypto/init.c
17*4c5b548fSDamjan Jovanovicindex cacf637c89..0728c0a20d 100644
18*4c5b548fSDamjan Jovanovic--- misc/build/openssl-3.0.13/crypto/init.c
19*4c5b548fSDamjan Jovanovic+++ misc/build/openssl-3.0.13/crypto/init.c
20*4c5b548fSDamjan Jovanovic@@ -131,7 +131,7 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_load_crypto_nodelete)
21a8693330Struckman
22*4c5b548fSDamjan Jovanovic #if !defined(OPENSSL_USE_NODELETE) \
23*4c5b548fSDamjan Jovanovic     && !defined(OPENSSL_NO_PINSHARED)
24*4c5b548fSDamjan Jovanovic-# if defined(DSO_WIN32) && !defined(_WIN32_WCE)
25*4c5b548fSDamjan Jovanovic+# if defined(DSO_WIN32) && !defined(_WIN32_WCE) && _WIN32_WINNT >= 0x0500
26*4c5b548fSDamjan Jovanovic     {
27*4c5b548fSDamjan Jovanovic         HMODULE handle = NULL;
28*4c5b548fSDamjan Jovanovic         BOOL ret;
29*4c5b548fSDamjan Jovanovic@@ -659,7 +659,7 @@ int OPENSSL_atexit(void (*handler)(void))
30*4c5b548fSDamjan Jovanovic #if !defined(OPENSSL_USE_NODELETE)\
31*4c5b548fSDamjan Jovanovic     && !defined(OPENSSL_NO_PINSHARED)
32*4c5b548fSDamjan Jovanovic     {
33*4c5b548fSDamjan Jovanovic-# if defined(DSO_WIN32) && !defined(_WIN32_WCE)
34*4c5b548fSDamjan Jovanovic+# if defined(DSO_WIN32) && !defined(_WIN32_WCE) && _WIN32_WINNT >= 0x0500
35*4c5b548fSDamjan Jovanovic         HMODULE handle = NULL;
36*4c5b548fSDamjan Jovanovic         BOOL ret;
37*4c5b548fSDamjan Jovanovic         union {
38*4c5b548fSDamjan Jovanovicdiff --git misc/build/openssl-3.0.13/crypto/threads_win.c misc/build/openssl-3.0.13/crypto/threads_win.c
39*4c5b548fSDamjan Jovanovicindex dbeda74d73..c599e88c59 100644
40*4c5b548fSDamjan Jovanovic--- misc/build/openssl-3.0.13/crypto/threads_win.c
41*4c5b548fSDamjan Jovanovic+++ misc/build/openssl-3.0.13/crypto/threads_win.c
42*4c5b548fSDamjan Jovanovic@@ -54,7 +54,7 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
43*4c5b548fSDamjan Jovanovic         return NULL;
44a8693330Struckman     }
45cdf0e10cSrcweir
46*4c5b548fSDamjan Jovanovic-#  if !defined(_WIN32_WCE)
47*4c5b548fSDamjan Jovanovic+#  if !defined(_WIN32_WCE) && _WIN32_WINNT >= 0x0403
48*4c5b548fSDamjan Jovanovic     /* 0x400 is the spin count value suggested in the documentation */
49*4c5b548fSDamjan Jovanovic     if (!InitializeCriticalSectionAndSpinCount(lock, 0x400)) {
50*4c5b548fSDamjan Jovanovic         OPENSSL_free(lock);
51