fixes #4149 (OpenSSL: switch to OpenSSL 3.x)

2 files changed, 76 insertions, 70 deletions

diff --git a/tools/openssl/build_win32.cmd b/tools/openssl/build_win32.cmd
index 488c7d6805..7dbb5a4561 100644
--- a/tools/openssl/build_win32.cmd
+++ b/tools/openssl/build_win32.cmd
@@ -11,38 +11,41 @@ perl "%OPENSSL_ROOT_DIR%\Configure" shared VC-WIN32 /D\"_USING_V110_SDK71_\" /D\
 call %VS141COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvars32.bat 
 nmake 
 
-copy libcrypto-1_1.mir %MIRANDA_BUILD_ROOT%\pre-build\bin15\32\Libs
-copy libssl-1_1.mir    %MIRANDA_BUILD_ROOT%\pre-build\bin15\32\Libs
-
-copy libcrypto-1_1.pdb %MIRANDA_BUILD_ROOT%\pre-symbols\bin15\32
-copy libssl-1_1.pdb    %MIRANDA_BUILD_ROOT%\pre-symbols\bin15\32
-
-copy libcrypto-1_1.mir %MIRANDA_DEV_ROOT%\bin15\Release\Libs
-copy libcrypto-1_1.pdb %MIRANDA_DEV_ROOT%\bin15\Release\Libs
-copy libssl-1_1.mir    %MIRANDA_DEV_ROOT%\bin15\Release\Libs
-copy libssl-1_1.pdb    %MIRANDA_DEV_ROOT%\bin15\Release\Libs
-
-copy libcrypto-1_1.mir %MIRANDA_DEV_ROOT%\bin15\Debug\Libs
-copy libcrypto-1_1.pdb %MIRANDA_DEV_ROOT%\bin15\Debug\Libs
-copy libssl-1_1.mir    %MIRANDA_DEV_ROOT%\bin15\Debug\Libs
-copy libssl-1_1.pdb    %MIRANDA_DEV_ROOT%\bin15\Debug\Libs
-
-copy libcrypto-1_1.mir %MIRANDA_DEV_ROOT%\bin16\Release\Libs
-copy libcrypto-1_1.pdb %MIRANDA_DEV_ROOT%\bin16\Release\Libs
-copy libssl-1_1.mir    %MIRANDA_DEV_ROOT%\bin16\Release\Libs
-copy libssl-1_1.pdb    %MIRANDA_DEV_ROOT%\bin16\Release\Libs
-
-copy libcrypto-1_1.mir %MIRANDA_DEV_ROOT%\bin16\Debug\Libs
-copy libcrypto-1_1.pdb %MIRANDA_DEV_ROOT%\bin16\Debug\Libs
-copy libssl-1_1.mir    %MIRANDA_DEV_ROOT%\bin16\Debug\Libs
-copy libssl-1_1.pdb    %MIRANDA_DEV_ROOT%\bin16\Debug\Libs
-
-copy libcrypto-1_1.mir %MIRANDA_DEV_ROOT%\bin17\Release\Libs
-copy libcrypto-1_1.pdb %MIRANDA_DEV_ROOT%\bin17\Release\Libs
-copy libssl-1_1.mir    %MIRANDA_DEV_ROOT%\bin17\Release\Libs
-copy libssl-1_1.pdb    %MIRANDA_DEV_ROOT%\bin17\Release\Libs
-
-copy libcrypto-1_1.mir %MIRANDA_DEV_ROOT%\bin17\Debug\Libs
-copy libcrypto-1_1.pdb %MIRANDA_DEV_ROOT%\bin17\Debug\Libs
-copy libssl-1_1.mir    %MIRANDA_DEV_ROOT%\bin17\Debug\Libs
-copy libssl-1_1.pdb    %MIRANDA_DEV_ROOT%\bin17\Debug\Libs
+ren  libcrypto-3.dll   libcrypto-3.mir
+ren  libssl-3.dll      libssl-3.mir
+
+copy libcrypto-3.mir   %MIRANDA_BUILD_ROOT%\pre-build\bin15\32\Libs
+copy libssl-3.mir      %MIRANDA_BUILD_ROOT%\pre-build\bin15\32\Libs
+
+copy libcrypto-3.pdb   %MIRANDA_BUILD_ROOT%\pre-symbols\bin15\32
+copy libssl-3.pdb      %MIRANDA_BUILD_ROOT%\pre-symbols\bin15\32
+
+copy libcrypto-3.mir   %MIRANDA_DEV_ROOT%\bin15\Release\Libs
+copy libcrypto-3.pdb   %MIRANDA_DEV_ROOT%\bin15\Release\Libs
+copy libssl-3.mir      %MIRANDA_DEV_ROOT%\bin15\Release\Libs
+copy libssl-3.pdb      %MIRANDA_DEV_ROOT%\bin15\Release\Libs
+
+copy libcrypto-3.mir   %MIRANDA_DEV_ROOT%\bin15\Debug\Libs
+copy libcrypto-3.pdb   %MIRANDA_DEV_ROOT%\bin15\Debug\Libs
+copy libssl-3.mir      %MIRANDA_DEV_ROOT%\bin15\Debug\Libs
+copy libssl-3.pdb      %MIRANDA_DEV_ROOT%\bin15\Debug\Libs
+
+copy libcrypto-3.mir   %MIRANDA_DEV_ROOT%\bin16\Release\Libs
+copy libcrypto-3.pdb   %MIRANDA_DEV_ROOT%\bin16\Release\Libs
+copy libssl-3.mir      %MIRANDA_DEV_ROOT%\bin16\Release\Libs
+copy libssl-3.pdb      %MIRANDA_DEV_ROOT%\bin16\Release\Libs
+
+copy libcrypto-3.mir   %MIRANDA_DEV_ROOT%\bin16\Debug\Libs
+copy libcrypto-3.pdb   %MIRANDA_DEV_ROOT%\bin16\Debug\Libs
+copy libssl-3.mir      %MIRANDA_DEV_ROOT%\bin16\Debug\Libs
+copy libssl-3.pdb      %MIRANDA_DEV_ROOT%\bin16\Debug\Libs
+
+copy libcrypto-3.mir   %MIRANDA_DEV_ROOT%\bin17\Release\Libs
+copy libcrypto-3.pdb   %MIRANDA_DEV_ROOT%\bin17\Release\Libs
+copy libssl-3.mir      %MIRANDA_DEV_ROOT%\bin17\Release\Libs
+copy libssl-3.pdb      %MIRANDA_DEV_ROOT%\bin17\Release\Libs
+
+copy libcrypto-3.mir   %MIRANDA_DEV_ROOT%\bin17\Debug\Libs
+copy libcrypto-3.pdb   %MIRANDA_DEV_ROOT%\bin17\Debug\Libs
+copy libssl-3.mir      %MIRANDA_DEV_ROOT%\bin17\Debug\Libs
+copy libssl-3.pdb      %MIRANDA_DEV_ROOT%\bin17\Debug\Libs
diff --git a/tools/openssl/build_win64.cmd b/tools/openssl/build_win64.cmd
index e484ad215e..337c58e26e 100644
--- a/tools/openssl/build_win64.cmd
+++ b/tools/openssl/build_win64.cmd
@@ -10,38 +10,41 @@ perl "%OPENSSL_ROOT_DIR%\Configure" shared VC-WIN64A
 call %VS141COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvars64.bat 
 nmake 
 
