ADD: J-Run's 2nd phase tool mf_key_brute ref: https://github.com/J-Run/mf_key_brute...

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 9c32321f7e86142b8ee746e7b10ff15b70c88e7f..d6e394442c4c9cfcb5a95c42d5ae71f7f023d276 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -9,28 +9,28 @@
 //-----------------------------------------------------------------------------\r
 \r
 #include "cmdhfmf.h"\r
 //-----------------------------------------------------------------------------\r
 \r
 #include "cmdhfmf.h"\r

-#include "cmdhfmfhard.h"\r
-#include "nonce2key/nonce2key.h"\r

 \r
 static int CmdHelp(const char *Cmd);\r
 int usage_hf14_mifare(void){\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("Usage:  hf mf mifare [h] <block number> <A|B>");\r

        PrintAndLog("options:");\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("      h               this help");\r
+       PrintAndLog("      <block number>  (Optional) target other block");\r
+       PrintAndLog("      <A|B>           (optional) target key type");\r
+       PrintAndLog("samples:");\r

        PrintAndLog("           hf mf mifare");\r
        PrintAndLog("           hf mf mifare 16");\r
        PrintAndLog("           hf mf mifare");\r
        PrintAndLog("           hf mf mifare 16");\r

+       PrintAndLog("           hf mf mifare 16 B");\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
        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("      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("samples:");\r
        PrintAndLog("           hf mf sim u 0a0a0a0a");\r
        PrintAndLog("           hf mf sim u 11223344556677");\r


@@ -56,15 +56,90 @@ int usage_hf14_sniff(void){
        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("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("      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
        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 based on card memory, other values then below defaults to 1k");\r
+       PrintAndLog("                           0 - MINI(320 bytes)");\r
+       PrintAndLog("                           1 - 1K");\r
+       PrintAndLog("                           2 - 2K");\r
+       PrintAndLog("                           4 - 4K");\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     -- target block 0, Key A");\r
+       PrintAndLog("      hf mf chk *1 ? t                        -- target all blocks, all keys, 1K, write to emul");\r
+       PrintAndLog("      hf mf chk *1 ? d                        -- target all blocks, all keys, 1K, write to file");\r
+       return 0;\r
+}\r
+int usage_hf14_keybrute(void){\r
+       PrintAndLog("J_Run's 2nd phase of multiple sector nested authentication key recovery");\r
+       PrintAndLog("You have a known 4 last bytes of a key recovered with mf_nonce_brute tool.");\r
+       PrintAndLog("First 2 bytes of key will be bruteforced");\r
+       PrintAndLog("");\r
+       PrintAndLog("Usage:  hf mf keybrute [h] <block number> <A|B> <key>");\r
+       PrintAndLog("options:");\r
+       PrintAndLog("      h               this help");\r
+       PrintAndLog("      <block number>  target block number");\r
+       PrintAndLog("      <A|B>           target key type");\r
+       PrintAndLog("      <key>           candidate key from mf_nonce_brute tool");\r
+       PrintAndLog("samples:");\r
+       PrintAndLog("           hf mf keybrute 1 A 000011223344");\r
+       return 0;\r
+}\r

 \r
 int CmdHF14AMifare(const char *Cmd) {\r
        uint32_t uid = 0;\r
 \r
 int CmdHF14AMifare(const char *Cmd) {\r
        uint32_t uid = 0;\r


@@ -72,13 +147,18 @@ int CmdHF14AMifare(const char *Cmd) {
        uint64_t par_list = 0, ks_list = 0, r_key = 0;\r
        int16_t isOK = 0;\r
        int tmpchar; \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
+       uint8_t blockNo = 0, keytype = MIFARE_AUTH_KEYA;\r

        \r
        char cmdp = param_getchar(Cmd, 0);      \r
        if ( cmdp == 'H' || cmdp == 'h') return usage_hf14_mifare();\r
        \r
        \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
+       blockNo = param_get8(Cmd, 0);    \r
+       \r
+       cmdp = param_getchar(Cmd, 1);\r
+       if (cmdp == 'B' || cmdp == 'b')\r
+               keytype = MIFARE_AUTH_KEYB;\r
+       \r
+       UsbCommand c = {CMD_READER_MIFARE, {true, blockNo, keytype}};\r

 \r
        // message\r
        printf("-------------------------------------------------------------------------\n");\r
 \r
        // message\r
        printf("-------------------------------------------------------------------------\n");\r


@@ -86,6 +166,8 @@ int CmdHF14AMifare(const char *Cmd) {
        printf("Press button on the proxmark3 device to abort both proxmark3 and client.\n");\r
        printf("-------------------------------------------------------------------------\n");\r
        clock_t t1 = clock();\r
        printf("Press button on the proxmark3 device to abort both proxmark3 and client.\n");\r
        printf("-------------------------------------------------------------------------\n");\r
        clock_t t1 = clock();\r

+       time_t start, end;\r
+       time(&start);\r

        \r
 start:\r
     clearCommandBuffer();\r
        \r
 start:\r
     clearCommandBuffer();\r


@@ -154,13 +236,14 @@ start:
        }\r
 END:\r
        t1 = clock() - t1;\r
        }\r
 END:\r
        t1 = clock() - t1;\r

+       time(&end);\r
+       unsigned long elapsed_time = difftime(end, start);      \r

        if ( t1 > 0 )\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
        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
        uint8_t blockNo = 0;\r
        uint8_t keyType = 0;\r
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r


@@ -209,8 +292,7 @@ int CmdHF14AMfWrBl(const char *Cmd)
        return 0;\r
 }\r
 \r
        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
        uint8_t blockNo = 0;\r
        uint8_t keyType = 0;\r
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r


@@ -258,8 +340,7 @@ int CmdHF14AMfRdBl(const char *Cmd)
   return 0;\r
 }\r
 \r
   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
        int i;\r
        uint8_t sectorNo = 0;\r
        uint8_t keyType = 0;\r


@@ -316,8 +397,7 @@ int CmdHF14AMfRdSc(const char *Cmd)
   return 0;\r
 }\r
 \r
   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
        if (sectorNo < 32) {\r
                return sectorNo * 4;\r
        } else {\r


@@ -325,8 +405,7 @@ uint8_t FirstBlockOfSector(uint8_t sectorNo)
        }\r
 }\r
 \r
        }\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
        if (sectorNo < 32) {\r
                return 4;\r
        } else {\r


@@ -632,30 +711,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
        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
 \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
        \r

+       char cmdp, ctmp;\r

        cmdp = param_getchar(Cmd, 0);\r
        blockNo = param_get8(Cmd, 1);\r
        ctmp = param_getchar(Cmd, 2);\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
        if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {\r
                PrintAndLog("Key type must be A or B");\r
                return 1;\r


@@ -731,7 +794,10 @@ int CmdHF14AMfNested(const char *Cmd) {
        }\r
        else { // ------------------------------------  multiple sectors working\r
                clock_t t1 = clock();\r
        }\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
                e_sector = calloc(SectorsCnt, sizeof(sector));\r
                if (e_sector == NULL) return 1;\r
                \r


@@ -757,9 +823,11 @@ int CmdHF14AMfNested(const char *Cmd) {
                        }\r
                }\r
                clock_t t2 = clock() - t1;\r
                        }\r
                }\r
                clock_t t2 = clock() - t1;\r

