FIX: 'LF PYRAMID' the crc8_MAXIM and crc16_DNP was calling the wrong crc method....

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 7cc07e96f62e485c330c77ce6f359184261f80ca..7114945d6744906fedd8455e1e9a3dc5e12ba0fa 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -9,18 +9,18 @@
 //-----------------------------------------------------------------------------\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("      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("samples:");\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
        return 0;\r
 }\r
 int usage_hf14_mf1ksim(void){\r


@@ -31,6 +31,8 @@ int usage_hf14_mf1ksim(void){
        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("      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("      e    (Optional) Fill simulator keys from what we crack");\r
+       PrintAndLog("      v    (Optional) Show maths used for cracking reader. Useful for debugging.");\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


@@ -111,15 +113,33 @@ int usage_hf14_chk(void){
        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("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("      *    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("      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
+       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
        return 0;\r
 }\r
 \r


@@ -129,13 +149,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


@@ -189,18 +214,22 @@ start:
                }\r
        }       \r
        printf("\n");\r
                }\r
        }       \r
        printf("\n");\r

+       // error\r
+       if (isOK != 1) return 1;\r

        \r
        \r

-       // par == 0\r
-       if (isOK == -1 && par_list == 0) {\r
-               if (!nonce2key_ex(uid, nt, nr, ks_list, &r_key) ){\r
+       if (par_list == 0 && ks_list != 0) {\r
+               // this special attack when parities is zero, uses checkkeys. Which now with block/keytype option also needs. \r
+               // but it uses 0|1 instead of 0x60|0x61...\r
+               if (nonce2key_ex(blockNo, keytype - 0x60 , uid, nt, nr, ks_list, &r_key) ){\r
+                       PrintAndLog("Trying again with a different reader nonce...");\r
+                       c.arg[0] = false;\r
+                       goto start;\r
+               } else {\r

                        PrintAndLog("Found valid key: %012"llx" \n", r_key);\r
                        goto END;\r
                }\r
        }\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
+\r

        // execute original function from util nonce2key\r
        if (nonce2key(uid, nt, nr, par_list, ks_list, &r_key)) {\r
                isOK = 2;\r
        // execute original function from util nonce2key\r
        if (nonce2key(uid, nt, nr, par_list, ks_list, &r_key)) {\r
                isOK = 2;\r


@@ -209,6 +238,16 @@ start:
                c.arg[0] = false;\r
                goto start;\r
        } else {\r
                c.arg[0] = false;\r
                goto start;\r
        } else {\r

+               \r
+               // nonce2key found a candidate key.  Lets verify it.\r
+               uint8_t keyblock[] = {0,0,0,0,0,0};\r
+               num_to_bytes(r_key, 6, keyblock);\r
+               uint64_t key64 = 0;\r
+               int res = mfCheckKeys(blockNo, keytype - 0x60 , false, 1, keyblock, &key64);\r
+               if ( res > 0 ) {\r
+                       PrintAndLog("Candidate Key found (%012"llx") - Test authentication failed. Starting over darkside attack", r_key);      \r
+                       goto start;\r
+               }\r

                PrintAndLog("Found valid key: %012"llx" \n", r_key);\r
        }\r
 END:\r
                PrintAndLog("Found valid key: %012"llx" \n", r_key);\r
        }\r
 END:\r


@@ -435,6 +474,7 @@ int CmdHF14AMfDump(const char *Cmd) {
                if ( bytes_read == 0) {\r
                        PrintAndLog("File reading error.");\r
                        fclose(fin);\r
                if ( bytes_read == 0) {\r
                        PrintAndLog("File reading error.");\r
                        fclose(fin);\r

+                       fin = NULL;\r

                        return 2;\r
                }\r
        }\r
                        return 2;\r
                }\r
        }\r


@@ -445,12 +485,14 @@ int CmdHF14AMfDump(const char *Cmd) {
                if ( bytes_read == 0) {\r
                        PrintAndLog("File reading error.");\r
                        fclose(fin);\r
                if ( bytes_read == 0) {\r
                        PrintAndLog("File reading error.");\r
                        fclose(fin);\r

+                       fin = NULL;\r

                        return 2;\r
                }\r
        }\r
        \r
        fclose(fin);\r
                        return 2;\r
                }\r
        }\r
        \r
        fclose(fin);\r

-\r
+       fin = NULL;\r
+                       \r

        PrintAndLog("|-----------------------------------------|");\r
        PrintAndLog("|------ Reading sector access bits...-----|");\r
        PrintAndLog("|-----------------------------------------|");\r
        PrintAndLog("|-----------------------------------------|");\r
        PrintAndLog("|------ Reading sector access bits...-----|");\r
        PrintAndLog("|-----------------------------------------|");\r


@@ -556,6 +598,7 @@ int CmdHF14AMfDump(const char *Cmd) {
                uint16_t numblocks = FirstBlockOfSector(numSectors - 1) + NumBlocksPerSector(numSectors - 1);\r
                fwrite(carddata, 1, 16*numblocks, fout);\r
                fclose(fout);\r
                uint16_t numblocks = FirstBlockOfSector(numSectors - 1) + NumBlocksPerSector(numSectors - 1);\r
                fwrite(carddata, 1, 16*numblocks, fout);\r
                fclose(fout);\r

+               fout = NULL;            \r

                PrintAndLog("Dumped %d blocks (%d bytes) to file dumpdata.bin", numblocks, 16*numblocks);\r
        }\r
                \r
                PrintAndLog("Dumped %d blocks (%d bytes) to file dumpdata.bin", numblocks, 16*numblocks);\r
        }\r
                \r


