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/uwp_fix.patch | |
| parent | c1b0662b40c8239731af13a96bac1b2db1c2097d (diff) | |
openssl: Reapply necessary UWP changes from patch
Diffstat (limited to 'thirdparty/openssl/uwp_fix.patch')
| -rw-r--r-- | thirdparty/openssl/uwp_fix.patch | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/thirdparty/openssl/uwp_fix.patch b/thirdparty/openssl/uwp_fix.patch deleted file mode 100644 index 00d8b64d00..0000000000 --- a/thirdparty/openssl/uwp_fix.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/drivers/builtin_openssl2/crypto/rand/rand_win.c b/drivers/builtin_openssl2/crypto/rand/rand_win.c -index 06670ae..70fd52a 100644 ---- a/drivers/builtin_openssl2/crypto/rand/rand_win.c -+++ b/drivers/builtin_openssl2/crypto/rand/rand_win.c -@@ -118,8 +118,10 @@ - # ifndef _WIN32_WINNT - # define _WIN32_WINNT 0x0400 - # endif -+#ifndef UWP_ENABLED - # include <wincrypt.h> - # include <tlhelp32.h> -+#endif - - /* - * 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) - 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) - int RAND_poll(void) - { - MEMORYSTATUS m; -@@ -580,6 +583,8 @@ int RAND_poll(void) - return (1); - } - -+#endif // UWP_ENABLED -+ - 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) - HDC hScrDC; /* screen DC */ - HBITMAP hBitmap; /* handle for our bitmap */ - BITMAP bm; /* bitmap properties */ -diff --git a/drivers/builtin_openssl2/openssl/dtls1.h b/drivers/builtin_openssl2/openssl/dtls1.h -index 64ad3c8..a58aca2 100644 ---- a/drivers/builtin_openssl2/openssl/dtls1.h -+++ b/drivers/builtin_openssl2/openssl/dtls1.h -@@ -81,6 +81,9 @@ - # include <sys/time.h> - # endif - # endif -+#ifdef UWP_ENABLED -+#include <winsock2.h> -+#endif - - #ifdef __cplusplus - extern "C" { |