]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhfmf.c
FIX: Some Coverity Scan warnings. fread, not initialised etc etc
[proxmark3-svn] / client / cmdhfmf.c
index 6273a1d12978e35006b8e7f49086507ed1a69400..67d2ab67713b64c0f71390e591c08d5935c8ff46 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("samples:");\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
+int usage_hf14_nested(void){\r
+       PrintAndLog("Usage:");\r
+       PrintAndLog(" all sectors:  hf mf nested  <card memory> <block number> <key A/B> <key (12 hex symbols)> [t,d]");\r
+       PrintAndLog(" one sector:   hf mf nested  o <block number> <key A/B> <key (12 hex symbols)>");\r
+       PrintAndLog("               <target block number> <target key A/B> [t]");\r
+       PrintAndLog("options:");\r
+       PrintAndLog("      h    this help");\r
+       PrintAndLog("      card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");\r
+       PrintAndLog("      t    transfer keys into emulator memory");\r
+       PrintAndLog("      d    write keys to binary file");\r
+       PrintAndLog(" ");\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
+int usage_hf14_hardnested(void){\r
+       PrintAndLog("Usage:");\r
+       PrintAndLog("      hf mf hardnested <block number> <key A|B> <key (12 hex symbols)>");\r
+       PrintAndLog("                       <target block number> <target key A|B> [known target key (12 hex symbols)] [w] [s]");\r
+       PrintAndLog("  or  hf mf hardnested r [known target key]");\r
+       PrintAndLog(" ");\r
+       PrintAndLog("options:");\r
+       PrintAndLog("      h    this help");    \r
+       PrintAndLog("      w    acquire nonces and write them to binary file nonces.bin");\r
+       PrintAndLog("      s    slower acquisition (required by some non standard cards)");\r
+       PrintAndLog("      r    read nonces.bin and start attack");\r
+       PrintAndLog("      t    tests?");\r
+       PrintAndLog(" ");\r
+       PrintAndLog("samples:");\r
+       PrintAndLog("      hf mf hardnested 0 A FFFFFFFFFFFF 4 A");\r
+       PrintAndLog("      hf mf hardnested 0 A FFFFFFFFFFFF 4 A w");\r
+       PrintAndLog("      hf mf hardnested 0 A FFFFFFFFFFFF 4 A w s");\r
+       PrintAndLog("      hf mf hardnested r");\r
+       PrintAndLog("      hf mf hardnested r a0a1a2a3a4a5");\r
+       PrintAndLog(" ");\r
+       PrintAndLog("Add the known target key to check if it is present in the remaining key space:");\r
+       PrintAndLog("      sample5: hf mf hardnested 0 A A0A1A2A3A4A5 4 A FFFFFFFFFFFF");\r
+       return 0;\r
+}\r
+int usage_hf14_chk(void){\r
+       PrintAndLog("Usage:  hf mf chk <block number>|<*card memory> <key type (A/B/?)> [t|d] [<key (12 hex symbols)>] [<dic (*.dic)>]");\r
+       PrintAndLog("options:");\r
+       PrintAndLog("      h    this help");    \r
+       PrintAndLog("      *    all sectors");\r
+       PrintAndLog("      card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");\r
+       PrintAndLog("      d    write keys to binary file");\r
+       PrintAndLog("      t    write keys to emulator memory\n");\r
+       PrintAndLog(" ");\r
+       PrintAndLog("samples:");\r
+       PrintAndLog("      hf mf chk 0 A 1234567890ab keys.dic");\r
+       PrintAndLog("      hf mf chk *1 ? t");\r
+       PrintAndLog("      hf mf chk *1 ? d");\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
@@ -24,22 +132,19 @@ int CmdHF14AMifare(const char *Cmd)
        uint8_t blockNo = 0;\r
        \r
        char cmdp = param_getchar(Cmd, 0);      \r
-       if ( cmdp == 'H' || cmdp == 'h') {\r
-               PrintAndLog("Usage:  hf mf mifare <block number>");\r
-               PrintAndLog("        sample: hf mf mifare 0");\r
-               return 0;\r
-       }       \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
+       time_t start, end;\r
+       time(&start);\r
        \r
 start:\r
     clearCommandBuffer();\r
@@ -65,26 +170,34 @@ start:
                UsbCommand resp;\r
                if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {\r
                        isOK  = resp.arg[0];\r
-                       printf("\n\n");\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
-                               case -3 : PrintAndLog("Card is not vulnerable to Darkside attack (its random number generator is not predictable).\n"); break;\r
-                               case -4 : PrintAndLog("Card is not vulnerable to Darkside attack (its random number generator seems to be based on the wellknown");\r
-                                                 PrintAndLog("generating polynomial with 16 effective bits only, but shows unexpected behaviour.\n"); break;\r
-                               default: ;\r
-                       }\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
+\r
+                       switch (isOK) {\r
+                               case -1 : PrintAndLog("Button pressed. Aborted.\n"); break;\r
+                               case -2 : PrintAndLog("Card isn't vulnerable to Darkside attack (doesn't send NACK on authentication requests).\n"); break;\r
+                               case -3 : PrintAndLog("Card isn't vulnerable to Darkside attack (its random number generator is not predictable).\n"); break;\r
+                               case -4 : PrintAndLog("Card isn't vulnerable to Darkside attack (its random number generator seems to be based on the wellknown");\r
+                                                 PrintAndLog("generating polynomial with 16 effective bits only, but shows unexpected behaviour.\n"); break;\r
+                               default: ;\r
+                       }\r
                        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
@@ -98,15 +211,16 @@ start:
        } else {\r
                PrintAndLog("Found valid key: %012"llx" \n", r_key);\r
        }\r
-       \r
+END:\r
        t1 = clock() - t1;\r
+       time(&end);\r
+       unsigned long elapsed_time = difftime(end, start);      \r
        if ( t1 > 0 )\r
-               PrintAndLog("Time in darkside: %.0f ticks\n", (float)t1);\r
+               PrintAndLog("Time in darkside: %.0f ticks %u seconds\n", (float)t1, elapsed_time);\r
        return 0;\r
 }\r
 \r
