]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhfmf.c
projects / proxmark3-svn / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Updated changelog
[proxmark3-svn] / client / cmdhfmf.c
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index d306ac65c8aec1d35cca859707bd5800f79ce02f..48e78b1c2fcad2a74a90de187356d346ed54492c 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -121,11 +121,10 @@ int CmdHF14AMfWrBl(const char *Cmd)
        PrintAndLog("--block no:%d, key type:%c, key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r
        PrintAndLog("--data: %s", sprint_hex(bldata, 16));\r
        \r
        PrintAndLog("--block no:%d, key type:%c, key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r
        PrintAndLog("--data: %s", sprint_hex(bldata, 16));\r
        \r
-       UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};\r
+  UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};\r
        memcpy(c.d.asBytes, key, 6);\r
        memcpy(c.d.asBytes + 10, bldata, 16);\r
        memcpy(c.d.asBytes, key, 6);\r
        memcpy(c.d.asBytes + 10, bldata, 16);\r
-       clearCommandBuffer();\r
-       SendCommand(&c);\r
+  SendCommand(&c);\r
 \r
        UsbCommand resp;\r
        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
 \r
        UsbCommand resp;\r
        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
@@ -143,7 +142,7 @@ int CmdHF14AMfRdBl(const char *Cmd)
        uint8_t blockNo = 0;\r
        uint8_t keyType = 0;\r
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
        uint8_t blockNo = 0;\r
        uint8_t keyType = 0;\r
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
-\r
+       \r
        char cmdp       = 0x00;\r
 \r
 \r
        char cmdp       = 0x00;\r
 \r
 \r
@@ -151,8 +150,8 @@ int CmdHF14AMfRdBl(const char *Cmd)
                PrintAndLog("Usage:  hf mf rdbl    <block number> <key A/B> <key (12 hex symbols)>");\r
                PrintAndLog("        sample: hf mf rdbl 0 A FFFFFFFFFFFF ");\r
                return 0;\r
                PrintAndLog("Usage:  hf mf rdbl    <block number> <key A/B> <key (12 hex symbols)>");\r
                PrintAndLog("        sample: hf mf rdbl 0 A FFFFFFFFFFFF ");\r
                return 0;\r
-       }\r
-\r
+       }       \r
+       \r
        blockNo = param_get8(Cmd, 0);\r
        cmdp = param_getchar(Cmd, 1);\r
        if (cmdp == 0x00) {\r
        blockNo = param_get8(Cmd, 0);\r
        cmdp = param_getchar(Cmd, 1);\r
        if (cmdp == 0x00) {\r
@@ -165,11 +164,10 @@ int CmdHF14AMfRdBl(const char *Cmd)
                return 1;\r
        }\r
        PrintAndLog("--block no:%d, key type:%c, key:%s ", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r
                return 1;\r
        }\r
        PrintAndLog("--block no:%d, key type:%c, key:%s ", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r
-\r
-       UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};\r
+       \r
+  UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};\r
        memcpy(c.d.asBytes, key, 6);\r
        memcpy(c.d.asBytes, key, 6);\r
-       clearCommandBuffer();\r
-       SendCommand(&c);\r
+  SendCommand(&c);\r
 \r
        UsbCommand resp;\r
        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
 \r
        UsbCommand resp;\r
        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
@@ -219,10 +217,9 @@ int CmdHF14AMfRdSc(const char *Cmd)
                return 1;\r
        }\r
        PrintAndLog("--sector no:%d key type:%c key:%s ", sectorNo, keyType?'B':'A', sprint_hex(key, 6));\r
                return 1;\r
        }\r
        PrintAndLog("--sector no:%d key type:%c key:%s ", sectorNo, keyType?'B':'A', sprint_hex(key, 6));\r
-\r
+       \r
        UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};\r
        memcpy(c.d.asBytes, key, 6);\r
        UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};\r
        memcpy(c.d.asBytes, key, 6);\r
-       clearCommandBuffer();\r
        SendCommand(&c);\r
        PrintAndLog(" ");\r
 \r
        SendCommand(&c);\r
        PrintAndLog(" ");\r
 \r
@@ -242,7 +239,7 @@ int CmdHF14AMfRdSc(const char *Cmd)
                PrintAndLog("Command execute timeout");\r
        }\r
 \r
                PrintAndLog("Command execute timeout");\r
        }\r
 \r
-       return 0;\r
+  return 0;\r
 }\r
 \r
 uint8_t FirstBlockOfSector(uint8_t sectorNo)\r
 }\r
 \r
 uint8_t FirstBlockOfSector(uint8_t sectorNo)\r
@@ -266,7 +263,7 @@ uint8_t NumBlocksPerSector(uint8_t sectorNo)
 int CmdHF14AMfDump(const char *Cmd)\r
 {\r
        uint8_t sectorNo, blockNo;\r
 int CmdHF14AMfDump(const char *Cmd)\r
 {\r
        uint8_t sectorNo, blockNo;\r
-\r
+       \r
        uint8_t keyA[40][6];\r
        uint8_t keyB[40][6];\r
        uint8_t rights[40][4];\r
        uint8_t keyA[40][6];\r
        uint8_t keyB[40][6];\r
        uint8_t rights[40][4];\r
@@ -319,17 +316,16 @@ int CmdHF14AMfDump(const char *Cmd)
                        return 2;\r
                }\r
        }\r
                        return 2;\r
                }\r
        }\r
