Merge NSS_3_14_2_RTM.

mozilla/security/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 411 matching lines @@
  */
 static SECStatus
 pk11_mergeSecretKey(PK11SlotInfo *targetSlot, PK11SlotInfo *sourceSlot,
                 CK_OBJECT_HANDLE id, void *targetPwArg, void *sourcePwArg)
 {
     PK11SymKey *sourceKey = NULL;
     PK11SymKey *targetKey = NULL;
     SECItem *sourceOutput = NULL;
     SECItem *targetOutput = NULL;
     SECItem *param = NULL;
+    int blockSize;
     SECItem input;
     CK_OBJECT_HANDLE targetKeyID;
     CK_FLAGS flags;
     PRArenaPool *arena = NULL;
     SECStatus rv = SECSuccess;
     CK_MECHANISM_TYPE keyMechType, cryptoMechType;
     CK_KEY_TYPE sourceKeyType, targetKeyType;
     CK_ATTRIBUTE symTemplate[] = {
         { CKA_ID, NULL, 0 },
         { CKA_CLASS, NULL, 0 }
@@ skipping 42 matching lines @@
      * really matches. If they don't import the key with a new CKA_ID
      * value. */
     rv = pk11_matchAcrossTokens(arena, targetSlot, sourceSlot,
                         symTemplate, symTemplateCount, id, &targetKeyID);
     if (rv != SECSuccess) {
         goto done;
     }
 
     /* set up the input test */
     input.data = (unsigned char *)testString;
-    input.len = PK11_GetBlockSize(cryptoMechType, NULL);
-    if (input.len < 0) {
+    blockSize = PK11_GetBlockSize(cryptoMechType, NULL);
+    if (blockSize < 0) {
         rv = SECFailure;
         goto done;
     }
+    input.len = blockSize;
     if (input.len == 0) {
         input.len = sizeof (testString);
     }
     while (targetKeyID != CK_INVALID_HANDLE) {
         /* test to see if the keys are identical */
         targetKeyType = PK11_ReadULongAttribute(sourceSlot, id, CKA_KEY_TYPE);
         if (targetKeyType == sourceKeyType) {
                 /* same keyType  - see if it's the same key */
                 targetKey = PK11_SymKeyFromHandle(targetSlot, NULL, 
                         PK11_OriginDerive, keyMechType, targetKeyID, PR_FALSE,
@@ skipping 899 matching lines @@
     return log;
 }
 
 void
 PK11_DestroyMergeLog(PK11MergeLog *log)
 {
    if (log && log->arena) {
         PORT_FreeArena(log->arena, PR_FALSE);
     }
 }