Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/certhigh/certhigh.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/. */
 #include "nspr.h"
 #include "secerr.h"
 #include "secasn1.h"
 #include "seccomon.h"
 #include "pk11func.h"
 #include "certdb.h"
 #include "certt.h"
 #include "cert.h"
 #include "certxutl.h"
 
 #include "nsspki.h"
 #include "pki.h"
 #include "pkit.h"
 #include "pkitm.h"
 #include "pki3hack.h"
 
 
 PRBool
 CERT_MatchNickname(char *name1, char *name2) {
     char *nickname1= NULL;
     char *nickname2 = NULL;
     char *token1;
     char *token2;
-    char *token = NULL;
-    int len;
 
     /* first deal with the straight comparison */
     if (PORT_Strcmp(name1, name2) == 0) {
         return PR_TRUE;
     }
     /* we need to handle the case where one name has an explicit token and the other
      * doesn't */
     token1 = PORT_Strchr(name1,':');
     token2 = PORT_Strchr(name2,':');
     if ((token1 && token2) || (!token1 && !token2)) {
         /* either both token names are specified or neither are, not match */
         return PR_FALSE;
     }
     if (token1) {
-        token=name1;
         nickname1=token1;
         nickname2=name2;
     } else {
-        token=name2;
         nickname1=token2;
         nickname2=name1;
     }
-    len = nickname1-token;
     nickname1++;
     if (PORT_Strcmp(nickname1,nickname2) != 0) {
         return PR_FALSE;
     }
-    /* compare the other token with the internal slot here */
+    /* Bug 1192443 - compare the other token with the internal slot here */
     return PR_TRUE;
 }
 
 /*
  * Find all user certificates that match the given criteria.
  * 
  *      "handle" - database to search
  *      "usage" - certificate usage to match
  *      "oneCertPerName" - if set then only return the "best" cert per
  *                      name
@@ skipping 1117 matching lines @@
     }
     return NULL;
 }
 
 void
 CERT_DestroyCertificateList(CERTCertificateList *list)
 {
     PORT_FreeArena(list->arena, PR_FALSE);
 }