]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhfmf.c
FIX: fixed some compiler warnings about strlen call and sscanf.
[proxmark3-svn] / client / cmdhfmf.c
index 1d516ebc32243f678bcfa17eb6bbcd23861e2d34..ec5d4487ce90068bc63794b2db2f85c5050a570d 100644 (file)
 #include "nonce2key/nonce2key.h"\r
 \r
 static int CmdHelp(const char *Cmd);\r
+int usage_hf14_mifare(void){\r
+       PrintAndLog("Usage:  hf mf mifare [h] <block number>");\r
+       PrintAndLog("options:");\r
+       PrintAndLog("           h    this help");\r
+       PrintAndLog("           <block number>  (Optional) target other key A than block 0.");\r
+       PrintAndLog("sample:");\r
+       PrintAndLog("           hf mf mifare");\r
+       PrintAndLog("           hf mf mifare 16");\r
+       return 0;\r
+}\r
+int usage_hf14_mf1ksim(void){\r
+       PrintAndLog("Usage:  hf mf sim  [h] u <uid (8,14,20 hex symbols)> n <numreads> i x");\r
+       PrintAndLog("options:");\r
+       PrintAndLog("           h    this help");\r
+       PrintAndLog("           u    (Optional) UID 4,7 or 10bytes. If not specified, the UID 4b from emulator memory will be used");\r
+       PrintAndLog("           n    (Optional) Automatically exit simulation after <numreads> blocks have been read by reader. 0 = infinite");\r
+       PrintAndLog("           i    (Optional) Interactive, means that console will not be returned until simulation finishes or is aborted");\r
+       PrintAndLog("           x    (Optional) Crack, performs the 'reader attack', nr/ar attack against a legitimate reader, fishes out the key(s)");\r
+       PrintAndLog("samples:");\r
+       PrintAndLog("           hf mf sim u 0a0a0a0a");\r
+       PrintAndLog("           hf mf sim u 11223344556677");\r
+       PrintAndLog("           hf mf sim u 112233445566778899AA");     \r
+       return 0;\r
+}\r
+int usage_hf14_dbg(void){\r
+       PrintAndLog("Usage:  hf mf dbg [h] <debug level>");\r
+       PrintAndLog("options:");\r
+       PrintAndLog("           h    this help");       \r
+       PrintAndLog("       <debug level>  (Optional) see list for valid levels");\r
+       PrintAndLog("           0 - no debug messages");\r
+       PrintAndLog("           1 - error messages");\r
+       PrintAndLog("           2 - plus information messages");\r
+       PrintAndLog("           3 - plus debug messages");\r
+       PrintAndLog("           4 - print even debug messages in timing critical functions");\r
+       PrintAndLog("               Note: this option therefore may cause malfunction itself");\r
+       PrintAndLog("samples:");\r
+       PrintAndLog("           hf mf dbg 3");\r
+       return 0;\r
+}\r
+int usage_hf14_sniff(void){\r
+       PrintAndLog("It continuously gets data from the field and saves it to: log, emulator, emulator file.");\r
+       PrintAndLog("Usage:  hf mf sniff [h] [l] [d] [f]");\r
+       PrintAndLog("options:");\r
+       PrintAndLog("           h    this help");\r
+       PrintAndLog("           l    save encrypted sequence to logfile `uid.log`");\r
+       PrintAndLog("           d    decrypt sequence and put it to log file `uid.log`");\r
+//     PrintAndLog(" n/a   e     decrypt sequence, collect read and write commands and save the result of the sequence to emulator memory");\r
+       PrintAndLog("           f    decrypt sequence, collect read and write commands and save the result of the sequence to emulator dump file `uid.eml`");\r
+       PrintAndLog("sample:");\r
+       PrintAndLog("           hf mf sniff l d f");\r
+       return 0;\r
+}\r
 \r
-int CmdHF14AMifare(const char *Cmd)\r
-{\r
+int CmdHF14AMifare(const char *Cmd) {\r
        uint32_t uid = 0;\r
        uint32_t nt = 0, nr = 0;\r
        uint64_t par_list = 0, ks_list = 0, r_key = 0;\r
        int16_t isOK = 0;\r
        int tmpchar; \r
+       uint8_t blockNo = 0;\r
        \r
-       UsbCommand c = {CMD_READER_MIFARE, {true, 0, 0}};\r
+       char cmdp = param_getchar(Cmd, 0);      \r
+       if ( cmdp == 'H' || cmdp == 'h') return usage_hf14_mifare();\r
+       \r
+       blockNo = param_get8(Cmd, 0);\r
+       UsbCommand c = {CMD_READER_MIFARE, {true, blockNo, 0}};\r
 \r
        // message\r
        printf("-------------------------------------------------------------------------\n");\r
-       printf("Executing command. Expected execution time: 25sec on average  :-)\n");\r
+       printf("Executing darkside attack. Expected execution time: 25sec on average :-)\n");\r
        printf("Press button on the proxmark3 device to abort both proxmark3 and client.\n");\r
        printf("-------------------------------------------------------------------------\n");\r
-\r
        clock_t t1 = clock();\r
        \r
 start:\r
@@ -54,14 +109,15 @@ start:
                }\r
                \r
                UsbCommand resp;\r
-               if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {\r
+               if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {\r
                        isOK  = resp.arg[0];\r
+                       printf("\n");\r
                        uid = (uint32_t)bytes_to_num(resp.d.asBytes +  0, 4);\r
                        nt =  (uint32_t)bytes_to_num(resp.d.asBytes +  4, 4);\r
                        par_list = bytes_to_num(resp.d.asBytes +  8, 8);\r
                        ks_list = bytes_to_num(resp.d.asBytes +  16, 8);\r
                        nr = bytes_to_num(resp.d.asBytes + 24, 4);\r
-                       printf("\n\n");\r
+\r
                        switch (isOK) {\r
                                case -1 : PrintAndLog("Button pressed. Aborted.\n"); break;\r
                                case -2 : PrintAndLog("Card is not vulnerable to Darkside attack (doesn't send NACK on authentication requests).\n"); break;\r
@@ -73,9 +129,16 @@ start:
                        break;\r
                }\r
        }       \r
-\r
        printf("\n");\r
        \r
+       // par == 0\r
+       if (isOK == -1 && par_list == 0) {\r
+               if (!nonce2key_ex(uid, nt, nr, ks_list, &r_key) ){\r
+                       PrintAndLog("Found valid key: %012"llx" \n", r_key);\r
+                       goto END;\r
+               }\r
+       }\r
+       \r
        // error\r
        if (isOK != 1) return 1;\r
        \r
@@ -87,14 +150,12 @@ start:
                c.arg[0] = false;\r
                goto start;\r
        } else {\r
-               isOK = 0;\r
-               printf("------------------------------------------------------------------\n");\r
                PrintAndLog("Found valid key: %012"llx" \n", r_key);\r
        }\r
+END:\r
        t1 = clock() - t1;\r
-       if ( t1 > 0 ){\r
-               PrintAndLog("Time in darkside: %f ticks - %1.2f sec\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC);\r
-       }\r
+       if ( t1 > 0 )\r
+               PrintAndLog("Time in darkside: %.0f ticks\n", (float)t1);\r
        return 0;\r
 }\r
 \r
@@ -273,8 +334,7 @@ uint8_t NumBlocksPerSector(uint8_t sectorNo)
        }\r
 }\r
 \r
