diff options
| author | Jay Satiro <raysatiro@yahoo.com> | 2018-10-02 22:19:16 -0400 |
|---|---|---|
| committer | Jay Satiro <raysatiro@yahoo.com> | 2018-10-03 02:28:09 -0400 |
| commit | dd6b62acc32308d3b9b13ae9f27b4d23c70985e3 (patch) | |
| tree | fe820680e17381cb41687a13dd5159a19f56814e | |
| parent | f33312fe3330363633f379b1d291745184ce01ce (diff) | |
| download | curl-dd6b62acc32308d3b9b13ae9f27b4d23c70985e3.tar.gz | |
nss: fix nssckbi module loading on Windows
- Use .DLL extension instead of .so to load modules on Windows.
Bug: https://curl.haxx.se/mail/lib-2018-09/0077.html
Reported-by: Maxime Legros
Ref: https://github.com/curl/curl/pull/3016/#issuecomment-423069442
Closes https://github.com/curl/curl/pull/3086
| -rw-r--r-- | lib/vtls/nss.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c index c945b453c..a3d3e58bb 100644 --- a/lib/vtls/nss.c +++ b/lib/vtls/nss.c @@ -217,10 +217,15 @@ static const cipher_s cipherlist[] = { #endif }; +#ifdef WIN32 +static const char *pem_library = "nsspem.dll"; +static const char *trust_library = "nssckbi.dll"; +#else static const char *pem_library = "libnsspem.so"; -static SECMODModule *pem_module = NULL; - static const char *trust_library = "libnssckbi.so"; +#endif + +static SECMODModule *pem_module = NULL; static SECMODModule *trust_module = NULL; /* NSPR I/O layer we use to detect blocking direction during SSL handshake */ |