-\r
+       \r
        fclose(fin);\r
 \r
        PrintAndLog("|-----------------------------------------|");\r
        PrintAndLog("|------ Reading sector access bits...-----|");\r
        PrintAndLog("|-----------------------------------------|");\r
        fclose(fin);\r
 \r
        PrintAndLog("|-----------------------------------------|");\r
        PrintAndLog("|------ Reading sector access bits...-----|");\r
        PrintAndLog("|-----------------------------------------|");\r
-\r
+       \r
        for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
                UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}};\r
                memcpy(c.d.asBytes, keyA[sectorNo], 6);\r
        for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
                UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}};\r
                memcpy(c.d.asBytes, keyA[sectorNo], 6);\r
-               clearCommandBuffer();\r
                SendCommand(&c);\r
 \r
                if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
                SendCommand(&c);\r
 \r
                if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
@@ -351,11 +347,11 @@ int CmdHF14AMfDump(const char *Cmd)
                        rights[sectorNo][3] = 0x01;\r
                }\r
        }\r
                        rights[sectorNo][3] = 0x01;\r
                }\r
        }\r
-\r
+       \r
        PrintAndLog("|-----------------------------------------|");\r
        PrintAndLog("|----- Dumping all blocks to file... -----|");\r
        PrintAndLog("|-----------------------------------------|");\r
        PrintAndLog("|-----------------------------------------|");\r
        PrintAndLog("|----- Dumping all blocks to file... -----|");\r
        PrintAndLog("|-----------------------------------------|");\r
-\r
+       \r
        bool isOK = true;\r
        for (sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {\r
                for (blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {\r
        bool isOK = true;\r
        for (sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {\r
                for (blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {\r
@@ -364,7 +360,6 @@ int CmdHF14AMfDump(const char *Cmd)
                        if (blockNo == NumBlocksPerSector(sectorNo) - 1) {              // sector trailer. At least the Access Conditions can always be read with key A. \r
                                UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};\r
                                memcpy(c.d.asBytes, keyA[sectorNo], 6);\r
                        if (blockNo == NumBlocksPerSector(sectorNo) - 1) {              // sector trailer. At least the Access Conditions can always be read with key A. \r
                                UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};\r
                                memcpy(c.d.asBytes, keyA[sectorNo], 6);\r
-                               clearCommandBuffer();\r
                                SendCommand(&c);\r
                                received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                        } else {                                                                                                // data block. Check if it can be read with key A or key B\r
                                SendCommand(&c);\r
                                received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                        } else {                                                                                                // data block. Check if it can be read with key A or key B\r
@@ -372,7 +367,6 @@ int CmdHF14AMfDump(const char *Cmd)
                                if ((rights[sectorNo][data_area] == 0x03) || (rights[sectorNo][data_area] == 0x05)) {   // only key B would work\r
                                        UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 1, 0}};\r
                                        memcpy(c.d.asBytes, keyB[sectorNo], 6);\r
                                if ((rights[sectorNo][data_area] == 0x03) || (rights[sectorNo][data_area] == 0x05)) {   // only key B would work\r
                                        UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 1, 0}};\r
                                        memcpy(c.d.asBytes, keyB[sectorNo], 6);\r
-                                       clearCommandBuffer();\r
                                        SendCommand(&c);\r
                                        received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                                } else if (rights[sectorNo][data_area] == 0x07) {                                                                               // no key would work\r
                                        SendCommand(&c);\r
                                        received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                                } else if (rights[sectorNo][data_area] == 0x07) {                                                                               // no key would work\r
@@ -381,7 +375,6 @@ int CmdHF14AMfDump(const char *Cmd)
                                } else {                                                                                                                                                                // key A would work\r
                                        UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};\r
                                        memcpy(c.d.asBytes, keyA[sectorNo], 6);\r
                                } else {                                                                                                                                                                // key A would work\r
                                        UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};\r
                                        memcpy(c.d.asBytes, keyA[sectorNo], 6);\r
-                                       clearCommandBuffer();\r
                                        SendCommand(&c);\r
                                        received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                                }\r
                                        SendCommand(&c);\r
                                        received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                                }\r
@@ -525,7 +518,6 @@ int CmdHF14AMfRestore(const char *Cmd)
                        PrintAndLog("Writing to block %3d: %s", FirstBlockOfSector(sectorNo) + blockNo, sprint_hex(bldata, 16));\r
                        \r
                        memcpy(c.d.asBytes + 10, bldata, 16);\r
                        PrintAndLog("Writing to block %3d: %s", FirstBlockOfSector(sectorNo) + blockNo, sprint_hex(bldata, 16));\r
                        \r
                        memcpy(c.d.asBytes + 10, bldata, 16);\r
-                       clearCommandBuffer();\r
                        SendCommand(&c);\r
 \r
                        UsbCommand resp;\r
                        SendCommand(&c);\r
 \r
                        UsbCommand resp;\r
@@ -875,7 +867,6 @@ int CmdHF14AMfChk(const char *Cmd)
                break;\r
        default:\r
                PrintAndLog("Key type must be A , B or ?");\r
                break;\r
        default:\r
                PrintAndLog("Key type must be A , B or ?");\r
-               free(keyBlock);\r
                return 1;\r
        };\r
        \r
                return 1;\r
        };\r
        \r