@@ -604,6 +647,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
                if ( bytes_read == 0) {\r
                        PrintAndLog("File reading error (dumpkeys.bin).");\r
                        fclose(fkeys);\r
                if ( bytes_read == 0) {\r
                        PrintAndLog("File reading error (dumpkeys.bin).");\r
                        fclose(fkeys);\r

+                       fkeys = NULL;\r

                        return 2;\r
                }\r
        }\r
                        return 2;\r
                }\r
        }\r


@@ -613,6 +657,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
                if ( bytes_read == 0) {\r
                        PrintAndLog("File reading error (dumpkeys.bin).");\r
                        fclose(fkeys);\r
                if ( bytes_read == 0) {\r
                        PrintAndLog("File reading error (dumpkeys.bin).");\r
                        fclose(fkeys);\r

+                       fkeys = NULL;\r

                        return 2;\r
                }\r
        }\r
                        return 2;\r
                }\r
        }\r


@@ -633,6 +678,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
                        if ( bytes_read == 0) {\r
                                PrintAndLog("File reading error (dumpdata.bin).");\r
                                fclose(fdump);\r
                        if ( bytes_read == 0) {\r
                                PrintAndLog("File reading error (dumpdata.bin).");\r
                                fclose(fdump);\r

+                               fdump = NULL;                           \r

                                return 2;\r
                        }\r
                                        \r
                                return 2;\r
                        }\r
                                        \r


@@ -668,6 +714,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
        }\r
        \r
        fclose(fdump);\r
        }\r
        \r
        fclose(fdump);\r

+       fdump = NULL;   \r

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


@@ -1010,7 +1057,7 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
                        slow ? "Yes" : "No",\r
                        tests);\r
 \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