+               time(&end);\r
+               elapsed_time = difftime(end, start);    \r

                if ( t2 > 0 )\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
                PrintAndLog("enter nested..."); \r
                \r
                // nested sectors\r


@@ -797,8 +865,11 @@ int CmdHF14AMfNested(const char *Cmd) {
                }\r
                \r
                t1 = clock() - t1;\r
                }\r
                \r
                t1 = clock() - t1;\r

+               time(&end);\r
+               elapsed_time = difftime(end, start);    \r

                if ( t1 > 0 )\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
 \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


@@ -891,27 +962,8 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
        \r
        char ctmp;\r
        ctmp = param_getchar(Cmd, 0);\r
        \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
        \r
        bool know_target_key = false;\r
        bool nonce_file_read = false;\r


@@ -919,7 +971,6 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
        bool slow = false;\r
        int tests = 0;\r
        \r
        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
        if (ctmp == 'R' || ctmp == 'r') {\r
                nonce_file_read = true;\r
                if (!param_gethex(Cmd, 1, trgkey, 12)) {\r


@@ -977,9 +1028,9 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
                        trgBlockNo, \r
                        trgKeyType?'B':'A', \r
                        trgkey[0], trgkey[1], trgkey[2], trgkey[3], trgkey[4], trgkey[5],\r
                        trgBlockNo, \r
                        trgKeyType?'B':'A', \r
                        trgkey[0], trgkey[1], trgkey[2], trgkey[3], trgkey[4], trgkey[5],\r

-                       know_target_key?"":" (not set)",\r
-                       nonce_file_write?"write":nonce_file_read?"read":"none",\r
-                       slow?"Yes":"No",\r
+                       know_target_key ? "" : " (not set)",\r
+                       nonce_file_write ? "write": nonce_file_read ? "read" : "none",\r
+                       slow ? "Yes" : "No",\r

                        tests);\r
 \r
        int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key?trgkey:NULL, nonce_file_read, nonce_file_write, slow, tests);\r
                        tests);\r
 \r
        int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key?trgkey:NULL, nonce_file_read, nonce_file_write, slow, tests);\r


