moved some functions and added auth sequence annotation

[proxmark3-svn] / client / scripts / tnp3dump.lua

diff --git a/client/scripts/tnp3dump.lua b/client/scripts/tnp3dump.lua
index cd547e8adf2225987a5a1a2abbbd36acf78d7b6a..3955137e575da4e6e107ec1f3e6e908250b43fdd 100644 (file)
--- a/client/scripts/tnp3dump.lua
+++ b/client/scripts/tnp3dump.lua
@@ -127,7 +127,7 @@ local function main(args)
        local cmdSetDbgOff = "hf mf dbg 0"
        core.console( cmdSetDbgOff) 
        
-       result, err = lib14a.read1443a(false)
+       result, err = lib14a.read14443a(false, true)
        if not result then
                return oops(err)
        end
@@ -205,18 +205,19 @@ local function main(args)
                
                        if blockNo < 8 then
                                -- Block 0-7 not encrypted
-                               blocks[blockNo+1] = ('%02d  :: %s'):format(blockNo,blockdata) 
+                               blocks[blockNo+1] = ('%02d  :: %s'):format(blockNo,blockdata)
                        else
                                -- blocks with zero not encrypted.
                                if string.find(blockdata, '^0+$') then
-                                       blocks[blockNo+1] = ('%02d  :: %s'):format(blockNo,blockdata) 
+                                       blocks[blockNo+1] = ('%02d  :: %s'):format(blockNo,blockdata)
                                else
                                        local baseStr = utils.ConvertHexToAscii(tmpHash:format(blockNo))
                                        local key = md5.sumhexa(baseStr)
                                        local aestest = core.aes128_decrypt(key, blockdata)
-                                       local hex = utils.ConvertAsciiToBytes(aestest)                                  
+                                       local hex = utils.ConvertAsciiToBytes(aestest)
                                        hex = utils.ConvertBytesToHex(hex)
-                                       blocks[blockNo+1] = ('%02d  :: %s'):format(blockNo,hex)                                 
+                                       blocks[blockNo+1] = ('%02d  :: %s'):format(blockNo,hex)
+                                       io.write(blockNo..',')
                                end             
                        end
                else
@@ -273,5 +274,7 @@ local function main(args)
        print( ('                  UID : 0x%s'):format(uid) )
        print( ('               CARDID : 0x%s'):format(cardid ) )
        print( string.rep('--',20) )
+       
+       core.clearCommandBuffer()
 end
 main(args)
\ No newline at end of file