]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhfmf.c
Merge branch 'master' into fix_iclass_sim
[proxmark3-svn] / client / cmdhfmf.c
index aafbce2afa12990873e7422daf4fc65f56ebc073..9ecf99fbe831c1b51061921f25188e153e409e7e 100644 (file)
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <ctype.h>\r
-#include "proxmark3.h"\r
+#include "comms.h"\r
 #include "cmdmain.h"\r
 #include "cmdhfmfhard.h"\r
+#include "parity.h"\r
 #include "util.h"\r
 #include "util_posix.h"\r
 #include "usb_cmd.h"\r
 #include "ui.h"\r
-#include "mifarehost.h"\r
+#include "mifare/mifarehost.h"\r
 #include "mifare.h"\r
-#include "mfkey.h"\r
-\r
-#define NESTED_SECTOR_RETRY     10                     // how often we try mfested() until we give up\r
+#include "mifare/mfkey.h"\r
+#include "hardnested/hardnested_bf_core.h"\r
+#include "cliparser/cliparser.h"\r
+#include "cmdhf14a.h"\r
+#include "mifare/mifaredefault.h"\r
+#include "mifare/mifare4.h"\r
+#include "mifare/mad.h"\r
+#include "mifare/ndef.h"\r
+#include "emv/dump.h"\r
+#include "protocols.h"\r
+\r
+#define NESTED_SECTOR_RETRY     10          // how often we try mfested() until we give up\r
 \r
 static int CmdHelp(const char *Cmd);\r
 \r
@@ -57,7 +67,7 @@ int CmdHF14AMfWrBl(const char *Cmd)
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
        uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};\r
 \r
-       char cmdp       = 0x00;\r
+       char cmdp   = 0x00;\r
 \r
        if (strlen(Cmd)<3) {\r
                PrintAndLog("Usage:  hf mf wrbl    <block number> <key A/B> <key (12 hex symbols)> <block data (32 hex symbols)>");\r
@@ -83,10 +93,10 @@ int CmdHF14AMfWrBl(const char *Cmd)
        PrintAndLog("--block no:%d, key type:%c, key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r
        PrintAndLog("--data: %s", sprint_hex(bldata, 16));\r
 \r
-  UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};\r
+       UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};\r
        memcpy(c.d.asBytes, key, 6);\r
        memcpy(c.d.asBytes + 10, bldata, 16);\r
-  SendCommand(&c);\r
+       SendCommand(&c);\r
 \r
        UsbCommand resp;\r
        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
@@ -105,7 +115,7 @@ int CmdHF14AMfRdBl(const char *Cmd)
        uint8_t keyType = 0;\r
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
 \r
-       char cmdp       = 0x00;\r
+       char cmdp   = 0x00;\r
 \r
 \r
        if (strlen(Cmd)<3) {\r
@@ -127,24 +137,38 @@ int CmdHF14AMfRdBl(const char *Cmd)
        }\r
        PrintAndLog("--block no:%d, key type:%c, key:%s ", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r
 \r
-  UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};\r
+       UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};\r
        memcpy(c.d.asBytes, key, 6);\r
-  SendCommand(&c);\r
+       SendCommand(&c);\r
 \r
        UsbCommand resp;\r
        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
                uint8_t isOK  = resp.arg[0] & 0xff;\r
                uint8_t *data = resp.d.asBytes;\r
 \r
-               if (isOK)\r
+               if (isOK) {\r
                        PrintAndLog("isOk:%02x data:%s", isOK, sprint_hex(data, 16));\r
-               else\r
+               } else {\r
                        PrintAndLog("isOk:%02x", isOK);\r
+                       return 1;\r
+               }\r
+\r
+               if (mfIsSectorTrailer(blockNo) && (data[6] || data[7] || data[8])) {\r
+                       PrintAndLogEx(NORMAL, "Trailer decoded:");\r
+                       int bln = mfFirstBlockOfSector(mfSectorNum(blockNo));\r
+                       int blinc = (mfNumBlocksPerSector(mfSectorNum(blockNo)) > 4) ? 5 : 1;\r
+                       for (int i = 0; i < 4; i++) {\r
+                               PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &data[6]));\r
+                               bln += blinc;\r
+                       }\r
+                       PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&data[9], 1));\r
+               }\r
        } else {\r
                PrintAndLog("Command execute timeout");\r
+               return 2;\r
        }\r
 \r
-  return 0;\r
+       return 0;\r
 }\r
 \r
 int CmdHF14AMfRdSc(const char *Cmd)\r
@@ -155,7 +179,7 @@ int CmdHF14AMfRdSc(const char *Cmd)
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
        uint8_t isOK  = 0;\r
        uint8_t *data  = NULL;\r
-       char cmdp       = 0x00;\r
+       char cmdp   = 0x00;\r
 \r
        if (strlen(Cmd)<3) {\r
                PrintAndLog("Usage:  hf mf rdsc    <sector number> <key A/B> <key (12 hex symbols)>");\r
@@ -196,12 +220,21 @@ int CmdHF14AMfRdSc(const char *Cmd)
                                PrintAndLog("data   : %s", sprint_hex(data + i * 16, 16));\r
                        }\r
                        PrintAndLog("trailer: %s", sprint_hex(data + (sectorNo<32?3:15) * 16, 16));\r
+\r
+                       PrintAndLogEx(NORMAL, "Trailer decoded:");\r
+                                               int bln = mfFirstBlockOfSector(sectorNo);\r
+                                               int blinc = (mfNumBlocksPerSector(sectorNo) > 4) ? 5 : 1;\r
+                                               for (i = 0; i < 4; i++) {\r
+                                                               PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &(data + (sectorNo<32?3:15) * 16)[6]));\r
+                                                               bln += blinc;\r
+                                               }\r
+                                               PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&(data + (sectorNo<32?3:15) * 16)[9], 1));\r
                }\r
        } else {\r
                PrintAndLog("Command execute timeout");\r
        }\r
 \r
-  return 0;\r
+       return 0;\r
 }\r
 \r
 uint8_t FirstBlockOfSector(uint8_t sectorNo)\r
@@ -222,12 +255,33 @@ uint8_t NumBlocksPerSector(uint8_t sectorNo)
        }\r
 }\r
 \r
+static int ParamCardSizeSectors(const char c) {\r
+       int numSectors = 16;\r
+       switch (c) {\r
+               case '0' : numSectors = 5; break;\r
+               case '2' : numSectors = 32; break;\r
+               case '4' : numSectors = 40; break;\r
+               default:   numSectors = 16;\r
+       }\r
+       return numSectors;\r
+}\r
+\r
+static int ParamCardSizeBlocks(const char c) {\r
+       int numBlocks = 16 * 4;\r
+       switch (c) {\r
+               case '0' : numBlocks = 5 * 4; break;\r
+               case '2' : numBlocks = 32 * 4; break;\r
+               case '4' : numBlocks = 32 * 4 + 8 * 16; break;\r
+               default:   numBlocks = 16 * 4;\r
+       }\r
+       return numBlocks;\r
+}\r
+\r
 int CmdHF14AMfDump(const char *Cmd)\r
 {\r
        uint8_t sectorNo, blockNo;\r
 \r
-       uint8_t keyA[40][6];\r
-       uint8_t keyB[40][6];\r
+       uint8_t keys[2][40][6];\r
        uint8_t rights[40][4];\r
        uint8_t carddata[256][16];\r
        uint8_t numSectors = 16;\r
@@ -238,46 +292,40 @@ int CmdHF14AMfDump(const char *Cmd)
        UsbCommand resp;\r
 \r
        char cmdp = param_getchar(Cmd, 0);\r
-       switch (cmdp) {\r
-               case '0' : numSectors = 5; break;\r
-               case '1' :\r
-               case '\0': numSectors = 16; break;\r
-               case '2' : numSectors = 32; break;\r
-               case '4' : numSectors = 40; break;\r
-               default:   numSectors = 16;\r
-       }\r
+       numSectors = ParamCardSizeSectors(cmdp);\r
 \r
-       if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {\r
-               PrintAndLog("Usage:   hf mf dump [card memory]");\r
+       if (strlen(Cmd) > 3 || cmdp == 'h' || cmdp == 'H') {\r
+               PrintAndLog("Usage:   hf mf dump [card memory] [k|m]");\r
                PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r
+               PrintAndLog("  k: Always try using both Key A and Key B for each sector, even if access bits would prohibit it");\r
+               PrintAndLog("  m: When missing access bits or keys, replace that block with NULL");\r
                PrintAndLog("");\r
                PrintAndLog("Samples: hf mf dump");\r
                PrintAndLog("         hf mf dump 4");\r
+               PrintAndLog("         hf mf dump 4 m");\r
                return 0;\r
        }\r
 \r
+       char opts = param_getchar(Cmd, 1);\r
+       bool useBothKeysAlways = false;\r
+       if (opts == 'k' || opts == 'K') useBothKeysAlways = true;\r
+       bool nullMissingKeys = false;\r
+       if (opts == 'm' || opts == 'M') nullMissingKeys = true;\r
+\r
        if ((fin = fopen("dumpkeys.bin","rb")) == NULL) {\r
                PrintAndLog("Could not find file dumpkeys.bin");\r
                return 1;\r
        }\r
 \r
-       // Read keys A from file\r
-       for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
-               size_t bytes_read = fread(keyA[sectorNo], 1, 6, fin);\r
-               if (bytes_read != 6) {\r
-                       PrintAndLog("File reading error.");\r
-                       fclose(fin);\r
-                       return 2;\r
-               }\r
-       }\r
-\r
-       // Read keys B from file\r
-       for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
-               size_t bytes_read = fread(keyB[sectorNo], 1, 6, fin);\r
-               if (bytes_read != 6) {\r
-                       PrintAndLog("File reading error.");\r
-                       fclose(fin);\r
-                       return 2;\r
+       // Read keys from file\r
+       for (int group=0; group<=1; group++) {\r
+               for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
+                       size_t bytes_read = fread(keys[group][sectorNo], 1, 6, fin);\r
+                       if (bytes_read != 6) {\r
+                               PrintAndLog("File reading error.");\r
+                               fclose(fin);\r
+                               return 2;\r
+                       }\r
                }\r
        }\r
 \r
@@ -290,7 +338,8 @@ int CmdHF14AMfDump(const char *Cmd)
        for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
                for (tries = 0; tries < 3; tries++) {\r
                        UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}};\r
-                       memcpy(c.d.asBytes, keyA[sectorNo], 6);\r
+                       // At least the Access Conditions can always be read with key A.\r
+                       memcpy(c.d.asBytes, keys[0][sectorNo], 6);\r
                        SendCommand(&c);\r
 \r
                        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
@@ -324,25 +373,43 @@ int CmdHF14AMfDump(const char *Cmd)
                for (blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {\r
                        bool received = false;\r
                        for (tries = 0; tries < 3; tries++) {\r
-                               if (blockNo == NumBlocksPerSector(sectorNo) - 1) {              // sector trailer. At least the Access Conditions can always be read with key A.\r
+                               if (blockNo == NumBlocksPerSector(sectorNo) - 1) {      // sector trailer. At least the Access Conditions can always be read with key A.\r
                                        UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};\r
-                                       memcpy(c.d.asBytes, keyA[sectorNo], 6);\r
+                                       memcpy(c.d.asBytes, keys[0][sectorNo], 6);\r
                                        SendCommand(&c);\r
                                        received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
-                               } else {                                                                                                // data block. Check if it can be read with key A or key B\r
+                               } else if (useBothKeysAlways) {\r
+                                       // Always try both keys, even if access conditions wouldn't work.\r
+                                       for (int k=0; k<=1; k++) {\r
+                                               UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 1, 0}};\r
+                                               memcpy(c.d.asBytes, keys[k][sectorNo], 6);\r
+                                               SendCommand(&c);\r
+                                               received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
+\r
+                                               // Don't try the other one on success.\r
+                                               if (resp.arg[0] & 0xff) break;\r
+                                       }\r
+                               } else {                                                // data block. Check if it can be read with key A or key B\r
                                        uint8_t data_area = sectorNo<32?blockNo:blockNo/5;\r
-                                       if ((rights[sectorNo][data_area] == 0x03) || (rights[sectorNo][data_area] == 0x05)) {   // only key B would work\r
+                                       if ((rights[sectorNo][data_area] == 0x03) || (rights[sectorNo][data_area] == 0x05)) {   // only key B would work\r
                                                UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 1, 0}};\r
-                                               memcpy(c.d.asBytes, keyB[sectorNo], 6);\r
+                                               memcpy(c.d.asBytes, keys[1][sectorNo], 6);\r
                                                SendCommand(&c);\r
                                                received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
-                                       } else if (rights[sectorNo][data_area] == 0x07) {                                                                               // no key would work\r
-                                               isOK = false;\r
+                                       } else if (rights[sectorNo][data_area] == 0x07) {                                       // no key would work\r
                                                PrintAndLog("Access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);\r
-                                               tries = 2;\r
-                                       } else {                                                                                                                                                                // key A would work\r
+                                               if (nullMissingKeys) {\r
+                                                       memset(resp.d.asBytes, 0, 16);\r
+                                                       resp.arg[0] = 1;\r
+                                                       PrintAndLog("  ... filling the block with NULL");\r
+                                                       received = true;\r
+                                               } else {\r
+                                                       isOK = false;\r
+                                                       tries = 2;\r
+                                               }\r
+                                       } else {                                                                                // key A would work\r
                                                UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};\r
-                                               memcpy(c.d.asBytes, keyA[sectorNo], 6);\r
+                                               memcpy(c.d.asBytes, keys[0][sectorNo], 6);\r
                                                SendCommand(&c);\r
                                                received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                                        }\r
@@ -356,23 +423,13 @@ int CmdHF14AMfDump(const char *Cmd)
                        if (received) {\r
                                isOK  = resp.arg[0] & 0xff;\r
                                uint8_t *data  = resp.d.asBytes;\r
-                               if (blockNo == NumBlocksPerSector(sectorNo) - 1) {              // sector trailer. Fill in the keys.\r
-                                       data[0]  = (keyA[sectorNo][0]);\r
-                                       data[1]  = (keyA[sectorNo][1]);\r
-                                       data[2]  = (keyA[sectorNo][2]);\r
-                                       data[3]  = (keyA[sectorNo][3]);\r
-                                       data[4]  = (keyA[sectorNo][4]);\r
-                                       data[5]  = (keyA[sectorNo][5]);\r
-                                       data[10] = (keyB[sectorNo][0]);\r
-                                       data[11] = (keyB[sectorNo][1]);\r
-                                       data[12] = (keyB[sectorNo][2]);\r
-                                       data[13] = (keyB[sectorNo][3]);\r
-                                       data[14] = (keyB[sectorNo][4]);\r
-                                       data[15] = (keyB[sectorNo][5]);\r
+                               if (blockNo == NumBlocksPerSector(sectorNo) - 1) {      // sector trailer. Fill in the keys.\r
+                                       memcpy(data, keys[0][sectorNo], 6);\r
+                                       memcpy(data + 10, keys[1][sectorNo], 6);\r
                                }\r
                                if (isOK) {\r
                                        memcpy(carddata[FirstBlockOfSector(sectorNo) + blockNo], data, 16);\r
-                    PrintAndLog("Successfully read block %2d of sector %2d.", blockNo, sectorNo);\r
+                                       PrintAndLog("Successfully read block %2d of sector %2d.", blockNo, sectorNo);\r
                                } else {\r
                                        PrintAndLog("Could not read block %2d of sector %2d", blockNo, sectorNo);\r
                                        break;\r
@@ -475,7 +532,7 @@ int CmdHF14AMfRestore(const char *Cmd)
                                return 2;\r
                        }\r
 \r
-                       if (blockNo == NumBlocksPerSector(sectorNo) - 1) {      // sector trailer\r
+                       if (blockNo == NumBlocksPerSector(sectorNo) - 1) {  // sector trailer\r
                                bldata[0]  = (keyA[sectorNo][0]);\r
                                bldata[1]  = (keyA[sectorNo][1]);\r
                                bldata[2]  = (keyA[sectorNo][2]);\r
@@ -509,12 +566,33 @@ int CmdHF14AMfRestore(const char *Cmd)
        return 0;\r
 }\r
 \r
+//----------------------------------------------\r
+//   Nested\r
+//----------------------------------------------\r
+\r
+static void parseParamTDS(const char *Cmd, const uint8_t indx, bool *paramT, bool *paramD, uint8_t *timeout) {\r
+       char ctmp3[4] = {0};\r
+       int len = param_getlength(Cmd, indx);\r
+       if (len > 0 && len < 4){\r
+               param_getstr(Cmd, indx, ctmp3, sizeof(ctmp3));\r
 \r
-typedef struct {\r
-       uint64_t Key[2];\r
-       int foundKey[2];\r
-} sector_t;\r
+               *paramT |= (ctmp3[0] == 't' || ctmp3[0] == 'T');\r
+               *paramD |= (ctmp3[0] == 'd' || ctmp3[0] == 'D');\r
+               bool paramS1 = *paramT || *paramD;\r
 \r
+               // slow and very slow\r
+               if (ctmp3[0] == 's' || ctmp3[0] == 'S' || ctmp3[1] == 's' || ctmp3[1] == 'S') {\r
+                       *timeout = 11; // slow\r
+\r
+                       if (!paramS1 && (ctmp3[1] == 's' || ctmp3[1] == 'S')) {\r
+                               *timeout = 53; // very slow\r
+                       }\r
+                       if (paramS1 && (ctmp3[2] == 's' || ctmp3[2] == 'S')) {\r
+                               *timeout = 53; // very slow\r
+                       }\r
+               }\r
+       }\r
+}\r
 \r
 int CmdHF14AMfNested(const char *Cmd)\r
 {\r
@@ -526,10 +604,14 @@ int CmdHF14AMfNested(const char *Cmd)
        uint8_t trgKeyType = 0;\r
        uint8_t SectorsCnt = 0;\r
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
-       uint8_t keyBlock[14*6];\r
+       uint8_t keyBlock[MifareDefaultKeysSize * 6];\r
        uint64_t key64 = 0;\r
-       bool transferToEml = false;\r
+       // timeout in units. (ms * 106)/10 or us*0.0106\r
+       uint8_t btimeout14a = MF_CHKKEYS_DEFTIMEOUT; // fast by default\r
+\r
+       bool autosearchKey = false;\r
 \r
+       bool transferToEml = false;\r
        bool createDumpFile = false;\r
        FILE *fkeys;\r
        uint8_t standart[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};\r
@@ -539,67 +621,90 @@ int CmdHF14AMfNested(const char *Cmd)
 \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(" all sectors:  hf mf nested  <card memory> <block number> <key A/B> <key (12 hex symbols)> [t|d|s|ss]");\r
+               PrintAndLog(" all sectors autosearch key:  hf mf nested  <card memory> * [t|d|s|ss]");\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(" ");\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("t - transfer keys to emulator memory");\r
+               PrintAndLog("d - write keys to binary file dumpkeys.bin");\r
+               PrintAndLog("s - Slow (1ms) check keys (required by some non standard cards)");\r
+               PrintAndLog("ss - Very slow (5ms) check keys");\r
                PrintAndLog(" ");\r
                PrintAndLog("      sample1: hf mf nested 1 0 A FFFFFFFFFFFF ");\r
                PrintAndLog("      sample2: hf mf nested 1 0 A FFFFFFFFFFFF t ");\r
                PrintAndLog("      sample3: hf mf nested 1 0 A FFFFFFFFFFFF d ");\r
                PrintAndLog("      sample4: hf mf nested o 0 A FFFFFFFFFFFF 4 A");\r
+               PrintAndLog("      sample5: hf mf nested 1 * t");\r
+               PrintAndLog("      sample6: hf mf nested 1 * ss");\r
                return 0;\r
        }\r
 \r
+       // <card memory>\r
        cmdp = param_getchar(Cmd, 0);\r
-       blockNo = param_get8(Cmd, 1);\r
-       ctmp = param_getchar(Cmd, 2);\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 (cmdp == 'o' || cmdp == 'O') {\r
+               cmdp = 'o';\r
+               SectorsCnt = 1;\r
+       } else {\r
+               SectorsCnt = ParamCardSizeSectors(cmdp);\r
        }\r
 \r
-       if (ctmp != 'A' && ctmp != 'a')\r
-               keyType = 1;\r
+       // <block number>. number or autosearch key (*)\r
+       if (param_getchar(Cmd, 1) == '*') {\r
+               autosearchKey = true;\r
 \r
-       if (param_gethex(Cmd, 3, key, 12)) {\r
-               PrintAndLog("Key must include 12 HEX symbols");\r
-               return 1;\r
-       }\r
+               parseParamTDS(Cmd, 2, &transferToEml, &createDumpFile, &btimeout14a);\r
 \r
-       if (cmdp == 'o' || cmdp == 'O') {\r
-               cmdp = 'o';\r
-               trgBlockNo = param_get8(Cmd, 4);\r
-               ctmp = param_getchar(Cmd, 5);\r
+               PrintAndLog("--nested. sectors:%2d, block no:*, eml:%c, dmp=%c checktimeout=%d us",\r
+                       SectorsCnt, transferToEml?'y':'n', createDumpFile?'y':'n', ((int)btimeout14a * 10000) / 106);\r
+       } else {\r
+               blockNo = param_get8(Cmd, 1);\r
+\r
+               ctmp = param_getchar(Cmd, 2);\r
                if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {\r
-                       PrintAndLog("Target key type must be A or B");\r
+                       PrintAndLog("Key type must be A or B");\r
                        return 1;\r
                }\r
+\r
                if (ctmp != 'A' && ctmp != 'a')\r
-                       trgKeyType = 1;\r
-       } else {\r
+                       keyType = 1;\r
 \r
-               switch (cmdp) {\r
-                       case '0': SectorsCnt = 05; break;\r
-                       case '1': SectorsCnt = 16; break;\r
-                       case '2': SectorsCnt = 32; break;\r
-                       case '4': SectorsCnt = 40; break;\r
-                       default:  SectorsCnt = 16;\r
+               if (param_gethex(Cmd, 3, key, 12)) {\r
+                       PrintAndLog("Key must include 12 HEX symbols");\r
+                       return 1;\r
+               }\r
+\r
+               // check if we can authenticate to sector\r
+               res = mfCheckKeys(blockNo, keyType, true, 1, key, &key64);\r
+               if (res) {\r
+                       PrintAndLog("Can't authenticate to block:%3d key type:%c key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r
+                       return 3;\r
                }\r
-       }\r
 \r
-       ctmp = param_getchar(Cmd, 4);\r
-       if              (ctmp == 't' || ctmp == 'T') transferToEml = true;\r
-       else if (ctmp == 'd' || ctmp == 'D') createDumpFile = true;\r
+               // one sector nested\r
+               if (cmdp == 'o') {\r
+                       trgBlockNo = param_get8(Cmd, 4);\r
 \r
-       ctmp = param_getchar(Cmd, 6);\r
-       transferToEml |= (ctmp == 't' || ctmp == 'T');\r
-       transferToEml |= (ctmp == 'd' || ctmp == 'D');\r
+                       ctmp = param_getchar(Cmd, 5);\r
+                       if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {\r
+                               PrintAndLog("Target key type must be A or B");\r
+                               return 1;\r
+                       }\r
+                       if (ctmp != 'A' && ctmp != 'a')\r
+                               trgKeyType = 1;\r
 \r
-       if (cmdp == 'o') {\r
+                       parseParamTDS(Cmd, 6, &transferToEml, &createDumpFile, &btimeout14a);\r
+               } else {\r
+                       parseParamTDS(Cmd, 4, &transferToEml, &createDumpFile, &btimeout14a);\r
+               }\r
+\r
+               PrintAndLog("--nested. sectors:%2d, block no:%3d, key type:%c, eml:%c, dmp=%c checktimeout=%d us",\r
+                       SectorsCnt, blockNo, keyType?'B':'A', transferToEml?'y':'n', createDumpFile?'y':'n', ((int)btimeout14a * 10000) / 106);\r
+       }\r
+\r
+       // one-sector nested\r
+       if (cmdp == 'o') { // ------------------------------------  one sector working\r
                PrintAndLog("--target block no:%3d, target key type:%c ", trgBlockNo, trgKeyType?'B':'A');\r
                int16_t isOK = mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true);\r
                if (isOK) {\r
@@ -618,10 +723,10 @@ int CmdHF14AMfNested(const char *Cmd)
                        // transfer key to the emulator\r
                        if (transferToEml) {\r
                                uint8_t sectortrailer;\r
-                               if (trgBlockNo < 32*4) {        // 4 block sector\r
-                                       sectortrailer = (trgBlockNo & 0x03) + 3;\r
-                               } else {                                        // 16 block sector\r
-                                       sectortrailer = (trgBlockNo & 0x0f) + 15;\r
+                               if (trgBlockNo < 32*4) {    // 4 block sector\r
+                                       sectortrailer = trgBlockNo | 0x03;\r
+                               } else {                    // 16 block sector\r
+                                       sectortrailer = trgBlockNo | 0x0f;\r
                                }\r
                                mfEmlGetMem(keyBlock, sectortrailer, 1);\r
 \r
@@ -630,6 +735,7 @@ int CmdHF14AMfNested(const char *Cmd)
                                else\r
                                        num_to_bytes(key64, 6, &keyBlock[10]);\r
                                mfEmlSetMem(keyBlock, sectortrailer, 1);\r
+                               PrintAndLog("Key transferred to emulator memory.");\r
                        }\r
                } else {\r
                        PrintAndLog("No valid key found");\r
@@ -643,33 +749,37 @@ int CmdHF14AMfNested(const char *Cmd)
                if (e_sector == NULL) return 1;\r
 \r
                //test current key and additional standard keys first\r
-               memcpy(keyBlock, key, 6);\r
-               num_to_bytes(0xffffffffffff, 6, (uint8_t*)(keyBlock + 1 * 6));\r
-               num_to_bytes(0x000000000000, 6, (uint8_t*)(keyBlock + 2 * 6));\r
-               num_to_bytes(0xa0a1a2a3a4a5, 6, (uint8_t*)(keyBlock + 3 * 6));\r
-               num_to_bytes(0xb0b1b2b3b4b5, 6, (uint8_t*)(keyBlock + 4 * 6));\r
-               num_to_bytes(0xaabbccddeeff, 6, (uint8_t*)(keyBlock + 5 * 6));\r
-               num_to_bytes(0x4d3a99c351dd, 6, (uint8_t*)(keyBlock + 6 * 6));\r
-               num_to_bytes(0x1a982c7e459a, 6, (uint8_t*)(keyBlock + 7 * 6));\r
-               num_to_bytes(0xd3f7d3f7d3f7, 6, (uint8_t*)(keyBlock + 8 * 6));\r
-               num_to_bytes(0x714c5c886e97, 6, (uint8_t*)(keyBlock + 9 * 6));\r
-               num_to_bytes(0x587ee5f9350f, 6, (uint8_t*)(keyBlock + 10 * 6));\r
-               num_to_bytes(0xa0478cc39091, 6, (uint8_t*)(keyBlock + 11 * 6));\r
-               num_to_bytes(0x533cb6c723f6, 6, (uint8_t*)(keyBlock + 12 * 6));\r
-               num_to_bytes(0x8fd0a4f256e9, 6, (uint8_t*)(keyBlock + 13 * 6));\r
+               for (int defaultKeyCounter = 0; defaultKeyCounter < MifareDefaultKeysSize; defaultKeyCounter++){\r
+                       num_to_bytes(MifareDefaultKeys[defaultKeyCounter], 6, (uint8_t*)(keyBlock + defaultKeyCounter * 6));\r
+               }\r
 \r
                PrintAndLog("Testing known keys. Sector count=%d", SectorsCnt);\r
-               for (i = 0; i < SectorsCnt; i++) {\r
-                       for (j = 0; j < 2; j++) {\r
-                               if (e_sector[i].foundKey[j]) continue;\r
+               mfCheckKeysSec(SectorsCnt, 2, btimeout14a, true, MifareDefaultKeysSize, keyBlock, e_sector);\r
 \r
-                               res = mfCheckKeys(FirstBlockOfSector(i), j, true, 6, keyBlock, &key64);\r
-\r
-                               if (!res) {\r
-                                       e_sector[i].Key[j] = key64;\r
-                                       e_sector[i].foundKey[j] = 1;\r
+               // get known key from array\r
+               bool keyFound = false;\r
+               if (autosearchKey) {\r
+                       for (i = 0; i < SectorsCnt; i++) {\r
+                               for (j = 0; j < 2; j++) {\r
+                                       if (e_sector[i].foundKey[j]) {\r
+                                               // get known key\r
+                                               blockNo = i * 4;\r
+                                               keyType = j;\r
+                                               num_to_bytes(e_sector[i].Key[j], 6, key);\r
+                                               keyFound = true;\r
+                                               break;\r
+                                       }\r
                                }\r
+                               if (keyFound) break;\r
+                       }\r
+\r
+                       // Can't found a key....\r
+                       if (!keyFound) {\r
+                               PrintAndLog("Can't found any of the known keys.");\r
+                               free(e_sector);\r
+                               return 4;\r
                        }\r
+                       PrintAndLog("--auto key. block no:%3d, key type:%c key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r
                }\r
 \r
                // nested sectors\r
@@ -702,15 +812,19 @@ int CmdHF14AMfNested(const char *Cmd)
                                                PrintAndLog("Found valid key:%012" PRIx64, key64);\r
                                                e_sector[sectorNo].foundKey[trgKeyType] = 1;\r
                                                e_sector[sectorNo].Key[trgKeyType] = key64;\r
+\r
+                                               // try to check this key as a key to the other sectors\r
+                                               mfCheckKeysSec(SectorsCnt, 2, btimeout14a, true, 1, keyBlock, e_sector);\r
                                        }\r
                                }\r
                        }\r
                }\r
 \r
-               printf("Time in nested: %1.3f (%1.3f sec per key)\n\n", ((float)(msclock() - msclock1))/1000.0, ((float)(msclock() - msclock1))/iterations/1000.0);\r
+               // print nested statistic\r
+               PrintAndLog("\n\n-----------------------------------------------\nNested statistic:\nIterations count: %d", iterations);\r
+               PrintAndLog("Time in nested: %1.3f (%1.3f sec per key)", ((float)(msclock() - msclock1))/1000.0, ((float)(msclock() - msclock1))/iterations/1000.0);\r
 \r
-               PrintAndLog("-----------------------------------------------\nIterations count: %d\n\n", iterations);\r
-               //print them\r
+               // print result\r
                PrintAndLog("|---|----------------|---|----------------|---|");\r
                PrintAndLog("|sec|key A           |res|key B           |res|");\r
                PrintAndLog("|---|----------------|---|----------------|---|");\r
@@ -720,7 +834,7 @@ int CmdHF14AMfNested(const char *Cmd)
                }\r
                PrintAndLog("|---|----------------|---|----------------|---|");\r
 \r
-               // transfer them to the emulator\r
+               // transfer keys to the emulator memory\r
                if (transferToEml) {\r
                        for (i = 0; i < SectorsCnt; i++) {\r
                                mfEmlGetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);\r
@@ -730,6 +844,7 @@ int CmdHF14AMfNested(const char *Cmd)
                                        num_to_bytes(e_sector[i].Key[1], 6, &keyBlock[10]);\r
                                mfEmlSetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);\r
                        }\r
+                       PrintAndLog("Keys transferred to emulator memory.");\r
                }\r
 \r
                // Create dump file\r
@@ -789,6 +904,13 @@ int CmdHF14AMfNestedHard(const char *Cmd)
                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("      iX: set type of SIMD instructions. Without this flag programs autodetect it.");\r
+               PrintAndLog("        i5: AVX512");\r
+               PrintAndLog("        i2: AVX2");\r
+               PrintAndLog("        ia: AVX");\r
+               PrintAndLog("        is: SSE2");\r
+               PrintAndLog("        im: MMX");\r
+               PrintAndLog("        in: none (use CPU regular instruction set)");\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
@@ -807,15 +929,20 @@ int CmdHF14AMfNestedHard(const char *Cmd)
        int tests = 0;\r
 \r
 \r
+       uint16_t iindx = 0;\r
        if (ctmp == 'R' || ctmp == 'r') {\r
                nonce_file_read = true;\r
+               iindx = 1;\r
                if (!param_gethex(Cmd, 1, trgkey, 12)) {\r
                        know_target_key = true;\r
+                       iindx = 2;\r
                }\r
        } else if (ctmp == 'T' || ctmp == 't') {\r
                tests = param_get32ex(Cmd, 1, 100, 10);\r
+               iindx = 2;\r
                if (!param_gethex(Cmd, 2, trgkey, 12)) {\r
                        know_target_key = true;\r
+                       iindx = 3;\r
                }\r
        } else {\r
                blockNo = param_get8(Cmd, 0);\r
@@ -849,20 +976,55 @@ int CmdHF14AMfNestedHard(const char *Cmd)
                        know_target_key = true;\r
                        i++;\r
                }\r
+               iindx = i;\r
 \r
                while ((ctmp = param_getchar(Cmd, i))) {\r
                        if (ctmp == 's' || ctmp == 'S') {\r
                                slow = true;\r
                        } else if (ctmp == 'w' || ctmp == 'W') {\r
                                nonce_file_write = true;\r
+                       } else if (param_getlength(Cmd, i) == 2 && ctmp == 'i') {\r
+                               iindx = i;\r
                        } else {\r
-                               PrintAndLog("Possible options are w and/or s");\r
+                               PrintAndLog("Possible options are w , s and/or iX");\r
                                return 1;\r
                        }\r
                        i++;\r
                }\r
        }\r
 \r
+       SetSIMDInstr(SIMD_AUTO);\r
+       if (iindx > 0) {\r
+               while ((ctmp = param_getchar(Cmd, iindx))) {\r
+                       if (param_getlength(Cmd, iindx) == 2 && ctmp == 'i') {\r
+                               switch(param_getchar_indx(Cmd, 1, iindx)) {\r
+                                       case '5':\r
+                                               SetSIMDInstr(SIMD_AVX512);\r
+                                               break;\r
+                                       case '2':\r
+                                               SetSIMDInstr(SIMD_AVX2);\r
+                                               break;\r
+                                       case 'a':\r
+                                               SetSIMDInstr(SIMD_AVX);\r
+                                               break;\r
+                                       case 's':\r
+                                               SetSIMDInstr(SIMD_SSE2);\r
+                                               break;\r
+                                       case 'm':\r
+                                               SetSIMDInstr(SIMD_MMX);\r
+                                               break;\r
+                                       case 'n':\r
+                                               SetSIMDInstr(SIMD_NONE);\r
+                                               break;\r
+                                       default:\r
+                                               PrintAndLog("Unknown SIMD type. %c", param_getchar_indx(Cmd, 1, iindx));\r
+                                               return 1;\r
+                               }\r
+                       }\r
+                       iindx++;\r
+               }\r
+       }\r
+\r
        PrintAndLog("--target block no:%3d, target key type:%c, known target key: 0x%02x%02x%02x%02x%02x%02x%s, file action: %s, Slow: %s, Tests: %d ",\r
                        trgBlockNo,\r
                        trgKeyType?'B':'A',\r
@@ -890,95 +1052,102 @@ int CmdHF14AMfNestedHard(const char *Cmd)
 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("Usage:  hf mf chk <block number>|<*card memory> <key type (A/B/?)> [t|d|s|ss] [<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\n");\r
-               PrintAndLog("t - write keys to emulator memory");\r
+               PrintAndLog("d  - write keys to binary file (not used when <block number> supplied)");\r
+               PrintAndLog("t  - write keys to emulator memory");\r
+               PrintAndLog("s  - slow execute. timeout 1ms");\r
+               PrintAndLog("ss - very slow execute. timeout 5ms");\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
+               PrintAndLog("              hf mf chk *1 ? s");\r
+               PrintAndLog("              hf mf chk *1 ? dss");\r
                return 0;\r
        }\r
 \r
-       FILE * f;\r
-       char filename[FILE_PATH_SIZE]={0};\r
-       char buf[13];\r
-       uint8_t *keyBlock = NULL, *p;\r
-       uint16_t stKeyBlock = 20;\r
-\r
-       int i, res;\r
-       int     keycnt = 0;\r
-       char ctmp       = 0x00;\r
-       uint8_t blockNo = 0;\r
-       uint8_t SectorsCnt = 1;\r
-       uint8_t keyType = 0;\r
-       uint64_t key64 = 0;\r
+       FILE     * f;\r
+       char     filename[FILE_PATH_SIZE]={0};\r
+       char     buf[13];\r
+       uint8_t  *keyBlock      = NULL, *p;\r
+       uint16_t stKeyBlock     = 20;\r
+       int      i, res;\r
+       int      keycnt         = 0;\r
+       char     ctmp           = 0x00;\r
+       int      clen           = 0;\r
+       uint8_t  blockNo        = 0;\r
+       uint8_t  SectorsCnt     = 0;\r
+       uint8_t  keyType        = 0;\r
+       uint64_t key64          = 0;\r
+       // timeout in units. (ms * 106)/10 or us*0.0106\r
+       uint8_t  btimeout14a    = MF_CHKKEYS_DEFTIMEOUT; // fast by default\r
+       bool     param3InUse    = false;\r
+       bool     transferToEml  = 0;\r
+       bool     createDumpFile = 0;\r
+       bool     singleBlock    = false;     // Flag to ID if a single or multi key check\r
+       uint8_t  keyFoundCount  = 0;         // Counter to display the number of keys found/transfered to emulator\r
 \r
-       int transferToEml = 0;\r
-       int createDumpFile = 0;\r
+       sector_t *e_sector = NULL;\r
 \r
        keyBlock = calloc(stKeyBlock, 6);\r
        if (keyBlock == NULL) return 1;\r
 \r
-       uint64_t defaultKeys[] =\r
-       {\r
-               0xffffffffffff, // Default key (first key used by program if no user defined key)\r
-               0x000000000000, // Blank key\r
-               0xa0a1a2a3a4a5, // NFCForum MAD key\r
-               0xb0b1b2b3b4b5,\r
-               0xaabbccddeeff,\r
-               0x4d3a99c351dd,\r
-               0x1a982c7e459a,\r
-               0xd3f7d3f7d3f7,\r
-               0x714c5c886e97,\r
-               0x587ee5f9350f,\r
-               0xa0478cc39091,\r
-               0x533cb6c723f6,\r
-               0x8fd0a4f256e9\r
-       };\r
-       int defaultKeysSize = sizeof(defaultKeys) / sizeof(uint64_t);\r
-\r
-       for (int defaultKeyCounter = 0; defaultKeyCounter < defaultKeysSize; defaultKeyCounter++)\r
-       {\r
-               num_to_bytes(defaultKeys[defaultKeyCounter], 6, (uint8_t*)(keyBlock + defaultKeyCounter * 6));\r
+       int defaultKeysSize = MifareDefaultKeysSize;\r
+       for (int defaultKeyCounter = 0; defaultKeyCounter < defaultKeysSize; defaultKeyCounter++){\r
+               num_to_bytes(MifareDefaultKeys[defaultKeyCounter], 6, (uint8_t*)(keyBlock + defaultKeyCounter * 6));\r
        }\r
 \r
        if (param_getchar(Cmd, 0)=='*') {\r
-               blockNo = 3;\r
-               switch(param_getchar(Cmd+1, 0)) {\r
-                       case '0': SectorsCnt =  5; break;\r
-                       case '1': SectorsCnt = 16; break;\r
-                       case '2': SectorsCnt = 32; break;\r
-                       case '4': SectorsCnt = 40; break;\r
-                       default:  SectorsCnt = 16;\r
+               SectorsCnt = ParamCardSizeSectors(param_getchar(Cmd + 1, 0));\r
+       } else {   \r
+               blockNo = param_get8(Cmd, 0);\r
+               // Singe Key check, so Set Sector count to cover sectors (1 to sector that contains the block)\r
+               // 1 and 2 Cards : Sector = blockNo/4 + 1\r
+               // Sectors  0 - 31  :  4 blocks per sector : Blocks 0 - 127\r
+               // Sectors 32 - 39  : 16 blocks per sector : Blocks 128 - 255 (4K)\r
+               if (blockNo < 128) {\r
+                       SectorsCnt = (blockNo / 4) + 1;\r
+               } else {\r
+                       SectorsCnt = 32 + ((blockNo-128)/16) + 1;\r
                }\r
+               singleBlock  = true;              // Set flag for single key check\r
        }\r
-       else\r
-               blockNo = param_get8(Cmd, 0);\r
 \r
        ctmp = param_getchar(Cmd, 1);\r
-       switch (ctmp) {\r
-       case 'a': case 'A':\r
-               keyType = !0;\r
-               break;\r
-       case 'b': case 'B':\r
-               keyType = !1;\r
-               break;\r
-       case '?':\r
-               keyType = 2;\r
-               break;\r
-       default:\r
-               PrintAndLog("Key type must be A , B or ?");\r
-               free(keyBlock);\r
+       clen = param_getlength(Cmd, 1);\r
+       if (clen == 1) {\r
+               switch (ctmp) {\r
+               case 'a': case 'A':\r
+                       keyType = 0;\r
+                       break;\r
+               case 'b': case 'B':\r
+                       keyType = 1;\r
+                       break;\r
+               case '?':\r
+                       keyType = 2;\r
+                       break;\r
+               default:\r
+                       PrintAndLog("Key type must be A , B or ?");\r
+                       free(keyBlock);\r
+                       return 1;\r
+               };\r
+       }\r
+\r
+       parseParamTDS(Cmd, 2, &transferToEml, &createDumpFile, &btimeout14a);\r
+\r
+       if (singleBlock & createDumpFile) {\r
+               PrintAndLog (" block key check (<block no>) and write to dump file (d) combination is not supported ");\r
+               PrintAndLog (" please remove option d and try again");\r
                return 1;\r
-       };\r
+       }\r
 \r
-       ctmp = param_getchar(Cmd, 2);\r
-       if              (ctmp == 't' || ctmp == 'T') transferToEml = 1;\r
-       else if (ctmp == 'd' || ctmp == 'D') createDumpFile = 1;\r
+       param3InUse = transferToEml | createDumpFile | (btimeout14a != MF_CHKKEYS_DEFTIMEOUT);\r
 \r
-       for (i = transferToEml || createDumpFile; param_getchar(Cmd, 2 + i); i++) {\r
+       PrintAndLog("--chk keys. sectors:%2d, block no:%3d, key type:%c, eml:%c, dmp=%c checktimeout=%d us",\r
+                       SectorsCnt, blockNo, keyType==0?'A':keyType==1?'B':'?', transferToEml?'y':'n', createDumpFile?'y':'n', ((int)btimeout14a * 10000) / 106);\r
+\r
+       for (i = param3InUse; param_getchar(Cmd, 2 + i); i++) {\r
                if (!param_gethex(Cmd, 2 + i, keyBlock + 6 * keycnt, 12)) {\r
                        if ( stKeyBlock - keycnt < 2) {\r
                                p = realloc(keyBlock, 6*(stKeyBlock+=10));\r
@@ -990,34 +1159,40 @@ int CmdHF14AMfChk(const char *Cmd)
                                keyBlock = p;\r
                        }\r
                        PrintAndLog("chk key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,\r
-                       (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],\r
-                       (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],     (keyBlock + 6*keycnt)[5], 6);\r
+                       (keyBlock + 6*keycnt)[0], (keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],\r
+                       (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6);\r
                        keycnt++;\r
                } else {\r
                        // May be a dic file\r
-                       if ( param_getstr(Cmd, 2 + i,filename) >= FILE_PATH_SIZE ) {\r
+                       if ( param_getstr(Cmd, 2 + i, filename, sizeof(filename)) >= FILE_PATH_SIZE ) {\r
                                PrintAndLog("File name too long");\r
                                free(keyBlock);\r
                                return 2;\r
                        }\r
 \r
-                       if ( (f = fopen( filename , "r")) ) {\r
-                               while( fgets(buf, sizeof(buf), f) ){\r
+                       if ((f = fopen( filename , "r"))) {\r
+                               while (fgets(buf, sizeof(buf), f)) {\r
                                        if (strlen(buf) < 12 || buf[11] == '\n')\r
                                                continue;\r
 \r
                                        while (fgetc(f) != '\n' && !feof(f)) ;  //goto next line\r
 \r
-                                       if( buf[0]=='#' ) continue;     //The line start with # is comment, skip\r
+                                       if( buf[0]=='#' ) continue; //The line start with # is comment, skip\r
 \r
-                                       if (!isxdigit(buf[0])){\r
-                                               PrintAndLog("File content error. '%s' must include 12 HEX symbols",buf);\r
+                                       bool content_error = false;\r
+                                       for (int i = 0; i < 12; i++) {\r
+                                               if (!isxdigit((unsigned char)buf[i])) {\r
+                                                       content_error = true;\r
+                                               }\r
+                                       }\r
+                                       if (content_error) {\r
+                                               PrintAndLog("File content error. '%s' must include 12 HEX symbols", buf);\r
                                                continue;\r
                                        }\r
 \r
                                        buf[12] = 0;\r
 \r
-                                       if ( stKeyBlock - keycnt < 2) {\r
+                                       if (stKeyBlock - keycnt < 2) {\r
                                                p = realloc(keyBlock, 6*(stKeyBlock+=10));\r
                                                if (!p) {\r
                                                        PrintAndLog("Cannot allocate memory for defKeys");\r
@@ -1038,91 +1213,160 @@ int CmdHF14AMfChk(const char *Cmd)
                                PrintAndLog("File: %s: not found or locked.", filename);\r
                                free(keyBlock);\r
                                return 1;\r
-\r
                        }\r
                }\r
        }\r
 \r
+       // fill with default keys\r
        if (keycnt == 0) {\r
                PrintAndLog("No key specified, trying default keys");\r
                for (;keycnt < defaultKeysSize; keycnt++)\r
                        PrintAndLog("chk default key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,\r
-                               (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],\r
-                               (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],     (keyBlock + 6*keycnt)[5], 6);\r
+                               (keyBlock + 6*keycnt)[0], (keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],\r
+                               (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6);\r
        }\r
 \r
        // initialize storage for found keys\r
-       bool validKey[2][40];\r
-       uint8_t foundKey[2][40][6];\r
-       for (uint16_t t = 0; t < 2; t++) {\r
+       e_sector = calloc(SectorsCnt, sizeof(sector_t));\r
+       if (e_sector == NULL) {\r
+               free(keyBlock);\r
+               return 1;\r
+       }\r
+       for (uint8_t keyAB = 0; keyAB < 2; keyAB++) {\r
                for (uint16_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {\r
-                       validKey[t][sectorNo] = false;\r
-                       for (uint16_t i = 0; i < 6; i++) {\r
-                               foundKey[t][sectorNo][i] = 0xff;\r
-                       }\r
+                       e_sector[sectorNo].Key[keyAB] = 0xffffffffffff;\r
+                       e_sector[sectorNo].foundKey[keyAB] = 0;\r
                }\r
        }\r
+       printf("\n");\r
+\r
+       bool foundAKey = false;\r
+       bool clearTraceLog = true;\r
+       uint32_t max_keys  = keycnt > USB_CMD_DATA_SIZE / 6 ? USB_CMD_DATA_SIZE / 6 : keycnt;\r
+\r
+       // !SingleKey, so all key check (if SectorsCnt > 0)\r
+       if (!singleBlock) {\r
+               PrintAndLog("To cancel this operation press the button on the proxmark...");\r
+               printf("--");\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
+                       res = mfCheckKeysSec(SectorsCnt, keyType, btimeout14a, clearTraceLog, size, &keyBlock[6 * c], e_sector); // timeout is (ms * 106)/10 or us*0.0106\r
+                       clearTraceLog = false;\r
+\r
+                       if (res != 1) {\r
+                               if (!res) {\r
+                                       printf("o");\r
+                                       foundAKey = true;\r
+                               } else {\r
+                                       printf(".");\r
+                               }\r
+                       } else {\r
+                               printf("\n");\r
+                               PrintAndLog("Command execute timeout");\r
+                       }\r
+               }\r
+       } else {\r
+               int keyAB = keyType;\r
+               do {\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
+                               res = mfCheckKeys(blockNo, keyAB & 0x01, true, size, &keyBlock[6 * c], &key64);\r
+                               clearTraceLog = false;\r
 \r
-       for ( int t = !keyType; t < 2; keyType==2?(t++):(t=2) ) {\r
-               int b=blockNo;\r
-               for (int i = 0; i < SectorsCnt; ++i) {\r
-                       PrintAndLog("--sector:%2d, block:%3d, key type:%C, key count:%2d ", i, b, t?'B':'A', keycnt);\r
-                       uint32_t max_keys = keycnt>USB_CMD_DATA_SIZE/6?USB_CMD_DATA_SIZE/6:keycnt;\r
-                       for (uint32_t c = 0; c < keycnt; c+=max_keys) {\r
-                               uint32_t size = keycnt-c>max_keys?max_keys:keycnt-c;\r
-                               res = mfCheckKeys(b, t, true, size, &keyBlock[6*c], &key64);\r
                                if (res != 1) {\r
                                        if (!res) {\r
-                                               PrintAndLog("Found valid key:[%012" PRIx64 "]",key64);\r
-                                               num_to_bytes(key64, 6, foundKey[t][i]);\r
-                                               validKey[t][i] = true;\r
+                                               // Use the common format below\r
+                                               // PrintAndLog("Found valid key:[%d:%c]%012" PRIx64, blockNo, (keyAB & 0x01)?'B':'A', key64);\r
+                                               foundAKey = true;\r
+\r
+                                               // Store the Single Key for display list\r
+                                               // For a single block check, SectorsCnt = Sector that contains the block\r
+                                               e_sector[SectorsCnt-1].foundKey[(keyAB & 0x01)] = true;  // flag key found\r
+                                               e_sector[SectorsCnt-1].Key[(keyAB & 0x01)]      = key64; // Save key data\r
+\r
                                        }\r
                                } else {\r
                                        PrintAndLog("Command execute timeout");\r
                                }\r
                        }\r
-                       b<127?(b+=4):(b+=16);\r
+               } while(--keyAB > 0);\r
+       }\r
+\r
+       // print result\r
+       if (foundAKey) {\r
+               PrintAndLog("");\r
+               PrintAndLog("|---|----------------|----------------|");\r
+               PrintAndLog("|sec|key A           |key B           |");\r
+               PrintAndLog("|---|----------------|----------------|");\r
+               for (i = 0; i < SectorsCnt; i++) {\r
+                       // If a block key check, only print a line if a key was found.\r
+                       if (!singleBlock || e_sector[i].foundKey[0] || e_sector[i].foundKey[1]) {\r
+                               char keyAString[13] = "      ?     ";\r
+                               char keyBString[13] = "      ?     ";\r
+                               if (e_sector[i].foundKey[0]) {\r
+                                       sprintf(keyAString, "%012" PRIx64, e_sector[i].Key[0]);\r
+                               }\r
+                               if (e_sector[i].foundKey[1]) {\r
+                                       sprintf(keyBString, "%012" PRIx64, e_sector[i].Key[1]);\r
+                               }\r
+                               PrintAndLog("|%03d|  %s  |  %s  |", i, keyAString, keyBString);\r
+                       }\r
                }\r
+               PrintAndLog("|---|----------------|----------------|");\r
+       } else {\r
+               PrintAndLog("");\r
+               PrintAndLog("No valid keys found.");\r
        }\r
 \r
        if (transferToEml) {\r
                uint8_t block[16];\r
                for (uint16_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {\r
-                       if (validKey[0][sectorNo] || validKey[1][sectorNo]) {\r
+                       if (e_sector[sectorNo].foundKey[0] || e_sector[sectorNo].foundKey[1]) {\r
                                mfEmlGetMem(block, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);\r
                                for (uint16_t t = 0; t < 2; t++) {\r
-                                       if (validKey[t][sectorNo]) {\r
-                                               memcpy(block + t*10, foundKey[t][sectorNo], 6);\r
+                                       if (e_sector[sectorNo].foundKey[t]) {\r
+                                               num_to_bytes(e_sector[sectorNo].Key[t], 6, block + t * 10);\r
+                                               keyFoundCount++; // Key found count for information\r
                                        }\r
                                }\r
                                mfEmlSetMem(block, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);\r
                        }\r
                }\r
-               PrintAndLog("Found keys have been transferred to the emulator memory");\r
+               // Updated to show the actual number of keys found/transfered.\r
+               PrintAndLog("%d keys(s) found have been transferred to the emulator memory",keyFoundCount);\r
        }\r
 \r
-       if (createDumpFile) {\r
+       if (createDumpFile && !singleBlock) {\r
                FILE *fkeys = fopen("dumpkeys.bin","wb");\r
                if (fkeys == NULL) {\r
                        PrintAndLog("Could not create file dumpkeys.bin");\r
+                       free(e_sector);\r
                        free(keyBlock);\r
                        return 1;\r
                }\r
-               for (uint16_t t = 0; t < 2; t++) {\r
-                       fwrite(foundKey[t], 1, 6*SectorsCnt, fkeys);\r
+               uint8_t mkey[6];\r
+               for (uint8_t t = 0; t < 2; t++) {\r
+                       for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {\r
+                               num_to_bytes(e_sector[sectorNo].Key[t], 6, mkey);\r
+                               fwrite(mkey, 1, 6, fkeys);\r
+                       }\r
                }\r
                fclose(fkeys);\r
                PrintAndLog("Found keys have been dumped to file dumpkeys.bin. 0xffffffffffff has been inserted for unknown keys.");\r
        }\r
 \r
+       free(e_sector);\r
        free(keyBlock);\r
        PrintAndLog("");\r
        return 0;\r
 }\r
 \r
+\r
 void readerAttack(nonces_t ar_resp[], bool setEmulatorMem, bool doStandardAttack) {\r
        #define ATTACK_KEY_COUNT 7 // keep same as define in iso14443a.c -> Mifare1ksim()\r
-                                  // cannot be more than 7 or it will overrun c.d.asBytes(512)\r
+                                                          // cannot be more than 7 or it will overrun c.d.asBytes(512)\r
        uint64_t key = 0;\r
        typedef struct {\r
                        uint64_t keyA;\r
@@ -1131,7 +1375,7 @@ void readerAttack(nonces_t ar_resp[], bool setEmulatorMem, bool doStandardAttack
        st_t sector_trailer[ATTACK_KEY_COUNT];\r
        memset(sector_trailer, 0x00, sizeof(sector_trailer));\r
 \r
-       uint8_t stSector[ATTACK_KEY_COUNT];\r
+       uint8_t stSector[ATTACK_KEY_COUNT];\r
        memset(stSector, 0x00, sizeof(stSector));\r
        uint8_t key_cnt[ATTACK_KEY_COUNT];\r
        memset(key_cnt, 0x00, sizeof(key_cnt));\r
@@ -1194,7 +1438,7 @@ void readerAttack(nonces_t ar_resp[], bool setEmulatorMem, bool doStandardAttack
        if (setEmulatorMem) {\r
                for (uint8_t i = 0; i<ATTACK_KEY_COUNT; i++) {\r
                        if (key_cnt[i]>0) {\r
-                               uint8_t memBlock[16];\r
+                               uint8_t memBlock[16];\r
                                memset(memBlock, 0x00, sizeof(memBlock));\r
                                char cmd1[36];\r
                                memset(cmd1,0x00,sizeof(cmd1));\r
@@ -1223,11 +1467,12 @@ void readerAttack(nonces_t ar_resp[], bool setEmulatorMem, bool doStandardAttack
        }*/\r
 }\r
 \r
-int usage_hf14_mf1ksim(void) {\r
-       PrintAndLog("Usage:  hf mf sim h u <uid (8, 14, or 20 hex symbols)> n <numreads> i x");\r
+int usage_hf14_mfsim(void) {\r
+       PrintAndLog("Usage:  hf mf sim [h] [*<card memory>] [u <uid (8, 14, or 20 hex symbols)>] [n <numreads>] [i] [x]");\r
        PrintAndLog("options:");\r
-       PrintAndLog("      h    this help");\r
-       PrintAndLog("      u    (Optional) UID 4,7 or 10 bytes. If not specified, the UID 4B from emulator memory will be used");\r
+       PrintAndLog("      h    (Optional) this help");\r
+       PrintAndLog("      card memory: 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other, default> - 1K");\r
+       PrintAndLog("      u    (Optional) UID 4 or 7 bytes. 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
@@ -1236,21 +1481,20 @@ int usage_hf14_mf1ksim(void) {
        PrintAndLog("      r    (Optional) Generate random nonces instead of sequential nonces. Standard reader attack won't work with this option, only moebius attack works.");\r
        PrintAndLog("samples:");\r
        PrintAndLog("           hf mf sim u 0a0a0a0a");\r
+       PrintAndLog("           hf mf sim *4");\r
        PrintAndLog("           hf mf sim u 11223344556677");\r
-       PrintAndLog("           hf mf sim u 112233445566778899AA");\r
        PrintAndLog("           hf mf sim f uids.txt");\r
        PrintAndLog("           hf mf sim u 0a0a0a0a e");\r
 \r
        return 0;\r
 }\r
 \r
-int CmdHF14AMf1kSim(const char *Cmd) {\r
+int CmdHF14AMfSim(const char *Cmd) {\r
        UsbCommand resp;\r
-       uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};\r
+       uint8_t uid[7] = {0};\r
        uint8_t exitAfterNReads = 0;\r
        uint8_t flags = 0;\r
        int uidlen = 0;\r
-       uint8_t pnr = 0;\r
        bool setEmulatorMem = false;\r
        bool attackFromFile = false;\r
        FILE *f;\r
@@ -1261,9 +1505,21 @@ int CmdHF14AMf1kSim(const char *Cmd) {
 \r
        uint8_t cmdp = 0;\r
        bool errors = false;\r
+       uint8_t cardsize = '1';\r
 \r
        while(param_getchar(Cmd, cmdp) != 0x00) {\r
                switch(param_getchar(Cmd, cmdp)) {\r
+               case '*':\r
+                       cardsize = param_getchar(Cmd + 1, cmdp);\r
+                       switch(cardsize) {\r
+                               case '0':\r
+                               case '1':\r
+                               case '2':\r
+                               case '4': break;\r
+                               default: cardsize = '1';\r
+                       }\r
+                       cmdp++;\r
+                       break;\r
                case 'e':\r
                case 'E':\r
                        setEmulatorMem = true;\r
@@ -1274,7 +1530,7 @@ int CmdHF14AMf1kSim(const char *Cmd) {
                        break;\r
                case 'f':\r
                case 'F':\r
-                       len = param_getstr(Cmd, cmdp+1, filename);\r
+                       len = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));\r
                        if (len < 1) {\r
                                PrintAndLog("error no filename found");\r
                                return 0;\r
@@ -1287,7 +1543,7 @@ int CmdHF14AMf1kSim(const char *Cmd) {
                        break;\r
                case 'h':\r
                case 'H':\r
-                       return usage_hf14_mf1ksim();\r
+                       return usage_hf14_mfsim();\r
                case 'i':\r
                case 'I':\r
                        flags |= FLAG_INTERACTIVE;\r
@@ -1295,7 +1551,7 @@ int CmdHF14AMf1kSim(const char *Cmd) {
                        break;\r
                case 'n':\r
                case 'N':\r
-                       exitAfterNReads = param_get8(Cmd, pnr+1);\r
+                       exitAfterNReads = param_get8(Cmd, cmdp+1);\r
                        cmdp += 2;\r
                        break;\r
                case 'r':\r
@@ -1305,12 +1561,14 @@ int CmdHF14AMf1kSim(const char *Cmd) {
                        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; //not complete\r
+                       uidlen = 14;\r
+                       if (param_gethex_ex(Cmd, cmdp+1, uid, &uidlen)) {\r
+                               return usage_hf14_mfsim();\r
+                       }\r
+                       switch (uidlen) {\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
+                               default: return usage_hf14_mfsim();\r
                        }\r
                        cmdp += 2;\r
                        break;\r
@@ -1327,7 +1585,7 @@ int CmdHF14AMf1kSim(const char *Cmd) {
                if(errors) break;\r
        }\r
        //Validations\r
-       if(errors) return usage_hf14_mf1ksim();\r
+       if(errors) return usage_hf14_mfsim();\r
 \r
        //get uid from file\r
        if (attackFromFile) {\r
@@ -1354,7 +1612,6 @@ int CmdHF14AMf1kSim(const char *Cmd) {
 \r
                        uidlen = strlen(buf)-1;\r
                        switch(uidlen) {\r
-                               case 20: flags |= FLAG_10B_UID_IN_DATA; break; //not complete\r
                                case 14: flags |= FLAG_7B_UID_IN_DATA; break;\r
                                case  8: flags |= FLAG_4B_UID_IN_DATA; break;\r
                                default:\r
@@ -1367,18 +1624,22 @@ int CmdHF14AMf1kSim(const char *Cmd) {
                                sscanf(&buf[i], "%02x", (unsigned int *)&uid[i / 2]);\r
                        }\r
 \r
-                       PrintAndLog("mf 1k sim uid: %s, numreads:%d, flags:%d (0x%02x) - press button to abort",\r
-                                       flags & FLAG_4B_UID_IN_DATA ? sprint_hex(uid,4):\r
-                                               flags & FLAG_7B_UID_IN_DATA     ? sprint_hex(uid,7):\r
-                                                       flags & FLAG_10B_UID_IN_DATA ? sprint_hex(uid,10): "N/A"\r
-                                       , exitAfterNReads, flags, flags);\r
+                       PrintAndLog("mf sim cardsize: %s, uid: %s, numreads:%d, flags:%d (0x%02x) - press button to abort",\r
+                               cardsize == '0' ? "Mini" :\r
+                                       cardsize == '2' ? "2K" :\r
+                                               cardsize == '4' ? "4K" : "1K",\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
+                               exitAfterNReads,\r
+                               flags,\r
+                               flags);\r
 \r
-                       UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads,0}};\r
+                       UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads, cardsize}};\r
                        memcpy(c.d.asBytes, uid, sizeof(uid));\r
                        clearCommandBuffer();\r
                        SendCommand(&c);\r
 \r
-                       while(! WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+                       while (! WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
                                //We're waiting only 1.5 s at a time, otherwise we get the\r
                                // annoying message about "Waiting for a response... "\r
                        }\r
@@ -1395,22 +1656,27 @@ int CmdHF14AMf1kSim(const char *Cmd) {
                        count++;\r
                }\r
                fclose(f);\r
-       } else { //not from file\r
 \r
-               PrintAndLog("mf 1k sim 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):\r
-                                               flags & FLAG_10B_UID_IN_DATA ? sprint_hex(uid,10): "N/A"\r
-                               , exitAfterNReads, flags, flags);\r
+       } else { //not from file\r
 \r
-               UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads,0}};\r
+               PrintAndLog("mf sim cardsize: %s, uid: %s, numreads:%d, flags:%d (0x%02x) ",\r
+                       cardsize == '0' ? "Mini" :\r
+                               cardsize == '2' ? "2K" :\r
+                                       cardsize == '4' ? "4K" : "1K",\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
+                       exitAfterNReads,\r
+                       flags,\r
+                       flags);\r
+\r
+               UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads, cardsize}};\r
                memcpy(c.d.asBytes, uid, sizeof(uid));\r
                clearCommandBuffer();\r
                SendCommand(&c);\r
 \r
                if(flags & FLAG_INTERACTIVE) {\r
                        PrintAndLog("Press pm3-button to abort simulation");\r
-                       while(! WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+                       while(! WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {\r
                                //We're waiting only 1.5 s at a time, otherwise we get the\r
                                // annoying message about "Waiting for a response... "\r
                        }\r
@@ -1445,10 +1711,10 @@ int CmdHF14AMfDbg(const char *Cmd)
                return 0;\r
        }\r
 \r
-  UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}};\r
-  SendCommand(&c);\r
+       UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}};\r
+       SendCommand(&c);\r
 \r
-  return 0;\r
+       return 0;\r
 }\r
 \r
 int CmdHF14AMfEGet(const char *Cmd)\r
@@ -1471,7 +1737,7 @@ int CmdHF14AMfEGet(const char *Cmd)
                PrintAndLog("Command execute timeout");\r
        }\r
 \r
-  return 0;\r
+       return 0;\r
 }\r
 \r
 int CmdHF14AMfEClear(const char *Cmd)\r
@@ -1482,9 +1748,9 @@ int CmdHF14AMfEClear(const char *Cmd)
                return 0;\r
        }\r
 \r
-  UsbCommand c = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}};\r
-  SendCommand(&c);\r
-  return 0;\r
+       UsbCommand c = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}};\r
+       SendCommand(&c);\r
+       return 0;\r
 }\r
 \r
 \r
@@ -1509,10 +1775,7 @@ int CmdHF14AMfESet(const char *Cmd)
        }\r
 \r
        //  1 - blocks count\r
-       UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNo, 1, 0}};\r
-       memcpy(c.d.asBytes, memBlock, 16);\r
-       SendCommand(&c);\r
-       return 0;\r
+       return mfEmlSetMem(memBlock, blockNo, 1);\r
 }\r
 \r
 \r
@@ -1550,7 +1813,7 @@ int CmdHF14AMfELoad(const char *Cmd)
                }\r
        }\r
 \r
-       len = param_getstr(Cmd,nameParamNo,filename);\r
+       len = param_getstr(Cmd, nameParamNo, filename, sizeof(filename));\r
 \r
        if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
 \r
@@ -1649,7 +1912,7 @@ int CmdHF14AMfESave(const char *Cmd)
                }\r
        }\r
 \r
-       len = param_getstr(Cmd,nameParamNo,filename);\r
+       len = param_getstr(Cmd,nameParamNo,filename,sizeof(filename));\r
 \r
        if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
 \r
@@ -1694,7 +1957,7 @@ int CmdHF14AMfESave(const char *Cmd)
 \r
        PrintAndLog("Saved %d blocks to file: %s", numBlocks, filename);\r
 \r
-  return 0;\r
+       return 0;\r
 }\r
 \r
 \r
@@ -1731,37 +1994,43 @@ int CmdHF14AMfECFill(const char *Cmd)
                default:   numSectors = 16;\r
        }\r
 \r
-       printf("--params: numSectors: %d, keyType:%d", numSectors, keyType);\r
+       printf("--params: numSectors: %d, keyType:%d\n", numSectors, keyType);\r
        UsbCommand c = {CMD_MIFARE_EML_CARDLOAD, {numSectors, keyType, 0}};\r
        SendCommand(&c);\r
        return 0;\r
 }\r
 \r
+\r
 int CmdHF14AMfEKeyPrn(const char *Cmd)\r
 {\r
        int i;\r
-       uint8_t numSectors;\r
+       uint8_t numSectors = 16;\r
        uint8_t data[16];\r
        uint64_t keyA, keyB;\r
+       bool createDumpFile = false;\r
 \r
        if (param_getchar(Cmd, 0) == 'h') {\r
                PrintAndLog("It prints the keys loaded in the emulator memory");\r
-               PrintAndLog("Usage:  hf mf ekeyprn [card memory]");\r
+               PrintAndLog("Usage:  hf mf ekeyprn [card memory] [d]");\r
                PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r
+               PrintAndLog("  [d]          : write keys to binary file dumpkeys.bin");\r
                PrintAndLog("");\r
                PrintAndLog(" sample: hf mf ekeyprn 1");\r
                return 0;\r
        }\r
 \r
-       char cmdp = param_getchar(Cmd, 0);\r
-\r
-       switch (cmdp) {\r
-               case '0' : numSectors = 5; break;\r
-               case '1' :\r
-               case '\0': numSectors = 16; break;\r
-               case '2' : numSectors = 32; break;\r
-               case '4' : numSectors = 40; break;\r
-               default:   numSectors = 16;\r
+       uint8_t cmdp = 0;\r
+       while (param_getchar(Cmd, cmdp) != 0x00) {\r
+               switch (param_getchar(Cmd, cmdp)) {\r
+                       case '0' : numSectors = 5; break;\r
+                       case '1' :\r
+                       case '\0': numSectors = 16; break;\r
+                       case '2' : numSectors = 32; break;\r
+                       case '4' : numSectors = 40; break;\r
+                       case 'd' :\r
+                       case 'D' : createDumpFile = true; break;\r
+               }\r
+               cmdp++;\r
        }\r
 \r
        PrintAndLog("|---|----------------|----------------|");\r
@@ -1778,9 +2047,35 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
        }\r
        PrintAndLog("|---|----------------|----------------|");\r
 \r
+       // Create dump file\r
+       if (createDumpFile) {\r
+               FILE *fkeys;\r
+               if ((fkeys = fopen("dumpkeys.bin","wb")) == NULL) {\r
+                       PrintAndLog("Could not create file dumpkeys.bin");\r
+                       return 1;\r
+               }\r
+               PrintAndLog("Printing keys to binary file dumpkeys.bin...");\r
+               for(i = 0; i < numSectors; i++) {\r
+                       if (mfEmlGetMem(data, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1)) {\r
+                               PrintAndLog("error get block %d", FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);\r
+                               break;\r
+                       }\r
+                       fwrite(data+6, 1, 6, fkeys);\r
+               }\r
+               for(i = 0; i < numSectors; i++) {\r
+                       if (mfEmlGetMem(data, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1)) {\r
+                               PrintAndLog("error get block %d", FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);\r
+                               break;\r
+                       }\r
+                       fwrite(data+10, 1, 6, fkeys);\r
+               }\r
+               fclose(fkeys);\r
+       }\r
+\r
        return 0;\r
 }\r
 \r
+\r
 int CmdHF14AMfCSetUID(const char *Cmd)\r
 {\r
        uint8_t uid[8] = {0x00};\r
@@ -1792,7 +2087,7 @@ int CmdHF14AMfCSetUID(const char *Cmd)
 \r
        uint8_t needHelp = 0;\r
        char cmdp = 1;\r
-       \r
+\r
        if (param_getchar(Cmd, 0) && param_gethex(Cmd, 0, uid, 8)) {\r
                PrintAndLog("UID must include 8 HEX symbols");\r
                return 1;\r
@@ -1801,12 +2096,12 @@ int CmdHF14AMfCSetUID(const char *Cmd)
        if (param_getlength(Cmd, 1) > 1 && param_getlength(Cmd, 2) >  1) {\r
                atqaPresent = 1;\r
                cmdp = 3;\r
-               \r
+\r
                if (param_gethex(Cmd, 1, atqa, 4)) {\r
                        PrintAndLog("ATQA must include 4 HEX symbols");\r
                        return 1;\r
                }\r
-                               \r
+\r
                if (param_gethex(Cmd, 2, sak, 2)) {\r
                        PrintAndLog("SAK must include 2 HEX symbols");\r
                        return 1;\r
@@ -1854,27 +2149,16 @@ int CmdHF14AMfCSetUID(const char *Cmd)
        return 0;\r
 }\r
 \r
-static int ParamGetCardSize(const char c) {\r
-       int numBlocks = 16 * 4;\r
-       switch (c) {\r
-               case '0' : numBlocks = 5 * 4; break;\r
-               case '2' : numBlocks = 32 * 4; break;\r
-               case '4' : numBlocks = 32 * 4 + 8 * 16; break;\r
-               default:   numBlocks = 16 * 4;\r
-       }\r
-       return numBlocks;\r
-}\r
-\r
 int CmdHF14AMfCWipe(const char *Cmd)\r
 {\r
        int res, gen = 0;\r
        int numBlocks = 16 * 4;\r
        bool wipeCard = false;\r
        bool fillCard = false;\r
-       \r
+\r
        if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
-               PrintAndLog("Usage:  hf mf cwipe [card size] [w] [p]");\r
-               PrintAndLog("sample:  hf mf cwipe 1 w s");\r
+               PrintAndLog("Usage:  hf mf cwipe [card size] [w] [f]");\r
+               PrintAndLog("sample:  hf mf cwipe 1 w f");\r
                PrintAndLog("[card size]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r
                PrintAndLog("w - Wipe magic Chinese card (only works with gen:1a cards)");\r
                PrintAndLog("f - Fill the card with default data and keys (works with gen:1a and gen:1b cards only)");\r
@@ -1882,10 +2166,10 @@ int CmdHF14AMfCWipe(const char *Cmd)
        }\r
 \r
        gen = mfCIdentify();\r
-       if ((gen != 1) && (gen != 2)) \r
+       if ((gen != 1) && (gen != 2))\r
                return 1;\r
-       \r
-       numBlocks = ParamGetCardSize(param_getchar(Cmd, 0));\r
+\r
+       numBlocks = ParamCardSizeBlocks(param_getchar(Cmd, 0));\r
 \r
        char cmdp = 0;\r
        while(param_getchar(Cmd, cmdp) != 0x00){\r
@@ -1904,7 +2188,7 @@ int CmdHF14AMfCWipe(const char *Cmd)
                cmdp++;\r
        }\r
 \r
-       if (!wipeCard && !fillCard) \r
+       if (!wipeCard && !fillCard)\r
                wipeCard = true;\r
 \r
        PrintAndLog("--blocks count:%2d wipe:%c fill:%c", numBlocks, (wipeCard)?'y':'n', (fillCard)?'y':'n');\r
@@ -1914,10 +2198,10 @@ int CmdHF14AMfCWipe(const char *Cmd)
                if (wipeCard) {\r
                        PrintAndLog("WARNING: can't wipe magic card 1b generation");\r
                }\r
-               res = mfCWipe(numBlocks, true, false, fillCard); \r
+               res = mfCWipe(numBlocks, true, false, fillCard);\r
        } else {\r
                /* generation 1a magic card by default */\r
-               res = mfCWipe(numBlocks, false, wipeCard, fillCard); \r
+               res = mfCWipe(numBlocks, false, wipeCard, fillCard);\r
        }\r
 \r
        if (res) {\r
@@ -1944,7 +2228,7 @@ int CmdHF14AMfCSetBlk(const char *Cmd)
        }\r
 \r
        gen = mfCIdentify();\r
-       if ((gen != 1) && (gen != 2)) \r
+       if ((gen != 1) && (gen != 2))\r
                return 1;\r
 \r
        blockNo = param_get8(Cmd, 0);\r
@@ -2010,9 +2294,9 @@ int CmdHF14AMfCLoad(const char *Cmd)
                                PrintAndLog("Cant get block: %d", blockNum);\r
                                return 2;\r
                        }\r
-                       if (blockNum == 0) flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;                               // switch on field and send magic sequence\r
-                       if (blockNum == 1) flags = 0;                                                                                                   // just write\r
-                       if (blockNum == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;           // Done. Magic Halt and switch off field.\r
+                       if (blockNum == 0) flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;               // switch on field and send magic sequence\r
+                       if (blockNum == 1) flags = 0;                                                   // just write\r
+                       if (blockNum == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;       // Done. Magic Halt and switch off field.\r
 \r
                        if (gen == 2)\r
                                /* generation 1b magic card */\r
@@ -2024,7 +2308,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
                }\r
                return 0;\r
        } else {\r
-               param_getstr(Cmd, 0, filename);\r
+               param_getstr(Cmd, 0, filename, sizeof(filename));\r
 \r
                len = strlen(filename);\r
                if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
@@ -2062,9 +2346,9 @@ int CmdHF14AMfCLoad(const char *Cmd)
                        for (i = 0; i < 32; i += 2)\r
                                sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);\r
 \r
-                       if (blockNum == 0) flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;                               // switch on field and send magic sequence\r
-                       if (blockNum == 1) flags = 0;                                                                                                   // just write\r
-                       if (blockNum == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;           // Done. Switch off field.\r
+                       if (blockNum == 0) flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;               // switch on field and send magic sequence\r
+                       if (blockNum == 1) flags = 0;                                                   // just write\r
+                       if (blockNum == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;       // Done. Switch off field.\r
 \r
                        if (gen == 2)\r
                                /* generation 1b magic card */\r
@@ -2123,6 +2407,20 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
                }\r
 \r
        PrintAndLog("block data:%s", sprint_hex(memBlock, 16));\r
+\r
+       if (mfIsSectorTrailer(blockNo)) {\r
+               PrintAndLogEx(NORMAL, "Trailer decoded:");\r
+               PrintAndLogEx(NORMAL, "Key A: %s", sprint_hex_inrow(memBlock, 6));\r
+               PrintAndLogEx(NORMAL, "Key B: %s", sprint_hex_inrow(&memBlock[10], 6));\r
+               int bln = mfFirstBlockOfSector(mfSectorNum(blockNo));\r
+               int blinc = (mfNumBlocksPerSector(mfSectorNum(blockNo)) > 4) ? 5 : 1;\r
+               for (int i = 0; i < 4; i++) {\r
+                       PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &memBlock[6]));\r
+                       bln += blinc;\r
+               }\r
+               PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&memBlock[9], 1));\r
+       }\r
+\r
        return 0;\r
 }\r
 \r
@@ -2173,6 +2471,19 @@ int CmdHF14AMfCGetSc(const char *Cmd) {
                }\r
 \r
                PrintAndLog("block %3d data:%s", baseblock + i, sprint_hex(memBlock, 16));\r
+\r
+               if (mfIsSectorTrailer(baseblock + i)) {\r
+                               PrintAndLogEx(NORMAL, "Trailer decoded:");\r
+                               PrintAndLogEx(NORMAL, "Key A: %s", sprint_hex_inrow(memBlock, 6));\r
+                               PrintAndLogEx(NORMAL, "Key B: %s", sprint_hex_inrow(&memBlock[10], 6));\r
+                               int bln = baseblock;\r
+                               int blinc = (mfNumBlocksPerSector(sectorNo) > 4) ? 5 : 1;\r
+                               for (int i = 0; i < 4; i++) {\r
+                                               PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &memBlock[6]));\r
+                                               bln += blinc;\r
+                               }\r
+                               PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&memBlock[9], 1));\r
+               }\r
        }\r
        return 0;\r
 }\r
@@ -2235,7 +2546,7 @@ int CmdHF14AMfCSave(const char *Cmd) {
                }\r
                return 0;\r
        } else {\r
-               param_getstr(Cmd, 0, filename);\r
+               param_getstr(Cmd, 0, filename, sizeof(filename));\r
 \r
                len = strlen(filename);\r
                if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
@@ -2308,6 +2619,7 @@ int CmdHF14AMfSniff(const char *Cmd){
        //var\r
        int res = 0;\r
        int len = 0;\r
+       int parlen = 0;\r
        int blockLen = 0;\r
        int pckNum = 0;\r
        int num = 0;\r
@@ -2319,6 +2631,7 @@ int CmdHF14AMfSniff(const char *Cmd){
        uint8_t *buf = NULL;\r
        uint16_t bufsize = 0;\r
        uint8_t *bufPtr = NULL;\r
+       uint8_t parity[16];\r
 \r
        char ctmp = param_getchar(Cmd, 0);\r
        if ( ctmp == 'h' || ctmp == 'H' ) {\r
@@ -2362,23 +2675,22 @@ int CmdHF14AMfSniff(const char *Cmd){
                }\r
 \r
                UsbCommand resp;\r
-               if (WaitForResponseTimeout(CMD_ACK,&resp,2000)) {\r
+               if (WaitForResponseTimeoutW(CMD_ACK, &resp, 2000, false)) {\r
                        res = resp.arg[0] & 0xff;\r
                        uint16_t traceLen = resp.arg[1];\r
                        len = resp.arg[2];\r
 \r
-                       if (res == 0) {                                                         // we are done\r
-                               free(buf);\r
-                               return 0;\r
+                       if (res == 0) {                             // we are done\r
+                               break;\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 (res == 1) {                             // there is (more) data to be transferred\r
+                               if (pckNum == 0) {                      // first packet, (re)allocate necessary buffer\r
                                        if (traceLen > bufsize || buf == NULL) {\r
                                                uint8_t *p;\r
-                                               if (buf == NULL) {                              // not yet allocated\r
+                                               if (buf == NULL) {              // not yet allocated\r
                                                        p = malloc(traceLen);\r
-                                               } else {                                                // need more memory\r
+                                               } else {                        // need more memory\r
                                                        p = realloc(buf, traceLen);\r
                                                }\r
                                                if (p == NULL) {\r
@@ -2397,13 +2709,13 @@ int CmdHF14AMfSniff(const char *Cmd){
                                pckNum++;\r
                        }\r
 \r
-                       if (res == 2) {                                                         // received all data, start displaying\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
+                                       bufPtr += 6;                        // skip (void) timing information\r
                                        len = *((uint16_t *)bufPtr);\r
                                        if(len & 0x8000) {\r
                                                isTag = true;\r
@@ -2411,6 +2723,7 @@ int CmdHF14AMfSniff(const char *Cmd){
                                        } else {\r
                                                isTag = false;\r
                                        }\r
+                                       parlen = (len - 1) / 8 + 1;\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
@@ -2429,15 +2742,22 @@ int CmdHF14AMfSniff(const char *Cmd){
                                                if (wantDecrypt)\r
                                                        mfTraceInit(uid, atqa, sak, wantSaveToEmlFile);\r
                                        } else {\r
-                                               PrintAndLog("%s(%d):%s", isTag ? "TAG":"RDR", num, sprint_hex(bufPtr, len));\r
+                                               oddparitybuf(bufPtr, len, parity);\r
+                                               PrintAndLog("%s(%d):%s [%s] c[%s]%c",\r
+                                                       isTag ? "TAG":"RDR",\r
+                                                       num,\r
+                                                       sprint_hex(bufPtr, len),\r
+                                                       printBitsPar(bufPtr + len, len),\r
+                                                       printBitsPar(parity, len),\r
+                                                       memcmp(bufPtr + len, parity, len / 8 + 1) ? '!' : ' ');\r
                                                if (wantLogToFile)\r
                                                        AddLogHex(logHexFileName, isTag ? "TAG: ":"RDR: ", bufPtr, len);\r
                                                if (wantDecrypt)\r
-                                                       mfTraceDecode(bufPtr, len, wantSaveToEmlFile);\r
+                                                       mfTraceDecode(bufPtr, len, bufPtr[len], wantSaveToEmlFile);\r
                                                num++;\r
                                        }\r
                                        bufPtr += len;\r
-                                       bufPtr += ((len-1)/8+1);        // ignore parity\r
+                                       bufPtr += parlen;   // ignore parity\r
                                }\r
                                pckNum = 0;\r
                        }\r
@@ -2445,61 +2765,375 @@ int CmdHF14AMfSniff(const char *Cmd){
        } // while (true)\r
 \r
        free(buf);\r
+\r
+       msleep(300); // wait for exiting arm side.\r
+       PrintAndLog("Done.");\r
        return 0;\r
 }\r
 \r
 //needs nt, ar, at, Data to decrypt\r
 int CmdDecryptTraceCmds(const char *Cmd){\r
        uint8_t data[50];\r
-       int len = 0;\r
-       param_gethex_ex(Cmd,3,data,&len);\r
-       return tryDecryptWord(param_get32ex(Cmd,0,0,16),param_get32ex(Cmd,1,0,16),param_get32ex(Cmd,2,0,16),data,len/2);\r
+       int len = 100;\r
+       param_gethex_ex(Cmd, 3, data, &len);\r
+       return tryDecryptWord(param_get32ex(Cmd, 0, 0, 16), param_get32ex(Cmd, 1, 0, 16), param_get32ex(Cmd, 2, 0, 16), data, len/2);\r
 }\r
 \r
-static command_t CommandTable[] =\r
-{\r
-  {"help",             CmdHelp,                 1, "This help"},\r
-  {"dbg",              CmdHF14AMfDbg,           0, "Set default debug mode"},\r
-  {"rdbl",             CmdHF14AMfRdBl,          0, "Read MIFARE classic block"},\r
-  {"rdsc",             CmdHF14AMfRdSc,          0, "Read MIFARE classic sector"},\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
-  {"hardnested",       CmdHF14AMfNestedHard,    0, "Nested attack for hardened Mifare cards"},\r
-  {"nested",           CmdHF14AMfNested,        0, "Test nested authentication"},\r
-  {"sniff",            CmdHF14AMfSniff,         0, "Sniff card-reader communication"},\r
-  {"sim",              CmdHF14AMf1kSim,         0, "Simulate MIFARE card"},\r
-  {"eclr",             CmdHF14AMfEClear,        0, "Clear simulator memory block"},\r
-  {"eget",             CmdHF14AMfEGet,          0, "Get simulator memory block"},\r
-  {"eset",             CmdHF14AMfESet,          0, "Set simulator memory block"},\r
-  {"eload",            CmdHF14AMfELoad,         0, "Load from file emul dump"},\r
-  {"esave",            CmdHF14AMfESave,         0, "Save to file emul dump"},\r
-  {"ecfill",           CmdHF14AMfECFill,        0, "Fill simulator memory with help of keys from simulator"},\r
-  {"ekeyprn",          CmdHF14AMfEKeyPrn,       0, "Print keys from simulator memory"},\r
-  {"cwipe",            CmdHF14AMfCWipe,         0, "Wipe magic Chinese card"},\r
-  {"csetuid",          CmdHF14AMfCSetUID,       0, "Set UID for magic Chinese card"},\r
-  {"csetblk",          CmdHF14AMfCSetBlk,       0, "Write block - Magic Chinese card"},\r
-  {"cgetblk",          CmdHF14AMfCGetBlk,       0, "Read block - Magic Chinese card"},\r
-  {"cgetsc",           CmdHF14AMfCGetSc,        0, "Read sector - Magic Chinese card"},\r
-  {"cload",            CmdHF14AMfCLoad,         0, "Load dump into magic Chinese card"},\r
-  {"csave",            CmdHF14AMfCSave,         0, "Save dump from magic Chinese card into file or emulator"},\r
-  {"decrypt",          CmdDecryptTraceCmds,     1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"},\r
-  {NULL,               NULL,                    0, NULL}\r
+int CmdHF14AMfAuth4(const char *cmd) {\r
+       uint8_t keyn[20] = {0};\r
+       int keynlen = 0;\r
+       uint8_t key[16] = {0};\r
+       int keylen = 0;\r
+\r
+       CLIParserInit("hf mf auth4",\r
+               "Executes AES authentication command in ISO14443-4",\r
+               "Usage:\n\thf mf auth4 4000 000102030405060708090a0b0c0d0e0f -> executes authentication\n"\r
+                       "\thf mf auth4 9003 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> executes authentication\n");\r
+\r
+       void* argtable[] = {\r
+               arg_param_begin,\r
+               arg_str1(NULL,  NULL,     "<Key Num (HEX 2 bytes)>", NULL),\r
+               arg_str1(NULL,  NULL,     "<Key Value (HEX 16 bytes)>", NULL),\r
+               arg_param_end\r
+       };\r
+       CLIExecWithReturn(cmd, argtable, true);\r
+\r
+       CLIGetHexWithReturn(1, keyn, &keynlen);\r
+       CLIGetHexWithReturn(2, key, &keylen);\r
+       CLIParserFree();\r
+\r
+       if (keynlen != 2) {\r
+               PrintAndLog("ERROR: <Key Num> must be 2 bytes long instead of: %d", keynlen);\r
+               return 1;\r
+       }\r
+\r
+       if (keylen != 16) {\r
+               PrintAndLog("ERROR: <Key Value> must be 16 bytes long instead of: %d", keylen);\r
+               return 1;\r
+       }\r
+\r
+       return MifareAuth4(NULL, keyn, key, true, false, true);\r
+}\r
+\r
+// https://www.nxp.com/docs/en/application-note/AN10787.pdf\r
+int CmdHF14AMfMAD(const char *cmd) {\r
+\r
+       CLIParserInit("hf mf mad",\r
+                                 "Checks and prints Mifare Application Directory (MAD)",\r
+                                 "Usage:\n\thf mf mad -> shows MAD if exists\n"\r
+                                 "\thf mf mad -a 03e1 -k ffffffffffff -b -> shows NDEF data if exists. read card with custom key and key B\n");\r
+\r
+       void *argtable[] = {\r
+               arg_param_begin,\r
+               arg_lit0("vV",  "verbose",  "show technical data"),\r
+               arg_str0("aA",  "aid",      "print all sectors with aid", NULL),\r
+               arg_str0("kK",  "key",      "key for printing sectors", NULL),\r
+               arg_lit0("bB",  "keyb",     "use key B for access printing sectors (by default: key A)"),\r
+               arg_param_end\r
+       };\r
+       CLIExecWithReturn(cmd, argtable, true);\r
+       bool verbose = arg_get_lit(1);\r
+       uint8_t aid[2] = {0};\r
+       int aidlen;\r
+       CLIGetHexWithReturn(2, aid, &aidlen);\r
+       uint8_t key[6] = {0};\r
+       int keylen;\r
+       CLIGetHexWithReturn(3, key, &keylen);\r
+       bool keyB = arg_get_lit(4);\r
+\r
+       CLIParserFree();\r
+\r
+       if (aidlen != 2 && keylen > 0) {\r
+               PrintAndLogEx(WARNING, "do not need a key without aid.");\r
+       }\r
+\r
+       uint8_t sector0[16 * 4] = {0};\r
+       uint8_t sector10[16 * 4] = {0};\r
+       if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector0)) {\r
+               PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");\r
+               return 2;\r
+       }\r
+\r
+       if (verbose) {\r
+               for (int i = 0; i < 4; i ++)\r
+                       PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(&sector0[i * 16], 16));\r
+       }\r
+\r
+       bool haveMAD2 = false;\r
+       MAD1DecodeAndPrint(sector0, verbose, &haveMAD2);\r
+\r
+       if (haveMAD2) {\r
+               if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector10)) {\r
+                       PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");\r
+                       return 2;\r
+               }\r
+\r
+               MAD2DecodeAndPrint(sector10, verbose);\r
+       }\r
+\r
+       if (aidlen == 2) {\r
+               uint16_t aaid = (aid[0] << 8) + aid[1];\r
+               PrintAndLogEx(NORMAL, "\n-------------- AID 0x%04x ---------------", aaid);\r
+\r
+               uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};\r
+               size_t madlen = 0;\r
+               if (MADDecode(sector0, sector10, mad, &madlen)) {\r
+                       PrintAndLogEx(ERR, "can't decode mad.");\r
+                       return 10;\r
+               }\r
+\r
+               uint8_t akey[6] = {0};\r
+               memcpy(akey, g_mifare_ndef_key, 6);\r
+               if (keylen == 6) {\r
+                       memcpy(akey, key, 6);\r
+               }\r
+\r
+               for (int i = 0; i < madlen; i++) {\r
+                       if (aaid == mad[i]) {\r
+                               uint8_t vsector[16 * 4] = {0};\r
+                               if (mfReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, akey, vsector)) {\r
+                                       PrintAndLogEx(NORMAL, "");\r
+                                       PrintAndLogEx(ERR, "read sector %d error.", i + 1);\r
+                                       return 2;\r
+                               }\r
+\r
+                               for (int j = 0; j < (verbose ? 4 : 3); j ++)\r
+                                       PrintAndLogEx(NORMAL, " [%03d] %s", (i + 1) * 4 + j, sprint_hex(&vsector[j * 16], 16));\r
+                       }\r
+               }\r
+       }\r
+\r
+       return 0;\r
+}\r
+\r
+int CmdHFMFNDEF(const char *cmd) {\r
+\r
+       CLIParserInit("hf mf ndef",\r
+                                 "Prints NFC Data Exchange Format (NDEF)",\r
+                                 "Usage:\n\thf mf ndef -> shows NDEF data\n"\r
+                                 "\thf mf ndef -a 03e1 -k ffffffffffff -b -> shows NDEF data with custom AID, key and with key B\n");\r
+\r
+       void *argtable[] = {\r
+               arg_param_begin,\r
+               arg_litn("vV",  "verbose",  0, 2, "show technical data"),\r
+               arg_str0("aA",  "aid",      "replace default aid for NDEF", NULL),\r
+               arg_str0("kK",  "key",      "replace default key for NDEF", NULL),\r
+               arg_lit0("bB",  "keyb",     "use key B for access sectors (by default: key A)"),\r
+               arg_param_end\r
+       };\r
+       CLIExecWithReturn(cmd, argtable, true);\r
+\r
+       bool verbose = arg_get_lit(1);\r
+       bool verbose2 = arg_get_lit(1) > 1;\r
+       uint8_t aid[2] = {0};\r
+       int aidlen;\r
+       CLIGetHexWithReturn(2, aid, &aidlen);\r
+       uint8_t key[6] = {0};\r
+       int keylen;\r
+       CLIGetHexWithReturn(3, key, &keylen);\r
+       bool keyB = arg_get_lit(4);\r
+\r
+       CLIParserFree();\r
+\r
+       uint16_t ndefAID = 0x03e1;\r
+       if (aidlen == 2)\r
+               ndefAID = (aid[0] << 8) + aid[1];\r
+\r
+       uint8_t ndefkey[6] = {0};\r
+       memcpy(ndefkey, g_mifare_ndef_key, 6);\r
+       if (keylen == 6) {\r
+               memcpy(ndefkey, key, 6);\r
+       }\r
+\r
+       uint8_t sector0[16 * 4] = {0};\r
+       uint8_t sector10[16 * 4] = {0};\r
+       uint8_t data[4096] = {0};\r
+       int datalen = 0;\r
+\r
+       PrintAndLogEx(NORMAL, "");\r
+\r
+       if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector0)) {\r
+               PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");\r
+               return 2;\r
+       }\r
+\r
+       bool haveMAD2 = false;\r
+       int res = MADCheck(sector0, NULL, verbose, &haveMAD2);\r
+       if (res) {\r
+               PrintAndLogEx(ERR, "MAD error %d.", res);\r
+               return res;\r
+       }\r
+\r
+       if (haveMAD2) {\r
+               if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector10)) {\r
+                       PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");\r
+                       return 2;\r
+               }\r
+       }\r
+\r
+       uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};\r
+       size_t madlen = 0;\r
+       if (MADDecode(sector0, (haveMAD2 ? sector10 : NULL), mad, &madlen)) {\r
+               PrintAndLogEx(ERR, "can't decode mad.");\r
+               return 10;\r
+       }\r
+\r
+       printf("data reading:");\r
+       for (int i = 0; i < madlen; i++) {\r
+               if (ndefAID == mad[i]) {\r
+                       uint8_t vsector[16 * 4] = {0};\r
+                       if (mfReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, ndefkey, vsector)) {\r
+                               PrintAndLogEx(ERR, "read sector %d error.", i + 1);\r
+                               return 2;\r
+                       }\r
+\r
+                       memcpy(&data[datalen], vsector, 16 * 3);\r
+                       datalen += 16 * 3;\r
+\r
+                       printf(".");\r
+               }\r
+       }\r
+       printf(" OK\n");\r
+\r
+       if (!datalen) {\r
+               PrintAndLogEx(ERR, "no NDEF data.");\r
+               return 11;\r
+       }\r
+\r
+       if (verbose2) {\r
+               PrintAndLogEx(NORMAL, "NDEF data:");\r
+               dump_buffer(data, datalen, stdout, 1);\r
+       }\r
+\r
+       NDEFDecodeAndPrint(data, datalen, verbose);\r
+\r
+       return 0;\r
+}\r
+\r
+int CmdHFMFPersonalize(const char *cmd) {\r
+\r
+       CLIParserInit("hf mf personalize",\r
+                                 "Personalize the UID of a Mifare Classic EV1 card. This is only possible if it is a 7Byte UID card and if it is not already personalized.",\r
+                                 "Usage:\n\thf mf personalize UIDF0                        -> double size UID according to ISO/IEC14443-3\n"\r
+                                 "\thf mf personalize UIDF1                        -> double size UID according to ISO/IEC14443-3, optional usage of selection process shortcut\n"\r
+                                 "\thf mf personalize UIDF2                        -> single size random ID according to ISO/IEC14443-3\n"\r
+                                 "\thf mf personalize UIDF3                        -> single size NUID according to ISO/IEC14443-3\n"\r
+                                 "\thf mf personalize -t B -k B0B1B2B3B4B5 UIDF3   -> use key B = 0xB0B1B2B3B4B5 instead of default key A\n");\r
+\r
+       void *argtable[] = {\r
+               arg_param_begin,\r
+               arg_str0("tT",  "keytype", "<A|B>",                     "key type (A or B) to authenticate sector 0 (default: A)"),\r
+               arg_str0("kK",  "key",     "<key (hex 6 Bytes)>",       "key to authenticate sector 0 (default: FFFFFFFFFFFF)"),\r
+               arg_str1(NULL,  NULL,      "<UIDF0|UIDF1|UIDF2|UIDF3>", "Personalization Option"),\r
+               arg_param_end\r
+       };\r
+       CLIExecWithReturn(cmd, argtable, true);\r
+\r
+       char keytypestr[2] = "A";\r
+       uint8_t keytype = 0x00;\r
+       int keytypestr_len;\r
+       int res = CLIParamStrToBuf(arg_get_str(1), (uint8_t*)keytypestr, 1, &keytypestr_len);\r
+       if (res || (keytypestr[0] != 'a' && keytypestr[0] != 'A' && keytypestr[0] != 'b' && keytypestr[0] != 'B')) {\r
+               PrintAndLog("ERROR: not a valid key type. Key type must be A or B");\r
+               CLIParserFree();\r
+               return 1;\r
+       }\r
+       if (keytypestr[0] == 'B' || keytypestr[0] == 'b') {\r
+               keytype = 0x01;\r
+       }\r
+\r
+       uint8_t key[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};\r
+       int key_len;\r
+       res = CLIParamHexToBuf(arg_get_str(2), key, 6, &key_len);\r
+       if (res || (!res && key_len > 0 && key_len != 6)) {\r
+               PrintAndLog("ERROR: not a valid key. Key must be 12 hex digits");\r
+               CLIParserFree();\r
+               return 1;\r
+       }\r
+\r
+       char pers_optionstr[6];\r
+       int opt_len;\r
+       uint8_t pers_option;\r
+       res = CLIParamStrToBuf(arg_get_str(3), (uint8_t*)pers_optionstr, 5, &opt_len);\r
+       if (res || (!res && opt_len > 0 && opt_len != 5)\r
+                       || (strncmp(pers_optionstr, "UIDF0", 5) && strncmp(pers_optionstr, "UIDF1", 5) && strncmp(pers_optionstr, "UIDF2", 5) && strncmp(pers_optionstr, "UIDF3", 5))) {\r
+               PrintAndLog("ERROR: invalid personalization option. Must be one of UIDF0, UIDF1, UIDF2, or UIDF3");\r
+               CLIParserFree();\r
+               return 1;\r
+       }\r
+       if (!strncmp(pers_optionstr, "UIDF0", 5)) {\r
+               pers_option = MIFARE_EV1_UIDF0;\r
+       } else if (!strncmp(pers_optionstr, "UIDF1", 5)) {\r
+               pers_option = MIFARE_EV1_UIDF1;\r
+       } else if (!strncmp(pers_optionstr, "UIDF2", 5)) {\r
+               pers_option = MIFARE_EV1_UIDF2;\r
+       } else {\r
+               pers_option = MIFARE_EV1_UIDF3;\r
+       }\r
+\r
+       CLIParserFree();\r
+\r
+       UsbCommand c = {CMD_MIFARE_PERSONALIZE_UID, {keytype, pers_option, 0}};\r
+       memcpy(c.d.asBytes, key, 6);\r
+       SendCommand(&c);\r
+\r
+       UsbCommand resp;\r
+       if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {\r
+               uint8_t isOK  = resp.arg[0] & 0xff;\r
+               PrintAndLog("Personalization %s", isOK ? "FAILED" : "SUCCEEDED");\r
+       } else {\r
+               PrintAndLog("Command execute timeout");\r
+       }\r
+\r
+       return 0;\r
+}\r
+\r
+\r
+static command_t CommandTable[] = {\r
+       {"help",             CmdHelp,                 1, "This help"},\r
+       {"dbg",              CmdHF14AMfDbg,           0, "Set default debug mode"},\r
+       {"rdbl",             CmdHF14AMfRdBl,          0, "Read MIFARE classic block"},\r
+       {"rdsc",             CmdHF14AMfRdSc,          0, "Read MIFARE classic sector"},\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
+       {"auth4",            CmdHF14AMfAuth4,         0, "ISO14443-4 AES authentication"},\r
+       {"chk",              CmdHF14AMfChk,           0, "Test block keys"},\r
+       {"mifare",           CmdHF14AMifare,          0, "Read parity error messages."},\r
+       {"hardnested",       CmdHF14AMfNestedHard,    0, "Nested attack for hardened Mifare cards"},\r
+       {"nested",           CmdHF14AMfNested,        0, "Test nested authentication"},\r
+       {"sniff",            CmdHF14AMfSniff,         0, "Sniff card-reader communication"},\r
+       {"sim",              CmdHF14AMfSim,           0, "Simulate MIFARE card"},\r
+       {"eclr",             CmdHF14AMfEClear,        0, "Clear simulator memory"},\r
+       {"eget",             CmdHF14AMfEGet,          0, "Get simulator memory block"},\r
+       {"eset",             CmdHF14AMfESet,          0, "Set simulator memory block"},\r
+       {"eload",            CmdHF14AMfELoad,         0, "Load from file emul dump"},\r
+       {"esave",            CmdHF14AMfESave,         0, "Save to file emul dump"},\r
+       {"ecfill",           CmdHF14AMfECFill,        0, "Fill simulator memory with help of keys from simulator"},\r
+       {"ekeyprn",          CmdHF14AMfEKeyPrn,       0, "Print keys from simulator memory"},\r
+       {"cwipe",            CmdHF14AMfCWipe,         0, "Wipe magic Chinese card"},\r
+       {"csetuid",          CmdHF14AMfCSetUID,       0, "Set UID for magic Chinese card"},\r
+       {"csetblk",          CmdHF14AMfCSetBlk,       0, "Write block - Magic Chinese card"},\r
+       {"cgetblk",          CmdHF14AMfCGetBlk,       0, "Read block - Magic Chinese card"},\r
+       {"cgetsc",           CmdHF14AMfCGetSc,        0, "Read sector - Magic Chinese card"},\r
+       {"cload",            CmdHF14AMfCLoad,         0, "Load dump into magic Chinese card"},\r
+       {"csave",            CmdHF14AMfCSave,         0, "Save dump from magic Chinese card into file or emulator"},\r
+       {"decrypt",          CmdDecryptTraceCmds,     1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"},\r
+       {"mad",              CmdHF14AMfMAD,           0, "Checks and prints MAD"},\r
+       {"ndef",             CmdHFMFNDEF,             0, "Prints NDEF records from card"},\r
+       {"personalize",      CmdHFMFPersonalize,      0, "Personalize UID (Mifare Classic EV1 only)"},\r
+       {NULL,               NULL,                    0, NULL}\r
 };\r
 \r
-int CmdHFMF(const char *Cmd)\r
-{\r
-       // flush\r
-       WaitForResponseTimeout(CMD_ACK,NULL,100);\r
 \r
-  CmdsParse(CommandTable, Cmd);\r
-  return 0;\r
+int CmdHFMF(const char *Cmd) {\r
+       (void)WaitForResponseTimeout(CMD_ACK,NULL,100);\r
+       CmdsParse(CommandTable, Cmd);\r
+       return 0;\r
 }\r
 \r
-int CmdHelp(const char *Cmd)\r
-{\r
-  CmdsHelp(CommandTable);\r
-  return 0;\r
+\r
+int CmdHelp(const char *Cmd) {\r
+       CmdsHelp(CommandTable);\r
+       return 0;\r
 }\r
Impressum, Datenschutz