CHG: the default_toys.lua has the index bytes in mix endiansness. I tried to clean...

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

diff --git a/client/scripts/tnp3clone.lua b/client/scripts/tnp3clone.lua
index 011e0a5729edf5915f573b6eac87230b407c2dd7..8c9397a780ced1a4939d19f8c08e3c5a9d93d5ee 100644 (file)
--- a/client/scripts/tnp3clone.lua
+++ b/client/scripts/tnp3clone.lua
@@ -109,24 +109,28 @@ local function main(args)
                        return oops('failed reading block with chinese magic command.  quitting...')
                end
        end
                        return oops('failed reading block with chinese magic command.  quitting...')
                end
        end

-       local b1 = toytype..'000000000000000000000000'

        
        

+       -- wipe card.
+       local cmd  = (cset..' %s 0004 08 w'):format( b0)        
+       core.console(cmd) 
+
+       
+       local b1 = toytype..'000000000000000000000000'

        local calc = utils.Crc16(b0..b1)
        local calcEndian = bor(rsh(calc,8), lsh(band(calc, 0xff), 8))
        
        local cmd  = (cset..'1 %s%04x'):format( b1, calcEndian) 
        local calc = utils.Crc16(b0..b1)
        local calcEndian = bor(rsh(calc,8), lsh(band(calc, 0xff), 8))
        
        local cmd  = (cset..'1 %s%04x'):format( b1, calcEndian) 

-       core.console( cmd) 
+       core.console(cmd) 

        
        local pos, key
        for blockNo = 2, numBlocks-1, 1 do
                pos = (math.floor( blockNo / 4 ) * 12)+1
                key = akeys:sub(pos, pos + 11 )
        
        local pos, key
        for blockNo = 2, numBlocks-1, 1 do
                pos = (math.floor( blockNo / 4 ) * 12)+1
                key = akeys:sub(pos, pos + 11 )

-               if  blockNo%4 ~= 3 then
-                       cmd =  ('%s %d %s'):format(cset,blockNo,empty) 
-               else
+               if  blockNo%4 == 3 then

                        cmd =  ('%s %d %s%s'):format(cset,blockNo,key,AccAndKeyB) 
                        cmd =  ('%s %d %s%s'):format(cset,blockNo,key,AccAndKeyB) 

-               end
-               core.console(cmd)
+                       core.console(cmd)
+               end             

        end 
        end 

+       core.clearCommandBuffer()

 end
 main(args)
\ No newline at end of file
 end
 main(args)
\ No newline at end of file