CHG: moved includes into header file where it belong

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

index 49928c9aef2d4ddf508fd82851a9b511bec70743..9b43f4118289ae109c2e8e9860ff4cf51146e3dc 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -7,61 +7,200 @@
  //-----------------------------------------------------------------------------\r
  // High frequency MIFARE commands\r
  //-----------------------------------------------------------------------------\r
  //-----------------------------------------------------------------------------\r
  // High frequency MIFARE commands\r
  //-----------------------------------------------------------------------------\r
-#include "../include/mifare.h"\r
+\r
  #include "cmdhfmf.h"\r
  #include "cmdhfmf.h"\r
+#include "cmdhfmfhard.h"\r
+#include "nonce2key/nonce2key.h"\r
  \r
  static int CmdHelp(const char *Cmd);\r
  \r
  static int CmdHelp(const char *Cmd);\r
+int usage_hf14_mifare(void){\r
+       PrintAndLog("Usage:  hf mf mifare [h] <block number>");\r
+       PrintAndLog("options:");\r
+       PrintAndLog("           h    this help");\r
+       PrintAndLog("           <block number>  (Optional) target other key A than block 0.");\r
+       PrintAndLog("samples:");\r
+       PrintAndLog("           hf mf mifare");\r
+       PrintAndLog("           hf mf mifare 16");\r
+       return 0;\r
+}\r
+int usage_hf14_mf1ksim(void){\r
+       PrintAndLog("Usage:  hf mf sim  [h] u <uid (8,14,20 hex symbols)> n <numreads> i x");\r
+       PrintAndLog("options:");\r
+       PrintAndLog("      h    this help");\r
+       PrintAndLog("      u    (Optional) UID 4,7 or 10bytes. If not specified, the UID 4b from emulator memory will be used");\r
+       PrintAndLog("      n    (Optional) Automatically exit simulation after <numreads> blocks have been read by reader. 0 = infinite");\r
+       PrintAndLog("      i    (Optional) Interactive, means that console will not be returned until simulation finishes or is aborted");\r
+       PrintAndLog("      x    (Optional) Crack, performs the 'reader attack', nr/ar attack against a legitimate reader, fishes out the key(s)");\r
+       PrintAndLog("samples:");\r
+       PrintAndLog("           hf mf sim u 0a0a0a0a");\r
+       PrintAndLog("           hf mf sim u 11223344556677");\r
+       PrintAndLog("           hf mf sim u 112233445566778899AA");     \r
+       return 0;\r
+}\r
+int usage_hf14_dbg(void){\r
+       PrintAndLog("Usage:  hf mf dbg [h] <debug level>");\r
+       PrintAndLog("options:");\r
+       PrintAndLog("           h    this help");       \r
+       PrintAndLog("       <debug level>  (Optional) see list for valid levels");\r
+       PrintAndLog("           0 - no debug messages");\r
+       PrintAndLog("           1 - error messages");\r
+       PrintAndLog("           2 - plus information messages");\r
+       PrintAndLog("           3 - plus debug messages");\r
+       PrintAndLog("           4 - print even debug messages in timing critical functions");\r
+       PrintAndLog("               Note: this option therefore may cause malfunction itself");\r
+       PrintAndLog("samples:");\r
+       PrintAndLog("           hf mf dbg 3");\r
+       return 0;\r
+}\r
+int usage_hf14_sniff(void){\r
+       PrintAndLog("It continuously gets data from the field and saves it to: log, emulator, emulator file.");\r
+       PrintAndLog("Usage:  hf mf sniff [h] [l] [d] [f]");\r
+       PrintAndLog("options:");\r
+       PrintAndLog("      h    this help");\r
+       PrintAndLog("      l    save encrypted sequence to logfile `uid.log`");\r
+       PrintAndLog("      d    decrypt sequence and put it to log file `uid.log`");\r
+//     PrintAndLog(" n/a  e     decrypt sequence, collect read and write commands and save the result of the sequence to emulator memory");\r
+       PrintAndLog("      f    decrypt sequence, collect read and write commands and save the result of the sequence to emulator dump file `uid.eml`");\r
+       PrintAndLog("sample:");\r
+       PrintAndLog("           hf mf sniff l d f");\r
+       return 0;\r
+}\r
+int usage_hf14_nested(void){\r
+       PrintAndLog("Usage:");\r
+       PrintAndLog(" all sectors:  hf mf nested  <card memory> <block number> <key A/B> <key (12 hex symbols)> [t,d]");\r
+       PrintAndLog(" one sector:   hf mf nested  o <block number> <key A/B> <key (12 hex symbols)>");\r
+       PrintAndLog("               <target block number> <target key A/B> [t]");\r
+       PrintAndLog("options:");\r
+       PrintAndLog("      h    this help");\r
+       PrintAndLog("      card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");\r
+       PrintAndLog("      t    transfer keys into emulator memory");\r
+       PrintAndLog("      d    write keys to binary file");\r
+       PrintAndLog(" ");\r
+       PrintAndLog("samples:");\r
+       PrintAndLog("      hf mf nested 1 0 A FFFFFFFFFFFF ");\r
+       PrintAndLog("      hf mf nested 1 0 A FFFFFFFFFFFF t ");\r
+       PrintAndLog("      hf mf nested 1 0 A FFFFFFFFFFFF d ");\r
+       PrintAndLog("      hf mf nested o 0 A FFFFFFFFFFFF 4 A");\r
+       return 0;\r
+}\r
+int usage_hf14_hardnested(void){\r
+       PrintAndLog("Usage:");\r
+       PrintAndLog("      hf mf hardnested <block number> <key A|B> <key (12 hex symbols)>");\r
+       PrintAndLog("                       <target block number> <target key A|B> [known target key (12 hex symbols)] [w] [s]");\r
+       PrintAndLog("  or  hf mf hardnested r [known target key]");\r
+       PrintAndLog(" ");\r
+       PrintAndLog("options:");\r
+       PrintAndLog("      h    this help");    \r
+       PrintAndLog("      w    acquire nonces and write them to binary file nonces.bin");\r
+       PrintAndLog("      s    slower acquisition (required by some non standard cards)");\r
+       PrintAndLog("      r    read nonces.bin and start attack");\r
+       PrintAndLog("      t    tests?");\r
+       PrintAndLog(" ");\r
+       PrintAndLog("samples:");\r
+       PrintAndLog("      hf mf hardnested 0 A FFFFFFFFFFFF 4 A");\r
+       PrintAndLog("      hf mf hardnested 0 A FFFFFFFFFFFF 4 A w");\r
+       PrintAndLog("      hf mf hardnested 0 A FFFFFFFFFFFF 4 A w s");\r
+       PrintAndLog("      hf mf hardnested r");\r
+       PrintAndLog("      hf mf hardnested r a0a1a2a3a4a5");\r
+       PrintAndLog(" ");\r
+       PrintAndLog("Add the known target key to check if it is present in the remaining key space:");\r
+       PrintAndLog("      sample5: hf mf hardnested 0 A A0A1A2A3A4A5 4 A FFFFFFFFFFFF");\r
+       return 0;\r
+}\r
+int usage_hf14_chk(void){\r
+       PrintAndLog("Usage:  hf mf chk <block number>|<*card memory> <key type (A/B/?)> [t|d] [<key (12 hex symbols)>] [<dic (*.dic)>]");\r
+       PrintAndLog("options:");\r
+       PrintAndLog("      h    this help");    \r
+       PrintAndLog("      *    all sectors based on card memory, other values then below defaults to 1k");\r
+       PrintAndLog("                           0 - MINI(320 bytes)");\r
+       PrintAndLog("                           1 - 1K");\r
+       PrintAndLog("                           2 - 2K");\r
+       PrintAndLog("                           4 - 4K");\r
+       PrintAndLog("      d    write keys to binary file");\r
+       PrintAndLog("      t    write keys to emulator memory\n");\r
+       PrintAndLog(" ");\r
+       PrintAndLog("samples:");\r
+       PrintAndLog("      hf mf chk 0 A 1234567890ab keys.dic     -- target block 0, Key A");\r
+       PrintAndLog("      hf mf chk *1 ? t                        -- target all blocks, all keys, 1K, write to emul");\r
+       PrintAndLog("      hf mf chk *1 ? d                        -- target all blocks, all keys, 1K, write to file");\r
+       return 0;\r
+}\r
  \r
  \r
-int CmdHF14AMifare(const char *Cmd)\r
-{\r
+int CmdHF14AMifare(const char *Cmd) {\r
         uint32_t uid = 0;\r
         uint32_t nt = 0, nr = 0;\r
         uint64_t par_list = 0, ks_list = 0, r_key = 0;\r
         uint32_t uid = 0;\r
         uint32_t nt = 0, nr = 0;\r
         uint64_t par_list = 0, ks_list = 0, r_key = 0;\r
-       uint8_t isOK = 0;\r
-       uint8_t keyBlock[8] = {0};\r
-\r
-       UsbCommand c = {CMD_READER_MIFARE, {true, 0, 0}};\r
+       int16_t isOK = 0;\r
+       int tmpchar; \r
+       uint8_t blockNo = 0;\r
+       \r
+       char cmdp = param_getchar(Cmd, 0);      \r
+       if ( cmdp == 'H' || cmdp == 'h') return usage_hf14_mifare();\r
+       \r
+       blockNo = param_get8(Cmd, 0);\r
+       UsbCommand c = {CMD_READER_MIFARE, {true, blockNo, 0}};\r
  \r
         // message\r
         printf("-------------------------------------------------------------------------\n");\r
  \r
         // message\r
         printf("-------------------------------------------------------------------------\n");\r
-       printf("Executing command. Expected execution time: 25sec on average  :-)\n");\r
-       printf("Press the key on the proxmark3 device to abort both proxmark3 and client.\n");\r
+       printf("Executing darkside attack. Expected execution time: 25sec on average :-)\n");\r
+       printf("Press button on the proxmark3 device to abort both proxmark3 and client.\n");\r
         printf("-------------------------------------------------------------------------\n");\r
         printf("-------------------------------------------------------------------------\n");\r
-\r
+       clock_t t1 = clock();\r
+       time_t start, end;\r
+       time(&start);\r
         \r
  start:\r
      clearCommandBuffer();\r
      SendCommand(&c);\r
         \r
         //flush queue\r
         \r
  start:\r
      clearCommandBuffer();\r
      SendCommand(&c);\r
         \r
         //flush queue\r
-       while (ukbhit()) getchar();\r
+       while (ukbhit()) {\r
+               tmpchar = getchar();\r
+               (void)tmpchar;\r
+       }\r
  \r
         // wait cycle\r
         while (true) {\r
          printf(".");\r
                 fflush(stdout);\r
                 if (ukbhit()) {\r
  \r
         // wait cycle\r
         while (true) {\r
          printf(".");\r
                 fflush(stdout);\r
                 if (ukbhit()) {\r
-                       getchar();\r
+                       tmpchar = getchar();\r
+                       (void)tmpchar;\r
                         printf("\naborted via keyboard!\n");\r
                         break;\r
                 }\r
                 \r
                 UsbCommand resp;\r
                         printf("\naborted via keyboard!\n");\r
                         break;\r
                 }\r
                 \r
                 UsbCommand resp;\r
-               if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {\r
-                       isOK  = resp.arg[0] & 0xff;\r
+               if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {\r
+                       isOK  = resp.arg[0];\r
+                       printf("\n");\r
                         uid = (uint32_t)bytes_to_num(resp.d.asBytes +  0, 4);\r
                         nt =  (uint32_t)bytes_to_num(resp.d.asBytes +  4, 4);\r
                         par_list = bytes_to_num(resp.d.asBytes +  8, 8);\r
                         ks_list = bytes_to_num(resp.d.asBytes +  16, 8);\r
                         nr = bytes_to_num(resp.d.asBytes + 24, 4);\r
                         uid = (uint32_t)bytes_to_num(resp.d.asBytes +  0, 4);\r
                         nt =  (uint32_t)bytes_to_num(resp.d.asBytes +  4, 4);\r
                         par_list = bytes_to_num(resp.d.asBytes +  8, 8);\r
                         ks_list = bytes_to_num(resp.d.asBytes +  16, 8);\r
                         nr = bytes_to_num(resp.d.asBytes + 24, 4);\r
-                       printf("\n\n");\r
-                       if (!isOK) PrintAndLog("Proxmark can't get statistic info. Execution aborted.\n");\r
+\r
+                       switch (isOK) {\r
+                               case -1 : PrintAndLog("Button pressed. Aborted.\n"); break;\r
+                               case -2 : PrintAndLog("Card isn't vulnerable to Darkside attack (doesn't send NACK on authentication requests).\n"); break;\r
+                               case -3 : PrintAndLog("Card isn't vulnerable to Darkside attack (its random number generator is not predictable).\n"); break;\r
+                               case -4 : PrintAndLog("Card isn't vulnerable to Darkside attack (its random number generator seems to be based on the wellknown");\r
+                                                 PrintAndLog("generating polynomial with 16 effective bits only, but shows unexpected behaviour.\n"); break;\r
+                               default: ;\r
+                       }\r
                         break;\r
                 }\r
         }       \r
                         break;\r
                 }\r
         }       \r
-\r
         printf("\n");\r
         \r
         printf("\n");\r
         \r
+       // par == 0\r
+       if (isOK == -1 && par_list == 0) {\r
+               if (!nonce2key_ex(uid, nt, nr, ks_list, &r_key) ){\r
+                       PrintAndLog("Found valid key: %012"llx" \n", r_key);\r
+                       goto END;\r
+               }\r
+       }\r
+       \r
         // error\r
         if (isOK != 1) return 1;\r
         \r
         // error\r
         if (isOK != 1) return 1;\r
         \r
@@ -69,30 +208,22 @@ start:
         if (nonce2key(uid, nt, nr, par_list, ks_list, &r_key)) {\r
                 isOK = 2;\r
                 PrintAndLog("Key not found (lfsr_common_prefix list is null). Nt=%08x", nt);    \r
         if (nonce2key(uid, nt, nr, par_list, ks_list, &r_key)) {\r
                 isOK = 2;\r
                 PrintAndLog("Key not found (lfsr_common_prefix list is null). Nt=%08x", nt);    \r
-       } else {\r
-               printf("------------------------------------------------------------------\n");\r
-               PrintAndLog("Key found :%012"llx" \n", r_key);\r
-\r
-               num_to_bytes(r_key, 6, keyBlock);\r
-               isOK = mfCheckKeys(0, 0, 1, keyBlock, &r_key);\r
-       }\r
-       \r
-       if (!isOK) \r
-               PrintAndLog("Found valid key :%012"llx, r_key);\r
-       else\r
-       {\r
-               if (isOK != 2) PrintAndLog("Found invalid key. ");      \r
                 PrintAndLog("Failing is expected to happen in 25%% of all cases. Trying again with a different reader nonce...");\r
                 c.arg[0] = false;\r
                 goto start;\r
                 PrintAndLog("Failing is expected to happen in 25%% of all cases. Trying again with a different reader nonce...");\r
                 c.arg[0] = false;\r
                 goto start;\r
-       }\r
-       \r
-       PrintAndLog("");\r
+       } else {\r
+               PrintAndLog("Found valid key: %012"llx" \n", r_key);\r
+       }\r
+END:\r
+       t1 = clock() - t1;\r
+       time(&end);\r
+       unsigned long elapsed_time = difftime(end, start);      \r
+       if ( t1 > 0 )\r
+               PrintAndLog("Time in darkside: %.0f ticks %u seconds\n", (float)t1, elapsed_time);\r
         return 0;\r
  }\r
  \r
         return 0;\r
  }\r
  \r
-int CmdHF14AMfWrBl(const char *Cmd)\r
-{\r
+int CmdHF14AMfWrBl(const char *Cmd) {\r
         uint8_t blockNo = 0;\r
         uint8_t keyType = 0;\r
         uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
         uint8_t blockNo = 0;\r
         uint8_t keyType = 0;\r
         uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
@@ -127,6 +258,7 @@ int CmdHF14AMfWrBl(const char *Cmd)
         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
+       clearCommandBuffer();\r
         SendCommand(&c);\r
  \r
         UsbCommand resp;\r
         SendCommand(&c);\r
  \r
         UsbCommand resp;\r
@@ -140,8 +272,7 @@ int CmdHF14AMfWrBl(const char *Cmd)
         return 0;\r
  }\r
  \r
         return 0;\r
  }\r
  \r
-int CmdHF14AMfRdBl(const char *Cmd)\r
-{\r
+int CmdHF14AMfRdBl(const char *Cmd) {\r
         uint8_t blockNo = 0;\r
         uint8_t keyType = 0;\r
         uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
         uint8_t blockNo = 0;\r
         uint8_t keyType = 0;\r
         uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
@@ -170,6 +301,7 @@ int CmdHF14AMfRdBl(const char *Cmd)
         \r
         UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};\r
         memcpy(c.d.asBytes, key, 6);\r
         \r
         UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};\r
         memcpy(c.d.asBytes, key, 6);\r
+       clearCommandBuffer();\r
         SendCommand(&c);\r
  \r
         UsbCommand resp;\r
         SendCommand(&c);\r
  \r
         UsbCommand resp;\r
@@ -188,8 +320,7 @@ int CmdHF14AMfRdBl(const char *Cmd)
    return 0;\r
  }\r
  \r
    return 0;\r
  }\r
  \r
-int CmdHF14AMfRdSc(const char *Cmd)\r
-{\r
+int CmdHF14AMfRdSc(const char *Cmd) {\r
         int i;\r
         uint8_t sectorNo = 0;\r
         uint8_t keyType = 0;\r
         int i;\r
         uint8_t sectorNo = 0;\r
         uint8_t keyType = 0;\r
@@ -223,6 +354,7 @@ int CmdHF14AMfRdSc(const char *Cmd)
         \r
         UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};\r
         memcpy(c.d.asBytes, key, 6);\r
         \r
         UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};\r
         memcpy(c.d.asBytes, key, 6);\r
+       clearCommandBuffer();\r
         SendCommand(&c);\r
         PrintAndLog(" ");\r
  \r
         SendCommand(&c);\r
         PrintAndLog(" ");\r
  \r
@@ -245,8 +377,7 @@ int CmdHF14AMfRdSc(const char *Cmd)
    return 0;\r
  }\r
  \r
    return 0;\r
  }\r
  \r
-uint8_t FirstBlockOfSector(uint8_t sectorNo)\r
-{\r
+uint8_t FirstBlockOfSector(uint8_t sectorNo) {\r
         if (sectorNo < 32) {\r
                 return sectorNo * 4;\r
         } else {\r
         if (sectorNo < 32) {\r
                 return sectorNo * 4;\r
         } else {\r
@@ -254,8 +385,7 @@ uint8_t FirstBlockOfSector(uint8_t sectorNo)
         }\r
  }\r
  \r
         }\r
  }\r
  \r
-uint8_t NumBlocksPerSector(uint8_t sectorNo)\r
-{\r
+uint8_t NumBlocksPerSector(uint8_t sectorNo) {\r
         if (sectorNo < 32) {\r
                 return 4;\r
         } else {\r
         if (sectorNo < 32) {\r
                 return 4;\r
         } else {\r
@@ -263,8 +393,7 @@ uint8_t NumBlocksPerSector(uint8_t sectorNo)
         }\r
  }\r
  \r
         }\r
  }\r
  \r
-int CmdHF14AMfDump(const char *Cmd)\r
-{\r
+int CmdHF14AMfDump(const char *Cmd) {\r
         uint8_t sectorNo, blockNo;\r
         \r
         uint8_t keyA[40][6];\r
         uint8_t sectorNo, blockNo;\r
         \r
         uint8_t keyA[40][6];\r
@@ -278,14 +407,7 @@ int CmdHF14AMfDump(const char *Cmd)
         \r
         UsbCommand resp;\r
  \r
         \r
         UsbCommand resp;\r
  \r
-       int size = GetCardSize();               \r
         char cmdp = param_getchar(Cmd, 0);\r
         char cmdp = param_getchar(Cmd, 0);\r
-\r
-       if  ( size > -1) \r
-               cmdp = (char)(48+size);\r
-\r
-       PrintAndLog("Got %d",cmdp);\r
-               \r
         switch (cmdp) {\r
                 case '0' : numSectors = 5; break;\r
                 case '1' : \r
         switch (cmdp) {\r
                 case '0' : numSectors = 5; break;\r
                 case '1' : \r
@@ -305,13 +427,15 @@ int CmdHF14AMfDump(const char *Cmd)
         }\r
         \r
         if ((fin = fopen("dumpkeys.bin","rb")) == NULL) {\r
         }\r
         \r
         if ((fin = fopen("dumpkeys.bin","rb")) == NULL) {\r
-               PrintAndLog("Could not find file dumpkeys.bin");                \r
+               PrintAndLog("Could not find file dumpkeys.bin");\r
                 return 1;\r
         }\r
         \r
         // Read keys A from file\r
                 return 1;\r
         }\r
         \r
         // Read keys A from file\r
+       size_t bytes_read;\r
         for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
         for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
-               if (fread( keyA[sectorNo], 1, 6, fin ) == 0) {\r
+               bytes_read = fread( keyA[sectorNo], 1, 6, fin );\r
+               if ( bytes_read == 0) {\r
                         PrintAndLog("File reading error.");\r
                         fclose(fin);\r
                         return 2;\r
                         PrintAndLog("File reading error.");\r
                         fclose(fin);\r
                         return 2;\r
@@ -320,7 +444,8 @@ int CmdHF14AMfDump(const char *Cmd)
         \r
         // Read keys B from file\r
         for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
         \r
         // Read keys B from file\r
         for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
-               if (fread( keyB[sectorNo], 1, 6, fin ) == 0) {\r
+               bytes_read = fread( keyB[sectorNo], 1, 6, fin );\r
+               if ( bytes_read == 0) {\r
                         PrintAndLog("File reading error.");\r
                         fclose(fin);\r
                         return 2;\r
                         PrintAndLog("File reading error.");\r
                         fclose(fin);\r
                         return 2;\r
@@ -328,7 +453,7 @@ int CmdHF14AMfDump(const char *Cmd)
         }\r
         \r
         fclose(fin);\r
         }\r
         \r
         fclose(fin);\r
-       \r
+\r
         PrintAndLog("|-----------------------------------------|");\r
         PrintAndLog("|------ Reading sector access bits...-----|");\r
         PrintAndLog("|-----------------------------------------|");\r
         PrintAndLog("|-----------------------------------------|");\r
         PrintAndLog("|------ Reading sector access bits...-----|");\r
         PrintAndLog("|-----------------------------------------|");\r
@@ -336,6 +461,7 @@ int CmdHF14AMfDump(const char *Cmd)
         for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
                 UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}};\r
                 memcpy(c.d.asBytes, keyA[sectorNo], 6);\r
         for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
                 UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}};\r
                 memcpy(c.d.asBytes, keyA[sectorNo], 6);\r
+               clearCommandBuffer();\r
                 SendCommand(&c);\r
  \r
                 if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
                 SendCommand(&c);\r
  \r
                 if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
@@ -370,6 +496,7 @@ int CmdHF14AMfDump(const char *Cmd)
                         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
                         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
+                               clearCommandBuffer();\r
                                 SendCommand(&c);\r
                                 received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                         } else {                                                                                                // data block. Check if it can be read with key A or key B\r
                                 SendCommand(&c);\r
                                 received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                         } else {                                                                                                // data block. Check if it can be read with key A or key B\r
@@ -381,12 +508,13 @@ int CmdHF14AMfDump(const char *Cmd)
                                         received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                                 } else if (rights[sectorNo][data_area] == 0x07) {                                                                               // no key would work\r
                                         isOK = false;\r
                                         received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                                 } else if (rights[sectorNo][data_area] == 0x07) {                                                                               // no key would work\r
                                         isOK = false;\r
-                                               PrintAndLog("Access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);\r
+                                       PrintAndLog("Access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);\r
                                 } else {                                                                                                                                                                // key A would work\r
                                 } else {                                                                                                                                                                // key A would work\r
-                                               UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};\r
-                                               memcpy(c.d.asBytes, keyA[sectorNo], 6);\r
-                                               SendCommand(&c);\r
-                                               received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
+                                       UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};\r
+                                       memcpy(c.d.asBytes, keyA[sectorNo], 6);\r
+                                       clearCommandBuffer();\r
+                                       SendCommand(&c);\r
+                                       received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                                 }\r
                         }\r
  \r
                                 }\r
                         }\r
  \r
@@ -433,15 +561,14 @@ 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
-int CmdHF14AMfRestore(const char *Cmd)\r
-{\r
+int CmdHF14AMfRestore(const char *Cmd) {\r
         uint8_t sectorNo,blockNo;\r
         uint8_t keyType = 0;\r
         uint8_t sectorNo,blockNo;\r
         uint8_t keyType = 0;\r
-       uint8_t key[6] = {0xFF};\r
+       uint8_t key[6] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};\r
         uint8_t bldata[16] = {0x00};\r
         uint8_t keyA[40][6];\r
         uint8_t keyB[40][6];\r
         uint8_t bldata[16] = {0x00};\r
         uint8_t keyA[40][6];\r
         uint8_t keyB[40][6];\r
@@ -460,7 +587,7 @@ int CmdHF14AMfRestore(const char *Cmd)
                 default:   numSectors = 16;\r
         }       \r
  \r
                 default:   numSectors = 16;\r
         }       \r
  \r
-       if (cmdp == 'h' || cmdp == 'H') {\r
+       if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {\r
                 PrintAndLog("Usage:   hf mf restore [card memory]");\r
                 PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r
                 PrintAndLog("");\r
                 PrintAndLog("Usage:   hf mf restore [card memory]");\r
                 PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r
                 PrintAndLog("");\r
@@ -468,28 +595,33 @@ int CmdHF14AMfRestore(const char *Cmd)
                 PrintAndLog("         hf mf restore 4");\r
                 return 0;\r
         }\r
                 PrintAndLog("         hf mf restore 4");\r
                 return 0;\r
         }\r
-       \r
+\r
         if ((fkeys = fopen("dumpkeys.bin","rb")) == NULL) {\r
                 PrintAndLog("Could not find file dumpkeys.bin");\r
                 return 1;\r
         }\r
         \r
         if ((fkeys = fopen("dumpkeys.bin","rb")) == NULL) {\r
                 PrintAndLog("Could not find file dumpkeys.bin");\r
                 return 1;\r
         }\r
         \r
+       size_t bytes_read;\r
         for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
         for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
-               if (fread(keyA[sectorNo], 1, 6, fkeys) == 0) {\r
+               bytes_read = fread( keyA[sectorNo], 1, 6, fkeys );\r
+               if ( bytes_read == 0) {\r
                         PrintAndLog("File reading error (dumpkeys.bin).");\r
                         PrintAndLog("File reading error (dumpkeys.bin).");\r
+                       fclose(fkeys);\r
                         return 2;\r
                 }\r
         }\r
  \r
         for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
                         return 2;\r
                 }\r
         }\r
  \r
         for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
-               if (fread(keyB[sectorNo], 1, 6, fkeys) == 0) {\r
+               bytes_read = fread( keyB[sectorNo], 1, 6, fkeys );\r
+               if ( bytes_read == 0) {\r
                         PrintAndLog("File reading error (dumpkeys.bin).");\r
                         PrintAndLog("File reading error (dumpkeys.bin).");\r
+                       fclose(fkeys);\r
                         return 2;\r
                 }\r
         }\r
  \r
         fclose(fkeys);\r
                         return 2;\r
                 }\r
         }\r
  \r
         fclose(fkeys);\r
-       \r
+\r
         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
@@ -499,9 +631,9 @@ int CmdHF14AMfRestore(const char *Cmd)
         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
         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
-                       if (fread(bldata, 1, 16, fdump) == 0) {\r
+                       memcpy(c.d.asBytes, key, 6);                    \r
+                       bytes_read = fread(bldata, 1, 16, fdump);\r
+                       if ( bytes_read == 0) {\r
                                 PrintAndLog("File reading error (dumpdata.bin).");\r
                                 fclose(fdump);\r
                                 return 2;\r
                                 PrintAndLog("File reading error (dumpdata.bin).");\r
                                 fclose(fdump);\r
                                 return 2;\r
@@ -525,6 +657,7 @@ int CmdHF14AMfRestore(const char *Cmd)
                         PrintAndLog("Writing to block %3d: %s", FirstBlockOfSector(sectorNo) + blockNo, sprint_hex(bldata, 16));\r
                         \r
                         memcpy(c.d.asBytes + 10, bldata, 16);\r
                         PrintAndLog("Writing to block %3d: %s", FirstBlockOfSector(sectorNo) + blockNo, sprint_hex(bldata, 16));\r
                         \r
                         memcpy(c.d.asBytes + 10, bldata, 16);\r
+                       clearCommandBuffer();\r
                         SendCommand(&c);\r
  \r
                         UsbCommand resp;\r
                         SendCommand(&c);\r
  \r
                         UsbCommand resp;\r
@@ -541,8 +674,7 @@ int CmdHF14AMfRestore(const char *Cmd)
         return 0;\r
  }\r
  \r
         return 0;\r
  }\r
  \r
-int CmdHF14AMfNested(const char *Cmd)\r
-{\r
+int CmdHF14AMfNested(const char *Cmd) {\r
         int i, j, res, iterations;\r
         sector *e_sector = NULL;\r
         uint8_t blockNo = 0;\r
         int i, j, res, iterations;\r
         sector *e_sector = NULL;\r
         uint8_t blockNo = 0;\r
@@ -551,7 +683,7 @@ 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[13*6];\r
+       uint8_t keyBlock[6*6];\r
         uint64_t key64 = 0;\r
         bool transferToEml = false;\r
         \r
         uint64_t key64 = 0;\r
         bool transferToEml = false;\r
         \r
@@ -559,29 +691,14 @@ int CmdHF14AMfNested(const char *Cmd)
         FILE *fkeys;\r
         uint8_t standart[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};\r
         uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};\r
         FILE *fkeys;\r
         uint8_t standart[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};\r
         uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};\r
-       \r
-       char cmdp, ctmp;\r
  \r
  \r
