From a2ef49f8b977a16bbfa7ad1a179aeb43a3a6be18 Mon Sep 17 00:00:00 2001 From: George Marques Date: Tue, 20 Feb 2018 15:03:57 +0100 Subject: [PATCH 1/4] Websocket module properly recognize UWP (by @vnen) --- modules/websocket/SCsub | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/websocket/SCsub b/modules/websocket/SCsub index 3b0f920bbfe..1a36e058634 100644 --- a/modules/websocket/SCsub +++ b/modules/websocket/SCsub @@ -54,7 +54,7 @@ thirdparty_sources = [ if env_lws["platform"] == "android": # Builtin getifaddrs thirdparty_sources += ["misc/getifaddrs.c"] -if env_lws["platform"] == "windows": # Winsock +if env_lws["platform"] == "windows" or env_lws["platform"] == "uwp": # Winsock thirdparty_sources += ["plat/lws-plat-win.c", helper_dir + "getopt.c", helper_dir + "getopt_long.c", helper_dir + "gettimeofday.c"] else: # Unix socket thirdparty_sources += ["plat/lws-plat-unix.c"] @@ -75,7 +75,10 @@ else: mbedtls_includes = "#thirdparty/mbedtls/include" env_lws.Append(CPPPATH=[mbedtls_includes]) - if env_lws["platform"] == "windows": + if env_lws["platform"] == "windows" or env_lws["platform"] == "uwp": env_lws.Append(CPPPATH=[thirdparty_dir + helper_dir]) + if env_lws["platform"] == "uwp": + env_lws.Append(CCFLAGS=["/DLWS_MINGW_SUPPORT"]) + env_lws.add_source_files(env.modules_sources, "*.cpp") From a929a5aea5f6d4582b845ba6b3fd6e776c5ad7fb Mon Sep 17 00:00:00 2001 From: Fabio Alessandrelli Date: Tue, 20 Feb 2018 09:35:52 +0100 Subject: [PATCH 2/4] Import PR 730 from mbedTLS project Fixes UWP build while we wait for it to get into next release. --- thirdparty/mbedtls/library/entropy_poll.c | 27 +++++++++++++++++------ thirdparty/mbedtls/library/x509_crt.c | 23 +++++++++++++++++-- 2 files changed, 41 insertions(+), 9 deletions(-) diff --git a/thirdparty/mbedtls/library/entropy_poll.c b/thirdparty/mbedtls/library/entropy_poll.c index a116e605d2f..5e8a090b37d 100644 --- a/thirdparty/mbedtls/library/entropy_poll.c +++ b/thirdparty/mbedtls/library/entropy_poll.c @@ -54,28 +54,41 @@ #define _WIN32_WINNT 0x0400 #endif #include -#include +#include +#if _MSC_VER <= 1600 +/* Visual Studio 2010 and earlier issue a warning when both and are included, as they + * redefine a number of _MAX constants. These constants are guaranteed to be the same, though, so + * we suppress the warning when including intsafe.h. + */ +#pragma warning( push ) +#pragma warning( disable : 4005 ) +#endif +#include +#if _MSC_VER <= 1600 +#pragma warning( pop ) +#endif int mbedtls_platform_entropy_poll( void *data, unsigned char *output, size_t len, size_t *olen ) { - HCRYPTPROV provider; + ULONG len_as_ulong = 0; ((void) data); *olen = 0; - if( CryptAcquireContext( &provider, NULL, NULL, - PROV_RSA_FULL, CRYPT_VERIFYCONTEXT ) == FALSE ) + /* + * BCryptGenRandom takes ULONG for size, which is smaller than size_t on 64-bit platforms. + * Ensure len's value can be safely converted into a ULONG. + */ + if ( FAILED( SizeTToULong( len, &len_as_ulong ) ) ) { return( MBEDTLS_ERR_ENTROPY_SOURCE_FAILED ); } - if( CryptGenRandom( provider, (DWORD) len, output ) == FALSE ) + if ( !BCRYPT_SUCCESS( BCryptGenRandom( NULL, output, len_as_ulong, BCRYPT_USE_SYSTEM_PREFERRED_RNG ) ) ) { - CryptReleaseContext( provider, 0 ); return( MBEDTLS_ERR_ENTROPY_SOURCE_FAILED ); } - CryptReleaseContext( provider, 0 ); *olen = len; return( 0 ); diff --git a/thirdparty/mbedtls/library/x509_crt.c b/thirdparty/mbedtls/library/x509_crt.c index c6209fb40d0..6c592fdb5a2 100644 --- a/thirdparty/mbedtls/library/x509_crt.c +++ b/thirdparty/mbedtls/library/x509_crt.c @@ -62,6 +62,18 @@ #if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) #include +#if _MSC_VER <= 1600 +/* Visual Studio 2010 and earlier issue a warning when both and are included, as they + * redefine a number of _MAX constants. These constants are guaranteed to be the same, though, so + * we suppress the warning when including intsafe.h. + */ +#pragma warning( push ) +#pragma warning( disable : 4005 ) +#endif +#include +#if _MSC_VER <= 1600 +#pragma warning( pop ) +#endif #else #include #endif @@ -1110,6 +1122,7 @@ int mbedtls_x509_crt_parse_path( mbedtls_x509_crt *chain, const char *path ) char filename[MAX_PATH]; char *p; size_t len = strlen( path ); + int lengthAsInt = 0; WIN32_FIND_DATAW file_data; HANDLE hFind; @@ -1124,7 +1137,10 @@ int mbedtls_x509_crt_parse_path( mbedtls_x509_crt *chain, const char *path ) p = filename + len; filename[len++] = '*'; - w_ret = MultiByteToWideChar( CP_ACP, 0, filename, (int)len, szDir, + if ( FAILED ( SizeTToInt( len, &lengthAsInt ) ) ) + return( MBEDTLS_ERR_X509_FILE_IO_ERROR ); + + w_ret = MultiByteToWideChar( CP_ACP, 0, filename, lengthAsInt, szDir, MAX_PATH - 3 ); if( w_ret == 0 ) return( MBEDTLS_ERR_X509_BAD_INPUT_DATA ); @@ -1141,8 +1157,11 @@ int mbedtls_x509_crt_parse_path( mbedtls_x509_crt *chain, const char *path ) if( file_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) continue; + if ( FAILED( SizeTToInt( wcslen( file_data.cFileName ), &lengthAsInt ) ) ) + return( MBEDTLS_ERR_X509_FILE_IO_ERROR ); + w_ret = WideCharToMultiByte( CP_ACP, 0, file_data.cFileName, - lstrlenW( file_data.cFileName ), + lengthAsInt, p, (int) len - 1, NULL, NULL ); if( w_ret == 0 ) From d29488ee9b86d7edb48771c059173ae4c3ae7421 Mon Sep 17 00:00:00 2001 From: Fabio Alessandrelli Date: Tue, 20 Feb 2018 10:08:17 +0100 Subject: [PATCH 3/4] Link bcrypt lib in window and UWP --- platform/uwp/detect.py | 1 + platform/windows/detect.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/uwp/detect.py b/platform/uwp/detect.py index 7cc8afff06e..f2c5c5d42e8 100644 --- a/platform/uwp/detect.py +++ b/platform/uwp/detect.py @@ -160,6 +160,7 @@ def configure(env): 'libANGLE', 'libEGL', 'libGLESv2', + 'bcrypt', ] env.Append(LINKFLAGS=[p + ".lib" for p in LIBS]) diff --git a/platform/windows/detect.py b/platform/windows/detect.py index b8a9ed482c7..94a3efcd894 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -179,7 +179,7 @@ def configure(env): if env["bits"] == "64": env.Append(CCFLAGS=['/D_WIN64']) - LIBS = ['winmm', 'opengl32', 'dsound', 'kernel32', 'ole32', 'oleaut32', 'user32', 'gdi32', 'IPHLPAPI', 'Shlwapi', 'wsock32', 'Ws2_32', 'shell32', 'advapi32', 'dinput8', 'dxguid', 'imm32'] + LIBS = ['winmm', 'opengl32', 'dsound', 'kernel32', 'ole32', 'oleaut32', 'user32', 'gdi32', 'IPHLPAPI', 'Shlwapi', 'wsock32', 'Ws2_32', 'shell32', 'advapi32', 'dinput8', 'dxguid', 'imm32', 'bcrypt'] env.Append(LINKFLAGS=[p + env["LIBSUFFIX"] for p in LIBS]) env.Append(LIBPATH=[os.getenv("WindowsSdkDir") + "/Lib"]) @@ -281,7 +281,7 @@ def configure(env): env.Append(CCFLAGS=['-DRTAUDIO_ENABLED']) env.Append(CCFLAGS=['-DWASAPI_ENABLED']) env.Append(CCFLAGS=['-DWINVER=%s' % env['target_win_version'], '-D_WIN32_WINNT=%s' % env['target_win_version']]) - env.Append(LIBS=['mingw32', 'opengl32', 'dsound', 'ole32', 'd3d9', 'winmm', 'gdi32', 'iphlpapi', 'shlwapi', 'wsock32', 'ws2_32', 'kernel32', 'oleaut32', 'dinput8', 'dxguid', 'ksuser', 'imm32']) + env.Append(LIBS=['mingw32', 'opengl32', 'dsound', 'ole32', 'd3d9', 'winmm', 'gdi32', 'iphlpapi', 'shlwapi', 'wsock32', 'ws2_32', 'kernel32', 'oleaut32', 'dinput8', 'dxguid', 'ksuser', 'imm32', 'bcrypt']) env.Append(CPPFLAGS=['-DMINGW_ENABLED']) From dfef6f24d586663cb76d73145abc4a9bb7994df3 Mon Sep 17 00:00:00 2001 From: Fabio Alessandrelli Date: Tue, 20 Feb 2018 14:41:17 +0100 Subject: [PATCH 4/4] Small patch to change mbedtls _WIN32_WINNT We are using 0x0601 as min anyway. This avoids SOCKADDR_STORAGE error on uwp build --- thirdparty/mbedtls/library/net_sockets.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/mbedtls/library/net_sockets.c b/thirdparty/mbedtls/library/net_sockets.c index 345f10227b9..754049005dc 100644 --- a/thirdparty/mbedtls/library/net_sockets.c +++ b/thirdparty/mbedtls/library/net_sockets.c @@ -49,7 +49,7 @@ #undef _WIN32_WINNT #endif /* Enables getaddrinfo() & Co */ -#define _WIN32_WINNT 0x0501 +#define _WIN32_WINNT 0x0601 #include #include