Skip to content
Merged
Changes from all commits
Commits
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
19 changes: 13 additions & 6 deletions crypto/rand_extra/windows.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,23 @@ OPENSSL_MSVC_PRAGMA(warning(push, 3))

#include <windows.h>

#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \
!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
// ProcessPrng (from `bcryptprimitives.dll`) is only available on Windows 8+.
#if !defined(__MINGW32__) && defined(_WIN32_WINNT) && _WIN32_WINNT <= _WIN32_WINNT_WIN7
#define AWSLC_WINDOWS_7_COMPAT
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Should we drop the COMPAT? seems like that's already implied like the rest of our compatibility macros like OPENSSL_WINDOWS.

Suggested change
#define AWSLC_WINDOWS_7_COMPAT
#define AWSLC_WINDOWS_7

#endif

#if defined(AWSLC_WINDOWS_7_COMPAT) || \
(WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \
!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP))
#include <bcrypt.h>
OPENSSL_MSVC_PRAGMA(comment(lib, "bcrypt.lib"))
#endif // WINAPI_PARTITION_APP && !WINAPI_PARTITION_DESKTOP
#endif // AWSLC_WINDOWS_7_COMPAT || (WINAPI_PARTITION_APP && !WINAPI_PARTITION_DESKTOP)

OPENSSL_MSVC_PRAGMA(warning(pop))

#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \
!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
#if defined(AWSLC_WINDOWS_7_COMPAT) || \
(WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \
!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP))

void CRYPTO_sysrand(uint8_t *out, size_t requested) {
while (requested > 0) {
Expand Down Expand Up @@ -83,5 +90,5 @@ void CRYPTO_sysrand(uint8_t *out, size_t requested) {
}
}

#endif // WINAPI_PARTITION_APP && !WINAPI_PARTITION_DESKTOP
#endif // AWSLC_WINDOWS_7_COMPAT || (WINAPI_PARTITION_APP && !WINAPI_PARTITION_DESKTOP)
#endif // OPENSSL_RAND_WINDOWS
Loading