Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/pk11wrap/pk11obj.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 manages object type indepentent functions.
  */
 #include "seccomon.h"
 #include "secmod.h"
 #include "secmodi.h"
 #include "secmodti.h"
@@ skipping 1559 matching lines @@
 }
 
 /*
  * Change an attribute on a raw object
  */
 SECStatus
 PK11_WriteRawAttribute(PK11ObjectType objType, void *objSpec, 
                                 CK_ATTRIBUTE_TYPE attrType, SECItem *item)
 {
     PK11SlotInfo *slot = NULL;
-    CK_OBJECT_HANDLE handle;
+    CK_OBJECT_HANDLE handle = 0;
     CK_ATTRIBUTE setTemplate;
     CK_RV crv;
     CK_SESSION_HANDLE rwsession;
 
     switch (objType) {
     case PK11_TypeGeneric:
         slot = ((PK11GenericObject *)objSpec)->slot;
         handle = ((PK11GenericObject *)objSpec)->objectID;
         break;
     case PK11_TypePrivKey:
@@ skipping 32 matching lines @@
     }
     return SECSuccess;
 }
 
 
 SECStatus
 PK11_ReadRawAttribute(PK11ObjectType objType, void *objSpec, 
                                 CK_ATTRIBUTE_TYPE attrType, SECItem *item)
 {
     PK11SlotInfo *slot = NULL;
-    CK_OBJECT_HANDLE handle;
+    CK_OBJECT_HANDLE handle = 0;
 
     switch (objType) {
     case PK11_TypeGeneric:
         slot = ((PK11GenericObject *)objSpec)->slot;
         handle = ((PK11GenericObject *)objSpec)->objectID;
         break;
     case PK11_TypePrivKey:
         slot = ((SECKEYPrivateKey *)objSpec)->pkcs11Slot;
         handle = ((SECKEYPrivateKey *)objSpec)->pkcs11ID;
         break;
@@ skipping 130 matching lines @@
 {
     CK_ATTRIBUTE theTemplate[] = {
         { CKA_ID, NULL, 0 },
         { CKA_CLASS, NULL, 0 }
     };
     /* if you change the array, change the variable below as well */
     CK_ATTRIBUTE *keyclass = &theTemplate[1];
     int tsize = sizeof(theTemplate)/sizeof(theTemplate[0]);
     /* if you change the array, change the variable below as well */
     CK_OBJECT_HANDLE peerID;
-    CK_OBJECT_HANDLE parent;
     PLArenaPool *arena;
     CK_RV crv;
 
     /* now we need to create space for the public key */
     arena = PORT_NewArena( DER_DEFAULT_CHUNKSIZE);
     if (arena == NULL) return CK_INVALID_HANDLE;
 
     crv = PK11_GetAttributes(arena,slot,searchID,theTemplate,tsize);
     if (crv != CKR_OK) {
         PORT_FreeArena(arena,PR_FALSE);
         PORT_SetError( PK11_MapError(crv) );
         return CK_INVALID_HANDLE;
     }
 
     if ((theTemplate[0].ulValueLen == 0) || (theTemplate[0].ulValueLen == -1)) {
         PORT_FreeArena(arena,PR_FALSE);
         if (matchclass == CKO_CERTIFICATE)
             PORT_SetError(SEC_ERROR_BAD_KEY);
         else
             PORT_SetError(SEC_ERROR_NO_KEY);
         return CK_INVALID_HANDLE;
      }
         
         
 
     /*
      * issue the find
      */
-    parent = *(CK_OBJECT_CLASS *)(keyclass->pValue);
     *(CK_OBJECT_CLASS *)(keyclass->pValue) = matchclass;
 
     peerID = pk11_FindObjectByTemplate(slot,theTemplate,tsize);
     PORT_FreeArena(arena,PR_FALSE);
 
     return peerID;
 }
 
 /*
  * count the number of objects that match the template.
@@ skipping 191 matching lines @@
         PORT_SetError( PK11_MapError(crv) );
         return NULL;
     }
 
     item->data = (unsigned char*) theTemplate[0].pValue;
     item->len =theTemplate[0].ulValueLen;
 
     return item;
 }