Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/pk11wrap/pk11pk12.c

Index: nss/lib/pk11wrap/pk11pk12.c
diff --git a/nss/lib/pk11wrap/pk11pk12.c b/nss/lib/pk11wrap/pk11pk12.c
index 471e57b33657878dffc5f9443250b023eae23d51..e5a0a21cf447697c6933ff2bf1b2a516fb94091c 100644
--- a/nss/lib/pk11wrap/pk11pk12.c
+++ b/nss/lib/pk11wrap/pk11pk12.c
@@ -234,13 +234,17 @@ PK11_ImportDERPrivateKeyInfoAndReturnKey(PK11SlotInfo *slot, SECItem *derPKI,
     rv = SEC_ASN1DecodeItem(pki->arena, pki, SECKEY_PrivateKeyInfoTemplate,
 		derPKI);
     if( rv != SECSuccess ) {
-	goto finish;
+        /* If SEC_ASN1DecodeItem fails, we cannot assume anything about the
+         * validity of the data in pki. The best we can do is free the arena
+         * and return.
+         */
+        PORT_FreeArena(temparena, PR_TRUE);
+        return rv;
     }
 
     rv = PK11_ImportPrivateKeyInfoAndReturnKey(slot, pki, nickname,
 		publicValue, isPerm, isPrivate, keyUsage, privk, wincx);
 
-finish:
     /* this zeroes the key and frees the arena */
     SECKEY_DestroyPrivateKeyInfo(pki, PR_TRUE /*freeit*/);
     return rv;
@@ -422,7 +426,6 @@ PK11_ImportPrivateKeyInfoAndReturnKey(PK11SlotInfo *slot,
 	PRBool isPerm, PRBool isPrivate, unsigned int keyUsage,
 	SECKEYPrivateKey **privk, void *wincx) 
 {
-    CK_KEY_TYPE keyType = CKK_RSA;
     SECStatus rv = SECFailure;
     SECKEYRawPrivateKey *lpk = NULL;
     const SEC_ASN1Template *keyTemplate, *paramTemplate;
@@ -449,7 +452,6 @@ PK11_ImportPrivateKeyInfoAndReturnKey(PK11SlotInfo *slot,
 	    paramTemplate = NULL;
 	    paramDest = NULL;
 	    lpk->keyType = rsaKey;
-	    keyType = CKK_RSA;
 	    break;
 	case SEC_OID_ANSIX9_DSA_SIGNATURE:
 	    prepare_dsa_priv_key_export_for_asn1(lpk);
@@ -457,7 +459,6 @@ PK11_ImportPrivateKeyInfoAndReturnKey(PK11SlotInfo *slot,
 	    paramTemplate = SECKEY_PQGParamsTemplate;
 	    paramDest = &(lpk->u.dsa.params);
 	    lpk->keyType = dsaKey;
-	    keyType = CKK_DSA;
 	    break;
 	case SEC_OID_X942_DIFFIE_HELMAN_KEY:
 	    if(!publicValue) {
@@ -468,7 +469,6 @@ PK11_ImportPrivateKeyInfoAndReturnKey(PK11SlotInfo *slot,
 	    paramTemplate = NULL;
 	    paramDest = NULL;
 	    lpk->keyType = dhKey;
-	    keyType = CKK_DH;
 	    break;
 
 	default: