- Claes Jakobsson fixed libcurl-NSS to build fine even without the

  PK11_CreateGenericObject() function.

diff --git a/CHANGES b/CHANGES
index 70f9f8d848cf8256a6feedb66cf56aec24137f13..0d2d8cc28fcfeae9edf84a601cf36424d7b8ecd2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,9 @@ Daniel Stenberg (27 May 2009)
   the auth credentials back in 7.19.0 and earlier while now you have to set ""
   to get the same effect. His patch brings back the ability to use NULL.
 
+- Claes Jakobsson fixed libcurl-NSS to build fine even without the
+  PK11_CreateGenericObject() function.
+
 Daniel Stenberg (25 May 2009)
 - bug report #2796358 (http://curl.haxx.se/bug/view.cgi?id=2796358) pointed
   out that the cookie parser would leak memory when it parses cookies that are

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c00db9161377274d237b3363984f699b95c33946..4bdeebe1cd6e9b7d596603864712a59a0af487c4 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -17,6 +17,7 @@ This release includes the following bugfixes:
  o leaking cookie memory when duplicate domains or paths were used
  o build fix for Symbian
  o CURLOPT_USERPWD set to NULL clears auth credentials
+ o libcurl-NSS build fix
 
 This release includes the following known bugs:
 
@@ -26,6 +27,6 @@ This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
  Kamil Dudka, Caolan McNamara, Frank McGeough, Andre Guibert de Bruet,
- Mike Crowe
+ Mike Crowe, Claes Jakobsson
 
         Thanks! (and sorry if I forgot to mention someone)

diff --git a/lib/nss.c b/lib/nss.c
index 15978190af121df54b85e47cdafc705f218067b9..509a311ec2ab45e6d667e8beb82452c217c3a372 100644 (file)
--- 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);