OLD/MIX convert to NG: Phase D. reworked all lua scripts to handle and behavie same way. Thanks Claude

This commit is contained in:
iceman1001 committed 2026-08-29 16:31:01 +02:00
1 parent 24a9a686ea
commit bd20f7cc81
18 files changed
+249 -248

No files matched your search

+5 -9
View File
@@ -100,14 +100,9 @@ function sendRaw(rawdata, options)
+ lib14a.ISO14A_COMMAND.ISO14A_APPEND_CRC
+ lib14a.ISO14A_COMMAND.ISO14A_NO_RATS
local command = Command:newMIX{cmd = cmds.CMD_HF_ISO14443A_READER,
arg1 = flags, -- Send raw
-- arg2 contains the length, which is half the length
-- of the ASCII-string rawdata
arg2 = string.len(rawdata)/2,
data = rawdata}
local command = Command:newRaw{ tech = '14a', flags = flags, data = rawdata }
return command:sendMIX(options.ignore_response)
return command:sendNG(options.ignore_response)
end
---
-- The main entry point
@@ -146,8 +141,9 @@ function main(args)
return oops(err)
end
local cmd_response = Command.parse(res)
local len = tonumber(cmd_response.arg1) * 2
local _rlen, _sel, _raw = parseRaw('14a', res)
local cmd_response = { arg1 = _rlen or 0, data = tohex(_raw or '') }
local len = (_rlen or 0) * 2
local data = string.sub(tostring(cmd_response.data), 0, len-4)
showdata(block, data)
+14 -20
View File
@@ -106,19 +106,9 @@ function sendRaw(rawdata, options)
+ lib14a.ISO14A_COMMAND.ISO14A_RAW
+ lib14a.ISO14A_COMMAND.ISO14A_APPEND_CRC
local command = Command:newMIX{
cmd = cmds.CMD_HF_ISO14443A_READER,
local command = Command:newRaw{ tech = '14a', flags = flags, data = rawdata }
-- arg1 is the defined flags for sending "raw" ISO 14443A package
arg1 = flags,
-- arg2 contains the length, which is half the length of the ASCII
-- string data
arg2 = string.len(rawdata) / 2,
data = rawdata
}
return command:sendMIX(options.ignore_response)
return command:sendNG(options.ignore_response)
end
-- Read the current one-time password (OTP)
@@ -139,8 +129,9 @@ function readOTP(show_output)
end
-- parse the response
local cmd_response = Command.parse(res)
local len = tonumber(cmd_response.arg1) * 2
local _rlen, _sel, _raw = parseRaw('14a', res)
local cmd_response = { arg1 = _rlen or 0, data = tohex(_raw or '') }
local len = (_rlen or 0) * 2
local data = string.sub(tostring(cmd_response.data), 0, len - 4)
-- check the response
@@ -185,8 +176,9 @@ function readInfo(show_output)
end
-- parse the response
local cmd_response = Command.parse(res)
local len = tonumber(cmd_response.arg1) * 2
local _rlen, _sel, _raw = parseRaw('14a', res)
local cmd_response = { arg1 = _rlen or 0, data = tohex(_raw or '') }
local len = (_rlen or 0) * 2
local data = string.sub(tostring(cmd_response.data), 0, len - 4)
-- check the response
@@ -263,8 +255,9 @@ function bruteforceCommands()
end
-- parse the response
local cmd_response = Command.parse(res)
local len = tonumber(cmd_response.arg1) * 2
local _rlen, _sel, _raw = parseRaw('14a', res)
local cmd_response = { arg1 = _rlen or 0, data = tohex(_raw or '') }
local len = (_rlen or 0) * 2
local data = string.sub(tostring(cmd_response.data), 0, len - 4)
-- check the response
@@ -308,8 +301,9 @@ function setTime(time, otp_interval)
end
-- parse the response
local cmd_response = Command.parse(res)
local len = tonumber(cmd_response.arg1) * 2
local _rlen, _sel, _raw = parseRaw('14a', res)
local cmd_response = { arg1 = _rlen or 0, data = tohex(_raw or '') }
local len = (_rlen or 0) * 2
local data = string.sub(tostring(cmd_response.data), 0, len - 4)
end
+10 -12
View File
@@ -151,11 +151,14 @@ end
-- and displays the data
-- @param usbpacket the data received from the device
function showdata(usbpacket)
local cmd_response = Command.parse(usbpacket)
local len = tonumber(cmd_response.arg1) *2
--print("data length:",len)
local data = string.sub(tostring(cmd_response.data), 0, len);
print("<< ",data)
-- iso14a_raw_resp_t: u16 len, u8 sel, u8 rfu, u8 data[]
local rlen, sel, raw = parseRaw('14a', usbpacket)
if rlen == nil then
print("<< ", "malformed response")
return
end
local hex = tohex(raw)
print("<< ", hex)
end
function sendRaw(rawdata, options)
@@ -170,13 +173,8 @@ function sendRaw(rawdata, options)
flags = flags + lib14a.ISO14A_COMMAND.ISO14A_APPEND_CRC
end
local command = Command:newMIX{cmd = cmds.CMD_HF_ISO14443A_READER,
arg1 = flags, -- Send raw
-- arg2 contains the length, which is half the length
-- of the ASCII-string rawdata
arg2 = string.len(rawdata)/2,
data = rawdata}
return command:sendMIX(options.ignore_response)
local command = Command:newRaw{ tech = '14a', flags = flags, data = rawdata }
return command:sendNG(options.ignore_response)
end
+7 -12
View File
@@ -83,26 +83,21 @@ local function sendRaw(rawdata, options)
flags = flags + lib14a.ISO14A_COMMAND.ISO14A_APPEND_CRC
end
local arg2 = #rawdata / 2
local lenbits = 0
if options.bits7 then
arg2 = arg2 + tonumber(lshift(7, 16))
lenbits = 7
end
local command = Command:newMIX{cmd = cmds.CMD_HF_ISO14443A_READER,
arg1 = flags, -- Send raw
-- arg2 contains the length, which is half the length
-- of the ASCII-string rawdata
arg2 = arg2,
data = rawdata}
return command:sendMIX(options.ignore_response)
local command = Command:newRaw{ tech = '14a', flags = flags, data = rawdata, lenbits = lenbits }
return command:sendNG(options.ignore_response)
end
---
-- get hex data from response
local function getdata(usbpacket)
local cmd_response = Command.parse(usbpacket)
local len = tonumber(cmd_response.arg1) * 2
return string.sub(tostring(cmd_response.data), 0, len)
local _rlen, _sel, _raw = parseRaw('14a', usbpacket)
if _rlen == nil then return nil end
return tohex(_raw)
end
---
+5 -8
View File
@@ -114,12 +114,9 @@ local function sendRaw(rawdata, options)
+ lib14a.ISO14A_COMMAND.ISO14A_RAW
+ lib14a.ISO14A_COMMAND.ISO14A_APPEND_CRC
local c = Command:newMIX{cmd = cmds.CMD_HF_ISO14443A_READER,
arg1 = flags,
arg2 = string.len(rawdata)/2,
data = rawdata}
local c = Command:newRaw{ tech = '14a', flags = flags, data = rawdata }
return c:sendMIX(options.ignore_response)
return c:sendNG(options.ignore_response)
end
---
@@ -152,9 +149,9 @@ end
--- Function to get response data
local function getResponseData(usbpacket)
local resp = Command.parse(usbpacket)
local len = tonumber(resp.arg1) * 2
return string.sub(tostring(resp.data), 0, len);
local _rlen, _sel, _raw = parseRaw('14a', usbpacket)
if _rlen == nil then return nil end
return tohex(_raw)
end
---
+5 -6
View File
@@ -91,12 +91,11 @@ end
local function readmagicblock( blocknum )
-- Read block N
local CSETBLOCK_SINGLE_OPERATION = 0x1F
local c = Command:newMIX{
cmd = cmds.CMD_HF_MIFARE_CGETBL
, arg1 = CSETBLOCK_SINGLE_OPERATION
, arg3 = blocknum
}
local b, err = getblockdata(c:sendMIX())
-- mf_chinese_blk_t { u8 params, u8 blockno, u8 data[] }
-- mf_chinese_blk_t { u8 params, u8 blockno, u8 data[] }
local payload = ('%02X%02X'):format(CSETBLOCK_SINGLE_OPERATION, blocknum)
local c = Command:newNG{ cmd = cmds.CMD_HF_MIFARE_CGETBL, data = payload }
local b, err = getblockdata(c:sendNG())
if not b then return oops(err) end
return b
end
+5 -2
View File
@@ -244,8 +244,11 @@ local function LoadEmulator(uid, blocks)
io.write( _..',')
io.flush()
core.clearCommandBuffer()
cmd = Command:newMIX{cmd = cmds.CMD_HF_MIFARE_EML_MEMSET, arg1 = _ ,arg2 = 1,arg3 = 16, data = blockdata}
local err, msg = cmd:sendMIX(true)
-- payload: u16 blockno, u8 blockcnt, u8 blockwidth, u8 data[]
-- payload: u16 blockno, u8 blockcnt, u8 blockwidth, u8 data[]
local eml_payload = ('%02X%02X%02X%02X'):format(_ % 256, math.floor(_ / 256) % 256, 1, 16) .. blockdata
cmd = Command:newNG{cmd = cmds.CMD_HF_MIFARE_EML_MEMSET, data = eml_payload}
local err, msg = cmd:sendNG(true)
if err == nil then return err, msg end
end
io.write('\n')
+5 -8
View File
@@ -144,20 +144,17 @@ end
-- reads the number of bytes specified in arg1 (arg0 in c-struct)
-- @param usbpacket the data received from the device
local function getResponseData(usbpacket)
local resp = Command.parse(usbpacket)
local len = tonumber(resp.arg1) * 2
return string.sub(tostring(resp.data), 0, len);
local _rlen, _sel, _raw = parseRaw('14a', usbpacket)
if _rlen == nil then return nil end
return tohex(_raw)
end
---
local function sendRaw(rawdata, options)
local flags = lib14a.ISO14A_COMMAND.ISO14A_NO_DISCONNECT
+ lib14a.ISO14A_COMMAND.ISO14A_RAW
+ lib14a.ISO14A_COMMAND.ISO14A_APPEND_CRC
local c = Command:newMIX{cmd = cmds.CMD_HF_ISO14443A_READER,
arg1 = flags,
arg2 = string.len(rawdata)/2,
data = rawdata}
return c:sendMIX(options.ignore_response)
local c = Command:newRaw{ tech = '14a', flags = flags, data = rawdata }
return c:sendNG(options.ignore_response)
end
---
local function send(payload)
+6 -11
View File
@@ -198,19 +198,14 @@ end
local function sendRaw(rawdata, keep)
flags = lib14a.ISO14A_COMMAND.ISO14A_RAW + lib14a.ISO14A_COMMAND.ISO14A_APPEND_CRC
if keep == true then flags = flags + lib14a.ISO14A_COMMAND.ISO14A_NO_DISCONNECT end
local command = Command:newMIX{cmd = cmds.CMD_HF_ISO14443A_READER,
arg1 = flags, -- Send raw
arg2 = string.len(rawdata) / 2, -- arg2 contains the length, which is half the length of the ASCII-string rawdata
data = rawdata
}
local command = Command:newRaw{ tech = '14a', flags = flags, data = rawdata }
local ignore_response = false
local result, err = command:sendMIX(ignore_response)
local result, err = command:sendNG(ignore_response)
if result then
--local count,cmd,arg1,arg2,arg3,data = bin.unpack('LLLLH512',result)
local p = command.parse(result)
arg1 = p["arg1"]
data = p["data"]
returned_bytes = string.sub(data, 1, arg1 * 2)
local rlen, sel, raw = parseRaw('14a', result)
if rlen == nil then return nil end
local data = tohex(raw)
returned_bytes = data
if #returned_bytes > 0 then return returned_bytes else return nil end
end
end
+7 -8
View File
@@ -76,18 +76,17 @@ local function sendRaw(rawdata, crc, power)
flags = flags + lib14a.ISO14A_COMMAND.ISO14A_NO_DISCONNECT
end
local command = Command:newMIX{cmd = cmds.CMD_HF_ISO14443A_READER,
arg1 = flags, -- Send raw
arg2 = string.len(rawdata) / 2, -- arg2 contains the length, which is half the length of the ASCII-string rawdata
data = rawdata
}
local command = Command:newRaw{ tech = '14a', flags = flags, data = rawdata }
local ignore_response = false
local result, err = command:sendMIX(ignore_response)
local result, err = command:sendNG(ignore_response)
if result then
--unpack the first 4 parts of the result as longs, and the last as an extremely long string to later be cut down based on arg1, the number of bytes returned
local count,cmd,arg1,arg2,arg3,data = bin.unpack('LLLLH512',result)
-- iso14a_raw_resp_t: u16 len, u8 sel, u8 rfu, u8 data[]
local rlen, sel, raw = parseRaw('14a', result)
if rlen == nil then return nil end
local data = tohex(raw)
returned_bytes = string.sub(data, 1, arg1 * 2)
returned_bytes = data
if #returned_bytes > 0 then
print(("<recvd>: %s"):format(returned_bytes)) -- need to multiply by 2 because the hex digits are actually two bytes when they are strings
return returned_bytes
+5 -9
View File
@@ -115,9 +115,9 @@ end
-- reads the number of bytes specified in arg1 (arg0 in c-struct)
-- @param usbpacket the data received from the device
local function getResponseData(usbpacket)
local resp = Command.parse(usbpacket)
local len = tonumber(resp.arg1) * 2
return string.sub(tostring(resp.data), 0, len);
local _rlen, _sel, _raw = parseRaw('14a', usbpacket)
if _rlen == nil then return nil end
return tohex(_raw)
end
---
--
@@ -127,13 +127,9 @@ local function sendRaw(rawdata, options)
+ lib14a.ISO14A_COMMAND.ISO14A_RAW
+ lib14a.ISO14A_COMMAND.ISO14A_APPEND_CRC
local c = Command:newMIX{cmd = cmds.CMD_HF_ISO14443A_READER,
arg1 = flags,
-- arg2 contains the length, which is half the length of the ASCII-string rawdata
arg2 = string.len(rawdata)/2,
data = rawdata}
local c = Command:newRaw{ tech = '14a', flags = flags, data = rawdata }
return c:sendMIX(options.ignore_response)
return c:sendNG(options.ignore_response)
end
---
--
+7 -10
View File
@@ -59,9 +59,9 @@ end
--- Parses response data
local function parseResponse(rawResponse)
local resp = Command.parse(rawResponse)
local len = tonumber(resp.arg1) * 2
return string.sub(tostring(resp.data), 0, len);
local _rlen, _sel, _raw = parseRaw('14a', rawResponse)
if _rlen == nil then return nil end
return tohex(_raw)
end
---
@@ -86,16 +86,13 @@ local function sendRaw(rawdata, options)
flags = flags + lib14a.ISO14A_COMMAND.ISO14A_APPEND_CRC
end
local arg2 = #rawdata / 2
local lenbits = 0
if options.bits7 then
arg2 = arg2 | tonumber(bit32.lshift(7, 16))
lenbits = 7
end
local command = Command:newMIX{cmd = cmds.CMD_HF_ISO14443A_READER,
arg1 = flags,
arg2 = arg2,
data = rawdata}
return command:sendMIX(options.ignore_response)
local command = Command:newRaw{ tech = '14a', flags = flags, data = rawdata, lenbits = lenbits }
return command:sendNG(options.ignore_response)
end
---
+14 -7
View File
@@ -74,10 +74,10 @@ end
--
-- Sends an instruction to do nothing, only disconnect
function disconnect()
local command = Command:newMIX{cmd = cmds.CMD_HF_ISO14443A_READER, arg1 = 0,}
local command = Command:newRaw{ tech = '14a', flags = 0 }
-- We can ignore the response here, no ACK is returned for this command
-- Check /armsrc/iso14443a.c, ReaderIso14443a() for details
return command:sendMIX(true)
return command:sendNG(true)
end
---
--
@@ -86,9 +86,11 @@ local function getblockdata(response)
return nil, 'No response from device'
end
local count, cmd, arg0, arg1, arg2, data = bin.unpack('LLLLH40', response)
if arg0 == 1 then
return data:sub(1, 32)
if response == nil or type(response) ~= 'table' then
return nil, "malformed response from device"
end
if response.Status == 0 and response.Length >= 16 then
return response.Data:sub(1, 32)
end
return nil, "Couldn't read block"
@@ -98,8 +100,13 @@ end
-- @return nil, errormessage if unsuccessful
local function getBlock(blockno)
local block, err
local c = Command:newMIX{cmd = cmds.CMD_HF_MIFAREU_READBL, arg1 = blockno, data = 0}
block, err = getblockdata(c:sendMIX(false))
-- mful_readblock_t { bool use_schann, u8 block_no, u8 num_of_blocks,
-- u8 keytype, u8 keylen, u8 key[16] }
-- mful_readblock_t { bool use_schann, u8 block_no, u8 num_of_blocks,
-- u8 keytype, u8 keylen, u8 key[16] }
local rb_payload = ('%02X%02X%02X%02X%02X'):format(0, blockno, 1, 0, 0) .. string.rep('00', 16)
local c = Command:newNG{cmd = cmds.CMD_HF_MIFAREU_READBL, data = rb_payload}
block, err = getblockdata(c:sendNG(false))
if not block then return oops(err) end
if #block < 32 then
+7 -8
View File
@@ -44,18 +44,17 @@ local function sendRaw(rawdata, crc, power)
flags = flags + lib14a.ISO14A_COMMAND.ISO14A_NO_DISCONNECT
end
local command = Command:newMIX{cmd = cmds.CMD_HF_ISO14443A_READER,
arg1 = flags, -- Send raw
arg2 = string.len(rawdata) / 2, -- arg2 contains the length, which is half the length of the ASCII-string rawdata
data = rawdata
}
local command = Command:newRaw{ tech = '14a', flags = flags, data = rawdata }
local ignore_response = false
local result, err = command:sendMIX(ignore_response)
local result, err = command:sendNG(ignore_response)
if result then
--unpack the first 4 parts of the result as longs, and the last as an extremely long string to later be cut down based on arg1, the number of bytes returned
local count,cmd,arg1,arg2,arg3,data = bin.unpack('LLLLH512',result)
-- iso14a_raw_resp_t: u16 len, u8 sel, u8 rfu, u8 data[]
local rlen, sel, raw = parseRaw('14a', result)
if rlen == nil then return nil end
local data = tohex(raw)
returned_bytes = string.sub(data, 1, arg1 * 2)
returned_bytes = data
if #returned_bytes > 0 then
-- print(("<recvd>: %s"):format(returned_bytes)) -- need to multiply by 2 because the hex digits are actually two bytes when they are strings
return returned_bytes
+7 -8
View File
@@ -64,18 +64,17 @@ local function sendRaw(rawdata, crc, power)
flags = flags + lib14a.ISO14A_COMMAND.ISO14A_NO_DISCONNECT
end
local command = Command:newMIX{cmd = cmds.CMD_HF_ISO14443A_READER,
arg1 = flags, -- Send raw
arg2 = string.len(rawdata) / 2, -- arg2 contains the length, which is half the length of the ASCII-string rawdata
data = rawdata
}
local command = Command:newRaw{ tech = '14a', flags = flags, data = rawdata }
local ignore_response = false
local result, err = command:sendMIX(ignore_response)
local result, err = command:sendNG(ignore_response)
if result then
--unpack the first 4 parts of the result as longs, and the last as an extremely long string to later be cut down based on arg1, the number of bytes returned
local count,cmd,arg1,arg2,arg3,data = bin.unpack('LLLLH512',result)
-- iso14a_raw_resp_t: u16 len, u8 sel, u8 rfu, u8 data[]
local rlen, sel, raw = parseRaw('14a', result)
if rlen == nil then return nil end
local data = tohex(raw)
returned_bytes = string.sub(data, 1, arg1 * 2)
returned_bytes = data
if #returned_bytes > 0 then
-- print(("<recvd>: %s"):format(returned_bytes)) -- need to multiply by 2 because the hex digits are actually two bytes when they are strings
return returned_bytes