Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/certdb/genname.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 "plarena.h"
 #include "seccomon.h"
 #include "secitem.h"
 #include "secoidt.h"
 #include "secasn1.h"
 #include "secder.h"
@@ skipping 49 matching lines @@
           SEC_ASN1_SUB(SEC_AnyTemplate) },
     { 0, } 
 };
 
 static const SEC_ASN1Template CERTOtherNameTemplate[] = {
     { SEC_ASN1_CONTEXT_SPECIFIC | SEC_ASN1_CONSTRUCTED | 0 ,
       offsetof(CERTGeneralName, name.OthName), CERTOthNameTemplate, 
       sizeof(CERTGeneralName) }
 };
 
-static const SEC_ASN1Template CERTOtherName2Template[] = {
-    { SEC_ASN1_SEQUENCE | SEC_ASN1_CONTEXT_SPECIFIC | 0 ,
-      0, NULL, sizeof(CERTGeneralName) },
-    { SEC_ASN1_OBJECT_ID,
-          offsetof(CERTGeneralName, name.OthName) + offsetof(OtherName, oid) },
-    { SEC_ASN1_ANY,
-          offsetof(CERTGeneralName, name.OthName) + offsetof(OtherName, name) },
-    { 0, } 
-};
-
 static const SEC_ASN1Template CERT_RFC822NameTemplate[] = {
     { SEC_ASN1_CONTEXT_SPECIFIC | SEC_ASN1_XTRN | 1 ,
           offsetof(CERTGeneralName, name.other),
           SEC_ASN1_SUB(SEC_IA5StringTemplate),
           sizeof (CERTGeneralName)}
 };
 
 static const SEC_ASN1Template CERT_DNSNameTemplate[] = {
     { SEC_ASN1_CONTEXT_SPECIFIC | SEC_ASN1_XTRN | 2 ,
           offsetof(CERTGeneralName, name.other),
@@ skipping 587 matching lines @@
      *            point anywhere else.  Otherwise, bad things will happen.
      */
     constraint->name.l.prev = constraint->name.l.next = &(constraint->name.l);
     /* TODO: unmark arena */
     return constraint;
 loser:
     /* TODO: release arena back to mark */
     return NULL;
 }
 
-CERTNameConstraint *
+static CERTNameConstraint *
 cert_DecodeNameConstraintSubTree(PLArenaPool   *arena,
                                  SECItem       **subTree,
                                  PRBool        permited)
 {
     CERTNameConstraint   *current = NULL;
     CERTNameConstraint   *first = NULL;
     CERTNameConstraint   *last = NULL;
     int                  i = 0;
 
     PORT_Assert(arena);
     /* TODO: mark arena */
     while (subTree[i] != NULL) {
         current = cert_DecodeNameConstraint(arena, subTree[i]);
         if (current == NULL) {
             goto loser;
         }
-        if (last == NULL) {
-            first = last = current;
+        if (first == NULL) {
+            first = current;
+        } else {
+            current->l.prev = &(last->l);
+            last->l.next = &(current->l);
         }
-        current->l.prev = &(last->l);
-        current->l.next = last->l.next;
-        last->l.next = &(current->l);
+        last = current;
         i++;
     }
-    first->l.prev = &(current->l);
+    first->l.prev = &(last->l);
+    last->l.next = &(first->l);
     /* TODO: unmark arena */
     return first;
 loser:
     /* TODO: release arena back to mark */
     return NULL;
 }
 
 CERTNameConstraints *
 cert_DecodeNameConstraints(PLArenaPool   *reqArena,
                            const SECItem *encodedConstraints)
@@ skipping 1261 matching lines @@
             break;
         }
         list->name = cert_CombineNamesLists(list->name, name);
         list->len++;
 done:
         PZ_Unlock(list->lock);
     }
     return;
 }
 #endif