From 3759931b0d661addbf8fcebb0694add6bb31041b Mon Sep 17 00:00:00 2001
From: Yuriy Puchkov <yuriy.puchkov@namecheap.com>
Date: Wed, 22 Jul 2020 15:58:29 +0300
Subject: [PATCH] Fix libssl connection error for Windows

---
 appveyor.yml            | 7 ++++++-
 flameshot.pro           | 2 ++
 win_setup/flameshot.iss | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index cc1ea021..4ca4e7c6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -59,13 +59,18 @@ after_build:
   - copy "%APPVEYOR_BUILD_FOLDER%\build\translations\Internationalization_*.qm" "distrib\flameshot\translations"
   # Delete translations\qt_*.qm
   - del /F /Q "distrib\flameshot\translations\qt_*.qm"
-  # Copy OpenSSL DLLs
+  # Copy OpenSSL DLLs ()
   - if "%PLATFORM%" EQU "X64" (xcopy "openssl-utils.git\win64\*.dll" "distrib\flameshot")
   - if "%PLATFORM%" EQU "x86" (xcopy "openssl-utils.git\win32\*.dll" "distrib\flameshot")
   - cd distrib
   - if "%PLATFORM%" EQU "X64" (mv flameshot\vcredist_x64.exe flameshot\vcredist.exe)
   - if "%PLATFORM%" EQU "x86" (mv flameshot\vcredist_x86.exe flameshot\vcredist.exe)
   - 7z a flameshot_%flameshot_version%_win_%PLATFORM%.zip flameshot
+  # Download and install vcredist-2013 for OpenSSL binnaries
+  - if "%PLATFORM%" EQU "X64" appveyor DownloadFile https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe
+  - if "%PLATFORM%" EQU "X64" (mv vcredist_x64.exe flameshot\vcredist-2013.exe)
+  - if "%PLATFORM%" EQU "x86" appveyor DownloadFile https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x86.exe
+  - if "%PLATFORM%" EQU "x86" (mv vcredist_x86.exe flameshot\vcredist-2013.exe)
   # Build installation
   - cp ..\..\win_setup\flameshot.iss flameshot.iss
   - C:\InnoSetup\Compil32.exe /cc flameshot.iss
diff --git a/flameshot.pro b/flameshot.pro
index 607becd1..f2d9e514 100644
--- a/flameshot.pro
+++ b/flameshot.pro
@@ -6,6 +6,8 @@
 
 win32:LIBS += -luser32 -lshell32
 
+LIBS += -Llibeay32 -Lssleay32
+
 BASE_VERSION = 0.7.5
 TAG_VERSION = "$$system(git --git-dir $$PWD/.git rev-parse --short HEAD)"
 isEmpty(TAG_VERSION){
diff --git a/win_setup/flameshot.iss b/win_setup/flameshot.iss
index dc4c272e..63e811d9 100644
--- a/win_setup/flameshot.iss
+++ b/win_setup/flameshot.iss
@@ -32,6 +32,7 @@ Source: "flameshot\iconengines\*"; DestDir: "{app}\iconengines"
 Source: "flameshot\imageformats\*"; DestDir: "{app}\imageformats"
 Source: "flameshot\platforms\*"; DestDir: "{app}\platforms"
 Source: "flameshot\translations\*"; DestDir: "{app}\translations"
+Source: "flameshot\vcredist-2013.exe"; DestDir: {app}
 Source: "flameshot\vcredist.exe"; DestDir: {app}
 
 [Icons]
@@ -44,6 +45,9 @@ Name: "{group}\FlameShot Documentation"; Filename: "{app}\flameshot-documentatio
 ; you don't need a [Registry] section.
 
 [Run]
+Filename: {app}\vcredist-2013.exe; \
+    Parameters: "/q /passive /Q:a /c:""msiexec /q /i vcredist.msi"""; \
+    StatusMsg: "Installing VC++ 2013 Redistributables..."
 Filename: {app}\vcredist.exe; \
     Parameters: "/q /passive /Q:a /c:""msiexec /q /i vcredist.msi"""; \
     StatusMsg: "Installing VC++ 2015 Redistributables..."