From cca15c40d6f01b63d594f16cd08d42f4cc01c8f3 Mon Sep 17 00:00:00 2001
From: Alexandre Petitjean <alpetitjean@gmail.com>
Date: Thu, 4 May 2023 13:56:14 +0200
Subject: [PATCH] #65 WIP OpenSSLv3

---
 .github/workflows/main.yml   | 21 +++++++++------------
 CMakePresets.json            |  2 +-
 cmake/WinDeployOpenSSL.cmake |  4 ++--
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0810d83..ac12a8c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,10 +12,11 @@ jobs:
         qt_version: [6.5.0, 5.15.2]
         include:
           - os: windows-2022
-            qt_tools: 'tools_openssl_x64'
+            qt_tools: 'tools_opensslv3_x64'
             cmake_preset: 'release-win'
             artifact_path: 'cmake-build-release-win/Kemai-*.msi'
           - os: ubuntu-22.04
+            qt_tools: 'tools_opensslv3_src'
             cmake_preset: 'release'
             artifact_path: 'cmake-build-release/Kemai-*.AppImage'
           - os: macos-13
@@ -49,7 +50,13 @@ jobs:
       # OS dependencies
       - if: contains(matrix.os, 'ubuntu')
         name: Install Linux dev dependencies
-        run: sudo apt install libxss-dev libxkbcommon-x11-dev libxcb-cursor-dev
+        run: sudo apt install libxss-dev libxkbcommon-x11-dev libxcb-cursor0
+
+      - if: contains(matrix.os, 'ubuntu')
+        name: Build OpenSSLv3
+        run: |
+          cd ${{ github.workspace }}/Qt/Tools/OpenSSLv3/src
+          ./Configure && make -j3
 
       # Build
       - name: Configure
@@ -90,13 +97,3 @@ jobs:
           allowUpdates: true
           draft: true
           artifacts: ${{ matrix.artifact_path }}
-#
-#      # Update packages on continuous 'release'
-#      - if: startsWith(matrix.qt_version, '6') && github.ref_name == 'develop'
-#        name: Create/Update Continuous
-#        uses: ncipollo/release-action@v1
-#        with:
-#          allowUpdates: true
-#          tag: Continuous
-#          name: Continuous
-#          artifacts: ${{ matrix.artifact_path }}
diff --git a/CMakePresets.json b/CMakePresets.json
index 519fd58..ec2838d 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -22,7 +22,7 @@
       "hidden": true,
       "cacheVariables": {
         "CMAKE_PREFIX_PATH": "c:/Qt/6.5.0/msvc2019_64",
-        "OPENSSL_ROOT": "c:/Qt/Tools/OpenSSL/Win_x64",
+        "OPENSSL_ROOT": "c:/Qt/Tools/OpenSSLv3/Win_x64",
         "CMAKE_INSTALL_PREFIX": "dist"
       }
     },
diff --git a/cmake/WinDeployOpenSSL.cmake b/cmake/WinDeployOpenSSL.cmake
index 627a448..458d798 100644
--- a/cmake/WinDeployOpenSSL.cmake
+++ b/cmake/WinDeployOpenSSL.cmake
@@ -7,11 +7,11 @@ function(kemai_find_openssl directory)
 	message("Looking for OpenSSL in ${directory}")
 
 	find_file(_WINDEPLOYOPENSSL_CRYPTO
-		NAMES libcrypto-1_1-x64.dll
+		NAMES libcrypto-3-x64.dll
 		PATHS ${directory} ${directory}/bin
 		NO_DEFAULT_PATH)
 	find_file(_WINDEPLOYOPENSSL_SSL
-		NAMES libssl-1_1-x64.dll
+		NAMES libssl-3-x64.dll
 		PATHS ${directory} ${directory}/bin
 		NO_DEFAULT_PATH)