Merge pull request #969 from pwpiwi/gcc10_fixes

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

diff --git a/client/scripts/tnp3clone.lua b/client/scripts/tnp3clone.lua
index 6c4a148c2e25b57cee40aa5444c4a325cfc60164..9441559b885bc704031dc63f254bef0849fde241 100644 (file)
--- a/client/scripts/tnp3clone.lua
+++ b/client/scripts/tnp3clone.lua
@@ -13,6 +13,7 @@ local band = bit32.band
 example =[[
        script run tnp3clone
        script run tnp3clone -h
 example =[[
        script run tnp3clone
        script run tnp3clone -h

+       script run tnp3clone -l

        script run tnp3clone -t aa00 -s 0030
 
 ]]
        script run tnp3clone -t aa00 -s 0030
 
 ]]


@@ -23,7 +24,8 @@ This script will try making a barebone clone of a tnp3 tag on to a magic generat
 
 Arguments:
        -h             : this help
 
 Arguments:
        -h             : this help

-       -t <data>      : toytype id, 4hex symbols.
+       -l             : list all known toy tokens
+       -t <data>      : toytype id, 4hex symbols

        -s <data>      : subtype id, 4hex symbols               
        
        For fun,  try the following subtype id: 
        -s <data>      : subtype id, 4hex symbols               
        
        For fun,  try the following subtype id: 


@@ -32,7 +34,7 @@ Arguments:
        0138 - Series 2
        0234 - Special
        023c - Special
        0138 - Series 2
        0234 - Special
        023c - Special

-       
+       0020 - Swapforce

 ]]
 
 
 ]]
 
 


@@ -74,7 +76,7 @@ local function readmagicblock( blocknum )
        -- Read block 0
        local CSETBLOCK_SINGLE_OPERATION = 0x1F
        cmd = Command:new{cmd = cmds.CMD_MIFARE_CGETBLOCK, arg1 = CSETBLOCK_SINGLE_OPERATION, arg2 = 0, arg3 = blocknum}
        -- Read block 0
        local CSETBLOCK_SINGLE_OPERATION = 0x1F
        cmd = Command:new{cmd = cmds.CMD_MIFARE_CGETBLOCK, arg1 = CSETBLOCK_SINGLE_OPERATION, arg2 = 0, arg3 = blocknum}

-       err = core.SendCommand(cmd:getBytes())
+       err = core.SendCommand(cmd:getBytes())

        if err then return nil, err end
        local block0, err = waitCmd()
        if err then return nil, err end
        if err then return nil, err end
        local block0, err = waitCmd()
        if err then return nil, err end


@@ -98,12 +100,13 @@ local function main(args)
        local DEBUG = true
        
        -- Arguments for the script
        local DEBUG = true
        
        -- Arguments for the script

-       for o, a in getopt.getopt(args, 'ht:s:') do
+       for o, a in getopt.getopt(args, 'ht:s:l') do

                if o == "h" then return help() end              
                if o == "t" then toytype = a end
                if o == "s" then subtype = a end
                if o == "h" then return help() end              
                if o == "t" then toytype = a end
                if o == "s" then subtype = a end

+               if o == "l" then return toys.List() end

        end
        end

-       
+

        if #toytype ~= 4 then return oops('Wrong size - toytype. (4hex symbols)') end   
        if #subtype ~= 4 then return oops('Wrong size - subtype. (4hex symbols)') end   
 
        if #toytype ~= 4 then return oops('Wrong size - toytype. (4hex symbols)') end   
        if #subtype ~= 4 then return oops('Wrong size - subtype. (4hex symbols)') end   
 


@@ -119,7 +122,7 @@ local function main(args)
 
        
        -- find tag
 
        
        -- find tag

-       result, err = lib14a.read1443a(false)
+       result, err = lib14a.read14443a(false, true)

        if not result then return oops(err)     end
 
        -- load keys
        if not result then return oops(err)     end
 
        -- load keys


@@ -139,8 +142,9 @@ local function main(args)
        -- wipe card.
        local cmd  = (csetuid..'%s 0004 08 w'):format(result.uid)       
        core.console(cmd) 
        -- wipe card.
        local cmd  = (csetuid..'%s 0004 08 w'):format(result.uid)       
        core.console(cmd) 

+
+       local b1 = toytype..string.rep('00',10)..subtype

        
        

-       local b1 = toytype..'00000000000000000000'..subtype

        local calc = utils.Crc16(b0..b1)
        local calcEndian = bor(rsh(calc,8), lsh(band(calc, 0xff), 8))
        
        local calc = utils.Crc16(b0..b1)
        local calcEndian = bor(rsh(calc,8), lsh(band(calc, 0xff), 8))