PK11_MoveKey was renamed PK11_MoveSymKey. r=relyea.

Modified Files: symkeyutil.c nss.def pk11func.h pk11skey.c

security/nss/cmd/symkeyutil/symkeyutil.c

@@ -1093,7 +1093,7 @@ main(int argc, char **argv)
 	    goto shutdown;
 	}
 	rv = SECFailure;
-	newKey = PK11_MoveKey(target, CKA_ENCRYPT, 0, PR_TRUE, symKey);
+	newKey = PK11_MoveSymKey(target, CKA_ENCRYPT, 0, PR_TRUE, symKey);
 	if (!newKey) {
 	    PR_fprintf(PR_STDERR, "%s: Couldn't move the key \n",progName);
 	    goto shutdown;

security/nss/lib/nss/nss.def

@@ -770,7 +770,7 @@ PK11_DeriveWithFlagsPerm;
 PK11_ExportEncryptedPrivKeyInfo;
 PK11_FindSlotsByAliases;
 PK11_GetSymKeyType;
-PK11_MoveKey;
+PK11_MoveSymKey;
 PK11_PubDeriveExtended;
 PK11_PubUnwrapSymKeyWithFlagsPerm;
 PK11_UnwrapSymKeyWithFlagsPerm;

security/nss/lib/pk11wrap/pk11func.h

@@ -304,7 +304,7 @@ SECStatus PK11_WrapSymKey(CK_MECHANISM_TYPE type, SECItem *params,
  * operation or the  flags and making the key permanent at the same time.
  * If the key is moved to the same slot, operation and flags values are 
  * currently ignored */
-PK11SymKey *PK11_MoveKey(PK11SlotInfo *slot, CK_ATTRIBUTE_TYPE operation, 
+PK11SymKey *PK11_MoveSymKey(PK11SlotInfo *slot, CK_ATTRIBUTE_TYPE operation, 
 			CK_FLAGS flags, PRBool  perm, PK11SymKey *symKey);
 /*
  * derive a new key from the base key.

security/nss/lib/pk11wrap/pk11skey.c

@@ -1428,7 +1428,7 @@ pk11_ForceSlot(PK11SymKey *symKey,CK_MECHANISM_TYPE type,
 }
 
 PK11SymKey *
-PK11_MoveKey(PK11SlotInfo *slot, CK_ATTRIBUTE_TYPE operation, 
+PK11_MoveSymKey(PK11SlotInfo *slot, CK_ATTRIBUTE_TYPE operation, 
 			CK_FLAGS flags, PRBool  perm, PK11SymKey *symKey)
 {
     if (symKey->slot == slot) {