paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-16 04:59:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Merging revisions r45504 from trunk:

Browse Source 
------------------------------------------------------------------------
    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 -
This commit is contained in:
michael 2020-08-23 09:09:14 +00:00
parent 2ac27ce2ef
commit e64257da96
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/openssl/src/openssl.pas
View File

@ -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