-       if (strlen(Cmd)<3) {\r
-               PrintAndLog("Usage:");\r
-               PrintAndLog(" all sectors:  hf mf nested  <card memory> <block number> <key A/B> <key (12 hex symbols)> [t,d]");\r
-               PrintAndLog(" one sector:   hf mf nested  o <block number> <key A/B> <key (12 hex symbols)>");\r
-               PrintAndLog("               <target block number> <target key A/B> [t]");\r
-               PrintAndLog("card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");\r
-               PrintAndLog("t - transfer keys into emulator memory");\r
-               PrintAndLog("d - write keys to binary file");\r
-               PrintAndLog(" ");\r
-               PrintAndLog("      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
-               return 0;\r
-       }       \r
+       if (strlen(Cmd)<3) return usage_hf14_nested();\r
         \r
         \r
+       char cmdp, ctmp;\r
         cmdp = param_getchar(Cmd, 0);\r
         blockNo = param_get8(Cmd, 1);\r
         ctmp = param_getchar(Cmd, 2);\r
         cmdp = param_getchar(Cmd, 0);\r
         blockNo = param_get8(Cmd, 1);\r
         ctmp = param_getchar(Cmd, 2);\r
-       \r
+\r
         if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {\r
                 PrintAndLog("Key type must be A or B");\r
                 return 1;\r
         if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {\r
                 PrintAndLog("Key type must be A or B");\r
                 return 1;\r
@@ -625,39 +742,42 @@ int CmdHF14AMfNested(const char *Cmd)
         transferToEml |= (ctmp == 'd' || ctmp == 'D');\r
         \r
         if (cmdp == 'o') {\r
         transferToEml |= (ctmp == 'd' || ctmp == 'D');\r
         \r
         if (cmdp == 'o') {\r
-               PrintAndLog("--target block no:%3d, target key type:%c ", trgBlockNo, trgKeyType?'B':'A');\r
-               if (mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true)) {\r
-                       PrintAndLog("Nested error.");\r
-                       return 2;\r
-               }\r
-               key64 = bytes_to_num(keyBlock, 6);\r
-               if (key64) {\r
-                       PrintAndLog("Found valid key:%012"llx, key64);\r
-\r
-                       // transfer key to the emulator\r
-                       if (transferToEml) {\r
-                               uint8_t sectortrailer;\r
-                               if (trgBlockNo < 32*4) {        // 4 block sector\r
-                                       sectortrailer = (trgBlockNo & 0x03) + 3;\r
-                               } else {                                        // 16 block sector\r
-                                       sectortrailer = (trgBlockNo & 0x0f) + 15;\r
+               int16_t isOK = mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true);\r
+               switch (isOK) {\r
+                       case -1 : PrintAndLog("Error: No response from Proxmark.\n"); break;\r
+                       case -2 : PrintAndLog("Button pressed. Aborted.\n"); break;\r
+                       case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (its random number generator is not predictable).\n"); break;\r
+                       case -4 : PrintAndLog("No valid key found"); break;\r
+                       case -5 : \r
+                               key64 = bytes_to_num(keyBlock, 6);\r
+\r
+                               // transfer key to the emulator\r
+                               if (transferToEml) {\r
+                                       uint8_t sectortrailer;\r
+                                       if (trgBlockNo < 32*4) {        // 4 block sector\r
+                                               sectortrailer = (trgBlockNo & 0x03) + 3;\r
+                                       } else {                                        // 16 block sector\r
+                                               sectortrailer = (trgBlockNo & 0x0f) + 15;\r
+                                       }\r
+                                       mfEmlGetMem(keyBlock, sectortrailer, 1);\r
+                       \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
                                 }\r
                                 }\r
-                               mfEmlGetMem(keyBlock, sectortrailer, 1);\r
-               \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
-                       }\r
-               } else {\r
-                       PrintAndLog("No valid key found");\r
+                               return 0;\r
+                       default : PrintAndLog("Unknown Error.\n");\r
                 }\r
                 }\r
+               return 2;\r
         }\r
         else { // ------------------------------------  multiple sectors working\r
         }\r
         else { // ------------------------------------  multiple sectors working\r
-               clock_t time1;\r
-               time1 = clock();\r
-\r
+               clock_t t1 = clock();\r
+               unsigned long elapsed_time;\r
+               time_t start, end;\r
+               time(&start);\r
+               \r
                 e_sector = calloc(SectorsCnt, sizeof(sector));\r
                 if (e_sector == NULL) return 1;\r
                 \r
                 e_sector = calloc(SectorsCnt, sizeof(sector));\r
                 if (e_sector == NULL) return 1;\r
                 \r
@@ -668,77 +788,103 @@ int CmdHF14AMfNested(const char *Cmd)
                 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(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
  \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
  \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, 6, keyBlock, &key64);\r
+                               res = mfCheckKeys(FirstBlockOfSector(i), j, true, 6, keyBlock, &key64);\r
                                 \r
                                 if (!res) {\r
                                         e_sector[i].Key[j] = key64;\r
                                 \r
                                 if (!res) {\r
                                         e_sector[i].Key[j] = key64;\r
-                                       e_sector[i].foundKey[j] = 1;\r
+                                       e_sector[i].foundKey[j] = TRUE;\r
                                 }\r
                         }\r
                 }\r
                                 }\r
                         }\r
                 }\r
+               clock_t t2 = clock() - t1;\r
+               time(&end);\r
+               elapsed_time = difftime(end, start);    \r
+               if ( t2 > 0 )\r
+                       PrintAndLog("Time to check 6 known keys: %.0f ticks %u seconds\n", (float)t2 , elapsed_time);\r
+               \r
+               PrintAndLog("enter nested..."); \r
                 \r
                 // nested sectors\r
                 iterations = 0;\r
                 \r
                 // nested sectors\r
                 iterations = 0;\r
-               PrintAndLog("nested...");\r
                 bool calibrate = true;\r
                 bool calibrate = true;\r
+\r
                 for (i = 0; i < NESTED_SECTOR_RETRY; i++) {\r
                 for (i = 0; i < NESTED_SECTOR_RETRY; i++) {\r
-                       for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {\r
+                       for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; ++sectorNo) {\r
+                               for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) { \r
  \r
  \r
-                               if (ukbhit()) {\r
-                                       printf("\naborted via keyboard!\n");\r
-                                       free(e_sector);\r
-                                       return 2;\r
-                               }                       \r
-                       \r
-                               for (trgKeyType = 0; trgKeyType < 2; trgKeyType++) { \r
                                         if (e_sector[sectorNo].foundKey[trgKeyType]) continue;\r
                                         if (e_sector[sectorNo].foundKey[trgKeyType]) continue;\r
-                                       PrintAndLog("-----------------------------------------------");\r
-                                       if(mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate)) {\r
-                                               PrintAndLog("Nested error.\n");\r
-                                               free(e_sector);\r
-                                               return 2;                                       }\r
-                                       else {\r
-                                               calibrate = false;\r
-                                       }\r
                                         \r
                                         \r
-                                       iterations++;\r
-\r
-                                       key64 = bytes_to_num(keyBlock, 6);\r
-                                       if (key64) {\r
-                                               PrintAndLog("Found valid key:%012"llx, key64);\r
-                                               e_sector[sectorNo].foundKey[trgKeyType] = 1;\r
-                                               e_sector[sectorNo].Key[trgKeyType] = key64;\r
+                                       int16_t isOK = mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate);\r
+                                       switch (isOK) {\r
+                                               case -1 : PrintAndLog("Error: No response from Proxmark.\n"); break;\r
+                                               case -2 : PrintAndLog("Button pressed. Aborted.\n"); break;\r
+                                               case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (its random number generator is not predictable).\n"); break;\r
+                                               case -4 : //key not found\r
+                                                       calibrate = false;\r
+                                                       iterations++;\r
+                                                       continue; \r
+                                               case -5 :\r
+                                                       calibrate = false;\r
+                                                       iterations++;\r
+                                                       e_sector[sectorNo].foundKey[trgKeyType] = 1;\r
+                                                       e_sector[sectorNo].Key[trgKeyType] = bytes_to_num(keyBlock, 6);\r
+                                                       continue;\r
+                                                       \r
+                                               default : PrintAndLog("Unknown Error.\n");\r
                                         }\r
                                         }\r
+                                       free(e_sector);\r
+                                       return 2;\r
                                 }\r
                         }\r
                 }\r
                                 }\r
                         }\r
                 }\r
-\r
-               printf("Time in nested: %1.3f (%1.3f sec per key)\n\n", ((float)clock() - time1)/CLOCKS_PER_SEC, ((float)clock() - time1)/iterations/CLOCKS_PER_SEC);\r
                 \r
                 \r
-               PrintAndLog("-----------------------------------------------\nIterations count: %d\n\n", iterations);\r
-               //print them\r
-               PrintAndLog("|---|----------------|---|----------------|---|");\r
-               PrintAndLog("|sec|key A           |res|key B           |res|");\r
-               PrintAndLog("|---|----------------|---|----------------|---|");\r
+               t1 = clock() - t1;\r
+               time(&end);\r
+               elapsed_time = difftime(end, start);    \r
+               if ( t1 > 0 )\r
+                       PrintAndLog("Time in nested: %.0f ticks %u seconds\n", (float)t1, elapsed_time);\r
+\r
+\r
+               // 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?\r
+               PrintAndLog("trying to read key B...");\r
                 for (i = 0; i < SectorsCnt; i++) {\r
                 for (i = 0; i < SectorsCnt; i++) {\r
-                       PrintAndLog("|%03d|  %012"llx"  | %d |  %012"llx"  | %d |", i,\r
-                               e_sector[i].Key[0], e_sector[i].foundKey[0], e_sector[i].Key[1], e_sector[i].foundKey[1]);\r
+                       // KEY A  but not KEY B\r
+                       if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {\r
+                               \r
+                               uint8_t sectrail = (FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);\r
+                               \r
+                               PrintAndLog("Reading block %d", sectrail);\r
+                                                       \r
+                               UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}};\r
+                               num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A\r
+                               clearCommandBuffer();\r
+                               SendCommand(&c);\r
+\r
+                               UsbCommand resp;\r
+                               if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) continue;\r
+                                       \r
+                               uint8_t isOK  = resp.arg[0] & 0xff;\r
+                               if (!isOK) continue;\r
+\r
+                               uint8_t *data = resp.d.asBytes;\r
+                               key64 = bytes_to_num(data+10, 6);\r
+                               if (key64) {\r
+                                       PrintAndLog("Data:%s", sprint_hex(data+10, 6));\r
+                                       e_sector[i].foundKey[1] = TRUE;\r
+                                       e_sector[i].Key[1] = key64;\r
+                               }\r
+                       }\r
                 }\r
                 }\r
-               PrintAndLog("|---|----------------|---|----------------|---|");\r
+\r
+               \r
+               //print them\r
+               printKeyTable( SectorsCnt, e_sector );\r
                 \r
                 // transfer them to the emulator\r
                 if (transferToEml) {\r
                 \r
                 // transfer them to the emulator\r
                 if (transferToEml) {\r
@@ -780,32 +926,119 @@ 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
  }\r
  \r
                 free(e_sector);\r
         }\r
         return 0;\r
  }\r
  \r
-int CmdHF14AMfChk(const char *Cmd)\r
-{\r
-       if (strlen(Cmd)<3) {\r
-               PrintAndLog("Usage:  hf mf chk <block number>|<*card memory> <key type (A/B/?)> [t|d] [<key (12 hex symbols)>] [<dic (*.dic)>]");\r
-               PrintAndLog("          * - all sectors");\r
-               PrintAndLog("card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");\r
-               PrintAndLog("d - write keys to binary file\n");\r
-               PrintAndLog("t - write keys to emulator memory");\r
-               PrintAndLog("      sample: hf mf chk 0 A 1234567890ab keys.dic");\r
-               PrintAndLog("              hf mf chk *1 ? t");\r
-               PrintAndLog("              hf mf chk *1 ? d");\r
-               return 0;\r
+int CmdHF14AMfNestedHard(const char *Cmd) {\r
+       uint8_t blockNo = 0;\r
+       uint8_t keyType = 0;\r
+       uint8_t trgBlockNo = 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
+       char ctmp;\r
+       ctmp = param_getchar(Cmd, 0);\r
+       if (ctmp == 'H' || ctmp == 'h' ) return usage_hf14_hardnested();\r
+       if (ctmp != 'R' && ctmp != 'r' && ctmp != 'T' && ctmp != 't' && strlen(Cmd) < 20) return usage_hf14_hardnested();\r
+       \r
+       bool know_target_key = false;\r
+       bool nonce_file_read = false;\r
+       bool nonce_file_write = false;\r
+       bool slow = false;\r
+       int tests = 0;\r
+       \r
+       if (ctmp == 'R' || ctmp == 'r') {\r
+               nonce_file_read = true;\r
+               if (!param_gethex(Cmd, 1, trgkey, 12)) {\r
+                       know_target_key = true;\r
+               }\r
+       } else if (ctmp == 'T' || ctmp == 't') {\r
+               tests = param_get32ex(Cmd, 1, 100, 10);\r
+       } else {\r
+               blockNo = param_get8(Cmd, 0);\r
+               ctmp = param_getchar(Cmd, 1);\r
+               if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {\r
+                       PrintAndLog("Key type must be A or B");\r
+                       return 1;\r
+               }\r
+               if (ctmp != 'A' && ctmp != 'a') { \r
+                       keyType = 1;\r
+               }\r
+               \r
+               if (param_gethex(Cmd, 2, key, 12)) {\r
+                       PrintAndLog("Key must include 12 HEX symbols");\r
+                       return 1;\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
+                       PrintAndLog("Target key type must be A or B");\r
+                       return 1;\r
+               }\r
+               if (ctmp != 'A' && ctmp != 'a') {\r
+                       trgKeyType = 1;\r
+               }\r
+\r
+               uint16_t i = 5;\r
+\r
+               if (!param_gethex(Cmd, 5, trgkey, 12)) {\r
+                       know_target_key = true;\r
+                       i++;\r
+               }\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 {\r
+                               PrintAndLog("Possible options are w and/or s");\r
+                               return 1;\r
+                       }\r
+                       i++;\r
+               }\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
+                       trgKeyType?'B':'A', \r
+                       trgkey[0], trgkey[1], trgkey[2], trgkey[3], trgkey[4], trgkey[5],\r
+                       know_target_key ? "" : " (not set)",\r
+                       nonce_file_write ? "write": nonce_file_read ? "read" : "none",\r
+                       slow ? "Yes" : "No",\r
+                       tests);\r
+\r
+       int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key?trgkey:NULL, nonce_file_read, nonce_file_write, slow, tests);\r
+\r
+       if (isOK) {\r
+               switch (isOK) {\r
+                       case 1 : PrintAndLog("Error: No response from Proxmark.\n"); break;\r
+                       case 2 : PrintAndLog("Button pressed. Aborted.\n"); break;\r
+                       default : break;\r
+               }\r
+               return 2;\r
+       }\r
+\r
+       return 0;\r
+}\r
+\r
+int CmdHF14AMfChk(const char *Cmd) {\r
+\r
+       if (strlen(Cmd)<3) return usage_hf14_chk();\r
+\r
         FILE * f;\r
         char filename[FILE_PATH_SIZE]={0};\r
         char buf[13];\r
         uint8_t *keyBlock = NULL, *p;\r
         uint8_t stKeyBlock = 20;\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
+       sector *e_sector = NULL;\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
@@ -814,14 +1047,15 @@ int CmdHF14AMfChk(const char *Cmd)
         uint8_t keyType = 0;\r
         uint64_t key64 = 0;\r
         \r
         uint8_t keyType = 0;\r
         uint64_t key64 = 0;\r
         \r
+       uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};\r
+               \r
         int transferToEml = 0;\r
         int createDumpFile = 0;\r
  \r
         keyBlock = calloc(stKeyBlock, 6);\r
         if (keyBlock == NULL) return 1;\r
  \r
         int transferToEml = 0;\r
         int createDumpFile = 0;\r
  \r
         keyBlock = calloc(stKeyBlock, 6);\r
         if (keyBlock == NULL) return 1;\r
  \r
