diff --git a/ci/win/build_installer.iss b/ci/win/build_installer.iss index 6acc6d36..2009b42a 100644 --- a/ci/win/build_installer.iss +++ b/ci/win/build_installer.iss @@ -73,8 +73,7 @@ Source:styles\*; DestDir: {app}\styles\ ;Libs Source: pdfium.dll; DestDir: {app} Source: qrencode.dll; DestDir: {app} -Source: libeay32.dll; DestDir: {app} -Source: ssleay32.dll; DestDir: {app} +Source: openssl\*; DestDir: {app} ;vcredist Source: "vc_redist.{#PLATFORM}.exe"; DestDir: {tmp}; Flags: deleteafterinstall diff --git a/ci/win/create_installer.cmd b/ci/win/create_installer.cmd index d0e43163..bb0cf09a 100644 --- a/ci/win/create_installer.cmd +++ b/ci/win/create_installer.cmd @@ -35,10 +35,11 @@ IF "%2"=="7z" ( copy %src_path%\dependencies\unarr\win\%1\unarr.dll . ) +mkdir openssl + copy %src_path%\dependencies\qrencode\win\%1\qrencode.dll . copy %src_path%\dependencies\pdfium\win\%1\pdfium.dll . -copy %src_path%\dependencies\openssl\win\%1\libeay32.dll . -copy %src_path%\dependencies\openssl\win\%1\ssleay32.dll . +copy %src_path%\dependencies\openssl\win\%1\* .\openssl\ xcopy %src_path%\release\server .\server /i /e xcopy %src_path%\release\languages .\languages /i /e diff --git a/dependencies/openssl/win/x64/libcrypto-1_1-x64.dll b/dependencies/openssl/win/x64/libcrypto-1_1-x64.dll new file mode 100644 index 00000000..9815dad0 Binary files /dev/null and b/dependencies/openssl/win/x64/libcrypto-1_1-x64.dll differ diff --git a/dependencies/openssl/win/x64/libeay32.dll b/dependencies/openssl/win/x64/libeay32.dll deleted file mode 100644 index 81998ee2..00000000 Binary files a/dependencies/openssl/win/x64/libeay32.dll and /dev/null differ diff --git a/dependencies/openssl/win/x64/libssl-1_1-x64.dll b/dependencies/openssl/win/x64/libssl-1_1-x64.dll new file mode 100644 index 00000000..bc6c50fe Binary files /dev/null and b/dependencies/openssl/win/x64/libssl-1_1-x64.dll differ diff --git a/dependencies/openssl/win/x64/ssleay32.dll b/dependencies/openssl/win/x64/ssleay32.dll deleted file mode 100644 index b4218a72..00000000 Binary files a/dependencies/openssl/win/x64/ssleay32.dll and /dev/null differ diff --git a/dependencies/openssl/win/x86/libcrypto-1_1.dll b/dependencies/openssl/win/x86/libcrypto-1_1.dll new file mode 100644 index 00000000..84eff69a Binary files /dev/null and b/dependencies/openssl/win/x86/libcrypto-1_1.dll differ diff --git a/dependencies/openssl/win/x86/libeay32.dll b/dependencies/openssl/win/x86/libeay32.dll deleted file mode 100644 index 3bfa0753..00000000 Binary files a/dependencies/openssl/win/x86/libeay32.dll and /dev/null differ diff --git a/dependencies/openssl/win/x86/libssl-1_1.dll b/dependencies/openssl/win/x86/libssl-1_1.dll new file mode 100644 index 00000000..26cfcbeb Binary files /dev/null and b/dependencies/openssl/win/x86/libssl-1_1.dll differ diff --git a/dependencies/openssl/win/x86/ssleay32.dll b/dependencies/openssl/win/x86/ssleay32.dll deleted file mode 100644 index 25218ac0..00000000 Binary files a/dependencies/openssl/win/x86/ssleay32.dll and /dev/null differ