Implemented parameter passing into script, added a minimal getop-parser, added an...

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 96eb800782a3fc1110eca30191d1efc741a06a05..956bbc0efd8ea4d636943b8a2d5dcc2dcf96c8a2 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -500,7 +500,7 @@ int CmdHF14AMfNested(const char *Cmd)
        uint8_t blDiff = 0;\r
        int  SectorsCnt = 0;\r
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
        uint8_t blDiff = 0;\r
        int  SectorsCnt = 0;\r
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r

-       uint8_t keyBlock[16 * 6];\r
+       uint8_t keyBlock[6*6];\r

        uint64_t key64 = 0;\r
        int transferToEml = 0;\r
        \r
        uint64_t key64 = 0;\r
        int transferToEml = 0;\r
        \r


@@ -572,20 +572,12 @@ int CmdHF14AMfNested(const char *Cmd)
                PrintAndLog("--target block no:%02x target key type:%02x ", trgBlockNo, trgKeyType);\r
 \r
        if (cmdp == 'o') {\r
                PrintAndLog("--target block no:%02x target key type:%02x ", trgBlockNo, trgKeyType);\r
 \r
        if (cmdp == 'o') {\r

-               if (mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock)) {\r
+               if (mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true)) {\r

                        PrintAndLog("Nested error.");\r
                        return 2;\r
                }\r
                        PrintAndLog("Nested error.");\r
                        return 2;\r
                }\r

-\r
-               for (i = 0; i < 16; i++) {\r
-                       PrintAndLog("count=%d key= %s", i, sprint_hex(keyBlock + i * 6, 6));\r
-               }\r
-       \r
-               // test keys\r
-               res = mfCheckKeys(trgBlockNo, trgKeyType, 8, keyBlock, &key64);\r
-               if (res)\r
-                       res = mfCheckKeys(trgBlockNo, trgKeyType, 8, &keyBlock[6 * 8], &key64);\r
-               if (!res) {\r
+               key64 = bytes_to_num(keyBlock, 6);\r
+               if (key64) {\r

                        PrintAndLog("Found valid key:%012"llx, key64);\r
 \r
                        // transfer key to the emulator\r
                        PrintAndLog("Found valid key:%012"llx, key64);\r
 \r
                        // transfer key to the emulator\r


@@ -603,6 +595,9 @@ int CmdHF14AMfNested(const char *Cmd)
                }\r
        }\r
        else { // ------------------------------------  multiple sectors working\r
                }\r
        }\r
        else { // ------------------------------------  multiple sectors working\r

+               clock_t time1;\r
+               time1 = clock();\r
+\r

                blDiff = blockNo % 4;\r
                PrintAndLog("Block shift=%d", blDiff);\r
                e_sector = calloc(SectorsCnt, sizeof(sector));\r
                blDiff = blockNo % 4;\r
                PrintAndLog("Block shift=%d", blDiff);\r
                e_sector = calloc(SectorsCnt, sizeof(sector));\r


@@ -610,10 +605,10 @@ int CmdHF14AMfNested(const char *Cmd)
                \r
                //test current key 4 sectors\r
                memcpy(keyBlock, key, 6);\r
                \r
                //test current key 4 sectors\r
                memcpy(keyBlock, key, 6);\r

-               num_to_bytes(0xa0a1a2a3a4a5, 6, (uint8_t*)(keyBlock + 1 * 6));\r
-               num_to_bytes(0xb0b1b2b3b4b5, 6, (uint8_t*)(keyBlock + 2 * 6));\r
-               num_to_bytes(0xffffffffffff, 6, (uint8_t*)(keyBlock + 3 * 6));\r
-               num_to_bytes(0x000000000000, 6, (uint8_t*)(keyBlock + 4 * 6));\r
+               num_to_bytes(0xffffffffffff, 6, (uint8_t*)(keyBlock + 1 * 6));\r
+               num_to_bytes(0x000000000000, 6, (uint8_t*)(keyBlock + 2 * 6));\r
+               num_to_bytes(0xa0a1a2a3a4a5, 6, (uint8_t*)(keyBlock + 3 * 6));\r
+               num_to_bytes(0xb0b1b2b3b4b5, 6, (uint8_t*)(keyBlock + 4 * 6));\r

                num_to_bytes(0xaabbccddeeff, 6, (uint8_t*)(keyBlock + 5 * 6));\r
 \r
                PrintAndLog("Testing known keys. Sector count=%d", SectorsCnt);\r
                num_to_bytes(0xaabbccddeeff, 6, (uint8_t*)(keyBlock + 5 * 6));\r
 \r
                PrintAndLog("Testing known keys. Sector count=%d", SectorsCnt);\r


@@ -628,32 +623,41 @@ int CmdHF14AMfNested(const char *Cmd)
                                        e_sector[i].foundKey[j] = 1;\r
                                }\r
                        }\r
                                        e_sector[i].foundKey[j] = 1;\r
                                }\r
                        }\r

