From: iceman1001 Date: Tue, 14 Feb 2017 14:54:10 +0000 (+0100) Subject: ADD: 'script runt remagic' - the Mifare Classic s50 (1k) magic tag restores now also... X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/dd015c59152b364b947c9f72a8164e5d13880438 ADD: 'script runt remagic' - the Mifare Classic s50 (1k) magic tag restores now also all sector trailers. Default A/B keys is 0xFFFFFFFFFFFF. --- diff --git a/client/default_keys.dic b/client/default_keys.dic index 3cf1c3ec..cac226be 100644 --- a/client/default_keys.dic +++ b/client/default_keys.dic @@ -284,4 +284,6 @@ cba6ae869ad5, 645a166b1eeb, a7abbc77cc9e, f792c4c76a5c, -bfb6796a11db, \ No newline at end of file +bfb6796a11db, +# Data from +8829da9daf76, \ No newline at end of file diff --git a/client/lualibs/mf_default_keys.lua b/client/lualibs/mf_default_keys.lua index 86fd1f14..7c19e248 100644 --- a/client/lualibs/mf_default_keys.lua +++ b/client/lualibs/mf_default_keys.lua @@ -410,6 +410,10 @@ local _keys = { 'a7abbc77cc9e', 'f792c4c76a5c', 'bfb6796a11db', + --[[ + Data from + --]] + '8829da9daf76', } --- diff --git a/client/scripts/remagic.lua b/client/scripts/remagic.lua index 41a2cb83..80645899 100644 --- a/client/scripts/remagic.lua +++ b/client/scripts/remagic.lua @@ -59,6 +59,22 @@ local function cmdClassic() [4] = "hf 14a raw -c -a 5000", } end +local function cmdRestoreST() + local arr = {} + for i = 0, 15 do + local blk = 3 + (4*i) + arr[i] = "hf mf csetbl "..blk.." FFFFFFFFFFFFFF078000FFFFFFFFFFFF" + end + return arr +end +local function sendCmds( cmds ) + for i = 0, #cmds do + if cmds[i] then + print ( cmds[i] ) + core.console( cmds[i] ) + end + end +end --- -- The main entry point function main(args) @@ -76,16 +92,10 @@ function main(args) core.clearCommandBuffer() if isUltralight then - cmds = cmdUltralight() + sendCmds ( cmdUltralight() ) else - cmds = cmdClassic() - end - - for i = 0, #cmds do - if cmds[i] then - print ( cmds[i] ) - core.console( cmds[i] ) - end + sendCmds( cmdClassic() ) + sendCmds( cmdRestoreST() ) end end