still wrong...

This commit is contained in:
iceman1001 2017-01-25 08:40:55 +01:00
parent 4431b482d7
commit e069d740e3

View file

@ -127,12 +127,10 @@ function main(args)
-- Turn off Debug -- Turn off Debug
local cmdSetDbgOff = "hf mf dbg 0" local cmdSetDbgOff = "hf mf dbg 0"
core.console( cmdSetDbgOff) core.console( cmdSetDbgOff)
core.clearCommandBuffer()
-- identify tag -- identify tag
result, err = lib14a.read1443a(false) result, err = lib14a.read1443a(false)
if not result then if not result then return oops(err) end
return oops(err)
end
core.clearCommandBuffer()
-- Show tag info -- Show tag info
print((' Found tag %s'):format(result.name)) print((' Found tag %s'):format(result.name))
@ -168,7 +166,7 @@ function main(args)
-- or actually blockNo and keytype -- or actually blockNo and keytype
-- just try default for now -- just try default for now
if sector == 1 and targetkeytype == 0 then if sector == 1 and targetkeytype == 0 then
keyA = tonumber(key,16) keyA = utils.ConvertHexToAscii(key)
else else
local err, foundkey = core.hardnested(blockno, keytype, key, trgblockno, tostring(targetkeytype), trgkey, 0,0,0,0) local err, foundkey = core.hardnested(blockno, keytype, key, trgblockno, tostring(targetkeytype), trgkey, 0,0,0,0)
foundkey = foundkey or "" foundkey = foundkey or ""