Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/pki/tdcache.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef PKIM_H
 #include "pkim.h"
 #endif /* PKIM_H */
 
 #ifndef PKIT_H
 #include "pkit.h"
@@ skipping 311 matching lines @@
 
 NSS_IMPLEMENT void
 nssTrustDomain_RemoveCertFromCacheLOCKED (
   NSSTrustDomain *td,
   NSSCertificate *cert
 )
 {
     nssList *subjectList;
     cache_entry *ce;
     NSSArena *arena;
-    NSSUTF8 *nickname;
+    NSSUTF8 *nickname = NULL;
 
 #ifdef DEBUG_CACHE
     log_cert_ref("attempt to remove cert", cert);
 #endif
     ce = (cache_entry *)nssHash_Lookup(td->cache->issuerAndSN, cert);
     if (!ce || ce->entry.cert != cert) {
         /* If it's not in the cache, or a different cert is (this is really
          * for safety reasons, though it shouldn't happen), do nothing 
          */
 #ifdef DEBUG_CACHE
@@ skipping 426 matching lines @@
     }
     /* create a new subject list for this cert, or add to existing */
     nssrv = add_subject_entry(arena, td->cache, cert, 
                                                 certNickname, &subjectList);
     if (nssrv != PR_SUCCESS) {
         goto loser;
     }
     added++;
     /* If a new subject entry was created, also need nickname and/or email */
     if (subjectList != NULL) {
+#ifdef nodef
         PRBool handle = PR_FALSE;
+#endif
         if (certNickname) {
             nssrv = add_nickname_entry(arena, td->cache, 
                                                 certNickname, subjectList);
             if (nssrv != PR_SUCCESS) {
                 goto loser;
             }
+#ifdef nodef
             handle = PR_TRUE;
+#endif
             added++;
         }
         if (cert->email) {
             nssrv = add_email_entry(td->cache, cert, subjectList);
             if (nssrv != PR_SUCCESS) {
                 goto loser;
             }
+#ifdef nodef
             handle = PR_TRUE;
+#endif
             added += 2;
         }
 #ifdef nodef
         /* I think either a nickname or email address must be associated
          * with the cert.  However, certs are passed to NewTemp without
          * either.  This worked in the old code, so it must work now.
          */
         if (!handle) {
             /* Require either nickname or email handle */
             nssrv = PR_FAILURE;
@@ skipping 313 matching lines @@
 nssTrustDomain_DumpCacheInfo (
   NSSTrustDomain *td,
   void (* cert_dump_iter)(const void *, void *, void *),
   void *arg
 )
 {
     PZ_Lock(td->cache->lock);
     nssHash_Iterate(td->cache->issuerAndSN, cert_dump_iter, arg);
     PZ_Unlock(td->cache->lock);
 }