]> granicus.if.org Git - curl/commitdiff
nss: fix nssckbi module loading on Windows
authorJay Satiro <raysatiro@yahoo.com>
Wed, 3 Oct 2018 02:19:16 +0000 (22:19 -0400)
committerJay Satiro <raysatiro@yahoo.com>
Wed, 3 Oct 2018 06:28:09 +0000 (02:28 -0400)
- 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

lib/vtls/nss.c

index c945b453c26d5065547a127f3a6f94388c1252ec..a3d3e58bbe726af9193ce061aff9ca3ff6385798 100644 (file)
@@ -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 */