From df3d4bb57a253f85bb60567aaea5f2dd992a9fbd Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Wed, 11 Nov 2020 05:39:56 -0600 Subject: Add -lbcrypt to Windows builds for CNG in getentropy --- CMakeLists.txt | 2 +- README.md | 4 ++-- m4/check-os-options.m4 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index debaac4..eca97b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,7 +119,7 @@ if(WIN32) add_definitions(-D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS) add_definitions(-DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600) add_definitions(-DCPPFLAGS -DNO_SYSLOG -DNO_CRYPT) - set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32) + set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32 bcrypt) endif() if(MSVC) diff --git a/README.md b/README.md index 833f0d4..f2f5ab0 100644 --- a/README.md +++ b/README.md @@ -37,9 +37,9 @@ At the time of this writing, LibreSSL is known to build and work on: * AIX (5.3 and later) LibreSSL also supports the following Windows environments: -* Microsoft Windows (Vista or higher, x86 and x64) +* Microsoft Windows (Windows 7 / Windows Server 2008r2 or later, x86 and x64) * Wine (32-bit and 64-bit) -* Builds with Mingw-w64, Cygwin, and Visual Studio +* Mingw-w64, Cygwin, and Visual Studio Official release tarballs are available at your friendly neighborhood OpenBSD mirror in directory diff --git a/m4/check-os-options.m4 b/m4/check-os-options.m4 index 8241aee..c014efb 100644 --- a/m4/check-os-options.m4 +++ b/m4/check-os-options.m4 @@ -112,7 +112,7 @@ char buf[1]; getentropy(buf, 1); CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS" CPPFLAGS="$CPPFLAGS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600" CPPFLAGS="$CPPFLAGS" - AC_SUBST([PLATFORM_LDADD], ['-lws2_32']) + AC_SUBST([PLATFORM_LDADD], ['-lws2_32 -lbcrypt']) ;; *solaris*) HOST_OS=solaris -- cgit v1.2.3-55-g6feb