]> cvs.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhfmf.c
Provide option -m for markdown help dump, -h for text dump
[proxmark3-svn] / client / cmdhfmf.c
index 9928cb1b899de4f42ff1e7a8e210d78b87eb3e49..a26652566e812d353a6a1f739ed4a296902561f6 100644 (file)
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------------\r
-// Copyright (C) 2011 Merlok\r
+// Copyright (C) 2011,2012 Merlok\r
 //\r
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,\r
 // at your option, any later version. See the LICENSE.txt file for the text of\r
@@ -9,41 +9,37 @@
 //-----------------------------------------------------------------------------\r
 \r
 #include "cmdhfmf.h"\r
-#include "proxmark3.h"\r
 \r
 static int CmdHelp(const char *Cmd);\r
 \r
 int CmdHF14AMifare(const char *Cmd)\r
 {\r
        uint32_t uid = 0;\r
-       uint32_t nt = 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[6] = {0,0,0,0,0,0};\r
+       uint8_t keyBlock[8] = {0};\r
 \r
-       if (param_getchar(Cmd, 0) && param_gethex(Cmd, 0, keyBlock, 8)) {\r
-               PrintAndLog("Nt must include 8 HEX symbols");\r
-               return 1;\r
-       }\r
+       UsbCommand c = {CMD_READER_MIFARE, {true, 0, 0}};\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("-------------------------------------------------------------------------\n");\r
 \r
        \r
-       UsbCommand c = {CMD_READER_MIFARE, {(uint32_t)bytes_to_num(keyBlock, 4), 0, 0}};\r
 start:\r
-       SendCommand(&c);\r
+    clearCommandBuffer();\r
+    SendCommand(&c);\r
        \r
        //flush queue\r
        while (ukbhit())        getchar();\r
 \r
-       // message\r
-       printf("-------------------------------------------------------------------------\n");\r
-       printf("Executing command. It may take up to 30 min.\n");\r
-       printf("Press the key on proxmark3 device to abort proxmark3.\n");\r
-       printf("Press the key on the proxmark3 device to abort both proxmark3 and client.\n");\r
-       printf("-------------------------------------------------------------------------\n");\r
        \r
        // wait cycle\r
        while (true) {\r
-               printf(".");\r
+        printf(".");\r
                fflush(stdout);\r
                if (ukbhit()) {\r
                        getchar();\r
@@ -51,39 +47,44 @@ start:
                        break;\r
                }\r
                \r
-               UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 2000);\r
-               if (resp != NULL) {\r
-                       isOK  = resp->arg[0] & 0xff;\r
-       \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
-       \r
+               UsbCommand resp;\r
+               if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {\r
+                       isOK  = resp.arg[0] & 0xff;\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
-                       PrintAndLog("isOk:%02x", isOK);\r
                        if (!isOK) PrintAndLog("Proxmark can't get statistic info. Execution aborted.\n");\r
                        break;\r
                }\r
        }       \r
+\r
        printf("\n");\r
        \r
        // error\r
        if (isOK != 1) return 1;\r
        \r
        // execute original function from util nonce2key\r
-       if (nonce2key(uid, nt, par_list, ks_list, &r_key)) return 2;\r
-       printf("------------------------------------------------------------------\n");\r
-       PrintAndLog("Key found:%012llx \n", r_key);\r
+       if (nonce2key(uid, nt, nr, par_list, ks_list, &r_key))\r
+       {\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
+               num_to_bytes(r_key, 6, keyBlock);\r
+               isOK = mfCheckKeys(0, 0, 1, keyBlock, &r_key);\r
+       }\r
        if (!isOK) \r
-               PrintAndLog("Found valid key:%012llx", r_key);\r
+               PrintAndLog("Found valid key:%012"llx, r_key);\r
        else\r
        {\r
-               PrintAndLog("Found invalid key. ( Nt=%08x ,Trying use it to run again...", nt); \r
-               c.d.asDwords[0] = nt;\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
        }\r
        \r
@@ -127,11 +128,10 @@ int CmdHF14AMfWrBl(const char *Cmd)
        memcpy(c.d.asBytes, key, 6);\r
        memcpy(c.d.asBytes + 10, bldata, 16);\r
   SendCommand(&c);\r
-       UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
-\r
-       if (resp != NULL) {\r
-               uint8_t                isOK  = resp->arg[0] & 0xff;\r
 \r
+       UsbCommand resp;\r
+       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+               uint8_t isOK  = resp.arg[0] & 0xff;\r
                PrintAndLog("isOk:%02x", isOK);\r
        } else {\r
                PrintAndLog("Command execute timeout");\r
@@ -140,6 +140,116 @@ int CmdHF14AMfWrBl(const char *Cmd)
        return 0;\r
 }\r
 \r
+int CmdHF14AMfUWrBl(const char *Cmd)\r
+{\r
+       uint8_t blockNo = 0;\r
+       bool chinese_card=0;\r
+       uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};\r
+       UsbCommand resp;\r
+       \r
+       if (strlen(Cmd)<3) {\r
+               PrintAndLog("Usage:  hf mf uwrbl    <block number> <block data (8 hex symbols)> <w>");\r
+               PrintAndLog("        sample: hf mf uwrbl 0 01020304");\r
+               return 0;\r
+       }      \r
+\r
+       blockNo = param_get8(Cmd, 0);\r
+       if (param_gethex(Cmd, 1, bldata, 8)) {\r
+               PrintAndLog("Block data must include 8 HEX symbols");\r
+               return 1;\r
+       }\r
+       \r
+       if (strchr(Cmd,'w') != 0) {\r
+         chinese_card=1;\r
+       }\r
+       \r
+       switch(blockNo){\r
+               case 0:\r
+                       if (!chinese_card){\r
+                               PrintAndLog("Access Denied");\r
+                       }else{\r
+                               PrintAndLog("--specialblock no:%02x", blockNo);\r
+                               PrintAndLog("--data: %s", sprint_hex(bldata, 4));\r
+                               UsbCommand d = {CMD_MIFAREU_WRITEBL, {blockNo}};\r
+                               memcpy(d.d.asBytes,bldata, 4);\r
+                               SendCommand(&d);\r
+\r
+                               if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+                                       uint8_t isOK  = resp.arg[0] & 0xff;\r
+                                       PrintAndLog("isOk:%02x", isOK);\r
+                               } else {\r
+                                       PrintAndLog("Command execute timeout");\r
+                             }\r
+                       }\r
+                       break;\r
+               case 1:\r
+                         if (!chinese_card){\r
+                               PrintAndLog("Access Denied");\r
+                         }else{\r
+                               PrintAndLog("--specialblock no:%02x", blockNo);\r
+                               PrintAndLog("--data: %s", sprint_hex(bldata, 4));\r
+                               UsbCommand d = {CMD_MIFAREU_WRITEBL, {blockNo}};\r
+                               memcpy(d.d.asBytes,bldata, 4);\r
+                               SendCommand(&d);\r
+\r
+                               if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+                               uint8_t isOK  = resp.arg[0] & 0xff;\r
+                               PrintAndLog("isOk:%02x", isOK);\r
+                               } else {\r
+                                       PrintAndLog("Command execute timeout");\r
+                               }\r
+                       }\r
+                       break;\r
+               case 2:\r
+                       if (!chinese_card){\r
+                               PrintAndLog("Access Denied");\r
+                       }else{\r
+                               PrintAndLog("--specialblock no:%02x", blockNo);\r
+                               PrintAndLog("--data: %s", sprint_hex(bldata, 4));\r
+                               UsbCommand c = {CMD_MIFAREU_WRITEBL, {blockNo}};\r
+                               memcpy(c.d.asBytes, bldata, 4);\r
+                               SendCommand(&c);\r
+\r
+                               if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+                                       uint8_t isOK  = resp.arg[0] & 0xff;\r
+                                       PrintAndLog("isOk:%02x", isOK);\r
+                               } else {\r
+                                       PrintAndLog("Command execute timeout");\r
+                               }\r
+                       }\r
+                       break;\r
+               case 3:\r
+                       PrintAndLog("--specialblock no:%02x", blockNo);\r
+                       PrintAndLog("--data: %s", sprint_hex(bldata, 4));\r
+                       UsbCommand d = {CMD_MIFAREU_WRITEBL, {blockNo}};\r
+                       memcpy(d.d.asBytes,bldata, 4);\r
+                       SendCommand(&d);\r
+\r
+                       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+                               uint8_t isOK  = resp.arg[0] & 0xff;\r
+                               PrintAndLog("isOk:%02x", isOK);\r
+                       } else {\r
+                               PrintAndLog("Command execute timeout");\r
+                       }\r
+                       break;\r
+               default: \r
+                       PrintAndLog("--block no:%02x", blockNo);\r
+                       PrintAndLog("--data: %s", sprint_hex(bldata, 4));               \r
+                       UsbCommand e = {CMD_MIFAREU_WRITEBL, {blockNo}};\r
+                       memcpy(e.d.asBytes,bldata, 4);\r
+                       SendCommand(&e);\r
+\r
+                       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+                               uint8_t isOK  = resp.arg[0] & 0xff;\r
+                               PrintAndLog("isOk:%02x", isOK);\r
+                       } else {\r
+                               PrintAndLog("Command execute timeout");\r
+                     }\r
+                     break;\r
+       }\r
+       return 0;\r
+}\r
+\r
 int CmdHF14AMfRdBl(const char *Cmd)\r
 {\r
        uint8_t blockNo = 0;\r
@@ -171,11 +281,11 @@ int CmdHF14AMfRdBl(const char *Cmd)
   UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};\r
        memcpy(c.d.asBytes, key, 6);\r
   SendCommand(&c);\r