-int CmdHF14AMfDump(const char *Cmd)\r
-{\r
+int CmdHF14AMfDump(const char *Cmd) {\r
        uint8_t sectorNo, blockNo;\r
        \r
        uint8_t keyA[40][6];\r
@@ -446,8 +506,7 @@ int CmdHF14AMfDump(const char *Cmd)
        return 0;\r
 }\r
 \r
-int CmdHF14AMfRestore(const char *Cmd)\r
-{\r
+int CmdHF14AMfRestore(const char *Cmd) {\r
        uint8_t sectorNo,blockNo;\r
        uint8_t keyType = 0;\r
        uint8_t key[6] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};\r
@@ -556,8 +615,7 @@ int CmdHF14AMfRestore(const char *Cmd)
        return 0;\r
 }\r
 \r
-int CmdHF14AMfNested(const char *Cmd)\r
-{\r
+int CmdHF14AMfNested(const char *Cmd) {\r
        int i, j, res, iterations;\r
        sector *e_sector = NULL;\r
        uint8_t blockNo = 0;\r
@@ -566,7 +624,7 @@ int CmdHF14AMfNested(const char *Cmd)
        uint8_t trgKeyType = 0;\r
        uint8_t SectorsCnt = 0;\r
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
-       uint8_t keyBlock[14*6];\r
+       uint8_t keyBlock[6*6];\r
        uint64_t key64 = 0;\r
        bool transferToEml = false;\r
        \r
@@ -586,10 +644,11 @@ int CmdHF14AMfNested(const char *Cmd)
                PrintAndLog("t - transfer keys into emulator memory");\r
                PrintAndLog("d - write keys to binary file");\r
                PrintAndLog(" ");\r
-               PrintAndLog("      sample1: hf mf nested 1 0 A FFFFFFFFFFFF ");\r
-               PrintAndLog("      sample2: hf mf nested 1 0 A FFFFFFFFFFFF t ");\r
-               PrintAndLog("      sample3: hf mf nested 1 0 A FFFFFFFFFFFF d ");\r
-               PrintAndLog("      sample4: hf mf nested o 0 A FFFFFFFFFFFF 4 A");\r
+               PrintAndLog(" samples:");\r
+               PrintAndLog("              hf mf nested 1 0 A FFFFFFFFFFFF ");\r
+               PrintAndLog("              hf mf nested 1 0 A FFFFFFFFFFFF t ");\r
+               PrintAndLog("              hf mf nested 1 0 A FFFFFFFFFFFF d ");\r
+               PrintAndLog("              hf mf nested o 0 A FFFFFFFFFFFF 4 A");\r
                return 0;\r
        }       \r
        \r
@@ -640,40 +699,35 @@ int CmdHF14AMfNested(const char *Cmd)
        transferToEml |= (ctmp == 'd' || ctmp == 'D');\r
        \r
        if (cmdp == 'o') {\r
-               PrintAndLog("--target block no:%3d, target key type:%c ", trgBlockNo, trgKeyType?'B':'A');\r
                int16_t isOK = mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true);\r
-               if (isOK) {\r
-                       switch (isOK) {\r
-                               case -1 : PrintAndLog("Error: No response from Proxmark.\n"); break;\r
-                               case -2 : PrintAndLog("Button pressed. Aborted.\n"); break;\r
-                               case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (random numbers are not predictable).\n"); break;\r
-                               default : PrintAndLog("Unknown Error.\n");\r
-                       }\r
-                       return 2;\r
-               }\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
-                       if (transferToEml) {\r
-                               uint8_t sectortrailer;\r
-                               if (trgBlockNo < 32*4) {        // 4 block sector\r
-                                       sectortrailer = (trgBlockNo & 0x03) + 3;\r
-                               } else {                                        // 16 block sector\r
-                                       sectortrailer = (trgBlockNo & 0x0f) + 15;\r
+               switch (isOK) {\r
+                       case -1 : PrintAndLog("Error: No response from Proxmark.\n"); break;\r
+                       case -2 : PrintAndLog("Button pressed. Aborted.\n"); break;\r
+                       case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (random numbers are not predictable).\n"); break;\r
+                       case -4 : PrintAndLog("No valid key found"); break;\r
+                       case -5 : \r
+                               key64 = bytes_to_num(keyBlock, 6);\r
+\r
+                               // transfer key to the emulator\r
+                               if (transferToEml) {\r
+                                       uint8_t sectortrailer;\r
+                                       if (trgBlockNo < 32*4) {        // 4 block sector\r
+                                               sectortrailer = (trgBlockNo & 0x03) + 3;\r
+                                       } else {                                        // 16 block sector\r
+                                               sectortrailer = (trgBlockNo & 0x0f) + 15;\r
+                                       }\r
+                                       mfEmlGetMem(keyBlock, sectortrailer, 1);\r
+                       \r
+                                       if (!trgKeyType)\r
+                                               num_to_bytes(key64, 6, keyBlock);\r
+                                       else\r
+                                               num_to_bytes(key64, 6, &keyBlock[10]);\r
+                                       mfEmlSetMem(keyBlock, sectortrailer, 1);                \r
                                }\r
-                               mfEmlGetMem(keyBlock, sectortrailer, 1);\r
-               \r
-                               if (!trgKeyType)\r
-                                       num_to_bytes(key64, 6, keyBlock);\r
-                               else\r
-                                       num_to_bytes(key64, 6, &keyBlock[10]);\r
-                               mfEmlSetMem(keyBlock, sectortrailer, 1);                \r
-                       }\r
-               } else {\r
-                       PrintAndLog("No valid key found");\r
+                               return 0;\r
+                       default : PrintAndLog("Unknown Error.\n");\r
                }\r
+               return 2;\r
        }\r
        else { // ------------------------------------  multiple sectors working\r
                clock_t t1 = clock();\r
@@ -688,14 +742,6 @@ int CmdHF14AMfNested(const char *Cmd)
                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
-               num_to_bytes(0x4d3a99c351dd, 6, (uint8_t*)(keyBlock + 6 * 6));\r
-               num_to_bytes(0x1a982c7e459a, 6, (uint8_t*)(keyBlock + 7 * 6));\r
-               num_to_bytes(0xd3f7d3f7d3f7, 6, (uint8_t*)(keyBlock + 8 * 6));\r
-               num_to_bytes(0x714c5c886e97, 6, (uint8_t*)(keyBlock + 9 * 6));\r
-               num_to_bytes(0x587ee5f9350f, 6, (uint8_t*)(keyBlock + 10 * 6));\r
-               num_to_bytes(0xa0478cc39091, 6, (uint8_t*)(keyBlock + 11 * 6));\r
-               num_to_bytes(0x533cb6c723f6, 6, (uint8_t*)(keyBlock + 12 * 6));\r
-               num_to_bytes(0x8fd0a4f256e9, 6, (uint8_t*)(keyBlock + 13 * 6));\r
 \r
                PrintAndLog("Testing known keys. Sector count=%d", SectorsCnt);\r
                for (i = 0; i < SectorsCnt; i++) {\r
@@ -706,54 +752,64 @@ int CmdHF14AMfNested(const char *Cmd)
                                \r
                                if (!res) {\r
                                        e_sector[i].Key[j] = key64;\r
-                                       e_sector[i].foundKey[j] = 1;\r
+                                       e_sector[i].foundKey[j] = TRUE;\r
                                }\r
                        }\r
                }\r
+               clock_t t2 = clock() - t1;\r
+               if ( t2 > 0 )\r
+                       PrintAndLog("Time to check 6 known keys: %.0f ticks", (float)t2 );\r
+\r
+               PrintAndLog("enter nested..."); \r
                \r
                // nested sectors\r
                iterations = 0;\r
-               PrintAndLog("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 (uint8_t sectorNo = 0; sectorNo < SectorsCnt; ++sectorNo) {\r
+                               for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) { \r
+\r
                                        if (e_sector[sectorNo].foundKey[trgKeyType]) continue;\r
-                                       PrintAndLog("-----------------------------------------------");\r
-                                       int16_t isOK = mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate);\r
-                                       if(isOK) {\r
-                                               switch (isOK) {\r
-                                                       case -1 : PrintAndLog("Error: No response from Proxmark.\n"); break;\r
-                                                       case -2 : PrintAndLog("Button pressed. Aborted.\n"); break;\r
-                                                       case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (random numbers are not predictable).\n"); break;\r
-                                                       default : PrintAndLog("Unknown Error.\n");\r
-                                               }\r
-                                               free(e_sector);\r
-                                               return 2;\r
-                                       } else {\r
-                                               calibrate = false;\r
-                                       }\r
                                        \r
-                                       iterations++;\r
-\r
-                                       key64 = bytes_to_num(keyBlock, 6);\r
-                                       if (key64) {\r
-                                               PrintAndLog("Found valid key:%012"llx, key64);\r
-                                               e_sector[sectorNo].foundKey[trgKeyType] = 1;\r
-                                               e_sector[sectorNo].Key[trgKeyType] = key64;\r
+                                       int16_t isOK = mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate);\r
+                                       switch (isOK) {\r
+                                               case -1 : PrintAndLog("Error: No response from Proxmark.\n"); break;\r
+                                               case -2 : PrintAndLog("Button pressed. Aborted.\n"); break;\r
+                                               case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (random numbers are not predictable).\n"); break;\r
+                                               case -4 : //key not found\r
+                                                       calibrate = false;\r
+                                                       iterations++;\r
+                                                       continue; \r
+                                               case -5 :\r
+                                                       calibrate = false;\r
+                                                       iterations++;\r
+                                                       e_sector[sectorNo].foundKey[trgKeyType] = 1;\r
+                                                       e_sector[sectorNo].Key[trgKeyType] = bytes_to_num(keyBlock, 6);\r
+                                                       continue;\r
+                                                       \r
+                                               default : PrintAndLog("Unknown Error.\n");\r
                                        }\r
+                                       free(e_sector);\r
+                                       return 2;\r
                                }\r
                        }\r
                }\r
