Skip to content

Enable Windows 7 compat path on MinGW builds #3239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
justsmth wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −1
Open

Enable Windows 7 compat path on MinGW builds #3239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions crypto/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,15 @@ function(build_libcrypto)
endif()
if(WIN32)
target_link_libraries(${arg_NAME} PUBLIC ws2_32)
# MinGW (non-Clang) builds target Windows 7 (see the top-level
# CMakeLists.txt, which adds -D_WIN32_WINNT=_WIN32_WINNT_WIN7), so
# `crypto/rand_extra/windows.c` compiles under the AWSLC_WINDOWS_7_COMPAT
# branch and calls BCryptGenRandom from bcrypt.dll. On MSVC this is
# handled by `#pragma comment(lib, "bcrypt.lib")` in that file, but
# MinGW ignores that pragma so we need to add the link explicitly.
if(MINGW)
target_link_libraries(${arg_NAME} PUBLIC bcrypt)
endif()
endif()

if(AWSLC_LINK_THREADS)
Expand Down
5 changes: 4 additions & 1 deletion crypto/rand_extra/windows.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ OPENSSL_MSVC_PRAGMA(warning(push, 3))
#include <windows.h>

// ProcessPrng (from `bcryptprimitives.dll`) is only available on Windows 8+.
#if !defined(__MINGW32__) && defined(_WIN32_WINNT) && _WIN32_WINNT <= _WIN32_WINNT_WIN7
// Fall back to BCryptGenRandom when targeting Windows 7 or earlier. This applies
// to both MSVC and MinGW-w64 toolchains; MinGW-w64 ships `bcrypt.h` and can link
// against `libbcrypt.a` / `bcrypt.dll`.
#if defined(_WIN32_WINNT) && _WIN32_WINNT <= _WIN32_WINNT_WIN7
#define AWSLC_WINDOWS_7_COMPAT
#endif

Expand Down
Loading