restore #755 reverted after #757 (#761)

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

diff --git a/client/scripts/formatMifare.lua b/client/scripts/formatMifare.lua
index 66a61fba9005f29555ae38904470e223bfa5dafb..2861b5426a6c6a710660f035da6eae0a792c4ef2 100644 (file)
--- a/client/scripts/formatMifare.lua
+++ b/client/scripts/formatMifare.lua
@@ -71,7 +71,7 @@ end
 --\r
 -- Read information from a card\r
 function GetCardInfo()\r
 --\r
 -- Read information from a card\r
 function GetCardInfo()\r

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

        if not result then\r
                print(err)\r
                return\r
        if not result then\r
                print(err)\r
                return\r


@@ -92,7 +92,7 @@ function GetCardInfo()
                numSectors = 5\r
        elseif  0x10 == result.sak then -- NXP MIFARE Plus 2k\r
                numSectors = 32\r
                numSectors = 5\r
        elseif  0x10 == result.sak then -- NXP MIFARE Plus 2k\r
                numSectors = 32\r

-       elseif  0x01 == sak then        -- NXP MIFARE TNP3xxx 1K\r
+       elseif  0x01 == result.sak then -- NXP MIFARE TNP3xxx 1K\r

                numSectors = 16\r
        else\r
                print("I don't know how many sectors there are on this type of card, defaulting to 16")\r
                numSectors = 16\r
        else\r
                print("I don't know how many sectors there are on this type of card, defaulting to 16")\r