-               } \r
+               }\r
+               \r

                \r
                // nested sectors\r
                iterations = 0;\r
                PrintAndLog("nested...");\r
                \r
                // nested sectors\r
                iterations = 0;\r
                PrintAndLog("nested...");\r

+               bool calibrate = true;\r

                for (i = 0; i < NESTED_SECTOR_RETRY; i++) {\r
                for (i = 0; i < NESTED_SECTOR_RETRY; i++) {\r

-                       for (trgBlockNo = blDiff; trgBlockNo < SectorsCnt * 4; trgBlockNo = trgBlockNo + 4) \r
+                       for (trgBlockNo = blDiff; trgBlockNo < SectorsCnt * 4; trgBlockNo = trgBlockNo + 4) {\r

                                for (trgKeyType = 0; trgKeyType < 2; trgKeyType++) { \r
                                        if (e_sector[trgBlockNo / 4].foundKey[trgKeyType]) continue;\r
                                for (trgKeyType = 0; trgKeyType < 2; trgKeyType++) { \r
                                        if (e_sector[trgBlockNo / 4].foundKey[trgKeyType]) continue;\r

-                                       if (mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock)) continue;\r
+                                       PrintAndLog("-----------------------------------------------");\r
+                                       if(mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, calibrate)) {\r
+                                               PrintAndLog("Nested error.\n");\r
+                                               return 2;\r
+                                       }\r
+                                       else {\r
+                                               calibrate = false;\r
+                                       }\r

                                        \r
                                        iterations++;\r
                                        \r
                                        iterations++;\r

-                                       \r
-                                       //try keys from nested\r
-                                       res = mfCheckKeys(trgBlockNo, trgKeyType, 8, keyBlock, &key64);\r
-                                       if (res)\r
-                                               res = mfCheckKeys(trgBlockNo, trgKeyType, 8, &keyBlock[6 * 8], &key64);\r
-                                       if (!res) {\r
+\r
+                                       key64 = bytes_to_num(keyBlock, 6);\r
+                                       if (key64) {\r

                                                PrintAndLog("Found valid key:%012"llx, key64);\r
                                                e_sector[trgBlockNo / 4].foundKey[trgKeyType] = 1;\r
                                                e_sector[trgBlockNo / 4].Key[trgKeyType] = key64;\r
                                        }\r
                                }\r
                                                PrintAndLog("Found valid key:%012"llx, key64);\r
                                                e_sector[trgBlockNo / 4].foundKey[trgKeyType] = 1;\r
                                                e_sector[trgBlockNo / 4].Key[trgKeyType] = key64;\r
                                        }\r
                                }\r

+                       }\r

                }\r
 \r
                }\r
 \r

-               PrintAndLog("Iterations count: %d", iterations);\r
+               printf("Time in nested: %1.3f (%1.3f sec per key)\n\n", ((float)clock() - time1)/1000.0, ((float)clock() - time1)/iterations/1000.0);\r
+               \r
+               PrintAndLog("-----------------------------------------------\nIterations count: %d\n\n", iterations);\r

                //print them\r
                PrintAndLog("|---|----------------|---|----------------|---|");\r
                PrintAndLog("|sec|key A           |res|key B           |res|");\r
                //print them\r
                PrintAndLog("|---|----------------|---|----------------|---|");\r
                PrintAndLog("|sec|key A           |res|key B           |res|");\r


