From e64257da963e9ee70c52eee45a0747c591403601 Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Sun, 23 Aug 2020 09:09:14 +0000
Subject: [PATCH] * Merging revisions r45504 from trunk:
------------------------------------------------------------------------
r45504 | michael | 2020-05-26 09:48:23 +0200 (Tue, 26 May 2020) | 1 line
* Patch to try more 1.1 library names on windows (bug ID 37137)
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@46575 -
---
packages/openssl/src/openssl.pas | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/packages/openssl/src/openssl.pas b/packages/openssl/src/openssl.pas
index 5817910984..1b23606217 100644
--- a/packages/openssl/src/openssl.pas
+++ b/packages/openssl/src/openssl.pas
@@ -88,7 +88,9 @@ var
{$IFDEF WINDOWS}
DLLSSLName: string = 'ssleay32.dll';
DLLSSLName2: string = 'libssl32.dll';
+ DLLSSLName3: string = {$IFDEF WIN64}'libssl-1_1-x64.dll'{$ELSE}'libssl-1_1.dll'{$ENDIF};
DLLUtilName: string = 'libeay32.dll';
+ DLLUtilName2: string = {$IFDEF WIN64}'libcrypto-1_1-x64.dll'{$ELSE}'libcrypto-1_1.dll'{$ENDIF};
{$ELSE}
{$IFDEF OS2}
{$IFDEF OS2GCC}
@@ -5630,8 +5632,12 @@ begin
SSLUtilHandle := LoadLib(DLLUtilName);
SSLLibHandle := LoadLib(DLLSSLName);
{$IFDEF MSWINDOWS}
+ if (SSLUtilHandle = 0) then
+ SSLUtilHandle := LoadLib(DLLUtilName2);
if (SSLLibHandle = 0) then
SSLLibHandle := LoadLib(DLLSSLName2);
+ if (SSLLibHandle = 0) then
+ SSLLibHandle := LoadLib(DLLSSLName3);
{$ELSE MSWINDOWS}
{$IFDEF OS2}
if (SSLUtilHandle = 0) then