FIX: introduced a bug in luascripts when adding the "safe ascii chars" to ConvertHex...

diff --git a/client/lualibs/utils.lua b/client/lualibs/utils.lua
index 9dcb49c7b53abbbf35785089d2de71b6a4dadffa..b86b016bdbeec94eb6e4126e600464993d9d000c 100644 (file)
--- a/client/lualibs/utils.lua
+++ b/client/lualibs/utils.lua
@@ -285,14 +285,15 @@ local Utils =
                return rev\r
        end,\r
        \r
                return rev\r
        end,\r
        \r

-       ConvertHexToAscii = function(s)\r
+       ConvertHexToAscii = function(s, useSafechars)\r

                if s == nil then return '' end\r
                if #s == 0 then return '' end\r
                local t={}\r
                for k in s:gmatch"(%x%x)" do\r
                if s == nil then return '' end\r
                if #s == 0 then return '' end\r
                local t={}\r
                for k in s:gmatch"(%x%x)" do\r

-                       local n = tonumber(k,16)\r
+\r
+                       local n = tonumber(k,16)                \r

                        local c \r
                        local c \r

-                       if  (n < 32) or (n == 127) then\r
+                       if useSafechars and ( (n < 32) or (n == 127) ) then\r

                                c = '.';\r
                        else\r
                                c = string.char(n)\r
                                c = '.';\r
                        else\r
                                c = string.char(n)\r

diff --git a/client/scripts/tnp3dump.lua b/client/scripts/tnp3dump.lua
index f3d377f7129d0d5b8843b3dc6bec24186730e533..613cf5819dcf3ca36fddca4c4bf62c2cfca15bd0 100644 (file)
--- a/client/scripts/tnp3dump.lua
+++ b/client/scripts/tnp3dump.lua
@@ -31,7 +31,7 @@ Arguments:
        -o             : filename for the saved dumps
 ]]
 local RANDOM = '20436F707972696768742028432920323031302041637469766973696F6E2E20416C6C205269676874732052657365727665642E20'
        -o             : filename for the saved dumps
 ]]
 local RANDOM = '20436F707972696768742028432920323031302041637469766973696F6E2E20416C6C205269676874732052657365727665642E20'

-local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
+local TIMEOUT = 2500 -- Shouldn't take longer than 2 seconds

 local DEBUG = false -- the debug flag
 local numBlocks = 64
 local numSectors = 16
 local DEBUG = false -- the debug flag
 local numBlocks = 64
 local numSectors = 16


@@ -80,17 +80,17 @@ local function readdumpkeys(infile)
 end
 
 local function waitCmd()
 end
 
 local function waitCmd()

-       local response = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
+       local response = core.WaitForResponseTimeout(cmds.CMD_ACK, TIMEOUT)

        if response then
        if response then

-               local count,cmd,arg0 = bin.unpack('LL',response)
+               local count, cmd, arg0 = bin.unpack('LL',response)

                if(arg0==1) then
                        local count,arg1,arg2,data = bin.unpack('LLH511',response,count)
                        return data:sub(1,32)
                else
                if(arg0==1) then
                        local count,arg1,arg2,data = bin.unpack('LLH511',response,count)
                        return data:sub(1,32)
                else

-                       return nil, "Couldn't read block.." 
+                       return nil, "Couldn't read block.. ["..arg0.."]"

                end
        end
                end
        end

-       return nil, "No response from device"
+       return nil, 'No response from device'

 end
 
 local function main(args)
 end
 
 local function main(args)


@@ -149,6 +149,7 @@ local function main(args)
        if usePreCalc then
                local pre = require('precalc')
                akeys = pre.GetAll(result.uid)
        if usePreCalc then
                local pre = require('precalc')
                akeys = pre.GetAll(result.uid)

+               dbg(akeys)

        else
                print('Loading dumpkeys.bin')
                local hex, err = utils.ReadDumpFile(input)
        else
                print('Loading dumpkeys.bin')
                local hex, err = utils.ReadDumpFile(input)


@@ -159,7 +160,8 @@ local function main(args)
        end
        
        -- Read block 0
        end
        
        -- Read block 0

-       cmd = Command:new{cmd = cmds.CMD_MIFARE_READBL, arg1 = 0,arg2 = 0,arg3 = 0, data = keyA}
+       dbg('Reading block 0')
+       cmd = Command:new{cmd = cmds.CMD_MIFARE_READBL, arg1 = 0, arg2 = 0, arg3 = 0, data = keyA}

        err = core.SendCommand(cmd:getBytes())
        if err then return oops(err) end
        local block0, err = waitCmd()
        err = core.SendCommand(cmd:getBytes())
        if err then return oops(err) end
        local block0, err = waitCmd()


@@ -168,7 +170,8 @@ local function main(args)
        core.clearCommandBuffer()
        
        -- Read block 1
        core.clearCommandBuffer()
        
        -- Read block 1

-       cmd = Command:new{cmd = cmds.CMD_MIFARE_READBL, arg1 = 1,arg2 = 0,arg3 = 0, data = keyA}
+       dbg('Reading block 1')
+       cmd = Command:new{cmd = cmds.CMD_MIFARE_READBL, arg1 = 1, arg2 = 0, arg3 = 0, data = keyA}

        err = core.SendCommand(cmd:getBytes())
        if err then return oops(err) end
        local block1, err = waitCmd()
        err = core.SendCommand(cmd:getBytes())
        if err then return oops(err) end
        local block1, err = waitCmd()


@@ -187,6 +190,8 @@ local function main(args)
        io.write('Reading blocks > ')
        for blockNo = 0, numBlocks-1, 1 do
 
        io.write('Reading blocks > ')
        for blockNo = 0, numBlocks-1, 1 do
 

+               io.flush()
+               

                if core.ukbhit() then
                        print("aborted by user")
                        break
                if core.ukbhit() then
                        print("aborted by user")
                        break

diff --git a/client/scripts/ufodump.lua b/client/scripts/ufodump.lua
index f1e4be1e90e218f4868d9251edcfb2804cab3759..65d779f021a191c05bd41f0e5adba542d0155d9f 100644 (file)
--- a/client/scripts/ufodump.lua
+++ b/client/scripts/ufodump.lua
@@ -71,7 +71,6 @@ end
 -- @param usbpacket the data received from the device
 function showdata(blockno, data)
        local xorkey = '55AA55AA55AA55AA6262'
 -- @param usbpacket the data received from the device
 function showdata(blockno, data)
        local xorkey = '55AA55AA55AA55AA6262'

-       --local s = data.." | "..utils.ConvertHexToAscii(data).." | "

        local s = data.." | "
        local dex = ''
        local rs 
        local s = data.." | "
        local dex = ''
        local rs 


@@ -86,7 +85,6 @@ function showdata(blockno, data)
                end
                dex = (dex..'%04X'):format(rs)
        end 
                end
                dex = (dex..'%04X'):format(rs)
        end 

-       --s = s..dex.." | "..utils.ConvertHexToAscii(dex)

        s = s..dex.." | "
        print( (" %02d | %s"):format(blockno,s))
 end
        s = s..dex.." | "
        print( (" %02d | %s"):format(blockno,s))
 end