diff --git a/client/luascripts/hf_mf_dump-luxeo.lua b/client/luascripts/hf_mf_dump-luxeo.lua index 70f1b42e0..8659dcd9b 100644 --- a/client/luascripts/hf_mf_dump-luxeo.lua +++ b/client/luascripts/hf_mf_dump-luxeo.lua @@ -12,9 +12,10 @@ local ansicolors = require('ansicolors') copyright = '' author = '0xdrrb' -version = 'v0.1.1' +version = 'v0.1.2' desc = [[ -This is a script that tries to dump and decrypt the data of a specific type of Mifare laundromat token. OBS! Tag must be on the antenna. +This is a script that tries to dump and decrypt the data of a specific type of Mifare laundromat token. +OBS! Tag must be on the antenna. ]] example = [[ script run hf_mf_dump-luxeo @@ -69,9 +70,9 @@ end local function setdevicedebug( status ) local c = 'hw dbg ' if status then - c = c..'1' + c = c..'-1' else - c = c..'0' + c = c..'-0' end core.console(c) end diff --git a/client/luascripts/hf_mf_mini_dumpdecrypt.lua b/client/luascripts/hf_mf_mini_dumpdecrypt.lua index ec6006ed2..c75b92304 100644 --- a/client/luascripts/hf_mf_mini_dumpdecrypt.lua +++ b/client/luascripts/hf_mf_mini_dumpdecrypt.lua @@ -10,7 +10,7 @@ local ansicolors = require('ansicolors') copyright = '' author = 'Iceman' -version = 'v1.0.2' +version = 'v1.0.3' desc = [[ This is a script to dump and decrypt the data of a specific type of Mifare Mini token. The dump is decrypted. If a raw dump is wanted, use the -r parameter @@ -557,9 +557,9 @@ end local function setdevicedebug( status ) local c = 'hw dbg ' if status then - c = c..'1' + c = c..'-1' else - c = c..'0' + c = c..'-0' end core.console(c) end diff --git a/client/luascripts/hf_mf_tnp3_dump.lua b/client/luascripts/hf_mf_tnp3_dump.lua index 54a19da82..8e6a6bfb3 100644 --- a/client/luascripts/hf_mf_tnp3_dump.lua +++ b/client/luascripts/hf_mf_tnp3_dump.lua @@ -10,7 +10,7 @@ local ansicolors = require('ansicolors') copyright = '' author = 'Iceman' -version = 'v1.0.2' +version = 'v1.0.3' desc = [[ This script will try to dump the contents of a Mifare TNP3xxx card. It will need a valid KeyA in order to find the other keys and decode the card. @@ -112,7 +112,7 @@ local function main(args) local keyA, cmd, err local useNested = false local usePreCalc = false - local cmdReadBlockString = 'hf mf rdbl %d A %s' + local cmdReadBlockString = 'hf mf rdbl --blk %d -k %s' local outputTemplate = os.date("toydump_%Y-%m-%d_%H%M%S"); -- Arguments for the script @@ -131,7 +131,7 @@ local function main(args) end -- Turn off Debug - local cmdSetDbgOff = "hw dbg 0" + local cmdSetDbgOff = "hw dbg -0" core.console( cmdSetDbgOff) utils.Sleep(0.5) diff --git a/client/luascripts/hf_mf_tnp3_sim.lua b/client/luascripts/hf_mf_tnp3_sim.lua index 33f82b2d4..2351bf1d5 100644 --- a/client/luascripts/hf_mf_tnp3_sim.lua +++ b/client/luascripts/hf_mf_tnp3_sim.lua @@ -10,7 +10,7 @@ local ansicolors = require('ansicolors') copyright = '' author = 'Iceman' -version = 'v1.0.2' +version = 'v1.0.3' desc = [[ This script will try to load a binary datadump of a Mifare TNP3xxx card. It will try to validate all checksums and view some information stored in the dump @@ -372,7 +372,7 @@ local function main(args) end -- Turn off Debug - local cmdSetDbgOff = 'hw dbg 0' + local cmdSetDbgOff = 'hw dbg -0' core.console( cmdSetDbgOff) utils.Sleep(0.5) diff --git a/client/luascripts/hf_ntag-3d.lua b/client/luascripts/hf_ntag-3d.lua index e46705bd1..1ee21fe37 100644 --- a/client/luascripts/hf_ntag-3d.lua +++ b/client/luascripts/hf_ntag-3d.lua @@ -5,7 +5,7 @@ local ansicolors = require('ansicolors') copyright = 'Copyright (c) 2017 IceSQL AB. All rights reserved.' author = "Christian Herrmann" -version = 'v1.0.5' +version = 'v1.0.6' desc = [[ This script writes a empty template for 3D printing system onto a empty NTAG213 or MAGIC NTAG21* @@ -189,25 +189,25 @@ end local function write_tag(uid, t) print('Writing to tag') - core.console('hw dbg 0') + core.console('hw dbg -0') utils.Sleep(0.5) local cmd = '' local pwd, pack = core.keygen_algo_d(uid) for i= 8, 23 do - cmd = ('hf mfu wrbl b %02d d %s k %08X'):format(i, t[i], pwd) + cmd = ('hf mfu wrbl --blk %02d -d %s -k %08X'):format(i, t[i], pwd) core.console(cmd) end --cfg1 - core.console(('hf mfu wrbl b 42 d %s k %08X'):format(t[42], pwd)) + core.console(('hf mfu wrbl --blk 42 -d %s -k %08X'):format(t[42], pwd)) --cfg0 - core.console(('hf mfu wrbl b 41 d %s k %08X'):format(t[41], pwd)) + core.console(('hf mfu wrbl --blk 41 -d %s -k %08X'):format(t[41], pwd)) --dynamic - core.console(('hf mfu wrbl b 40 d %s k %08X'):format(t[40], pwd)) + core.console(('hf mfu wrbl --blk 40 -d %s -k %08X'):format(t[40], pwd)) - core.console('hw dbg 1') + core.console('hw dbg -1') utils.Sleep(0.5) print('Done') end