From 0fdf83763dd0292dc0c0ad2011f131bfc0d13eec Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Wed, 17 Apr 2024 17:32:04 +0200 Subject: [PATCH] (Windows) Updated OpenSSL to 3.3.0 --- es-app/CMakeLists.txt | 4 ++-- tools/Windows_dependencies_build.bat | 2 +- tools/Windows_dependencies_setup.bat | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt index 97ba82224..e5eae0002 100644 --- a/es-app/CMakeLists.txt +++ b/es-app/CMakeLists.txt @@ -161,9 +161,9 @@ if(WIN32) ../freetype.dll ../git2.dll ../glew32.dll - ../libcrypto-1_1-x64.dll + ../libcrypto-3-x64.dll ../libcurl-x64.dll - ../libssl-1_1-x64.dll + ../libssl-3-x64.dll ../lunasvg.dll ../pugixml.dll ../rlottie.dll diff --git a/tools/Windows_dependencies_build.bat b/tools/Windows_dependencies_build.bat index 58d98fb06..fb5169e98 100644 --- a/tools/Windows_dependencies_build.bat +++ b/tools/Windows_dependencies_build.bat @@ -1,6 +1,6 @@ :: SPDX-License-Identifier: MIT :: -:: ES-DE +:: ES-DE Frontend :: Windows_dependencies_build.bat :: :: Builds the external dependencies in-tree using MSVC. diff --git a/tools/Windows_dependencies_setup.bat b/tools/Windows_dependencies_setup.bat index 6fa84e16b..19311e51d 100644 --- a/tools/Windows_dependencies_setup.bat +++ b/tools/Windows_dependencies_setup.bat @@ -1,6 +1,6 @@ :: SPDX-License-Identifier: MIT :: -:: ES-DE +:: ES-DE Frontend :: Windows_dependencies_setup.bat :: :: Downloads and prepares the external dependencies for building in-tree using MSVC. @@ -309,18 +309,18 @@ if exist fWin64OpenSSL_Light-1_1_1m.exe ( del Win64OpenSSL_Light-1_1_1m.exe ) -if not exist "C:\Program Files\OpenSSL-Win64\libcrypto-1_1-x64.dll" ( - curl -O https://slproweb.com/download/Win64OpenSSL_Light-1_1_1m.exe +if not exist "C:\Program Files\OpenSSL-Win64\libcrypto-3-x64.dll" ( + curl -O https://slproweb.com/download/Win64OpenSSL_Light-3_3_0.exe :: Run the installer. - .\Win64OpenSSL_Light-1_1_1m.exe + .\Win64OpenSSL_Light-3_3_0.exe ) :: Return to the root of the repository. cd .. -if exist "C:\Program Files\OpenSSL-Win64\libcrypto-1_1-x64.dll" ( - copy /Y "C:\Program Files\OpenSSL-Win64\libcrypto-1_1-x64.dll" - copy /Y "C:\Program Files\OpenSSL-Win64\libssl-1_1-x64.dll" +if exist "C:\Program Files\OpenSSL-Win64\libcrypto-3-x64.dll" ( + copy /Y "C:\Program Files\OpenSSL-Win64\libcrypto-3-x64.dll" + copy /Y "C:\Program Files\OpenSSL-Win64\libssl-3-x64.dll" ) echo: