Fix Issue #843 - hf mf chk - t Doesnt save to emulator memory

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5cd979dfbc6cc0a1656f16340c6a17572d86c92..e740099a99da7adcd2f98a54820900b945aeea3b 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 - AC-Mode decoding for HitagS
 - Wrong UID at HitagS simulation
 - `hf 15 sim` now works as expected (piwi)
 - AC-Mode decoding for HitagS
 - Wrong UID at HitagS simulation
 - `hf 15 sim` now works as expected (piwi)

+- 'hf mf chk t` save to emulator memory now works as expeted (mwalker)

 
 ### Added
 - Added `hf 15 csetuid` - set UID on ISO-15693 Magic tags (t0m4)
 
 ### Added
 - Added `hf 15 csetuid` - set UID on ISO-15693 Magic tags (t0m4)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index ef48b825116710d04a425bf88a41be734faf590a..a4461e37b9bf76f40b94cfbef9a8899ecfe708aa 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1054,7 +1054,7 @@ int CmdHF14AMfChk(const char *Cmd)
                PrintAndLog("Usage:  hf mf chk <block number>|<*card memory> <key type (A/B/?)> [t|d|s|ss] [<key (12 hex symbols)>] [<dic (*.dic)>]");\r
                PrintAndLog("          * - all sectors");\r
                PrintAndLog("card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");\r
                PrintAndLog("Usage:  hf mf chk <block number>|<*card memory> <key type (A/B/?)> [t|d|s|ss] [<key (12 hex symbols)>] [<dic (*.dic)>]");\r
                PrintAndLog("          * - all sectors");\r
                PrintAndLog("card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");\r

-               PrintAndLog("d  - write keys to binary file\n");\r
+               PrintAndLog("d  - write keys to binary file (not used when <block number> supplied)");\r

                PrintAndLog("t  - write keys to emulator memory");\r
                PrintAndLog("s  - slow execute. timeout 1ms");\r
                PrintAndLog("ss - very slow execute. timeout 5ms");\r
                PrintAndLog("t  - write keys to emulator memory");\r
                PrintAndLog("s  - slow execute. timeout 1ms");\r
                PrintAndLog("ss - very slow execute. timeout 5ms");\r


@@ -1066,27 +1066,27 @@ int CmdHF14AMfChk(const char *Cmd)
                return 0;\r
        }\r
 \r
                return 0;\r
        }\r
 \r

-       FILE * f;\r
-       char filename[FILE_PATH_SIZE]={0};\r
-       char buf[13];\r
-       uint8_t *keyBlock = NULL, *p;\r
-       uint16_t stKeyBlock = 20;\r
-\r
-       int i, res;\r
-       int keycnt = 0;\r
-       char ctmp   = 0x00;\r
-       int clen = 0;\r
-       uint8_t blockNo = 0;\r
-       uint8_t SectorsCnt = 0;\r
-       uint8_t keyType = 0;\r
-       uint64_t key64 = 0;\r
+       FILE     * f;\r
+       char     filename[FILE_PATH_SIZE]={0};\r
+       char     buf[13];\r
+       uint8_t  *keyBlock      = NULL, *p;\r
+       uint16_t stKeyBlock     = 20;\r
+       int      i, res;\r
+       int      keycnt         = 0;\r
+       char     ctmp           = 0x00;\r
+       int      clen           = 0;\r
+       uint8_t  blockNo        = 0;\r
+       uint8_t  SectorsCnt     = 0;\r
+       uint8_t  keyType        = 0;\r
+       uint64_t key64          = 0;\r

        // timeout in units. (ms * 106)/10 or us*0.0106\r
        // timeout in units. (ms * 106)/10 or us*0.0106\r

-       uint8_t btimeout14a = MF_CHKKEYS_DEFTIMEOUT; // fast by default\r
-       bool param3InUse = false;\r
-\r
-       bool transferToEml = 0;\r
-       bool createDumpFile = 0;\r
-\r
+       uint8_t  btimeout14a    = MF_CHKKEYS_DEFTIMEOUT; // fast by default\r
+       bool     param3InUse    = false;\r
+       bool     transferToEml  = 0;\r
+       bool     createDumpFile = 0;\r
+       bool     singleBlock    = false;     // Flag to ID if a single or multi key check\r
+       uint8_t  keyFoundCount  = 0;         // Counter to display the number of keys found/transfered to emulator\r
+    \r

        sector_t *e_sector = NULL;\r
 \r
        keyBlock = calloc(stKeyBlock, 6);\r
        sector_t *e_sector = NULL;\r
 \r
        keyBlock = calloc(stKeyBlock, 6);\r


@@ -1100,8 +1100,17 @@ int CmdHF14AMfChk(const char *Cmd)
        if (param_getchar(Cmd, 0)=='*') {\r
                SectorsCnt = ParamCardSizeSectors(param_getchar(Cmd + 1, 0));\r
        }\r
        if (param_getchar(Cmd, 0)=='*') {\r
                SectorsCnt = ParamCardSizeSectors(param_getchar(Cmd + 1, 0));\r
        }\r

-       else\r
+       else {   \r

                blockNo = param_get8(Cmd, 0);\r
                blockNo = param_get8(Cmd, 0);\r

+               // Singe Key check, so Set Sector count to cover sectors (1 to sector that contains the block)\r
+               // 1 and 2 Cards : Sector = blockNo/4 + 1\r
+               // Sectors  0 - 31  :  4 blocks per sector : Blocks 0 - 127\r
+               // Sectors 32 - 39  : 16 blocks per sector : Blocks 128 - 255 (4K)\r
+               if (blockNo < 128) SectorsCnt =       (blockNo     / 4) + 1;\r
+               else                                     SectorsCnt = 32 + ((blockNo-128)/16) + 1;\r
+\r
+               singleBlock  = true;              // Set flag for single key check\r
+       }\r

 \r
        ctmp = param_getchar(Cmd, 1);\r
        clen = param_getlength(Cmd, 1);\r
 \r
        ctmp = param_getchar(Cmd, 1);\r
        clen = param_getlength(Cmd, 1);\r


@@ -1122,9 +1131,15 @@ int CmdHF14AMfChk(const char *Cmd)
                        return 1;\r
                };\r
        }\r
                        return 1;\r
                };\r
        }\r

-\r
+       \r

        parseParamTDS(Cmd, 2, &transferToEml, &createDumpFile, &btimeout14a);\r
 \r
        parseParamTDS(Cmd, 2, &transferToEml, &createDumpFile, &btimeout14a);\r
 \r

+       if (singleBlock & createDumpFile) {\r
+               PrintAndLog (" block key check (<block no>) and write to dump file (d) combination is not supported ");\r
+               PrintAndLog (" please remove option d and try again");\r
+               return 1;\r
+       }\r
+\r

        param3InUse = transferToEml | createDumpFile | (btimeout14a != MF_CHKKEYS_DEFTIMEOUT);\r
 \r
        PrintAndLog("--chk keys. sectors:%2d, block no:%3d, key type:%c, eml:%c, dmp=%c checktimeout=%d us",\r
        param3InUse = transferToEml | createDumpFile | (btimeout14a != MF_CHKKEYS_DEFTIMEOUT);\r
 \r
        PrintAndLog("--chk keys. sectors:%2d, block no:%3d, key type:%c, eml:%c, dmp=%c checktimeout=%d us",\r


@@ -1142,7 +1157,7 @@ int CmdHF14AMfChk(const char *Cmd)
                                keyBlock = p;\r
                        }\r
                        PrintAndLog("chk key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,\r
                                keyBlock = p;\r
                        }\r
                        PrintAndLog("chk key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,\r

-                       (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],\r
+                       (keyBlock + 6*keycnt)[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
                        (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6);\r
                        keycnt++;\r
                } else {\r


@@ -1190,7 +1205,6 @@ int CmdHF14AMfChk(const char *Cmd)
                                PrintAndLog("File: %s: not found or locked.", filename);\r
                                free(keyBlock);\r
                                return 1;\r
                                PrintAndLog("File: %s: not found or locked.", filename);\r
                                free(keyBlock);\r
                                return 1;\r

-\r

                        }\r
                }\r
        }\r
                        }\r
                }\r
        }\r


@@ -1200,7 +1214,7 @@ int CmdHF14AMfChk(const char *Cmd)
                PrintAndLog("No key specified, trying default keys");\r
                for (;keycnt < defaultKeysSize; keycnt++)\r
                        PrintAndLog("chk default key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,\r
                PrintAndLog("No key specified, trying default keys");\r
                for (;keycnt < defaultKeysSize; keycnt++)\r
                        PrintAndLog("chk default key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,\r

-                               (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],\r
+                               (keyBlock + 6*keycnt)[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
                                (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6);\r
        }\r
 \r


@@ -1218,9 +1232,11 @@ int CmdHF14AMfChk(const char *Cmd)
        }\r
        printf("\n");\r
 \r
        }\r
        printf("\n");\r
 \r

-       bool foundAKey = false;\r
-       uint32_t max_keys = keycnt > USB_CMD_DATA_SIZE / 6 ? USB_CMD_DATA_SIZE / 6 : keycnt;\r
-       if (SectorsCnt) {\r
+       bool            foundAKey = false;\r
+       uint32_t        max_keys  = keycnt > USB_CMD_DATA_SIZE / 6 ? USB_CMD_DATA_SIZE / 6 : keycnt;\r
+\r
+       // !SingleKey, so all key check (if SectorsCnt > 0)\r
+       if (!singleBlock) { \r

                PrintAndLog("To cancel this operation press the button on the proxmark...");\r
                printf("--");\r
                for (uint32_t c = 0; c < keycnt; c += max_keys) {\r
                PrintAndLog("To cancel this operation press the button on the proxmark...");\r
                printf("--");\r
                for (uint32_t c = 0; c < keycnt; c += max_keys) {\r


@@ -1240,7 +1256,7 @@ int CmdHF14AMfChk(const char *Cmd)
                                PrintAndLog("Command execute timeout");\r
                        }\r
                }\r
                                PrintAndLog("Command execute timeout");\r
                        }\r
                }\r

