godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

openssl: Sync with pristine upstream 1.0.2h

Browse Source 
Our necessary custom changes will be reapplied in later commits for clarity,
and saved as patches for future updates.
This commit is contained in:
Rémi Verschelde
2017-05-27 15:35:40 +02:00
parent 022541d917
commit cb0f771aaa
6 changed files with 11 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
thirdparty/openssl/crypto/rand/rand_win.c vendored
View File

@@ -118,10 +118,8 @@
# 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
@@ -163,7 +161,7 @@ typedef struct tagCURSORINFO {
# define CURSOR_SHOWING 0x00000001
# endif /* CURSOR_SHOWING */
# if !defined(OPENSSL_SYS_WINCE) && !defined(UWP_ENABLED)
# if !defined(OPENSSL_SYS_WINCE)
typedef BOOL(WINAPI *CRYPTACQUIRECONTEXTW) (HCRYPTPROV *, LPCWSTR, LPCWSTR,
DWORD, DWORD);
typedef BOOL(WINAPI *CRYPTGENRANDOM) (HCRYPTPROV, DWORD, BYTE *);
@@ -198,7 +196,6 @@ 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;
@@ -583,8 +580,6 @@ int RAND_poll(void)
return (1);
}
#endif // UWP_ENABLED
int RAND_event(UINT iMsg, WPARAM wParam, LPARAM lParam)
{
double add_entropy = 0;
@@ -687,7 +682,7 @@ static void readtimer(void)
static void readscreen(void)
{
# if !defined(OPENSSL_SYS_WINCE) && !defined(OPENSSL_SYS_WIN32_CYGWIN) && !defined(UWP_ENABLED)
# if !defined(OPENSSL_SYS_WINCE) && !defined(OPENSSL_SYS_WIN32_CYGWIN)
HDC hScrDC; /* screen DC */
HBITMAP hBitmap; /* handle for our bitmap */
BITMAP bm; /* bitmap properties */