@@ -927,7 +918,6 @@ int CmdHF14AMfChk(const char *Cmd)
                                                if (!p) {\r
                                                        PrintAndLog("Cannot allocate memory for defKeys");\r
                                                        free(keyBlock);\r
                                                if (!p) {\r
                                                        PrintAndLog("Cannot allocate memory for defKeys");\r
                                                        free(keyBlock);\r
-                                                       fclose(f);\r
                                                        return 2;\r
                                                }\r
                                                keyBlock = p;\r
                                                        return 2;\r
                                                }\r
                                                keyBlock = p;\r
@@ -1079,7 +1069,6 @@ int CmdHF14AMf1kSim(const char *Cmd)
 \r
        UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads,0}};\r
        memcpy(c.d.asBytes, uid, sizeof(uid));\r
 \r
        UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads,0}};\r
        memcpy(c.d.asBytes, uid, sizeof(uid));\r
-       clearCommandBuffer();\r
        SendCommand(&c);\r
 \r
        if(flags & FLAG_INTERACTIVE)\r
        SendCommand(&c);\r
 \r
        if(flags & FLAG_INTERACTIVE)\r
@@ -1088,7 +1077,7 @@ int CmdHF14AMf1kSim(const char *Cmd)
                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
                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
+                       // annoying message about "Waiting for a response... "\r
                }\r
        }\r
        \r
                }\r
        }\r
        \r
@@ -1155,6 +1144,7 @@ int CmdHF14AMfEClear(const char *Cmd)
   return 0;\r
 }\r
 \r
   return 0;\r
 }\r
 \r