-       UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
 \r
-       if (resp != NULL) {\r
-               uint8_t                isOK  = resp->arg[0] & 0xff;\r
-               uint8_t              * data  = resp->d.asBytes;\r
+       UsbCommand resp;\r
+       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+               uint8_t                isOK  = resp.arg[0] & 0xff;\r
+               uint8_t              * data  = resp.d.asBytes;\r
 \r
                if (isOK)\r
                        PrintAndLog("isOk:%02x data:%s", isOK, sprint_hex(data, 16));\r
@@ -188,6 +298,129 @@ int CmdHF14AMfRdBl(const char *Cmd)
   return 0;\r
 }\r
 \r
+int CmdHF14AMfURdBl(const char *Cmd)\r
+{\r
+        uint8_t blockNo = 0;\r
+\r
+        if (strlen(Cmd)<1) {\r
+                PrintAndLog("Usage:  hf mf urdbl    <block number>");\r
+                PrintAndLog("        sample: hf mf urdbl 0");\r
+                return 0;\r
+        }       \r
+        \r
+        blockNo = param_get8(Cmd, 0);\r
+        PrintAndLog("--block no:%02x", blockNo);\r
+        \r
+  UsbCommand c = {CMD_MIFAREU_READBL, {blockNo}};\r
+  SendCommand(&c);\r
+\r
+        UsbCommand resp;\r
+        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+                uint8_t                isOK  = resp.arg[0] & 0xff;\r
+                uint8_t              * data  = resp.d.asBytes;\r
+\r
+                if (isOK)\r
+                        PrintAndLog("isOk:%02x data:%s", isOK, sprint_hex(data, 4));\r
+                else\r
+                        PrintAndLog("isOk:%02x", isOK);\r
+        } else {\r
+                PrintAndLog("Command execute timeout");\r
+        }\r
+\r
+  return 0;\r
+}\r
+\r
+int CmdHF14AMfURdCard(const char *Cmd)\r
+{\r
+        int i;\r
+        uint8_t sectorNo = 0;\r
+       uint8_t *lockbytes_t=NULL;\r
+       uint8_t lockbytes[2]={0,0};\r
+       bool bit[16]={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};\r
+        \r
+        uint8_t isOK  = 0;\r
+        uint8_t * data  = NULL;\r
+\r
+        if (sectorNo > 15) {\r
+                PrintAndLog("Sector number must be less than 16");\r
+                return 1;\r
+        }\r
+        PrintAndLog("Attempting to Read Ultralight... ");\r
+        \r
+       UsbCommand c = {CMD_MIFAREU_READCARD, {sectorNo}};\r
+       SendCommand(&c);\r
+\r
+        UsbCommand resp;\r
+        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+                isOK  = resp.arg[0] & 0xff;\r
+                data  = resp.d.asBytes;\r
+\r
+                PrintAndLog("isOk:%02x", isOK);\r
+                if (isOK) \r
+                        for (i = 0; i < 16; i++) {\r
+                               switch(i){\r
+                                 case 2:\r
+                                       //process lock bytes\r
+                                       lockbytes_t=data+(i*4);\r
+                                       lockbytes[0]=lockbytes_t[2];\r
+                                       lockbytes[1]=lockbytes_t[3];\r
+                                       for(int j=0; j<16; j++){\r
+                                               bit[j]=lockbytes[j/8] & ( 1 <<(7-j%8));\r
+                                       }\r
+                                       //PrintAndLog("LB %02x %02x", lockbytes[0],lockbytes[1]);\r
+                                       //PrintAndLog("LB2b %02x %02x %02x %02x %02x %02x %02x %02x",bit[8],bit[9],bit[10],bit[11],bit[12],bit[13],bit[14],bit[15]);            \r
+                                       PrintAndLog("Block %02x:%s ", i,sprint_hex(data + i * 4, 4));\r
+                                       break;\r
+                                 case 3: \r
+                                       PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[4]);\r
+                                       break;\r
+                                 case 4:\r
+                                        PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[3]);\r
+                                       break;\r
+                                 case 5:\r
+                                        PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[2]);\r
+                                       break;\r
+                                 case 6:\r
+                                        PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[1]);\r
+                                       break;\r
+                                 case 7:\r
+                                        PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[0]);\r
+                                       break;\r
+                                 case 8:\r
+                                        PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[15]);\r
+                                       break;\r
+                                 case 9:\r
+                                        PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[14]);\r
+                                       break;\r
+                                 case 10:\r
+                                        PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[13]);\r
+                                       break;\r
+                                 case 11:\r
+                                        PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[12]);\r
+                                       break;\r
+                                 case 12:\r
+                                        PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[11]);\r
+                                       break;\r
+                                 case 13:\r
+                                        PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[10]);\r
+                                       break;\r
+                                 case 14:\r
+                                        PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[9]);\r
+                                       break;\r
+                                 case 15:\r
+                                        PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[8]);\r
+                                       break;\r
+                                 default:\r
+                                       PrintAndLog("Block %02x:%s ", i,sprint_hex(data + i * 4, 4));\r
+                                       break;\r
+                               }\r
+                        }\r
+        } else {\r
+                PrintAndLog("Command1 execute timeout");\r
+        }\r
+  return 0;\r
+}\r
+\r
 int CmdHF14AMfRdSc(const char *Cmd)\r
 {\r
        int i;\r
@@ -226,12 +459,12 @@ int CmdHF14AMfRdSc(const char *Cmd)
   UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};\r
        memcpy(c.d.asBytes, key, 6);\r
   SendCommand(&c);\r
