diff options
| author | Araq <rumpf_a@web.de> | 2018-02-09 16:38:39 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2018-02-09 16:38:39 +0100 |
| commit | 6dc8bedb984c8a57379aeb120b1ab0fe6a2ba07d (patch) | |
| tree | 46d1f904a08388a05510f424a29cb6bb083da2e8 /lib | |
| parent | ad222e3015841f4e57bf3f75d809b00082b91a3a (diff) | |
| download | Nim-6dc8bedb984c8a57379aeb120b1ab0fe6a2ba07d.tar.gz | |
OpenSSL: use modern DLLs on Windows; export DLLSSLName and DLLUtilName for modules that need to expand on the openssl wrapper
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/wrappers/openssl.nim | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/wrappers/openssl.nim b/lib/wrappers/openssl.nim index a83e0c938..ca46a300e 100644 --- a/lib/wrappers/openssl.nim +++ b/lib/wrappers/openssl.nim @@ -29,12 +29,12 @@ const useWinVersion = defined(Windows) or defined(nimdoc) when useWinVersion: when not defined(nimOldDlls) and defined(cpu64): const - DLLSSLName = "(ssleay64|libssl64).dll" - DLLUtilName = "libeay64.dll" + DLLSSLName* = "(libssl-1_1-x64|ssleay64|libssl64).dll" + DLLUtilName* = "(libcrypto-1_1-x64|libeay64).dll" else: const - DLLSSLName = "(ssleay32|libssl32).dll" - DLLUtilName = "libeay32.dll" + DLLSSLName* = "(libssl-1_1-x32|ssleay32|libssl32).dll" + DLLUtilName* = "(libcrypto-1_1-x32|libeay32).dll" from winlean import SocketHandle else: @@ -42,12 +42,12 @@ else: when defined(macosx): const - DLLSSLName = "libssl" & versions & ".dylib" - DLLUtilName = "libcrypto" & versions & ".dylib" + DLLSSLName* = "libssl" & versions & ".dylib" + DLLUtilName* = "libcrypto" & versions & ".dylib" else: const - DLLSSLName = "libssl.so" & versions - DLLUtilName = "libcrypto.so" & versions + DLLSSLName* = "libssl.so" & versions + DLLUtilName* = "libcrypto.so" & versions from posix import SocketHandle import dynlib |