+               \r
+               t1 = clock() - t1;\r
+               if ( t1 > 0 )\r
+                       PrintAndLog("Time in nested: %.0f ticks \n", (float)t1);\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
+               PrintAndLog("trying to read key B...");\r
                for (i = 0; i < SectorsCnt; i++) {\r
                        // KEY A  but not KEY B\r
                        if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {\r
                                \r
                                uint8_t sectrail = (FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);\r
                                \r
+                               PrintAndLog("Reading block %d", sectrail);\r
+                                                       \r
                                UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}};\r
                                num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A\r
                                clearCommandBuffer();\r
@@ -763,39 +819,21 @@ int CmdHF14AMfNested(const char *Cmd)
                                if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) continue;\r
                                        \r
                                uint8_t isOK  = resp.arg[0] & 0xff;\r
-                               uint8_t *data = resp.d.asBytes;\r
+                               if (!isOK) continue;\r
 \r
-                               if (isOK) {\r
-\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].Key[1] = key64;\r
-                                       }\r
+                               uint8_t *data = resp.d.asBytes;\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] = TRUE;\r
+                                       e_sector[i].Key[1] = key64;\r
                                }\r
                        }\r
                }\r
+\r
                \r
-               t1 = clock() - t1;\r
-               if ( t1 > 0 ) {\r
-                       PrintAndLog("Time in nested: %f ticks %1.2f sec (%1.2f sec per key)\n\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC, ((float)t1)/iterations/CLOCKS_PER_SEC);\r
-               }\r
-               \r
-               PrintAndLog("-----------------------------------------------\nIterations count: %d\n\n", iterations);\r
                //print them\r
-               PrintAndLog("|---|----------------|---|----------------|---|");\r
-               PrintAndLog("|sec|key A           |res|key B           |res|");\r
-               PrintAndLog("|---|----------------|---|----------------|---|");\r
-               for (i = 0; i < SectorsCnt; i++) {\r
-                       PrintAndLog("|%03d|  %012"llx"  | %d |  %012"llx"  | %d |", i,\r
-                               e_sector[i].Key[0], \r
-                               e_sector[i].foundKey[0], \r
-                               e_sector[i].Key[1], \r
-                               e_sector[i].foundKey[1]\r
-                       );\r
-               }\r
-               PrintAndLog("|---|----------------|---|----------------|---|");\r
+               printKeyTable( SectorsCnt, e_sector );\r
                \r
                // transfer them to the emulator\r
                if (transferToEml) {\r
@@ -843,8 +881,7 @@ int CmdHF14AMfNested(const char *Cmd)
        return 0;\r
 }\r
 \r
-int CmdHF14AMfNestedHard(const char *Cmd)\r
-{\r
+int CmdHF14AMfNestedHard(const char *Cmd) {\r
        uint8_t blockNo = 0;\r
        uint8_t keyType = 0;\r
        uint8_t trgBlockNo = 0;\r
@@ -959,8 +996,7 @@ int CmdHF14AMfNestedHard(const char *Cmd)
        return 0;\r
 }\r
 \r
-int CmdHF14AMfChk(const char *Cmd)\r
-{\r
+int CmdHF14AMfChk(const char *Cmd) {\r
        if (strlen(Cmd)<3) {\r
                PrintAndLog("Usage:  hf mf chk <block number>|<*card memory> <key type (A/B/?)> [t|d] [<key (12 hex symbols)>] [<dic (*.dic)>]");\r
                PrintAndLog("          * - all sectors");\r
@@ -979,6 +1015,8 @@ int CmdHF14AMfChk(const char *Cmd)
        uint8_t *keyBlock = NULL, *p;\r
        uint8_t stKeyBlock = 20;\r
        \r
+       sector *e_sector = NULL;\r
+       \r
        int i, res;\r
        int     keycnt = 0;\r
        char ctmp       = 0x00;\r
@@ -987,14 +1025,15 @@ int CmdHF14AMfChk(const char *Cmd)
        uint8_t keyType = 0;\r
        uint64_t key64 = 0;\r
        \r
+       uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};\r
+               \r
        int transferToEml = 0;\r
        int createDumpFile = 0;\r
 \r
        keyBlock = calloc(stKeyBlock, 6);\r
        if (keyBlock == NULL) return 1;\r
 \r
-       uint64_t defaultKeys[] =\r
-       {\r
+       uint64_t defaultKeys[] = {\r
                0xffffffffffff, // Default key (first key used by program if no user defined key)\r
                0x000000000000, // Blank key\r
                0xa0a1a2a3a4a5, // NFCForum MAD key\r
@@ -1012,9 +1051,8 @@ int CmdHF14AMfChk(const char *Cmd)
        int defaultKeysSize = sizeof(defaultKeys) / sizeof(uint64_t);\r
 \r
        for (int defaultKeyCounter = 0; defaultKeyCounter < defaultKeysSize; defaultKeyCounter++)\r
-       {\r
                num_to_bytes(defaultKeys[defaultKeyCounter], 6, (uint8_t*)(keyBlock + defaultKeyCounter * 6));\r
-       }\r
+\r
        \r
        if (param_getchar(Cmd, 0)=='*') {\r
                blockNo = 3;\r
@@ -1025,9 +1063,9 @@ int CmdHF14AMfChk(const char *Cmd)
                        case '4': SectorsCnt = 40; break;\r
                        default:  SectorsCnt = 16;\r
                }\r
-       }\r
-       else\r
+       } else {\r
                blockNo = param_get8(Cmd, 0);\r
+       }\r
        \r
        ctmp = param_getchar(Cmd, 1);\r
        switch (ctmp) { \r
@@ -1061,7 +1099,7 @@ int CmdHF14AMfChk(const char *Cmd)
                                }\r
                                keyBlock = p;\r
                        }\r
-                       PrintAndLog("chk 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
@@ -1101,7 +1139,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
-                                       PrintAndLog("chk 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
@@ -1118,215 +1156,392 @@ int CmdHF14AMfChk(const char *Cmd)
        if (keycnt == 0) {\r
                PrintAndLog("No key specified, trying default keys");\r
                for (;keycnt < defaultKeysSize; keycnt++)\r
-                       PrintAndLog("chk 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
        \r
        // initialize storage for found keys\r
-       bool validKey[2][40];\r
-       uint8_t foundKey[2][40][6];\r
-       for (uint16_t t = 0; t < 2; t++) {\r
-               for (uint16_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {\r
-                       validKey[t][sectorNo] = false;\r
-                       for (uint16_t i = 0; i < 6; i++) {\r
-                               foundKey[t][sectorNo][i] = 0xff;\r
-                       }\r
-               }\r
+       e_sector = calloc(SectorsCnt, sizeof(sector));\r
+       if (e_sector == NULL) {\r
+               free(keyBlock);\r
+               return 1;\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
-       for ( int t = !keyType; t < 2; keyType==2?(t++):(t=2) ) {\r
-               int b=blockNo;\r
+       \r
+       // check keys.\r
+       for (trgKeyType = !keyType;  trgKeyType < 2;  (keyType==2) ? (++trgKeyType) : (trgKeyType=2) ) {\r
+\r
+               int b = blockNo;\r
                for (int i = 0; i < SectorsCnt; ++i) {\r
-                       PrintAndLog("--sector:%2d, block:%3d, key type:%C, key count:%2d ", i, b, t?'B':'A', keycnt);\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, true, size, &keyBlock[6*c], &key64);\r
-                               if (res != 1) {\r
-                                       if (!res) {\r
-                                               PrintAndLog("Found valid key:[%012"llx"]",key64);\r
-                                               num_to_bytes(key64, 6, foundKey[t][i]);\r
-                                               validKey[t][i] = true;\r
-                                       } \r
-                               } else {\r
-                                       PrintAndLog("Command execute timeout");\r
+                       \r
+                       // skip already found keys.\r
+                       if (e_sector[i].foundKey[trgKeyType]) continue;\r
+                       \r
+                       \r
+                       for (uint32_t c = 0; c < keycnt; c += max_keys) {\r
+                               \r
+                               uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c;\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
+                                                                                \r
+                                       e_sector[i].Key[trgKeyType] = key64;\r
+                                       e_sector[i].foundKey[trgKeyType] = TRUE;\r
+                                       break;\r
+                               } else {                                        \r
+                                       e_sector[i].Key[trgKeyType] = 0xffffffffffff;\r
+                                       e_sector[i].foundKey[trgKeyType] = FALSE;\r
                                }\r
+                               printf(".");\r
+                               fflush(stdout);\r
                        }\r
-                       b<127?(b+=4):(b+=16);   \r
+                       b < 127 ? ( b +=4 ) : ( b += 16 );      \r
                }\r
        }\r
        t1 = clock() - t1;\r
-       if ( t1 > 0 ){\r
-               printf("Time in checkkeys: %f 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
+       if ( t1 > 0 )\r
+               printf("\nTime in checkkeys: %.0f ticks\n", (float)t1);\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
+               // KEY A  but not KEY B\r
+               if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {\r
+                                               \r
+                       uint8_t sectrail = (FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);\r
+                       \r
+                       PrintAndLog("Reading block %d", sectrail);\r
+                       \r
+                       UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}};\r
+                       num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A\r
+                       clearCommandBuffer();\r
+                       SendCommand(&c);\r
+\r
+                       UsbCommand resp;\r
+                       if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) continue;\r
+                               \r
+                       uint8_t isOK  = resp.arg[0] & 0xff;\r
+                       if (!isOK) continue;\r
+\r
+                       uint8_t *data = resp.d.asBytes;\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].Key[1] = key64;\r
+                       }\r
+               }\r
        }\r
 \r
+\r
+       //print them\r
+       printKeyTable( SectorsCnt, e_sector );\r
+       \r
        if (transferToEml) {\r
-               uint8_t block[16];\r
-               for (uint16_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {\r
-                       if (validKey[0][sectorNo] || validKey[1][sectorNo]) {\r
-                               mfEmlGetMem(block, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);\r
-                               for (uint16_t t = 0; t < 2; t++) {\r
-                                       if (validKey[t][sectorNo]) {\r
-                                               memcpy(block + t*10, foundKey[t][sectorNo], 6);\r
-                                       }\r
-                               }\r
-                               mfEmlSetMem(block, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);\r
-                       }\r
+               uint8_t block[16] = {0x00};\r
+               for (uint8_t i = 0; i < SectorsCnt; ++i ) {\r
+                       mfEmlGetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);\r
+                       if (e_sector[i].foundKey[0])\r
+                               num_to_bytes(e_sector[i].Key[0], 6, block);\r
+                       if (e_sector[i].foundKey[1])\r
+                               num_to_bytes(e_sector[i].Key[1], 6, block+10);\r
+                       mfEmlSetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);\r
                }\r
                PrintAndLog("Found keys have been transferred to the emulator memory");\r
        }\r
-\r
+       \r
        if (createDumpFile) {\r
                FILE *fkeys = fopen("dumpkeys.bin","wb");\r
                if (fkeys == NULL) { \r
                        PrintAndLog("Could not create file dumpkeys.bin");\r
                        free(keyBlock);\r
+                       free(e_sector);\r
                        return 1;\r
                }\r
-               for (uint16_t t = 0; t < 2; t++) {\r
-                       fwrite(foundKey[t], 1, 6*SectorsCnt, fkeys);\r
+               PrintAndLog("Printing keys to binary file dumpkeys.bin...");\r
+       \r
+               for( i=0; i<SectorsCnt; i++) {\r
+                       num_to_bytes(e_sector[i].Key[0], 6, tempkey);\r
+                       fwrite ( tempkey, 1, 6, fkeys );\r
+               }\r
+               for(i=0; i<SectorsCnt; i++) {\r
+                       num_to_bytes(e_sector[i].Key[1], 6, tempkey);\r
+                       fwrite ( tempkey, 1, 6, fkeys );\r
                }\r
                fclose(fkeys);\r
-               PrintAndLog("Found keys have been dumped to file dumpkeys.bin. 0xffffffffffff has been inserted for unknown keys.");\r
+               PrintAndLog("Found keys have been dumped to file dumpkeys.bin. 0xffffffffffff has been inserted for unknown keys.");                    \r
        }\r
-\r
+       \r
        free(keyBlock);\r
+       free(e_sector);\r
        PrintAndLog("");\r
        return 0;\r
 }\r
 \r
-int CmdHF14AMf1kSim(const char *Cmd)\r
-{\r
-       uint8_t uid[7] = {0, 0, 0, 0, 0, 0, 0};\r
+int CmdHF14AMf1kSim(const char *Cmd) {\r
+       uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};\r
        uint8_t exitAfterNReads = 0;\r
-       uint8_t flags = 0;\r
-       \r
+       uint8_t flags = (FLAG_UID_IN_EMUL | FLAG_4B_UID_IN_DATA);\r
+       int uidlen = 0;\r
+       uint8_t pnr = 0;\r
        uint8_t cmdp = param_getchar(Cmd, 0);\r
 \r
-       if (cmdp == 'h' || cmdp == 'H') {\r
-               PrintAndLog("Usage:  hf mf sim  u <uid (8 hex symbols)> n <numreads> i x");\r
-               PrintAndLog("           h    this help");\r
-               PrintAndLog("           u    (Optional) UID. If not specified, the UID from emulator memory will be used");\r
-               PrintAndLog("           n    (Optional) Automatically exit simulation after <numreads> blocks have been read by reader. 0 = infinite");\r
-               PrintAndLog("           i    (Optional) Interactive, means that console will not be returned until simulation finishes or is aborted");\r
-               PrintAndLog("           x    (Optional) Crack, performs the 'reader attack', nr/ar attack against a legitimate reader, fishes out the key(s)");\r
-               PrintAndLog("");\r
-               PrintAndLog("           sample: hf mf sim u 0a0a0a0a ");\r
-               return 0;\r
-       }\r
-       uint8_t pnr = 0;\r
-       if (param_getchar(Cmd, pnr) == 'u') {\r
-               if(param_gethex(Cmd, pnr+1, uid, 8) == 0)\r
-               {\r
-                       flags |= FLAG_4B_UID_IN_DATA; // UID from packet\r
-               } else if(param_gethex(Cmd,pnr+1,uid,14) == 0) {\r
-                       flags |= FLAG_7B_UID_IN_DATA;// UID from packet\r
-               } else {\r
-                       PrintAndLog("UID, if specified, must include 8 or 14 HEX symbols");\r
-                       return 1;\r
+       if (cmdp == 'h' || cmdp == 'H') return usage_hf14_mf1ksim();\r
+\r
+       cmdp = param_getchar(Cmd, pnr);\r
+       if (cmdp == 'u' || cmdp == 'U') {\r
+               param_gethex_ex(Cmd, pnr+1, uid, &uidlen);\r
+               switch(uidlen){\r
+                       case 20: flags = FLAG_10B_UID_IN_DATA;  break;\r
+                       case 14: flags = FLAG_7B_UID_IN_DATA; break;\r
+                       case  8: flags = FLAG_4B_UID_IN_DATA; break;\r
+                       default: return usage_hf14_mf1ksim();\r
                }\r
                pnr +=2;\r
        }\r
-       \r
-       if (param_getchar(Cmd, pnr) == 'n') {\r
-               exitAfterNReads = param_get8(Cmd,pnr+1);\r
+\r
+       cmdp = param_getchar(Cmd, pnr); \r
+       if (cmdp == 'n' || cmdp == 'N') {\r
+               exitAfterNReads = param_get8(Cmd, pnr+1);\r
                pnr += 2;\r
        }\r
-       \r
-       if (param_getchar(Cmd, pnr) == 'i' ) {\r
-               //Using a flag to signal interactiveness, least significant bit\r
+\r
+       cmdp = param_getchar(Cmd, pnr);         \r
+       if (cmdp == 'i' || cmdp == 'I' ) {\r
                flags |= FLAG_INTERACTIVE;\r
                pnr++;\r
        }\r
 \r
-       if (param_getchar(Cmd, pnr) == 'x' ) {\r
-               //Using a flag to signal interactiveness, least significant bit\r
+       cmdp = param_getchar(Cmd, pnr); \r
+       if (cmdp == 'x' || cmdp == 'X') {\r
                flags |= FLAG_NR_AR_ATTACK;\r
        }\r
        \r
-       PrintAndLog(" uid:%s, numreads:%d, flags:%d (0x%02x) ",\r
-                               flags & FLAG_4B_UID_IN_DATA ? sprint_hex(uid,4):\r
-                                                                                         flags & FLAG_7B_UID_IN_DATA   ? sprint_hex(uid,7): "N/A"\r
+       PrintAndLog(" uid:%s, numreads:%d, flags:%d (0x%02x) "\r
+                               , (uidlen == 0 ) ? "N/A" : sprint_hex(uid, uidlen>>1)\r
                                , exitAfterNReads\r
                                , flags\r
                                , flags);\r
 \r
-\r
-       UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads,0}};\r
+       UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads, 0}};\r
        memcpy(c.d.asBytes, uid, sizeof(uid));\r
        clearCommandBuffer();\r
        SendCommand(&c);\r
 \r
-       if(flags & FLAG_INTERACTIVE)\r
-       {               \r
-               uint8_t data[40];\r
-               uint8_t key[6];\r
-\r
+       if(flags & FLAG_INTERACTIVE) {          \r
+               uint8_t data[32];\r
+               uint64_t key;\r
                UsbCommand resp;                \r
                PrintAndLog("Press pm3-button or send another cmd to abort simulation");\r
-\r
                while( !ukbhit() ){\r
                        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;\r
 \r
                        if ( !(flags & FLAG_NR_AR_ATTACK) ) break;\r
-                       \r
                        if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;\r
 \r
-                               memset(data, 0x00, sizeof(data));\r
-                               memset(key, 0x00, sizeof(key));\r
-                               int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1];\r
-                               \r
-                               memcpy(data, resp.d.asBytes, len);\r
-                               \r
-                               uint64_t corr_uid = 0;\r
-                               \r
-                               // this IF?  what was I thinking of?\r
-                               if ( memcmp(data, "\x00\x00\x00\x00", 4) == 0 ) {\r
-                                       corr_uid = ((uint64_t)(data[3] << 24)) | (data[2] << 16) | (data[1] << 8) | data[0];\r
-                                       tryMfk32(corr_uid, data, key);\r
-                               } else {\r
-                                       corr_uid |= (uint64_t)data[2] << 48; \r
-                                       corr_uid |= (uint64_t)data[1] << 40; \r
-                                       corr_uid |= (uint64_t)data[0] << 32;\r
-                                       corr_uid |= (uint64_t)data[7] << 24;\r
-                                       corr_uid |= (uint64_t)data[6] << 16;\r
-                                       corr_uid |= (uint64_t)data[5] << 8;\r
-                                       corr_uid |= (uint64_t)data[4];\r
-                                       tryMfk64(corr_uid, data, key);\r
-                               }\r
-                       PrintAndLog("--");\r
+                       memset(data, 0x00, sizeof(data));       \r
+                       int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1];\r
+\r
+                       memcpy(data, resp.d.asBytes, len);                      \r
+                       key = 0;\r
+                       bool found = tryMfk32(data, &key);\r
+                       found ^= tryMfk32_moebius(data, &key);\r
+                       if ( found ) break;\r
                }\r
        }\r
        return 0;\r
 }\r
 \r
-int CmdHF14AMfDbg(const char *Cmd)\r
-{\r
-       int dbgMode = param_get32ex(Cmd, 0, 0, 10);\r
-       if (dbgMode > 4) {\r
-               PrintAndLog("Max debug mode parameter is 4 \n");\r
-       }\r
-\r
-       if (strlen(Cmd) < 1 || !param_getchar(Cmd, 0) || dbgMode > 4) {\r
-               PrintAndLog("Usage:  hf mf dbg  <debug level>");\r
-               PrintAndLog(" 0 - no debug messages");\r
-               PrintAndLog(" 1 - error messages");\r
-               PrintAndLog(" 2 - plus information messages");\r
-               PrintAndLog(" 3 - plus debug messages");\r
-               PrintAndLog(" 4 - print even debug messages in timing critical functions");\r
-               PrintAndLog("     Note: this option therefore may cause malfunction itself");\r
-               return 0;\r
-       }       \r
+int CmdHF14AMfSniff(const char *Cmd){\r
+       bool wantLogToFile = FALSE;\r
+       bool wantDecrypt = FALSE;\r
+       //bool wantSaveToEml = FALSE; TODO\r
+       bool wantSaveToEmlFile = FALSE;\r
 \r
-       UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}};\r
+       //var \r
+       int tmpchar;\r
+       int res = 0;\r
+       int len = 0;\r
+       int blockLen = 0;\r
+       int pckNum = 0;\r
+       int num = 0;\r
+       uint8_t uid[10];\r
+       uint8_t uid_len = 0;\r
+       uint8_t atqa[2] = {0x00, 0x00};\r
+       uint8_t sak = 0;\r
+       bool isTag = FALSE;\r
+       uint8_t *buf = NULL;\r
+       uint16_t bufsize = 0;\r
+       uint8_t *bufPtr = NULL;\r
+       uint16_t traceLen = 0;\r
+       \r
+       memset(uid, 0x00, sizeof(uid));\r
+       \r
+       char ctmp = param_getchar(Cmd, 0);\r
+       if ( ctmp == 'h' || ctmp == 'H' ) return usage_hf14_sniff();\r
+       \r
+       for (int i = 0; i < 4; i++) {\r
+               ctmp = param_getchar(Cmd, i);\r
+               if (ctmp == 'l' || ctmp == 'L') wantLogToFile = true;\r
+               if (ctmp == 'd' || ctmp == 'D') wantDecrypt = true;\r
+               //if (ctmp == 'e' || ctmp == 'E') wantSaveToEml = true; TODO\r
+               if (ctmp == 'f' || ctmp == 'F') wantSaveToEmlFile = true;\r
+       }\r
+       \r
+       printf("-------------------------------------------------------------------------\n");\r
+       printf("Executing mifare sniffing command. \n");\r
+       printf("Press the key on the proxmark3 device to abort both proxmark3 and client.\n");\r
+       printf("Press the key on pc keyboard to abort the client.\n");\r
+       printf("-------------------------------------------------------------------------\n");\r
+\r
+       UsbCommand c = {CMD_MIFARE_SNIFFER, {0, 0, 0}};\r
+       clearCommandBuffer();\r
        SendCommand(&c);\r
 \r
+       // wait cycle\r
+       while (true) {\r
+               printf(".");\r
+               fflush(stdout);\r
+               if (ukbhit()) {\r
+                       tmpchar = getchar();\r
+                       (void)tmpchar;\r
+                       printf("\naborted via keyboard!\n");\r
+                       break;\r
+               }\r
+               \r
+               UsbCommand resp;\r
+               if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {\r
+                       res = resp.arg[0] & 0xff;\r
+                       traceLen = resp.arg[1];\r
+                       len = resp.arg[2];\r
+\r
+                       // we are done?\r
+                       if (res == 0) {\r
+                               free(buf);\r
+                               return 0;\r
+                       }\r
+\r
+                       if (res == 1) {                                                         // there is (more) data to be transferred\r
+                               if (pckNum == 0) {                                              // first packet, (re)allocate necessary buffer\r
+                                       if (traceLen > bufsize) {\r
+                                               uint8_t *p;\r
+                                               if (buf == NULL)                                // not yet allocated\r
+                                                       p = malloc(traceLen);\r
+                                               else                                            // need more memory\r
+                                                       p = realloc(buf, traceLen);\r
+                                               \r
+                                               if (p == NULL) {\r
+                                                       PrintAndLog("Cannot allocate memory for trace");\r
+                                                       free(buf);\r
+                                                       return 2;\r
+                                               }\r
+                                               buf = p;\r
+                                       }\r
+                                       bufPtr = buf;\r
+                                       bufsize = traceLen;\r
+                                       memset(buf, 0x00, traceLen);\r
+                               }\r
+                               if (bufPtr == NULL) {\r
+                                       PrintAndLog("Cannot allocate memory for trace");\r
+                                       free(buf);\r
+                                       return 2;\r
+                               }\r
+                               // what happens if LEN is bigger then TRACELEN --iceman\r
+                               memcpy(bufPtr, resp.d.asBytes, len);\r
+                               bufPtr += len;\r
+                               pckNum++;\r
+                       }\r
+\r
+                       if (res == 2) {                                                         // received all data, start displaying\r
+                               blockLen = bufPtr - buf;\r
+                               bufPtr = buf;\r
+                               printf(">\n");\r
+                               PrintAndLog("received trace len: %d packages: %d", blockLen, pckNum);\r
+                               while (bufPtr - buf < blockLen) {\r
+                                       bufPtr += 6;                                            // skip (void) timing information\r
+                                       len = *((uint16_t *)bufPtr);\r
+                                       if(len & 0x8000) {\r
+                                               isTag = true;\r
+                                               len &= 0x7fff;\r
+                                       } else {\r
+                                               isTag = false;\r
+                                       }\r
+                                       bufPtr += 2;\r
+                                       if ((len == 17) && (bufPtr[0] == 0xff) && (bufPtr[1] == 0xff) && (bufPtr[15] == 0xff) && (bufPtr[16] == 0xff)) {\r
+                                               memcpy(uid, bufPtr + 2, 10);\r
+                                               memcpy(atqa, bufPtr + 2 + 10, 2);\r
+                                               switch (atqa[0] & 0xC0) {\r
+                                                       case 0x80: uid_len = 10; break;\r
+                                                       case 0x40: uid_len = 7; break;\r
+                                                       default:   uid_len = 4; break;\r
+                                               }\r
+                                               sak = bufPtr[14];\r
+                                               PrintAndLog("tag select uid| %s atqa:0x%02x%02x sak:0x%02x", \r
+                                                       sprint_hex(uid, uid_len),\r
+                                                       atqa[1], \r
+                                                       atqa[0], \r
+                                                       sak);\r
+                                               if (wantLogToFile || wantDecrypt) {\r
+                                                       FillFileNameByUID(logHexFileName, uid, ".log", uid_len);\r
+                                                       AddLogCurrentDT(logHexFileName);\r
+                                               }                                               \r
+                                               if (wantDecrypt)\r
+                                                       mfTraceInit(uid, uid_len, atqa, sak, wantSaveToEmlFile);\r
+                                       } else {\r
+                                               PrintAndLog("%03d| %s |%s", num, isTag ? "TAG" : "RDR", sprint_hex(bufPtr, len));\r
+                                               if (wantLogToFile) \r
+                                                       AddLogHex(logHexFileName, isTag ? "TAG| ":"RDR| ", bufPtr, len);\r
+                                               if (wantDecrypt) \r
+                                                       mfTraceDecode(bufPtr, len, wantSaveToEmlFile);\r
+                                               num++;  \r
+                                       }\r
+                                       bufPtr += len;\r
+                                       bufPtr += ((len-1)/8+1);        // ignore parity\r
+                               }\r
+                               pckNum = 0;\r
+                       }\r
+               } // resp not NULL\r
+       } // while (true)\r
+\r
+       free(buf);\r
        return 0;\r
 }\r
 \r
+int CmdHF14AMfDbg(const char *Cmd) {\r
+\r
+       char ctmp = param_getchar(Cmd, 0);\r
+       if (strlen(Cmd) < 1  || ctmp == 'h'|| ctmp == 'H') return usage_hf14_dbg();\r
+       \r
+       uint8_t dbgMode = param_get8ex(Cmd, 0, 0, 10);\r
+       if (dbgMode > 4) return usage_hf14_dbg();\r
+\r
+       UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}};\r
+       SendCommand(&c);\r
+       return 0;\r
+}\r
+\r
+void printKeyTable( uint8_t sectorscnt, sector *e_sector ){\r
+       PrintAndLog("|---|----------------|---|----------------|---|");\r
+       PrintAndLog("|sec|key A           |res|key B           |res|");\r
+       PrintAndLog("|---|----------------|---|----------------|---|");\r
+       for (uint8_t i = 0; i < sectorscnt; ++i) {\r
+               PrintAndLog("|%03d|  %012"llx"  | %d |  %012"llx"  | %d |", i,\r
+                       e_sector[i].Key[0], e_sector[i].foundKey[0], \r
+                       e_sector[i].Key[1], e_sector[i].foundKey[1]\r
+               );\r
+       }\r
+       PrintAndLog("|---|----------------|---|----------------|---|");\r
+}\r
+\r
+// EMULATOR COMMANDS\r
+\r
 int CmdHF14AMfEGet(const char *Cmd)\r
 {\r
        uint8_t blockNo = 0;\r
@@ -1656,8 +1871,9 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
        return 0;\r
 }\r
 \r
-int CmdHF14AMfCSetUID(const char *Cmd)\r
-{\r
+// CHINESE MAGIC COMMANDS \r
+\r
+int CmdHF14AMfCSetUID(const char *Cmd) {\r
        uint8_t wipeCard = 0;\r
        uint8_t uid[8] = {0x00};\r
        uint8_t oldUid[8] = {0x00};\r
@@ -1669,11 +1885,13 @@ int CmdHF14AMfCSetUID(const char *Cmd)
        int argi=0;\r
 \r
        if (strlen(Cmd) < 1 || param_getchar(Cmd, argi) == 'h') {\r
-               PrintAndLog("Usage:  hf mf csetuid <UID 8 hex symbols> [ATQA 4 hex symbols SAK 2 hex symbols] [w]");\r
-               PrintAndLog("sample:  hf mf csetuid 01020304");\r
-               PrintAndLog("sample:  hf mf csetuid 01020304 0004 08 w");\r
                PrintAndLog("Set UID, ATQA, and SAK for magic Chinese card (only works with such cards)");\r
                PrintAndLog("If you also want to wipe the card then add 'w' at the end of the command line.");\r
+               PrintAndLog("");\r
+               PrintAndLog("Usage:  hf mf csetuid <UID 8 hex symbols> [ATQA 4 hex symbols SAK 2 hex symbols] [w]");\r
+               PrintAndLog("");\r
+               PrintAndLog("sample:  hf mf csetuid 01020304");\r
+               PrintAndLog("         hf mf csetuid 01020304 0004 08 w");\r
                return 0;\r
        }\r
 \r
@@ -1714,7 +1932,7 @@ int CmdHF14AMfCSetUID(const char *Cmd)
 \r
        PrintAndLog("--wipe card:%s  uid:%s", (wipeCard)?"YES":"NO", sprint_hex(uid, 4));\r
 \r
-       res = mfCSetUID(uid, (atqaPresent)?atqa:NULL, (atqaPresent)?sak:NULL, oldUid, wipeCard);\r
+       res = mfCSetUID(uid, (atqaPresent) ? atqa : NULL, (atqaPresent) ? sak : NULL, oldUid, wipeCard);\r
        if (res) {\r
                        PrintAndLog("Can't set UID. error=%d", res);\r
                        return 1;\r
@@ -1725,8 +1943,7 @@ int CmdHF14AMfCSetUID(const char *Cmd)
        return 0;\r
 }\r
 \r
-int CmdHF14AMfCSetBlk(const char *Cmd)\r
-{\r
+int CmdHF14AMfCSetBlk(const char *Cmd) {\r
        uint8_t block[16] = {0x00};\r
        uint8_t blockNo = 0;\r
        uint8_t params = MAGIC_SINGLE;\r
@@ -1761,8 +1978,7 @@ int CmdHF14AMfCSetBlk(const char *Cmd)
        return 0;\r
 }\r
 \r
-int CmdHF14AMfCLoad(const char *Cmd)\r
-{\r
+int CmdHF14AMfCLoad(const char *Cmd) {\r
        FILE * f;\r
        char filename[FILE_PATH_SIZE];\r
        char * fnameptr = filename;\r
@@ -2025,167 +2241,9 @@ int CmdHF14AMfCSave(const char *Cmd) {
        }\r
 }\r
 \r
-int CmdHF14AMfSniff(const char *Cmd){\r
-\r
-       bool wantLogToFile = 0;\r
-       bool wantDecrypt = 0;\r
-       //bool wantSaveToEml = 0; TODO\r
-       bool wantSaveToEmlFile = 0;\r
-\r
-       //var \r
-       int tmpchar;\r
-       int res = 0;\r
-       int len = 0;\r
-       int blockLen = 0;\r
-       int pckNum = 0;\r
-       int num = 0;\r
-       uint8_t uid[7];\r
-       uint8_t uid_len;\r
-       uint8_t atqa[2] = {0x00};\r
-       uint8_t sak;\r
-       bool isTag;\r
-       uint8_t *buf = NULL;\r
-       uint16_t bufsize = 0;\r
-       uint8_t *bufPtr = NULL;\r
-       \r
-       char ctmp = param_getchar(Cmd, 0);\r
-       if ( ctmp == 'h' || ctmp == 'H' ) {\r
-               PrintAndLog("It continuously gets data from the field and saves it to: log, emulator, emulator file.");\r
-               PrintAndLog("You can specify:");\r
-               PrintAndLog("    l - save encrypted sequence to logfile `uid.log`");\r
-               PrintAndLog("    d - decrypt sequence and put it to log file `uid.log`");\r
-               PrintAndLog(" n/a   e - decrypt sequence, collect read and write commands and save the result of the sequence to emulator memory");\r
-               PrintAndLog("    f - decrypt sequence, collect read and write commands and save the result of the sequence to emulator dump file `uid.eml`");\r
-               PrintAndLog("Usage:  hf mf sniff [l][d][e][f]");\r
-               PrintAndLog("  sample: hf mf sniff l d e");\r
-               return 0;\r
-       }       \r
-       \r
-       for (int i = 0; i < 4; i++) {\r
-               ctmp = param_getchar(Cmd, i);\r
-               if (ctmp == 'l' || ctmp == 'L') wantLogToFile = true;\r
-               if (ctmp == 'd' || ctmp == 'D') wantDecrypt = true;\r
-               //if (ctmp == 'e' || ctmp == 'E') wantSaveToEml = true; TODO\r
-               if (ctmp == 'f' || ctmp == 'F') wantSaveToEmlFile = true;\r
-       }\r
-       \r
-       printf("-------------------------------------------------------------------------\n");\r
-       printf("Executing command. \n");\r
-       printf("Press the key on the proxmark3 device to abort both proxmark3 and client.\n");\r
-       printf("Press the key on pc keyboard to abort the client.\n");\r
-       printf("-------------------------------------------------------------------------\n");\r
-\r
-       UsbCommand c = {CMD_MIFARE_SNIFFER, {0, 0, 0}};\r
-       clearCommandBuffer();\r
-       SendCommand(&c);\r
-\r
-       // wait cycle\r
-       while (true) {\r
-               printf(".");\r
-               fflush(stdout);\r
-               if (ukbhit()) {\r
-                       tmpchar = getchar();\r
-                       (void)tmpchar;\r
-                       printf("\naborted via keyboard!\n");\r
-                       break;\r
-               }\r
-               \r
-               UsbCommand resp;\r
-               if (WaitForResponseTimeout(CMD_ACK,&resp,2000)) {\r
-                       res = resp.arg[0] & 0xff;\r
-                       uint16_t traceLen = resp.arg[1];\r
-                       len = resp.arg[2];\r
-\r
-                       if (res == 0) {\r
-                               free(buf);\r
-                               return 0;                                               // we are done\r
-                       }\r
-\r
-                       if (res == 1) {                                                         // there is (more) data to be transferred\r
-                               if (pckNum == 0) {                                              // first packet, (re)allocate necessary buffer\r
-                                       if (traceLen > bufsize) {\r
-                                               uint8_t *p;\r
-                                               if (buf == NULL) {                              // not yet allocated\r
-                                                       p = malloc(traceLen);\r
-                                               } else {                                                // need more memory\r
-                                                       p = realloc(buf, traceLen);\r
-                                               }\r
-                                               if (p == NULL) {\r
-                                                       PrintAndLog("Cannot allocate memory for trace");\r
-                                                       free(buf);\r
-                                                       return 2;\r
-                                               }\r
-                                               buf = p;\r
-                                       }\r
-                                       bufPtr = buf;\r
-                                       bufsize = traceLen;\r
-                                       memset(buf, 0x00, traceLen);\r
-                               }\r
-                               if (bufPtr == NULL) {\r
-                                       PrintAndLog("Cannot allocate memory for trace");\r
-                                       free(buf);\r
-                                       return 2;\r
-                               }\r
-                               memcpy(bufPtr, resp.d.asBytes, len);\r
-                               bufPtr += len;\r
-                               pckNum++;\r
-                       }\r
-\r
-                       if (res == 2) {                                                         // received all data, start displaying\r
-                               blockLen = bufPtr - buf;\r
-                               bufPtr = buf;\r
-                               printf(">\n");\r
-                               PrintAndLog("received trace len: %d packages: %d", blockLen, pckNum);\r
-                               while (bufPtr - buf < blockLen) {\r
-                                       bufPtr += 6;                                            // skip (void) timing information\r
-                                       len = *((uint16_t *)bufPtr);\r
-                                       if(len & 0x8000) {\r
-                                               isTag = true;\r
-                                               len &= 0x7fff;\r
-                                       } else {\r
-                                               isTag = false;\r
-                                       }\r
-                                       bufPtr += 2;\r
-                                       if ((len == 14) && (bufPtr[0] == 0xff) && (bufPtr[1] == 0xff) && (bufPtr[12] == 0xff) && (bufPtr[13] == 0xff)) {\r
-                                               memcpy(uid, bufPtr + 2, 7);\r
-                                               memcpy(atqa, bufPtr + 2 + 7, 2);\r
-                                               uid_len = (atqa[0] & 0xC0) == 0x40 ? 7 : 4;\r
-                                               sak = bufPtr[11];\r
-                                               PrintAndLog("tag select uid:%s atqa:0x%02x%02x sak:0x%02x", \r
-                                                       sprint_hex(uid + (7 - uid_len), uid_len),\r
-                                                       atqa[1], \r
-                                                       atqa[0], \r
-                                                       sak);\r
-                                               if (wantLogToFile || wantDecrypt) {\r
-                                                       FillFileNameByUID(logHexFileName, uid + (7 - uid_len), ".log", uid_len);\r
-                                                       AddLogCurrentDT(logHexFileName);\r
-                                               }                                               \r
-                                               if (wantDecrypt) \r
-                                                       mfTraceInit(uid, atqa, sak, wantSaveToEmlFile);\r
-                                       } else {\r
-                                               PrintAndLog("%s(%d):%s", isTag ? "TAG":"RDR", num, sprint_hex(bufPtr, len));\r
-                                               if (wantLogToFile) \r
-                                                       AddLogHex(logHexFileName, isTag ? "TAG: ":"RDR: ", bufPtr, len);\r
-                                               if (wantDecrypt) \r
-                                                       mfTraceDecode(bufPtr, len, wantSaveToEmlFile);\r
-                                               num++;  \r
-                                       }\r
-                                       bufPtr += len;\r
-                                       bufPtr += ((len-1)/8+1);        // ignore parity\r
-                               }\r
-                               pckNum = 0;\r
-                       }\r
-               } // resp not NULL\r
-       } // while (true)\r
-\r
-       free(buf);\r
-       return 0;\r
-}\r
-\r
 //needs nt, ar, at, Data to decrypt\r
 int CmdHf14MfDecryptBytes(const char *Cmd){\r
        uint8_t data[50];\r
-       \r
        uint32_t nt     = param_get32ex(Cmd,0,0,16);\r
        uint32_t ar_enc = param_get32ex(Cmd,1,0,16);\r
        uint32_t at_enc = param_get32ex(Cmd,2,0,16);\r
@@ -2234,9 +2292,7 @@ static command_t CommandTable[] = {
 };\r
 \r
 int CmdHFMF(const char *Cmd) {\r
-       // flush\r
        clearCommandBuffer();\r
-       //WaitForResponseTimeout(CMD_ACK,NULL,100);\r
        CmdsParse(CommandTable, Cmd);\r
        return 0;\r
 }\r
Impressum, Datenschutz