From 331d2ca58b954a94d3008573262e454834027d4d Mon Sep 17 00:00:00 2001 From: Christian Hohnstaedt Date: Sat, 20 May 2023 18:19:36 +0200 Subject: [PATCH] Windows: switch to OpenSSL 3 --- CMakeLists.txt | 5 ++++- README.md | 2 +- misc/dynamic.wxs.in | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2106e4eb..4608b7de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,6 +63,9 @@ elseif(WIN32) if (NOT OPENSSL_ROOT_DIR) set(OPENSSL_ROOT_DIR $ENV{PROGRAMFILES}/OpenSSL-Win64) endif() + if (NOT OPENSSL_LIBRARY_MAJOR) + set(OPENSSL_LIBRARY_MAJOR 3) # For OpenSSL 1.1.1 use "1_1" + endif() set(PSQL_BINDIR $ENV{PROGRAMFILES}/PostgreSQL/14/bin CACHE PATH "PostgreSQL installation directory for the MSI installer") set(MYSQL_BINDIR $ENV{PROGRAMFILES}/qsqlmysql.dll_Qt_SQL_driver_5.15.2_MinGW_8.1.0_64-bit/${CMAKE_BUILD_TYPE} @@ -237,7 +240,7 @@ elseif(WIN32) ${CMAKE_BINARY_DIR}/libstdc++-6.dll ${CMAKE_BINARY_DIR}/libwinpthread-1.dll ${SYSTEM32}/vcruntime140.dll - ${OPENSSL_ROOT_DIR}/bin/libcrypto-1_1-x64.dll + ${OPENSSL_ROOT_DIR}/bin/libcrypto-${OPENSSL_LIBRARY_MAJOR}-x64.dll DESTINATION ${RUNTIME_DEST} ) install(CODE "execute_process(COMMAND cmake -E chdir \${CMAKE_INSTALL_PREFIX} tar cvf ${RUNTIME_DEST}.zip --format=zip -- ${RUNTIME_DEST})") diff --git a/README.md b/README.md index 429d05ad..a1c45c9d 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ XCA can be used with Xcode after initializing the directory with: - Install the dependencies - Install Python for windows from the store or https://www.python.org/downloads/windows/ - - Install OpenSSL from here: https://slproweb.com/download/Win64OpenSSL-1_1_1m.msi and verify the sha256 from https://github.com/slproweb/opensslhashes/blob/master/win32_openssl_hashes.json + - Install OpenSSL from here: https://slproweb.com/download/Win64OpenSSL-3_0_8.msi and verify the sha256 from https://github.com/slproweb/opensslhashes/blob/master/win32_openssl_hashes.json - To install the Qt libraries, cmake and the MinGW compiler [aqtinstall](https://github.com/miurahr/aqtinstall) is used. Sphinx is used to generate the documentation ``` diff --git a/misc/dynamic.wxs.in b/misc/dynamic.wxs.in index 2edfd6db..e136a405 100644 --- a/misc/dynamic.wxs.in +++ b/misc/dynamic.wxs.in @@ -4,7 +4,7 @@ - + @@ -78,7 +78,7 @@ - +