From: marshmellow42 <marshmellow42@users.noreply.github.com>
Date: Tue, 13 Jun 2017 21:22:44 +0000 (-0400)
Subject: Merge pull request #317 from Proxmark/iceman1001-patch-1
X-Git-Tag: v3.1.0~211
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/0efcb691287836bc0afddfa8f7c595b149909f96?hp=8040afa5ba915a022e28c0d61c81b773d4ed6686

Merge pull request #317 from Proxmark/iceman1001-patch-1

bug;  Check keys params
---

diff --git a/client/scripts/mfkeys.lua b/client/scripts/mfkeys.lua
index 9471ad4b..c54f6e67 100644
--- a/client/scripts/mfkeys.lua
+++ b/client/scripts/mfkeys.lua
@@ -86,6 +86,7 @@ function checkBlock(blockNo, keys, keyType)
 	-- The command data is only 512 bytes, each key is 6 bytes, meaning that we can send max 85 keys in one go. 
 	-- If there's more, we need to split it up
 	local start, remaining= 1, #keys
+	local arg1 = bit32.bor(bit32.lshift(keyType, 8), blockNo)
 	local packets = {}
 	while remaining > 0 do
 		local n,data = remaining, nil
@@ -95,8 +96,8 @@ function checkBlock(blockNo, keys, keyType)
 		--print("data len", #data)
 		print(("Testing block %d, keytype %d, with %d keys"):format(blockNo, keyType, n))
 		local command = Command:new{cmd = cmds.CMD_MIFARE_CHKKEYS, 
-								arg1 = blockNo, 
-								arg2 = keyType, 
+								arg1 = arg1, 
+								arg2 = 1, 
 								arg3 = n, 
 								data = data}
 		local status = checkCommand(command)