From 0bf9c1e8815ad1bf07ef875b3e7a5a3acc9f3e8c Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 27 May 2009 22:01:03 +0000 Subject: - Claes Jakobsson fixed libcurl-NSS to build fine even without the PK11_CreateGenericObject() function. --- lib/nss.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib') 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); -- cgit v1.2.3