jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OpenSSL: use modern DLLs on Windows; export DLLSSLName and DLLUtilName for modules that need to expand on the openssl wrapper

Browse source
This commit is contained in:
Araq 2018-02-09 16:38:39 +01:00
commit 6dc8bedb98
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/wrappers/openssl.nim
View file

@ -29,12 +29,12 @@ const useWinVersion = defined(Windows) or defined(nimdoc)
when useWinVersion: when useWinVersion:
when not defined(nimOldDlls) and defined(cpu64): when not defined(nimOldDlls) and defined(cpu64):
const const
DLLSSLName = "(ssleay64|libssl64).dll" DLLSSLName* = "(libssl-1_1-x64|ssleay64|libssl64).dll"
DLLUtilName = "libeay64.dll" DLLUtilName* = "(libcrypto-1_1-x64|libeay64).dll"
else: else:
const const
DLLSSLName = "(ssleay32|libssl32).dll" DLLSSLName* = "(libssl-1_1-x32|ssleay32|libssl32).dll"
DLLUtilName = "libeay32.dll" DLLUtilName* = "(libcrypto-1_1-x32|libeay32).dll"
from winlean import SocketHandle from winlean import SocketHandle
else: else:
@ -42,12 +42,12 @@ else:
when defined(macosx): when defined(macosx):
const const
DLLSSLName = "libssl" & versions & ".dylib" DLLSSLName* = "libssl" & versions & ".dylib"
DLLUtilName = "libcrypto" & versions & ".dylib" DLLUtilName* = "libcrypto" & versions & ".dylib"
else: else:
const const
DLLSSLName = "libssl.so" & versions DLLSSLName* = "libssl.so" & versions
DLLUtilName = "libcrypto.so" & versions DLLUtilName* = "libcrypto.so" & versions
from posix import SocketHandle from posix import SocketHandle
import dynlib import dynlib