-       uint64_t defaultKeys[] =\r
-       {\r
+       uint64_t defaultKeys[] = {\r
                 0xffffffffffff, // Default key (first key used by program if no user defined key)\r
                 0x000000000000, // Blank key\r
                 0xa0a1a2a3a4a5, // NFCForum MAD key\r
                 0xffffffffffff, // Default key (first key used by program if no user defined key)\r
                 0x000000000000, // Blank key\r
                 0xa0a1a2a3a4a5, // NFCForum MAD key\r
@@ -839,9 +1073,8 @@ int CmdHF14AMfChk(const char *Cmd)
         int defaultKeysSize = sizeof(defaultKeys) / sizeof(uint64_t);\r
  \r
         for (int defaultKeyCounter = 0; defaultKeyCounter < defaultKeysSize; defaultKeyCounter++)\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
                 num_to_bytes(defaultKeys[defaultKeyCounter], 6, (uint8_t*)(keyBlock + defaultKeyCounter * 6));\r
-       }\r
+\r
         \r
         if (param_getchar(Cmd, 0)=='*') {\r
                 blockNo = 3;\r
         \r
         if (param_getchar(Cmd, 0)=='*') {\r
                 blockNo = 3;\r
@@ -852,9 +1085,9 @@ int CmdHF14AMfChk(const char *Cmd)
                         case '4': SectorsCnt = 40; break;\r
                         default:  SectorsCnt = 16;\r
                 }\r
                         case '4': SectorsCnt = 40; break;\r
                         default:  SectorsCnt = 16;\r
                 }\r
-       }\r
-       else\r
+       } else {\r
                 blockNo = param_get8(Cmd, 0);\r
                 blockNo = param_get8(Cmd, 0);\r
+       }\r
         \r
         ctmp = param_getchar(Cmd, 1);\r
         switch (ctmp) { \r
         \r
         ctmp = param_getchar(Cmd, 1);\r
         switch (ctmp) { \r
@@ -869,6 +1102,7 @@ int CmdHF14AMfChk(const char *Cmd)
                 break;\r
         default:\r
                 PrintAndLog("Key type must be A , B or ?");\r
                 break;\r
         default:\r
                 PrintAndLog("Key type must be A , B or ?");\r
+               free(keyBlock);\r
                 return 1;\r
         };\r
         \r
                 return 1;\r
         };\r
         \r
@@ -887,7 +1121,7 @@ int CmdHF14AMfChk(const char *Cmd)
                                 }\r
                                 keyBlock = p;\r
                         }\r
                                 }\r
                                 keyBlock = p;\r
                         }\r
-                       PrintAndLog("chk key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,\r
+                       PrintAndLog("key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,\r
                         (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],\r
                         (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],     (keyBlock + 6*keycnt)[5], 6);\r
                         keycnt++;\r
                         (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],\r
                         (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],     (keyBlock + 6*keycnt)[5], 6);\r
                         keycnt++;\r
@@ -920,13 +1154,14 @@ int CmdHF14AMfChk(const char *Cmd)
                                                 if (!p) {\r
                                                         PrintAndLog("Cannot allocate memory for defKeys");\r
                                                         free(keyBlock);\r
                                                 if (!p) {\r
                                                         PrintAndLog("Cannot allocate memory for defKeys");\r
                                                         free(keyBlock);\r
+                                                       fclose(f);\r
                                                         return 2;\r
                                                 }\r
                                                 keyBlock = p;\r
                                         }\r
                                         memset(keyBlock + 6 * keycnt, 0, 6);\r
                                         num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);\r
                                                         return 2;\r
                                                 }\r
                                                 keyBlock = p;\r
                                         }\r
                                         memset(keyBlock + 6 * keycnt, 0, 6);\r
                                         num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);\r
-                                       PrintAndLog("chk custom key[%2d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));\r
+                                       PrintAndLog("check key[%2d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));\r
                                         keycnt++;\r
                                         memset(buf, 0, sizeof(buf));\r
                                 }\r
                                         keycnt++;\r
                                         memset(buf, 0, sizeof(buf));\r
                                 }\r
@@ -943,185 +1178,417 @@ int CmdHF14AMfChk(const char *Cmd)
         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
-                       PrintAndLog("chk default key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,\r
-                       (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],\r
-                       (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],     (keyBlock + 6*keycnt)[5], 6);\r
+                       PrintAndLog("key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,\r
+                               (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],\r
+                               (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],     (keyBlock + 6*keycnt)[5], 6);\r
         }\r
         \r
         // initialize storage for found keys\r
         }\r
         \r
         // initialize storage for found keys\r
-       bool validKey[2][40];\r
-       uint8_t foundKey[2][40][6];\r
-       for (uint16_t t = 0; t < 2; t++) {\r
-               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
-               }\r
+       e_sector = calloc(SectorsCnt, sizeof(sector));\r
+       if (e_sector == NULL) {\r
+               free(keyBlock);\r
+               return 1;\r
+       }\r
+\r
+       // empty e_sector\r
+       for(int i = 0; i < SectorsCnt; ++i){\r
+               e_sector[i].Key[0] = 0xffffffffffff;\r
+               e_sector[i].Key[1] = 0xffffffffffff;\r
+               e_sector[i].foundKey[0] = FALSE;\r
+               e_sector[i].foundKey[1] = FALSE;\r
         }\r
         }\r
+               \r
+       \r
+       uint8_t trgKeyType = 0;\r
+       uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;\r
         \r
         \r
-       for ( int t = !keyType; t < 2; keyType==2?(t++):(t=2) ) {\r
-               int b=blockNo;\r
+       // time\r
+       clock_t t1 = clock();\r
+       time_t start, end;\r
+       time(&start);\r
+       \r
+       // check keys.\r
+       for (trgKeyType = !keyType;  trgKeyType < 2;  (keyType==2) ? (++trgKeyType) : (trgKeyType=2) ) {\r
+\r
+               int b = blockNo;\r
                 for (int i = 0; i < SectorsCnt; ++i) {\r
                 for (int i = 0; i < SectorsCnt; ++i) {\r
-                       PrintAndLog("--sector:%2d, block:%3d, key type:%C, key count:%2d ", i, b, t?'B':'A', keycnt);\r
-                       uint32_t max_keys = keycnt>USB_CMD_DATA_SIZE/6?USB_CMD_DATA_SIZE/6:keycnt;\r
-                       for (uint32_t c = 0; c < keycnt; c+=max_keys) {\r
-                               uint32_t size = keycnt-c>max_keys?max_keys:keycnt-c;\r
-                               res = mfCheckKeys(b, t, size, &keyBlock[6*c], &key64);\r
-                               if (res != 1) {\r
-                                       if (!res) {\r
-                                               PrintAndLog("Found valid key:[%012"llx"]",key64);\r
-                                               num_to_bytes(key64, 6, foundKey[t][i]);\r
-                                               validKey[t][i] = true;\r
-                                       } \r
-                               } else {\r
-                                       PrintAndLog("Command execute timeout");\r
+                       \r
+                       // skip already found keys.\r
+                       if (e_sector[i].foundKey[trgKeyType]) continue;\r
+                                               \r
+                       for (uint32_t c = 0; c < keycnt; c += max_keys) {\r
+                               printf(".");\r
+                               fflush(stdout);                 \r
+                               uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c;\r
+                               \r
+                               res = mfCheckKeys(b, trgKeyType, true, size, &keyBlock[6*c], &key64);\r
+                               if (!res) {\r
+                                       e_sector[i].Key[trgKeyType] = key64;\r
+                                       e_sector[i].foundKey[trgKeyType] = TRUE;\r
+                                       break;\r
                                 }\r
                         }\r
                                 }\r
                         }\r
-                       b<127?(b+=4):(b+=16);   \r
+                       b < 127 ? ( b +=4 ) : ( b += 16 );      \r
                 }\r
         }\r
                 }\r
         }\r
+       t1 = clock() - t1;\r
+       time(&end);\r
+       unsigned long elapsed_time = difftime(end, start);      \r
+       if ( t1 > 0 )\r
+               PrintAndLog("\nTime in checkkeys: %.0f ticks %u seconds\n", (float)t1, elapsed_time);\r
  \r
  \r
-       if (transferToEml) {\r
-               uint8_t block[16];\r
-               for (uint16_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {\r
-                       if (validKey[0][sectorNo] || validKey[1][sectorNo]) {\r
-                               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
-               }\r
-                       }\r
-                               mfEmlSetMem(block, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);\r
+               \r
+       // 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?\r
+       if ( keyType != 1 ) {\r
+               PrintAndLog("testing to read key B...");\r
+               for (i = 0; i < SectorsCnt; i++) {\r
+                       // KEY A  but not KEY B\r
+                       if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {\r
+                                                       \r
+                               uint8_t sectrail = (FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);\r
+                               \r
+                               PrintAndLog("Reading block %d", sectrail);\r
+                               \r
+                               UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}};\r
+                               num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A\r
+                               clearCommandBuffer();\r
+                               SendCommand(&c);\r
+\r
+                               UsbCommand resp;\r
+                               if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) continue;\r
+                                       \r
+                               uint8_t isOK  = resp.arg[0] & 0xff;\r
+                               if (!isOK) continue;\r
+\r
+                               uint8_t *data = resp.d.asBytes;\r
+                               key64 = bytes_to_num(data+10, 6);\r
+                               if (key64) {\r
+                                       PrintAndLog("Data:%s", sprint_hex(data+10, 6));\r
+                                       e_sector[i].foundKey[1] = 1;\r
+                                       e_sector[i].Key[1] = key64;\r
+                               }\r
                         }\r
                 }\r
                         }\r
                 }\r
-               PrintAndLog("Found keys have been transferred to the emulator memory");\r
-                       }\r
+       }\r
+\r
  \r
  \r
+       //print them\r
+       printKeyTable( SectorsCnt, e_sector );\r
+       \r
+       if (transferToEml) {\r
+               uint8_t block[16] = {0x00};\r
+               for (uint8_t i = 0; i < SectorsCnt; ++i ) {\r
+                       mfEmlGetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);\r
+                       if (e_sector[i].foundKey[0])\r
+                               num_to_bytes(e_sector[i].Key[0], 6, block);\r
+                       if (e_sector[i].foundKey[1])\r
+                               num_to_bytes(e_sector[i].Key[1], 6, block+10);\r
+                       mfEmlSetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);\r
+               }\r
+               PrintAndLog("Found keys have been transferred to the emulator memory");\r
+       }\r
+       \r
         if (createDumpFile) {\r
                 FILE *fkeys = fopen("dumpkeys.bin","wb");\r
                 if (fkeys == NULL) { \r
                         PrintAndLog("Could not create file dumpkeys.bin");\r
                         free(keyBlock);\r
         if (createDumpFile) {\r
                 FILE *fkeys = fopen("dumpkeys.bin","wb");\r
                 if (fkeys == NULL) { \r
                         PrintAndLog("Could not create file dumpkeys.bin");\r
                         free(keyBlock);\r
+                       free(e_sector);\r
                         return 1;\r
                         return 1;\r
-                       }\r
-               for (uint16_t t = 0; t < 2; t++) {\r
-                       fwrite(foundKey[t], 1, 6*SectorsCnt, fkeys);\r
+               }\r
+               PrintAndLog("Printing keys to binary file dumpkeys.bin...");\r
+       \r
+               for( i=0; i<SectorsCnt; i++) {\r
+                       num_to_bytes(e_sector[i].Key[0], 6, tempkey);\r
+                       fwrite ( tempkey, 1, 6, fkeys );\r
+               }\r
+               for(i=0; i<SectorsCnt; i++) {\r
+                       num_to_bytes(e_sector[i].Key[1], 6, tempkey);\r
+                       fwrite ( tempkey, 1, 6, fkeys );\r
                 }\r
                 fclose(fkeys);\r
                 }\r
                 fclose(fkeys);\r
-               PrintAndLog("Found keys have been dumped to file dumpkeys.bin. 0xffffffffffff has been inserted for unknown keys.");\r
+               PrintAndLog("Found keys have been dumped to file dumpkeys.bin. 0xffffffffffff has been inserted for unknown keys.");                    \r
         }\r
         }\r
-\r
+       \r
         free(keyBlock);\r
         free(keyBlock);\r
+       free(e_sector);\r
         PrintAndLog("");\r
         PrintAndLog("");\r
-  return 0;\r
+       return 0;\r
  }\r
  \r
  }\r
  \r
-int CmdHF14AMf1kSim(const char *Cmd)\r
-{\r
-       uint8_t uid[7] = {0, 0, 0, 0, 0, 0, 0};\r
+int CmdHF14AMf1kSim(const char *Cmd) {\r
+       uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};\r
         uint8_t exitAfterNReads = 0;\r
         uint8_t exitAfterNReads = 0;\r
-       uint8_t flags = 0;\r
-\r
-       if (param_getchar(Cmd, 0) == 'h') {\r
-               PrintAndLog("Usage:  hf mf sim  u <uid (8 hex symbols)> n <numreads> i x");\r
-               PrintAndLog("           u    (Optional) UID. If not specified, the UID from emulator memory will be used");\r
-               PrintAndLog("           n    (Optional) Automatically exit simulation after <numreads> blocks have been read by reader. 0 = infinite");\r
-               PrintAndLog("           i    (Optional) Interactive, means that console will not be returned until simulation finishes or is aborted");\r
-               PrintAndLog("           x    (Optional) Crack, performs the 'reader attack', nr/ar attack against a legitimate reader, fishes out the key(s)");\r
-               PrintAndLog("           sample: hf mf sim u 0a0a0a0a ");\r
-               return 0;\r
-       }\r
+       uint8_t flags = (FLAG_UID_IN_EMUL | FLAG_4B_UID_IN_DATA);\r
+       int uidlen = 0;\r
         uint8_t pnr = 0;\r
         uint8_t pnr = 0;\r
-       if (param_getchar(Cmd, pnr) == 'u') {\r
-               if(param_gethex(Cmd, pnr+1, uid, 8) == 0)\r
-               {\r
-                       flags |= FLAG_4B_UID_IN_DATA; // UID from packet\r
-               } else if(param_gethex(Cmd,pnr+1,uid,14) == 0) {\r
-                       flags |= FLAG_7B_UID_IN_DATA;// UID from packet\r
-               } else {\r
-                       PrintAndLog("UID, if specified, must include 8 or 14 HEX symbols");\r
-                       return 1;\r
+       uint8_t cmdp = param_getchar(Cmd, 0);\r
+\r
+       if (cmdp == 'h' || cmdp == 'H') return usage_hf14_mf1ksim();\r
+\r
+       cmdp = param_getchar(Cmd, pnr);\r
+       if (cmdp == 'u' || cmdp == 'U') {\r
+               param_gethex_ex(Cmd, pnr+1, uid, &uidlen);\r
+               switch(uidlen){\r
+                       case 20: flags = FLAG_10B_UID_IN_DATA;  break;\r
+                       case 14: flags = FLAG_7B_UID_IN_DATA; break;\r
+                       case  8: flags = FLAG_4B_UID_IN_DATA; break;\r
+                       default: return usage_hf14_mf1ksim();\r
                 }\r
                 pnr +=2;\r
         }\r
                 }\r
                 pnr +=2;\r
         }\r
-       if (param_getchar(Cmd, pnr) == 'n') {\r
-               exitAfterNReads = param_get8(Cmd,pnr+1);\r
+\r
+       cmdp = param_getchar(Cmd, pnr); \r
+       if (cmdp == 'n' || cmdp == 'N') {\r
+               exitAfterNReads = param_get8(Cmd, pnr+1);\r
                 pnr += 2;\r
         }\r
                 pnr += 2;\r
         }\r
-       if (param_getchar(Cmd, pnr) == 'i' ) {\r
-               //Using a flag to signal interactiveness, least significant bit\r
+\r
+       cmdp = param_getchar(Cmd, pnr);         \r
+       if (cmdp == 'i' || cmdp == 'I' ) {\r
                 flags |= FLAG_INTERACTIVE;\r
                 pnr++;\r
         }\r
  \r
                 flags |= FLAG_INTERACTIVE;\r
                 pnr++;\r
         }\r
  \r
-       if (param_getchar(Cmd, pnr) == 'x' ) {\r
-               //Using a flag to signal interactiveness, least significant bit\r
+       cmdp = param_getchar(Cmd, pnr); \r
+       if (cmdp == 'x' || cmdp == 'X') {\r
                 flags |= FLAG_NR_AR_ATTACK;\r
         }\r
                 flags |= FLAG_NR_AR_ATTACK;\r
         }\r
-       PrintAndLog(" uid:%s, numreads:%d, flags:%d (0x%02x) ",\r
-                               flags & FLAG_4B_UID_IN_DATA ? sprint_hex(uid,4):\r
-                                                                                         flags & FLAG_7B_UID_IN_DATA   ? sprint_hex(uid,7): "N/A"\r
-                               , exitAfterNReads, flags,flags);\r
-\r
+       \r
+       PrintAndLog(" uid:%s, numreads:%d, flags:%d (0x%02x) "\r
+                               , (uidlen == 0 ) ? "N/A" : sprint_hex(uid, uidlen>>1)\r
+                               , exitAfterNReads\r
+                               , flags\r
+                               , flags);\r
  \r
  \r
-       UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads,0}};\r
+       UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads, 0}};\r
         memcpy(c.d.asBytes, uid, sizeof(uid));\r
         memcpy(c.d.asBytes, uid, sizeof(uid));\r
