diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-05-27 15:44:57 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-05-27 19:08:07 +0200 |
| commit | 996f1ae29e8d9bd2719f0dc72bfde6a8d77b1b12 (patch) | |
| tree | 6c2dcb440d64da48a6d62537dcb2588e46400a57 /thirdparty/openssl/patches | |
| parent | c1b0662b40c8239731af13a96bac1b2db1c2097d (diff) | |
openssl: Reapply necessary UWP changes from patch
Diffstat (limited to 'thirdparty/openssl/patches')
| -rw-r--r-- | thirdparty/openssl/patches/uwp_fix.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/thirdparty/openssl/patches/uwp_fix.patch b/thirdparty/openssl/patches/uwp_fix.patch new file mode 100644 index 0000000000..54aeb1f80d --- /dev/null +++ b/thirdparty/openssl/patches/uwp_fix.patch @@ -0,0 +1,64 @@ +diff --git a/thirdparty/openssl/crypto/rand/rand_win.c b/thirdparty/openssl/crypto/rand/rand_win.c +index 06670ae01..cb4093128 100644 +--- a/thirdparty/openssl/crypto/rand/rand_win.c ++++ b/thirdparty/openssl/crypto/rand/rand_win.c +@@ -118,8 +118,10 @@ + # ifndef _WIN32_WINNT + # define _WIN32_WINNT 0x0400 + # endif ++#ifndef UWP_ENABLED // -- GODOT -- + # include <wincrypt.h> + # include <tlhelp32.h> ++#endif // -- GODOT -- + + /* + * Limit the time spent walking through the heap, processes, threads and +@@ -161,7 +163,7 @@ typedef struct tagCURSORINFO { + # define CURSOR_SHOWING 0x00000001 + # endif /* CURSOR_SHOWING */ + +-# if !defined(OPENSSL_SYS_WINCE) ++# if !defined(OPENSSL_SYS_WINCE) && !defined(UWP_ENABLED) // -- GODOT -- + typedef BOOL(WINAPI *CRYPTACQUIRECONTEXTW) (HCRYPTPROV *, LPCWSTR, LPCWSTR, + DWORD, DWORD); + typedef BOOL(WINAPI *CRYPTGENRANDOM) (HCRYPTPROV, DWORD, BYTE *); +@@ -196,6 +198,7 @@ typedef NET_API_STATUS(NET_API_FUNCTION *NETFREE) (LPBYTE); + # endif /* 1 */ + # endif /* !OPENSSL_SYS_WINCE */ + ++#if !defined(UWP_ENABLED) // -- GODOT -- + int RAND_poll(void) + { + MEMORYSTATUS m; +@@ -580,6 +583,8 @@ int RAND_poll(void) + return (1); + } + ++#endif // UWP_ENABLED // -- GODOT -- ++ + int RAND_event(UINT iMsg, WPARAM wParam, LPARAM lParam) + { + double add_entropy = 0; +@@ -682,7 +687,7 @@ static void readtimer(void) + + static void readscreen(void) + { +-# if !defined(OPENSSL_SYS_WINCE) && !defined(OPENSSL_SYS_WIN32_CYGWIN) ++# if !defined(OPENSSL_SYS_WINCE) && !defined(OPENSSL_SYS_WIN32_CYGWIN) && !defined(UWP_ENABLED) // -- GODOT -- + HDC hScrDC; /* screen DC */ + HBITMAP hBitmap; /* handle for our bitmap */ + BITMAP bm; /* bitmap properties */ +diff --git a/thirdparty/openssl/openssl/dtls1.h b/thirdparty/openssl/openssl/dtls1.h +index 30bbcf278..81d28c29c 100644 +--- a/thirdparty/openssl/openssl/dtls1.h ++++ b/thirdparty/openssl/openssl/dtls1.h +@@ -78,6 +78,9 @@ + # include <sys/time.h> + # endif + # endif ++#ifdef UWP_ENABLED // -- GODOT start -- ++#include <winsock2.h> ++#endif // -- GODOT end -- + + #ifdef __cplusplus + extern "C" { |