Install OpenSSL 3.5 on Windows

Author: Paulchen-Panther

.github/workflows/windows.yml

@@ -80,6 +80,19 @@ jobs:
         with:
           arch: ${{ matrix.os.architecture }}
 
+      - name: 💾 Download OpenSSL 3.x
+        uses: ethanjli/[email protected]
+        with:
+          url: "https://slproweb.com/download/Win64${{ matrix.os.architecture == 'arm64' && 'ARM' || '' }}OpenSSL-3_5_0.exe"
+          destination: .\installer\openssl.exe
+          cache-key: OpenSSL
+
+      - name: 📥 Install OpenSSL 3.x
+        shell: powershell
+        run: |
+          Start-Process -FilePath ".\installer\openssl.exe" -ArgumentList "/silent", "/verysilent", "/sp-", "/suppressmsgboxes", "/DIR=C:\OpenSSL" -Wait
+          echo "OPENSSL_ROOT_DIR=C:\OpenSSL" >> $env:GITHUB_ENV
+
       - name: 💾 Download Pre-Build Dependencies
         id: dependencies
         uses: ./.github/actions/download-pre-built-deps

cmake/windows/BundleWindows.cmake.in

@@ -80,19 +80,22 @@ if(EXISTS @CMAKE_BINARY_DIR@/bin/@PROJECT_NAME@@CMAKE_EXECUTABLE_SUFFIX@)
 		endif()
 
 		foreach(comp "ssl" "crypto")
-			find_file(${comp}
+			find_file(lib${comp}
 				NAMES
 					"lib${comp}${open_ssl_version_suffix}.dll"
 				PATHS
 					"@_OPENSSL_ROOT_PATHS@"
+				HINTS
+					"@OPENSSL_ROOT_DIR@"
+					$ENV{OPENSSL_ROOT_DIR}
 				PATH_SUFFIXES
 					bin
 			)
 
-			if(comp)
+			if(lib${comp})
 				file(INSTALL
 					FILES
-						${${comp}}
+						${lib${comp}}
 					DESTINATION
 						"${CMAKE_INSTALL_PREFIX}/bin"
 				)

libsrc/webserver/CMakeLists.txt

@@ -45,20 +45,6 @@ if(ENABLE_MDNS)
 	target_link_libraries(webserver mdns)
 endif()
 
-# OpenSSL is only found correctly under ARM windows from CMake 4.1 onwards.
-# To fix this until the release of CMake 4.1, Hyperion contains a customized OpenSSL find script.
-if(WIN32 AND ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64|ARM64|arm64" AND CMAKE_VERSION VERSION_LESS "4.1.0")
-	list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/windows/openssl)
-endif()
-
-find_package(OpenSSL QUIET)
-if(OPENSSL_FOUND AND TARGET OpenSSL::SSL AND TARGET OpenSSL::Crypto)
-	target_link_libraries(webserver
-		OpenSSL::SSL
-		OpenSSL::Crypto
-	)
-endif()
-
 if(NOT CMAKE_VERSION VERSION_LESS "3.15")
 	set_target_properties(webserver PROPERTIES
 		ADDITIONAL_CLEAN_FILES ${CMAKE_BINARY_DIR}/WebConfig.qrc

src/hyperiond/CMakeLists.txt

@@ -64,6 +64,7 @@ if(WIN32 AND ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64|ARM64|arm64" AND CMAKE_V
 endif()
 
 find_package(OpenSSL QUIET)
+
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS DBus QUIET)
 target_link_libraries(${PROJECT_NAME}
 	commandline
@@ -228,17 +229,20 @@ if(WIN32 AND NOT DEFINED ENV{GITHUB_ACTIONS})
 		endif()
 
 		foreach(comp "ssl" "crypto")
-			find_file(${comp}
+			find_file(lib${comp}
 				NAMES
 					"lib${comp}${open_ssl_version_suffix}.dll"
 				PATHS
 					${_OPENSSL_ROOT_PATHS}
+				HINTS
+					${OPENSSL_ROOT_DIR}
+					$ENV{OPENSSL_ROOT_DIR}
 				PATH_SUFFIXES
 					bin
 			)
 
 			add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
-				COMMAND ${CMAKE_COMMAND} -E copy ${${comp}} $<TARGET_FILE_DIR:${PROJECT_NAME}>
+				COMMAND ${CMAKE_COMMAND} -E copy ${lib${comp}} $<TARGET_FILE_DIR:${PROJECT_NAME}>
 			)
 		endforeach()
 	endif()