CHG: added timeouts for downloading values from device, to make the client more respo...

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index c54a0592839854ddb85531063a8a948e6ef44a92..d6cae59f0bfa46101b142cbbc43c842ce4462067 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -707,12 +707,14 @@ int CmdHF14AMfNested(const char *Cmd)
                clock_t t2 = clock() - t1;\r
                if ( t2 > 0 )\r
                        PrintAndLog("Time to check 6 known keys: %.0f ticks %4.2f sec", (float)t2, ((float)t2)/CLOCKS_PER_SEC);\r
                clock_t t2 = clock() - t1;\r
                if ( t2 > 0 )\r
                        PrintAndLog("Time to check 6 known keys: %.0f ticks %4.2f sec", (float)t2, ((float)t2)/CLOCKS_PER_SEC);\r

-       \r
+\r
+               PrintAndLog("enter nested..."); \r

                \r
                // nested sectors\r
                iterations = 0;\r
                PrintAndLog("enter nested...");\r
                bool calibrate = true;\r
                \r
                // nested sectors\r
                iterations = 0;\r
                PrintAndLog("enter nested...");\r
                bool calibrate = true;\r

+\r

                for (i = 0; i < NESTED_SECTOR_RETRY; i++) {\r
                        for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; ++sectorNo) {\r
                                for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) { \r
                for (i = 0; i < NESTED_SECTOR_RETRY; i++) {\r
                        for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; ++sectorNo) {\r
                                for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) { \r


@@ -742,6 +744,10 @@ int CmdHF14AMfNested(const char *Cmd)
                                }\r
                        }\r
                }\r
                                }\r
                        }\r
                }\r

+               \r
+               t1 = clock() - t1;\r
+               if ( t1 > 0 )\r
+                       PrintAndLog("Time in nested: %.0f ticks %4.2f sec (%4.2f sec per key)\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC, ((float)t1)/iterations/CLOCKS_PER_SEC);\r

 \r
                // 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?\r
                PrintAndLog("trying to read key B...");\r
 \r
                // 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?\r
                PrintAndLog("trying to read key B...");\r


@@ -768,15 +774,12 @@ int CmdHF14AMfNested(const char *Cmd)
                                key64 = bytes_to_num(data+10, 6);\r
                                if (key64) {\r
                                        PrintAndLog("Data:%s", sprint_hex(data+10, 6));\r
                                key64 = bytes_to_num(data+10, 6);\r
                                if (key64) {\r
                                        PrintAndLog("Data:%s", sprint_hex(data+10, 6));\r

-                                       e_sector[i].foundKey[1] = 1;\r
+                                       e_sector[i].foundKey[1] = TRUE;\r

                                        e_sector[i].Key[1] = key64;\r
                                }\r
                        }\r
                }\r
                                        e_sector[i].Key[1] = key64;\r
                                }\r
                        }\r
                }\r

-               \r
-               t1 = clock() - t1;\r
-               if ( t1 > 0 )\r
-                       PrintAndLog("Time in nested: %.0f ticks %4.2f sec (%4.2f sec per key)\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC, ((float)t1)/iterations/CLOCKS_PER_SEC);\r
+\r

                \r
                //print them\r
                printKeyTable( SectorsCnt, e_sector );\r
                \r
                //print them\r
                printKeyTable( SectorsCnt, e_sector );\r


@@ -1047,7 +1050,7 @@ int CmdHF14AMfChk(const char *Cmd)
                                }\r
                                keyBlock = p;\r
                        }\r
                                }\r
                                keyBlock = p;\r
                        }\r

-                       PrintAndLog("check key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,\r
+                       PrintAndLog("key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,\r

                        (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],\r
                        (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],     (keyBlock + 6*keycnt)[5], 6);\r
                        keycnt++;\r
                        (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],\r
                        (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],     (keyBlock + 6*keycnt)[5], 6);\r
                        keycnt++;\r


@@ -1087,7 +1090,7 @@ int CmdHF14AMfChk(const char *Cmd)
                                        }\r
                                        memset(keyBlock + 6 * keycnt, 0, 6);\r
                                        num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);\r
                                        }\r
                                        memset(keyBlock + 6 * keycnt, 0, 6);\r
                                        num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);\r

-                                       PrintAndLog("check custom key[%2d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));\r
+                                       PrintAndLog("check key[%2d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));\r

                                        keycnt++;\r
                                        memset(buf, 0, sizeof(buf));\r
                                }\r
                                        keycnt++;\r
                                        memset(buf, 0, sizeof(buf));\r
                                }\r