-int CmdHF14AMfWrBl(const char *Cmd)\r
-{\r
+int CmdHF14AMfWrBl(const char *Cmd) {\r
        uint8_t blockNo = 0;\r
        uint8_t keyType = 0;\r
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
@@ -155,8 +269,7 @@ int CmdHF14AMfWrBl(const char *Cmd)
        return 0;\r
 }\r
 \r
-int CmdHF14AMfRdBl(const char *Cmd)\r
-{\r
+int CmdHF14AMfRdBl(const char *Cmd) {\r
        uint8_t blockNo = 0;\r
        uint8_t keyType = 0;\r
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
@@ -204,8 +317,7 @@ int CmdHF14AMfRdBl(const char *Cmd)
   return 0;\r
 }\r
 \r
-int CmdHF14AMfRdSc(const char *Cmd)\r
-{\r
+int CmdHF14AMfRdSc(const char *Cmd) {\r
        int i;\r
        uint8_t sectorNo = 0;\r
        uint8_t keyType = 0;\r
@@ -262,8 +374,7 @@ int CmdHF14AMfRdSc(const char *Cmd)
   return 0;\r
 }\r
 \r
-uint8_t FirstBlockOfSector(uint8_t sectorNo)\r
-{\r
+uint8_t FirstBlockOfSector(uint8_t sectorNo) {\r
        if (sectorNo < 32) {\r
                return sectorNo * 4;\r
        } else {\r
@@ -271,8 +382,7 @@ uint8_t FirstBlockOfSector(uint8_t sectorNo)
        }\r
 }\r
 \r
-uint8_t NumBlocksPerSector(uint8_t sectorNo)\r
-{\r
+uint8_t NumBlocksPerSector(uint8_t sectorNo) {\r
        if (sectorNo < 32) {\r
                return 4;\r
        } else {\r
@@ -280,8 +390,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
@@ -453,8 +562,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
@@ -563,8 +671,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
@@ -581,30 +688,14 @@ int CmdHF14AMfNested(const char *Cmd)
        FILE *fkeys;\r
        uint8_t standart[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};\r
        uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};\r
-       \r
-       char cmdp, ctmp;\r
 \r
-       if (strlen(Cmd)<3) {\r
-               PrintAndLog("Usage:");\r
-               PrintAndLog(" all sectors:  hf mf nested  <card memory> <block number> <key A/B> <key (12 hex symbols)> [t,d]");\r
-               PrintAndLog(" one sector:   hf mf nested  o <block number> <key A/B> <key (12 hex symbols)>");\r
-               PrintAndLog("               <target block number> <target key A/B> [t]");\r
-               PrintAndLog("card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");\r
-               PrintAndLog("t - transfer keys into emulator memory");\r
-               PrintAndLog("d - write keys to binary file");\r
-               PrintAndLog(" ");\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
+       if (strlen(Cmd)<3) return usage_hf14_nested();\r
        \r
+       char cmdp, ctmp;\r
        cmdp = param_getchar(Cmd, 0);\r
        blockNo = param_get8(Cmd, 1);\r
        ctmp = param_getchar(Cmd, 2);\r
-       \r
+\r
        if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {\r
                PrintAndLog("Key type must be A or B");\r
                return 1;\r
@@ -652,7 +743,7 @@ int CmdHF14AMfNested(const char *Cmd)
                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 -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (its random number generator is not predictable).\n"); break;\r
                        case -4 : PrintAndLog("No valid key found"); break;\r
                        case -5 : \r
                                key64 = bytes_to_num(keyBlock, 6);\r
@@ -680,7 +771,10 @@ int CmdHF14AMfNested(const char *Cmd)
        }\r
        else { // ------------------------------------  multiple sectors working\r
                clock_t t1 = clock();\r
-\r
+               unsigned long elapsed_time;\r
+               time_t start, end;\r
+               time(&start);\r
+               \r
                e_sector = calloc(SectorsCnt, sizeof(sector));\r
                if (e_sector == NULL) return 1;\r
                \r
@@ -706,9 +800,11 @@ int CmdHF14AMfNested(const char *Cmd)
                        }\r
                }\r
                clock_t t2 = clock() - t1;\r
+               time(&end);\r
+               elapsed_time = difftime(end, start);    \r
                if ( t2 > 0 )\r
-                       PrintAndLog("Time to check 6 known keys: %.0f ticks", (float)t2 );\r
-\r
+                       PrintAndLog("Time to check 6 known keys: %.0f ticks %u seconds\n", (float)t2 , elapsed_time);\r
+               \r
                PrintAndLog("enter nested..."); \r
                \r
                // nested sectors\r
@@ -725,7 +821,7 @@ int CmdHF14AMfNested(const char *Cmd)
                                        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 -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (its random number generator is not predictable).\n"); break;\r
                                                case -4 : //key not found\r
                                                        calibrate = false;\r
                                                        iterations++;\r
@@ -746,8 +842,11 @@ int CmdHF14AMfNested(const char *Cmd)
                }\r
                \r
                t1 = clock() - t1;\r
+               time(&end);\r
+               elapsed_time = difftime(end, start);    \r
                if ( t1 > 0 )\r
-                       PrintAndLog("Time in nested: %.0f ticks \n", (float)t1);\r
+                       PrintAndLog("Time in nested: %.0f ticks %u seconds\n", (float)t1, elapsed_time);\r
+\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
@@ -830,8 +929,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
@@ -841,27 +939,8 @@ int CmdHF14AMfNestedHard(const char *Cmd)
        \r
        char ctmp;\r
        ctmp = param_getchar(Cmd, 0);\r
-\r
-       if (ctmp != 'R' && ctmp != 'r' && ctmp != 'T' && ctmp != 't' && strlen(Cmd) < 20) {\r
-               PrintAndLog("Usage:");\r
-               PrintAndLog("      hf mf hardnested <block number> <key A|B> <key (12 hex symbols)>");\r
-               PrintAndLog("                       <target block number> <target key A|B> [known target key (12 hex symbols)] [w] [s]");\r
-               PrintAndLog("  or  hf mf hardnested r [known target key]");\r
-               PrintAndLog(" ");\r
-               PrintAndLog("Options: ");\r
-               PrintAndLog("      w: Acquire nonces and write them to binary file nonces.bin");\r
-               PrintAndLog("      s: Slower acquisition (required by some non standard cards)");\r
-               PrintAndLog("      r: Read nonces.bin and start attack");\r
-               PrintAndLog(" ");\r
-               PrintAndLog("      sample1: hf mf hardnested 0 A FFFFFFFFFFFF 4 A");\r
-               PrintAndLog("      sample2: hf mf hardnested 0 A FFFFFFFFFFFF 4 A w");\r
-               PrintAndLog("      sample3: hf mf hardnested 0 A FFFFFFFFFFFF 4 A w s");\r
-               PrintAndLog("      sample4: hf mf hardnested r");\r
-               PrintAndLog(" ");\r
-               PrintAndLog("Add the known target key to check if it is present in the remaining key space:");\r
-               PrintAndLog("      sample5: hf mf hardnested 0 A A0A1A2A3A4A5 4 A FFFFFFFFFFFF");\r
-               return 0;\r
-       }       \r
+       if (ctmp == 'H' || ctmp == 'h' ) return usage_hf14_hardnested();\r
+       if (ctmp != 'R' && ctmp != 'r' && ctmp != 'T' && ctmp != 't' && strlen(Cmd) < 20) return usage_hf14_hardnested();\r
        \r
        bool know_target_key = false;\r
        bool nonce_file_read = false;\r
@@ -869,7 +948,6 @@ int CmdHF14AMfNestedHard(const char *Cmd)
        bool slow = false;\r
        int tests = 0;\r
        \r
-       \r
        if (ctmp == 'R' || ctmp == 'r') {\r
                nonce_file_read = true;\r
                if (!param_gethex(Cmd, 1, trgkey, 12)) {\r
@@ -946,19 +1024,9 @@ int CmdHF14AMfNestedHard(const char *Cmd)
        return 0;\r
 }\r
 \r
-int CmdHF14AMfChk(const char *Cmd)\r
-{\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
-               PrintAndLog("card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");\r
-               PrintAndLog("d - write keys to binary file");\r
-               PrintAndLog("t - write keys to emulator memory\n");\r
-               PrintAndLog("      sample: hf mf chk 0 A 1234567890ab keys.dic");\r
-               PrintAndLog("              hf mf chk *1 ? t");\r
-               PrintAndLog("              hf mf chk *1 ? d");\r
-               return 0;\r
-       }       \r
+int CmdHF14AMfChk(const char *Cmd) {\r
+\r
+       if (strlen(Cmd)<3) return usage_hf14_chk();\r
 \r
        FILE * f;\r
        char filename[FILE_PATH_SIZE]={0};\r
@@ -1119,11 +1187,22 @@ int CmdHF14AMfChk(const char *Cmd)
                return 1;\r
        }\r
 \r
+       // empty e_sector\r
+       for(int i = 0; i < SectorsCnt; ++i){\r
+               e_sector[i].Key[0] = 0xffffffffffff;\r
+               e_sector[i].Key[1] = 0xffffffffffff;\r
+               e_sector[i].foundKey[0] = FALSE;\r
+               e_sector[i].foundKey[1] = FALSE;\r
+       }\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
+       time_t start, end;\r
+       time(&start);\r
        \r
        // check keys.\r
        for (trgKeyType = !keyType;  trgKeyType < 2;  (keyType==2) ? (++trgKeyType) : (trgKeyType=2) ) {\r
@@ -1133,22 +1212,16 @@ int CmdHF14AMfChk(const char *Cmd)
                        \r
                        // skip already found keys.\r
                        if (e_sector[i].foundKey[trgKeyType]) continue;\r
-                       \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
@@ -1157,36 +1230,41 @@ int CmdHF14AMfChk(const char *Cmd)
                }\r
        }\r
        t1 = clock() - t1;\r
+       time(&end);\r
+       unsigned long elapsed_time = difftime(end, start);      \r
        if ( t1 > 0 )\r
-               printf("\nTime in checkkeys: %.0f ticks\n", (float)t1);\r
+               PrintAndLog("\nTime in checkkeys: %.0f ticks %u seconds\n", (float)t1, elapsed_time);\r
 \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
+       if ( keyType != 1 ) {\r
+               PrintAndLog("testing 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
-                       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
+                               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
@@ -1236,148 +1314,263 @@ int CmdHF14AMfChk(const char *Cmd)
        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
-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
@@ -1707,8 +1900,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
@@ -1778,8 +1972,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
@@ -1814,8 +2007,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
@@ -2078,167 +2270,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
@@ -2287,9 +2321,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