Skip to content

Commit 63bd7ab

Browse files
committed
Update to Libressl V3.3.3 version
1 parent 3e9bd97 commit 63bd7ab

File tree

476 files changed

+51420
-20250
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

476 files changed

+51420
-20250
lines changed

CMakeLists.txt

+27-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
cmake_minimum_required (VERSION 3.0)
1+
if(MSVC)
2+
cmake_minimum_required (VERSION 3.16.4)
3+
cmake_policy(SET CMP0091 NEW)
4+
else()
5+
cmake_minimum_required (VERSION 3.0)
6+
endif()
7+
8+
project (LibreSSL C ASM)
9+
210
include(CheckFunctionExists)
311
include(CheckSymbolExists)
412
include(CheckLibraryExists)
@@ -9,8 +17,6 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" ${CMAKE_MODULE_PATH})
917
include(cmake_export_symbol)
1018
include(GNUInstallDirs)
1119

12-
project (LibreSSL C ASM)
13-
1420
enable_testing()
1521

1622
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/ssl/VERSION SSL_VERSION)
@@ -36,6 +42,11 @@ option(ENABLE_EXTRATESTS "Enable extra tests that may be unreliable on some plat
3642
option(ENABLE_NC "Enable installing TLS-enabled nc(1)" OFF)
3743
set(OPENSSLDIR ${OPENSSLDIR} CACHE PATH "Set the default openssl directory" FORCE)
3844

45+
option(USE_STATIC_MSVC_RUNTIMES "Use /MT instead of /MD in MSVC" OFF)
46+
if(USE_STATIC_MSVC_RUNTIMES)
47+
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
48+
endif()
49+
3950
if(NOT LIBRESSL_SKIP_INSTALL)
4051
set( ENABLE_LIBRESSL_INSTALL ON )
4152
endif(NOT LIBRESSL_SKIP_INSTALL)
@@ -108,7 +119,7 @@ if(WIN32)
108119
add_definitions(-D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS)
109120
add_definitions(-DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600)
110121
add_definitions(-DCPPFLAGS -DNO_SYSLOG -DNO_CRYPT)
111-
set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32)
122+
set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32 bcrypt)
112123
endif()
113124

114125
if(MSVC)
@@ -289,7 +300,7 @@ if(ENABLE_ASM)
289300
endif()
290301
elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
291302
set(HOST_ASM_MACOSX_X86_64 true)
292-
elseif(MSVC AND "${CMAKE_GENERATOR}" MATCHES "Win64")
303+
elseif(MSVC AND ("${CMAKE_GENERATOR}" MATCHES "Win64" OR "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64"))
293304
set(HOST_ASM_MASM_X86_64 true)
294305
ENABLE_LANGUAGE(ASM_MASM)
295306
elseif(CMAKE_SYSTEM_NAME MATCHES "MINGW" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
@@ -357,6 +368,17 @@ if(NOT MSVC)
357368
DESTINATION ${CMAKE_INSTALL_LIBDIR})
358369
endif()
359370

371+
if(NOT "${OPENSSLDIR}" STREQUAL "")
372+
set(CONF_DIR "${OPENSSLDIR}")
373+
else()
374+
set(CONF_DIR "${CMAKE_INSTALL_PREFIX}/etc/ssl")
375+
endif()
376+
377+
if(ENABLE_LIBRESSL_INSTALL)
378+
install(FILES cert.pem openssl.cnf x509v3.cnf DESTINATION ${CONF_DIR})
379+
install(DIRECTORY DESTINATION ${CONF_DIR}/certs)
380+
endif(ENABLE_LIBRESSL_INSTALL)
381+
360382
if(NOT TARGET uninstall)
361383
configure_file(
362384
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"

0 commit comments

Comments
 (0)