-copy libcrypto-1_1.mir %MIRANDA_BUILD_ROOT%\pre-build\bin15\64\Libs
-copy libssl-1_1.mir    %MIRANDA_BUILD_ROOT%\pre-build\bin15\64\Libs
-
-copy libcrypto-1_1.pdb %MIRANDA_BUILD_ROOT%\pre-symbols\bin15\64
-copy libssl-1_1.pdb    %MIRANDA_BUILD_ROOT%\pre-symbols\bin15\64
-
-copy libcrypto-1_1.mir %MIRANDA_DEV_ROOT%\bin15\Release64\Libs
-copy libcrypto-1_1.pdb %MIRANDA_DEV_ROOT%\bin15\Release64\Libs
-copy libssl-1_1.mir    %MIRANDA_DEV_ROOT%\bin15\Release64\Libs
-copy libssl-1_1.pdb    %MIRANDA_DEV_ROOT%\bin15\Release64\Libs
-
-copy libcrypto-1_1.mir %MIRANDA_DEV_ROOT%\bin15\Debug64\Libs
-copy libcrypto-1_1.pdb %MIRANDA_DEV_ROOT%\bin15\Debug64\Libs
-copy libssl-1_1.mir    %MIRANDA_DEV_ROOT%\bin15\Debug64\Libs
-copy libssl-1_1.pdb    %MIRANDA_DEV_ROOT%\bin15\Debug64\Libs
-
-copy libcrypto-1_1.mir %MIRANDA_DEV_ROOT%\bin16\Release64\Libs
-copy libcrypto-1_1.pdb %MIRANDA_DEV_ROOT%\bin16\Release64\Libs
-copy libssl-1_1.mir    %MIRANDA_DEV_ROOT%\bin16\Release64\Libs
-copy libssl-1_1.pdb    %MIRANDA_DEV_ROOT%\bin16\Release64\Libs
-
-copy libcrypto-1_1.mir %MIRANDA_DEV_ROOT%\bin16\Debug64\Libs
-copy libcrypto-1_1.pdb %MIRANDA_DEV_ROOT%\bin16\Debug64\Libs
-copy libssl-1_1.mir    %MIRANDA_DEV_ROOT%\bin16\Debug64\Libs
-copy libssl-1_1.pdb    %MIRANDA_DEV_ROOT%\bin16\Debug64\Libs
-
-copy libcrypto-1_1.mir %MIRANDA_DEV_ROOT%\bin17\Release64\Libs
-copy libcrypto-1_1.pdb %MIRANDA_DEV_ROOT%\bin17\Release64\Libs
-copy libssl-1_1.mir    %MIRANDA_DEV_ROOT%\bin17\Release64\Libs
-copy libssl-1_1.pdb    %MIRANDA_DEV_ROOT%\bin17\Release64\Libs
-
-copy libcrypto-1_1.mir %MIRANDA_DEV_ROOT%\bin17\Debug64\Libs
-copy libcrypto-1_1.pdb %MIRANDA_DEV_ROOT%\bin17\Debug64\Libs
-copy libssl-1_1.mir    %MIRANDA_DEV_ROOT%\bin17\Debug64\Libs
-copy libssl-1_1.pdb    %MIRANDA_DEV_ROOT%\bin17\Debug64\Libs
+ren  libcrypto-3.dll   libcrypto-3.mir
+ren  libssl-3.dll      libssl-3.mir
+
+copy libcrypto-3.mir   %MIRANDA_BUILD_ROOT%\pre-build\bin15\64\Libs
+copy libssl-3.mir      %MIRANDA_BUILD_ROOT%\pre-build\bin15\64\Libs
+
+copy libcrypto-3.pdb   %MIRANDA_BUILD_ROOT%\pre-symbols\bin15\64
+copy libssl-3.pdb      %MIRANDA_BUILD_ROOT%\pre-symbols\bin15\64
+
+copy libcrypto-3.mir   %MIRANDA_DEV_ROOT%\bin15\Release64\Libs
+copy libcrypto-3.pdb   %MIRANDA_DEV_ROOT%\bin15\Release64\Libs
+copy libssl-3.mir      %MIRANDA_DEV_ROOT%\bin15\Release64\Libs
+copy libssl-3.pdb      %MIRANDA_DEV_ROOT%\bin15\Release64\Libs
+
+copy libcrypto-3.mir   %MIRANDA_DEV_ROOT%\bin15\Debug64\Libs
+copy libcrypto-3.pdb   %MIRANDA_DEV_ROOT%\bin15\Debug64\Libs
+copy libssl-3.mir      %MIRANDA_DEV_ROOT%\bin15\Debug64\Libs
+copy libssl-3.pdb      %MIRANDA_DEV_ROOT%\bin15\Debug64\Libs
+
+copy libcrypto-3.mir   %MIRANDA_DEV_ROOT%\bin16\Release64\Libs
+copy libcrypto-3.pdb   %MIRANDA_DEV_ROOT%\bin16\Release64\Libs
+copy libssl-3.mir      %MIRANDA_DEV_ROOT%\bin16\Release64\Libs
+copy libssl-3.pdb      %MIRANDA_DEV_ROOT%\bin16\Release64\Libs
+
+copy libcrypto-3.mir   %MIRANDA_DEV_ROOT%\bin16\Debug64\Libs
+copy libcrypto-3.pdb   %MIRANDA_DEV_ROOT%\bin16\Debug64\Libs
+copy libssl-3.mir      %MIRANDA_DEV_ROOT%\bin16\Debug64\Libs
+copy libssl-3.pdb      %MIRANDA_DEV_ROOT%\bin16\Debug64\Libs
+
+copy libcrypto-3.mir   %MIRANDA_DEV_ROOT%\bin17\Release64\Libs
+copy libcrypto-3.pdb   %MIRANDA_DEV_ROOT%\bin17\Release64\Libs
+copy libssl-3.mir      %MIRANDA_DEV_ROOT%\bin17\Release64\Libs
+copy libssl-3.pdb      %MIRANDA_DEV_ROOT%\bin17\Release64\Libs
+
+copy libcrypto-3.mir   %MIRANDA_DEV_ROOT%\bin17\Debug64\Libs
+copy libcrypto-3.pdb   %MIRANDA_DEV_ROOT%\bin17\Debug64\Libs
+copy libssl-3.mir      %MIRANDA_DEV_ROOT%\bin17\Debug64\Libs
+copy libssl-3.pdb      %MIRANDA_DEV_ROOT%\bin17\Debug64\Libs