FIX: `lf search` - em410x demod was a bit greedy.

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

diff --git a/client/scripts/hard_autopwn.lua b/client/scripts/hard_autopwn.lua
index 3f2ed870da0cdba099ab3663490a4f9ca253f605..d320e1a66d1bfb22de90e80add341da40031c7ab 100644 (file)
--- a/client/scripts/hard_autopwn.lua
+++ b/client/scripts/hard_autopwn.lua
@@ -127,13 +127,11 @@ function main(args)
        -- Turn off Debug
        local cmdSetDbgOff = "hf mf dbg 0"
        core.console( cmdSetDbgOff) 
        -- Turn off Debug
        local cmdSetDbgOff = "hf mf dbg 0"
        core.console( cmdSetDbgOff) 

+       core.clearCommandBuffer()

        -- identify tag
        result, err = lib14a.read1443a(false)
        -- identify tag
        result, err = lib14a.read1443a(false)

-       if not result then
-               return oops(err)
-       end
-       core.clearCommandBuffer()
-       
+       if not result then return oops(err) end
+

        -- Show tag info
        print((' Found tag %s'):format(result.name))
        
        -- Show tag info
        print((' Found tag %s'):format(result.name))
        


@@ -168,7 +166,7 @@ function main(args)
                        -- or actually blockNo and keytype
                        -- just try default for now
                        if sector == 1 and targetkeytype == 0 then
                        -- or actually blockNo and keytype
                        -- just try default for now
                        if sector == 1 and targetkeytype == 0 then

-                               keyA = tonumber(key,16)
+                               keyA = utils.ConvertHexToAscii(key)

                        else
                                local err, foundkey = core.hardnested(blockno, keytype, key, trgblockno, tostring(targetkeytype), trgkey, 0,0,0,0)
                                foundkey = foundkey or ""
                        else
                                local err, foundkey = core.hardnested(blockno, keytype, key, trgblockno, tostring(targetkeytype), trgkey, 0,0,0,0)
                                foundkey = foundkey or ""