+       int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key ? trgkey : NULL, nonce_file_read, nonce_file_write, slow, tests);\r

 \r
        if (isOK) {\r
                switch (isOK) {\r
 \r
        if (isOK) {\r
                switch (isOK) {\r


@@ -1214,7 +1261,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


@@ -1223,8 +1271,6 @@ 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
                        b < 127 ? ( b +=4 ) : ( b += 16 );      \r
                }\r


@@ -1313,45 +1359,152 @@ 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, bool verbose) {\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
+       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
+       printf("enter reader attack\n");\r
+       for (uint8_t i = 0; i < ATTACK_KEY_COUNT; ++i) {\r
+               if (data[i].ar2 > 0) {\r
+\r
+                       // We can probably skip this, mfkey32v2 is more reliable.\r
+#ifdef HFMF_TRYMFK32\r
+                       if (tryMfk32(data[i], &key, verbose)) {\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
+                                       PrintAndLog("Setting Emulator Memory Block %02d: [%s]"\r
+                                               , ((data[i].sector)*4) + 3\r
+                                               , sprint_hex( memBlock, sizeof(memBlock))\r
+                                               );\r
+                                       mfEmlSetMem( memBlock, ((data[i].sector)*4) + 3, 1);\r
+                               }\r
+                               continue;\r
+                       }\r
+#endif\r
+                       //moebius attack                        \r
+                       if (tryMfk32_moebius(data[i+ATTACK_KEY_COUNT], &key, verbose)) {\r
+                               uint8_t sectorNum = data[i+ATTACK_KEY_COUNT].sector;\r
+                               uint8_t keyType = data[i+ATTACK_KEY_COUNT].keytype;\r
+\r
+                               PrintAndLog("M-Found Key%s for sector %02d: [%012"llx"]"\r
+                                       , keyType ? "B" : "A"\r
+                                       , sectorNum\r
+                                       , key\r
+                               );\r
+\r
+                               k_sector[sectorNum].Key[keyType] = key;\r
+                               k_sector[sectorNum].foundKey[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[sectorNum].Key[0], 6, memBlock);\r
+                                       num_to_bytes( k_sector[sectorNum].Key[1], 6, memBlock+10);\r
+                                       PrintAndLog("Setting Emulator Memory Block %02d: [%s]"\r
+                                               , (sectorNum*4) + 3\r
+                                               , sprint_hex( memBlock, sizeof(memBlock))\r
+                                               );\r
+                                       mfEmlSetMem( memBlock, (sectorNum*4) + 3, 1);\r
+                               }\r
+                               continue;\r
+                       }\r
+\r
+               }\r
+       }\r
+}\r

 \r
 int CmdHF14AMf1kSim(const char *Cmd) {\r
 \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
        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
+       bool setEmulatorMem = false;\r
+       uint8_t cmdp = 0;\r
+       bool errors = false;\r
+\r
+       // If set to true, we should show our workings when doing NR_AR_ATTACK.\r
+       bool verbose = 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 'v':\r
+               case 'V':\r
+                       verbose = true;\r
+                       cmdp++;\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
                }\r

-               pnr +=2;\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
-       }\r
-\r
-       cmdp = param_getchar(Cmd, pnr);         \r
-       if (cmdp == 'i' || cmdp == 'I' ) {\r
-               flags |= FLAG_INTERACTIVE;\r
-               pnr++;\r
-       }\r
-\r
-       cmdp = param_getchar(Cmd, pnr); \r
-       if (cmdp == 'x' || cmdp == 'X') {\r
-               flags |= FLAG_NR_AR_ATTACK;\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


@@ -1365,24 +1518,25 @@ 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, verbose);\r
+               }\r
+               \r
+               if (k_sector != NULL) {\r
+                       printKeyTable(k_sectorsCount, k_sector );\r
+                       free(k_sector);\r
+                       k_sector = NULL;\r

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


@@ -1546,7 +1700,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


@@ -1556,6 +1710,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


@@ -1570,7 +1761,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


@@ -1584,7 +1774,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


@@ -2297,10 +2487,11 @@ static command_t CommandTable[] = {
        {"dump",                CmdHF14AMfDump,                 0, "Dump MIFARE classic tag to binary file"},\r
        {"restore",             CmdHF14AMfRestore,              0, "Restore MIFARE classic binary file to BLANK tag"},\r
        {"wrbl",                CmdHF14AMfWrBl,                 0, "Write MIFARE classic block"},\r
        {"dump",                CmdHF14AMfDump,                 0, "Dump MIFARE classic tag to binary file"},\r
        {"restore",             CmdHF14AMfRestore,              0, "Restore MIFARE classic binary file to BLANK tag"},\r
        {"wrbl",                CmdHF14AMfWrBl,                 0, "Write MIFARE classic block"},\r

-       {"chk",                 CmdHF14AMfChk,                  0, "Test block keys"},\r
-       {"mifare",              CmdHF14AMifare,                 0, "Read parity error messages."},\r
-       {"nested",              CmdHF14AMfNested,               0, "Test nested authentication"},\r
+       {"chk",                 CmdHF14AMfChk,                  0, "Check keys"},\r
+       {"mifare",              CmdHF14AMifare,                 0, "Darkside attack. read parity error messages."},\r
+       {"nested",              CmdHF14AMfNested,               0, "Nested attack. Test nested authentication"},\r

        {"hardnested",  CmdHF14AMfNestedHard,   0, "Nested attack for hardened Mifare cards"},\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