From: Jay Satiro <raysatiro@yahoo.com>
Date: Wed, 3 Oct 2018 02:19:16 +0000 (-0400)
Subject: nss: fix nssckbi module loading on Windows
X-Git-Tag: curl-7_62_0~113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd6b62acc32308d3b9b13ae9f27b4d23c70985e3;p=thirdparty%2Fcurl.git

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

diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c
index c945b453c2..a3d3e58bbe 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 */