diff --git a/CMakeLists.txt b/CMakeLists.txt index effdfff2e..d3bdf29ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -520,16 +520,16 @@ if(WIN32) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/NSCP.msi DESTINATION ${CMAKE_INSTALL_SBINDIR}) - if (OPENSSL_VERSION_MINOR GREATER_EQUAL 1) - if (CMAKE_VS_PLATFORM_NAME STREQUAL "x64") - list (APPEND ICINGA2_OPENSSL_DLLS ${OPENSSL_INCLUDE_DIR}/../bin/libcrypto-1_1-x64.dll ${OPENSSL_INCLUDE_DIR}/../bin/libssl-1_1-x64.dll) - else() - list (APPEND ICINGA2_OPENSSL_DLLS ${OPENSSL_INCLUDE_DIR}/../bin/libcrypto-1_1.dll ${OPENSSL_INCLUDE_DIR}/../bin/libssl-1_1.dll) - endif() + if (CMAKE_VS_PLATFORM_NAME STREQUAL "x64") + set(ICINGA2_OPENSSL_DLL_ARCH "-x64") else() - list (APPEND ICINGA2_OPENSSL_DLLS ${OPENSSL_INCLUDE_DIR}/../bin/libeay32.dll ${OPENSSL_INCLUDE_DIR}/../bin/ssleay32.dll) + set(ICINGA2_OPENSSL_DLL_ARCH "") endif() + foreach(ICINGA2_OPENSSL_LIB crypto ssl) + list(APPEND ICINGA2_OPENSSL_DLLS ${OPENSSL_INCLUDE_DIR}/../bin/lib${ICINGA2_OPENSSL_LIB}-3${ICINGA2_OPENSSL_DLL_ARCH}.dll) + endforeach() + install( PROGRAMS ${ICINGA2_OPENSSL_DLLS} DESTINATION ${CMAKE_INSTALL_SBINDIR} diff --git a/doc/21-development.md b/doc/21-development.md index 7c863539d..a2d26ed8b 100644 --- a/doc/21-development.md +++ b/doc/21-development.md @@ -482,8 +482,8 @@ File Type: EXECUTABLE IMAGE boost_filesystem-vc142-mt-gd-x64-1_82.dll boost_thread-vc142-mt-gd-x64-1_82.dll boost_regex-vc142-mt-gd-x64-1_82.dll - libssl-1_1-x64.dll - libcrypto-1_1-x64.dll + libssl-3_0-x64.dll + libcrypto-3_0-x64.dll WS2_32.dll dbghelp.dll SHLWAPI.dll diff --git a/doc/win-dev.ps1 b/doc/win-dev.ps1 index 249361430..078931182 100644 --- a/doc/win-dev.ps1 +++ b/doc/win-dev.ps1 @@ -14,7 +14,7 @@ function ThrowOnNativeFailure { $VsVersion = 2019 $MsvcVersion = '14.2' $BoostVersion = @(1, 82, 0) -$OpensslVersion = '1_1_1t' +$OpensslVersion = '3_0_9' switch ($Env:BITS) { 32 { } diff --git a/tools/win32/configure.ps1 b/tools/win32/configure.ps1 index 6e66d09e1..80c22d2bf 100644 --- a/tools/win32/configure.ps1 +++ b/tools/win32/configure.ps1 @@ -30,7 +30,7 @@ if (-not (Test-Path env:CMAKE_GENERATOR_PLATFORM)) { } } if (-not (Test-Path env:OPENSSL_ROOT_DIR)) { - $env:OPENSSL_ROOT_DIR = "c:\local\OpenSSL_1_1_1t-Win${env:BITS}" + $env:OPENSSL_ROOT_DIR = "c:\local\OpenSSL_3_0_9-Win${env:BITS}" } if (-not (Test-Path env:BOOST_ROOT)) { $env:BOOST_ROOT = "c:\local\boost_1_82_0-Win${env:BITS}"