Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/pk11wrap/pk11merge.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/. */
 
 /*
  * Merge the source token into the target token.
  */
 
 #include "secmod.h"
 #include "secmodi.h"
@@ skipping 732 matching lines @@
                 CK_OBJECT_HANDLE id, void *targetPwArg, void *sourcePwArg)
 {
     CERTCertificate *sourceCert = NULL;
     CK_OBJECT_HANDLE targetCertID = CK_INVALID_HANDLE;
     char *nickname = NULL;
     SECStatus rv = SECSuccess;
     PLArenaPool *arena = NULL;
     CK_ATTRIBUTE sourceCKAID = {CKA_ID, NULL, 0};
     CK_ATTRIBUTE targetCKAID = {CKA_ID, NULL, 0};
     SECStatus lrv = SECSuccess;
-    int error;
-
+    int error = SEC_ERROR_LIBRARY_FAILURE;
 
     sourceCert = PK11_MakeCertFromHandle(sourceSlot, id, NULL);
     if (sourceCert == NULL) {
         rv = SECFailure;
         goto done;
     }
 
     nickname = PK11_GetObjectNickname(sourceSlot, id);
 
     /* The database code will prevent nickname collisions for certs with
@@ skipping 490 matching lines @@
 
 /*
  * walk down each entry and merge it. keep track of the errors in the log
  */
 static SECStatus
 pk11_mergeByObjectIDs(PK11SlotInfo *targetSlot, PK11SlotInfo *sourceSlot,
                 CK_OBJECT_HANDLE *objectIDs, int count,
                 PK11MergeLog *log, void *targetPwArg, void *sourcePwArg)
 {
     SECStatus rv = SECSuccess;
-    int error, i;
+    int error = SEC_ERROR_LIBRARY_FAILURE;
+    int i;
     
     for (i=0; i < count; i++) {
         /* try to update the entire database. On failure, keep going,
          * but remember the error to report back to the caller */
         SECStatus lrv;
         PK11MergeLogNode *newLog;
 
         lrv= pk11_mergeObject(targetSlot, sourceSlot, objectIDs[i], 
                                 targetPwArg, sourcePwArg);
         if (lrv == SECSuccess) {
@@ skipping 43 matching lines @@
  *
  *   Applications can pass in an optional error log which will record
  *   each failing object and why it failed to import. PK11MergeLog
  *   is modelled after the CERTVerifyLog.
  */
 SECStatus
 PK11_MergeTokens(PK11SlotInfo *targetSlot, PK11SlotInfo *sourceSlot,
                 PK11MergeLog *log, void *targetPwArg, void *sourcePwArg)
 {
     SECStatus rv = SECSuccess, lrv = SECSuccess;
-    int error, count = 0;
+    int error = SEC_ERROR_LIBRARY_FAILURE;
+    int count = 0;
     CK_ATTRIBUTE search[2];
     CK_OBJECT_HANDLE *objectIDs = NULL;
     CK_BBOOL ck_true = CK_TRUE;
     CK_OBJECT_CLASS privKey = CKO_PRIVATE_KEY;
 
     PK11_SETATTRS(&search[0], CKA_TOKEN, &ck_true, sizeof(ck_true));
     PK11_SETATTRS(&search[1], CKA_CLASS, &privKey, sizeof(privKey));
     /*
      * make sure both tokens are already authenticated if need be.
      */
@@ skipping 70 matching lines @@
     return log;
 }
 
 void
 PK11_DestroyMergeLog(PK11MergeLog *log)
 {
    if (log && log->arena) {
         PORT_FreeArena(log->arena, PR_FALSE);
     }
 }