aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2009-05-27 22:01:03 +0000
committerDaniel Stenberg <daniel@haxx.se>2009-05-27 22:01:03 +0000
commit0bf9c1e8815ad1bf07ef875b3e7a5a3acc9f3e8c (patch)
tree9f755642199fb63a6234dbc61b2ff03a3fe98632 /lib
parentbf07d37737e179ff2ded90b8303bb65c227a8615 (diff)
- Claes Jakobsson fixed libcurl-NSS to build fine even without the
PK11_CreateGenericObject() function.
Diffstat (limited to 'lib')
-rw-r--r--lib/nss.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/nss.c b/lib/nss.c
index 15978190a..509a311ec 100644
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -914,12 +914,14 @@ void Curl_nss_close(struct connectdata *conn, int sockindex)
}
if(connssl->client_cert)
CERT_DestroyCertificate(connssl->client_cert);
+#ifdef HAVE_PK11_CREATEGENERICOBJECT
if(connssl->key)
(void)PK11_DestroyGenericObject(connssl->key);
if(connssl->cacert[1])
(void)PK11_DestroyGenericObject(connssl->cacert[1]);
if(connssl->cacert[0])
(void)PK11_DestroyGenericObject(connssl->cacert[0]);
+#endif
connssl->handle = NULL;
}
}
@@ -956,9 +958,11 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
return CURLE_OK;
connssl->client_cert = NULL;
+#ifdef HAVE_PK11_CREATEGENERICOBJECT
connssl->cacert[0] = NULL;
connssl->cacert[1] = NULL;
connssl->key = NULL;
+#endif
/* FIXME. NSS doesn't support multiple databases open at the same time. */
PR_Lock(nss_initlock);