github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 13:53:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

chg: adapting luascript to use new filename template for key files.

Browse source
This commit is contained in:
iceman1001 2020-01-04 16:57:15 +01:00
commit e612ae3de4
5 changed files with 30 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

20
client/luascripts/tnp3dump.lua
View file

@ -109,7 +109,6 @@ local function main(args)
local useNested = false
local usePreCalc = false
local cmdReadBlockString = 'hf mf rdbl %d A %s'
local input = "dumpkeys.bin"
local outputTemplate = os.date("toydump_%Y-%m-%d_%H%M%S");
-- Arguments for the script
@ -132,13 +131,13 @@ local function main(args)
core.console( cmdSetDbgOff)
utils.Sleep(0.5)
result, err = lib14a.read(false, true)
if not result then return oops(err) end
tag, err = lib14a.read(false, true)
if not tag then return oops(err) end
core.clearCommandBuffer()
-- Show tag info
print((' Found tag %s'):format(result.name))
print((' Found tag %s'):format(tag.name))
dbg(('Using keyA : %s'):format(keyA))
@ -152,13 +151,18 @@ local function main(args)
local akeys = ''
if usePreCalc then
local pre = require('precalc')
akeys = pre.GetAll(result.uid)
akeys = pre.GetAll(tag.uid)
dbg(akeys)
else
print('Loading dumpkeys.bin')
local hex, err = utils.ReadDumpFile(input)
local filename = ('hf-mf-%s-key.bin'):format(tag.uid);
print('loading '..filename)
local hex, err = utils.ReadDumpFile(filename)
if not hex then
return oops(err)
print('loading dumpkeys.bin')
hex, err = utils.ReadDumpFile('dumpkeys.bin')
if not hex then
return oops(err)
end
end
akeys = hex:sub(0,12*16)
end