+       clearCommandBuffer();\r
         SendCommand(&c);\r
  \r
         SendCommand(&c);\r
  \r
-       if(flags & FLAG_INTERACTIVE)\r
-       {\r
-               UsbCommand resp;\r
-               PrintAndLog("Press pm3-button to abort simulation");\r
-               while(! WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
-                       //We're waiting only 1.5 s at a time, otherwise we get the\r
-                       // annoying message about "Waiting for a response... "\r
+       if(flags & FLAG_INTERACTIVE) {          \r
+               uint8_t data[32];\r
+               uint64_t key;\r
+               UsbCommand resp;                \r
+               PrintAndLog("Press pm3-button or send another cmd to abort simulation");\r
+               while( !ukbhit() ){\r
+                       if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;\r
+\r
+                       if ( !(flags & FLAG_NR_AR_ATTACK) ) break;\r
+                       if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;\r
+\r
+                       memset(data, 0x00, sizeof(data));       \r
+                       int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1];\r
+\r
+                       memcpy(data, resp.d.asBytes, len);                      \r
+                       key = 0;\r
+                       bool found = tryMfk32(data, &key);\r
+                       found ^= tryMfk32_moebius(data, &key);\r
+                       if ( found ) break;\r
                 }\r
         }\r
                 }\r
         }\r
-       \r
         return 0;\r
  }\r
  \r
         return 0;\r
  }\r
  \r
-int CmdHF14AMfDbg(const char *Cmd)\r
-{\r
-       int dbgMode = param_get32ex(Cmd, 0, 0, 10);\r
-       if (dbgMode > 4) {\r
-               PrintAndLog("Max debug mode parameter is 4 \n");\r
-       }\r
-\r
-       if (strlen(Cmd) < 1 || !param_getchar(Cmd, 0) || dbgMode > 4) {\r
-               PrintAndLog("Usage:  hf mf dbg  <debug level>");\r
-               PrintAndLog(" 0 - no debug messages");\r
-               PrintAndLog(" 1 - error messages");\r
-               PrintAndLog(" 2 - plus information messages");\r
-               PrintAndLog(" 3 - plus debug messages");\r
-               PrintAndLog(" 4 - print even debug messages in timing critical functions");\r
-               PrintAndLog("     Note: this option therefore may cause malfunction itself");\r
-               return 0;\r
-       }       \r
-\r
-  UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}};\r
-  SendCommand(&c);\r
-\r
-  return 0;\r
-}\r
-\r
-int CmdHF14AMfEGet(const char *Cmd)\r
-{\r
-       uint8_t blockNo = 0;\r
-       uint8_t data[16];\r
-\r
-       if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
-               PrintAndLog("Usage:  hf mf eget <block number>");\r
-               PrintAndLog(" sample: hf mf eget 0 ");\r
-               return 0;\r
-       }       \r
-       \r
-       blockNo = param_get8(Cmd, 0);\r
+int CmdHF14AMfSniff(const char *Cmd){\r
+       bool wantLogToFile = FALSE;\r
+       bool wantDecrypt = FALSE;\r
+       //bool wantSaveToEml = FALSE; TODO\r
+       bool wantSaveToEmlFile = FALSE;\r
  \r
  \r
-       PrintAndLog(" ");\r
-       if (!mfEmlGetMem(data, blockNo, 1)) {\r
-               PrintAndLog("data[%3d]:%s", blockNo, sprint_hex(data, 16));\r
+       //var \r
+       int tmpchar;\r
+       int res = 0;\r
+       int len = 0;\r
+       int blockLen = 0;\r
+       int pckNum = 0;\r
+       int num = 0;\r
+       uint8_t uid[10];\r
+       uint8_t uid_len = 0;\r
+       uint8_t atqa[2] = {0x00, 0x00};\r
+       uint8_t sak = 0;\r
+       bool isTag = FALSE;\r
+       uint8_t *buf = NULL;\r
+       uint16_t bufsize = 0;\r
+       uint8_t *bufPtr = NULL;\r
+       uint16_t traceLen = 0;\r
+       \r
+       memset(uid, 0x00, sizeof(uid));\r
+       \r
+       char ctmp = param_getchar(Cmd, 0);\r
+       if ( ctmp == 'h' || ctmp == 'H' ) return usage_hf14_sniff();\r
+       \r
+       for (int i = 0; i < 4; i++) {\r
+               ctmp = param_getchar(Cmd, i);\r
+               if (ctmp == 'l' || ctmp == 'L') wantLogToFile = true;\r
+               if (ctmp == 'd' || ctmp == 'D') wantDecrypt = true;\r
+               //if (ctmp == 'e' || ctmp == 'E') wantSaveToEml = true; TODO\r
+               if (ctmp == 'f' || ctmp == 'F') wantSaveToEmlFile = true;\r
+       }\r
+       \r
+       printf("-------------------------------------------------------------------------\n");\r
+       printf("Executing mifare sniffing command. \n");\r
+       printf("Press the key on the proxmark3 device to abort both proxmark3 and client.\n");\r
+       printf("Press the key on pc keyboard to abort the client.\n");\r
+       printf("-------------------------------------------------------------------------\n");\r
+\r
+       UsbCommand c = {CMD_MIFARE_SNIFFER, {0, 0, 0}};\r
+       clearCommandBuffer();\r
+       SendCommand(&c);\r
+\r
+       // wait cycle\r
+       while (true) {\r
+               printf(".");\r
+               fflush(stdout);\r
+               if (ukbhit()) {\r
+                       tmpchar = getchar();\r
+                       (void)tmpchar;\r
+                       printf("\naborted via keyboard!\n");\r
+                       break;\r
+               }\r
+               \r
+               UsbCommand resp;\r
+               if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {\r
+                       res = resp.arg[0] & 0xff;\r
+                       traceLen = resp.arg[1];\r
+                       len = resp.arg[2];\r
+\r
+                       // we are done?\r
+                       if (res == 0) {\r
+                               free(buf);\r
+                               return 0;\r
+                       }\r
+\r
+                       if (res == 1) {                                                         // there is (more) data to be transferred\r
+                               if (pckNum == 0) {                                              // first packet, (re)allocate necessary buffer\r
+                                       if (traceLen > bufsize) {\r
+                                               uint8_t *p;\r
+                                               if (buf == NULL)                                // not yet allocated\r
+                                                       p = malloc(traceLen);\r
+                                               else                                            // need more memory\r
+                                                       p = realloc(buf, traceLen);\r
+                                               \r
+                                               if (p == NULL) {\r
+                                                       PrintAndLog("Cannot allocate memory for trace");\r
+                                                       free(buf);\r
+                                                       return 2;\r
+                                               }\r
+                                               buf = p;\r
+                                       }\r
+                                       bufPtr = buf;\r
+                                       bufsize = traceLen;\r
+                                       memset(buf, 0x00, traceLen);\r
+                               }\r
+                               if (bufPtr == NULL) {\r
+                                       PrintAndLog("Cannot allocate memory for trace");\r
+                                       free(buf);\r
+                                       return 2;\r
+                               }\r
+                               // what happens if LEN is bigger then TRACELEN --iceman\r
+                               memcpy(bufPtr, resp.d.asBytes, len);\r
+                               bufPtr += len;\r
+                               pckNum++;\r
+                       }\r
+\r
+                       if (res == 2) {                                                         // received all data, start displaying\r
+                               blockLen = bufPtr - buf;\r
+                               bufPtr = buf;\r
+                               printf(">\n");\r
+                               PrintAndLog("received trace len: %d packages: %d", blockLen, pckNum);\r
+                               while (bufPtr - buf < blockLen) {\r
+                                       bufPtr += 6;                                            // skip (void) timing information\r
+                                       len = *((uint16_t *)bufPtr);\r
+                                       if(len & 0x8000) {\r
+                                               isTag = true;\r
+                                               len &= 0x7fff;\r
+                                       } else {\r
+                                               isTag = false;\r
+                                       }\r
+                                       bufPtr += 2;\r
+                                       if ((len == 17) && (bufPtr[0] == 0xff) && (bufPtr[1] == 0xff) && (bufPtr[15] == 0xff) && (bufPtr[16] == 0xff)) {\r
+                                               memcpy(uid, bufPtr + 2, 10);\r
+                                               memcpy(atqa, bufPtr + 2 + 10, 2);\r
+                                               switch (atqa[0] & 0xC0) {\r
+                                                       case 0x80: uid_len = 10; break;\r
+                                                       case 0x40: uid_len = 7; break;\r
+                                                       default:   uid_len = 4; break;\r
+                                               }\r
+                                               sak = bufPtr[14];\r
+                                               PrintAndLog("tag select uid| %s atqa:0x%02x%02x sak:0x%02x", \r
+                                                       sprint_hex(uid, uid_len),\r
+                                                       atqa[1], \r
+                                                       atqa[0], \r
+                                                       sak);\r
+                                               if (wantLogToFile || wantDecrypt) {\r
+                                                       FillFileNameByUID(logHexFileName, uid, ".log", uid_len);\r
+                                                       AddLogCurrentDT(logHexFileName);\r
+                                               }                                               \r
+                                               if (wantDecrypt)\r
+                                                       mfTraceInit(uid, uid_len, atqa, sak, wantSaveToEmlFile);\r
+                                       } else {\r
+                                               PrintAndLog("%03d| %s |%s", num, isTag ? "TAG" : "RDR", sprint_hex(bufPtr, len));\r
+                                               if (wantLogToFile) \r
+                                                       AddLogHex(logHexFileName, isTag ? "TAG| ":"RDR| ", bufPtr, len);\r
+                                               if (wantDecrypt) \r
+                                                       mfTraceDecode(bufPtr, len, wantSaveToEmlFile);\r
+                                               num++;  \r
+                                       }\r
+                                       bufPtr += len;\r
+                                       bufPtr += ((len-1)/8+1);        // ignore parity\r
+                               }\r
+                               pckNum = 0;\r
+                       }\r
+               } // resp not NULL\r
+       } // while (true)\r
+\r
+       free(buf);\r
+       return 0;\r
+}\r
+\r
+int CmdHF14AMfDbg(const char *Cmd) {\r
+\r
+       char ctmp = param_getchar(Cmd, 0);\r
+       if (strlen(Cmd) < 1  || ctmp == 'h'|| ctmp == 'H') return usage_hf14_dbg();\r
+       \r
+       uint8_t dbgMode = param_get8ex(Cmd, 0, 0, 10);\r
+       if (dbgMode > 4) return usage_hf14_dbg();\r
+\r
+       UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}};\r
+       SendCommand(&c);\r
+       return 0;\r
+}\r
+\r
+void printKeyTable( uint8_t sectorscnt, sector *e_sector ){\r
+       PrintAndLog("|---|----------------|---|----------------|---|");\r
+       PrintAndLog("|sec|key A           |res|key B           |res|");\r
+       PrintAndLog("|---|----------------|---|----------------|---|");\r
+       for (uint8_t i = 0; i < sectorscnt; ++i) {\r
+               PrintAndLog("|%03d|  %012"llx"  | %d |  %012"llx"  | %d |", i,\r
+                       e_sector[i].Key[0], e_sector[i].foundKey[0], \r
+                       e_sector[i].Key[1], e_sector[i].foundKey[1]\r
+               );\r
+       }\r
+       PrintAndLog("|---|----------------|---|----------------|---|");\r
+}\r
+\r
+// EMULATOR COMMANDS\r
+\r
+int CmdHF14AMfEGet(const char *Cmd)\r
+{\r
+       uint8_t blockNo = 0;\r
+       uint8_t data[16] = {0x00};\r
+\r
+       if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
+               PrintAndLog("Usage:  hf mf eget <block number>");\r
+               PrintAndLog(" sample: hf mf eget 0 ");\r
+               return 0;\r
+       }       \r
+       \r
+       blockNo = param_get8(Cmd, 0);\r
+\r
+       PrintAndLog(" ");\r
+       if (!mfEmlGetMem(data, blockNo, 1)) {\r
+               PrintAndLog("data[%3d]:%s", blockNo, sprint_hex(data, 16));\r
         } else {\r
                 PrintAndLog("Command execute timeout");\r
         }\r
         } else {\r
                 PrintAndLog("Command execute timeout");\r
         }\r
@@ -1137,12 +1604,11 @@ int CmdHF14AMfEClear(const char *Cmd)
                 return 0;\r
         }       \r
  \r
                 return 0;\r
         }       \r
  \r
-  UsbCommand c = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}};\r
-  SendCommand(&c);\r
-  return 0;\r
+       UsbCommand c = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}};\r
+       SendCommand(&c);\r
+       return 0;\r
  }\r
  \r
  }\r
  \r
-\r
  int CmdHF14AMfESet(const char *Cmd)\r
  {\r
         uint8_t memBlock[16];\r
  int CmdHF14AMfESet(const char *Cmd)\r
  {\r
         uint8_t memBlock[16];\r
@@ -1170,26 +1636,22 @@ int CmdHF14AMfESet(const char *Cmd)
         return 0;\r
  }\r
  \r
         return 0;\r
  }\r
  \r
