Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/certhigh/certhigh.c

Index: nss/lib/certhigh/certhigh.c
diff --git a/nss/lib/certhigh/certhigh.c b/nss/lib/certhigh/certhigh.c
index 74651baf2714b20741e98fd3eb84f8ca32ccfd0b..b06b7af331d02ef6ffbe7b5a038641f087a965ea 100644
--- a/nss/lib/certhigh/certhigh.c
+++ b/nss/lib/certhigh/certhigh.c
@@ -24,8 +24,6 @@ CERT_MatchNickname(char *name1, char *name2) {
     char *nickname2 = NULL;
     char *token1;
     char *token2;
-    char *token = NULL;
-    int len;
 
     /* first deal with the straight comparison */
     if (PORT_Strcmp(name1, name2) == 0) {
@@ -40,20 +38,17 @@ CERT_MatchNickname(char *name1, char *name2) {
 	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;
 }