]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhfmf.c
merged all patches into CDC repository
[proxmark3-svn] / client / cmdhfmf.c
index cd50477d9be9ec1e7448192c3a5b8e53f79854ed..cea95ff0aa420f621d9a20d17b5668eb96fc2a90 100644 (file)
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------------\r
 //-----------------------------------------------------------------------------\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
 //\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,7 +9,6 @@
 //-----------------------------------------------------------------------------\r
 \r
 #include "cmdhfmf.h"\r
 //-----------------------------------------------------------------------------\r
 \r
 #include "cmdhfmf.h"\r
-#include "proxmark3.h"\r
 \r
 static int CmdHelp(const char *Cmd);\r
 \r
 \r
 static int CmdHelp(const char *Cmd);\r
 \r
@@ -19,14 +18,16 @@ int CmdHF14AMifare(const char *Cmd)
        uint32_t nt = 0;\r
        uint64_t par_list = 0, ks_list = 0, r_key = 0;\r
        uint8_t isOK = 0;\r
        uint32_t nt = 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
-       \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
        if (param_getchar(Cmd, 0) && param_gethex(Cmd, 0, keyBlock, 8)) {\r
                PrintAndLog("Nt must include 8 HEX symbols");\r
                return 1;\r
        }\r
+\r
        \r
        UsbCommand c = {CMD_READER_MIFARE, {(uint32_t)bytes_to_num(keyBlock, 4), 0, 0}};\r
        \r
        UsbCommand c = {CMD_READER_MIFARE, {(uint32_t)bytes_to_num(keyBlock, 4), 0, 0}};\r
+start:\r
        SendCommand(&c);\r
        \r
        //flush queue\r
        SendCommand(&c);\r
        \r
        //flush queue\r
@@ -35,27 +36,27 @@ int CmdHF14AMifare(const char *Cmd)
        // message\r
        printf("-------------------------------------------------------------------------\n");\r
        printf("Executing command. It may take up to 30 min.\n");\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("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
+               fflush(stdout);\r
                if (ukbhit()) {\r
                        getchar();\r
                        printf("\naborted via keyboard!\n");\r
                        break;\r
                }\r
                \r
                if (ukbhit()) {\r
                        getchar();\r
                        printf("\naborted via keyboard!\n");\r
                        break;\r
                }\r
                \r
-               UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 2000);\r
-               if (resp != NULL) {\r
-                       isOK  = resp->arg[0] & 0xff;\r
+               UsbCommand resp;\r
+               if (WaitForResponseTimeout(CMD_ACK,&resp,2000)) {\r
+                       isOK  = resp.arg[0] & 0xff;\r
        \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
+                       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
                        printf("\n\n");\r
                        PrintAndLog("isOk:%02x", isOK);\r
        \r
                        printf("\n\n");\r
                        PrintAndLog("isOk:%02x", isOK);\r
@@ -69,17 +70,25 @@ int CmdHF14AMifare(const char *Cmd)
        if (isOK != 1) return 1;\r
        \r
        // execute original function from util nonce2key\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, 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:%012llx \n", r_key);\r
 \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
        else\r
        if (!isOK) \r
                PrintAndLog("Found valid key:%012llx", r_key);\r
        else\r
-               PrintAndLog("Found invalid key. ( Nt=%08x", nt);        \r
-       \r
+       {\r
+               if (isOK != 2) PrintAndLog("Found invalid key. ( Nt=%08x ,Trying use it to run again...", nt);  \r
+               c.arg[0] = nt;\r
+               goto start;\r
+       }\r
        \r
        return 0;\r
 }\r
        \r
        return 0;\r
 }\r