-       UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
        PrintAndLog(" ");\r
 \r
-       if (resp != NULL) {\r
-               isOK  = resp->arg[0] & 0xff;\r
-               data  = resp->d.asBytes;\r
+       UsbCommand resp;\r
+       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+               isOK  = resp.arg[0] & 0xff;\r
+               data  = resp.d.asBytes;\r
 \r
                PrintAndLog("isOk:%02x", isOK);\r
                if (isOK) \r
@@ -242,13 +475,11 @@ int CmdHF14AMfRdSc(const char *Cmd)
                PrintAndLog("Command1 execute timeout");\r
        }\r
 \r
-               // response2\r
-       resp = WaitForResponseTimeout(CMD_ACK, 500);\r
+  // response2\r
        PrintAndLog(" ");\r
-\r
-       if (resp != NULL) {\r
-               isOK  = resp->arg[0] & 0xff;\r
-               data  = resp->d.asBytes;\r
+       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+               isOK  = resp.arg[0] & 0xff;\r
+               data  = resp.d.asBytes;\r
 \r
                if (isOK) \r
                        for (i = 0; i < 2; i++) {\r
@@ -272,7 +503,7 @@ int CmdHF14AMfDump(const char *Cmd)
        FILE *fin;\r
        FILE *fout;\r
        \r
-       UsbCommand *resp;\r
+       UsbCommand resp;\r
        \r
        if ((fin = fopen("dumpkeys.bin","rb")) == NULL) {\r
                PrintAndLog("Could not find file dumpkeys.bin");\r
@@ -287,10 +518,16 @@ int CmdHF14AMfDump(const char *Cmd)
        // Read key file\r
        \r
        for (i=0 ; i<16 ; i++) {\r
-               fread ( keyA[i], 1, 6, fin );\r
+               if (fread( keyA[i], 1, 6, fin ) == 0) {\r
+      PrintAndLog("File reading error.");\r
+                       return 2;\r
+    }\r
        }\r
        for (i=0 ; i<16 ; i++) {\r
-               fread ( keyB[i], 1, 6, fin );\r
+               if (fread( keyB[i], 1, 6, fin ) == 0) {\r
+      PrintAndLog("File reading error.");\r
+                       return 2;\r
+    }\r
        }\r
        \r
        // Read access rights to sectors\r
@@ -303,11 +540,10 @@ int CmdHF14AMfDump(const char *Cmd)
                UsbCommand c = {CMD_MIFARE_READBL, {4*i + 3, 0, 0}};\r
                memcpy(c.d.asBytes, keyA[i], 6);\r
                SendCommand(&c);\r
-               resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
 \r
-               if (resp != NULL) {\r
-                       uint8_t isOK  = resp->arg[0] & 0xff;\r
-                       uint8_t *data  = resp->d.asBytes;\r
+    if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+                       uint8_t isOK  = resp.arg[0] & 0xff;\r
+                       uint8_t *data  = resp.d.asBytes;\r
                        if (isOK){\r
                                rights[i][0] = ((data[7] & 0x10)>>4) | ((data[8] & 0x1)<<1) | ((data[8] & 0x10)>>2);\r
                                rights[i][1] = ((data[7] & 0x20)>>5) | ((data[8] & 0x2)<<0) | ((data[8] & 0x20)>>3);\r
@@ -329,20 +565,23 @@ int CmdHF14AMfDump(const char *Cmd)
        PrintAndLog("|----- Dumping all blocks to file... -----|");\r
        PrintAndLog("|-----------------------------------------|");\r
        \r
+  \r
        for (i=0 ; i<16 ; i++) {\r
                for (j=0 ; j<4 ; j++) {\r
-                       if (j == 3){\r
+      bool received = false;\r
+      \r
+      if (j == 3){\r
                                UsbCommand c = {CMD_MIFARE_READBL, {i*4 + j, 0, 0}};\r
                                memcpy(c.d.asBytes, keyA[i], 6);\r
                                SendCommand(&c);\r
-                               resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
+        received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                        }\r
                        else{\r
                                if ((rights[i][j] == 6) | (rights[i][j] == 5)) {\r
                                        UsbCommand c = {CMD_MIFARE_READBL, {i*4+j, 1, 0}};\r
                                        memcpy(c.d.asBytes, keyB[i], 6);\r
                                        SendCommand(&c);\r
-                                       resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
+          received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                                }\r
                                else if (rights[i][j] == 7) {\r
                                        PrintAndLog("Access rights do not allow reading of sector %d block %d",i,j);\r
@@ -351,13 +590,13 @@ int CmdHF14AMfDump(const char *Cmd)
                                        UsbCommand c = {CMD_MIFARE_READBL, {i*4+j, 0, 0}};\r
                                        memcpy(c.d.asBytes, keyA[i], 6);\r
                                        SendCommand(&c);\r
-                                       resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
+          received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                                }\r
                        }\r
 \r
-                       if (resp != NULL) {\r
-                               uint8_t isOK  = resp->arg[0] & 0xff;\r
-                               uint8_t *data  = resp->d.asBytes;\r
+                       if (received) {\r
+                               uint8_t isOK  = resp.arg[0] & 0xff;\r
+                               uint8_t *data  = resp.d.asBytes;\r
                                if (j == 3) {\r
                                        data[0]  = (keyA[i][0]);\r
                                        data[1]  = (keyA[i][1]);\r
@@ -374,6 +613,8 @@ int CmdHF14AMfDump(const char *Cmd)
                                }\r
                                if (isOK) {\r
                                        fwrite ( data, 1, 16, fout );\r
+                    PrintAndLog("Dumped card data into 'dumpdata.bin'");\r
+\r
                                }\r
                                else {\r
                                        PrintAndLog("Could not get access rights for block %d", i);\r
@@ -387,7 +628,6 @@ int CmdHF14AMfDump(const char *Cmd)
        \r
        fclose(fin);\r
        fclose(fout);\r
-       \r
   return 0;\r
 }\r
 \r
@@ -414,10 +654,16 @@ int CmdHF14AMfRestore(const char *Cmd)
        }\r
        \r
        for (i=0 ; i<16 ; i++) {\r
-               fread(keyA[i], 1, 6, fkeys);\r
+               if (fread(keyA[i], 1, 6, fkeys) == 0) {\r
+      PrintAndLog("File reading error.");\r
+                       return 2;\r
+    }\r
        }\r
        for (i=0 ; i<16 ; i++) {\r
-               fread(keyB[i], 1, 6, fkeys);\r
+               if (fread(keyB[i], 1, 6, fkeys) == 0) {\r
+      PrintAndLog("File reading error.");\r
+                       return 2;\r
+    }\r
        }\r
        \r
        PrintAndLog("Restoring dumpdata.bin to card");\r
@@ -427,7 +673,10 @@ int CmdHF14AMfRestore(const char *Cmd)
                        UsbCommand c = {CMD_MIFARE_WRITEBL, {i*4 + j, keyType, 0}};\r
                        memcpy(c.d.asBytes, key, 6);\r
                        \r
-                       fread(bldata, 1, 16, fdump);\r
+                       if (fread(bldata, 1, 16, fdump) == 0) {\r
+        PrintAndLog("File reading error.");\r
+        return 2;\r
+      }\r
                                        \r
                        if (j == 3) {\r
                                bldata[0]  = (keyA[i][0]);\r
@@ -458,10 +707,10 @@ int CmdHF14AMfRestore(const char *Cmd)
                        \r
                        memcpy(c.d.asBytes + 10, bldata, 16);\r
                        SendCommand(&c);\r
-                       UsbCommand *resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
 \r
-                       if (resp != NULL) {\r
-                               uint8_t isOK  = resp->arg[0] & 0xff;\r
+                       UsbCommand resp;\r
+      if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+                               uint8_t isOK  = resp.arg[0] & 0xff;\r
                                PrintAndLog("isOk:%02x", isOK);\r
                        } else {\r
                                PrintAndLog("Command execute timeout");\r
@@ -485,7 +734,7 @@ int CmdHF14AMfNested(const char *Cmd)
        uint8_t blDiff = 0;\r
        int  SectorsCnt = 0;\r
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
-       uint8_t keyBlock[16 * 6];\r
+       uint8_t keyBlock[6*6];\r
        uint64_t key64 = 0;\r
        int transferToEml = 0;\r
        \r
@@ -557,21 +806,13 @@ int CmdHF14AMfNested(const char *Cmd)
                PrintAndLog("--target block no:%02x target key type:%02x ", trgBlockNo, trgKeyType);\r
 \r
        if (cmdp == 'o') {\r
-               if (mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock)) {\r
+               if (mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true)) {\r
                        PrintAndLog("Nested error.");\r
                        return 2;\r
                }\r
-\r
-               for (i = 0; i < 16; i++) {\r
-                       PrintAndLog("count=%d key= %s", i, sprint_hex(keyBlock + i * 6, 6));\r
-               }\r
-       \r
-               // test keys\r
-               res = mfCheckKeys(trgBlockNo, trgKeyType, 8, keyBlock, &key64);\r
-               if (res)\r
-                       res = mfCheckKeys(trgBlockNo, trgKeyType, 8, &keyBlock[6 * 8], &key64);\r
-               if (!res) {\r
-                       PrintAndLog("Found valid key:%012llx", key64);\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
@@ -588,6 +829,9 @@ int CmdHF14AMfNested(const char *Cmd)
                }\r
        }\r
        else { // ------------------------------------  multiple sectors working\r
+               clock_t time1;\r
+               time1 = clock();\r
+\r
                blDiff = blockNo % 4;\r
                PrintAndLog("Block shift=%d", blDiff);\r
                e_sector = calloc(SectorsCnt, sizeof(sector));\r
@@ -595,10 +839,10 @@ int CmdHF14AMfNested(const char *Cmd)
                \r
                //test current key 4 sectors\r
                memcpy(keyBlock, key, 6);\r
-               num_to_bytes(0xa0a1a2a3a4a5, 6, (uint8_t*)(keyBlock + 1 * 6));\r
-               num_to_bytes(0xb0b1b2b3b4b5, 6, (uint8_t*)(keyBlock + 2 * 6));\r
-               num_to_bytes(0xffffffffffff, 6, (uint8_t*)(keyBlock + 3 * 6));\r
-               num_to_bytes(0x000000000000, 6, (uint8_t*)(keyBlock + 4 * 6));\r
+               num_to_bytes(0xffffffffffff, 6, (uint8_t*)(keyBlock + 1 * 6));\r
+               num_to_bytes(0x000000000000, 6, (uint8_t*)(keyBlock + 2 * 6));\r
+               num_to_bytes(0xa0a1a2a3a4a5, 6, (uint8_t*)(keyBlock + 3 * 6));\r
+               num_to_bytes(0xb0b1b2b3b4b5, 6, (uint8_t*)(keyBlock + 4 * 6));\r
                num_to_bytes(0xaabbccddeeff, 6, (uint8_t*)(keyBlock + 5 * 6));\r
 \r
                PrintAndLog("Testing known keys. Sector count=%d", SectorsCnt);\r
@@ -613,38 +857,47 @@ int CmdHF14AMfNested(const char *Cmd)
                                        e_sector[i].foundKey[j] = 1;\r
                                }\r
                        }\r
-               } \r
+               }\r
+               \r
                \r
                // nested sectors\r
                iterations = 0;\r
                PrintAndLog("nested...");\r
+               bool calibrate = true;\r
                for (i = 0; i < NESTED_SECTOR_RETRY; i++) {\r
-                       for (trgBlockNo = blDiff; trgBlockNo < SectorsCnt * 4; trgBlockNo = trgBlockNo + 4) \r
+                       for (trgBlockNo = blDiff; trgBlockNo < SectorsCnt * 4; trgBlockNo = trgBlockNo + 4) {\r
                                for (trgKeyType = 0; trgKeyType < 2; trgKeyType++) { \r
                                        if (e_sector[trgBlockNo / 4].foundKey[trgKeyType]) continue;\r
-                                       if (mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock)) continue;\r
+                                       PrintAndLog("-----------------------------------------------");\r
+                                       if(mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, calibrate)) {\r
+                                               PrintAndLog("Nested error.\n");\r
+                                               return 2;\r
+                                       }\r
+                                       else {\r
+                                               calibrate = false;\r
+                                       }\r
                                        \r
                                        iterations++;\r
-                                       \r
-                                       //try keys from nested\r
-                                       res = mfCheckKeys(trgBlockNo, trgKeyType, 8, keyBlock, &key64);\r
-                                       if (res)\r
-                                               res = mfCheckKeys(trgBlockNo, trgKeyType, 8, &keyBlock[6 * 8], &key64);\r
-                                       if (!res) {\r
-                                               PrintAndLog("Found valid key:%012llx", key64);  \r
+\r
+                                       key64 = bytes_to_num(keyBlock, 6);\r
+                                       if (key64) {\r
+                                               PrintAndLog("Found valid key:%012"llx, key64);\r
                                                e_sector[trgBlockNo / 4].foundKey[trgKeyType] = 1;\r
                                                e_sector[trgBlockNo / 4].Key[trgKeyType] = key64;\r
                                        }\r
                                }\r
+                       }\r
                }\r
 \r
-               PrintAndLog("Iterations count: %d", iterations);\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
+               PrintAndLog("-----------------------------------------------\nIterations count: %d\n\n", iterations);\r
                //print them\r
                PrintAndLog("|---|----------------|---|----------------|---|");\r
                PrintAndLog("|sec|key A           |res|key B           |res|");\r
                PrintAndLog("|---|----------------|---|----------------|---|");\r
                for (i = 0; i < SectorsCnt; i++) {\r
-                       PrintAndLog("|%03d|  %012llx  | %d |  %012llx  | %d |", 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
                }\r
                PrintAndLog("|---|----------------|---|----------------|---|");\r
@@ -730,19 +983,28 @@ int CmdHF14AMfChk(const char *Cmd)
        keyBlock = calloc(stKeyBlock, 6);\r
        if (keyBlock == NULL) return 1;\r
 \r
-       num_to_bytes(0xffffffffffff, 6, (uint8_t*)(keyBlock + 0 * 6)); // Default key (first key used by program if no user defined key)\r
-       num_to_bytes(0x000000000000, 6, (uint8_t*)(keyBlock + 1 * 6)); // Blank key\r
-       num_to_bytes(0xa0a1a2a3a4a5, 6, (uint8_t*)(keyBlock + 2 * 6)); // NFCForum MAD key\r
-       num_to_bytes(0xb0b1b2b3b4b5, 6, (uint8_t*)(keyBlock + 3 * 6));\r
-       num_to_bytes(0xaabbccddeeff, 6, (uint8_t*)(keyBlock + 4 * 6));\r
-       num_to_bytes(0x4d3a99c351dd, 6, (uint8_t*)(keyBlock + 5 * 6));\r
-       num_to_bytes(0x1a982c7e459a, 6, (uint8_t*)(keyBlock + 6 * 6));\r
-       num_to_bytes(0xd3f7d3f7d3f7, 6, (uint8_t*)(keyBlock + 7 * 6));\r
-       num_to_bytes(0x714c5c886e97, 6, (uint8_t*)(keyBlock + 8 * 6));\r
-       num_to_bytes(0x587ee5f9350f, 6, (uint8_t*)(keyBlock + 9 * 6));\r
-       num_to_bytes(0xa0478cc39091, 6, (uint8_t*)(keyBlock + 10 * 6));\r
-       num_to_bytes(0x533cb6c723f6, 6, (uint8_t*)(keyBlock + 11 * 6));\r
-       num_to_bytes(0x8fd0a4f256e9, 6, (uint8_t*)(keyBlock + 12 * 6));\r
+       uint64_t defaultKeys[] =\r
+       {\r
+               0xffffffffffff, // Default key (first key used by program if no user defined key)\r
+               0x000000000000, // Blank key\r
+               0xa0a1a2a3a4a5, // NFCForum MAD key\r
+               0xb0b1b2b3b4b5,\r
+               0xaabbccddeeff,\r
+               0x4d3a99c351dd,\r
+               0x1a982c7e459a,\r
+               0xd3f7d3f7d3f7,\r
+               0x714c5c886e97,\r
+               0x587ee5f9350f,\r
+               0xa0478cc39091,\r
+               0x533cb6c723f6,\r
+               0x8fd0a4f256e9\r
+       };\r
+       int defaultKeysSize = (sizeof(defaultKeys) / 7) - 1;\r
+\r
+       for (int defaultKeyCounter = 0; defaultKeyCounter < defaultKeysSize; defaultKeyCounter++)\r
+       {\r
+               num_to_bytes(defaultKeys[defaultKeyCounter], 6, (uint8_t*)(keyBlock + defaultKeyCounter * 6));\r
+       }\r
        \r
        if (strlen(Cmd)<3) {\r
                PrintAndLog("Usage:  hf mf chk <block number>/<*card memory> <key type (A/B/?)> [t] [<key (12 hex symbols)>] [<dic (*.dic)>]");\r
@@ -812,16 +1074,13 @@ int CmdHF14AMfChk(const char *Cmd)
                        }\r
                        \r
                        if ( (f = fopen( filename , "r")) ) {\r
-                               while( !feof(f) ){\r
-                                       memset(buf, 0, sizeof(buf));\r
-                                       fgets(buf, sizeof(buf), f);\r
-                                       \r
+                               while( fgets(buf, sizeof(buf), f) ){\r
                                        if (strlen(buf) < 12 || buf[11] == '\n')\r
                                                continue;\r
                                \r
                                        while (fgetc(f) != '\n' && !feof(f)) ;  //goto next line\r
                                        \r
-                                       if( buf[0]=='#' ) continue;     //The line start with # is remcommnet,skip\r
+                                       if( buf[0]=='#' ) continue;     //The line start with # is comment, skip\r
 \r
                                        if (!isxdigit(buf[0])){\r
                                                PrintAndLog("File content error. '%s' must include 12 HEX symbols",buf);\r
@@ -841,8 +1100,9 @@ int CmdHF14AMfChk(const char *Cmd)
                                        }\r
                                        memset(keyBlock + 6 * keycnt, 0, 6);\r
                                        num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);\r
-                                       PrintAndLog("chk custom key[%d] %012llx", keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));\r
+                                       PrintAndLog("chk custom key[%d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));\r
                                        keycnt++;\r
+                                       memset(buf, 0, sizeof(buf));\r
                                }\r
                        } else {\r
                                PrintAndLog("File: %s: not found or locked.", filename);\r
@@ -855,7 +1115,7 @@ int CmdHF14AMfChk(const char *Cmd)
        \r
        if (keycnt == 0) {\r
                PrintAndLog("No key specified,try default keys");\r
-               for (;keycnt <=12; keycnt++)\r
+               for (;keycnt < defaultKeysSize; keycnt++)\r
                        PrintAndLog("chk default key[%d] %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
@@ -865,24 +1125,19 @@ int CmdHF14AMfChk(const char *Cmd)
                int b=blockNo;\r
                for (int i=0; i<SectorsCnt; ++i) {\r
                        PrintAndLog("--SectorsCnt:%d block no:0x%02x key type:%C key count:%d ", i,      b, t?'B':'A', keycnt);\r
-                       int size = keycnt>8?8:keycnt;\r
-                       for (int c = 0; c < keycnt; c+=size) {\r
-                               size=keycnt-c>8?8:keycnt-c;                     \r
-                               res = mfCheckKeys(b, t, size, keyBlock +6*c, &key64);\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:[%012llx]",key64);\r
+                                               PrintAndLog("Found valid key:[%012"llx"]",key64);\r
                                                if (transferToEml) {\r
                                                        uint8_t block[16];\r
                                                        mfEmlGetMem(block, get_trailer_block(b), 1);\r
                                                        num_to_bytes(key64, 6, block + t*10);\r
                                                        mfEmlSetMem(block, get_trailer_block(b), 1);\r
                                                }\r
-                                               break;\r
-                                       }\r
-                                       else {\r
-                                               printf("Not found yet, keycnt:%d\r", c+size);\r
-                                               fflush(stdout);\r
                                        }\r
                                } else {\r
                                        PrintAndLog("Command execute timeout");\r
@@ -929,24 +1184,68 @@ int CmdHF14AMfChk(const char *Cmd)
 \r
 int CmdHF14AMf1kSim(const char *Cmd)\r
 {\r
-       uint8_t uid[4] = {0, 0, 0, 0};\r
-       \r
+       uint8_t uid[7] = {0, 0, 0, 0, 0, 0, 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  <uid (8 hex symbols)>");\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 0a0a0a0a ");\r
                return 0;\r
-       }       \r
-       \r
-       if (param_getchar(Cmd, 0) && param_gethex(Cmd, 0, uid, 8)) {\r
-               PrintAndLog("UID must include 8 HEX symbols");\r
-               return 1;\r
        }\r
-       PrintAndLog(" uid:%s ", sprint_hex(uid, 4));\r
-       \r
-  UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {0, 0, 0}};\r
-       memcpy(c.d.asBytes, uid, 4);\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
+               {\r
+                       flags |= FLAG_7B_UID_IN_DATA;// UID from packet\r
+               }else\r
+               {\r
+                               PrintAndLog("UID, if specified, must include 8 or 14 HEX symbols");\r
+                               return 1;\r
+               }\r
+               pnr +=2;\r
+       }\r
+       if (param_getchar(Cmd, pnr) == 'n') {\r
+               exitAfterNReads = param_get8(Cmd,pnr+1);\r
+               pnr += 2;\r
+       }\r
+       if (param_getchar(Cmd, pnr) == 'i' ) {\r
+               //Using a flag to signal interactiveness, least significant bit\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
+               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
+  UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads,0}};\r
+  memcpy(c.d.asBytes, uid, sizeof(uid));\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
+         }\r
+  }\r
+\r
   return 0;\r
 }\r
 \r
@@ -985,10 +1284,6 @@ int CmdHF14AMfEGet(const char *Cmd)
        }       \r
        \r
        blockNo = param_get8(Cmd, 0);\r
-       if (blockNo >= 32 * 4 + 8 * 16) {\r
-               PrintAndLog("Block number must be in [0..255] as in MIFARE classic.");\r
-               return 1;\r
-       }\r
 \r
        PrintAndLog(" ");\r
        if (!mfEmlGetMem(data, blockNo, 3)) {\r
@@ -1029,10 +1324,6 @@ int CmdHF14AMfESet(const char *Cmd)
        }       \r
        \r
        blockNo = param_get8(Cmd, 0);\r
-       if (blockNo >= 32 * 4 + 8 * 16) {\r
-               PrintAndLog("Block number must be in [0..255] as in MIFARE classic.");\r
-               return 1;\r
-       }\r
        \r
        if (param_gethex(Cmd, 1, memBlock, 32)) {\r
                PrintAndLog("block data must include 32 HEX symbols");\r
@@ -1083,7 +1374,14 @@ int CmdHF14AMfELoad(const char *Cmd)
        blockNum = 0;\r
        while(!feof(f)){\r
                memset(buf, 0, sizeof(buf));\r
-               fgets(buf, sizeof(buf), f);\r
+               if (fgets(buf, sizeof(buf), f) == NULL) {\r
+                       if(blockNum == 16 * 4)\r
+                       {\r
+                               break;\r
+                       }\r
+                       PrintAndLog("File reading error.");\r
+                       return 2;\r
+    }\r
 \r
                if (strlen(buf) < 32){\r
                        if(strlen(buf) && feof(f))\r
@@ -1109,7 +1407,7 @@ int CmdHF14AMfELoad(const char *Cmd)
                PrintAndLog("File content error. There must be 64 blocks");\r
                return 4;\r
        }\r
-       PrintAndLog("Loaded from file: %s", filename);\r
+       PrintAndLog("Loaded %d blocks from file: %s", blockNum, filename);\r
   return 0;\r
 }\r
 \r
@@ -1211,7 +1509,7 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
                }\r
                keyA = bytes_to_num(data, 6);\r
                keyB = bytes_to_num(data + 10, 6);\r
-               PrintAndLog("|%03d|  %012llx  |  %012llx  |", i, keyA, keyB);\r
+               PrintAndLog("|%03d|  %012"llx"  |  %012"llx"  |", i, keyA, keyB);\r
        }\r
        PrintAndLog("|---|----------------|----------------|");\r
        \r
@@ -1255,28 +1553,423 @@ int CmdHF14AMfCSetUID(const char *Cmd)
 \r
 int CmdHF14AMfCSetBlk(const char *Cmd)\r
 {\r
+       uint8_t uid[8];\r
+       uint8_t memBlock[16];\r
+       uint8_t blockNo = 0;\r
+       int res;\r
+       memset(memBlock, 0x00, sizeof(memBlock));\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("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
+               return 0;\r
+       }       \r
+\r
+       blockNo = param_get8(Cmd, 0);\r
+\r
+       if (param_gethex(Cmd, 1, memBlock, 32)) {\r
+               PrintAndLog("block data must include 32 HEX symbols");\r
+               return 1;\r
+       }\r
+\r
+       PrintAndLog("--block number:%02x data:%s", blockNo, sprint_hex(memBlock, 16));\r
+\r
+       res = mfCSetBlock(blockNo, memBlock, uid, 0, CSETBLOCK_SINGLE_OPER);\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
        return 0;\r
 }\r
 \r
 int CmdHF14AMfCLoad(const char *Cmd)\r
 {\r
+       FILE * f;\r
+       char filename[20];\r
+       char * fnameptr = filename;\r
+       char buf[64];\r
+       uint8_t buf8[64];\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
+\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
+               PrintAndLog("or from emulator memory (option `e`)");\r
+               PrintAndLog("Usage:  hf mf cload <file name w/o `.eml`>");\r
+               PrintAndLog("   or:  hf mf cload e ");\r
+               PrintAndLog(" sample: hf mf cload filename");\r
+               return 0;\r
+       }       \r
+\r
+       char ctmp = param_getchar(Cmd, 0);\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
+                       \r
+                       if (blockNum == 2) flags = 0;\r
+                       if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r
+\r
+                       if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {\r
+                               PrintAndLog("Cant set magic card block: %d", blockNum);\r
+                               return 3;\r
+                       }\r
+               }\r
+               return 0;\r
+       } else {\r
+               len = strlen(Cmd);\r
+               if (len > 14) len = 14;\r
+\r
+               memcpy(filename, Cmd, len);\r
+               fnameptr += len;\r
+\r
+               sprintf(fnameptr, ".eml"); \r
+       \r
+               // open file\r
+               f = fopen(filename, "r");\r
+               if (f == NULL) {\r
+                       PrintAndLog("File not found or locked.");\r
+                       return 1;\r
+               }\r
+       \r
+               blockNum = 0;\r
+               flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r
+               while(!feof(f)){\r
+                       memset(buf, 0, sizeof(buf));\r
+                       if (fgets(buf, sizeof(buf), f) == NULL) {\r
+        PrintAndLog("File reading error.");\r
+        return 2;\r
+      }\r
+\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
+                               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
+\r
+                       if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {\r
+                               PrintAndLog("Cant set magic card block: %d", blockNum);\r
+                               return 3;\r
+                       }\r
+                       blockNum++;\r
+               \r
+                       if (blockNum >= 16 * 4) break;  // magic card type - mifare 1K\r
+               }\r
+               fclose(f);\r
+       \r
+               if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){\r
+                       PrintAndLog("File content error. There must be 64 blocks");\r
+                       return 4;\r
+               }\r
+               PrintAndLog("Loaded from file: %s", filename);\r
+               return 0;\r
+       }\r
+}\r
+\r
+int CmdHF14AMfCGetBlk(const char *Cmd) {\r
+       uint8_t memBlock[16];\r
+       uint8_t blockNo = 0;\r
+       int res;\r
+       memset(memBlock, 0x00, sizeof(memBlock));\r
+\r
+       if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\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
+               return 0;\r
+       }       \r
+\r
+       blockNo = param_get8(Cmd, 0);\r
+\r
+       PrintAndLog("--block number:%02x ", blockNo);\r
+\r
+       res = mfCGetBlock(blockNo, memBlock, CSETBLOCK_SINGLE_OPER);\r
+       if (res) {\r
+                       PrintAndLog("Can't read block. error=%d", res);\r
+                       return 1;\r
+               }\r
+       \r
+       PrintAndLog("block data:%s", sprint_hex(memBlock, 16));\r
+       return 0;\r
+}\r
+\r
+int CmdHF14AMfCGetSc(const char *Cmd) {\r
+       uint8_t memBlock[16];\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
+               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
+               return 0;\r
+       }       \r
+\r
+       sectorNo = param_get8(Cmd, 0);\r
+       if (sectorNo > 15) {\r
+               PrintAndLog("Sector number must be in [0..15] as in MIFARE classic.");\r
+               return 1;\r
+       }\r
+\r
+       PrintAndLog("--sector number:%02x ", sectorNo);\r
+\r
+       flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r
+       for (i = 0; i < 4; i++) {\r
+               if (i == 1) flags = 0;\r
+               if (i == 3) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r
+\r
+               res = mfCGetBlock(sectorNo * 4 + i, memBlock, flags);\r
+               if (res) {\r
+                       PrintAndLog("Can't read block. %02x error=%d", sectorNo * 4 + i, res);\r
+                       return 1;\r
+               }\r
+       \r
+               PrintAndLog("block %02x data:%s", sectorNo * 4 + i, sprint_hex(memBlock, 16));\r
+       }\r
+       return 0;\r
+}\r
+\r
+int CmdHF14AMfCSave(const char *Cmd) {\r
+\r
+       FILE * f;\r
+       char filename[20];\r
+       char * fnameptr = filename;\r
+       uint8_t fillFromEmulator = 0;\r
+       uint8_t buf[64];\r
+       int i, j, len, flags;\r
+       \r
+       memset(filename, 0, sizeof(filename));\r
+       memset(buf, 0, sizeof(buf));\r
+\r
+       if (param_getchar(Cmd, 0) == 'h') {\r
+               PrintAndLog("It saves `magic Chinese` card dump into the file `filename.eml` or `cardID.eml`");\r
+               PrintAndLog("or into emulator memory (option `e`)");\r
+               PrintAndLog("Usage:  hf mf esave [file name w/o `.eml`][e]");\r
+               PrintAndLog(" sample: hf mf esave ");\r
+               PrintAndLog("         hf mf esave filename");\r
+               PrintAndLog("         hf mf esave e \n");\r
+               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
+               flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\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
+               \r
+                       if (mfCGetBlock(i, buf, flags)) {\r
+                               PrintAndLog("Cant get block: %d", i);\r
+                               break;\r
+                       }\r
+                       \r
+                       if (mfEmlSetMem(buf, i, 1)) {\r
+                               PrintAndLog("Cant set emul block: %d", i);\r
+                               return 3;\r
+                       }\r
+               }\r
+               return 0;\r
+       } else {\r
+               len = strlen(Cmd);\r
+               if (len > 14) len = 14;\r
+       \r
+               if (len < 1) {\r
+                       // get filename\r
+                       if (mfCGetBlock(0, buf, CSETBLOCK_SINGLE_OPER)) {\r
+                               PrintAndLog("Cant get block: %d", 0);\r
+                               return 1;\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
+               sprintf(fnameptr, ".eml"); \r
+       \r
+               // open file\r
+               f = fopen(filename, "w+");\r
+\r
+               // put hex\r
+               flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\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
+               \r
+                       if (mfCGetBlock(i, buf, flags)) {\r
+                               PrintAndLog("Cant get block: %d", i);\r
+                               break;\r
+                       }\r
+                       for (j = 0; j < 16; j++)\r
+                               fprintf(f, "%02x", buf[j]); \r
+                       fprintf(f,"\n");\r
+               }\r
+               fclose(f);\r
+       \r
+               PrintAndLog("Saved to file: %s", filename);\r
+       \r
+               return 0;\r
+       }\r
+}\r
+\r
+int CmdHF14AMfSniff(const char *Cmd){\r
+       // params\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 blockLen = 0;\r
+       int num = 0;\r
+       int pckNum = 0;\r
+       uint8_t uid[8];\r
+       uint8_t atqa[2];\r
+       uint8_t sak;\r
+       bool isTag;\r
+       uint32_t parity;\r
+       uint8_t buf[3000];\r
+       uint8_t * bufPtr = buf;\r
+       memset(buf, 0x00, 3000);\r
+       \r
+       if (param_getchar(Cmd, 0) == 'h') {\r
+               PrintAndLog("It continuously get 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("    r - 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][r]");\r
+               PrintAndLog("  sample: hf mf sniff l d e");\r
+               return 0;\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
+       \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 + 9 < blockLen) {\r
+                                       isTag = bufPtr[3] & 0x80 ? true:false;\r
+                                       bufPtr += 4;\r
+                                       parity = *((uint32_t *)(bufPtr));\r
+                                       bufPtr += 4;\r
+                                       len = bufPtr[0];\r
+                                       bufPtr++;\r
+                                       if ((len == 14) && (bufPtr[0] = 0xff) && (bufPtr[1] = 0xff)) {\r
+                                               memcpy(uid, bufPtr + 2, 7);\r
+                                               memcpy(atqa, bufPtr + 2 + 7, 2);\r
+                                               sak = bufPtr[11];\r
+                                               \r
+                                               PrintAndLog("tag select uid:%s atqa:%02x %02x sak:0x%02x", sprint_hex(uid, 7), atqa[0], atqa[1], sak);\r
+                                               if (wantLogToFile || wantDecrypt) {\r
+                                                       FillFileNameByUID(logHexFileName, uid, ".log", 7);\r
+                                                       AddLogCurrentDT(logHexFileName);\r
+                                               }                                               \r
+                                               if (wantDecrypt) mfTraceInit(uid, atqa, sak, wantSaveToEmlFile);\r
+                                       } else {\r
+                                               PrintAndLog("%s(%d):%s", isTag ? "TAG":"RDR", num, sprint_hex(bufPtr, len));\r
+                                               if (wantLogToFile) AddLogHex(logHexFileName, isTag ? "TAG: ":"RDR: ", bufPtr, len);\r
+                                               if (wantDecrypt) mfTraceDecode(bufPtr, len, parity, wantSaveToEmlFile);\r
+                                       }\r
+                                       bufPtr += len;\r
+                                       num++;\r
+                               }\r
+                       }\r
+               } // resp not NILL\r
+       } // while (true)\r
+       \r
        return 0;\r
 }\r
 \r
 static command_t CommandTable[] =\r
 {\r
-  {"help",             CmdHelp,                                1, "This help"},\r
-  {"dbg",              CmdHF14AMfDbg,                  0, "Set default debug mode"},\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
+  {"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. param - <used card nonce>"},\r
+  {"chk",                      CmdHF14AMfChk,                  0, "Test block keys"},\r
+  {"mifare",   CmdHF14AMifare,                 0, "Read parity error messages."},\r
   {"nested",   CmdHF14AMfNested,               0, "Test nested authentication"},\r
-  {"sim",              CmdHF14AMf1kSim,                0, "Simulate MIFARE card"},\r
-  {"eclr",     CmdHF14AMfEClear,               0, "Clear simulator memory block"},\r
+  {"sniff",            CmdHF14AMfSniff,                0, "Sniff card-reader communication"},\r
+  {"sim",                      CmdHF14AMf1kSim,                0, "Simulate MIFARE card"},\r
+  {"eclr",             CmdHF14AMfEClear,               0, "Clear simulator memory block"},\r
   {"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
@@ -1284,15 +1977,18 @@ static command_t CommandTable[] =
   {"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, "(n/a)Write block into magic Chinese card"},\r
-  {"cload",            CmdHF14AMfCLoad,                0, "(n/a)Load dump into 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
 };\r
 \r
 int CmdHFMF(const char *Cmd)\r
 {\r
        // flush\r
-       while (WaitForResponseTimeout(CMD_ACK, 500) != NULL) ;\r
+       WaitForResponseTimeout(CMD_ACK,NULL,100);\r
 \r
   CmdsParse(CommandTable, Cmd);\r
   return 0;\r
Impressum, Datenschutz