-\r
  int CmdHF14AMfELoad(const char *Cmd)\r
  {\r
         FILE * f;\r
         char filename[FILE_PATH_SIZE];\r
         char *fnameptr = filename;\r
  int CmdHF14AMfELoad(const char *Cmd)\r
  {\r
         FILE * f;\r
         char filename[FILE_PATH_SIZE];\r
         char *fnameptr = filename;\r
-       char buf[64];\r
-       uint8_t buf8[64];\r
+       char buf[64] = {0x00};\r
+       uint8_t buf8[64] = {0x00};\r
         int i, len, blockNum, numBlocks;\r
         int nameParamNo = 1;\r
         int i, len, blockNum, numBlocks;\r
         int nameParamNo = 1;\r
-       \r
-       memset(filename, 0, sizeof(filename));\r
-       memset(buf, 0, sizeof(buf));\r
-\r
+       uint8_t blockWidth = 32;\r
         char ctmp = param_getchar(Cmd, 0);\r
                 \r
         char ctmp = param_getchar(Cmd, 0);\r
                 \r
-       if ( ctmp == 'h' || ctmp == 0x00) {\r
+       if ( ctmp == 'h' || ctmp == 'H' || ctmp == 0x00) {\r
                 PrintAndLog("It loads emul dump from the file `filename.eml`");\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
-               PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r
+               PrintAndLog("Usage:  hf mf eload [card memory] <file name w/o `.eml`> [numblocks]");\r
+               PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K, u = UL");\r
                 PrintAndLog("");\r
                 PrintAndLog(" sample: hf mf eload filename");\r
                 PrintAndLog("         hf mf eload 4 filename");\r
                 PrintAndLog("");\r
                 PrintAndLog(" sample: hf mf eload filename");\r
                 PrintAndLog("         hf mf eload 4 filename");\r
@@ -1202,15 +1664,19 @@ int CmdHF14AMfELoad(const char *Cmd)
                 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
+               case 'U' : // fall through\r
+               case 'u' : numBlocks = 255; blockWidth = 8; break;\r
                 default:  {\r
                         numBlocks = 16*4;\r
                         nameParamNo = 0;\r
                 }\r
         }\r
                 default:  {\r
                         numBlocks = 16*4;\r
                         nameParamNo = 0;\r
                 }\r
         }\r
+       uint32_t numblk2 = param_get32ex(Cmd,2,0,10);\r
+       if (numblk2 > 0) numBlocks = numblk2;   \r
  \r
         len = param_getstr(Cmd,nameParamNo,filename);\r
         \r
  \r
         len = param_getstr(Cmd,nameParamNo,filename);\r
         \r
-       if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;\r
+       if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
  \r
         fnameptr += len;\r
  \r
  \r
         fnameptr += len;\r
  \r
@@ -1236,28 +1702,29 @@ int CmdHF14AMfELoad(const char *Cmd)
                         return 2;\r
                 }\r
                 \r
                         return 2;\r
                 }\r
                 \r
-               if (strlen(buf) < 32){\r
+               if (strlen(buf) < blockWidth){\r
                         if(strlen(buf) && feof(f))\r
                                 break;\r
                         if(strlen(buf) && feof(f))\r
                                 break;\r
-                       PrintAndLog("File content error. Block data must include 32 HEX symbols");\r
+                       PrintAndLog("File content error. Block data must include %d HEX symbols", blockWidth);\r
                         fclose(f);\r
                         return 2;\r
                 }\r
                 \r
                         fclose(f);\r
                         return 2;\r
                 }\r
                 \r
-               for (i = 0; i < 32; i += 2) {\r
+               for (i = 0; i < blockWidth; i += 2) {\r
                         sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);\r
                 }\r
                         sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);\r
                 }\r
-               \r
-               if (mfEmlSetMem(buf8, blockNum, 1)) {\r
+               if (mfEmlSetMem_xt(buf8, blockNum, 1, blockWidth/2)) {\r
                         PrintAndLog("Cant set emul block: %3d", blockNum);\r
                         fclose(f);\r
                         return 3;\r
                 }\r
                         PrintAndLog("Cant set emul block: %3d", blockNum);\r
                         fclose(f);\r
                         return 3;\r
                 }\r
+               printf(".");\r
                 blockNum++;\r
                 \r
                 if (blockNum >= numBlocks) break;\r
         }\r
         fclose(f);\r
                 blockNum++;\r
                 \r
                 if (blockNum >= numBlocks) break;\r
         }\r
         fclose(f);\r
+       printf("\n");\r
         \r
         if ((blockNum != numBlocks)) {\r
                 PrintAndLog("File content error. Got %d must be %d blocks.",blockNum, numBlocks);\r
         \r
         if ((blockNum != numBlocks)) {\r
                 PrintAndLog("File content error. Got %d must be %d blocks.",blockNum, numBlocks);\r
@@ -1267,7 +1734,6 @@ int CmdHF14AMfELoad(const char *Cmd)
         return 0;\r
  }\r
  \r
         return 0;\r
  }\r
  \r