-       } else {\r
+       } else { \r

                int keyAB = keyType;\r
                do {\r
                        for (uint32_t c = 0; c < keycnt; c+=max_keys) {\r
                int keyAB = keyType;\r
                do {\r
                        for (uint32_t c = 0; c < keycnt; c+=max_keys) {\r


@@ -1249,9 +1265,16 @@ int CmdHF14AMfChk(const char *Cmd)
                                res = mfCheckKeys(blockNo, keyAB & 0x01, true, size, &keyBlock[6 * c], &key64);\r
 \r
                                if (res != 1) {\r
                                res = mfCheckKeys(blockNo, keyAB & 0x01, true, size, &keyBlock[6 * c], &key64);\r
 \r
                                if (res != 1) {\r

-                                       if (!res) {\r
-                                               PrintAndLog("Found valid key:[%d:%c]%012" PRIx64, blockNo, (keyAB & 0x01)?'B':'A', key64);\r
+                                       if (!res) {      \r
+                                               // Use the common format below\r
+                                               // PrintAndLog("Found valid key:[%d:%c]%012" PRIx64, blockNo, (keyAB & 0x01)?'B':'A', key64);\r

                                                foundAKey = true;\r
                                                foundAKey = true;\r

+                       \r
+                                               // Store the Single Key for display list\r
+                                               // For a single block check, SectorsCnt = Sector that contains the block\r
+                                               e_sector[SectorsCnt-1].foundKey[(keyAB & 0x01)] = true;  // flag key found \r
+                                               e_sector[SectorsCnt-1].Key[(keyAB & 0x01)]      = key64; // Save key data  \r
+                                               \r

                                        }\r
                                } else {\r
                                        PrintAndLog("Command execute timeout");\r
                                        }\r
                                } else {\r
                                        PrintAndLog("Command execute timeout");\r


@@ -1268,8 +1291,11 @@ int CmdHF14AMfChk(const char *Cmd)
                        PrintAndLog("|sec|key A           |res|key B           |res|");\r
                        PrintAndLog("|---|----------------|---|----------------|---|");\r
                        for (i = 0; i < SectorsCnt; i++) {\r
                        PrintAndLog("|sec|key A           |res|key B           |res|");\r
                        PrintAndLog("|---|----------------|---|----------------|---|");\r
                        for (i = 0; i < SectorsCnt; i++) {\r

-                               PrintAndLog("|%03d|  %012" PRIx64 "  | %d |  %012" PRIx64 "  | %d |", i,\r
-                                       e_sector[i].Key[0], e_sector[i].foundKey[0], e_sector[i].Key[1], e_sector[i].foundKey[1]);\r
+                       // If a block key check, only print a line if a key was found.\r
+                if (!singleBlock || (e_sector[i].foundKey[0]) || (e_sector[i].foundKey[1]) ){ \r
+                    PrintAndLog("|%03d|  %012" PRIx64 "  | %d |  %012" PRIx64 "  | %d |", i,\r
+                        e_sector[i].Key[0], e_sector[i].foundKey[0], e_sector[i].Key[1], e_sector[i].foundKey[1]);\r
+                }\r

                        }\r
                        PrintAndLog("|---|----------------|---|----------------|---|");\r
                }\r
                        }\r
                        PrintAndLog("|---|----------------|---|----------------|---|");\r
                }\r


@@ -1286,15 +1312,17 @@ int CmdHF14AMfChk(const char *Cmd)
                                for (uint16_t t = 0; t < 2; t++) {\r
                                        if (e_sector[sectorNo].foundKey[t]) {\r
                                                num_to_bytes(e_sector[sectorNo].Key[t], 6, block + t * 10);\r
                                for (uint16_t t = 0; t < 2; t++) {\r
                                        if (e_sector[sectorNo].foundKey[t]) {\r
                                                num_to_bytes(e_sector[sectorNo].Key[t], 6, block + t * 10);\r

+                        keyFoundCount++; // Key found count for information\r

                                        }\r
                                }\r
                                mfEmlSetMem(block, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);\r
                        }\r
                }\r
                                        }\r
                                }\r
                                mfEmlSetMem(block, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);\r
                        }\r
                }\r

-               PrintAndLog("Found keys have been transferred to the emulator memory");\r
+               // Updated to show the actual number of keys found/transfered.\r
+               PrintAndLog("%d keys(s) found have been transferred to the emulator memory",keyFoundCount);\r

        }\r
 \r
        }\r
 \r

-       if (createDumpFile) {\r
+       if (createDumpFile && !singleBlock) {\r

                FILE *fkeys = fopen("dumpkeys.bin","wb");\r
                if (fkeys == NULL) {\r
                        PrintAndLog("Could not create file dumpkeys.bin");\r
                FILE *fkeys = fopen("dumpkeys.bin","wb");\r
                if (fkeys == NULL) {\r
                        PrintAndLog("Could not create file dumpkeys.bin");\r


@@ -1312,7 +1340,7 @@ int CmdHF14AMfChk(const char *Cmd)
                fclose(fkeys);\r
                PrintAndLog("Found keys have been dumped to file dumpkeys.bin. 0xffffffffffff has been inserted for unknown keys.");\r
        }\r
                fclose(fkeys);\r
                PrintAndLog("Found keys have been dumped to file dumpkeys.bin. 0xffffffffffff has been inserted for unknown keys.");\r
        }\r

-\r
+    \r

        free(e_sector);\r
        free(keyBlock);\r
        PrintAndLog("");\r
        free(e_sector);\r
        free(keyBlock);\r
        PrintAndLog("");\r