FIX: old bug back, and now fixed again. @marshmellow42

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

diff --git a/client/scripts/tnp3dump.lua b/client/scripts/tnp3dump.lua
index 363998fb87ad56e768ce94e03d196f21a9936b2b..211d146fd1c4da89d200ea05d568cb1a3f0a1fa6 100644 (file)
--- a/client/scripts/tnp3dump.lua
+++ b/client/scripts/tnp3dump.lua
@@ -5,8 +5,7 @@ local lib14a = require('read14a')
 local utils = require('utils')
 local md5 = require('md5')
 local dumplib = require('html_dumplib')
-local toyNames = require('default_toys')
-
+local toys = require('default_toys')
 
 example =[[
        script run tnp3dump
@@ -31,9 +30,7 @@ Arguments:
        -p             : Use the precalc to find all keys
        -o             : filename for the saved dumps
 ]]
-
-local HASHCONSTANT = '20436F707972696768742028432920323031302041637469766973696F6E2E20416C6C205269676874732052657365727665642E20'
-
+local RANDOM = '20436F707972696768742028432920323031302041637469766973696F6E2E20416C6C205269676874732052657365727665642E20'
 local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
 local DEBUG = false -- the debug flag
 local numBlocks = 64
@@ -97,16 +94,6 @@ local function waitCmd()
        return nil, "No response from device"
 end
 
-local function computeCrc16(s)
-       local hash = core.crc16(utils.ConvertHexToAscii(s))     
-       return hash
-end
-
-local function reverseCrcBytes(crc)
-       crc2 = crc:sub(3,4)..crc:sub(1,2)
-       return tonumber(crc2,16)
-end
-
 local function main(args)
 
        print( string.rep('--',20) )
@@ -129,7 +116,7 @@ local function main(args)
                if o == "p" then usePreCalc = true end
                if o == "o" then outputTemplate = a end         
        end
-
+       
        -- validate input args.
        keyA =  keyA or '4b0b20107ccb'
        if #(keyA) ~= 12 then
@@ -147,10 +134,6 @@ local function main(args)
 
        core.clearCommandBuffer()
        
-       if 0x01 ~= result.sak then -- NXP MIFARE TNP3xxx
-       --      return oops('This is not a TNP3xxx tag. aborting.')
-       end     
-
        -- Show tag info
        print((' Found tag %s'):format(result.name))
 
@@ -190,6 +173,8 @@ local function main(args)
        local block1, err = waitCmd()
        if err then return oops(err) end
 
+       local tmpHash = block0..block1..'%02x'..RANDOM
+
        local key
        local pos = 0
        local blockNo
@@ -220,22 +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
-                               local base = ('%s%s%02x%s'):format(block0, block1, blockNo, HASHCONSTANT)       
-                               local baseStr = utils.ConvertHexToAscii(base)
-                               local md5hash = md5.sumhexa(baseStr)
-                               local aestest = core.aes(md5hash, blockdata)
-
-                               local hex = utils.ConvertAsciiToBytes(aestest)
-                               hex = utils.ConvertBytesToHex(hex)
-
                                -- 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)
+                                       hex = utils.ConvertBytesToHex(hex)
                                        blocks[blockNo+1] = ('%02d  :: %s'):format(blockNo,hex)
-                                       io.write( blockNo..',')
+                                       io.write(blockNo..',')
                                end             
                        end
                else
@@ -259,36 +241,40 @@ local function main(args)
                emldata = emldata..slice..'\n'
                for c in (str):gmatch('.') do
                        bindata[#bindata+1] = c
-               end
+               end             
        end 
+
+       print( string.rep('--',20) )
        
        local uid = block0:sub(1,8)
-       local itemtype = block1:sub(1,4)
+       local toytype = block1:sub(1,4)
        local cardidLsw = block1:sub(9,16)
        local cardidMsw = block1:sub(16,24)
        local cardid = block1:sub(9,24)
-       local traptype = block1:sub(25,28)
+       local subtype = block1:sub(25,28)
        
        -- Write dump to files
        if not DEBUG then
-               local foo = dumplib.SaveAsBinary(bindata, outputTemplate..'_uid_'..uid..'.bin')
+               local foo = dumplib.SaveAsBinary(bindata, outputTemplate..'-'..uid..'.bin')
                print(("Wrote a BIN dump to:  %s"):format(foo))
-               local bar = dumplib.SaveAsText(emldata, outputTemplate..'_uid_'..uid..'.eml')
+               local bar = dumplib.SaveAsText(emldata, outputTemplate..'-'..uid..'.eml')
                print(("Wrote a EML dump to:  %s"):format(bar))
        end
+       
+       print( string.rep('--',20) )
+       -- Show info 
 
-       local itemtypename = toyNames[itemtype]
-       if itemtypename == nil then
-               itemtypename = toyNames[utils.SwapEndiannessStr(itemtype,16)]
+       local item = toys.Find(toytype, subtype)
+       if item then
+               print(('            ITEM TYPE : %s - %s (%s)'):format(item[6],item[5], item[4]) )
+       else
+               print(('            ITEM TYPE : 0x%s 0x%s'):format(toytype, subtype))
        end
-       -- Show info 
-       print( string.rep('--',20) )
-       print( ('            ITEM TYPE : 0x%s - %s'):format(itemtype, itemtypename) )
-       print( (' Alter ego / traptype : 0x%s'):format(traptype) )
+
        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