@@ -121,11 +130,10 @@ int CmdHF14AMfWrBl(const char *Cmd)
        memcpy(c.d.asBytes, key, 6);\r
        memcpy(c.d.asBytes + 10, bldata, 16);\r
   SendCommand(&c);\r
        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
 \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
                PrintAndLog("isOk:%02x", isOK);\r
        } else {\r
                PrintAndLog("Command execute timeout");\r
@@ -165,11 +173,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 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
 \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
 \r
                if (isOK)\r
                        PrintAndLog("isOk:%02x data:%s", isOK, sprint_hex(data, 16));\r
@@ -220,12 +228,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 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
        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
 \r
                PrintAndLog("isOk:%02x", isOK);\r
                if (isOK) \r
@@ -236,13 +244,11 @@ int CmdHF14AMfRdSc(const char *Cmd)
                PrintAndLog("Command1 execute timeout");\r
        }\r
 \r
                PrintAndLog("Command1 execute timeout");\r
        }\r
 \r
-               // response2\r
-       resp = WaitForResponseTimeout(CMD_ACK, 500);\r
+  // response2\r
        PrintAndLog(" ");\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
 \r
                if (isOK) \r
                        for (i = 0; i < 2; i++) {\r
@@ -255,31 +261,26 @@ int CmdHF14AMfRdSc(const char *Cmd)
   return 0;\r
 }\r
 \r
   return 0;\r
 }\r
 \r
-int CmdHF14AMfDump1k(const char *Cmd)\r
+int CmdHF14AMfDump(const char *Cmd)\r
 {\r
        int i, j;\r
        \r
 {\r
        int i, j;\r
        \r
-       uint8_t keyType = 0;\r
-       uint8_t c[3][4];\r
-       uint8_t keyA[16][6];\r
-       uint8_t keyB[16][6];\r
-       uint8_t rights[16][4];\r
+       uint8_t keyA[40][6];\r
+       uint8_t keyB[40][6];\r
+       uint8_t rights[40][4];\r
        \r
        \r
-       uint8_t isOK  = 0;\r
-       uint8_t *data  = NULL;\r
-\r
        FILE *fin;\r
        FILE *fout;\r
        \r
        FILE *fin;\r
        FILE *fout;\r
        \r
-       UsbCommand *resp;\r
+       UsbCommand resp;\r
        \r
        if ((fin = fopen("dumpkeys.bin","rb")) == NULL) {\r
        \r
        if ((fin = fopen("dumpkeys.bin","rb")) == NULL) {\r
-               PrintAndLog("Could not find file keys.bin");\r
+               PrintAndLog("Could not find file dumpkeys.bin");\r
                return 1;\r
        }\r
        \r
        if ((fout = fopen("dumpdata.bin","wb")) == NULL) { \r
                return 1;\r
        }\r
        \r
        if ((fout = fopen("dumpdata.bin","wb")) == NULL) { \r
-               PrintAndLog("Could not create file name dump.bin");\r
+               PrintAndLog("Could not create file name dumpdata.bin");\r
                return 1;\r
        }\r
        \r
                return 1;\r
        }\r
        \r
@@ -302,11 +303,10 @@ int CmdHF14AMfDump1k(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
                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
 \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
                        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
@@ -328,20 +328,23 @@ int CmdHF14AMfDump1k(const char *Cmd)
        PrintAndLog("|----- Dumping all blocks to file... -----|");\r
        PrintAndLog("|-----------------------------------------|");\r
        \r
        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
        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
                                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
                        }\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
                                }\r
                                else if (rights[i][j] == 7) {\r
                                        PrintAndLog("Access rights do not allow reading of sector %d block %d",i,j);\r
@@ -350,13 +353,13 @@ int CmdHF14AMfDump1k(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
                                        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
                                }\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
                                if (j == 3) {\r
                                        data[0]  = (keyA[i][0]);\r
                                        data[1]  = (keyA[i][1]);\r
@@ -390,7 +393,7 @@ int CmdHF14AMfDump1k(const char *Cmd)
   return 0;\r
 }\r
 \r
   return 0;\r
 }\r
 \r
-int CmdHF14AMfRestore1k(const char *Cmd)\r
+int CmdHF14AMfRestore(const char *Cmd)\r
 {\r
 \r
        int i,j;\r
 {\r
 \r
        int i,j;\r
@@ -404,11 +407,11 @@ int CmdHF14AMfRestore1k(const char *Cmd)
        FILE *fkeys;\r
        \r
        if ((fdump = fopen("dumpdata.bin","rb")) == NULL) {\r
        FILE *fkeys;\r
        \r
        if ((fdump = fopen("dumpdata.bin","rb")) == NULL) {\r
-               PrintAndLog("Could not find file dump.bin");\r
+               PrintAndLog("Could not find file dumpdata.bin");\r
                return 1;\r
        }\r
        if ((fkeys = fopen("dumpkeys.bin","rb")) == NULL) {\r
                return 1;\r
        }\r
        if ((fkeys = fopen("dumpkeys.bin","rb")) == NULL) {\r
-               PrintAndLog("Could not find file keys.bin");\r
+               PrintAndLog("Could not find file dumpkeys.bin");\r
                return 1;\r
        }\r
        \r
                return 1;\r
        }\r
        \r
@@ -457,10 +460,10 @@ int CmdHF14AMfRestore1k(const char *Cmd)
                        \r
                        memcpy(c.d.asBytes + 10, bldata, 16);\r
                        SendCommand(&c);\r
                        \r
                        memcpy(c.d.asBytes + 10, bldata, 16);\r
                        SendCommand(&c);\r
-                       UsbCommand *resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
 \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
                                PrintAndLog("isOk:%02x", isOK);\r
                        } else {\r
                                PrintAndLog("Command execute timeout");\r
@@ -562,7 +565,7 @@ int CmdHF14AMfNested(const char *Cmd)
                }\r
 \r
                for (i = 0; i < 16; i++) {\r
                }\r
 \r
                for (i = 0; i < 16; i++) {\r
-                       PrintAndLog("cnt=%d key= %s", i, sprint_hex(keyBlock + i * 6, 6));\r
+                       PrintAndLog("count=%d key= %s", i, sprint_hex(keyBlock + i * 6, 6));\r
                }\r
        \r
                // test keys\r
                }\r
        \r
                // test keys\r
@@ -663,7 +666,7 @@ int CmdHF14AMfNested(const char *Cmd)
                // Create dump file\r
                if (createDumpFile) {\r
                        if ((fkeys = fopen("dumpkeys.bin","wb")) == NULL) { \r
                // Create dump file\r
                if (createDumpFile) {\r
                        if ((fkeys = fopen("dumpkeys.bin","wb")) == NULL) { \r
-                               PrintAndLog("Could not create file keys.bin");\r
+                               PrintAndLog("Could not create file dumpkeys.bin");\r
                                free(e_sector);\r
                                return 1;\r
                        }\r
                                free(e_sector);\r
                                return 1;\r
                        }\r
@@ -695,59 +698,234 @@ int CmdHF14AMfNested(const char *Cmd)
        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r
+static  uint32_t\r
+get_trailer_block (uint32_t uiBlock)\r
+{\r
+  // Test if we are in the small or big sectors\r
+  uint32_t trailer_block = 0;\r
+  if (uiBlock < 128) {\r
+    trailer_block = uiBlock + (3 - (uiBlock % 4));\r
+  } else {\r
+    trailer_block = uiBlock + (15 - (uiBlock % 16));\r
+  }\r
+  return trailer_block;\r
+}\r
 int CmdHF14AMfChk(const char *Cmd)\r
 {\r
 int CmdHF14AMfChk(const char *Cmd)\r
 {\r
+       FILE * f;\r
+       char filename[256]={0};\r
+       char buf[13];\r
+       uint8_t *keyBlock = NULL, *p;\r
+       uint8_t stKeyBlock = 20;\r
+       \r
        int i, res;\r
        int     keycnt = 0;\r
        char ctmp       = 0x00;\r
        uint8_t blockNo = 0;\r
        int i, res;\r
        int     keycnt = 0;\r
        char ctmp       = 0x00;\r
        uint8_t blockNo = 0;\r
+       uint8_t SectorsCnt = 1;\r
        uint8_t keyType = 0;\r
        uint8_t keyType = 0;\r
-       uint8_t keyBlock[8 * 6];\r
        uint64_t key64 = 0;\r
        uint64_t key64 = 0;\r
+       \r
+       int transferToEml = 0;\r
+       int createDumpFile = 0;\r
 \r
 \r
-       memset(keyBlock, 0x00, sizeof(keyBlock));\r
-\r
+       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
+       \r
        if (strlen(Cmd)<3) {\r
        if (strlen(Cmd)<3) {\r
-               PrintAndLog("Usage:  hf mf chk <block number> <key A/B> [<key (12 hex symbols)>]");\r
-               PrintAndLog("      sample: hf mf chk 0 A FFFFFFFFFFFF a0a1a2a3a4a5 b0b1b2b3b4b5 ");\r
+               PrintAndLog("Usage:  hf mf chk <block number>/<*card memory> <key type (A/B/?)> [t] [<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
+               \r
+               PrintAndLog("      sample: hf mf chk 0 A 1234567890ab keys.dic");\r
+               PrintAndLog("              hf mf chk *1 ? t");\r
                return 0;\r
        }       \r
        \r
                return 0;\r
        }       \r
        \r
-       blockNo = param_get8(Cmd, 0);\r
+       if (param_getchar(Cmd, 0)=='*') {\r
+               blockNo = 3;\r
+               switch(param_getchar(Cmd+1, 0)) {\r
+                       case '0': SectorsCnt =  5; break;\r
+                       case '1': SectorsCnt = 16; break;\r
+                       case '2': SectorsCnt = 32; break;\r
+                       case '4': SectorsCnt = 40; break;\r
+                       default:  SectorsCnt = 16;\r
+               }\r
+       }\r
+       else\r
+               blockNo = param_get8(Cmd, 0);\r
+       \r
        ctmp = param_getchar(Cmd, 1);\r
        ctmp = param_getchar(Cmd, 1);\r
-       if (ctmp == 0x00) {\r
-               PrintAndLog("Key type must be A or B");\r
+       switch (ctmp) { \r
+       case 'a': case 'A':\r
+               keyType = !0;\r
+               break;\r
+       case 'b': case 'B':\r
+               keyType = !1;\r
+               break;\r
+       case '?':\r
+               keyType = 2;\r
+               break;\r
+       default:\r
+               PrintAndLog("Key type must be A , B or ?");\r
                return 1;\r
                return 1;\r
-       }\r
-       if (ctmp != 'A' && ctmp != 'a') keyType = 1;\r
+       };\r
+       \r
+       ctmp = param_getchar(Cmd, 2);\r
+       if              (ctmp == 't' || ctmp == 'T') transferToEml = 1;\r
+       else if (ctmp == 'd' || ctmp == 'D') createDumpFile = 1;\r
        \r
        \r
-       for (i = 0; i < 6; i++) {\r
-               if (!isxdigit(param_getchar(Cmd, 2 + i))) break;\r
+       for (i = transferToEml || createDumpFile; param_getchar(Cmd, 2 + i); i++) {\r
+               if (!param_gethex(Cmd, 2 + i, keyBlock + 6 * keycnt, 12)) {\r
+                       if ( stKeyBlock - keycnt < 2) {\r
+                               p = realloc(keyBlock, 6*(stKeyBlock+=10));\r
+                               if (!p) {\r
+                                       PrintAndLog("Cannot allocate memory for Keys");\r
+                                       free(keyBlock);\r
+                                       return 2;\r
+                               }\r
+                               keyBlock = p;\r
+                       }\r
+                       PrintAndLog("chk 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
+                       keycnt++;\r
+               } else {\r
+                       // May be a dic file\r
+                       if ( param_getstr(Cmd, 2 + i,filename) > 255 ) {\r
+                               PrintAndLog("File name too long");\r
+                               free(keyBlock);\r
+                               return 2;\r
+                       }\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
+                                       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
 \r
 \r
-               if (param_gethex(Cmd, 2 + i, keyBlock + 6 * i, 12)) {\r
-                       PrintAndLog("Key[%d] must include 12 HEX symbols", i);\r
-                       return 1;\r
+                                       if (!isxdigit(buf[0])){\r
+                                               PrintAndLog("File content error. '%s' must include 12 HEX symbols",buf);\r
+                                               continue;\r
+                                       }\r
+                                       \r
+                                       buf[12] = 0;\r
+\r
+                                       if ( stKeyBlock - keycnt < 2) {\r
+                                               p = realloc(keyBlock, 6*(stKeyBlock+=10));\r
+                                               if (!p) {\r
+                                                       PrintAndLog("Cannot allocate memory for defKeys");\r
+                                                       free(keyBlock);\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[%d] %012llx", keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));\r
+                                       keycnt++;\r
+                               }\r
+                       } else {\r
+                               PrintAndLog("File: %s: not found or locked.", filename);\r
+                               free(keyBlock);\r
+                               return 1;\r
+                       fclose(f);\r
+                       }\r
                }\r
                }\r
-               keycnt = i + 1;\r
        }\r
        \r
        if (keycnt == 0) {\r
        }\r
        \r
        if (keycnt == 0) {\r
-               PrintAndLog("There is must be at least one key");\r
-               return 1;\r
+               PrintAndLog("No key specified,try default keys");\r
+               for (;keycnt <=12; 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
        }\r
        }\r
-\r
-       PrintAndLog("--block no:%02x key type:%02x key count:%d ", blockNo, keyType, keycnt);\r
        \r
        \r
-       res = mfCheckKeys(blockNo, keyType, keycnt, keyBlock, &key64);\r
-       if (res !=1) {\r
-               if (!res)\r
-                       PrintAndLog("isOk:%02x valid key:%012llx", 1, key64);\r
-               else\r
-                       PrintAndLog("isOk:%02x", 0);\r
-       } else {\r
-               PrintAndLog("Command execute timeout");\r
+       for ( int t = !keyType ; t < 2 ; keyType==2?(t++):(t=2) ) {\r
+               int b=blockNo;\r
+               for (int i=0; i<SectorsCnt; ++i) {\r
+                       PrintAndLog("--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
+                               if (res !=1) {\r
+                                       if (!res) {\r
+                                               PrintAndLog("Found valid key:[%012llx]",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
+                               }\r
+                       }\r
+                       b<127?(b+=4):(b+=16);   \r
+               }\r
        }\r
        }\r
+       \r
+       free(keyBlock);\r
 \r
 \r
+/*\r
+       // Create dump file\r
+       if (createDumpFile) {\r
+               if ((fkeys = fopen("dumpkeys.bin","wb")) == NULL) { \r
+                       PrintAndLog("Could not create file dumpkeys.bin");\r
+                       free(e_sector);\r
+                       return 1;\r
+               }\r
+               PrintAndLog("Printing keys to bynary file dumpkeys.bin...");\r
+               for(i=0; i<16; i++) {\r
+                       if (e_sector[i].foundKey[0]){\r
+                               num_to_bytes(e_sector[i].Key[0], 6, tempkey);\r
+                               fwrite ( tempkey, 1, 6, fkeys );\r
+                       }\r
+                       else{\r
+                               fwrite ( &standart, 1, 6, fkeys );\r
+                       }\r
+               }\r
+               for(i=0; i<16; i++) {\r
+                       if (e_sector[i].foundKey[1]){\r
+                               num_to_bytes(e_sector[i].Key[1], 6, tempkey);\r
+                               fwrite ( tempkey, 1, 6, fkeys );\r
+                       }\r
+                       else{\r
+                               fwrite ( &standart, 1, 6, fkeys );\r
+                       }\r
+               }\r
+               fclose(fkeys);\r
+       }\r
+*/\r
   return 0;\r
 }\r
 \r
   return 0;\r
 }\r
 \r
@@ -809,10 +987,6 @@ int CmdHF14AMfEGet(const char *Cmd)
        }       \r
        \r
        blockNo = param_get8(Cmd, 0);\r
        }       \r
        \r
        blockNo = param_get8(Cmd, 0);\r
-       if (blockNo >= 16 * 4) {\r
-               PrintAndLog("Block number must be in [0..63] as in MIFARE classic.");\r
-               return 1;\r
-       }\r
 \r
        PrintAndLog(" ");\r
        if (!mfEmlGetMem(data, blockNo, 3)) {\r
 \r
        PrintAndLog(" ");\r
        if (!mfEmlGetMem(data, blockNo, 3)) {\r
@@ -853,10 +1027,6 @@ int CmdHF14AMfESet(const char *Cmd)
        }       \r
        \r
        blockNo = param_get8(Cmd, 0);\r
        }       \r
        \r
        blockNo = param_get8(Cmd, 0);\r
-       if (blockNo >= 16 * 4) {\r
-               PrintAndLog("Block number must be in [0..63] 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
        \r
        if (param_gethex(Cmd, 1, memBlock, 32)) {\r
                PrintAndLog("block data must include 32 HEX symbols");\r
@@ -882,7 +1052,7 @@ int CmdHF14AMfELoad(const char *Cmd)
        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
+       if (param_getchar(Cmd, 0) == 'h' || param_getchar(Cmd, 0)== 0x00) {\r
                PrintAndLog("It loads emul dump from the file `filename.eml`");\r
                PrintAndLog("Usage:  hf mf eload <file name w/o `.eml`>");\r
                PrintAndLog(" sample: hf mf eload filename");\r
                PrintAndLog("It loads emul dump from the file `filename.eml`");\r
                PrintAndLog("Usage:  hf mf eload <file name w/o `.eml`>");\r
                PrintAndLog(" sample: hf mf eload filename");\r
@@ -891,9 +1061,6 @@ int CmdHF14AMfELoad(const char *Cmd)
 \r
        len = strlen(Cmd);\r
        if (len > 14) len = 14;\r
 \r
        len = strlen(Cmd);\r
        if (len > 14) len = 14;\r
-       \r
-       if (len < 1) {\r
-       }\r
 \r
        memcpy(filename, Cmd, len);\r
        fnameptr += len;\r
 \r
        memcpy(filename, Cmd, len);\r
        fnameptr += len;\r
@@ -911,7 +1078,10 @@ int CmdHF14AMfELoad(const char *Cmd)
        while(!feof(f)){\r
                memset(buf, 0, sizeof(buf));\r
                fgets(buf, sizeof(buf), f);\r
        while(!feof(f)){\r
                memset(buf, 0, sizeof(buf));\r
                fgets(buf, sizeof(buf), f);\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
                        return 2;\r
                }\r
                        PrintAndLog("File content error. Block data must include 32 HEX symbols");\r
                        return 2;\r
                }\r
@@ -925,11 +1095,11 @@ int CmdHF14AMfELoad(const char *Cmd)
                }\r
                blockNum++;\r
                \r
                }\r
                blockNum++;\r
                \r
-               if (blockNum >= 16 * 4) break;\r
+               if (blockNum >= 32 * 4 + 8 * 16) break;\r
        }\r
        fclose(f);\r
        \r
        }\r
        fclose(f);\r
        \r
-       if (blockNum != 16 * 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
        }\r
                PrintAndLog("File content error. There must be 64 blocks");\r
                return 4;\r
        }\r
@@ -978,7 +1148,7 @@ int CmdHF14AMfESave(const char *Cmd)
        f = fopen(filename, "w+");\r
 \r
        // put hex\r
        f = fopen(filename, "w+");\r
 \r
        // put hex\r
-       for (i = 0; i < 16 * 4; i++) {\r
+       for (i = 0; i < 32 * 4 + 8 * 16; i++) {\r
                if (mfEmlGetMem(buf, i, 1)) {\r
                        PrintAndLog("Cant get block: %d", i);\r
                        break;\r
                if (mfEmlGetMem(buf, i, 1)) {\r
                        PrintAndLog("Cant get block: %d", i);\r
                        break;\r
@@ -1020,16 +1190,17 @@ int CmdHF14AMfECFill(const char *Cmd)
 \r
 int CmdHF14AMfEKeyPrn(const char *Cmd)\r
 {\r
 \r
 int CmdHF14AMfEKeyPrn(const char *Cmd)\r
 {\r
-       int i;\r
+       int i,b=-1;\r
        uint8_t data[16];\r
        uint64_t keyA, keyB;\r
        \r
        PrintAndLog("|---|----------------|----------------|");\r
        PrintAndLog("|sec|key A           |key B           |");\r
        PrintAndLog("|---|----------------|----------------|");\r
        uint8_t data[16];\r
        uint64_t keyA, keyB;\r
        \r
        PrintAndLog("|---|----------------|----------------|");\r
        PrintAndLog("|sec|key A           |key B           |");\r
        PrintAndLog("|---|----------------|----------------|");\r
-       for (i = 0; i < 16; i++) {\r
-               if (mfEmlGetMem(data, i * 4 + 3, 1)) {\r
-                       PrintAndLog("error get block %d", i * 4 + 3);\r
+       for (i = 0; i < 40; i++) {\r
+               b<127?(b+=4):(b+=16);\r
+               if (mfEmlGetMem(data, b, 1)) {\r
+                       PrintAndLog("error get block %d", b);\r
                        break;\r
                }\r
                keyA = bytes_to_num(data, 6);\r
                        break;\r
                }\r
                keyA = bytes_to_num(data, 6);\r
@@ -1041,33 +1212,471 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r
+int CmdHF14AMfCSetUID(const char *Cmd)\r
+{\r
+       uint8_t wipeCard = 0;\r
+       uint8_t uid[8];\r
+       uint8_t oldUid[8];\r
+       int res;\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
+               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
+\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
+\r
+       res = mfCSetUID(uid, 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
+       return 0;\r
+}\r
+\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
+                       fgets(buf, sizeof(buf), f);\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
+  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) {\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
+  return 0;\r
+}\r
+\r
 static command_t CommandTable[] =\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
   {"rdsc",             CmdHF14AMfRdSc,                 0, "Read MIFARE classic sector"},\r
   {"rdbl",             CmdHF14AMfRdBl,                 0, "Read MIFARE classic block"},\r
   {"rdsc",             CmdHF14AMfRdSc,                 0, "Read MIFARE classic sector"},\r
-  {"dump1k",   CmdHF14AMfDump1k,               0, "Dump MIFARE classic tag to binary file"},\r
-  {"restore1k",        CmdHF14AMfRestore1k,    0, "Restore MIFARE classic binary file to BLANK tag"},\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
   {"wrbl",             CmdHF14AMfWrBl,                 0, "Write MIFARE classic block"},\r
-  {"chk",              CmdHF14AMfChk,                  0, "Test block up to 8 keys"},\r
+  {"chk",                      CmdHF14AMfChk,                  0, "Test block keys"},\r
   {"mifare",   CmdHF14AMifare,                 0, "Read parity error messages. param - <used card nonce>"},\r
   {"nested",   CmdHF14AMfNested,               0, "Test nested authentication"},\r
   {"mifare",   CmdHF14AMifare,                 0, "Read parity error messages. param - <used card nonce>"},\r
   {"nested",   CmdHF14AMfNested,               0, "Test nested authentication"},\r
-  {"sim",              CmdHF14AMf1kSim,                0, "Simulate MIFARE 1k 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
   {"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
   {"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
 };\r
 \r
 int CmdHFMF(const char *Cmd)\r
 {\r
        // flush\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
 \r
   CmdsParse(CommandTable, Cmd);\r
   return 0;\r
Impressum, Datenschutz