Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
4009c017
Unverified
Commit
4009c017
authored
Feb 21, 2018
by
Rémi Verschelde
Committed by
GitHub
Feb 21, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #16865 from Faless/uwp_mbedtls_fixes
Fix mbedTLS and websocket module for UWP
parents
c291fc39
dfef6f24
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
50 additions
and
14 deletions
+50
-14
SCsub
modules/websocket/SCsub
+5
-2
detect.py
platform/uwp/detect.py
+1
-0
detect.py
platform/windows/detect.py
+2
-2
entropy_poll.c
thirdparty/mbedtls/library/entropy_poll.c
+20
-7
net_sockets.c
thirdparty/mbedtls/library/net_sockets.c
+1
-1
x509_crt.c
thirdparty/mbedtls/library/x509_crt.c
+21
-2
No files found.
modules/websocket/SCsub
View file @
4009c017
...
...
@@ -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"
)
platform/uwp/detect.py
View file @
4009c017
...
...
@@ -160,6 +160,7 @@ def configure(env):
'libANGLE'
,
'libEGL'
,
'libGLESv2'
,
'bcrypt'
,
]
env
.
Append
(
LINKFLAGS
=
[
p
+
".lib"
for
p
in
LIBS
])
...
...
platform/windows/detect.py
View file @
4009c017
...
...
@@ -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'
])
...
...
thirdparty/mbedtls/library/entropy_poll.c
View file @
4009c017
...
...
@@ -54,28 +54,41 @@
#define _WIN32_WINNT 0x0400
#endif
#include <windows.h>
#include <wincrypt.h>
#include <bcrypt.h>
#if _MSC_VER <= 1600
/* Visual Studio 2010 and earlier issue a warning when both <stdint.h> and <intsafe.h> are included, as they
* redefine a number of <TYPE>_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 <intsafe.h>
#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
);
...
...
thirdparty/mbedtls/library/net_sockets.c
View file @
4009c017
...
...
@@ -49,7 +49,7 @@
#undef _WIN32_WINNT
#endif
/* Enables getaddrinfo() & Co */
#define _WIN32_WINNT 0x0
5
01
#define _WIN32_WINNT 0x0
6
01
#include <ws2tcpip.h>
#include <winsock2.h>
...
...
thirdparty/mbedtls/library/x509_crt.c
View file @
4009c017
...
...
@@ -62,6 +62,18 @@
#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
#include <windows.h>
#if _MSC_VER <= 1600
/* Visual Studio 2010 and earlier issue a warning when both <stdint.h> and <intsafe.h> are included, as they
* redefine a number of <TYPE>_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 <intsafe.h>
#if _MSC_VER <= 1600
#pragma warning( pop )
#endif
#else
#include <time.h>
#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
,
l
strlenW
(
file_data
.
cFileName
)
,
l
engthAsInt
,
p
,
(
int
)
len
-
1
,
NULL
,
NULL
);
if
(
w_ret
==
0
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment