deploy in msys2 and proxspace (#702)

[proxmark3-svn] / client / cmdhfmf.c
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c

index 5b4a0b2a401a48ead9d8e7375c3211047a40061b..eb85b8c578f0ceaa5f3ff5f7465c5287f764de4c 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -15,19 +15,24 @@
  #include <stdio.h>\r
  #include <stdlib.h>\r
  #include <ctype.h>\r
  #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 "cmdmain.h"\r
  #include "cmdhfmfhard.h"\r
+#include "parity.h"\r
  #include "util.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.h"\r
  #include "mfkey.h"\r
  #include "usb_cmd.h"\r
  #include "ui.h"\r
  #include "mifarehost.h"\r
  #include "mifare.h"\r
  #include "mfkey.h"\r
+#include "hardnested/hardnested_bf_core.h"\r
+#include "cliparser/cliparser.h"\r
+#include "cmdhf14a.h"\r
+#include <polarssl/aes.h>\r
  \r
  #define NESTED_SECTOR_RETRY     10                     // how often we try mfested() until we give up\r
  \r
  \r
  #define NESTED_SECTOR_RETRY     10                     // how often we try mfested() until we give up\r
  \r
-\r
  static int CmdHelp(const char *Cmd);\r
  \r
  int CmdHF14AMifare(const char *Cmd)\r
  static int CmdHelp(const char *Cmd);\r
  \r
  int CmdHF14AMifare(const char *Cmd)\r
@@ -44,7 +49,7 @@ int CmdHF14AMifare(const char *Cmd)
                 case -5 : PrintAndLog("Aborted via keyboard.");  return 1;\r
                 default : PrintAndLog("Found valid key:%012" PRIx64 "\n", key);\r
         }\r
                 case -5 : PrintAndLog("Aborted via keyboard.");  return 1;\r
                 default : PrintAndLog("Found valid key:%012" PRIx64 "\n", key);\r
         }\r
-       \r
+\r
         PrintAndLog("");\r
         return 0;\r
  }\r
         PrintAndLog("");\r
         return 0;\r
  }\r
@@ -56,14 +61,14 @@ int CmdHF14AMfWrBl(const char *Cmd)
         uint8_t keyType = 0;\r
         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
         uint8_t keyType = 0;\r
         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
+\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
                 PrintAndLog("        sample: hf mf wrbl 0 A FFFFFFFFFFFF 000102030405060708090A0B0C0D0E0F");\r
                 return 0;\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
                 PrintAndLog("        sample: hf mf wrbl 0 A FFFFFFFFFFFF 000102030405060708090A0B0C0D0E0F");\r
                 return 0;\r
-       }       \r
+       }\r
  \r
         blockNo = param_get8(Cmd, 0);\r
         cmdp = param_getchar(Cmd, 1);\r
  \r
         blockNo = param_get8(Cmd, 0);\r
         cmdp = param_getchar(Cmd, 1);\r
@@ -82,7 +87,7 @@ int CmdHF14AMfWrBl(const char *Cmd)
         }\r
         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
         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
+\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
    UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};\r
         memcpy(c.d.asBytes, key, 6);\r
         memcpy(c.d.asBytes + 10, bldata, 16);\r
@@ -104,7 +109,7 @@ int CmdHF14AMfRdBl(const char *Cmd)
         uint8_t blockNo = 0;\r
         uint8_t keyType = 0;\r
         uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
         uint8_t blockNo = 0;\r
         uint8_t keyType = 0;\r
         uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
-       \r
+\r
         char cmdp       = 0x00;\r
  \r
  \r
         char cmdp       = 0x00;\r
  \r
  \r
@@ -112,8 +117,8 @@ int CmdHF14AMfRdBl(const char *Cmd)
                 PrintAndLog("Usage:  hf mf rdbl    <block number> <key A/B> <key (12 hex symbols)>");\r
                 PrintAndLog("        sample: hf mf rdbl 0 A FFFFFFFFFFFF ");\r
                 return 0;\r
                 PrintAndLog("Usage:  hf mf rdbl    <block number> <key A/B> <key (12 hex symbols)>");\r
                 PrintAndLog("        sample: hf mf rdbl 0 A FFFFFFFFFFFF ");\r
                 return 0;\r
-       }       \r
-       \r
+       }\r
+\r
         blockNo = param_get8(Cmd, 0);\r
         cmdp = param_getchar(Cmd, 1);\r
         if (cmdp == 0x00) {\r
         blockNo = param_get8(Cmd, 0);\r
         cmdp = param_getchar(Cmd, 1);\r
         if (cmdp == 0x00) {\r
@@ -126,7 +131,7 @@ int CmdHF14AMfRdBl(const char *Cmd)
                 return 1;\r
         }\r
         PrintAndLog("--block no:%d, key type:%c, key:%s ", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r
                 return 1;\r
         }\r
         PrintAndLog("--block no:%d, key type:%c, key:%s ", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r
-       \r
+\r
    UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};\r
         memcpy(c.d.asBytes, key, 6);\r
    SendCommand(&c);\r
    UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};\r
         memcpy(c.d.asBytes, key, 6);\r
    SendCommand(&c);\r
@@ -161,8 +166,8 @@ int CmdHF14AMfRdSc(const char *Cmd)
                 PrintAndLog("Usage:  hf mf rdsc    <sector number> <key A/B> <key (12 hex symbols)>");\r
                 PrintAndLog("        sample: hf mf rdsc 0 A FFFFFFFFFFFF ");\r
                 return 0;\r
                 PrintAndLog("Usage:  hf mf rdsc    <sector number> <key A/B> <key (12 hex symbols)>");\r
                 PrintAndLog("        sample: hf mf rdsc 0 A FFFFFFFFFFFF ");\r
                 return 0;\r
-       }       \r
-       \r
+       }\r
+\r
         sectorNo = param_get8(Cmd, 0);\r
         if (sectorNo > 39) {\r
                 PrintAndLog("Sector number must be less than 40");\r
         sectorNo = param_get8(Cmd, 0);\r
         if (sectorNo > 39) {\r
                 PrintAndLog("Sector number must be less than 40");\r
@@ -179,7 +184,7 @@ int CmdHF14AMfRdSc(const char *Cmd)
                 return 1;\r
         }\r
         PrintAndLog("--sector no:%d key type:%c key:%s ", sectorNo, keyType?'B':'A', sprint_hex(key, 6));\r
                 return 1;\r
         }\r
         PrintAndLog("--sector no:%d key type:%c key:%s ", sectorNo, keyType?'B':'A', sprint_hex(key, 6));\r
-       \r
+\r
         UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};\r
         memcpy(c.d.asBytes, key, 6);\r
         SendCommand(&c);\r
         UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};\r
         memcpy(c.d.asBytes, key, 6);\r
         SendCommand(&c);\r
@@ -222,31 +227,46 @@ uint8_t NumBlocksPerSector(uint8_t sectorNo)
         }\r
  }\r
  \r
         }\r
  }\r
  \r
+static int ParamCardSizeSectors(const char c) {\r
+       int numBlocks = 16;\r
+       switch (c) {\r
+               case '0' : numBlocks = 5; break;\r
+               case '2' : numBlocks = 32; break;\r
+               case '4' : numBlocks = 40; break;\r
+               default:   numBlocks = 16;\r
+       }\r
+       return numBlocks;\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
  int CmdHF14AMfDump(const char *Cmd)\r
  {\r
         uint8_t sectorNo, blockNo;\r
-       \r
+\r
         uint8_t keyA[40][6];\r
         uint8_t keyB[40][6];\r
         uint8_t rights[40][4];\r
         uint8_t carddata[256][16];\r
         uint8_t numSectors = 16;\r
         uint8_t keyA[40][6];\r
         uint8_t keyB[40][6];\r
         uint8_t rights[40][4];\r
         uint8_t carddata[256][16];\r
         uint8_t numSectors = 16;\r
-       \r
+\r
         FILE *fin;\r
         FILE *fout;\r
         FILE *fin;\r
         FILE *fout;\r
-       \r
+\r
         UsbCommand resp;\r
  \r
         char cmdp = param_getchar(Cmd, 0);\r
         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
-       \r
+       numSectors = ParamCardSizeSectors(cmdp);\r
+\r
         if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {\r
                 PrintAndLog("Usage:   hf mf dump [card memory]");\r
                 PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r
         if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {\r
                 PrintAndLog("Usage:   hf mf dump [card memory]");\r
                 PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r
@@ -255,12 +275,12 @@ int CmdHF14AMfDump(const char *Cmd)
                 PrintAndLog("         hf mf dump 4");\r
                 return 0;\r
         }\r
                 PrintAndLog("         hf mf dump 4");\r
                 return 0;\r
         }\r
-       \r
+\r
         if ((fin = fopen("dumpkeys.bin","rb")) == NULL) {\r
                 PrintAndLog("Could not find file dumpkeys.bin");\r
                 return 1;\r
         }\r
         if ((fin = fopen("dumpkeys.bin","rb")) == NULL) {\r
                 PrintAndLog("Could not find file dumpkeys.bin");\r
                 return 1;\r
         }\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
         // Read keys A from file\r
         for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
                 size_t bytes_read = fread(keyA[sectorNo], 1, 6, fin);\r
@@ -270,7 +290,7 @@ int CmdHF14AMfDump(const char *Cmd)
                         return 2;\r
                 }\r
         }\r
                         return 2;\r
                 }\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
         // Read keys B from file\r
         for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
                 size_t bytes_read = fread(keyB[sectorNo], 1, 6, fin);\r
@@ -280,7 +300,7 @@ int CmdHF14AMfDump(const char *Cmd)
                         return 2;\r
                 }\r
         }\r
                         return 2;\r
                 }\r
         }\r
-       \r
+\r
         fclose(fin);\r
  \r
         PrintAndLog("|-----------------------------------------|");\r
         fclose(fin);\r
  \r
         PrintAndLog("|-----------------------------------------|");\r
@@ -288,7 +308,7 @@ int CmdHF14AMfDump(const char *Cmd)
         PrintAndLog("|-----------------------------------------|");\r
         uint8_t tries = 0;\r
         for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
         PrintAndLog("|-----------------------------------------|");\r
         uint8_t tries = 0;\r
         for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
-               for (tries = 0; tries < 3; tries++) {           \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
                         SendCommand(&c);\r
                         UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}};\r
                         memcpy(c.d.asBytes, keyA[sectorNo], 6);\r
                         SendCommand(&c);\r
@@ -314,17 +334,17 @@ int CmdHF14AMfDump(const char *Cmd)
                         }\r
                 }\r
         }\r
                         }\r
                 }\r
         }\r
-       \r
+\r
         PrintAndLog("|-----------------------------------------|");\r
         PrintAndLog("|----- Dumping all blocks to file... -----|");\r
         PrintAndLog("|-----------------------------------------|");\r
         PrintAndLog("|-----------------------------------------|");\r
         PrintAndLog("|----- Dumping all blocks to file... -----|");\r
         PrintAndLog("|-----------------------------------------|");\r
-       \r
+\r
         bool isOK = true;\r
         for (sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {\r
                 for (blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {\r
                         bool received = false;\r
         bool isOK = true;\r
         for (sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {\r
                 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
+                       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
                                         UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};\r
                                         memcpy(c.d.asBytes, keyA[sectorNo], 6);\r
                                         SendCommand(&c);\r
                                         UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};\r
                                         memcpy(c.d.asBytes, keyA[sectorNo], 6);\r
                                         SendCommand(&c);\r
@@ -387,7 +407,7 @@ int CmdHF14AMfDump(const char *Cmd)
         }\r
  \r
         if (isOK) {\r
         }\r
  \r
         if (isOK) {\r
-               if ((fout = fopen("dumpdata.bin","wb")) == NULL) { \r
+               if ((fout = fopen("dumpdata.bin","wb")) == NULL) {\r
                         PrintAndLog("Could not create file name dumpdata.bin");\r
                         return 1;\r
                 }\r
                         PrintAndLog("Could not create file name dumpdata.bin");\r
                         return 1;\r
                 }\r
@@ -396,7 +416,7 @@ int CmdHF14AMfDump(const char *Cmd)
                 fclose(fout);\r
                 PrintAndLog("Dumped %d blocks (%d bytes) to file dumpdata.bin", numblocks, 16*numblocks);\r
         }\r
                 fclose(fout);\r
                 PrintAndLog("Dumped %d blocks (%d bytes) to file dumpdata.bin", numblocks, 16*numblocks);\r
         }\r
-               \r
+\r
         return 0;\r
  }\r
  \r
         return 0;\r
  }\r
  \r
@@ -409,19 +429,19 @@ int CmdHF14AMfRestore(const char *Cmd)
         uint8_t keyA[40][6];\r
         uint8_t keyB[40][6];\r
         uint8_t numSectors;\r
         uint8_t keyA[40][6];\r
         uint8_t keyB[40][6];\r
         uint8_t numSectors;\r
-       \r
+\r
         FILE *fdump;\r
         FILE *fkeys;\r
  \r
         char cmdp = param_getchar(Cmd, 0);\r
         switch (cmdp) {\r
                 case '0' : numSectors = 5; break;\r
         FILE *fdump;\r
         FILE *fkeys;\r
  \r
         char cmdp = param_getchar(Cmd, 0);\r
         switch (cmdp) {\r
                 case '0' : numSectors = 5; break;\r
-               case '1' : \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
                 case '\0': numSectors = 16; break;\r
                 case '2' : numSectors = 32; break;\r
                 case '4' : numSectors = 40; break;\r
                 default:   numSectors = 16;\r
-       }       \r
+       }\r
  \r
         if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {\r
                 PrintAndLog("Usage:   hf mf restore [card memory]");\r
  \r
         if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {\r
                 PrintAndLog("Usage:   hf mf restore [card memory]");\r
@@ -436,7 +456,7 @@ int CmdHF14AMfRestore(const char *Cmd)
                 PrintAndLog("Could not find file dumpkeys.bin");\r
                 return 1;\r
         }\r
                 PrintAndLog("Could not find file dumpkeys.bin");\r
                 return 1;\r
         }\r
-       \r
+\r
         for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
                 size_t bytes_read = fread(keyA[sectorNo], 1, 6, fkeys);\r
                 if (bytes_read != 6) {\r
         for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
                 size_t bytes_read = fread(keyA[sectorNo], 1, 6, fkeys);\r
                 if (bytes_read != 6) {\r
@@ -460,21 +480,21 @@ int CmdHF14AMfRestore(const char *Cmd)
         if ((fdump = fopen("dumpdata.bin","rb")) == NULL) {\r
                 PrintAndLog("Could not find file dumpdata.bin");\r
                 return 1;\r
         if ((fdump = fopen("dumpdata.bin","rb")) == NULL) {\r
                 PrintAndLog("Could not find file dumpdata.bin");\r
                 return 1;\r
-       }       \r
+       }\r
         PrintAndLog("Restoring dumpdata.bin to card");\r
  \r
         for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
                 for(blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {\r
                         UsbCommand c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}};\r
                         memcpy(c.d.asBytes, key, 6);\r
         PrintAndLog("Restoring dumpdata.bin to card");\r
  \r
         for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
                 for(blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {\r
                         UsbCommand c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}};\r
                         memcpy(c.d.asBytes, key, 6);\r
-                       \r
+\r
                         size_t bytes_read = fread(bldata, 1, 16, fdump);\r
                         if (bytes_read != 16) {\r
                                 PrintAndLog("File reading error (dumpdata.bin).");\r
                                 fclose(fdump);\r
                                 return 2;\r
                         }\r
                         size_t bytes_read = fread(bldata, 1, 16, fdump);\r
                         if (bytes_read != 16) {\r
                                 PrintAndLog("File reading error (dumpdata.bin).");\r
                                 fclose(fdump);\r
                                 return 2;\r
                         }\r
-                                       \r
+\r
                         if (blockNo == NumBlocksPerSector(sectorNo) - 1) {      // sector trailer\r
                                 bldata[0]  = (keyA[sectorNo][0]);\r
                                 bldata[1]  = (keyA[sectorNo][1]);\r
                         if (blockNo == NumBlocksPerSector(sectorNo) - 1) {      // sector trailer\r
                                 bldata[0]  = (keyA[sectorNo][0]);\r
                                 bldata[1]  = (keyA[sectorNo][1]);\r
@@ -488,10 +508,10 @@ int CmdHF14AMfRestore(const char *Cmd)
                                 bldata[13] = (keyB[sectorNo][3]);\r
                                 bldata[14] = (keyB[sectorNo][4]);\r
                                 bldata[15] = (keyB[sectorNo][5]);\r
                                 bldata[13] = (keyB[sectorNo][3]);\r
                                 bldata[14] = (keyB[sectorNo][4]);\r
                                 bldata[15] = (keyB[sectorNo][5]);\r
-                       }               \r
-                       \r
+                       }\r
+\r
                         PrintAndLog("Writing to block %3d: %s", FirstBlockOfSector(sectorNo) + blockNo, sprint_hex(bldata, 16));\r
                         PrintAndLog("Writing to block %3d: %s", FirstBlockOfSector(sectorNo) + blockNo, sprint_hex(bldata, 16));\r
-                       \r
+\r
                         memcpy(c.d.asBytes + 10, bldata, 16);\r
                         SendCommand(&c);\r
  \r
                         memcpy(c.d.asBytes + 10, bldata, 16);\r
                         SendCommand(&c);\r
  \r
@@ -504,17 +524,38 @@ int CmdHF14AMfRestore(const char *Cmd)
                         }\r
                 }\r
         }\r
                         }\r
                 }\r
         }\r
-       \r
+\r
         fclose(fdump);\r
         return 0;\r
  }\r
  \r
         fclose(fdump);\r
         return 0;\r
  }\r
  \r
+//----------------------------------------------\r
+//   Nested\r
+//----------------------------------------------\r
  \r
  \r
-typedef struct {\r
-       uint64_t Key[2];\r
-       int foundKey[2];\r
-} sector_t;\r
+static void parseParamTDS(const char *Cmd, const uint8_t indx, bool *paramT, bool *paramD, uint8_t *timeout) {\r
+       char ctmp3[3] = {0};\r
+       int len = param_getlength(Cmd, indx);\r
+       if (len > 0 && len < 4){\r
+               param_getstr(Cmd, indx, ctmp3, sizeof(ctmp3));\r
+               \r
+               *paramT |= (ctmp3[0] == 't' || ctmp3[0] == 'T');\r
+               *paramD |= (ctmp3[0] == 'd' || ctmp3[0] == 'D');\r
+               bool paramS1 = *paramT || *paramD;\r
  \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
  \r
  int CmdHF14AMfNested(const char *Cmd)\r
  {\r
@@ -526,80 +567,107 @@ 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 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
         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
         \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
         uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};\r
         bool createDumpFile = false;\r
         FILE *fkeys;\r
         uint8_t standart[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};\r
         uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};\r
-       \r
+\r
         char cmdp, ctmp;\r
  \r
         if (strlen(Cmd)<3) {\r
                 PrintAndLog("Usage:");\r
         char cmdp, ctmp;\r
  \r
         if (strlen(Cmd)<3) {\r
                 PrintAndLog("Usage:");\r
-               PrintAndLog(" all sectors:  hf mf nested  <card memory> <block number> <key A/B> <key (12 hex symbols)> [t,d]");\r
+               PrintAndLog(" 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(" 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("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(" ");\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
                 return 0;\r
-       }       \r
-       \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
-       }\r
-       \r
-       if (ctmp != 'A' && ctmp != 'a') \r
-               keyType = 1;\r
-               \r
-       if (param_gethex(Cmd, 3, key, 12)) {\r
-               PrintAndLog("Key must include 12 HEX symbols");\r
-               return 1;\r
         }\r
         }\r
-       \r
+\r
+       // <card memory>\r
+       cmdp = param_getchar(Cmd, 0);\r
         if (cmdp == 'o' || cmdp == 'O') {\r
                 cmdp = 'o';\r
         if (cmdp == 'o' || cmdp == 'O') {\r
                 cmdp = 'o';\r
-               trgBlockNo = param_get8(Cmd, 4);\r
-               ctmp = param_getchar(Cmd, 5);\r
+               SectorsCnt = 1;\r
+       } else {\r
+               SectorsCnt = ParamCardSizeSectors(cmdp);\r
+       }\r
+               \r
+       // <block number>. number or autosearch key (*)\r
+       if (param_getchar(Cmd, 1) == '*') {\r
+               autosearchKey = true;\r
+\r
+               parseParamTDS(Cmd, 2, &transferToEml, &createDumpFile, &btimeout14a);\r
+\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
                 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
                         return 1;\r
                 }\r
-               if (ctmp != 'A' && ctmp != 'a') \r
-                       trgKeyType = 1;\r
-       } else {\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
+\r
+               if (ctmp != 'A' && ctmp != 'a')\r
+                       keyType = 1;\r
+\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
+               // one sector nested\r
+               if (cmdp == 'o') { \r
+                       trgBlockNo = param_get8(Cmd, 4);\r
+\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
+                       parseParamTDS(Cmd, 6, &transferToEml, &createDumpFile, &btimeout14a);\r
+               } else {\r
+                       parseParamTDS(Cmd, 4, &transferToEml, &createDumpFile, &btimeout14a);\r
                 }\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
         }\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
-       \r
-       ctmp = param_getchar(Cmd, 6);\r
-       transferToEml |= (ctmp == 't' || ctmp == 'T');\r
-       transferToEml |= (ctmp == 'd' || ctmp == 'D');\r
-       \r
-       if (cmdp == 'o') {\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
                 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
@@ -619,17 +687,18 @@ int CmdHF14AMfNested(const char *Cmd)
                         if (transferToEml) {\r
                                 uint8_t sectortrailer;\r
                                 if (trgBlockNo < 32*4) {        // 4 block sector\r
                         if (transferToEml) {\r
                                 uint8_t sectortrailer;\r
                                 if (trgBlockNo < 32*4) {        // 4 block sector\r
-                                       sectortrailer = (trgBlockNo & 0x03) + 3;\r
+                                       sectortrailer = trgBlockNo | 0x03;\r
                                 } else {                                        // 16 block sector\r
                                 } else {                                        // 16 block sector\r
-                                       sectortrailer = (trgBlockNo & 0x0f) + 15;\r
+                                       sectortrailer = trgBlockNo | 0x0f;\r
                                 }\r
                                 mfEmlGetMem(keyBlock, sectortrailer, 1);\r
                                 }\r
                                 mfEmlGetMem(keyBlock, sectortrailer, 1);\r
-               \r
+\r
                                 if (!trgKeyType)\r
                                         num_to_bytes(key64, 6, keyBlock);\r
                                 else\r
                                         num_to_bytes(key64, 6, &keyBlock[10]);\r
                                 if (!trgKeyType)\r
                                         num_to_bytes(key64, 6, keyBlock);\r
                                 else\r
                                         num_to_bytes(key64, 6, &keyBlock[10]);\r
-                               mfEmlSetMem(keyBlock, sectortrailer, 1);                \r
+                               mfEmlSetMem(keyBlock, sectortrailer, 1);\r
+                               PrintAndLog("Key transferred to emulator memory.");\r
                         }\r
                 } else {\r
                         PrintAndLog("No valid key found");\r
                         }\r
                 } else {\r
                         PrintAndLog("No valid key found");\r
@@ -641,44 +710,48 @@ int CmdHF14AMfNested(const char *Cmd)
  \r
                 e_sector = calloc(SectorsCnt, sizeof(sector_t));\r
                 if (e_sector == NULL) return 1;\r
  \r
                 e_sector = calloc(SectorsCnt, sizeof(sector_t));\r
                 if (e_sector == NULL) return 1;\r
-               \r
+\r
                 //test current key and additional standard keys first\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
  \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
-                               \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
+               mfCheckKeysSec(SectorsCnt, 2, btimeout14a, true, MifareDefaultKeysSize, keyBlock, e_sector);\r
+               \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
                                 }\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
                         }\r
+                       PrintAndLog("--auto key. block no:%3d, key type:%c key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r
                 }\r
                 }\r
-               \r
+\r
                 // nested sectors\r
                 iterations = 0;\r
                 PrintAndLog("nested...");\r
                 bool calibrate = true;\r
                 for (i = 0; i < NESTED_SECTOR_RETRY; i++) {\r
                         for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {\r
                 // nested sectors\r
                 iterations = 0;\r
                 PrintAndLog("nested...");\r
                 bool calibrate = true;\r
                 for (i = 0; i < NESTED_SECTOR_RETRY; i++) {\r
                         for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {\r
-                               for (trgKeyType = 0; trgKeyType < 2; trgKeyType++) { \r
+                               for (trgKeyType = 0; trgKeyType < 2; trgKeyType++) {\r
                                         if (e_sector[sectorNo].foundKey[trgKeyType]) continue;\r
                                         PrintAndLog("-----------------------------------------------");\r
                                         int16_t isOK = mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate);\r
                                         if (e_sector[sectorNo].foundKey[trgKeyType]) continue;\r
                                         PrintAndLog("-----------------------------------------------");\r
                                         int16_t isOK = mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate);\r
@@ -694,7 +767,7 @@ int CmdHF14AMfNested(const char *Cmd)
                                         } else {\r
                                                 calibrate = false;\r
                                         }\r
                                         } else {\r
                                                 calibrate = false;\r
                                         }\r
-                                       \r
+\r
                                         iterations++;\r
  \r
                                         key64 = bytes_to_num(keyBlock, 6);\r
                                         iterations++;\r
  \r
                                         key64 = bytes_to_num(keyBlock, 6);\r
@@ -702,15 +775,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
                                                 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
                                         }\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
                 \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
                 PrintAndLog("|---|----------------|---|----------------|---|");\r
                 PrintAndLog("|sec|key A           |res|key B           |res|");\r
                 PrintAndLog("|---|----------------|---|----------------|---|");\r
@@ -719,8 +796,8 @@ int CmdHF14AMfNested(const char *Cmd)
                                 e_sector[i].Key[0], e_sector[i].foundKey[0], e_sector[i].Key[1], e_sector[i].foundKey[1]);\r
                 }\r
                 PrintAndLog("|---|----------------|---|----------------|---|");\r
                                 e_sector[i].Key[0], e_sector[i].foundKey[0], e_sector[i].Key[1], e_sector[i].foundKey[1]);\r
                 }\r
                 PrintAndLog("|---|----------------|---|----------------|---|");\r
-               \r
-               // transfer them to the emulator\r
+\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
                 if (transferToEml) {\r
                         for (i = 0; i < SectorsCnt; i++) {\r
                                 mfEmlGetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);\r
@@ -729,12 +806,13 @@ int CmdHF14AMfNested(const char *Cmd)
                                 if (e_sector[i].foundKey[1])\r
                                         num_to_bytes(e_sector[i].Key[1], 6, &keyBlock[10]);\r
                                 mfEmlSetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);\r
                                 if (e_sector[i].foundKey[1])\r
                                         num_to_bytes(e_sector[i].Key[1], 6, &keyBlock[10]);\r
                                 mfEmlSetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);\r
-                       }               \r
+                       }\r
+                       PrintAndLog("Keys transferred to emulator memory.");\r
                 }\r
                 }\r
-               \r
+\r
                 // Create dump file\r
                 if (createDumpFile) {\r
                 // Create dump file\r
                 if (createDumpFile) {\r
-                       if ((fkeys = fopen("dumpkeys.bin","wb")) == NULL) { \r
+                       if ((fkeys = fopen("dumpkeys.bin","wb")) == NULL) {\r
                                 PrintAndLog("Could not create file dumpkeys.bin");\r
                                 free(e_sector);\r
                                 return 1;\r
                                 PrintAndLog("Could not create file dumpkeys.bin");\r
                                 free(e_sector);\r
                                 return 1;\r
@@ -760,7 +838,7 @@ int CmdHF14AMfNested(const char *Cmd)
                         }\r
                         fclose(fkeys);\r
                 }\r
                         }\r
                         fclose(fkeys);\r
                 }\r
-               \r
+\r
                 free(e_sector);\r
         }\r
         return 0;\r
                 free(e_sector);\r
         }\r
         return 0;\r
@@ -775,7 +853,7 @@ int CmdHF14AMfNestedHard(const char *Cmd)
         uint8_t trgKeyType = 0;\r
         uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
         uint8_t trgkey[6] = {0, 0, 0, 0, 0, 0};\r
         uint8_t trgKeyType = 0;\r
         uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
         uint8_t trgkey[6] = {0, 0, 0, 0, 0, 0};\r
-       \r
+\r
         char ctmp;\r
         ctmp = param_getchar(Cmd, 0);\r
  \r
         char ctmp;\r
         ctmp = param_getchar(Cmd, 0);\r
  \r
@@ -789,6 +867,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("      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
                 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
@@ -798,24 +883,29 @@ int CmdHF14AMfNestedHard(const char *Cmd)
                 PrintAndLog("Add the known target key to check if it is present in the remaining key space:");\r
                 PrintAndLog("      sample5: hf mf hardnested 0 A A0A1A2A3A4A5 4 A FFFFFFFFFFFF");\r
                 return 0;\r
                 PrintAndLog("Add the known target key to check if it is present in the remaining key space:");\r
                 PrintAndLog("      sample5: hf mf hardnested 0 A A0A1A2A3A4A5 4 A FFFFFFFFFFFF");\r
                 return 0;\r
-       }       \r
-       \r
+       }\r
+\r
         bool know_target_key = false;\r
         bool nonce_file_read = false;\r
         bool nonce_file_write = false;\r
         bool slow = false;\r
         int tests = 0;\r
         bool know_target_key = false;\r
         bool nonce_file_read = false;\r
         bool nonce_file_write = false;\r
         bool slow = false;\r
         int tests = 0;\r
-       \r
-       \r
+\r
+\r
+       uint16_t iindx = 0;\r
         if (ctmp == 'R' || ctmp == 'r') {\r
                 nonce_file_read = true;\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
                 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
                 }\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
                 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
                 }\r
         } else {\r
                 blockNo = param_get8(Cmd, 0);\r
@@ -824,15 +914,15 @@ int CmdHF14AMfNestedHard(const char *Cmd)
                         PrintAndLog("Key type must be A or B");\r
                         return 1;\r
                 }\r
                         PrintAndLog("Key type must be A or B");\r
                         return 1;\r
                 }\r
-               if (ctmp != 'A' && ctmp != 'a') { \r
+               if (ctmp != 'A' && ctmp != 'a') {\r
                         keyType = 1;\r
                 }\r
                         keyType = 1;\r
                 }\r
-               \r
+\r
                 if (param_gethex(Cmd, 2, key, 12)) {\r
                         PrintAndLog("Key must include 12 HEX symbols");\r
                         return 1;\r
                 }\r
                 if (param_gethex(Cmd, 2, key, 12)) {\r
                         PrintAndLog("Key must include 12 HEX symbols");\r
                         return 1;\r
                 }\r
-               \r
+\r
                 trgBlockNo = param_get8(Cmd, 3);\r
                 ctmp = param_getchar(Cmd, 4);\r
                 if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {\r
                 trgBlockNo = param_get8(Cmd, 3);\r
                 ctmp = param_getchar(Cmd, 4);\r
                 if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {\r
@@ -849,22 +939,57 @@ int CmdHF14AMfNestedHard(const char *Cmd)
                         know_target_key = true;\r
                         i++;\r
                 }\r
                         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
  \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
                         } 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
                                 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
  \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
+       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
                         trgkey[0], trgkey[1], trgkey[2], trgkey[3], trgkey[4], trgkey[5],\r
                         know_target_key?"":" (not set)",\r
                         trgKeyType?'B':'A',\r
                         trgkey[0], trgkey[1], trgkey[2], trgkey[3], trgkey[4], trgkey[5],\r
                         know_target_key?"":" (not set)",\r
@@ -890,94 +1015,106 @@ int CmdHF14AMfNestedHard(const char *Cmd)
  int CmdHF14AMfChk(const char *Cmd)\r
  {\r
         if (strlen(Cmd)<3) {\r
  int CmdHF14AMfChk(const char *Cmd)\r
  {\r
         if (strlen(Cmd)<3) {\r
-               PrintAndLog("Usage:  hf mf chk <block number>|<*card memory> <key type (A/B/?)> [t|d] [<key (12 hex symbols)>] [<dic (*.dic)>]");\r
+               PrintAndLog("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("          * - 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("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("      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
                 return 0;\r
-       }       \r
+       }\r
  \r
         FILE * f;\r
         char filename[FILE_PATH_SIZE]={0};\r
         char buf[13];\r
         uint8_t *keyBlock = NULL, *p;\r
  \r
         FILE * f;\r
         char filename[FILE_PATH_SIZE]={0};\r
         char buf[13];\r
         uint8_t *keyBlock = NULL, *p;\r
-       uint8_t stKeyBlock = 20;\r
-       \r
+       uint16_t stKeyBlock = 20;\r
+\r
         int i, res;\r
         int     keycnt = 0;\r
         char ctmp       = 0x00;\r
         int i, res;\r
         int     keycnt = 0;\r
         char ctmp       = 0x00;\r
+       int clen = 0;\r
+       char ctmp3[3]   = {0x00};\r
         uint8_t blockNo = 0;\r
         uint8_t blockNo = 0;\r
-       uint8_t SectorsCnt = 1;\r
+       uint8_t SectorsCnt = 0;\r
         uint8_t keyType = 0;\r
         uint64_t key64 = 0;\r
         uint8_t keyType = 0;\r
         uint64_t key64 = 0;\r
-       \r
+       uint32_t timeout14a = 0; // timeout in us\r
+       bool param3InUse = false;\r
+\r
         int transferToEml = 0;\r
         int createDumpFile = 0;\r
         int transferToEml = 0;\r
         int createDumpFile = 0;\r
+       \r
+       sector_t *e_sector = NULL;\r
  \r
         keyBlock = calloc(stKeyBlock, 6);\r
         if (keyBlock == NULL) return 1;\r
  \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
-       \r
+\r
         if (param_getchar(Cmd, 0)=='*') {\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
-               }\r
+               SectorsCnt = ParamCardSizeSectors(param_getchar(Cmd + 1, 0));\r
         }\r
         else\r
                 blockNo = param_get8(Cmd, 0);\r
         }\r
         else\r
                 blockNo = param_get8(Cmd, 0);\r
-       \r
+\r
         ctmp = param_getchar(Cmd, 1);\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
-               return 1;\r
-       };\r
-       \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
+       // transfer to emulator & create dump file\r
         ctmp = param_getchar(Cmd, 2);\r
         ctmp = param_getchar(Cmd, 2);\r
-       if              (ctmp == 't' || ctmp == 'T') transferToEml = 1;\r
-       else if (ctmp == 'd' || ctmp == 'D') createDumpFile = 1;\r
+       clen = param_getlength(Cmd, 2);\r
+       if (clen == 1 && (ctmp == 't' || ctmp == 'T')) transferToEml = 1;\r
+       if (clen == 1 && (ctmp == 'd' || ctmp == 'D')) createDumpFile = 1;\r
         \r
         \r
-       for (i = transferToEml || createDumpFile; param_getchar(Cmd, 2 + i); i++) {\r
+       param3InUse = transferToEml | createDumpFile;\r
+       \r
+       timeout14a = 500; // fast by default\r
+       // double parameters - ts, ds\r
+       clen = param_getlength(Cmd, 2);\r
+       if (clen == 2 || clen == 3){\r
+               param_getstr(Cmd, 2, ctmp3, sizeof(ctmp3));\r
+               ctmp = ctmp3[1];\r
+       }\r
+       //parse\r
+       if (ctmp == 's' || ctmp == 'S') {\r
+               timeout14a = 1000; // slow\r
+               if (!param3InUse && clen == 2 && (ctmp3[1] == 's' || ctmp3[1] == 'S')) {\r
+                       timeout14a = 5000; // very slow\r
+               }\r
+               if (param3InUse && clen == 3 && (ctmp3[2] == 's' || ctmp3[2] == 'S')) {\r
+                       timeout14a = 5000; // very slow\r
+               }\r
+               param3InUse = true;\r
+       }\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
                 if (!param_gethex(Cmd, 2 + i, keyBlock + 6 * keycnt, 12)) {\r
                         if ( stKeyBlock - keycnt < 2) {\r
                                 p = realloc(keyBlock, 6*(stKeyBlock+=10));\r
@@ -994,26 +1131,26 @@ int CmdHF14AMfChk(const char *Cmd)
                         keycnt++;\r
                 } else {\r
                         // May be a dic file\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
                                 PrintAndLog("File name too long");\r
                                 free(keyBlock);\r
                                 return 2;\r
                         }\r
-                       \r
+\r
                         if ( (f = fopen( filename , "r")) ) {\r
                                 while( fgets(buf, sizeof(buf), f) ){\r
                                         if (strlen(buf) < 12 || buf[11] == '\n')\r
                                                 continue;\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
+\r
                                         while (fgetc(f) != '\n' && !feof(f)) ;  //goto next line\r
                                         while (fgetc(f) != '\n' && !feof(f)) ;  //goto next line\r
-                                       \r
+\r
                                         if( buf[0]=='#' ) continue;     //The line start with # is comment, skip\r
  \r
                                         if( buf[0]=='#' ) continue;     //The line start with # is comment, skip\r
  \r
-                                       if (!isxdigit(buf[0])){\r
+                                       if (!isxdigit((unsigned char)buf[0])){\r
                                                 PrintAndLog("File content error. '%s' must include 12 HEX symbols",buf);\r
                                                 continue;\r
                                         }\r
                                                 PrintAndLog("File content error. '%s' must include 12 HEX symbols",buf);\r
                                                 continue;\r
                                         }\r
-                                       \r
+\r
                                         buf[12] = 0;\r
  \r
                                         if ( stKeyBlock - keycnt < 2) {\r
                                         buf[12] = 0;\r
  \r
                                         if ( stKeyBlock - keycnt < 2) {\r
@@ -1037,11 +1174,12 @@ int CmdHF14AMfChk(const char *Cmd)
                                 PrintAndLog("File: %s: not found or locked.", filename);\r
                                 free(keyBlock);\r
                                 return 1;\r
                                 PrintAndLog("File: %s: not found or locked.", filename);\r
                                 free(keyBlock);\r
                                 return 1;\r
-                       \r
+\r
                         }\r
                 }\r
         }\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
         if (keycnt == 0) {\r
                 PrintAndLog("No key specified, trying default keys");\r
                 for (;keycnt < defaultKeysSize; keycnt++)\r
@@ -1049,49 +1187,89 @@ int CmdHF14AMfChk(const char *Cmd)
                                 (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
                                 (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
+\r
         // initialize storage for found keys\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
                 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
                 }\r
         }\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
+       printf("\n");\r
+\r
+       bool foundAKey = false;\r
+       uint32_t max_keys = keycnt > USB_CMD_DATA_SIZE / 6 ? USB_CMD_DATA_SIZE / 6 : keycnt;\r
+       if (SectorsCnt) {\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, timeout14a * 1.06 / 100, true, size, &keyBlock[6 * c], e_sector); // timeout is (ms * 106)/10 or us*0.0106\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
                         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
+\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
+\r
                                 if (res != 1) {\r
                                         if (!res) {\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
-                                       } \r
+                                               PrintAndLog("Found valid key:[%d:%c]%012" PRIx64, blockNo, (keyAB & 0x01)?'B':'A', key64);\r
+                                               foundAKey = true;\r
+                                       }\r
                                 } else {\r
                                         PrintAndLog("Command execute timeout");\r
                                 }\r
                         }\r
                                 } else {\r
                                         PrintAndLog("Command execute timeout");\r
                                 }\r
                         }\r
-                       b<127?(b+=4):(b+=16);   \r
-               }\r
+               } while(--keyAB > 0);\r
         }\r
         }\r
-\r
+       \r
+       // print result\r
+       if (foundAKey) {\r
+               if (SectorsCnt) {\r
+                       PrintAndLog("");\r
+                       PrintAndLog("|---|----------------|---|----------------|---|");\r
+                       PrintAndLog("|sec|key A           |res|key B           |res|");\r
+                       PrintAndLog("|---|----------------|---|----------------|---|");\r
+                       for (i = 0; i < SectorsCnt; i++) {\r
+                               PrintAndLog("|%03d|  %012" PRIx64 "  | %d |  %012" PRIx64 "  | %d |", i,\r
+                                       e_sector[i].Key[0], e_sector[i].foundKey[0], e_sector[i].Key[1], e_sector[i].foundKey[1]);\r
+                       }\r
+                       PrintAndLog("|---|----------------|---|----------------|---|");\r
+               }\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 (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
                                 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
                                         }\r
                                 }\r
                                 mfEmlSetMem(block, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);\r
                                         }\r
                                 }\r
                                 mfEmlSetMem(block, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);\r
@@ -1102,25 +1280,32 @@ int CmdHF14AMfChk(const char *Cmd)
  \r
         if (createDumpFile) {\r
                 FILE *fkeys = fopen("dumpkeys.bin","wb");\r
  \r
         if (createDumpFile) {\r
                 FILE *fkeys = fopen("dumpkeys.bin","wb");\r
-               if (fkeys == NULL) { \r
+               if (fkeys == NULL) {\r
                         PrintAndLog("Could not create file dumpkeys.bin");\r
                         PrintAndLog("Could not create file dumpkeys.bin");\r
+                       free(e_sector);\r
                         free(keyBlock);\r
                         return 1;\r
                 }\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
-               }\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
                 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
  void readerAttack(nonces_t ar_resp[], bool setEmulatorMem, bool doStandardAttack) {\r
         free(keyBlock);\r
         PrintAndLog("");\r
         return 0;\r
  }\r
  \r
  void readerAttack(nonces_t ar_resp[], bool setEmulatorMem, bool doStandardAttack) {\r
-       #define ATTACK_KEY_COUNT 8 // keep same as define in iso14443a.c -> Mifare1ksim()\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
         uint64_t key = 0;\r
         typedef struct {\r
                         uint64_t keyA;\r
         uint64_t key = 0;\r
         typedef struct {\r
                         uint64_t keyA;\r
@@ -1202,11 +1387,11 @@ void readerAttack(nonces_t ar_resp[], bool setEmulatorMem, bool doStandardAttack
                                         PrintAndLog("block data must include 32 HEX symbols");\r
                                         return;\r
                                 }\r
                                         PrintAndLog("block data must include 32 HEX symbols");\r
                                         return;\r
                                 }\r
-                               \r
+\r
                                 UsbCommand c = {CMD_MIFARE_EML_MEMSET, {(stSector[i]*4+3), 1, 0}};\r
                                 memcpy(c.d.asBytes, memBlock, 16);\r
                                 clearCommandBuffer();\r
                                 UsbCommand c = {CMD_MIFARE_EML_MEMSET, {(stSector[i]*4+3), 1, 0}};\r
                                 memcpy(c.d.asBytes, memBlock, 16);\r
                                 clearCommandBuffer();\r
-                               SendCommand(&c);                        \r
+                               SendCommand(&c);\r
                         }\r
                 }\r
         }\r
                         }\r
                 }\r
         }\r
@@ -1238,7 +1423,7 @@ int usage_hf14_mf1ksim(void) {
         PrintAndLog("           hf mf sim u 112233445566778899AA");\r
         PrintAndLog("           hf mf sim f uids.txt");\r
         PrintAndLog("           hf mf sim u 0a0a0a0a e");\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
+\r
         return 0;\r
  }\r
  \r
         return 0;\r
  }\r
  \r
@@ -1272,7 +1457,7 @@ int CmdHF14AMf1kSim(const char *Cmd) {
                         break;\r
                 case 'f':\r
                 case 'F':\r
                         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
                         if (len < 1) {\r
                                 PrintAndLog("error no filename found");\r
                                 return 0;\r
@@ -1341,9 +1526,9 @@ int CmdHF14AMf1kSim(const char *Cmd) {
                         memset(buf, 0, sizeof(buf));\r
                         memset(uid, 0, sizeof(uid));\r
  \r
                         memset(buf, 0, sizeof(buf));\r
                         memset(uid, 0, sizeof(uid));\r
  \r
-                       if (fgets(buf, sizeof(buf), f) == NULL) {                       \r
+                       if (fgets(buf, sizeof(buf), f) == NULL) {\r
                                 if (count > 0) break;\r
                                 if (count > 0) break;\r
-                               \r
+\r
                                 PrintAndLog("File reading error.");\r
                                 fclose(f);\r
                                 return 2;\r
                                 PrintAndLog("File reading error.");\r
                                 fclose(f);\r
                                 return 2;\r
@@ -1355,7 +1540,7 @@ int CmdHF14AMf1kSim(const char *Cmd) {
                                 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
                                 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
+                               default:\r
                                         PrintAndLog("uid in file wrong length at %d (length: %d) [%s]",count, uidlen, buf);\r
                                         fclose(f);\r
                                         return 2;\r
                                         PrintAndLog("uid in file wrong length at %d (length: %d) [%s]",count, uidlen, buf);\r
                                         fclose(f);\r
                                         return 2;\r
@@ -1364,10 +1549,10 @@ int CmdHF14AMf1kSim(const char *Cmd) {
                         for (uint8_t i = 0; i < uidlen; i += 2) {\r
                                 sscanf(&buf[i], "%02x", (unsigned int *)&uid[i / 2]);\r
                         }\r
                         for (uint8_t i = 0; i < uidlen; i += 2) {\r
                                 sscanf(&buf[i], "%02x", (unsigned int *)&uid[i / 2]);\r
                         }\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
                         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_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
  \r
                                                         flags & FLAG_10B_UID_IN_DATA ? sprint_hex(uid,10): "N/A"\r
                                         , exitAfterNReads, flags, flags);\r
  \r
@@ -1397,7 +1582,7 @@ int CmdHF14AMf1kSim(const char *Cmd) {
  \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
  \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_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
  \r
                                                 flags & FLAG_10B_UID_IN_DATA ? sprint_hex(uid,10): "N/A"\r
                                 , exitAfterNReads, flags, flags);\r
  \r
@@ -1441,7 +1626,7 @@ int CmdHF14AMfDbg(const char *Cmd)
                 PrintAndLog(" 4 - print even debug messages in timing critical functions");\r
                 PrintAndLog("     Note: this option therefore may cause malfunction itself");\r
                 return 0;\r
                 PrintAndLog(" 4 - print even debug messages in timing critical functions");\r
                 PrintAndLog("     Note: this option therefore may cause malfunction itself");\r
                 return 0;\r
-       }       \r
+       }\r
  \r
    UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}};\r
    SendCommand(&c);\r
  \r
    UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}};\r
    SendCommand(&c);\r
@@ -1458,8 +1643,8 @@ int CmdHF14AMfEGet(const char *Cmd)
                 PrintAndLog("Usage:  hf mf eget <block number>");\r
                 PrintAndLog(" sample: hf mf eget 0 ");\r
                 return 0;\r
                 PrintAndLog("Usage:  hf mf eget <block number>");\r
                 PrintAndLog(" sample: hf mf eget 0 ");\r
                 return 0;\r
-       }       \r
-       \r
+       }\r
+\r
         blockNo = param_get8(Cmd, 0);\r
  \r
         PrintAndLog(" ");\r
         blockNo = param_get8(Cmd, 0);\r
  \r
         PrintAndLog(" ");\r
@@ -1478,7 +1663,7 @@ int CmdHF14AMfEClear(const char *Cmd)
                 PrintAndLog("Usage:  hf mf eclr");\r
                 PrintAndLog("It set card emulator memory to empty data blocks and key A/B FFFFFFFFFFFF \n");\r
                 return 0;\r
                 PrintAndLog("Usage:  hf mf eclr");\r
                 PrintAndLog("It set card emulator memory to empty data blocks and key A/B FFFFFFFFFFFF \n");\r
                 return 0;\r
-       }       \r
+       }\r
  \r
    UsbCommand c = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}};\r
    SendCommand(&c);\r
  \r
    UsbCommand c = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}};\r
    SendCommand(&c);\r
@@ -1497,20 +1682,17 @@ int CmdHF14AMfESet(const char *Cmd)
                 PrintAndLog("Usage:  hf mf eset <block number> <block data (32 hex symbols)>");\r
                 PrintAndLog(" sample: hf mf eset 1 000102030405060708090a0b0c0d0e0f ");\r
                 return 0;\r
                 PrintAndLog("Usage:  hf mf eset <block number> <block data (32 hex symbols)>");\r
                 PrintAndLog(" sample: hf mf eset 1 000102030405060708090a0b0c0d0e0f ");\r
                 return 0;\r
-       }       \r
-       \r
+       }\r
+\r
         blockNo = param_get8(Cmd, 0);\r
         blockNo = param_get8(Cmd, 0);\r
-       \r
+\r
         if (param_gethex(Cmd, 1, memBlock, 32)) {\r
                 PrintAndLog("block data must include 32 HEX symbols");\r
                 return 1;\r
         }\r
         if (param_gethex(Cmd, 1, memBlock, 32)) {\r
                 PrintAndLog("block data must include 32 HEX symbols");\r
                 return 1;\r
         }\r
-       \r
+\r
         //  1 - blocks count\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
  }\r
  \r
  \r
@@ -1523,9 +1705,9 @@ int CmdHF14AMfELoad(const char *Cmd)
         uint8_t buf8[64] = {0x00};\r
         int i, len, blockNum, numBlocks;\r
         int nameParamNo = 1;\r
         uint8_t buf8[64] = {0x00};\r
         int i, len, blockNum, numBlocks;\r
         int nameParamNo = 1;\r
-       \r
+\r
         char ctmp = param_getchar(Cmd, 0);\r
         char ctmp = param_getchar(Cmd, 0);\r
-               \r
+\r
         if ( ctmp == 'h' || ctmp == 0x00) {\r
                 PrintAndLog("It loads emul dump from the file `filename.eml`");\r
                 PrintAndLog("Usage:  hf mf eload [card memory] <file name w/o `.eml`>");\r
         if ( ctmp == 'h' || ctmp == 0x00) {\r
                 PrintAndLog("It loads emul dump from the file `filename.eml`");\r
                 PrintAndLog("Usage:  hf mf eload [card memory] <file name w/o `.eml`>");\r
@@ -1534,11 +1716,11 @@ int CmdHF14AMfELoad(const char *Cmd)
                 PrintAndLog(" sample: hf mf eload filename");\r
                 PrintAndLog("         hf mf eload 4 filename");\r
                 return 0;\r
                 PrintAndLog(" sample: hf mf eload filename");\r
                 PrintAndLog("         hf mf eload 4 filename");\r
                 return 0;\r
-       }       \r
+       }\r
  \r
         switch (ctmp) {\r
                 case '0' : numBlocks = 5*4; break;\r
  \r
         switch (ctmp) {\r
                 case '0' : numBlocks = 5*4; break;\r
-               case '1' : \r
+               case '1' :\r
                 case '\0': numBlocks = 16*4; break;\r
                 case '2' : numBlocks = 32*4; break;\r
                 case '4' : numBlocks = 256; break;\r
                 case '\0': numBlocks = 16*4; break;\r
                 case '2' : numBlocks = 32*4; break;\r
                 case '4' : numBlocks = 256; break;\r
@@ -1548,34 +1730,34 @@ int CmdHF14AMfELoad(const char *Cmd)
                 }\r
         }\r
  \r
                 }\r
         }\r
  \r
-       len = param_getstr(Cmd,nameParamNo,filename);\r
-       \r
+       len = param_getstr(Cmd,nameParamNo,filename,sizeof(filename));\r
+\r
         if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
  \r
         fnameptr += len;\r
  \r
         if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
  \r
         fnameptr += len;\r
  \r
-       sprintf(fnameptr, ".eml"); \r
-       \r
+       sprintf(fnameptr, ".eml");\r
+\r
         // open file\r
         f = fopen(filename, "r");\r
         if (f == NULL) {\r
                 PrintAndLog("File %s not found or locked", filename);\r
                 return 1;\r
         }\r
         // open file\r
         f = fopen(filename, "r");\r
         if (f == NULL) {\r
                 PrintAndLog("File %s not found or locked", filename);\r
                 return 1;\r
         }\r
-       \r
+\r
         blockNum = 0;\r
         while(!feof(f)){\r
                 memset(buf, 0, sizeof(buf));\r
         blockNum = 0;\r
         while(!feof(f)){\r
                 memset(buf, 0, sizeof(buf));\r
-               \r
+\r
                 if (fgets(buf, sizeof(buf), f) == NULL) {\r
                 if (fgets(buf, sizeof(buf), f) == NULL) {\r
-                       \r
+\r
                         if (blockNum >= numBlocks) break;\r
                         if (blockNum >= numBlocks) break;\r
-                       \r
+\r
                         PrintAndLog("File reading error.");\r
                         fclose(f);\r
                         return 2;\r
                 }\r
                         PrintAndLog("File reading error.");\r
                         fclose(f);\r
                         return 2;\r
                 }\r
-               \r
+\r
                 if (strlen(buf) < 32){\r
                         if(strlen(buf) && feof(f))\r
                                 break;\r
                 if (strlen(buf) < 32){\r
                         if(strlen(buf) && feof(f))\r
                                 break;\r
@@ -1583,11 +1765,11 @@ int CmdHF14AMfELoad(const char *Cmd)
                         fclose(f);\r
                         return 2;\r
                 }\r
                         fclose(f);\r
                         return 2;\r
                 }\r
-               \r
+\r
                 for (i = 0; i < 32; i += 2) {\r
                         sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);\r
                 }\r
                 for (i = 0; i < 32; i += 2) {\r
                         sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);\r
                 }\r
-               \r
+\r
                 if (mfEmlSetMem(buf8, blockNum, 1)) {\r
                         PrintAndLog("Cant set emul block: %3d", blockNum);\r
                         fclose(f);\r
                 if (mfEmlSetMem(buf8, blockNum, 1)) {\r
                         PrintAndLog("Cant set emul block: %3d", blockNum);\r
                         fclose(f);\r
@@ -1595,12 +1777,12 @@ int CmdHF14AMfELoad(const char *Cmd)
                 }\r
                 printf(".");\r
                 blockNum++;\r
                 }\r
                 printf(".");\r
                 blockNum++;\r
-               \r
+\r
                 if (blockNum >= numBlocks) break;\r
         }\r
         fclose(f);\r
         printf("\n");\r
                 if (blockNum >= numBlocks) break;\r
         }\r
         fclose(f);\r
         printf("\n");\r
-       \r
+\r
         if ((blockNum != numBlocks)) {\r
                 PrintAndLog("File content error. Got %d must be %d blocks.",blockNum, numBlocks);\r
                 return 4;\r
         if ((blockNum != numBlocks)) {\r
                 PrintAndLog("File content error. Got %d must be %d blocks.",blockNum, numBlocks);\r
                 return 4;\r
@@ -1618,12 +1800,12 @@ int CmdHF14AMfESave(const char *Cmd)
         uint8_t buf[64];\r
         int i, j, len, numBlocks;\r
         int nameParamNo = 1;\r
         uint8_t buf[64];\r
         int i, j, len, numBlocks;\r
         int nameParamNo = 1;\r
-       \r
+\r
         memset(filename, 0, sizeof(filename));\r
         memset(buf, 0, sizeof(buf));\r
  \r
         char ctmp = param_getchar(Cmd, 0);\r
         memset(filename, 0, sizeof(filename));\r
         memset(buf, 0, sizeof(buf));\r
  \r
         char ctmp = param_getchar(Cmd, 0);\r
-       \r
+\r
         if ( ctmp == 'h' || ctmp == 'H') {\r
                 PrintAndLog("It saves emul dump into the file `filename.eml` or `cardID.eml`");\r
                 PrintAndLog(" Usage:  hf mf esave [card memory] [file name w/o `.eml`]");\r
         if ( ctmp == 'h' || ctmp == 'H') {\r
                 PrintAndLog("It saves emul dump into the file `filename.eml` or `cardID.eml`");\r
                 PrintAndLog(" Usage:  hf mf esave [card memory] [file name w/o `.eml`]");\r
@@ -1633,11 +1815,11 @@ int CmdHF14AMfESave(const char *Cmd)
                 PrintAndLog("         hf mf esave 4");\r
                 PrintAndLog("         hf mf esave 4 filename");\r
                 return 0;\r
                 PrintAndLog("         hf mf esave 4");\r
                 PrintAndLog("         hf mf esave 4 filename");\r
                 return 0;\r
-       }       \r
+       }\r
  \r
         switch (ctmp) {\r
                 case '0' : numBlocks = 5*4; break;\r
  \r
         switch (ctmp) {\r
                 case '0' : numBlocks = 5*4; break;\r
-               case '1' : \r
+               case '1' :\r
                 case '\0': numBlocks = 16*4; break;\r
                 case '2' : numBlocks = 32*4; break;\r
                 case '4' : numBlocks = 256; break;\r
                 case '\0': numBlocks = 16*4; break;\r
                 case '2' : numBlocks = 32*4; break;\r
                 case '4' : numBlocks = 256; break;\r
@@ -1647,10 +1829,10 @@ int CmdHF14AMfESave(const char *Cmd)
                 }\r
         }\r
  \r
                 }\r
         }\r
  \r
-       len = param_getstr(Cmd,nameParamNo,filename);\r
-       \r
+       len = param_getstr(Cmd,nameParamNo,filename,sizeof(filename));\r
+\r
         if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
         if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
-       \r
+\r
         // user supplied filename?\r
         if (len < 1) {\r
                 // get filename (UID from memory)\r
         // user supplied filename?\r
         if (len < 1) {\r
                 // get filename (UID from memory)\r
@@ -1668,8 +1850,8 @@ int CmdHF14AMfESave(const char *Cmd)
         }\r
  \r
         // add file extension\r
         }\r
  \r
         // add file extension\r
-       sprintf(fnameptr, ".eml"); \r
-       \r
+       sprintf(fnameptr, ".eml");\r
+\r
         // open file\r
         f = fopen(filename, "w+");\r
  \r
         // open file\r
         f = fopen(filename, "w+");\r
  \r
@@ -1677,7 +1859,7 @@ int CmdHF14AMfESave(const char *Cmd)
                 PrintAndLog("Can't open file %s ", filename);\r
                 return 1;\r
         }\r
                 PrintAndLog("Can't open file %s ", filename);\r
                 return 1;\r
         }\r
-       \r
+\r
         // put hex\r
         for (i = 0; i < numBlocks; i++) {\r
                 if (mfEmlGetMem(buf, i, 1)) {\r
         // put hex\r
         for (i = 0; i < numBlocks; i++) {\r
                 if (mfEmlGetMem(buf, i, 1)) {\r
@@ -1685,13 +1867,13 @@ int CmdHF14AMfESave(const char *Cmd)
                         break;\r
                 }\r
                 for (j = 0; j < 16; j++)\r
                         break;\r
                 }\r
                 for (j = 0; j < 16; j++)\r
-                       fprintf(f, "%02X", buf[j]); \r
+                       fprintf(f, "%02X", buf[j]);\r
                 fprintf(f,"\n");\r
         }\r
         fclose(f);\r
                 fprintf(f,"\n");\r
         }\r
         fclose(f);\r
-       \r
+\r
         PrintAndLog("Saved %d blocks to file: %s", numBlocks, filename);\r
         PrintAndLog("Saved %d blocks to file: %s", numBlocks, filename);\r
-       \r
+\r
    return 0;\r
  }\r
  \r
    return 0;\r
  }\r
  \r
@@ -1700,7 +1882,7 @@ int CmdHF14AMfECFill(const char *Cmd)
  {\r
         uint8_t keyType = 0;\r
         uint8_t numSectors = 16;\r
  {\r
         uint8_t keyType = 0;\r
         uint8_t numSectors = 16;\r
-       \r
+\r
         if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
                 PrintAndLog("Usage:  hf mf ecfill <key A/B> [card memory]");\r
                 PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r
         if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
                 PrintAndLog("Usage:  hf mf ecfill <key A/B> [card memory]");\r
                 PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r
@@ -1710,7 +1892,7 @@ int CmdHF14AMfECFill(const char *Cmd)
                 PrintAndLog("Read card and transfer its data to emulator memory.");\r
                 PrintAndLog("Keys must be laid in the emulator memory. \n");\r
                 return 0;\r
                 PrintAndLog("Read card and transfer its data to emulator memory.");\r
                 PrintAndLog("Keys must be laid in the emulator memory. \n");\r
                 return 0;\r
-       }       \r
+       }\r
  \r
         char ctmp = param_getchar(Cmd, 0);\r
         if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {\r
  \r
         char ctmp = param_getchar(Cmd, 0);\r
         if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {\r
@@ -1722,27 +1904,26 @@ int CmdHF14AMfECFill(const char *Cmd)
         ctmp = param_getchar(Cmd, 1);\r
         switch (ctmp) {\r
                 case '0' : numSectors = 5; break;\r
         ctmp = param_getchar(Cmd, 1);\r
         switch (ctmp) {\r
                 case '0' : numSectors = 5; break;\r
-               case '1' : \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
                 case '\0': numSectors = 16; break;\r
                 case '2' : numSectors = 32; break;\r
                 case '4' : numSectors = 40; break;\r
                 default:   numSectors = 16;\r
-       }       \r
+       }\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
         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 data[16];\r
         uint64_t keyA, keyB;\r
  int CmdHF14AMfEKeyPrn(const char *Cmd)\r
  {\r
         int i;\r
         uint8_t numSectors;\r
         uint8_t data[16];\r
         uint64_t keyA, keyB;\r
-       \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
         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
@@ -1750,19 +1931,19 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
                 PrintAndLog("");\r
                 PrintAndLog(" sample: hf mf ekeyprn 1");\r
                 return 0;\r
                 PrintAndLog("");\r
                 PrintAndLog(" sample: hf mf ekeyprn 1");\r
                 return 0;\r
-       }       \r
+       }\r
  \r
         char cmdp = param_getchar(Cmd, 0);\r
  \r
         char cmdp = param_getchar(Cmd, 0);\r
-       \r
+\r
         switch (cmdp) {\r
                 case '0' : numSectors = 5; break;\r
         switch (cmdp) {\r
                 case '0' : numSectors = 5; break;\r
-               case '1' : \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
                 case '\0': numSectors = 16; break;\r
                 case '2' : numSectors = 32; break;\r
                 case '4' : numSectors = 40; break;\r
                 default:   numSectors = 16;\r
-       }               \r
-       \r
+       }\r
+\r
         PrintAndLog("|---|----------------|----------------|");\r
         PrintAndLog("|sec|key A           |key B           |");\r
         PrintAndLog("|---|----------------|----------------|");\r
         PrintAndLog("|---|----------------|----------------|");\r
         PrintAndLog("|sec|key A           |key B           |");\r
         PrintAndLog("|---|----------------|----------------|");\r
@@ -1776,86 +1957,152 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
                 PrintAndLog("|%03d|  %012" PRIx64 "  |  %012" PRIx64 "  |", i, keyA, keyB);\r
         }\r
         PrintAndLog("|---|----------------|----------------|");\r
                 PrintAndLog("|%03d|  %012" PRIx64 "  |  %012" PRIx64 "  |", i, keyA, keyB);\r
         }\r
         PrintAndLog("|---|----------------|----------------|");\r
-       \r
+\r
         return 0;\r
  }\r
  \r
         return 0;\r
  }\r
  \r
-\r
  int CmdHF14AMfCSetUID(const char *Cmd)\r
  {\r
  int CmdHF14AMfCSetUID(const char *Cmd)\r
  {\r
-       uint8_t wipeCard = 0;\r
         uint8_t uid[8] = {0x00};\r
         uint8_t oldUid[8] = {0x00};\r
         uint8_t atqa[2] = {0x00};\r
         uint8_t sak[1] = {0x00};\r
         uint8_t uid[8] = {0x00};\r
         uint8_t oldUid[8] = {0x00};\r
         uint8_t atqa[2] = {0x00};\r
         uint8_t sak[1] = {0x00};\r
-       uint8_t atqaPresent = 1;\r
+       uint8_t atqaPresent = 0;\r
         int res;\r
         int res;\r
-       char ctmp;\r
-       int argi=0;\r
-\r
-       if (strlen(Cmd) < 1 || param_getchar(Cmd, argi) == 'h') {\r
-               PrintAndLog("Usage:  hf mf csetuid <UID 8 hex symbols> [ATQA 4 hex symbols SAK 2 hex symbols] [w]");\r
-               PrintAndLog("sample:  hf mf csetuid 01020304");\r
-               PrintAndLog("sample:  hf mf csetuid 01020304 0004 08 w");\r
-               PrintAndLog("Set UID, ATQA, and SAK for magic Chinese card (only works with such cards)");\r
-               PrintAndLog("If you also want to wipe the card then add 'w' at the end of the command line.");\r
-               return 0;\r
-       }\r
  \r
  \r
-       if (param_getchar(Cmd, argi) && param_gethex(Cmd, argi, uid, 8)) {\r
+       uint8_t needHelp = 0;\r
+       char cmdp = 1;\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
         }\r
                 PrintAndLog("UID must include 8 HEX symbols");\r
                 return 1;\r
         }\r
-       argi++;\r
  \r
  \r
-       ctmp = param_getchar(Cmd, argi);\r
-       if (ctmp == 'w' || ctmp == 'W') {\r
-               wipeCard = 1;\r
-               atqaPresent = 0;\r
+       if (param_getlength(Cmd, 1) > 1 && param_getlength(Cmd, 2) >  1) {\r
+               atqaPresent = 1;\r
+               cmdp = 3;\r
+               \r
+               if (param_gethex(Cmd, 1, atqa, 4)) {\r
+                       PrintAndLog("ATQA must include 4 HEX symbols");\r
+                       return 1;\r
+               }\r
+                               \r
+               if (param_gethex(Cmd, 2, sak, 2)) {\r
+                       PrintAndLog("SAK must include 2 HEX symbols");\r
+                       return 1;\r
+               }\r
         }\r
  \r
         }\r
  \r
-       if (atqaPresent) {\r
-               if (param_getchar(Cmd, argi)) {\r
-                       if (param_gethex(Cmd, argi, atqa, 4)) {\r
-                               PrintAndLog("ATQA must include 4 HEX symbols");\r
-                               return 1;\r
-                       }\r
-                       argi++;\r
-                       if (!param_getchar(Cmd, argi) || param_gethex(Cmd, argi, sak, 2)) {\r
-                               PrintAndLog("SAK must include 2 HEX symbols");\r
-                               return 1;\r
-                       }\r
-                       argi++;\r
-               } else\r
-                       atqaPresent = 0;\r
+       while(param_getchar(Cmd, cmdp) != 0x00)\r
+       {\r
+               switch(param_getchar(Cmd, cmdp))\r
+               {\r
+               case 'h':\r
+               case 'H':\r
+                       needHelp = 1;\r
+                       break;\r
+               default:\r
+                       PrintAndLog("ERROR: Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r
+                       needHelp = 1;\r
+                       break;\r
+               }\r
+               cmdp++;\r
         }\r
  \r
         }\r
  \r
-       if(!wipeCard) {\r
-               ctmp = param_getchar(Cmd, argi);\r
-               if (ctmp == 'w' || ctmp == 'W') {\r
-                       wipeCard = 1;\r
-               }\r
+       if (strlen(Cmd) < 1 || needHelp) {\r
+               PrintAndLog("");\r
+               PrintAndLog("Usage:  hf mf csetuid <UID 8 hex symbols> [ATQA 4 hex symbols SAK 2 hex symbols]");\r
+               PrintAndLog("sample:  hf mf csetuid 01020304");\r
+               PrintAndLog("sample:  hf mf csetuid 01020304 0004 08");\r
+               PrintAndLog("Set UID, ATQA, and SAK for magic Chinese card (only works with such cards)");\r
+               return 0;\r
         }\r
  \r
         }\r
  \r
-       PrintAndLog("--wipe card:%s  uid:%s", (wipeCard)?"YES":"NO", sprint_hex(uid, 4));\r
+       PrintAndLog("uid:%s", sprint_hex(uid, 4));\r
+       if (atqaPresent) {\r
+               PrintAndLog("--atqa:%s sak:%02x", sprint_hex(atqa, 2), sak[0]);\r
+       }\r
  \r
  \r
-       res = mfCSetUID(uid, (atqaPresent)?atqa:NULL, (atqaPresent)?sak:NULL, oldUid, wipeCard);\r
+       res = mfCSetUID(uid, (atqaPresent)?atqa:NULL, (atqaPresent)?sak:NULL, oldUid);\r
         if (res) {\r
         if (res) {\r
-                       PrintAndLog("Can't set UID. error=%d", res);\r
+                       PrintAndLog("Can't set UID. Error=%d", res);\r
                         return 1;\r
                 }\r
                         return 1;\r
                 }\r
-       \r
+\r
         PrintAndLog("old UID:%s", sprint_hex(oldUid, 4));\r
         PrintAndLog("new UID:%s", sprint_hex(uid, 4));\r
         return 0;\r
  }\r
  \r
         PrintAndLog("old UID:%s", sprint_hex(oldUid, 4));\r
         PrintAndLog("new UID:%s", sprint_hex(uid, 4));\r
         return 0;\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
+       if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\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
+               return 0;\r
+       }\r
+\r
+       gen = mfCIdentify();\r
+       if ((gen != 1) && (gen != 2)) \r
+               return 1;\r
+       \r
+       numBlocks = ParamCardSizeBlocks(param_getchar(Cmd, 0));\r
+\r
+       char cmdp = 0;\r
+       while(param_getchar(Cmd, cmdp) != 0x00){\r
+               switch(param_getchar(Cmd, cmdp)) {\r
+               case 'w':\r
+               case 'W':\r
+                       wipeCard = 1;\r
+                       break;\r
+               case 'f':\r
+               case 'F':\r
+                       fillCard = 1;\r
+                       break;\r
+               default:\r
+                       break;\r
+               }\r
+               cmdp++;\r
+       }\r
+\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
+\r
+       if (gen == 2) {\r
+               /* generation 1b magic card */\r
+               if (wipeCard) {\r
+                       PrintAndLog("WARNING: can't wipe magic card 1b generation");\r
+               }\r
+               res = mfCWipe(numBlocks, true, false, fillCard); \r
+       } else {\r
+               /* generation 1a magic card by default */\r
+               res = mfCWipe(numBlocks, false, wipeCard, fillCard); \r
+       }\r
+\r
+       if (res) {\r
+               PrintAndLog("Can't wipe. error=%d", res);\r
+               return 1;\r
+       }\r
+       PrintAndLog("OK");\r
+       return 0;\r
+}\r
+\r
  int CmdHF14AMfCSetBlk(const char *Cmd)\r
  {\r
         uint8_t memBlock[16] = {0x00};\r
         uint8_t blockNo = 0;\r
         bool wipeCard = false;\r
  int CmdHF14AMfCSetBlk(const char *Cmd)\r
  {\r
         uint8_t memBlock[16] = {0x00};\r
         uint8_t blockNo = 0;\r
         bool wipeCard = false;\r
-       int res;\r
+       int res, gen = 0;\r
  \r
         if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
                 PrintAndLog("Usage:  hf mf csetblk <block number> <block data (32 hex symbols)> [w]");\r
  \r
         if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
                 PrintAndLog("Usage:  hf mf csetblk <block number> <block data (32 hex symbols)> [w]");\r
@@ -1863,7 +2110,11 @@ int CmdHF14AMfCSetBlk(const char *Cmd)
                 PrintAndLog("Set block data for magic Chinese card (only works with such cards)");\r
                 PrintAndLog("If you also want wipe the card then add 'w' at the end of the command line");\r
                 return 0;\r
                 PrintAndLog("Set block data for magic Chinese card (only works with such cards)");\r
                 PrintAndLog("If you also want wipe the card then add 'w' at the end of the command line");\r
                 return 0;\r
-       }       \r
+       }\r
+\r
+       gen = mfCIdentify();\r
+       if ((gen != 1) && (gen != 2)) \r
+               return 1;\r
  \r
         blockNo = param_get8(Cmd, 0);\r
  \r
  \r
         blockNo = param_get8(Cmd, 0);\r
  \r
@@ -1876,7 +2127,14 @@ int CmdHF14AMfCSetBlk(const char *Cmd)
         wipeCard = (ctmp == 'w' || ctmp == 'W');\r
         PrintAndLog("--block number:%2d data:%s", blockNo, sprint_hex(memBlock, 16));\r
  \r
         wipeCard = (ctmp == 'w' || ctmp == 'W');\r
         PrintAndLog("--block number:%2d data:%s", blockNo, sprint_hex(memBlock, 16));\r
  \r
-       res = mfCSetBlock(blockNo, memBlock, NULL, wipeCard, CSETBLOCK_SINGLE_OPER);\r
+       if (gen == 2) {\r
+               /* generation 1b magic card */\r
+               res = mfCSetBlock(blockNo, memBlock, NULL, wipeCard, CSETBLOCK_SINGLE_OPER | CSETBLOCK_MAGIC_1B);\r
+       } else {\r
+               /* generation 1a magic card by default */\r
+               res = mfCSetBlock(blockNo, memBlock, NULL, wipeCard, CSETBLOCK_SINGLE_OPER);\r
+       }\r
+\r
         if (res) {\r
                 PrintAndLog("Can't write block. error=%d", res);\r
                 return 1;\r
         if (res) {\r
                 PrintAndLog("Can't write block. error=%d", res);\r
                 return 1;\r
@@ -1890,33 +2148,44 @@ int CmdHF14AMfCLoad(const char *Cmd)
         FILE * f;\r
         char filename[FILE_PATH_SIZE] = {0x00};\r
         char * fnameptr = filename;\r
         FILE * f;\r
         char filename[FILE_PATH_SIZE] = {0x00};\r
         char * fnameptr = filename;\r
-       char buf[64] = {0x00};\r
-       uint8_t buf8[64] = {0x00};\r
+       char buf[256] = {0x00};\r
+       uint8_t buf8[256] = {0x00};\r
         uint8_t fillFromEmulator = 0;\r
         uint8_t fillFromEmulator = 0;\r
-       int i, len, blockNum, flags=0;\r
-       \r
+       int i, len, blockNum, flags = 0, gen = 0, numblock = 64;\r
+\r
         if (param_getchar(Cmd, 0) == 'h' || param_getchar(Cmd, 0)== 0x00) {\r
                 PrintAndLog("It loads magic Chinese card from the file `filename.eml`");\r
         if (param_getchar(Cmd, 0) == 'h' || param_getchar(Cmd, 0)== 0x00) {\r
                 PrintAndLog("It loads magic Chinese card from the file `filename.eml`");\r
-               PrintAndLog("or from emulator memory (option `e`)");\r
-               PrintAndLog("Usage:  hf mf cload <file name w/o `.eml`>");\r
-               PrintAndLog("   or:  hf mf cload e ");\r
-               PrintAndLog(" sample: hf mf cload filename");\r
+               PrintAndLog("or from emulator memory (option `e`). 4K card: (option `4`)");\r
+               PrintAndLog("Usage:  hf mf cload [file name w/o `.eml`][e][4]");\r
+               PrintAndLog("   or:  hf mf cload e [4]");\r
+               PrintAndLog("Sample: hf mf cload filename");\r
+               PrintAndLog("        hf mf cload filname 4");\r
+               PrintAndLog("        hf mf cload e");\r
+               PrintAndLog("        hf mf cload e 4");\r
                 return 0;\r
                 return 0;\r
-       }       \r
+       }\r
  \r
         char ctmp = param_getchar(Cmd, 0);\r
         if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;\r
  \r
         char ctmp = param_getchar(Cmd, 0);\r
         if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;\r
-       \r
+       ctmp = param_getchar(Cmd, 1);\r
+       if (ctmp == '4') numblock = 256;\r
+\r
+       gen = mfCIdentify();\r
+       PrintAndLog("Loading magic mifare %dK", numblock == 256 ? 4:1);\r
+\r
         if (fillFromEmulator) {\r
         if (fillFromEmulator) {\r
-               for (blockNum = 0; blockNum < 16 * 4; blockNum += 1) {\r
+               for (blockNum = 0; blockNum < numblock; blockNum += 1) {\r
                         if (mfEmlGetMem(buf8, blockNum, 1)) {\r
                                 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 (mfEmlGetMem(buf8, blockNum, 1)) {\r
                                 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 == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;             // Done. Magic Halt and switch off field.\r
+                       if (blockNum == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;           // Done. Magic Halt and switch off field.\r
  \r
  \r
+                       if (gen == 2)\r
+                               /* generation 1b magic card */\r
+                               flags |= CSETBLOCK_MAGIC_1B;\r
                         if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {\r
                                 PrintAndLog("Cant set magic card block: %d", blockNum);\r
                                 return 3;\r
                         if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {\r
                                 PrintAndLog("Cant set magic card block: %d", blockNum);\r
                                 return 3;\r
@@ -1924,26 +2193,28 @@ int CmdHF14AMfCLoad(const char *Cmd)
                 }\r
                 return 0;\r
         } else {\r
                 }\r
                 return 0;\r
         } else {\r
-               len = strlen(Cmd);\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
  \r
                 if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
  \r
-               memcpy(filename, Cmd, len);\r
+               //memcpy(filename, Cmd, len);\r
                 fnameptr += len;\r
  \r
                 fnameptr += len;\r
  \r
-               sprintf(fnameptr, ".eml"); \r
-       \r
+               sprintf(fnameptr, ".eml");\r
+\r
                 // open file\r
                 f = fopen(filename, "r");\r
                 if (f == NULL) {\r
                         PrintAndLog("File not found or locked.");\r
                         return 1;\r
                 }\r
                 // open file\r
                 f = fopen(filename, "r");\r
                 if (f == NULL) {\r
                         PrintAndLog("File not found or locked.");\r
                         return 1;\r
                 }\r
-       \r
+\r
                 blockNum = 0;\r
                 while(!feof(f)){\r
                 blockNum = 0;\r
                 while(!feof(f)){\r
-               \r
+\r
                         memset(buf, 0, sizeof(buf));\r
                         memset(buf, 0, sizeof(buf));\r
-                       \r
+\r
                         if (fgets(buf, sizeof(buf), f) == NULL) {\r
                                 fclose(f);\r
                                 PrintAndLog("File reading error.");\r
                         if (fgets(buf, sizeof(buf), f) == NULL) {\r
                                 fclose(f);\r
                                 PrintAndLog("File reading error.");\r
@@ -1962,21 +2233,25 @@ int CmdHF14AMfCLoad(const char *Cmd)
  \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
  \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 == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;             // Done. Switch off field.\r
+                       if (blockNum == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;           // Done. Switch off field.\r
  \r
  \r
+                       if (gen == 2)\r
+                               /* generation 1b magic card */\r
+                               flags |= CSETBLOCK_MAGIC_1B;\r
                         if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {\r
                                 PrintAndLog("Can't set magic card block: %d", blockNum);\r
                                 fclose(f);\r
                                 return 3;\r
                         }\r
                         blockNum++;\r
                         if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {\r
                                 PrintAndLog("Can't set magic card block: %d", blockNum);\r
                                 fclose(f);\r
                                 return 3;\r
                         }\r
                         blockNum++;\r
-               \r
-                       if (blockNum >= 16 * 4) break;  // magic card type - mifare 1K\r
+\r
+                       if (blockNum >= numblock) break;  // magic card type - mifare 1K 64 blocks, mifare 4k 256 blocks\r
                 }\r
                 fclose(f);\r
                 }\r
                 fclose(f);\r
-       \r
-               if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){\r
-                       PrintAndLog("File content error. There must be 64 blocks");\r
+\r
+               //if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){\r
+               if (blockNum != numblock){\r
+                       PrintAndLog("File content error. There must be %d blocks", numblock);\r
                         return 4;\r
                 }\r
                 PrintAndLog("Loaded from file: %s", filename);\r
                         return 4;\r
                 }\r
                 PrintAndLog("Loaded from file: %s", filename);\r
@@ -1988,7 +2263,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
  int CmdHF14AMfCGetBlk(const char *Cmd) {\r
         uint8_t memBlock[16];\r
         uint8_t blockNo = 0;\r
  int CmdHF14AMfCGetBlk(const char *Cmd) {\r
         uint8_t memBlock[16];\r
         uint8_t blockNo = 0;\r
-       int res;\r
+       int res, gen = 0;\r
         memset(memBlock, 0x00, sizeof(memBlock));\r
  \r
         if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
         memset(memBlock, 0x00, sizeof(memBlock));\r
  \r
         if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
@@ -1996,55 +2271,77 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
                 PrintAndLog("sample:  hf mf cgetblk 1");\r
                 PrintAndLog("Get block data from magic Chinese card (only works with such cards)\n");\r
                 return 0;\r
                 PrintAndLog("sample:  hf mf cgetblk 1");\r
                 PrintAndLog("Get block data from magic Chinese card (only works with such cards)\n");\r
                 return 0;\r
-       }       \r
+       }\r
+\r
+       gen = mfCIdentify();\r
  \r
         blockNo = param_get8(Cmd, 0);\r
  \r
         PrintAndLog("--block number:%2d ", blockNo);\r
  \r
  \r
         blockNo = param_get8(Cmd, 0);\r
  \r
         PrintAndLog("--block number:%2d ", blockNo);\r
  \r
-       res = mfCGetBlock(blockNo, memBlock, CSETBLOCK_SINGLE_OPER);\r
+       if (gen == 2) {\r
+               /* generation 1b magic card */\r
+               res = mfCGetBlock(blockNo, memBlock, CSETBLOCK_SINGLE_OPER | CSETBLOCK_MAGIC_1B);\r
+       } else {\r
+               /* generation 1a magic card by default */\r
+               res = mfCGetBlock(blockNo, memBlock, CSETBLOCK_SINGLE_OPER);\r
+       }\r
         if (res) {\r
                         PrintAndLog("Can't read block. error=%d", res);\r
                         return 1;\r
                 }\r
         if (res) {\r
                         PrintAndLog("Can't read block. error=%d", res);\r
                         return 1;\r
                 }\r
-       \r
+\r
         PrintAndLog("block data:%s", sprint_hex(memBlock, 16));\r
         return 0;\r
  }\r
  \r
         PrintAndLog("block data:%s", sprint_hex(memBlock, 16));\r
         return 0;\r
  }\r
  \r
-\r
  int CmdHF14AMfCGetSc(const char *Cmd) {\r
         uint8_t memBlock[16] = {0x00};\r
         uint8_t sectorNo = 0;\r
  int CmdHF14AMfCGetSc(const char *Cmd) {\r
         uint8_t memBlock[16] = {0x00};\r
         uint8_t sectorNo = 0;\r
-       int i, res, flags;\r
+       int i, res, flags, gen = 0, baseblock = 0, sect_size = 4;\r
  \r
         if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
                 PrintAndLog("Usage:  hf mf cgetsc <sector number>");\r
                 PrintAndLog("sample:  hf mf cgetsc 0");\r
                 PrintAndLog("Get sector data from magic Chinese card (only works with such cards)\n");\r
                 return 0;\r
  \r
         if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
                 PrintAndLog("Usage:  hf mf cgetsc <sector number>");\r
                 PrintAndLog("sample:  hf mf cgetsc 0");\r
                 PrintAndLog("Get sector data from magic Chinese card (only works with such cards)\n");\r
                 return 0;\r
-       }       \r
+       }\r
  \r
         sectorNo = param_get8(Cmd, 0);\r
  \r
         sectorNo = param_get8(Cmd, 0);\r
-       if (sectorNo > 15) {\r
-               PrintAndLog("Sector number must be in [0..15] as in MIFARE classic.");\r
+\r
+       if (sectorNo > 39) {\r
+               PrintAndLog("Sector number must be in [0..15] in MIFARE classic 1k and [0..39] in MIFARE classic 4k.");\r
                 return 1;\r
         }\r
  \r
         PrintAndLog("--sector number:%d ", sectorNo);\r
  \r
                 return 1;\r
         }\r
  \r
         PrintAndLog("--sector number:%d ", sectorNo);\r
  \r
+       gen = mfCIdentify();\r
+\r
         flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r
         flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r
-       for (i = 0; i < 4; i++) {\r
+       if (sectorNo < 32 ) {\r
+               baseblock = sectorNo * 4;\r
+       } else {\r
+               baseblock = 128 + 16 * (sectorNo - 32);\r
+\r
+       }\r
+       if (sectorNo > 31) sect_size = 16;\r
+\r
+       for (i = 0; i < sect_size; i++) {\r
                 if (i == 1) flags = 0;\r
                 if (i == 1) flags = 0;\r
-               if (i == 3) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r
+               if (i == sect_size - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r
  \r
  \r
-               res = mfCGetBlock(sectorNo * 4 + i, memBlock, flags);\r
+               if (gen == 2)\r
+                       /* generation 1b magic card */\r
+                       flags |= CSETBLOCK_MAGIC_1B;\r
+\r
+               res = mfCGetBlock(baseblock + i, memBlock, flags);\r
                 if (res) {\r
                 if (res) {\r
-                       PrintAndLog("Can't read block. %d error=%d", sectorNo * 4 + i, res);\r
+                       PrintAndLog("Can't read block. %d error=%d", baseblock + i, res);\r
                         return 1;\r
                 }\r
                         return 1;\r
                 }\r
-       \r
-               PrintAndLog("block %3d data:%s", sectorNo * 4 + i, sprint_hex(memBlock, 16));\r
+\r
+               PrintAndLog("block %3d data:%s", baseblock + i, sprint_hex(memBlock, 16));\r
         }\r
         return 0;\r
  }\r
         }\r
         return 0;\r
  }\r
@@ -2056,37 +2353,50 @@ int CmdHF14AMfCSave(const char *Cmd) {
         char filename[FILE_PATH_SIZE] = {0x00};\r
         char * fnameptr = filename;\r
         uint8_t fillFromEmulator = 0;\r
         char filename[FILE_PATH_SIZE] = {0x00};\r
         char * fnameptr = filename;\r
         uint8_t fillFromEmulator = 0;\r
-       uint8_t buf[64] = {0x00};\r
-       int i, j, len, flags;\r
-       \r
+       uint8_t buf[256] = {0x00};\r
+       int i, j, len, flags, gen = 0, numblock = 64;\r
+\r
         // memset(filename, 0, sizeof(filename));\r
         // memset(buf, 0, sizeof(buf));\r
  \r
         if (param_getchar(Cmd, 0) == 'h') {\r
                 PrintAndLog("It saves `magic Chinese` card dump into the file `filename.eml` or `cardID.eml`");\r
         // memset(filename, 0, sizeof(filename));\r
         // memset(buf, 0, sizeof(buf));\r
  \r
         if (param_getchar(Cmd, 0) == 'h') {\r
                 PrintAndLog("It saves `magic Chinese` card dump into the file `filename.eml` or `cardID.eml`");\r
-               PrintAndLog("or into emulator memory (option `e`)");\r
-               PrintAndLog("Usage:  hf mf esave [file name w/o `.eml`][e]");\r
-               PrintAndLog(" sample: hf mf esave ");\r
-               PrintAndLog("         hf mf esave filename");\r
-               PrintAndLog("         hf mf esave e \n");\r
+               PrintAndLog("or into emulator memory (option `e`). 4K card: (option `4`)");\r
+               PrintAndLog("Usage:  hf mf csave [file name w/o `.eml`][e][4]");\r
+               PrintAndLog("Sample: hf mf csave ");\r
+               PrintAndLog("        hf mf csave filename");\r
+               PrintAndLog("        hf mf csave e");\r
+               PrintAndLog("        hf mf csave 4");\r
+               PrintAndLog("        hf mf csave filename 4");\r
+               PrintAndLog("        hf mf csave e 4");\r
                 return 0;\r
                 return 0;\r
-       }       \r
+       }\r
  \r
         char ctmp = param_getchar(Cmd, 0);\r
         if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;\r
  \r
         char ctmp = param_getchar(Cmd, 0);\r
         if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;\r
+       if (ctmp == '4') numblock = 256;\r
+       ctmp = param_getchar(Cmd, 1);\r
+       if (ctmp == '4') numblock = 256;\r
+\r
+       gen = mfCIdentify();\r
+       PrintAndLog("Saving magic mifare %dK", numblock == 256 ? 4:1);\r
  \r
         if (fillFromEmulator) {\r
                 // put into emulator\r
                 flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r
  \r
         if (fillFromEmulator) {\r
                 // put into emulator\r
                 flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r
-               for (i = 0; i < 16 * 4; i++) {\r
+               for (i = 0; i < numblock; i++) {\r
                         if (i == 1) flags = 0;\r
                         if (i == 1) flags = 0;\r
-                       if (i == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r
-               \r
+                       if (i == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r
+\r
+                       if (gen == 2)\r
+                               /* generation 1b magic card */\r
+                               flags |= CSETBLOCK_MAGIC_1B;\r
+\r
                         if (mfCGetBlock(i, buf, flags)) {\r
                                 PrintAndLog("Cant get block: %d", i);\r
                                 break;\r
                         }\r
                         if (mfCGetBlock(i, buf, flags)) {\r
                                 PrintAndLog("Cant get block: %d", i);\r
                                 break;\r
                         }\r
-                       \r
+\r
                         if (mfEmlSetMem(buf, i, 1)) {\r
                                 PrintAndLog("Cant set emul block: %d", i);\r
                                 return 3;\r
                         if (mfEmlSetMem(buf, i, 1)) {\r
                                 PrintAndLog("Cant set emul block: %d", i);\r
                                 return 3;\r
@@ -2094,27 +2404,35 @@ int CmdHF14AMfCSave(const char *Cmd) {
                 }\r
                 return 0;\r
         } else {\r
                 }\r
                 return 0;\r
         } else {\r
-               len = strlen(Cmd);\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
                 if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
-       \r
-               if (len < 1) {\r
+\r
+               ctmp = param_getchar(Cmd, 0);\r
+               if (len < 1 || (ctmp == '4')) {\r
                         // get filename\r
                         // get filename\r
-                       if (mfCGetBlock(0, buf, CSETBLOCK_SINGLE_OPER)) {\r
+\r
+                       flags = CSETBLOCK_SINGLE_OPER;\r
+                       if (gen == 2)\r
+                               /* generation 1b magic card */\r
+                               flags |= CSETBLOCK_MAGIC_1B;\r
+                       if (mfCGetBlock(0, buf, flags)) {\r
                                 PrintAndLog("Cant get block: %d", 0);\r
                                 len = sprintf(fnameptr, "dump");\r
                                 fnameptr += len;\r
                         }\r
                         else {\r
                                 for (j = 0; j < 7; j++, fnameptr += 2)\r
                                 PrintAndLog("Cant get block: %d", 0);\r
                                 len = sprintf(fnameptr, "dump");\r
                                 fnameptr += len;\r
                         }\r
                         else {\r
                                 for (j = 0; j < 7; j++, fnameptr += 2)\r
-                                       sprintf(fnameptr, "%02x", buf[j]); \r
+                                       sprintf(fnameptr, "%02x", buf[j]);\r
                         }\r
                 } else {\r
                         }\r
                 } else {\r
-                       memcpy(filename, Cmd, len);\r
+                       //memcpy(filename, Cmd, len);\r
                         fnameptr += len;\r
                 }\r
  \r
                         fnameptr += len;\r
                 }\r
  \r
-               sprintf(fnameptr, ".eml"); \r
-       \r
+               sprintf(fnameptr, ".eml");\r
+\r
                 // open file\r
                 f = fopen(filename, "w+");\r
  \r
                 // open file\r
                 f = fopen(filename, "w+");\r
  \r
@@ -2125,22 +2443,25 @@ int CmdHF14AMfCSave(const char *Cmd) {
  \r
                 // put hex\r
                 flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r
  \r
                 // put hex\r
                 flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r
-               for (i = 0; i < 16 * 4; i++) {\r
+               for (i = 0; i < numblock; i++) {\r
                         if (i == 1) flags = 0;\r
                         if (i == 1) flags = 0;\r
-                       if (i == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r
-               \r
+                       if (i == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r
+\r
+                       if (gen == 2)\r
+                               /* generation 1b magic card */\r
+                               flags |= CSETBLOCK_MAGIC_1B;\r
                         if (mfCGetBlock(i, buf, flags)) {\r
                                 PrintAndLog("Cant get block: %d", i);\r
                                 break;\r
                         }\r
                         for (j = 0; j < 16; j++)\r
                         if (mfCGetBlock(i, buf, flags)) {\r
                                 PrintAndLog("Cant get block: %d", i);\r
                                 break;\r
                         }\r
                         for (j = 0; j < 16; j++)\r
-                               fprintf(f, "%02x", buf[j]); \r
+                               fprintf(f, "%02x", buf[j]);\r
                         fprintf(f,"\n");\r
                 }\r
                 fclose(f);\r
                         fprintf(f,"\n");\r
                 }\r
                 fclose(f);\r
-       \r
+\r
                 PrintAndLog("Saved to file: %s", filename);\r
                 PrintAndLog("Saved to file: %s", filename);\r
-       \r
+\r
                 return 0;\r
         }\r
  }\r
                 return 0;\r
         }\r
  }\r
@@ -2153,9 +2474,10 @@ int CmdHF14AMfSniff(const char *Cmd){
         //bool wantSaveToEml = 0; TODO\r
         bool wantSaveToEmlFile = 0;\r
  \r
         //bool wantSaveToEml = 0; TODO\r
         bool wantSaveToEmlFile = 0;\r
  \r
-       //var \r
+       //var\r
         int res = 0;\r
         int len = 0;\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
         int blockLen = 0;\r
         int pckNum = 0;\r
         int num = 0;\r
@@ -2167,7 +2489,8 @@ int CmdHF14AMfSniff(const char *Cmd){
         uint8_t *buf = NULL;\r
         uint16_t bufsize = 0;\r
         uint8_t *bufPtr = NULL;\r
         uint8_t *buf = NULL;\r
         uint16_t bufsize = 0;\r
         uint8_t *bufPtr = NULL;\r
-       \r
+       uint8_t parity[16];\r
+\r
         char ctmp = param_getchar(Cmd, 0);\r
         if ( ctmp == 'h' || ctmp == 'H' ) {\r
                 PrintAndLog("It continuously gets data from the field and saves it to: log, emulator, emulator file.");\r
         char ctmp = param_getchar(Cmd, 0);\r
         if ( ctmp == 'h' || ctmp == 'H' ) {\r
                 PrintAndLog("It continuously gets data from the field and saves it to: log, emulator, emulator file.");\r
@@ -2179,8 +2502,8 @@ int CmdHF14AMfSniff(const char *Cmd){
                 PrintAndLog("Usage:  hf mf sniff [l][d][e][f]");\r
                 PrintAndLog("  sample: hf mf sniff l d e");\r
                 return 0;\r
                 PrintAndLog("Usage:  hf mf sniff [l][d][e][f]");\r
                 PrintAndLog("  sample: hf mf sniff l d e");\r
                 return 0;\r
-       }       \r
-       \r
+       }\r
+\r
         for (int i = 0; i < 4; i++) {\r
                 ctmp = param_getchar(Cmd, i);\r
                 if (ctmp == 'l' || ctmp == 'L') wantLogToFile = true;\r
         for (int i = 0; i < 4; i++) {\r
                 ctmp = param_getchar(Cmd, i);\r
                 if (ctmp == 'l' || ctmp == 'L') wantLogToFile = true;\r
@@ -2188,7 +2511,7 @@ int CmdHF14AMfSniff(const char *Cmd){
                 //if (ctmp == 'e' || ctmp == 'E') wantSaveToEml = true; TODO\r
                 if (ctmp == 'f' || ctmp == 'F') wantSaveToEmlFile = true;\r
         }\r
                 //if (ctmp == 'e' || ctmp == 'E') wantSaveToEml = true; TODO\r
                 if (ctmp == 'f' || ctmp == 'F') wantSaveToEmlFile = true;\r
         }\r
-       \r
+\r
         printf("-------------------------------------------------------------------------\n");\r
         printf("Executing command. \n");\r
         printf("Press the key on the proxmark3 device to abort both proxmark3 and client.\n");\r
         printf("-------------------------------------------------------------------------\n");\r
         printf("Executing command. \n");\r
         printf("Press the key on the proxmark3 device to abort both proxmark3 and client.\n");\r
@@ -2208,16 +2531,15 @@ int CmdHF14AMfSniff(const char *Cmd){
                         printf("\naborted via keyboard!\n");\r
                         break;\r
                 }\r
                         printf("\naborted via keyboard!\n");\r
                         break;\r
                 }\r
-               \r
+\r
                 UsbCommand resp;\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
                         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
+                               break;\r
                         }\r
  \r
                         if (res == 1) {                                                         // there is (more) data to be transferred\r
                         }\r
  \r
                         if (res == 1) {                                                         // there is (more) data to be transferred\r
@@ -2259,33 +2581,41 @@ int CmdHF14AMfSniff(const char *Cmd){
                                         } else {\r
                                                 isTag = false;\r
                                         }\r
                                         } 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
                                                 memcpy(atqa, bufPtr + 2 + 7, 2);\r
                                                 uid_len = (atqa[0] & 0xC0) == 0x40 ? 7 : 4;\r
                                                 sak = bufPtr[11];\r
                                         bufPtr += 2;\r
                                         if ((len == 14) && (bufPtr[0] == 0xff) && (bufPtr[1] == 0xff) && (bufPtr[12] == 0xff) && (bufPtr[13] == 0xff)) {\r
                                                 memcpy(uid, bufPtr + 2, 7);\r
                                                 memcpy(atqa, bufPtr + 2 + 7, 2);\r
                                                 uid_len = (atqa[0] & 0xC0) == 0x40 ? 7 : 4;\r
                                                 sak = bufPtr[11];\r
-                                               PrintAndLog("tag select uid:%s atqa:0x%02x%02x sak:0x%02x", \r
+                                               PrintAndLog("tag select uid:%s atqa:0x%02x%02x sak:0x%02x",\r
                                                         sprint_hex(uid + (7 - uid_len), uid_len),\r
                                                         sprint_hex(uid + (7 - uid_len), uid_len),\r
-                                                       atqa[1], \r
-                                                       atqa[0], \r
+                                                       atqa[1],\r
+                                                       atqa[0],\r
                                                         sak);\r
                                                 if (wantLogToFile || wantDecrypt) {\r
                                                         FillFileNameByUID(logHexFileName, uid + (7 - uid_len), ".log", uid_len);\r
                                                         AddLogCurrentDT(logHexFileName);\r
                                                         sak);\r
                                                 if (wantLogToFile || wantDecrypt) {\r
                                                         FillFileNameByUID(logHexFileName, uid + (7 - uid_len), ".log", uid_len);\r
                                                         AddLogCurrentDT(logHexFileName);\r
-                                               }                                               \r
-                                               if (wantDecrypt) \r
+                                               }\r
+                                               if (wantDecrypt)\r
                                                         mfTraceInit(uid, atqa, sak, wantSaveToEmlFile);\r
                                         } else {\r
                                                         mfTraceInit(uid, atqa, sak, wantSaveToEmlFile);\r
                                         } else {\r
-                                               PrintAndLog("%s(%d):%s", isTag ? "TAG":"RDR", num, sprint_hex(bufPtr, len));\r
-                                               if (wantLogToFile) \r
+                                               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
                                                         AddLogHex(logHexFileName, isTag ? "TAG: ":"RDR: ", bufPtr, len);\r
-                                               if (wantDecrypt) \r
-                                                       mfTraceDecode(bufPtr, len, wantSaveToEmlFile);\r
-                                               num++;  \r
+                                               if (wantDecrypt)\r
+                                                       mfTraceDecode(bufPtr, len, bufPtr[len], wantSaveToEmlFile);\r
+                                               num++;\r
                                         }\r
                                         bufPtr += len;\r
                                         }\r
                                         bufPtr += len;\r
-                                       bufPtr += ((len-1)/8+1);        // ignore parity\r
+                                       bufPtr += parlen;       // ignore parity\r
                                 }\r
                                 pckNum = 0;\r
                         }\r
                                 }\r
                                 pckNum = 0;\r
                         }\r
@@ -2293,6 +2623,9 @@ int CmdHF14AMfSniff(const char *Cmd){
         } // while (true)\r
  \r
         free(buf);\r
         } // while (true)\r
  \r
         free(buf);\r
+       \r
+       msleep(300); // wait for exiting arm side.\r
+       PrintAndLog("Done.");\r
         return 0;\r
  }\r
  \r
         return 0;\r
  }\r
  \r
@@ -2304,6 +2637,146 @@ int CmdDecryptTraceCmds(const char *Cmd){
         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
         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
+int aes_encode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length){\r
+       uint8_t iiv[16] = {0};\r
+       if (iv)\r
+               memcpy(iiv, iv, 16);\r
+       \r
+       aes_context aes;\r
+       aes_init(&aes);\r
+       if (aes_setkey_enc(&aes, key, 128))\r
+               return 1;\r
+       if (aes_crypt_cbc(&aes, AES_ENCRYPT, length, iiv, input, output))\r
+               return 2;\r
+       aes_free(&aes);\r
+\r
+       return 0;\r
+}\r
+\r
+int aes_decode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length){\r
+       uint8_t iiv[16] = {0};\r
+       if (iv)\r
+               memcpy(iiv, iv, 16);\r
+       \r
+       aes_context aes;\r
+       aes_init(&aes);\r
+       if (aes_setkey_dec(&aes, key, 128))\r
+               return 1;\r
+       if (aes_crypt_cbc(&aes, AES_DECRYPT, length, iiv, input, output))\r
+               return 2;\r
+       aes_free(&aes);\r
+\r
+       return 0;\r
+}\r
+\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
+       uint8_t data[257] = {0};\r
+       int datalen = 0;\r
+       \r
+       uint8_t Rnd1[17] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00};\r
+       uint8_t Rnd2[17] = {0};\r
+       \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
+       CLIGetStrWithReturn(1, keyn, &keynlen);\r
+       CLIGetStrWithReturn(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
+       uint8_t cmd1[] = {0x70, keyn[1], keyn[0], 0x00};\r
+       int res = ExchangeRAW14a(cmd1, sizeof(cmd1), true, true, data, sizeof(data), &datalen);\r
+       if (res) {\r
+               PrintAndLog("ERROR exchande raw error: %d", res);\r
+               DropField();\r
+               return 2;\r
+       }\r
+       \r
+       PrintAndLog("<phase1: %s", sprint_hex(data, datalen));\r
+               \r
+       if (datalen < 1) {\r
+               PrintAndLog("ERROR: card response length: %d", datalen);\r
+               DropField();\r
+               return 3;\r
+       }\r
+       \r
+       if (data[0] != 0x90) {\r
+               PrintAndLog("ERROR: card response error: %02x", data[2]);\r
+               DropField();\r
+               return 3;\r
+       }\r
+\r
+       if (datalen != 19) { // code 1b + 16b + crc 2b\r
+               PrintAndLog("ERROR: card response must be 19 bytes long instead of: %d", datalen);\r
+               DropField();\r
+               return 3;\r
+       }\r
+       \r
+    aes_decode(NULL, key, &data[1], Rnd2, 16);\r
+       Rnd2[16] = Rnd2[0];\r
+       PrintAndLog("Rnd2: %s", sprint_hex(Rnd2, 16));\r
+\r
+       uint8_t cmd2[33] = {0};\r
+       cmd2[0] = 0x72;\r
+\r
+       uint8_t raw[32] = {0};\r
+       memmove(raw, Rnd1, 16);\r
+       memmove(&raw[16], &Rnd2[1], 16);\r
+\r
+    aes_encode(NULL, key, raw, &cmd2[1], 32);\r
+       PrintAndLog(">phase2: %s", sprint_hex(cmd2, 33));\r
+       \r
+       res = ExchangeRAW14a(cmd2, sizeof(cmd2), false, false, data, sizeof(data), &datalen);\r
+       if (res) {\r
+               PrintAndLog("ERROR exchande raw error: %d", res);\r
+               DropField();\r
+               return 4;\r
+       }\r
+       \r
+       PrintAndLog("<phase2: %s", sprint_hex(data, datalen));\r
+\r
+    aes_decode(NULL, key, &data[1], raw, 32);\r
+       PrintAndLog("res: %s", sprint_hex(raw, 32));\r
+       \r
+       PrintAndLog("Rnd1`: %s", sprint_hex(&raw[4], 16));\r
+       if (memcmp(&raw[4], &Rnd1[1], 16)) {\r
+               PrintAndLog("\nERROR: Authentication FAILED. rnd not equal");\r
+               PrintAndLog("rnd1 reader: %s", sprint_hex(&Rnd1[1], 16));\r
+               PrintAndLog("rnd1   card: %s", sprint_hex(&raw[4], 16));\r
+               DropField();\r
+               return 5;\r
+       }\r
+\r
+       DropField();\r
+       PrintAndLog("\nAuthentication OK");\r
+       \r
+       return 0;\r
+}\r
+\r
  static command_t CommandTable[] =\r
  {\r
    {"help",             CmdHelp,                 1, "This help"},\r
  static command_t CommandTable[] =\r
  {\r
    {"help",             CmdHelp,                 1, "This help"},\r
@@ -2313,6 +2786,7 @@ static command_t CommandTable[] =
    {"dump",             CmdHF14AMfDump,          0, "Dump MIFARE classic tag to binary file"},\r
    {"restore",                 CmdHF14AMfRestore,       0, "Restore MIFARE classic binary file to BLANK tag"},\r
    {"wrbl",             CmdHF14AMfWrBl,          0, "Write MIFARE classic block"},\r
    {"dump",             CmdHF14AMfDump,          0, "Dump MIFARE classic tag to binary file"},\r
    {"restore",                 CmdHF14AMfRestore,       0, "Restore MIFARE classic binary file to BLANK tag"},\r
    {"wrbl",             CmdHF14AMfWrBl,          0, "Write MIFARE classic block"},\r
+  {"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
    {"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
@@ -2326,6 +2800,7 @@ static command_t CommandTable[] =
    {"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
    {"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
    {"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
@@ -2338,11 +2813,9 @@ static command_t CommandTable[] =
  \r
  int CmdHFMF(const char *Cmd)\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
+       (void)WaitForResponseTimeout(CMD_ACK,NULL,100);\r
+       CmdsParse(CommandTable, Cmd);\r
+       return 0;\r
  }\r
  \r
  int CmdHelp(const char *Cmd)\r
  }\r
  \r
  int CmdHelp(const char *Cmd)\r