@@ -997,17 +1048,8 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 }\r
 \r
 int CmdHF14AMfChk(const char *Cmd) {\r
 }\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
-               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
+\r
+       if (strlen(Cmd)<3) return usage_hf14_chk();\r

 \r
        FILE * f;\r
        char filename[FILE_PATH_SIZE]={0};\r
 \r
        FILE * f;\r
        char filename[FILE_PATH_SIZE]={0};\r


@@ -1182,6 +1224,8 @@ int CmdHF14AMfChk(const char *Cmd) {
        \r
        // time\r
        clock_t t1 = clock();\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
        \r
        // check keys.\r
        for (trgKeyType = !keyType;  trgKeyType < 2;  (keyType==2) ? (++trgKeyType) : (trgKeyType=2) ) {\r


@@ -1193,7 +1237,8 @@ int CmdHF14AMfChk(const char *Cmd) {
                        if (e_sector[i].foundKey[trgKeyType]) continue;\r
                                                \r
                        for (uint32_t c = 0; c < keycnt; c += max_keys) {\r
                        if (e_sector[i].foundKey[trgKeyType]) continue;\r
                                                \r
                        for (uint32_t c = 0; c < keycnt; c += max_keys) {\r

-                               \r
+                               printf(".");\r
+                               fflush(stdout);                 \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
                                uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c;\r
                                \r
                                res = mfCheckKeys(b, trgKeyType, true, size, &keyBlock[6*c], &key64);\r


@@ -1202,19 +1247,19 @@ int CmdHF14AMfChk(const char *Cmd) {
                                        e_sector[i].foundKey[trgKeyType] = TRUE;\r
                                        break;\r
                                }\r
                                        e_sector[i].foundKey[trgKeyType] = TRUE;\r
                                        break;\r
                                }\r

-                               printf(".");\r
-                               fflush(stdout);\r

                        }\r
                        b < 127 ? ( b +=4 ) : ( b += 16 );      \r
                }\r
        }\r
        t1 = clock() - t1;\r
                        }\r
                        b < 127 ? ( b +=4 ) : ( b += 16 );      \r
                }\r
        }\r
        t1 = clock() - t1;\r

+       time(&end);\r
+       unsigned long elapsed_time = difftime(end, start);      \r

        if ( t1 > 0 )\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