@@ -1104,7 +1107,7 @@ int CmdHF14AMfChk(const char *Cmd)
        if (keycnt == 0) {\r
                PrintAndLog("No key specified, trying default keys");\r
                for (;keycnt < defaultKeysSize; keycnt++)\r
        if (keycnt == 0) {\r
                PrintAndLog("No key specified, trying default keys");\r
                for (;keycnt < defaultKeysSize; keycnt++)\r

-                       PrintAndLog("check default key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,\r
+                       PrintAndLog("key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,\r

                                (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],\r
                                (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],     (keyBlock + 6*keycnt)[5], 6);\r
        }\r
                                (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],\r
                                (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],     (keyBlock + 6*keycnt)[5], 6);\r
        }\r


@@ -1117,19 +1120,20 @@ int CmdHF14AMfChk(const char *Cmd)
        }\r
 \r
        uint8_t trgKeyType = 0;\r
        }\r
 \r
        uint8_t trgKeyType = 0;\r

+       uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;\r

        \r
        // time\r
        clock_t t1 = clock();\r
        \r
        // check keys.\r
        for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) {\r
        \r
        // time\r
        clock_t t1 = clock();\r
        \r
        // check keys.\r
        for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) {\r

+\r

                int b = blockNo;\r
                for (int i = 0; i < SectorsCnt; ++i) {\r
                        \r
                        // skip already found keys.\r
                        if (e_sector[i].foundKey[trgKeyType]) continue;\r
                        \r
                int b = blockNo;\r
                for (int i = 0; i < SectorsCnt; ++i) {\r
                        \r
                        // skip already found keys.\r
                        if (e_sector[i].foundKey[trgKeyType]) continue;\r
                        \r

-                       uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;\r

                        \r
                        for (uint32_t c = 0; c < keycnt; c += max_keys) {\r
                                \r
                        \r
                        for (uint32_t c = 0; c < keycnt; c += max_keys) {\r
                                \r


@@ -1137,7 +1141,7 @@ int CmdHF14AMfChk(const char *Cmd)
                                \r
                                res = mfCheckKeys(b, trgKeyType, true, size, &keyBlock[6*c], &key64);\r
                                if (!res) {\r
                                \r
                                res = mfCheckKeys(b, trgKeyType, true, size, &keyBlock[6*c], &key64);\r
                                if (!res) {\r

-                                       PrintAndLog("Sector:%3d Block:%3d, key type: %C  -- Found key [%012"llx"]", i, b, trgKeyType ? 'B':'A', key64);\r
+                                       //PrintAndLog("Sector:%3d Block:%3d, key type: %C  -- Found key [%012"llx"]", i, b, trgKeyType ? 'B':'A', key64);\r

                                                                                 \r
                                        e_sector[i].Key[trgKeyType] = key64;\r
                                        e_sector[i].foundKey[trgKeyType] = TRUE;\r
                                                                                 \r
                                        e_sector[i].Key[trgKeyType] = key64;\r
                                        e_sector[i].foundKey[trgKeyType] = TRUE;\r


@@ -1150,6 +1154,11 @@ int CmdHF14AMfChk(const char *Cmd)
                        b < 127 ? ( b +=4 ) : ( b += 16 );      \r
                }\r
        }\r
                        b < 127 ? ( b +=4 ) : ( b += 16 );      \r
                }\r
        }\r

+       \r
+       t1 = clock() - t1;\r
+       if ( t1 > 0 )\r
+               printf("Time in checkkeys: %.0f ticks  %1.2f sec (%1.2f sec per key)\n\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC, ((float)t1)/keycnt/CLOCKS_PER_SEC);\r
+\r

        // 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?\r
        PrintAndLog("testing to read B...");\r
        for (i = 0; i < SectorsCnt; i++) {\r
        // 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?\r
        PrintAndLog("testing to read B...");\r
        for (i = 0; i < SectorsCnt; i++) {\r


@@ -1180,10 +1189,7 @@ int CmdHF14AMfChk(const char *Cmd)
                        }\r
                }\r
        }\r
                        }\r
                }\r
        }\r

-       \r
-       t1 = clock() - t1;\r
-       if ( t1 > 0 )\r
-               printf("Time in checkkeys: %.0f ticks  %1.2f sec (%1.2f sec per key)\n\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC, ((float)t1)/keycnt/CLOCKS_PER_SEC);\r
+\r

 \r
        //print them\r
        printKeyTable( SectorsCnt, e_sector );\r
 \r
        //print them\r
        printKeyTable( SectorsCnt, e_sector );\r