-\r
  int CmdHF14AMfESave(const char *Cmd)\r
  {\r
         FILE * f;\r
  int CmdHF14AMfESave(const char *Cmd)\r
  {\r
         FILE * f;\r
@@ -1282,8 +1748,8 @@ int CmdHF14AMfESave(const char *Cmd)
  \r
         char ctmp = param_getchar(Cmd, 0);\r
         \r
  \r
         char ctmp = param_getchar(Cmd, 0);\r
         \r
-       if ( ctmp == 'h') {\r
-               PrintAndLog("It saves emul dump into the file `filename.eml` or `cardID.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
                 PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r
                 PrintAndLog("");\r
                 PrintAndLog(" Usage:  hf mf esave [card memory] [file name w/o `.eml`]");\r
                 PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r
                 PrintAndLog("");\r
@@ -1292,7 +1758,7 @@ int CmdHF14AMfESave(const char *Cmd)
                 PrintAndLog("         hf mf esave 4 filename");\r
                 return 0;\r
         }       \r
                 PrintAndLog("         hf mf esave 4 filename");\r
                 return 0;\r
         }       \r
-       \r
+\r
         switch (ctmp) {\r
                 case '0' : numBlocks = 5*4; break;\r
                 case '1' : \r
         switch (ctmp) {\r
                 case '0' : numBlocks = 5*4; break;\r
                 case '1' : \r
@@ -1307,17 +1773,20 @@ int CmdHF14AMfESave(const char *Cmd)
  \r
         len = param_getstr(Cmd,nameParamNo,filename);\r
         \r
  \r
         len = param_getstr(Cmd,nameParamNo,filename);\r
         \r
-       if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;\r
+       if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
         \r
         // user supplied filename?\r
         if (len < 1) {\r
                 // get filename (UID from memory)\r
                 if (mfEmlGetMem(buf, 0, 1)) {\r
                         PrintAndLog("Can\'t get UID from block: %d", 0);\r
         \r
         // user supplied filename?\r
         if (len < 1) {\r
                 // get filename (UID from memory)\r
                 if (mfEmlGetMem(buf, 0, 1)) {\r
                         PrintAndLog("Can\'t get UID from block: %d", 0);\r
-                       sprintf(filename, "dump.eml"); \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
                 }\r
                 }\r
-               for (j = 0; j < 7; j++, fnameptr += 2)\r
-                       sprintf(fnameptr, "%02X", buf[j]); \r
         } else {\r
                 fnameptr += len;\r
         }\r
         } else {\r
                 fnameptr += len;\r
         }\r
@@ -1328,6 +1797,11 @@ int CmdHF14AMfESave(const char *Cmd)
         // open file\r
         f = fopen(filename, "w+");\r
  \r
         // open file\r
         f = fopen(filename, "w+");\r
  \r
+       if ( !f ) {\r
+               PrintAndLog("Can't open file %s ", filename);\r
+               return 1;\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
@@ -1345,7 +1819,6 @@ int CmdHF14AMfESave(const char *Cmd)
    return 0;\r
  }\r
  \r
    return 0;\r
  }\r
  \r
-\r
  int CmdHF14AMfECFill(const char *Cmd)\r
  {\r
         uint8_t keyType = 0;\r
  int CmdHF14AMfECFill(const char *Cmd)\r
  {\r
         uint8_t keyType = 0;\r
@@ -1385,15 +1858,16 @@ int CmdHF14AMfECFill(const char *Cmd)
         return 0;\r
  }\r
  \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
+       char cmdp = param_getchar(Cmd, 0);\r
         \r
         \r
-       if (param_getchar(Cmd, 0) == 'h') {\r
+       if ( cmdp == 'h' || cmdp == 'H' ) {\r
                 PrintAndLog("It prints the keys loaded in the emulator memory");\r
                 PrintAndLog("Usage:  hf mf ekeyprn [card memory]");\r
                 PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r
                 PrintAndLog("It prints the keys loaded in the emulator memory");\r
                 PrintAndLog("Usage:  hf mf ekeyprn [card memory]");\r
                 PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r
@@ -1402,8 +1876,6 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
                 return 0;\r
         }       \r
  \r
                 return 0;\r
         }       \r
  \r
-       char cmdp = param_getchar(Cmd, 0);\r
-       \r
         switch (cmdp) {\r
                 case '0' : numSectors = 5; break;\r
                 case '1' : \r
         switch (cmdp) {\r
                 case '0' : numSectors = 5; break;\r
                 case '1' : \r
@@ -1430,94 +1902,128 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
         return 0;\r
  }\r
  \r
         return 0;\r
  }\r
  \r
+// CHINESE MAGIC COMMANDS \r
  \r
  \r
-int CmdHF14AMfCSetUID(const char *Cmd)\r
-{\r
+int CmdHF14AMfCSetUID(const char *Cmd) {\r
         uint8_t wipeCard = 0;\r
         uint8_t uid[8] = {0x00};\r
         uint8_t oldUid[8] = {0x00};\r
         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 atqaPresent = 1;\r
         int res;\r
         int res;\r
+       char ctmp;\r
+       int argi=0;\r
  \r
  \r
-       if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
-               PrintAndLog("Usage:  hf mf csetuid <UID 8 hex symbols> <w>");\r
-               PrintAndLog("sample:  hf mf csetuid 01020304 w");\r
-               PrintAndLog("Set UID for magic Chinese card (only works with!!!)");\r
-               PrintAndLog("If you want wipe card then add 'w' into command line. \n");\r
+       if (strlen(Cmd) < 1 || param_getchar(Cmd, argi) == 'h') {\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
+               PrintAndLog("");\r
+               PrintAndLog("Usage:  hf mf csetuid <UID 8 hex symbols> [ATQA 4 hex symbols SAK 2 hex symbols] [w]");\r
+               PrintAndLog("");\r
+               PrintAndLog("sample:  hf mf csetuid 01020304");\r
+               PrintAndLog("         hf mf csetuid 01020304 0004 08 w");\r
                 return 0;\r
                 return 0;\r
-       }       \r
+       }\r
  \r
  \r
-       if (param_getchar(Cmd, 0) && param_gethex(Cmd, 0, uid, 8)) {\r
+       if (param_getchar(Cmd, argi) && param_gethex(Cmd, argi, 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
-       char ctmp = param_getchar(Cmd, 1);\r
-       if (ctmp == 'w' || ctmp == 'W') wipeCard = 1;\r
-       \r
-       PrintAndLog("--wipe card:%02x uid:%s", wipeCard, sprint_hex(uid, 4));\r
+       ctmp = param_getchar(Cmd, argi);\r
+       if (ctmp == 'w' || ctmp == 'W') {\r
+               wipeCard = 1;\r
+               atqaPresent = 0;\r
+       }\r
  \r
  \r
-       res = mfCSetUID(uid, oldUid, wipeCard);\r
-       if (res) {\r
-               PrintAndLog("Can't set UID. error=%d", res);\r
-               return 1;\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
+       }\r
+\r
+       if(!wipeCard) {\r
+               ctmp = param_getchar(Cmd, argi);\r
+               if (ctmp == 'w' || ctmp == 'W') {\r
+                       wipeCard = 1;\r
+               }\r
         }\r
         }\r
+\r
+       PrintAndLog("--wipe card:%s  uid:%s", (wipeCard)?"YES":"NO", sprint_hex(uid, 4));\r
+\r
+       res = mfCSetUID(uid, (atqaPresent) ? atqa : NULL, (atqaPresent) ? sak : NULL, oldUid, wipeCard);\r
+       if (res) {\r
+                       PrintAndLog("Can't set UID. error=%d", res);\r
+                       return 1;\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
         \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 CmdHF14AMfCSetBlk(const char *Cmd)\r
-{\r
-       uint8_t uid[8];\r
-       uint8_t memBlock[16];\r
+int CmdHF14AMfCSetBlk(const char *Cmd) {\r
+       uint8_t block[16] = {0x00};\r
         uint8_t blockNo = 0;\r
         uint8_t blockNo = 0;\r
+       uint8_t params = MAGIC_SINGLE;\r
         int res;\r
         int res;\r
-       memset(memBlock, 0x00, sizeof(memBlock));\r
  \r
         if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
  \r
         if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
-               PrintAndLog("Usage:  hf mf csetblk <block number> <block data (32 hex symbols)>");\r
+               PrintAndLog("Usage:  hf mf csetblk <block number> <block data (32 hex symbols)> [w]");\r
                 PrintAndLog("sample:  hf mf csetblk 1 01020304050607080910111213141516");\r
                 PrintAndLog("sample:  hf mf csetblk 1 01020304050607080910111213141516");\r
-               PrintAndLog("Set block data for magic Chinese card (only works with!!!)");\r
-               PrintAndLog("If you want wipe card then add 'w' into command line. \n");\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
         blockNo = param_get8(Cmd, 0);\r
  \r
                 return 0;\r
         }       \r
  \r
         blockNo = param_get8(Cmd, 0);\r
  \r
-       if (param_gethex(Cmd, 1, memBlock, 32)) {\r
+       if (param_gethex(Cmd, 1, block, 32)) {\r
                 PrintAndLog("block data must include 32 HEX symbols");\r
                 return 1;\r
         }\r
  \r
                 PrintAndLog("block data must include 32 HEX symbols");\r
                 return 1;\r
         }\r
  \r
-       PrintAndLog("--block number:%2d data:%s", blockNo, sprint_hex(memBlock, 16));\r
+       char ctmp = param_getchar(Cmd, 2);\r
+       if (ctmp == 'w' || ctmp == 'W')\r
+               params |= MAGIC_WIPE;\r
+       \r
+       PrintAndLog("--block number:%2d data:%s", blockNo, sprint_hex(block, 16));\r
  \r
  \r
-       res = mfCSetBlock(blockNo, memBlock, uid, 0, CSETBLOCK_SINGLE_OPER);\r
+       res = mfCSetBlock(blockNo, block, NULL, params);\r
         if (res) {\r
         if (res) {\r
-                       PrintAndLog("Can't write block. error=%d", res);\r
-                       return 1;\r
-               }\r
-       \r
-       PrintAndLog("UID:%s", sprint_hex(uid, 4));\r
+               PrintAndLog("Can't write block. error=%d", res);\r
+               return 1;\r
+       }\r
         return 0;\r
  }\r
  \r
         return 0;\r
  }\r
  \r
-\r
-int CmdHF14AMfCLoad(const char *Cmd)\r
-{\r
+int CmdHF14AMfCLoad(const char *Cmd) {\r
         FILE * f;\r
         char filename[FILE_PATH_SIZE];\r
         char * fnameptr = filename;\r
         FILE * f;\r
         char filename[FILE_PATH_SIZE];\r
         char * fnameptr = filename;\r
-       char buf[64];\r
-       uint8_t buf8[64];\r
+       char buf[64] = {0x00};\r
+       uint8_t buf8[64] = {0x00};\r
         uint8_t fillFromEmulator = 0;\r
         uint8_t fillFromEmulator = 0;\r
-       int i, len, blockNum, flags;\r
-       \r
-       memset(filename, 0, sizeof(filename));\r
-       memset(buf, 0, sizeof(buf));\r
+       int i, len, blockNum, flags=0;\r
  \r
  \r
-       if (param_getchar(Cmd, 0) == 'h' || param_getchar(Cmd, 0)== 0x00) {\r
-               PrintAndLog("It loads magic Chinese card (only works with!!!) from the file `filename.eml`");\r
+       memset(filename, 0, sizeof(filename));\r
+       \r
+       char ctmp = param_getchar(Cmd, 0);\r
+       \r
+       if (ctmp == 'h' || ctmp == 'H' || ctmp == 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("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
@@ -1525,21 +2031,19 @@ int CmdHF14AMfCLoad(const char *Cmd)
                 return 0;\r
         }       \r
  \r
                 return 0;\r
         }       \r
  \r
-       char ctmp = param_getchar(Cmd, 0);\r
         if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;\r
         \r
         if (fillFromEmulator) {\r
         if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;\r
         \r
         if (fillFromEmulator) {\r
-               flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r
                 for (blockNum = 0; blockNum < 16 * 4; blockNum += 1) {\r
                         if (mfEmlGetMem(buf8, blockNum, 1)) {\r
                                 PrintAndLog("Cant get block: %d", blockNum);\r
                                 return 2;\r
                         }\r
                 for (blockNum = 0; blockNum < 16 * 4; blockNum += 1) {\r
                         if (mfEmlGetMem(buf8, blockNum, 1)) {\r
                                 PrintAndLog("Cant get block: %d", blockNum);\r
                                 return 2;\r
                         }\r
-                       \r
-                       if (blockNum == 2) flags = 0;\r
-                       if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r
+                       if (blockNum == 0) flags = MAGIC_INIT + MAGIC_WUPC;                             // switch on field and send magic sequence\r
+                       if (blockNum == 1) flags = 0;                                                                                                   // just write\r
+                       if (blockNum == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;             // Done. Magic Halt and switch off field.\r
  \r
  \r
-                       if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {\r
+                       if (mfCSetBlock(blockNum, buf8, NULL, flags)) {\r
                                 PrintAndLog("Cant set magic card block: %d", blockNum);\r
                                 return 3;\r
                         }\r
                                 PrintAndLog("Cant set magic card block: %d", blockNum);\r
                                 return 3;\r
                         }\r
@@ -1547,7 +2051,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
                 return 0;\r
         } else {\r
                 len = strlen(Cmd);\r
                 return 0;\r
         } else {\r
                 len = strlen(Cmd);\r
-               if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;\r
+               if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
  \r
                 memcpy(filename, Cmd, len);\r
                 fnameptr += len;\r
  \r
                 memcpy(filename, Cmd, len);\r
                 fnameptr += len;\r
@@ -1562,28 +2066,33 @@ int CmdHF14AMfCLoad(const char *Cmd)
                 }\r
         \r
                 blockNum = 0;\r
                 }\r
         \r
                 blockNum = 0;\r
-               flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r
                 while(!feof(f)){\r
                 while(!feof(f)){\r
+               \r
                         memset(buf, 0, sizeof(buf));\r
                         memset(buf, 0, sizeof(buf));\r
+                       \r
                         if (fgets(buf, sizeof(buf), f) == NULL) {\r
                         if (fgets(buf, sizeof(buf), f) == NULL) {\r
+                               fclose(f);\r
                                 PrintAndLog("File reading error.");\r
                                 return 2;\r
                         }\r
  \r
                                 PrintAndLog("File reading error.");\r
                                 return 2;\r
                         }\r
  \r
-                       if (strlen(buf) < 32){\r
+                       if (strlen(buf) < 32) {\r
                                 if(strlen(buf) && feof(f))\r
                                         break;\r
                                 PrintAndLog("File content error. Block data must include 32 HEX symbols");\r
                                 if(strlen(buf) && feof(f))\r
                                         break;\r
                                 PrintAndLog("File content error. Block data must include 32 HEX symbols");\r
+                               fclose(f);\r
                                 return 2;\r
                         }\r
                         for (i = 0; i < 32; i += 2)\r
                                 sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);\r
  \r
                                 return 2;\r
                         }\r
                         for (i = 0; i < 32; i += 2)\r
                                 sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);\r
  \r
-                       if (blockNum == 2) flags = 0;\r
-                       if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r
+                       if (blockNum == 0) flags = MAGIC_INIT + MAGIC_WUPC;                             // switch on field and send magic sequence\r
+                       if (blockNum == 1) flags = 0;                                                                                                   // just write\r
+                       if (blockNum == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;             // Done. Switch off field.\r
  \r
  \r
-                       if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {\r
+                       if (mfCSetBlock(blockNum, buf8, NULL, flags)) {\r
                                 PrintAndLog("Can't set magic card block: %d", blockNum);\r
                                 PrintAndLog("Can't set magic card block: %d", blockNum);\r
+                               fclose(f);\r
                                 return 3;\r
                         }\r
                         blockNum++;\r
                                 return 3;\r
                         }\r
                         blockNum++;\r
@@ -1592,6 +2101,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
                 }\r
                 fclose(f);\r
         \r
                 }\r
                 fclose(f);\r
         \r
+               // 64 or 256blocks.\r
                 if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){\r
                         PrintAndLog("File content error. There must be 64 blocks");\r
                         return 4;\r
                 if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){\r
                         PrintAndLog("File content error. There must be 64 blocks");\r
                         return 4;\r
@@ -1599,18 +2109,20 @@ int CmdHF14AMfCLoad(const char *Cmd)
                 PrintAndLog("Loaded from file: %s", filename);\r
                 return 0;\r
         }\r
                 PrintAndLog("Loaded from file: %s", filename);\r
                 return 0;\r
         }\r
+       return 0;\r
  }\r
  \r
  int CmdHF14AMfCGetBlk(const char *Cmd) {\r
  }\r
  \r
  int CmdHF14AMfCGetBlk(const char *Cmd) {\r
-       uint8_t memBlock[16];\r
+       uint8_t data[16];\r
         uint8_t blockNo = 0;\r
         int res;\r
         uint8_t blockNo = 0;\r
         int res;\r
-       memset(memBlock, 0x00, sizeof(memBlock));\r
+       memset(data, 0x00, sizeof(data));\r
+       char ctmp = param_getchar(Cmd, 0);\r
  \r
  \r
-       if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
+       if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') {\r
                 PrintAndLog("Usage:  hf mf cgetblk <block number>");\r
                 PrintAndLog("sample:  hf mf cgetblk 1");\r
                 PrintAndLog("Usage:  hf mf cgetblk <block number>");\r
                 PrintAndLog("sample:  hf mf cgetblk 1");\r
-               PrintAndLog("Get block data from magic Chinese card (only works with!!!)\n");\r
+               PrintAndLog("Get block data from magic Chinese card (only works with such cards)\n");\r
                 return 0;\r
         }       \r
  \r
                 return 0;\r
         }       \r
  \r
@@ -1618,27 +2130,27 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
  \r
         PrintAndLog("--block number:%2d ", blockNo);\r
  \r
  \r
         PrintAndLog("--block number:%2d ", blockNo);\r
  \r
-       res = mfCGetBlock(blockNo, memBlock, CSETBLOCK_SINGLE_OPER);\r
+       res = mfCGetBlock(blockNo, data, MAGIC_SINGLE);\r
         if (res) {\r
         if (res) {\r
-                       PrintAndLog("Can't read block. error=%d", res);\r
-                       return 1;\r
-               }\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
+       PrintAndLog("data: %s", sprint_hex(data, sizeof(data)));\r
         return 0;\r
  }\r
  \r
         return 0;\r
  }\r
  \r
-\r
  int CmdHF14AMfCGetSc(const char *Cmd) {\r
  int CmdHF14AMfCGetSc(const char *Cmd) {\r
-       uint8_t memBlock[16];\r
+       uint8_t data[16];\r
         uint8_t sectorNo = 0;\r
         int i, res, flags;\r
         uint8_t sectorNo = 0;\r
         int i, res, flags;\r
-       memset(memBlock, 0x00, sizeof(memBlock));\r
-\r
-       if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
+       memset(data, 0x00, sizeof(data));\r
+       char ctmp = param_getchar(Cmd, 0);\r
+       \r
+       if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') {\r
                 PrintAndLog("Usage:  hf mf cgetsc <sector number>");\r
                 PrintAndLog("sample:  hf mf cgetsc 0");\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!!!)\n");\r
+               PrintAndLog("Get sector data from magic Chinese card (only works with such cards)\n");\r
                 return 0;\r
         }       \r
  \r
                 return 0;\r
         }       \r
  \r
@@ -1649,24 +2161,23 @@ int CmdHF14AMfCGetSc(const char *Cmd) {
         }\r
  \r
         PrintAndLog("--sector number:%d ", sectorNo);\r
         }\r
  \r
         PrintAndLog("--sector number:%d ", sectorNo);\r
+       PrintAndLog("block | data");\r
  \r
  \r
-       flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r
+       flags = MAGIC_INIT + MAGIC_WUPC;\r
         for (i = 0; i < 4; i++) {\r
                 if (i == 1) flags = 0;\r
         for (i = 0; i < 4; i++) {\r
                 if (i == 1) flags = 0;\r
-               if (i == 3) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r
+               if (i == 3) flags = MAGIC_HALT + MAGIC_OFF;\r
  \r
  \r
-               res = mfCGetBlock(sectorNo * 4 + i, memBlock, flags);\r
+               res = mfCGetBlock(sectorNo * 4 + i, data, flags);\r
                 if (res) {\r
                         PrintAndLog("Can't read block. %d error=%d", sectorNo * 4 + i, res);\r
                         return 1;\r
                 if (res) {\r
                         PrintAndLog("Can't read block. %d error=%d", sectorNo * 4 + i, res);\r
                         return 1;\r
-               }\r
-       \r
-               PrintAndLog("block %3d data:%s", sectorNo * 4 + i, sprint_hex(memBlock, 16));\r
+               }       \r
+               PrintAndLog(" %3d | %s", sectorNo * 4 + i, sprint_hex(data, sizeof(data)));\r
         }\r
         return 0;\r
  }\r
  \r
         }\r
         return 0;\r
  }\r
  \r
-\r
  int CmdHF14AMfCSave(const char *Cmd) {\r
  \r
         FILE * f;\r
  int CmdHF14AMfCSave(const char *Cmd) {\r
  \r
         FILE * f;\r
@@ -1678,8 +2189,9 @@ int CmdHF14AMfCSave(const char *Cmd) {
         \r
         memset(filename, 0, sizeof(filename));\r
         memset(buf, 0, sizeof(buf));\r
         \r
         memset(filename, 0, sizeof(filename));\r
         memset(buf, 0, sizeof(buf));\r
-\r
-       if (param_getchar(Cmd, 0) == 'h') {\r
+       char ctmp = param_getchar(Cmd, 0);\r
+       \r
+       if ( ctmp == 'h' || ctmp == '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("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
@@ -1688,16 +2200,14 @@ int CmdHF14AMfCSave(const char *Cmd) {
                 PrintAndLog("         hf mf esave e \n");\r
                 return 0;\r
         }       \r
                 PrintAndLog("         hf mf esave e \n");\r
                 return 0;\r
         }       \r
-\r
-       char ctmp = param_getchar(Cmd, 0);\r
         if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;\r
  \r
         if (fillFromEmulator) {\r
                 // put into emulator\r
         if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;\r
  \r
         if (fillFromEmulator) {\r
                 // put into emulator\r
-               flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r
+               flags = MAGIC_INIT + MAGIC_WUPC;\r
                 for (i = 0; i < 16 * 4; i++) {\r
                         if (i == 1) flags = 0;\r
                 for (i = 0; i < 16 * 4; i++) {\r
                         if (i == 1) flags = 0;\r
-                       if (i == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r
+                       if (i == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;\r
                 \r
                         if (mfCGetBlock(i, buf, flags)) {\r
                                 PrintAndLog("Cant get block: %d", i);\r
                 \r
                         if (mfCGetBlock(i, buf, flags)) {\r
                                 PrintAndLog("Cant get block: %d", i);\r
@@ -1712,31 +2222,40 @@ int CmdHF14AMfCSave(const char *Cmd) {
                 return 0;\r
         } else {\r
                 len = strlen(Cmd);\r
                 return 0;\r
         } else {\r
                 len = strlen(Cmd);\r
-               if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;\r
+               if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
         \r
         \r
+               // get filename based on UID\r
                 if (len < 1) {\r
                 if (len < 1) {\r
-                       // get filename\r
-                       if (mfCGetBlock(0, buf, CSETBLOCK_SINGLE_OPER)) {\r
+               \r
+                       if (mfCGetBlock(0, buf, MAGIC_SINGLE)) {\r
                                 PrintAndLog("Cant get block: %d", 0);\r
                                 PrintAndLog("Cant get block: %d", 0);\r
-                               return 1;\r
+                               len = sprintf(fnameptr, "dump");\r
+                               fnameptr += len;\r
+                       } else {\r
+                               for (j = 0; j < 7; j++, fnameptr += 2)\r
+                                       sprintf(fnameptr, "%02x", buf[j]); \r
                         }\r
                         }\r
-                       for (j = 0; j < 7; j++, fnameptr += 2)\r
-                               sprintf(fnameptr, "%02x", buf[j]); \r
                 } else {\r
                         memcpy(filename, Cmd, len);\r
                         fnameptr += len;\r
                 }\r
  \r
                 } else {\r
                         memcpy(filename, Cmd, len);\r
                         fnameptr += len;\r
                 }\r
  \r
+               // add .eml extension\r
                 sprintf(fnameptr, ".eml"); \r
         \r
                 // open file\r
                 f = fopen(filename, "w+");\r
  \r
                 sprintf(fnameptr, ".eml"); \r
         \r
                 // open file\r
                 f = fopen(filename, "w+");\r
  \r
+               if (f == NULL) {\r
+                       PrintAndLog("File not found or locked.");\r
+                       return 1;\r
+               }\r
+\r
                 // put hex\r
                 // put hex\r
-               flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r
+               flags = MAGIC_INIT + MAGIC_WUPC;\r
                 for (i = 0; i < 16 * 4; i++) {\r
                         if (i == 1) flags = 0;\r
                 for (i = 0; i < 16 * 4; i++) {\r
                         if (i == 1) flags = 0;\r
-                       if (i == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r
+                       if (i == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;\r
                 \r
                         if (mfCGetBlock(i, buf, flags)) {\r
                                 PrintAndLog("Cant get block: %d", i);\r
                 \r
                         if (mfCGetBlock(i, buf, flags)) {\r
                                 PrintAndLog("Cant get block: %d", i);\r
@@ -1746,282 +2265,70 @@ int CmdHF14AMfCSave(const char *Cmd) {
                                 fprintf(f, "%02x", buf[j]); \r
                         fprintf(f,"\n");\r
                 }\r
                                 fprintf(f, "%02x", buf[j]); \r
                         fprintf(f,"\n");\r
                 }\r
+               fflush(f);\r
                 fclose(f);\r
                 fclose(f);\r
-       \r
                 PrintAndLog("Saved to file: %s", filename);\r
                 PrintAndLog("Saved to file: %s", filename);\r
-       \r
                 return 0;\r
         }\r
  }\r
  \r
                 return 0;\r
         }\r
  }\r
  \r
+//needs nt, ar, at, Data to decrypt\r
+int CmdHf14MfDecryptBytes(const char *Cmd){\r
+       uint8_t data[50];\r
+       uint32_t nt     = param_get32ex(Cmd,0,0,16);\r
+       uint32_t ar_enc = param_get32ex(Cmd,1,0,16);\r
+       uint32_t at_enc = param_get32ex(Cmd,2,0,16);\r
  \r
  \r
-int CmdHF14AMfSniff(const char *Cmd){\r
-\r
-       bool wantLogToFile = 0;\r
-       bool wantDecrypt = 0;\r
-       //bool wantSaveToEml = 0; TODO\r
-       bool wantSaveToEmlFile = 0;\r
-\r
-       //var \r
-       int res = 0;\r
         int len = 0;\r
         int len = 0;\r
-       int blockLen = 0;\r
-       int num = 0;\r
-       int pckNum = 0;\r
-       uint8_t uid[7];\r
-       uint8_t uid_len;\r
-       uint8_t atqa[2];\r
-       uint8_t sak;\r
-       bool isTag;\r
-       uint8_t buf[3000];\r
-       uint8_t * bufPtr = buf;\r
-       memset(buf, 0x00, 3000);\r
+       param_gethex_ex(Cmd, 3, data, &len);\r
         \r
         \r
-       if (param_getchar(Cmd, 0) == 'h') {\r
-               PrintAndLog("It continuously gets data from the field and saves it to: log, emulator, emulator file.");\r
-               PrintAndLog("You can specify:");\r
-               PrintAndLog("    l - save encrypted sequence to logfile `uid.log`");\r
-               PrintAndLog("    d - decrypt sequence and put it to log file `uid.log`");\r
-               PrintAndLog(" n/a   e - decrypt sequence, collect read and write commands and save the result of the sequence to emulator memory");\r
-               PrintAndLog("    f - decrypt sequence, collect read and write commands and save the result of the sequence to emulator dump file `uid.eml`");\r
-               PrintAndLog("Usage:  hf mf sniff [l][d][e][f]");\r
-               PrintAndLog("  sample: hf mf sniff l d e");\r
-               return 0;\r
-       }       \r
+       len /= 2;       \r
+       int limit = sizeof(data) / 2;\r
         \r
         \r
-       for (int i = 0; i < 4; i++) {\r
-               char ctmp = param_getchar(Cmd, i);\r
-               if (ctmp == 'l' || ctmp == 'L') wantLogToFile = true;\r
-               if (ctmp == 'd' || ctmp == 'D') wantDecrypt = true;\r
-               //if (ctmp == 'e' || ctmp == 'E') wantSaveToEml = true; TODO\r
-               if (ctmp == 'f' || ctmp == 'F') wantSaveToEmlFile = true;\r
-       }\r
+       if ( len >= limit )\r
+               len = limit;\r
         \r
         \r
-       printf("-------------------------------------------------------------------------\n");\r
-       printf("Executing command. \n");\r
-       printf("Press the key on the proxmark3 device to abort both proxmark3 and client.\n");\r
-       printf("Press the key on pc keyboard to abort the client.\n");\r
-       printf("-------------------------------------------------------------------------\n");\r
-\r
-       UsbCommand c = {CMD_MIFARE_SNIFFER, {0, 0, 0}};\r
-       clearCommandBuffer();\r
-       SendCommand(&c);\r
-\r
-       // wait cycle\r
-       while (true) {\r
-               printf(".");\r
-               fflush(stdout);\r
-               if (ukbhit()) {\r
-                       getchar();\r
-                       printf("\naborted via keyboard!\n");\r
-                       break;\r
-               }\r
-               \r
-    UsbCommand resp;\r
-    if (WaitForResponseTimeout(CMD_ACK,&resp,2000)) {\r
-                       res = resp.arg[0] & 0xff;\r
-                       len = resp.arg[1];\r
-                       num = resp.arg[2];\r
-                       \r
-                       if (res == 0) return 0;\r
-                       if (res == 1) {\r
-                               if (num ==0) {\r
-                                       bufPtr = buf;\r
-                                       memset(buf, 0x00, 3000);\r
-                               }\r
-                               memcpy(bufPtr, resp.d.asBytes, len);\r
-                               bufPtr += len;\r
-                               pckNum++;\r
-                       }\r
-                       if (res == 2) {\r
-                               blockLen = bufPtr - buf;\r
-                               bufPtr = buf;\r
-                               printf(">\n");\r
-                               PrintAndLog("received trace len: %d packages: %d", blockLen, pckNum);\r
-                               num = 0;\r
-                               while (bufPtr - buf < blockLen) {\r
-                                       bufPtr += 6;\r
-                                       len = *((uint16_t *)bufPtr);\r
-\r
-                                       if(len & 0x8000) {\r
-                                               isTag = true;\r
-                                               len &= 0x7fff;\r
-                                       } else {\r
-                                               isTag = false;\r
-                                       }\r
-                                       bufPtr += 2;\r
-                                       if ((len == 14) && (bufPtr[0] == 0xff) && (bufPtr[1] == 0xff) && (bufPtr[12] == 0xff) && (bufPtr[13] == 0xff)) {\r
-                                       \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
-                                               \r
-                                               PrintAndLog("tag select uid:%s atqa:0x%02x%02x sak:0x%02x", \r
-                                                       sprint_hex(uid + (7 - uid_len), uid_len),\r
-                                                       atqa[1], \r
-                                                       atqa[0], \r
-                                                       sak);\r
-                                               if (wantLogToFile || wantDecrypt) {\r
-                                                       FillFileNameByUID(logHexFileName, uid + (7 - uid_len), ".log", uid_len);\r
-                                                       AddLogCurrentDT(logHexFileName);\r
-                                               }                                               \r
-                                               if (wantDecrypt) \r
-                                                       mfTraceInit(uid, atqa, sak, wantSaveToEmlFile);\r
-                                       } else {\r
-                                               PrintAndLog("%s(%d):%s", isTag ? "TAG":"RDR", num, sprint_hex(bufPtr, len));\r
-                                               if (wantLogToFile) \r
-                                                       AddLogHex(logHexFileName, isTag ? "TAG: ":"RDR: ", bufPtr, len);\r
-                                               if (wantDecrypt) \r
-                                                       mfTraceDecode(bufPtr, len, wantSaveToEmlFile);\r
-                                       }\r
-                                       bufPtr += len;\r
-                                       bufPtr += ((len-1)/8+1); // ignore parity\r
-                                       num++;\r
-                               }\r
-                       }\r
-               } // resp not NULL\r
-       } // while (true)\r
-       \r
-       return 0;\r
+       return tryDecryptWord( nt, ar_enc, at_enc, data, len);\r
  }\r
  \r
  }\r
  \r
-// Tries to identify cardsize.\r
-// Returns <num>  where num is:\r
-// -1  unidentified\r
-//  0 - MINI (320bytes)\r
-//  1 - 1K\r
-//  2 - 2K\r
-//  4 - 4K\r
-int GetCardSize()\r
-{\r
-       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};\r
-       SendCommand(&c);\r
-\r
-       UsbCommand resp;\r
-       WaitForResponse(CMD_ACK,&resp);\r
-\r
-       if(resp.arg[0] == 0) {\r
-               PrintAndLog("iso14443a card select failed");\r
-               return -1;\r
-       }\r
-       \r
-       iso14a_card_select_t *card = (iso14a_card_select_t *)resp.d.asBytes;\r
-\r
-       PrintAndLog("Trying to detect card size.");\r
-       \r
-       uint16_t atqa = 0;\r
-       uint8_t sak = 0;\r
-       atqa = (card->atqa[1] & 0xff) << 8;\r
-    atqa += card->atqa[0] & 0xff;\r
-       sak = card->sak;\r
-       \r
-       // https://code.google.com/p/libnfc/source/browse/libnfc/target-subr.c\r
-       \r
-       PrintAndLog("found ATAQ: %04X SAK: %02X", atqa, sak);\r
-       \r
-       \r
-       // NXP MIFARE Mini 0.3k\r
-       if ( ( (atqa & 0xff0f) == 0x0004) && (sak == 0x09) ) return 0;\r
-       \r
-       // MIFARE Classic 1K\r
-       if ( ((atqa & 0xff0f) == 0x0004) && (sak == 0x08) ) return 1;\r
-       \r
-       // MIFARE Classik 4K\r
-       if ( ((atqa & 0xff0f) == 0x0002) && (sak == 0x18) ) return 4;\r
-       \r
-       // SmartMX with MIFARE 1K emulation \r
-       if ( ((atqa & 0xf0ff) == 0x0004) ) return 1;\r
-\r
-       // SmartMX with MIFARE 4K emulation \r
-       if ( ((atqa & 0xf0ff) == 0x0002) ) return 4;    \r
-       \r
-       // Infineon MIFARE CLASSIC 1K\r
-       if ( ((atqa & 0xffff) == 0x0004) && (sak == 0x88) ) return 1;\r
-       \r
-       // MFC 4K emulated by Nokia 6212 Classic\r
-       if ( ((atqa & 0xffff) == 0x0002) && (sak == 0x38) ) return 4;\r
-\r
-       // MFC 4K emulated by Nokia 6131 NFC\r
-       if ( ((atqa & 0xffff) == 0x0008) && (sak == 0x38) ) return 4;\r
-\r
-       \r
-       PrintAndLog("BEFOOO  1K %02X",  (atqa & 0xff0f));\r
-       \r
-       // MIFARE Plus (4 Byte UID or 4 Byte RID)\r
-       // MIFARE Plus (7 Byte UID)\r
-       if (\r
-                       ((atqa & 0xffff) == 0x0002) |\r
-                       ((atqa & 0xffff) == 0x0004) |\r
-                       ((atqa & 0xffff) == 0x0042) |   \r
-                       ((atqa & 0xffff) == 0x0044) \r
-               )\r
-       {\r
-               switch(sak){\r
-                       case 0x08:\r
-                       case 0x10: {\r
-                       //case 0x20:\r
-                               PrintAndLog("2");\r
-                               return 2;\r
-                               break;\r
-                               }\r
-                       case 0x11:\r
-                       case 0x18:{\r
-                       //case 0x20:\r
-                               PrintAndLog("4");\r
-                               return 4;\r
-                               break;\r
-                               }\r
-               }\r
-       }\r
-       \r
-       return -1;\r
-}\r
-\r
-static command_t CommandTable[] =\r
-{\r
-  {"help",             CmdHelp,                                1, "This help"},\r
-  {"dbg",              CmdHF14AMfDbg,                  0, "Set default debug mode"},\r
-  {"rdbl",             CmdHF14AMfRdBl,                 0, "Read MIFARE classic block"},\r
-  //{"urdbl",              CmdHF14AMfURdBl,                 0, "Read MIFARE Ultralight block"},\r
-  //{"urdcard",           CmdHF14AMfURdCard,               0,"Read MIFARE Ultralight Card"},\r
-  //{"uwrbl",          CmdHF14AMfUWrBl,                0,"Write MIFARE Ultralight block"},\r
-  {"rdsc",             CmdHF14AMfRdSc,                 0, "Read MIFARE classic sector"},\r
-  {"dump",             CmdHF14AMfDump,                 0, "Dump MIFARE classic tag to binary file"},\r
-  {"restore",  CmdHF14AMfRestore,              0, "Restore MIFARE classic binary file to BLANK tag"},\r
-  {"wrbl",             CmdHF14AMfWrBl,                 0, "Write MIFARE classic block"},\r
-  {"chk",              CmdHF14AMfChk,                  0, "Test block keys"},\r
-  {"mifare",   CmdHF14AMifare,                 0, "Read parity error messages."},\r
-  {"nested",   CmdHF14AMfNested,               0, "Test nested authentication"},\r
-  {"sniff",            CmdHF14AMfSniff,                0, "Sniff card-reader communication"},\r
-  {"sim",              CmdHF14AMf1kSim,                0, "Simulate MIFARE card"},\r
-  {"eclr",             CmdHF14AMfEClear,               0, "Clear simulator memory block"},\r
-  {"eget",             CmdHF14AMfEGet,                 0, "Get simulator memory block"},\r
-  {"eset",             CmdHF14AMfESet,                 0, "Set simulator memory block"},\r
-  {"eload",            CmdHF14AMfELoad,                0, "Load from file emul dump"},\r
-  {"esave",            CmdHF14AMfESave,                0, "Save to file emul dump"},\r
-  {"ecfill",   CmdHF14AMfECFill,               0, "Fill simulator memory with help of keys from simulator"},\r
-  {"ekeyprn",  CmdHF14AMfEKeyPrn,              0, "Print keys from simulator memory"},\r
-  {"csetuid",  CmdHF14AMfCSetUID,              0, "Set UID for magic Chinese card"},\r
-  {"csetblk",  CmdHF14AMfCSetBlk,              0, "Write block into magic Chinese card"},\r
-  {"cgetblk",  CmdHF14AMfCGetBlk,              0, "Read block from magic Chinese card"},\r
-  {"cgetsc",   CmdHF14AMfCGetSc,               0, "Read sector from magic Chinese card"},\r
-  {"cload",            CmdHF14AMfCLoad,                0, "Load dump into magic Chinese card"},\r
-  {"csave",            CmdHF14AMfCSave,                0, "Save dump from magic Chinese card into file or emulator"},\r
-  {NULL, NULL, 0, NULL}\r
+static command_t CommandTable[] = {\r
+       {"help",                CmdHelp,                                1, "This help"},\r
+       {"dbg",                 CmdHF14AMfDbg,                  0, "Set default debug mode"},\r
+       {"rdbl",                CmdHF14AMfRdBl,                 0, "Read MIFARE classic block"},\r
+       {"rdsc",                CmdHF14AMfRdSc,                 0, "Read MIFARE classic sector"},\r
+       {"dump",                CmdHF14AMfDump,                 0, "Dump MIFARE classic tag to binary file"},\r
+       {"restore",             CmdHF14AMfRestore,              0, "Restore MIFARE classic binary file to BLANK tag"},\r
+       {"wrbl",                CmdHF14AMfWrBl,                 0, "Write MIFARE classic block"},\r
+       {"chk",                 CmdHF14AMfChk,                  0, "Test block keys"},\r
+       {"mifare",              CmdHF14AMifare,                 0, "Read parity error messages."},\r
+       {"nested",              CmdHF14AMfNested,               0, "Test nested authentication"},\r
+       {"hardnested",  CmdHF14AMfNestedHard,   0, "Nested attack for hardened Mifare cards"},\r
+       {"sniff",               CmdHF14AMfSniff,                0, "Sniff card-reader communication"},\r
+       {"sim",                 CmdHF14AMf1kSim,                0, "Simulate MIFARE card"},\r
+       {"eclr",                CmdHF14AMfEClear,               0, "Clear simulator memory block"},\r
+       {"eget",                CmdHF14AMfEGet,                 0, "Get simulator memory block"},\r
+       {"eset",                CmdHF14AMfESet,                 0, "Set simulator memory block"},\r
+       {"eload",               CmdHF14AMfELoad,                0, "Load from file emul dump"},\r
+       {"esave",               CmdHF14AMfESave,                0, "Save to file emul dump"},\r
+       {"ecfill",              CmdHF14AMfECFill,               0, "Fill simulator memory with help of keys from simulator"},\r
+       {"ekeyprn",             CmdHF14AMfEKeyPrn,              0, "Print keys from simulator memory"},\r
+       {"csetuid",             CmdHF14AMfCSetUID,              0, "Set UID for magic Chinese card"},\r
+       {"csetblk",             CmdHF14AMfCSetBlk,              0, "Write block - Magic Chinese card"},\r
+       {"cgetblk",             CmdHF14AMfCGetBlk,              0, "Read block - Magic Chinese card"},\r
+       {"cgetsc",              CmdHF14AMfCGetSc,               0, "Read sector - Magic Chinese card"},\r
+       {"cload",               CmdHF14AMfCLoad,                0, "Load dump into magic Chinese card"},\r
+       {"csave",               CmdHF14AMfCSave,                0, "Save dump from magic Chinese card into file or emulator"},\r
+       {"decrypt",             CmdHf14MfDecryptBytes,  1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"},\r
+       {NULL, NULL, 0, NULL}\r
  };\r
  \r
  };\r
  \r
-int CmdHFMF(const char *Cmd)\r
-{\r
-       // flush\r
-       WaitForResponseTimeout(CMD_ACK,NULL,100);\r
-\r
-  CmdsParse(CommandTable, Cmd);\r
-  return 0;\r
+int CmdHFMF(const char *Cmd) {\r
+       clearCommandBuffer();\r
+       CmdsParse(CommandTable, Cmd);\r
+       return 0;\r
  }\r
  \r
  }\r
  \r
-int CmdHelp(const char *Cmd)\r
-{\r
-  CmdsHelp(CommandTable);\r
-  return 0;\r
+int CmdHelp(const char *Cmd) {\r
+       CmdsHelp(CommandTable);\r
+       return 0;\r
  }\r
  }\r