Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/pk11wrap/pk11pk12.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/. */
 /*
  * This file PKCS #12 fuctions that should really be moved to the
  * PKCS #12 directory, however we can't do that in a point release
  * because that will break binary compatibility, so we keep them here for now.
  */
 
@@ skipping 216 matching lines @@
     pki = PORT_ArenaZNew(temparena, SECKEYPrivateKeyInfo);
     if (!pki) {
         PORT_FreeArena(temparena, PR_FALSE);
         return rv;
     }
     pki->arena = temparena;
 
     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;
 }
         
 SECStatus
 PK11_ImportAndReturnPrivateKey(PK11SlotInfo *slot, SECKEYRawPrivateKey *lpk, 
         SECItem *nickname, SECItem *publicValue, PRBool isPerm, 
         PRBool isPrivate, unsigned int keyUsage, SECKEYPrivateKey **privk,
         void *wincx) 
@@ skipping 161 matching lines @@
     }
     return rv;
 }
 
 SECStatus
 PK11_ImportPrivateKeyInfoAndReturnKey(PK11SlotInfo *slot,
         SECKEYPrivateKeyInfo *pki, SECItem *nickname, SECItem *publicValue,
         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;
     void *paramDest = NULL;
     PLArenaPool *arena = NULL;
 
     arena = PORT_NewArena(2048);
     if(!arena) {
         return SECFailure;
     }
 
     /* need to change this to use RSA/DSA keys */
     lpk = (SECKEYRawPrivateKey *)PORT_ArenaZAlloc(arena,
                                                   sizeof(SECKEYRawPrivateKey));
     if(lpk == NULL) {
         goto loser;
     }
     lpk->arena = arena;
 
     switch(SECOID_GetAlgorithmTag(&pki->algorithm)) {
         case SEC_OID_PKCS1_RSA_ENCRYPTION:
             prepare_rsa_priv_key_export_for_asn1(lpk);
             keyTemplate = SECKEY_RSAPrivateKeyExportTemplate;
             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);
             keyTemplate = SECKEY_DSAPrivateKeyExportTemplate;
             paramTemplate = SECKEY_PQGParamsTemplate;
             paramDest = &(lpk->u.dsa.params);
             lpk->keyType = dsaKey;
-            keyType = CKK_DSA;
             break;
         case SEC_OID_X942_DIFFIE_HELMAN_KEY:
             if(!publicValue) {
                 goto loser;
             }
             prepare_dh_priv_key_export_for_asn1(lpk);
             keyTemplate = SECKEY_DHPrivateKeyExportTemplate;
             paramTemplate = NULL;
             paramDest = NULL;
             lpk->keyType = dhKey;
-            keyType = CKK_DH;
             break;
 
         default:
             keyTemplate   = NULL;
             paramTemplate = NULL;
             paramDest     = NULL;
             break;
     }
 
     if(!keyTemplate) {
@@ skipping 137 matching lines @@
     pki->arena = arena;
 
     return pki;
 
 loser:
     if (arena) {
         PORT_FreeArena(arena, PR_TRUE);
     }
     return NULL;
 }