+\r
 int CmdHF14AMfESet(const char *Cmd)\r
 {\r
        uint8_t memBlock[16];\r
 int CmdHF14AMfESet(const char *Cmd)\r
 {\r
        uint8_t memBlock[16];\r
@@ -1182,6 +1172,7 @@ int CmdHF14AMfESet(const char *Cmd)
        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r
+\r
 int CmdHF14AMfELoad(const char *Cmd)\r
 {\r
        FILE * f;\r
 int CmdHF14AMfELoad(const char *Cmd)\r
 {\r
        FILE * f;\r
@@ -1191,13 +1182,13 @@ int CmdHF14AMfELoad(const char *Cmd)
        uint8_t buf8[64] = {0x00};\r
        int i, len, blockNum, numBlocks;\r
        int nameParamNo = 1;\r
        uint8_t buf8[64] = {0x00};\r
        int i, len, blockNum, numBlocks;\r
        int nameParamNo = 1;\r
-       uint8_t blockWidth = 32;        \r
+       \r
        char ctmp = param_getchar(Cmd, 0);\r
                \r
        if ( ctmp == 'h' || ctmp == 0x00) {\r
                PrintAndLog("It loads emul dump from the file `filename.eml`");\r
        char ctmp = param_getchar(Cmd, 0);\r
                \r
        if ( ctmp == 'h' || ctmp == 0x00) {\r
                PrintAndLog("It loads emul dump from the file `filename.eml`");\r
-               PrintAndLog("Usage:  hf mf eload [card memory] <file name w/o `.eml`> [numblocks]");\r
-               PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K, u = UL");\r
+               PrintAndLog("Usage:  hf mf eload [card memory] <file name w/o `.eml`>");\r
+               PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r
                PrintAndLog("");\r
                PrintAndLog(" sample: hf mf eload filename");\r
                PrintAndLog("         hf mf eload 4 filename");\r
                PrintAndLog("");\r
                PrintAndLog(" sample: hf mf eload filename");\r
                PrintAndLog("         hf mf eload 4 filename");\r
@@ -1210,18 +1201,15 @@ int CmdHF14AMfELoad(const char *Cmd)
                case '\0': numBlocks = 16*4; break;\r
                case '2' : numBlocks = 32*4; break;\r
                case '4' : numBlocks = 256; break;\r
                case '\0': numBlocks = 16*4; break;\r
                case '2' : numBlocks = 32*4; break;\r
                case '4' : numBlocks = 256; break;\r
-               case 'U' : // fall through\r
-               case 'u' : numBlocks = 255; blockWidth = 8; break;\r
                default:  {\r
                        numBlocks = 16*4;\r
                        nameParamNo = 0;\r
                }\r
        }\r
                default:  {\r
                        numBlocks = 16*4;\r
                        nameParamNo = 0;\r
                }\r
        }\r
-       uint32_t numblk2 = param_get32ex(Cmd,2,0,10);\r
-       if (numblk2 > 0) numBlocks = numblk2;   \r
 \r
        len = param_getstr(Cmd,nameParamNo,filename);\r
 \r
        len = param_getstr(Cmd,nameParamNo,filename);\r
-       if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
+       \r
+       if (len > FILE_PATH_SIZE - 4) len = FILE_PATH_SIZE - 4;\r
 \r
        fnameptr += len;\r
 \r
 \r
        fnameptr += len;\r
 \r
@@ -1247,18 +1235,19 @@ int CmdHF14AMfELoad(const char *Cmd)
                        return 2;\r
                }\r
                \r
                        return 2;\r
                }\r
                \r
-               if (strlen(buf) < blockWidth){\r
+               if (strlen(buf) < 32){\r
                        if(strlen(buf) && feof(f))\r
                                break;\r
                        if(strlen(buf) && feof(f))\r
                                break;\r
-                       PrintAndLog("File content error. Block data must include %d HEX symbols", blockWidth);\r
+                       PrintAndLog("File content error. Block data must include 32 HEX symbols");\r
                        fclose(f);\r
                        return 2;\r
                }\r
                \r
                        fclose(f);\r
                        return 2;\r
                }\r
                \r
-               for (i = 0; i < blockWidth; i += 2) {\r
+               for (i = 0; i < 32; i += 2) {\r
                        sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);\r
                        sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);\r
-               }               \r
-               if (mfEmlSetMem_xt(buf8, blockNum, 1, blockWidth/2)) {\r
+               }\r
+               \r
+               if (mfEmlSetMem(buf8, blockNum, 1)) {\r
                        PrintAndLog("Cant set emul block: %3d", blockNum);\r
                        fclose(f);\r
                        return 3;\r
                        PrintAndLog("Cant set emul block: %3d", blockNum);\r
                        fclose(f);\r
                        return 3;\r
@@ -1279,6 +1268,7 @@ int CmdHF14AMfELoad(const char *Cmd)
        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r
+\r
 int CmdHF14AMfESave(const char *Cmd)\r
 {\r
        FILE * f;\r
 int CmdHF14AMfESave(const char *Cmd)\r
 {\r
        FILE * f;\r
@@ -1318,7 +1308,7 @@ int CmdHF14AMfESave(const char *Cmd)
 \r
        len = param_getstr(Cmd,nameParamNo,filename);\r
        \r
 \r
        len = param_getstr(Cmd,nameParamNo,filename);\r
        \r
-       if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
+       if (len > FILE_PATH_SIZE - 4) len = FILE_PATH_SIZE - 4;\r
        \r
        // user supplied filename?\r
        if (len < 1) {\r
        \r
        // user supplied filename?\r
        if (len < 1) {\r
@@ -1364,6 +1354,7 @@ int CmdHF14AMfESave(const char *Cmd)
   return 0;\r
 }\r
 \r
   return 0;\r
 }\r
 \r
+\r
 int CmdHF14AMfECFill(const char *Cmd)\r
 {\r
        uint8_t keyType = 0;\r
 int CmdHF14AMfECFill(const char *Cmd)\r
 {\r
        uint8_t keyType = 0;\r
@@ -1403,6 +1394,7 @@ int CmdHF14AMfECFill(const char *Cmd)
        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r
+\r
 int CmdHF14AMfEKeyPrn(const char *Cmd)\r
 {\r
        int i;\r
 int CmdHF14AMfEKeyPrn(const char *Cmd)\r
 {\r
        int i;\r
@@ -1410,9 +1402,7 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
        uint8_t data[16];\r
        uint64_t keyA, keyB;\r
        \r
        uint8_t data[16];\r
        uint64_t keyA, keyB;\r
        \r
-       char cmdp = param_getchar(Cmd, 0);\r
-\r
-       if ( cmdp == 'h' || cmdp == 'H') {\r
+       if (param_getchar(Cmd, 0) == 'h') {\r
                PrintAndLog("It prints the keys loaded in the emulator memory");\r
                PrintAndLog("Usage:  hf mf ekeyprn [card memory]");\r
                PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r
                PrintAndLog("It prints the keys loaded in the emulator memory");\r
                PrintAndLog("Usage:  hf mf ekeyprn [card memory]");\r
                PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r
@@ -1421,6 +1411,8 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
                return 0;\r
        }       \r
 \r
                return 0;\r
        }       \r
 \r
+       char cmdp = param_getchar(Cmd, 0);\r
+       \r
        switch (cmdp) {\r
                case '0' : numSectors = 5; break;\r
                case '1' : \r
        switch (cmdp) {\r
                case '0' : numSectors = 5; break;\r
                case '1' : \r
@@ -1447,6 +1439,7 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r
+\r
 int CmdHF14AMfCSetUID(const char *Cmd)\r
 {\r
        uint8_t wipeCard = 0;\r
 int CmdHF14AMfCSetUID(const char *Cmd)\r
 {\r
        uint8_t wipeCard = 0;\r
@@ -1520,7 +1513,7 @@ int CmdHF14AMfCSetBlk(const char *Cmd)
 {\r
        uint8_t memBlock[16] = {0x00};\r
        uint8_t blockNo = 0;\r
 {\r
        uint8_t memBlock[16] = {0x00};\r
        uint8_t blockNo = 0;\r
-       uint8_t params = MAGIC_SINGLE;\r
+       bool wipeCard = FALSE;\r
        int res;\r
 \r
        if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
        int res;\r
 \r
        if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
@@ -1539,12 +1532,10 @@ int CmdHF14AMfCSetBlk(const char *Cmd)
        }\r
 \r
        char ctmp = param_getchar(Cmd, 2);\r
        }\r
 \r
        char ctmp = param_getchar(Cmd, 2);\r
-       if (ctmp == 'w' || ctmp == 'W')\r
-               params |= MAGIC_WIPE;\r
-\r
+       wipeCard = (ctmp == 'w' || ctmp == 'W');\r
        PrintAndLog("--block number:%2d data:%s", blockNo, sprint_hex(memBlock, 16));\r
 \r
        PrintAndLog("--block number:%2d data:%s", blockNo, sprint_hex(memBlock, 16));\r
 \r
-       res = mfCSetBlock(blockNo, memBlock, NULL, params);\r
+       res = mfCSetBlock(blockNo, memBlock, NULL, wipeCard, CSETBLOCK_SINGLE_OPER);\r
        if (res) {\r
                PrintAndLog("Can't write block. error=%d", res);\r
                return 1;\r
        if (res) {\r
                PrintAndLog("Can't write block. error=%d", res);\r
                return 1;\r
@@ -1552,21 +1543,18 @@ int CmdHF14AMfCSetBlk(const char *Cmd)
        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r
+\r
 int CmdHF14AMfCLoad(const char *Cmd)\r
 {\r
        FILE * f;\r
 int CmdHF14AMfCLoad(const char *Cmd)\r
 {\r
        FILE * f;\r
-       char filename[FILE_PATH_SIZE];\r
+       char filename[FILE_PATH_SIZE] = {0x00};\r
        char * fnameptr = filename;\r
        char buf[64] = {0x00};\r
        uint8_t buf8[64] = {0x00};\r
        uint8_t fillFromEmulator = 0;\r
        int i, len, blockNum, flags=0;\r
        \r
        char * fnameptr = filename;\r
        char buf[64] = {0x00};\r
        uint8_t buf8[64] = {0x00};\r
        uint8_t fillFromEmulator = 0;\r
        int i, len, blockNum, flags=0;\r
        \r
-       memset(filename, 0, sizeof(filename));\r
-\r
-       char ctmp = param_getchar(Cmd, 0);\r
-\r
-       if (ctmp == 'h' || ctmp == 'H' || ctmp == 0x00) {\r
+       if (param_getchar(Cmd, 0) == 'h' || param_getchar(Cmd, 0)== 0x00) {\r
                PrintAndLog("It loads magic Chinese card from the file `filename.eml`");\r
                PrintAndLog("or from emulator memory (option `e`)");\r
                PrintAndLog("Usage:  hf mf cload <file name w/o `.eml`>");\r
                PrintAndLog("It loads magic Chinese card from the file `filename.eml`");\r
                PrintAndLog("or from emulator memory (option `e`)");\r
                PrintAndLog("Usage:  hf mf cload <file name w/o `.eml`>");\r
@@ -1575,6 +1563,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
                return 0;\r
        }       \r
 \r
                return 0;\r
        }       \r
 \r
+       char ctmp = param_getchar(Cmd, 0);\r
        if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;\r
        \r
        if (fillFromEmulator) {\r
        if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;\r
        \r
        if (fillFromEmulator) {\r
@@ -1583,11 +1572,11 @@ int CmdHF14AMfCLoad(const char *Cmd)
                                PrintAndLog("Cant get block: %d", blockNum);\r
                                return 2;\r
                        }\r
                                PrintAndLog("Cant get block: %d", blockNum);\r
                                return 2;\r
                        }\r
-                       if (blockNum == 0) flags = MAGIC_INIT + MAGIC_WUPC;                             // switch on field and send magic sequence\r
+                       if (blockNum == 0) flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;                               // switch on field and send magic sequence\r
                        if (blockNum == 1) flags = 0;                                                                                                   // just write\r
                        if (blockNum == 1) flags = 0;                                                                                                   // just write\r
-                       if (blockNum == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;             // Done. Magic Halt and switch off field.\r
+                       if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;             // Done. Magic Halt and switch off field.\r
 \r
 \r
-                       if (mfCSetBlock(blockNum, buf8, NULL, flags)) {\r
+                       if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {\r
                                PrintAndLog("Cant set magic card block: %d", blockNum);\r
                                return 3;\r
                        }\r
                                PrintAndLog("Cant set magic card block: %d", blockNum);\r
                                return 3;\r
                        }\r
@@ -1595,7 +1584,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
                return 0;\r
        } else {\r
                len = strlen(Cmd);\r
                return 0;\r
        } else {\r
                len = strlen(Cmd);\r
-               if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
+               if (len > FILE_PATH_SIZE - 4) len = FILE_PATH_SIZE - 4;\r
 \r
                memcpy(filename, Cmd, len);\r
                fnameptr += len;\r
 \r
                memcpy(filename, Cmd, len);\r
                fnameptr += len;\r
@@ -1630,11 +1619,11 @@ int CmdHF14AMfCLoad(const char *Cmd)
                        for (i = 0; i < 32; i += 2)\r
                                sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);\r
 \r
                        for (i = 0; i < 32; i += 2)\r
                                sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);\r
 \r
-                       if (blockNum == 0) flags = MAGIC_INIT + MAGIC_WUPC;                             // switch on field and send magic sequence\r
+                       if (blockNum == 0) flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;                               // switch on field and send magic sequence\r
                        if (blockNum == 1) flags = 0;                                                                                                   // just write\r
                        if (blockNum == 1) flags = 0;                                                                                                   // just write\r
-                       if (blockNum == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;             // Done. Switch off field.\r
+                       if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;             // Done. Switch off field.\r
 \r
 \r
-                       if (mfCSetBlock(blockNum, buf8, NULL, flags)) {\r
+                       if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {\r
                                PrintAndLog("Can't set magic card block: %d", blockNum);\r
                                return 3;\r
                        }\r
                                PrintAndLog("Can't set magic card block: %d", blockNum);\r
                                return 3;\r
                        }\r
@@ -1655,13 +1644,12 @@ int CmdHF14AMfCLoad(const char *Cmd)
 }\r
 \r
 int CmdHF14AMfCGetBlk(const char *Cmd) {\r
 }\r
 \r
 int CmdHF14AMfCGetBlk(const char *Cmd) {\r
-       uint8_t data[16];\r
+       uint8_t memBlock[16];\r
        uint8_t blockNo = 0;\r
        int res;\r
        uint8_t blockNo = 0;\r
        int res;\r
-       memset(data, 0x00, sizeof(data));\r
-       char ctmp = param_getchar(Cmd, 0);\r
+       memset(memBlock, 0x00, sizeof(memBlock));\r
 \r
 \r
-       if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') {\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 such cards)\n");\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 such cards)\n");\r
@@ -1672,29 +1660,28 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
 \r
        PrintAndLog("--block number:%2d ", blockNo);\r
 \r
 \r
        PrintAndLog("--block number:%2d ", blockNo);\r
 \r
-       res = mfCGetBlock(blockNo, data, MAGIC_SINGLE);\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
        if (res) {\r
                        PrintAndLog("Can't read block. error=%d", res);\r
                        return 1;\r
                }\r
        \r
-       PrintAndLog("block data:%s", sprint_hex(data, sizeof(data)));\r
+       PrintAndLog("block data:%s", sprint_hex(memBlock, 16));\r
        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r
+\r
 int CmdHF14AMfCGetSc(const char *Cmd) {\r
 int CmdHF14AMfCGetSc(const char *Cmd) {\r
-       uint8_t data[16];\r
+       uint8_t memBlock[16] = {0x00};\r
        uint8_t sectorNo = 0;\r
        int i, res, flags;\r
        uint8_t sectorNo = 0;\r
        int i, res, flags;\r
-       memset(data, 0x00, sizeof(data));\r
-       char ctmp = param_getchar(Cmd, 0);\r
 \r
 \r
-       if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') {\r
+       if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
                PrintAndLog("Usage:  hf mf cgetsc <sector number>");\r
                PrintAndLog("sample:  hf mf cgetsc 0");\r
                PrintAndLog("Get sector data from magic Chinese card (only works with such cards)\n");\r
                return 0;\r
                PrintAndLog("Usage:  hf mf cgetsc <sector number>");\r
                PrintAndLog("sample:  hf mf cgetsc 0");\r
                PrintAndLog("Get sector data from magic Chinese card (only works with such cards)\n");\r
                return 0;\r
-       }\r
+       }       \r
 \r
        sectorNo = param_get8(Cmd, 0);\r
        if (sectorNo > 15) {\r
 \r
        sectorNo = param_get8(Cmd, 0);\r
        if (sectorNo > 15) {\r
@@ -1703,37 +1690,37 @@ int CmdHF14AMfCGetSc(const char *Cmd) {
        }\r
 \r
        PrintAndLog("--sector number:%d ", sectorNo);\r
        }\r
 \r
        PrintAndLog("--sector number:%d ", sectorNo);\r
-       PrintAndLog("block | data");\r
 \r
 \r
-       flags = MAGIC_INIT + MAGIC_WUPC;\r
+       flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r
        for (i = 0; i < 4; i++) {\r
                if (i == 1) flags = 0;\r
        for (i = 0; i < 4; i++) {\r
                if (i == 1) flags = 0;\r
-               if (i == 3) flags = MAGIC_HALT + MAGIC_OFF;\r
+               if (i == 3) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r
 \r
 \r
-               res = mfCGetBlock(sectorNo * 4 + i, data, flags);\r
+               res = mfCGetBlock(sectorNo * 4 + i, memBlock, flags);\r
                if (res) {\r
                        PrintAndLog("Can't read block. %d error=%d", sectorNo * 4 + i, res);\r
                        return 1;\r
                }\r
                if (res) {\r
                        PrintAndLog("Can't read block. %d error=%d", sectorNo * 4 + i, res);\r
                        return 1;\r
                }\r
-               PrintAndLog(" %3d | %s", sectorNo * 4 + i, sprint_hex(data, sizeof(data)));\r
+       \r
+               PrintAndLog("block %3d data:%s", sectorNo * 4 + i, sprint_hex(memBlock, 16));\r
        }\r
        return 0;\r
 }\r
 \r
        }\r
        return 0;\r
 }\r
 \r
+\r
 int CmdHF14AMfCSave(const char *Cmd) {\r
 \r
        FILE * f;\r
 int CmdHF14AMfCSave(const char *Cmd) {\r
 \r
        FILE * f;\r
-       char filename[FILE_PATH_SIZE];\r
+       char filename[FILE_PATH_SIZE] = {0x00};\r
        char * fnameptr = filename;\r
        uint8_t fillFromEmulator = 0;\r
        char * fnameptr = filename;\r
        uint8_t fillFromEmulator = 0;\r
-       uint8_t buf[64];\r
+       uint8_t buf[64] = {0x00};\r
        int i, j, len, flags;\r
        int i, j, len, flags;\r
+       \r
+       // memset(filename, 0, sizeof(filename));\r
+       // memset(buf, 0, sizeof(buf));\r
 \r
 \r
-       memset(filename, 0, sizeof(filename));\r
-       memset(buf, 0, sizeof(buf));\r
-       char ctmp = param_getchar(Cmd, 0);\r
-\r
-       if ( ctmp == 'h' || ctmp == 'H' ) {\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("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
@@ -1741,21 +1728,23 @@ int CmdHF14AMfCSave(const char *Cmd) {
                PrintAndLog("         hf mf esave filename");\r
                PrintAndLog("         hf mf esave e \n");\r
                return 0;\r
                PrintAndLog("         hf mf esave filename");\r
                PrintAndLog("         hf mf esave e \n");\r
                return 0;\r
-       }\r
+       }       \r
+\r
+       char ctmp = param_getchar(Cmd, 0);\r
        if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;\r
 \r
        if (fillFromEmulator) {\r
                // put into emulator\r
        if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;\r
 \r
        if (fillFromEmulator) {\r
                // put into emulator\r
-               flags = MAGIC_INIT + MAGIC_WUPC;\r
+               flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r
                for (i = 0; i < 16 * 4; i++) {\r
                        if (i == 1) flags = 0;\r
                for (i = 0; i < 16 * 4; i++) {\r
                        if (i == 1) flags = 0;\r
-                       if (i == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;\r
-\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
                        if (mfCGetBlock(i, buf, flags)) {\r
                                PrintAndLog("Cant get block: %d", i);\r
                                break;\r
                        }\r
-\r
+                       \r
                        if (mfEmlSetMem(buf, i, 1)) {\r
                                PrintAndLog("Cant set emul block: %d", i);\r
                                return 3;\r
                        if (mfEmlSetMem(buf, i, 1)) {\r
                                PrintAndLog("Cant set emul block: %d", i);\r
                                return 3;\r
@@ -1764,16 +1753,16 @@ int CmdHF14AMfCSave(const char *Cmd) {
                return 0;\r
        } else {\r
                len = strlen(Cmd);\r
                return 0;\r
        } else {\r
                len = strlen(Cmd);\r
-               if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
-\r
-               // get filename based on UID\r
+               if (len > FILE_PATH_SIZE - 4) len = FILE_PATH_SIZE - 4;\r
+       \r
                if (len < 1) {\r
                if (len < 1) {\r
-\r
-                       if (mfCGetBlock(0, buf, MAGIC_SINGLE)) {\r
+                       // get filename\r
+                       if (mfCGetBlock(0, buf, CSETBLOCK_SINGLE_OPER)) {\r
                                PrintAndLog("Cant get block: %d", 0);\r
                                len = sprintf(fnameptr, "dump");\r
                                fnameptr += len;\r
                                PrintAndLog("Cant get block: %d", 0);\r
                                len = sprintf(fnameptr, "dump");\r
                                fnameptr += len;\r
-                       } else {\r
+                       }\r
+                       else {\r
                                for (j = 0; j < 7; j++, fnameptr += 2)\r
                                        sprintf(fnameptr, "%02x", buf[j]); \r
                        }\r
                                for (j = 0; j < 7; j++, fnameptr += 2)\r
                                        sprintf(fnameptr, "%02x", buf[j]); \r
                        }\r
@@ -1782,9 +1771,8 @@ int CmdHF14AMfCSave(const char *Cmd) {
                        fnameptr += len;\r
                }\r
 \r
                        fnameptr += len;\r
                }\r
 \r
-               // add .eml extension\r
                sprintf(fnameptr, ".eml"); \r
                sprintf(fnameptr, ".eml"); \r
-\r
+       \r
                // open file\r
                f = fopen(filename, "w+");\r
 \r
                // open file\r
                f = fopen(filename, "w+");\r
 \r
@@ -1794,10 +1782,10 @@ int CmdHF14AMfCSave(const char *Cmd) {
                }\r
 \r
                // put hex\r
                }\r
 \r
                // put hex\r
-               flags = MAGIC_INIT + MAGIC_WUPC;\r
+               flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r
                for (i = 0; i < 16 * 4; i++) {\r
                        if (i == 1) flags = 0;\r
                for (i = 0; i < 16 * 4; i++) {\r
                        if (i == 1) flags = 0;\r
-                       if (i == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;\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
                \r
                        if (mfCGetBlock(i, buf, flags)) {\r
                                PrintAndLog("Cant get block: %d", i);\r
@@ -1807,13 +1795,15 @@ int CmdHF14AMfCSave(const char *Cmd) {
                                fprintf(f, "%02x", buf[j]); \r
                        fprintf(f,"\n");\r
                }\r
                                fprintf(f, "%02x", buf[j]); \r
                        fprintf(f,"\n");\r
                }\r
-               fflush(f);\r
                fclose(f);\r
                fclose(f);\r
+       \r
                PrintAndLog("Saved to file: %s", filename);\r
                PrintAndLog("Saved to file: %s", filename);\r
+       \r
                return 0;\r
        }\r
 }\r
 \r
                return 0;\r
        }\r
 }\r
 \r
+\r
 int CmdHF14AMfSniff(const char *Cmd){\r
 \r
        bool wantLogToFile = 0;\r
 int CmdHF14AMfSniff(const char *Cmd){\r
 \r
        bool wantLogToFile = 0;\r
@@ -1883,10 +1873,7 @@ int CmdHF14AMfSniff(const char *Cmd){
                        uint16_t traceLen = resp.arg[1];\r
                        len = resp.arg[2];\r
 \r
                        uint16_t traceLen = resp.arg[1];\r
                        len = resp.arg[2];\r
 \r
-                       if (res == 0) {\r
-                               free(buf);\r
-                               return 0;                                               // we are done\r
-                       }\r
+                       if (res == 0) return 0;                                         // we are done\r
 \r
                        if (res == 1) {                                                         // there is (more) data to be transferred\r
                                if (pckNum == 0) {                                              // first packet, (re)allocate necessary buffer\r
 \r
                        if (res == 1) {                                                         // there is (more) data to be transferred\r
                                if (pckNum == 0) {                                              // first packet, (re)allocate necessary buffer\r
@@ -1908,11 +1895,6 @@ int CmdHF14AMfSniff(const char *Cmd){
                                        bufsize = traceLen;\r
                                        memset(buf, 0x00, traceLen);\r
                                }\r
                                        bufsize = traceLen;\r
                                        memset(buf, 0x00, traceLen);\r
                                }\r
-                               if (bufPtr == NULL) {\r
-                                       PrintAndLog("Cannot allocate memory for trace");\r
-                                       free(buf);\r
-                                       return 2;\r
-                               }\r
                                memcpy(bufPtr, resp.d.asBytes, len);\r
                                bufPtr += len;\r
                                pckNum++;\r
                                memcpy(bufPtr, resp.d.asBytes, len);\r
                                bufPtr += len;\r
                                pckNum++;\r
@@ -1970,7 +1952,7 @@ int CmdHF14AMfSniff(const char *Cmd){
 }\r
 \r
 //needs nt, ar, at, Data to decrypt\r
 }\r
 \r
 //needs nt, ar, at, Data to decrypt\r
-int CmdHf14MfDecryptBytes(const char *Cmd){\r
+int CmdDecryptTraceCmds(const char *Cmd){\r
        uint8_t data[50];\r
        int len = 0;\r
        param_gethex_ex(Cmd,3,data,&len);\r
        uint8_t data[50];\r
        int len = 0;\r
        param_gethex_ex(Cmd,3,data,&len);\r
@@ -2004,7 +1986,7 @@ static command_t CommandTable[] =
   {"cgetsc",   CmdHF14AMfCGetSc,               0, "Read sector - Magic Chinese card"},\r
   {"cload",            CmdHF14AMfCLoad,                0, "Load dump into magic Chinese card"},\r
   {"csave",            CmdHF14AMfCSave,                0, "Save dump from magic Chinese card into file or emulator"},\r
   {"cgetsc",   CmdHF14AMfCGetSc,               0, "Read sector - Magic Chinese card"},\r
   {"cload",            CmdHF14AMfCLoad,                0, "Load dump into magic Chinese card"},\r
   {"csave",            CmdHF14AMfCSave,                0, "Save dump from magic Chinese card into file or emulator"},\r
-  {"decrypt", CmdHf14MfDecryptBytes,1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"},\r
+  {"decrypt", CmdDecryptTraceCmds,1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"},\r
   {NULL, NULL, 0, NULL}\r
 };\r
 \r
   {NULL, NULL, 0, NULL}\r
 };\r
 \r
Proxmark3 GIT tracking
Impressum, Datenschutz