Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/certdb/secname.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 "cert.h"
 #include "secoid.h"
 #include "secder.h"     /* XXX remove this when remove the DERTemplates */
 #include "secasn1.h"
 #include "secitem.h"
 #include <stdarg.h>
@@ skipping 222 matching lines @@
         if (rv) goto loser;
         rv = SECITEM_CopyItem(arena, &ava->value, &from->value);
         if (rv) goto loser;
     }
     return ava;
 
   loser:
     return 0;
 }
 
-/************************************************************************/
-/* XXX This template needs to go away in favor of the new SEC_ASN1 version. */
-static const SEC_ASN1Template cert_RDNTemplate[] = {
-    { SEC_ASN1_SET_OF,
-          offsetof(CERTRDN,avas), cert_AVATemplate, sizeof(CERTRDN) }
-};
-
-
 CERTRDN *
 CERT_CreateRDN(PLArenaPool *arena, CERTAVA *ava0, ...)
 {
     CERTAVA *ava;
     CERTRDN *rdn;
     va_list ap;
     unsigned count;
     CERTAVA **avap;
 
     rdn = (CERTRDN*) PORT_ArenaAlloc(arena, sizeof(CERTRDN));
@@ skipping 439 matching lines @@
         }
           
         avaValue.data = utf8Val;
         avaValue.len = utf8ValLen;
     }
 
     retItem = SECITEM_DupItem(&avaValue);
     PORT_FreeArena(newarena, PR_FALSE);
     return retItem;
 }