github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-14 10:37:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes to commands.lua to support MIX/NG

Browse source
This commit is contained in:
iceman1001 2019-04-28 16:35:30 +02:00
commit 195887487b
1 changed files with 141 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

148
client/lualibs/commands.lua
View file

@ -3,6 +3,7 @@ Handle Proxmark USB Commands
--]]
local _commands = require('usb_cmd')
local util = require('utils')
local _reverse_lookup,k,v = {}
for k, v in pairs(_commands) do
@ -29,14 +30,14 @@ Command = {
o.arg3 = o.arg3 or 0
local data = o.data or "0"
if(type(data) == 'string') then
if (type(data) == 'string') then
-- We need to check if it is correct length, otherwise pad it
local len = string.len(data)
if(len < 1024) then
if (len < 1024) then
--Should be 1024 hex characters to represent 512 bytes of data
data = data .. string.rep("0",1024 - len )
end
if(len > 1024) then
if (len > 1024) then
-- OOps, a bit too much data here
print( ( "WARNING: data size too large, was %s chars, will be truncated "):format(len) )
--
@ -48,12 +49,55 @@ Command = {
o.data = data
return o
end,
parse = function (packet)
local count, cmd, arg1, arg2, arg3, data = bin.unpack('LLLLH511', packet)
return Command:new{cmd = cmd, arg1 = arg1, arg2 = arg2, arg3 = arg3, data = data}
end
newMIX = function(self, o)
local o = o or {} -- create object if user does not provide one
setmetatable(o, self) -- DIY inheritance a'la javascript
self.__index = self
o.cmd = o.cmd or _commands.CMD_UNKNOWN
o.arg1 = o.arg1 or 0
o.arg2 = o.arg2 or 0
o.arg3 = o.arg3 or 0
local data = o.data or ''
if (type(data) == 'string') then
if (#data > 1024) then
-- OOps, a bit too much data here
print( ( "WARNING: data size too large, was %s chars, will be truncated "):format( #data) )
--
data = data:sub(1,1024)
end
end
o.data = data
return o
end,
newNG = function(self, o)
local o = o or {} -- create object if user does not provide one
setmetatable(o, self) -- DIY inheritance a'la javascript
self.__index = self
o.cmd = o.cmd or _commands.CMD_UNKNOWN
local data = o.data or ''
if (type(data) == 'string') then
if (#data > 1024) then
-- OOps, a bit too much data here
print( ( "WARNING: data size too large, was %s chars, will be truncated "):format( #data) )
--
data = data:sub(1,1024)
end
end
o.data = data
return o
end,
parse = function (packet)
local count, cmd, arg1, arg2, arg3, data = bin.unpack('LLLLH511', packet)
return Command:new{cmd = cmd, arg1 = arg1, arg2 = arg2, arg3 = arg3, data = data}
end
}
-- commented out, not used.
function Command:__tostring()
local output = ("%s\r\nargs : (%s, %s, %s)\r\ndata:\r\n%s\r\n"):format(
_commands.tostring(self.cmd),
@ -63,6 +107,7 @@ function Command:__tostring()
tostring(self.data))
return output
end
function Command:getBytes()
--If a hex-string has been used
local data = self.data
@ -70,4 +115,93 @@ function Command:getBytes()
local arg1, arg2, arg3 = self.arg1, self.arg2, self.arg3
return bin.pack("LLLLH",cmd, arg1, arg2, arg3, data);
end
function Command:__responsetostring()
print('NG package received')
print('CMD ::', _commands.tostring(self.resp_cmd))
print('Length ::', tostring(self.resp_length))
print('Magic ::', string.format("0x%08X", self.resp_magic), util.ConvertHexToAscii(string.format("0x%08X", self.resp_magic)))
print('Status ::', tostring(self.resp_status))
print('crc ::', string.format("0x%02X", self.resp_crc))
print('Args ::', ("(%s, %s, %s)\r\n"):format(
tostring(self.resp_arg1),
tostring(self.resp_arg2),
tostring(self.resp_arg3)))
print('NG ::', self.resp_ng)
print('package ::', self.resp_response)
end
function Command:sendMIX( ignore_response, timeout )
local data = self.data
local cmd = self.cmd
local arg1, arg2, arg3 = self.arg1, self.arg2, self.arg3
local err, msg = core.SendCommandMIX(cmd, arg1, arg2, arg3, data)
if err == nil then return err, msg end
if ignoreresponse then return true, nil end
local response, msg = core.WaitForResponseTimeout(_commands.CMD_ACK, timeout)
if response == nil then
return nil, 'Error, waiting for response timed out :: '..msg
end
-- lets digest
local data
local count, cmd, length, magic, status, crc, arg1, arg2, arg3 = bin.unpack('SSIsSLLL', response)
count, data, ng = bin.unpack('H'..length..'C', response, count)
--[[ uncomment if you want to debug
self.resp_cmd = cmd
self.resp_length = length
self.resp_magic = magic
self.resp_status = status
self.resp_crc = crc
self.resp_arg1 = arg1
self.resp_arg2 = arg2
self.resp_arg3 = arg3
self.resp_data = data
self.resp_ng = ng
self:__responsetostring()
--]]
local packed = bin.pack("LLLLH", cmd, arg1, arg2, arg3, data)
return packed, nil;
end
function Command:sendNG( ignore_response, timeout )
local data = self.data
local cmd = self.cmd
local err, msg = core.SendCommandNG(cmd, data)
if err == nil then return err, msg end
if ignoreresponse then return true, nil end
local response, msg = core.WaitForResponseTimeout(cmd, timeout)
if response == nil then
return nil, 'Error, waiting for response timed out :: '..msg
end
-- lets digest
local data
local count, cmd, length, magic, status, crc, arg1, arg2, arg3 = bin.unpack('SSIsSLLL', response)
count, data, ng = bin.unpack('H'..length..'C', response, count)
--[[ uncomment if you want to debug
self.resp_cmd = cmd
self.resp_length = length
self.resp_magic = magic
self.resp_status = status
self.resp_crc = crc
self.resp_arg1 = arg1
self.resp_arg2 = arg2
self.resp_arg3 = arg3
self.resp_data = data
self.resp_ng = ng
self:__responsetostring()
--]]
local packed = bin.pack("LLLLH", cmd, arg1, arg2, arg3, data)
return packed, nil;
end
return _commands