From 8ae1248c2a5f8b0b5e158abd60ccd00c53d3176e Mon Sep 17 00:00:00 2001
From: Lukas Holecek <hluk@email.cz>
Date: Mon, 8 Jun 2020 20:04:59 +0200
Subject: [PATCH] Windows: Fix SSL/TLS errors
Fixes #1177
Signed-off-by: Lukas Holecek <hluk@email.cz>
---
appveyor.yml | 8 ++++++++
utils/appveyor/after_build.bat | 3 +++
utils/appveyor/install.bat | 4 ++++
3 files changed, 15 insertions(+)
diff --git a/appveyor.yml b/appveyor.yml
index 587cfb0c7..f4fb81d61 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,10 +9,18 @@ environment:
- QTDIR: C:\Qt\5.13\mingw73_32
CMAKE_GENERATOR: MinGW Makefiles
MINGW_PATH: C:\Qt\Tools\mingw730_32
+ # https://wiki.qt.io/Qt_5.13_Tools_and_Versions
+ # https://www.appveyor.com/docs/windows-images-software/#tools
+ OPENSSL_PATH: C:\OpenSSL-v111-Win32\bin
+ LIBSSL: libssl-1_1.dll
+ LIBCRYPTO: libcrypto-1_1.dll
- QTDIR: C:\Qt\5.13\mingw73_64
CMAKE_GENERATOR: MinGW Makefiles
MINGW_PATH: C:\Qt\Tools\mingw730_64
+ OPENSSL_PATH: C:\OpenSSL-v111-Win64\bin
+ LIBSSL: libssl-1_1-x64.dll
+ LIBCRYPTO: libcrypto-1_1-x64.dll
# Parameters for default build commands (build_script is used instead).
build:
diff --git a/utils/appveyor/after_build.bat b/utils/appveyor/after_build.bat
index 24f9710c6..afb66b12f 100644
--- a/utils/appveyor/after_build.bat
+++ b/utils/appveyor/after_build.bat
@@ -28,6 +28,9 @@ xcopy /F "%BuildRoot%\src\*.qm" "%Destination%\translations" || goto :error
mkdir "%Destination%\plugins"
xcopy /F "%BuildPlugins%\*.dll" "%Destination%\plugins" || goto :error
+xcopy /F "%OPENSSL_PATH%\%LIBCRYPTO%" "%Destination%" || goto :error
+xcopy /F "%OPENSSL_PATH%\%LIBSSL%" "%Destination%" || goto :error
+
%QTDIR%\bin\windeployqt --version
%QTDIR%\bin\windeployqt --help
%QTDIR%\bin\windeployqt --release --no-system-d3d-compiler --no-angle --no-opengl-sw "%Executable%" || goto :error
diff --git a/utils/appveyor/install.bat b/utils/appveyor/install.bat
index 69ee78e8a..e0211eee0 100644
--- a/utils/appveyor/install.bat
+++ b/utils/appveyor/install.bat
@@ -6,6 +6,10 @@ set CMAKE_PREFIX_PATH=%QTDIR%\lib\cmake
dir %QTDIR%\bin || goto :error
dir %QTDIR%\lib\cmake || goto :error
+dir "%OPENSSL_PATH%" || goto :error
+dir "%OPENSSL_PATH%\%LIBCRYPTO%" || goto :error
+dir "%OPENSSL_PATH%\%LIBSSL%" || goto :error
+
REM Note: Following removes sh.exe from PATH so that CMake can generate MinGW Makefile.
PATH=%MINGW_PATH%\bin;%PATH:C:\Program Files\Git\usr\bin;=%
--
GitLab