aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Cook <busterb@gmail.com>2020-11-11 05:39:56 -0600
committerBrent Cook <busterb@gmail.com>2020-11-11 05:39:56 -0600
commitdf3d4bb57a253f85bb60567aaea5f2dd992a9fbd (patch)
treece470698e45cccf76c7f1c05c803936b41fa52ee
parent9abd36e3af5876f67c633f27496ad5660ab7fe24 (diff)
downloadportable-df3d4bb57a253f85bb60567aaea5f2dd992a9fbd.tar.gz
portable-df3d4bb57a253f85bb60567aaea5f2dd992a9fbd.tar.bz2
portable-df3d4bb57a253f85bb60567aaea5f2dd992a9fbd.zip
Add -lbcrypt to Windows builds for CNG in getentropy
-rw-r--r--CMakeLists.txt2
-rw-r--r--README.md4
-rw-r--r--m4/check-os-options.m42
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)
119 add_definitions(-D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS) 119 add_definitions(-D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS)
120 add_definitions(-DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600) 120 add_definitions(-DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600)
121 add_definitions(-DCPPFLAGS -DNO_SYSLOG -DNO_CRYPT) 121 add_definitions(-DCPPFLAGS -DNO_SYSLOG -DNO_CRYPT)
122 set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32) 122 set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32 bcrypt)
123endif() 123endif()
124 124
125if(MSVC) 125if(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:
37* AIX (5.3 and later) 37* AIX (5.3 and later)
38 38
39LibreSSL also supports the following Windows environments: 39LibreSSL also supports the following Windows environments:
40* Microsoft Windows (Vista or higher, x86 and x64) 40* Microsoft Windows (Windows 7 / Windows Server 2008r2 or later, x86 and x64)
41* Wine (32-bit and 64-bit) 41* Wine (32-bit and 64-bit)
42* Builds with Mingw-w64, Cygwin, and Visual Studio 42* Mingw-w64, Cygwin, and Visual Studio
43 43
44Official release tarballs are available at your friendly neighborhood 44Official release tarballs are available at your friendly neighborhood
45OpenBSD mirror in directory 45OpenBSD 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);
112 CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS" 112 CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS"
113 CPPFLAGS="$CPPFLAGS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600" 113 CPPFLAGS="$CPPFLAGS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600"
114 CPPFLAGS="$CPPFLAGS" 114 CPPFLAGS="$CPPFLAGS"
115 AC_SUBST([PLATFORM_LDADD], ['-lws2_32']) 115 AC_SUBST([PLATFORM_LDADD], ['-lws2_32 -lbcrypt'])
116 ;; 116 ;;
117 *solaris*) 117 *solaris*)
118 HOST_OS=solaris 118 HOST_OS=solaris