github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-22 22:23:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: 'dumptoemul.lua' doesn't add the last newline in generated eml file.

Browse source 
FIX:  'dumptoemul-mfu.lua' doesn't add the last newline in generated eml file.
FIX:  'dumptoemul-mfu.lua' correctly gets the UID from bin file,  previously took wrong data.
This commit is contained in:
iceman1001 2017-07-11 19:37:59 +02:00
commit ed54dc8e17
2 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
client/scripts/dumptoemul-mfu.lua
View file

@ -3,7 +3,7 @@
getopt = require('getopt') getopt = require('getopt')
bin = require('bin') bin = require('bin')
example = "script run dumptoemul-mfu -i dumpdata-foobar.bin" example = "script run dumptoemul-mfu -i dumpdata-foobar.bin"
author = "Martin Holst Swende \n @Marshmellow" author = "Martin Holst Swende \n @Marshmellow \n @iceman"
usage = "script run dumptoemul-mfu [-i <file>] [-o <file>]" usage = "script run dumptoemul-mfu [-i <file>] [-o <file>]"
desc =[[ desc =[[
This script takes a dumpfile from 'hf mfu dump' and converts it to a format that can be used This script takes a dumpfile from 'hf mfu dump' and converts it to a format that can be used
@ -62,11 +62,10 @@ local function convert_to_emulform(hexdata)
return oops(("Bad data, length should be a multiple of 8 (was %d)"):format(string.len(hexdata))) return oops(("Bad data, length should be a multiple of 8 (was %d)"):format(string.len(hexdata)))
end end
local ascii,i = ""; local ascii,i = "";
for i = 1, string.len(hexdata),8 do for i = 1, string.len(hexdata), 8 do
ascii = ascii ..string.sub(hexdata,i,i+7).."\n" ascii = ascii..string.sub(hexdata, i, i+7).."\n"
end end
return string.sub(ascii, 1, -2)
return string.sub(ascii,1,-1)
end end
local function main(args) local function main(args)
@ -89,7 +88,14 @@ local function main(args)
-- The hex-data is now in ascii-format, -- The hex-data is now in ascii-format,
-- But first, check the uid -- But first, check the uid
local uid = string.sub(dumpdata,1+48,8) -- lua uses start index and endindex, not count.
-- UID is 3three skip bcc0 then 4bytes.
-- 1 lua is one-index.
-- 1 + 96 (48*2) new dump format has version/signature/counter data here
-- 97,98,99,100,101,102 UID first three bytes
-- 103,104 bcc0
-- 105--- UID last four bytes
local uid = string.sub(dumpdata, 97, 97+5)..string.sub(dumpdata, 97+8, 97+8+7)
output = output or (uid .. ".eml") output = output or (uid .. ".eml")
-- Format some linebreaks -- Format some linebreaks
@ -105,7 +111,6 @@ local function main(args)
print(("Wrote an emulator-dump to the file %s"):format(output)) print(("Wrote an emulator-dump to the file %s"):format(output))
end end
--[[ --[[
In the future, we may implement so that scripts are invoked directly In the future, we may implement so that scripts are invoked directly
into a 'main' function, instead of being executed blindly. For future into a 'main' function, instead of being executed blindly. For future

5
client/scripts/dumptoemul.lua
View file

@ -68,10 +68,9 @@ local function convert_to_emulform(hexdata)
end end
local ascii,i = ""; local ascii,i = "";
for i = 1, string.len(hexdata),32 do for i = 1, string.len(hexdata),32 do
ascii = ascii ..string.sub(hexdata,i,i+31).."\n" ascii = ascii..string.sub(hexdata,i,i+31).."\n"
end end
return string.sub(ascii, 1, -2)
return string.sub(ascii,1,-1)
end end
local function main(args) local function main(args)