@@ -830,16 +834,16 @@ int CmdHF14AMfChk(const char *Cmd)
                                while( !feof(f) ){\r
                                        memset(buf, 0, sizeof(buf));\r
                                        if (fgets(buf, sizeof(buf), f) == NULL) {\r
                                while( !feof(f) ){\r
                                        memset(buf, 0, sizeof(buf));\r
                                        if (fgets(buf, sizeof(buf), f) == NULL) {\r

-            PrintAndLog("File reading error.");\r
-            return 2;\r
-          }\r
+                                               PrintAndLog("File reading error.");\r
+                                               return 2;\r
+                                       }\r

           \r
                                        if (strlen(buf) < 12 || buf[11] == '\n')\r
                                                continue;\r
                                \r
                                        while (fgetc(f) != '\n' && !feof(f)) ;  //goto next line\r
                                        \r
           \r
                                        if (strlen(buf) < 12 || buf[11] == '\n')\r
                                                continue;\r
                                \r
                                        while (fgetc(f) != '\n' && !feof(f)) ;  //goto next line\r
                                        \r

-                                       if( buf[0]=='#' ) continue;     //The line start with # is remcommnet,skip\r
+                                       if( buf[0]=='#' ) continue;     //The line start with # is comment, skip\r

 \r
                                        if (!isxdigit(buf[0])){\r
                                                PrintAndLog("File content error. '%s' must include 12 HEX symbols",buf);\r
 \r
                                        if (!isxdigit(buf[0])){\r
                                                PrintAndLog("File content error. '%s' must include 12 HEX symbols",buf);\r


@@ -883,10 +887,10 @@ int CmdHF14AMfChk(const char *Cmd)
                int b=blockNo;\r
                for (int i=0; i<SectorsCnt; ++i) {\r
                        PrintAndLog("--SectorsCnt:%d block no:0x%02x key type:%C key count:%d ", i,      b, t?'B':'A', keycnt);\r
                int b=blockNo;\r
                for (int i=0; i<SectorsCnt; ++i) {\r
                        PrintAndLog("--SectorsCnt:%d block no:0x%02x key type:%C key count:%d ", i,      b, t?'B':'A', keycnt);\r

-                       int size = keycnt>8?8:keycnt;\r
-                       for (int c = 0; c < keycnt; c+=size) {\r
-                               size=keycnt-c>8?8:keycnt-c;                     \r
-                               res = mfCheckKeys(b, t, size, keyBlock +6*c, &key64);\r
+                       uint32_t max_keys = keycnt>USB_CMD_DATA_SIZE/6?USB_CMD_DATA_SIZE/6:keycnt;\r
+                       for (uint32_t c = 0; c < keycnt; c+=max_keys) {\r
+                               uint32_t size = keycnt-c>max_keys?max_keys:keycnt-c;\r
+                               res = mfCheckKeys(b, t, size, &keyBlock[6*c], &key64);\r

                                if (res !=1) {\r
                                        if (!res) {\r
                                                PrintAndLog("Found valid key:[%012"llx"]",key64);\r
                                if (res !=1) {\r
                                        if (!res) {\r
                                                PrintAndLog("Found valid key:[%012"llx"]",key64);\r


@@ -896,11 +900,6 @@ int CmdHF14AMfChk(const char *Cmd)
                                                        num_to_bytes(key64, 6, block + t*10);\r
                                                        mfEmlSetMem(block, get_trailer_block(b), 1);\r
                                                }\r
                                                        num_to_bytes(key64, 6, block + t*10);\r
                                                        mfEmlSetMem(block, get_trailer_block(b), 1);\r
                                                }\r

-                                               break;\r
-                                       }\r
-                                       else {\r
-                                               printf("Not found yet, keycnt:%d\r", c+size);\r
-                                               fflush(stdout);\r

                                        }\r
                                } else {\r
                                        PrintAndLog("Command execute timeout");\r
                                        }\r
                                } else {\r
                                        PrintAndLog("Command execute timeout");\r