+               \r

        // 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?\r
        if ( keyType != 1 ) {\r
        // 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?\r
        if ( keyType != 1 ) {\r

-               \r

                PrintAndLog("testing to read key B...");\r
                for (i = 0; i < SectorsCnt; i++) {\r
                        // KEY A  but not KEY B\r
                PrintAndLog("testing to read key B...");\r
                for (i = 0; i < SectorsCnt; i++) {\r
                        // KEY A  but not KEY B\r


@@ -1290,45 +1335,121 @@ int CmdHF14AMfChk(const char *Cmd) {
        PrintAndLog("");\r
        return 0;\r
 }\r
        PrintAndLog("");\r
        return 0;\r
 }\r

+#define ATTACK_KEY_COUNT 8\r
+sector *k_sector = NULL;\r
+uint8_t k_sectorsCount = 16;\r
+void readerAttack(nonces_t data[], bool setEmulatorMem) {\r

 \r
 \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 = (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') 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
+       // initialize storage for found keys\r
+       if (k_sector == NULL)\r
+               k_sector = calloc(k_sectorsCount, sizeof(sector));\r
+       if (k_sector == NULL) \r
+               return;\r

 \r
 \r

-       cmdp = param_getchar(Cmd, pnr); \r
-       if (cmdp == 'n' || cmdp == 'N') {\r
-               exitAfterNReads = param_get8(Cmd, pnr+1);\r
-               pnr += 2;\r
+       uint64_t key = 0;\r
+               \r
+       // empty e_sector\r
+       for(int i = 0; i < k_sectorsCount; ++i){\r
+               k_sector[i].Key[0] = 0xffffffffffff;\r
+               k_sector[i].Key[1] = 0xffffffffffff;\r
+               k_sector[i].foundKey[0] = FALSE;\r
+               k_sector[i].foundKey[1] = FALSE;\r

        }\r
 \r
        }\r
 \r

-       cmdp = param_getchar(Cmd, pnr);         \r
-       if (cmdp == 'i' || cmdp == 'I' ) {\r
-               flags |= FLAG_INTERACTIVE;\r
-               pnr++;\r
+       printf("enter reader attack\n");\r
+       for (uint8_t i = 0; i < ATTACK_KEY_COUNT; ++i) {\r
+               if (data[i].ar2 > 0) {\r
+                       \r
+                       if (tryMfk32(data[i], &key)) {\r
+                               PrintAndLog("Found Key%s for sector %02d: [%012"llx"]"\r
+                                       , (data[i].keytype) ? "B" : "A"\r
+                                       , data[i].sector\r
+                                       , key\r
+                               );\r
+\r
+                               k_sector[i].Key[data[i].keytype] = key;\r
+                               k_sector[i].foundKey[data[i].keytype] = TRUE;\r
+                               \r
+                               //set emulator memory for keys\r
+                               if (setEmulatorMem) {\r
+                                       uint8_t memBlock[16] = {0,0,0,0,0,0, 0xff, 0x0F, 0x80, 0x69, 0,0,0,0,0,0};\r
+                                       num_to_bytes( k_sector[i].Key[0], 6, memBlock);\r
+                                       num_to_bytes( k_sector[i].Key[1], 6, memBlock+10);\r
+                                       mfEmlSetMem( memBlock, i*4 + 3, 1);\r
+                                       PrintAndLog("Setting Emulator Memory Block %02d: [%s]"\r
+                                               , i*4 + 3\r
+                                               , sprint_hex( memBlock, sizeof(memBlock))\r
+                                               );\r
+                               }\r
+                               break;\r
+                       }\r
+                       //moebius attack                        \r
+                       // if (tryMfk32_moebius(data[i+ATTACK_KEY_COUNT], &key)) {\r
+                               // PrintAndLog("M-Found Key%s for sector %02d: [%012"llx"]"\r
+                                       // ,(data[i+ATTACK_KEY_COUNT].keytype) ? "B" : "A"\r
+                                       // , data[i+ATTACK_KEY_COUNT].sector\r
+                                       // , key\r
+                               // );\r
+                       // }\r
+               }\r

        }\r
        }\r

+}\r

 \r
 \r

-       cmdp = param_getchar(Cmd, pnr); \r
-       if (cmdp == 'x' || cmdp == 'X') {\r
-               flags |= FLAG_NR_AR_ATTACK;\r
+int CmdHF14AMf1kSim(const char *Cmd) {\r
+\r
+       uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};\r
+       uint8_t exitAfterNReads = 0;\r
+       uint8_t flags = (FLAG_UID_IN_EMUL | FLAG_4B_UID_IN_DATA);\r
+       int uidlen = 0; \r
+       bool setEmulatorMem = false;\r
+       uint8_t cmdp = 0;\r
+       bool errors = false;\r
+\r
+       while(param_getchar(Cmd, cmdp) != 0x00) {\r
+               switch(param_getchar(Cmd, cmdp)) {\r
+               case 'e':\r
+               case 'E':\r
+                       setEmulatorMem = true;\r
+                       cmdp++;\r
+                       break;\r
+               case 'h':\r
+               case 'H':\r
+                       return usage_hf14_mf1ksim();\r
+               case 'i':\r
+               case 'I':\r
+                       flags |= FLAG_INTERACTIVE;\r
+                       cmdp++;\r
+                       break;\r
+               case 'n':\r
+               case 'N':\r
+                       exitAfterNReads = param_get8(Cmd, cmdp+1);\r
+                       cmdp += 2;\r
+                       break;\r
+               case 'u':\r
+               case 'U':\r
+                       param_gethex_ex(Cmd, cmdp+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
+                       cmdp +=2;\r
+                       break;\r
+               case 'x':\r
+               case 'X':\r
+                       flags |= FLAG_NR_AR_ATTACK;\r
+                       cmdp++;\r
+                       break;\r
+               default:\r
+                       PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r
+                       errors = true;\r
+                       break;\r
+               }\r
+               if(errors) break;\r

        }\r
        }\r

+       //Validations\r
+       if(errors) return usage_hf14_mf1ksim();\r

        \r
        PrintAndLog(" uid:%s, numreads:%d, flags:%d (0x%02x) "\r
                                , (uidlen == 0 ) ? "N/A" : sprint_hex(uid, uidlen>>1)\r
        \r
        PrintAndLog(" uid:%s, numreads:%d, flags:%d (0x%02x) "\r
                                , (uidlen == 0 ) ? "N/A" : sprint_hex(uid, uidlen>>1)\r


@@ -1342,24 +1463,24 @@ int CmdHF14AMf1kSim(const char *Cmd) {
        SendCommand(&c);\r
 \r
        if(flags & FLAG_INTERACTIVE) {          \r
        SendCommand(&c);\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
                PrintAndLog("Press pm3-button or send another cmd to abort simulation");\r

+\r
+               nonces_t data[ATTACK_KEY_COUNT*2];\r
+               UsbCommand resp;                \r
+\r

                while( !ukbhit() ){\r
                        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;\r
 \r
                        if ( !(flags & FLAG_NR_AR_ATTACK) ) break;\r
                        if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;\r
 \r
                while( !ukbhit() ){\r
                        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;\r
 \r
                        if ( !(flags & FLAG_NR_AR_ATTACK) ) break;\r
                        if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;\r
 \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
+                       memcpy( data, resp.d.asBytes, sizeof(data) );                   \r
+                       readerAttack(data, setEmulatorMem);\r
+               }\r
+               \r
+               if (k_sector != NULL) {\r
+                       printKeyTable(k_sectorsCount, k_sector );\r
+                       free(k_sector);\r

                }\r
        }\r
        return 0;\r
                }\r
        }\r
        return 0;\r


@@ -1523,7 +1644,7 @@ int CmdHF14AMfSniff(const char *Cmd){
 int CmdHF14AMfDbg(const char *Cmd) {\r
 \r
        char ctmp = param_getchar(Cmd, 0);\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
+       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
        uint8_t dbgMode = param_get8ex(Cmd, 0, 0, 10);\r
        if (dbgMode > 4) return usage_hf14_dbg();\r


@@ -1533,6 +1654,43 @@ int CmdHF14AMfDbg(const char *Cmd) {
        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r

+int CmdHF14AMfKeyBrute(const char *Cmd) {\r
+\r
+       uint8_t blockNo = 0, keytype = 0;\r
+       uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
+       uint64_t foundkey = 0;\r
+       \r
+       char cmdp = param_getchar(Cmd, 0);      \r
+       if ( cmdp == 'H' || cmdp == 'h') return usage_hf14_keybrute();\r
+       \r
+       // block number\r
+       blockNo = param_get8(Cmd, 0);    \r
+       \r
+       // keytype\r
+       cmdp = param_getchar(Cmd, 1);\r
+       if (cmdp == 'B' || cmdp == 'b') keytype = 1;\r
+       \r
+       // key\r
+       if (param_gethex(Cmd, 2, key, 12)) return usage_hf14_keybrute();\r
+       \r
+       clock_t t1 = clock();\r
+       time_t start, end;\r
+       time(&start);\r
+       \r
+       if (mfKeyBrute( blockNo, keytype, key, &foundkey))\r
+               PrintAndLog("Found valid key: %012"llx" \n", foundkey);\r
+       else\r
+               PrintAndLog("Key not found");\r
+       \r
+       t1 = clock() - t1;\r
+       time(&end);\r
+       unsigned long elapsed_time = difftime(end, start);      \r
+       if ( t1 > 0 )\r
+               PrintAndLog("\nTime in keybrute: %.0f ticks %u seconds\n", (float)t1, elapsed_time);\r
+       \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
 void printKeyTable( uint8_t sectorscnt, sector *e_sector ){\r
        PrintAndLog("|---|----------------|---|----------------|---|");\r
        PrintAndLog("|sec|key A           |res|key B           |res|");\r


@@ -1547,7 +1705,6 @@ void printKeyTable( uint8_t sectorscnt, sector *e_sector ){
 }\r
 \r
 // EMULATOR COMMANDS\r
 }\r
 \r
 // EMULATOR COMMANDS\r

-\r

 int CmdHF14AMfEGet(const char *Cmd)\r
 {\r
        uint8_t blockNo = 0;\r
 int CmdHF14AMfEGet(const char *Cmd)\r
 {\r
        uint8_t blockNo = 0;\r


@@ -1561,7 +1718,7 @@ int CmdHF14AMfEGet(const char *Cmd)
        \r
        blockNo = param_get8(Cmd, 0);\r
 \r
        \r
        blockNo = param_get8(Cmd, 0);\r
 \r

-       PrintAndLog(" ");\r
+       PrintAndLog("");\r

        if (!mfEmlGetMem(data, blockNo, 1)) {\r
                PrintAndLog("data[%3d]:%s", blockNo, sprint_hex(data, 16));\r
        } else {\r
        if (!mfEmlGetMem(data, blockNo, 1)) {\r
                PrintAndLog("data[%3d]:%s", blockNo, sprint_hex(data, 16));\r
        } else {\r


@@ -2278,6 +2435,7 @@ static command_t CommandTable[] = {
        {"mifare",              CmdHF14AMifare,                 0, "Read parity error messages."},\r
        {"nested",              CmdHF14AMfNested,               0, "Test nested authentication"},\r
        {"hardnested",  CmdHF14AMfNestedHard,   0, "Nested attack for hardened Mifare cards"},\r
        {"mifare",              CmdHF14AMifare,                 0, "Read parity error messages."},\r
        {"nested",              CmdHF14AMfNested,               0, "Test nested authentication"},\r
        {"hardnested",  CmdHF14AMfNestedHard,   0, "Nested attack for hardened Mifare cards"},\r

+       {"keybrute",    CmdHF14AMfKeyBrute,             0, "J_Run's 2nd phase of multiple sector nested authentication key recovery"},\r

        {"sniff",               CmdHF14AMfSniff,                0, "Sniff card-reader communication"},\r
        {"sim",                 CmdHF14AMf1kSim,                0, "Simulate MIFARE card"},\r
        {"eclr",                CmdHF14AMfEClear,               0, "Clear simulator memory block"},\r
        {"sniff",               CmdHF14AMfSniff,                0, "Sniff card-reader communication"},\r
        {"sim",                 CmdHF14AMf1kSim,                0, "Simulate MIFARE card"},\r
        {"eclr",                CmdHF14AMfEClear,               0, "Clear simulator memory block"},\r