From fb5a73a39fb7e6e5924db362062cba628525028a Mon Sep 17 00:00:00 2001 From: George Marques Date: Wed, 2 Nov 2016 18:26:42 -0200 Subject: Rename WinRT files to UWP --- thirdparty/openssl/uwp.cpp | 155 +++++++++++++++++++++++++++++++++++++ thirdparty/openssl/uwp_fix.patch | 64 +++++++++++++++ thirdparty/openssl/winrt.cpp | 155 ------------------------------------- thirdparty/openssl/winrt_fix.patch | 64 --------------- 4 files changed, 219 insertions(+), 219 deletions(-) create mode 100644 thirdparty/openssl/uwp.cpp create mode 100644 thirdparty/openssl/uwp_fix.patch delete mode 100644 thirdparty/openssl/winrt.cpp delete mode 100644 thirdparty/openssl/winrt_fix.patch (limited to 'thirdparty/openssl') diff --git a/thirdparty/openssl/uwp.cpp b/thirdparty/openssl/uwp.cpp new file mode 100644 index 0000000000..c3a6f8bfcc --- /dev/null +++ b/thirdparty/openssl/uwp.cpp @@ -0,0 +1,155 @@ +/* Snippets extracted from https://github.com/Microsoft/openssl/blob/ec7e430e06e4e3ac87c183dee33cb216814cf980/ms/winrt.cpp + * Adapted for Godot definitions + */ +/* winrt.cpp + * Copyright 2014 Microsoft Corporation + * C++/CX Entropy/shims for Windows Phone/Windows Store platform + * written by Alejandro Jimenez Martinez + * (aljim@microsoft.com) for the OpenSSL project 2014. + */ + +#include +#if defined(WINAPI_FAMILY) +extern "C" +{ + unsigned entropyRT(BYTE *buffer, unsigned len); + void RAND_add(const void *buf,int num,double entropy); + int RAND_poll(void); +} +#endif + +unsigned entropyRT(BYTE *buffer, unsigned len) + { + using namespace Platform; + using namespace Windows::Foundation; + using namespace Windows::Foundation::Collections; + using namespace Windows::Security::Cryptography; + using namespace Windows::Storage::Streams; + IBuffer ^buf = CryptographicBuffer::GenerateRandom(len); + Array ^arr; + CryptographicBuffer::CopyToByteArray(buf, &arr); + unsigned arrayLen = arr->Length; + + // Make sure not to overflow the copy + arrayLen = (arrayLen > len) ? len : arrayLen; + memcpy(buffer, arr->Data, arrayLen); + return arrayLen; + } + +int RAND_poll(void) + { + BYTE buf[60]; + unsigned collected = entropyRT(buf , sizeof(buf)); + RAND_add(buf, collected, collected); + return 1; + } + +#if defined(WINRT_ENABLED) +extern "C" +{ +#include +#include +#include + + void* GetModuleHandle( + _In_opt_ LPCTSTR lpModuleName + ) + { + return NULL; + } + //no log for phone + int RegisterEventSource( + _In_ LPCTSTR lpUNCServerName, + _In_ LPCTSTR lpSourceName + ) + { + return NULL; + } + + int ReportEvent( + _In_ HANDLE hEventLog, + _In_ WORD wType, + _In_ WORD wCategory, + _In_ DWORD dwEventID, + _In_ PSID lpUserSid, + _In_ WORD wNumStrings, + _In_ DWORD dwDataSize, + _In_ LPCTSTR *lpStrings, + _In_ LPVOID lpRawData + ) + { + return 0; + } + int MessageBox( + _In_opt_ HWND hWnd, + _In_opt_ LPCTSTR lpText, + _In_opt_ LPCTSTR lpCaption, + _In_ UINT uType + ) + { + return 0; + } + int __cdecl GetProcessWindowStation(void) + { + return NULL; + } + BOOL __cdecl GetUserObjectInformationW( + _In_ HANDLE hObj, + _In_ int nIndex, + _Out_opt_ PVOID pvInfo, + _In_ DWORD nLength, + _Out_opt_ LPDWORD lpnLengthNeeded + ) + { + return 0; + } + int __cdecl GetStdHandle( + _In_ DWORD nStdHandle + ) + { + return 0; + } + BOOL DeregisterEventSource( + _Inout_ HANDLE hEventLog + ) + { + return 0; + } + char *getenv( + const char *varname + ) + { + //hardcoded environmental variables used for the appx testing application for store/phone + if (!strcmp(varname, "OPENSSL_CONF")) + { + return "./openssl.cnf"; + } + return 0; + } + int setenv(const char *envname, const char *envval, int overwrite) + { + return -1; + } + int _getch(void) + { + return 0; + } + int _kbhit() + { + return 0; + } + BOOL __cdecl FlushConsoleInputBuffer( + _In_ HANDLE hConsoleInput + ) + { + return 0; + } + int winrt_GetTickCount(void) + { + LARGE_INTEGER t; + return(int) (QueryPerformanceCounter(&t) ? t.QuadPart : 0); + } + void *OPENSSL_UplinkTable [26]= {0}; +} //extern C + +#endif /*defined(WINRT_ENABLED)*/ diff --git a/thirdparty/openssl/uwp_fix.patch b/thirdparty/openssl/uwp_fix.patch new file mode 100644 index 0000000000..caf180a75b --- /dev/null +++ b/thirdparty/openssl/uwp_fix.patch @@ -0,0 +1,64 @@ +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 WINRT_ENABLED + # include + # include ++#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(WINRT_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(WINRT_ENABLED) + int RAND_poll(void) + { + MEMORYSTATUS m; +@@ -580,6 +583,8 @@ int RAND_poll(void) + return (1); + } + ++#endif // WINRT_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(WINRT_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 + # endif + # endif ++#ifdef WINRT_ENABLED ++#include ++#endif + + #ifdef __cplusplus + extern "C" { diff --git a/thirdparty/openssl/winrt.cpp b/thirdparty/openssl/winrt.cpp deleted file mode 100644 index c3a6f8bfcc..0000000000 --- a/thirdparty/openssl/winrt.cpp +++ /dev/null @@ -1,155 +0,0 @@ -/* Snippets extracted from https://github.com/Microsoft/openssl/blob/ec7e430e06e4e3ac87c183dee33cb216814cf980/ms/winrt.cpp - * Adapted for Godot definitions - */ -/* winrt.cpp - * Copyright 2014 Microsoft Corporation - * C++/CX Entropy/shims for Windows Phone/Windows Store platform - * written by Alejandro Jimenez Martinez - * (aljim@microsoft.com) for the OpenSSL project 2014. - */ - -#include -#if defined(WINAPI_FAMILY) -extern "C" -{ - unsigned entropyRT(BYTE *buffer, unsigned len); - void RAND_add(const void *buf,int num,double entropy); - int RAND_poll(void); -} -#endif - -unsigned entropyRT(BYTE *buffer, unsigned len) - { - using namespace Platform; - using namespace Windows::Foundation; - using namespace Windows::Foundation::Collections; - using namespace Windows::Security::Cryptography; - using namespace Windows::Storage::Streams; - IBuffer ^buf = CryptographicBuffer::GenerateRandom(len); - Array ^arr; - CryptographicBuffer::CopyToByteArray(buf, &arr); - unsigned arrayLen = arr->Length; - - // Make sure not to overflow the copy - arrayLen = (arrayLen > len) ? len : arrayLen; - memcpy(buffer, arr->Data, arrayLen); - return arrayLen; - } - -int RAND_poll(void) - { - BYTE buf[60]; - unsigned collected = entropyRT(buf , sizeof(buf)); - RAND_add(buf, collected, collected); - return 1; - } - -#if defined(WINRT_ENABLED) -extern "C" -{ -#include -#include -#include - - void* GetModuleHandle( - _In_opt_ LPCTSTR lpModuleName - ) - { - return NULL; - } - //no log for phone - int RegisterEventSource( - _In_ LPCTSTR lpUNCServerName, - _In_ LPCTSTR lpSourceName - ) - { - return NULL; - } - - int ReportEvent( - _In_ HANDLE hEventLog, - _In_ WORD wType, - _In_ WORD wCategory, - _In_ DWORD dwEventID, - _In_ PSID lpUserSid, - _In_ WORD wNumStrings, - _In_ DWORD dwDataSize, - _In_ LPCTSTR *lpStrings, - _In_ LPVOID lpRawData - ) - { - return 0; - } - int MessageBox( - _In_opt_ HWND hWnd, - _In_opt_ LPCTSTR lpText, - _In_opt_ LPCTSTR lpCaption, - _In_ UINT uType - ) - { - return 0; - } - int __cdecl GetProcessWindowStation(void) - { - return NULL; - } - BOOL __cdecl GetUserObjectInformationW( - _In_ HANDLE hObj, - _In_ int nIndex, - _Out_opt_ PVOID pvInfo, - _In_ DWORD nLength, - _Out_opt_ LPDWORD lpnLengthNeeded - ) - { - return 0; - } - int __cdecl GetStdHandle( - _In_ DWORD nStdHandle - ) - { - return 0; - } - BOOL DeregisterEventSource( - _Inout_ HANDLE hEventLog - ) - { - return 0; - } - char *getenv( - const char *varname - ) - { - //hardcoded environmental variables used for the appx testing application for store/phone - if (!strcmp(varname, "OPENSSL_CONF")) - { - return "./openssl.cnf"; - } - return 0; - } - int setenv(const char *envname, const char *envval, int overwrite) - { - return -1; - } - int _getch(void) - { - return 0; - } - int _kbhit() - { - return 0; - } - BOOL __cdecl FlushConsoleInputBuffer( - _In_ HANDLE hConsoleInput - ) - { - return 0; - } - int winrt_GetTickCount(void) - { - LARGE_INTEGER t; - return(int) (QueryPerformanceCounter(&t) ? t.QuadPart : 0); - } - void *OPENSSL_UplinkTable [26]= {0}; -} //extern C - -#endif /*defined(WINRT_ENABLED)*/ diff --git a/thirdparty/openssl/winrt_fix.patch b/thirdparty/openssl/winrt_fix.patch deleted file mode 100644 index caf180a75b..0000000000 --- a/thirdparty/openssl/winrt_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 WINRT_ENABLED - # include - # include -+#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(WINRT_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(WINRT_ENABLED) - int RAND_poll(void) - { - MEMORYSTATUS m; -@@ -580,6 +583,8 @@ int RAND_poll(void) - return (1); - } - -+#endif // WINRT_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(WINRT_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 - # endif - # endif -+#ifdef WINRT_ENABLED -+#include -+#endif - - #ifdef __cplusplus - extern "C" { -- cgit v1.2.3