Merge branch 'master' of https://github.com/Proxmark/proxmark3

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 37c6fe94bd29dd308dbc34df67c85ddfca7c3cb6..0d4813dd43c88cdef82bb443bd9ebaca864f06de 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -511,6 +511,7 @@ int CmdHF14AMfDump(const char *Cmd)
        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

+       uint8_t carddata[256][16];\r

        uint8_t numSectors = 16;\r
        \r
        FILE *fin;\r
        uint8_t numSectors = 16;\r
        \r
        FILE *fin;\r


@@ -551,11 +552,6 @@ int CmdHF14AMfDump(const char *Cmd)
                return 1;\r
        }\r
        \r
                return 1;\r
        }\r
        \r

-       if ((fout = fopen("dumpdata.bin","wb")) == NULL) { \r
-               PrintAndLog("Could not create file name dumpdata.bin");\r
-               return 1;\r
-       }\r
-       \r

        // Read keys A from file\r
        for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
                if (fread( keyA[sectorNo], 1, 6, fin ) == 0) {\r
        // Read keys A from file\r
        for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
                if (fread( keyA[sectorNo], 1, 6, fin ) == 0) {\r


@@ -590,10 +586,12 @@ int CmdHF14AMfDump(const char *Cmd)
                                rights[sectorNo][2] = ((data[7] & 0x40)>>6) | ((data[8] & 0x4)>>1) | ((data[8] & 0x40)>>4);\r
                                rights[sectorNo][3] = ((data[7] & 0x80)>>7) | ((data[8] & 0x8)>>2) | ((data[8] & 0x80)>>5);\r
                        } else {\r
                                rights[sectorNo][2] = ((data[7] & 0x40)>>6) | ((data[8] & 0x4)>>1) | ((data[8] & 0x40)>>4);\r
                                rights[sectorNo][3] = ((data[7] & 0x80)>>7) | ((data[8] & 0x8)>>2) | ((data[8] & 0x80)>>5);\r
                        } else {\r

-                               PrintAndLog("Could not get access rights for sector %2d.", sectorNo);\r
+                               PrintAndLog("Could not get access rights for sector %2d. Trying with defaults...", sectorNo);\r
+                               rights[sectorNo][0] = rights[sectorNo][1] = rights[sectorNo][2] = rights[sectorNo][3] = 0x01;\r

                        }\r
                } else {\r
                        }\r
                } else {\r

-                       PrintAndLog("Command execute timeout");\r
+                       PrintAndLog("Command execute timeout when trying to read access rights for sector %2d. Trying with defaults...", sectorNo);\r
+                       rights[sectorNo][0] = rights[sectorNo][1] = rights[sectorNo][2] = rights[sectorNo][3] = 0x01;\r

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


@@ -601,8 +599,9 @@ int CmdHF14AMfDump(const char *Cmd)
        PrintAndLog("|----- Dumping all blocks to file... -----|");\r
        PrintAndLog("|-----------------------------------------|");\r
        \r
        PrintAndLog("|----- Dumping all blocks to file... -----|");\r
        PrintAndLog("|-----------------------------------------|");\r
        \r

-       for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
-               for (blockNo = 0; 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

                        bool received = false;\r
                        \r
                        if (blockNo == NumBlocksPerSector(sectorNo) - 1) {              // sector trailer. At least the Access Conditions can always be read with key A. \r
                        bool received = false;\r
                        \r
                        if (blockNo == NumBlocksPerSector(sectorNo) - 1) {              // sector trailer. At least the Access Conditions can always be read with key A. \r


@@ -618,6 +617,7 @@ int CmdHF14AMfDump(const char *Cmd)
                                        SendCommand(&c);\r
                                        received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                                } else if (rights[sectorNo][data_area] == 7) {                                                                                  // no key would work\r
                                        SendCommand(&c);\r
                                        received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                                } else if (rights[sectorNo][data_area] == 7) {                                                                                  // no key would work\r

+                                       isOK = false;\r

                                                PrintAndLog("Access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);\r
                                } else {                                                                                                                                                                // key A would work\r
                                                UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};\r
                                                PrintAndLog("Access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);\r
                                } else {                                                                                                                                                                // key A would work\r
                                                UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};\r


@@ -628,7 +628,7 @@ int CmdHF14AMfDump(const char *Cmd)
                        }\r
 \r
                        if (received) {\r
                        }\r
 \r
                        if (received) {\r

-                               uint8_t isOK  = resp.arg[0] & 0xff;\r
+                               isOK  = resp.arg[0] & 0xff;\r

                                uint8_t *data  = resp.d.asBytes;\r
                                if (blockNo == NumBlocksPerSector(sectorNo) - 1) {              // sector trailer. Fill in the keys.\r
                                        data[0]  = (keyA[sectorNo][0]);\r
                                uint8_t *data  = resp.d.asBytes;\r
                                if (blockNo == NumBlocksPerSector(sectorNo) - 1) {              // sector trailer. Fill in the keys.\r
                                        data[0]  = (keyA[sectorNo][0]);\r


@@ -645,20 +645,33 @@ int CmdHF14AMfDump(const char *Cmd)
                                        data[15] = (keyB[sectorNo][5]);\r
                                }\r
                                if (isOK) {\r
                                        data[15] = (keyB[sectorNo][5]);\r
                                }\r
                                if (isOK) {\r

-                                       fwrite ( data, 1, 16, fout );\r
-                    PrintAndLog("Dumped block %2d of sector %2d into 'dumpdata.bin'", blockNo, sectorNo);\r
+                                       memcpy(carddata[FirstBlockOfSector(sectorNo) + blockNo], data, 16);\r
+                    PrintAndLog("Successfully read block %2d of sector %2d.", blockNo, sectorNo);\r

                                } else {\r
                                        PrintAndLog("Could not read block %2d of sector %2d", blockNo, sectorNo);\r
                                } else {\r
                                        PrintAndLog("Could not read block %2d of sector %2d", blockNo, sectorNo);\r

+                                       break;\r

                                }\r
                        }\r
                        else {\r
                                }\r
                        }\r
                        else {\r

-                               PrintAndLog("Command execute timeout");\r
+                               isOK = false;\r
+                               PrintAndLog("Command execute timeout when trying to read block %2d of sector %2d.", blockNo, sectorNo);\r
+                               break;\r

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

+\r
+       if (isOK) {\r
+               if ((fout = fopen("dumpdata.bin","wb")) == NULL) { \r
+                       PrintAndLog("Could not create file name dumpdata.bin");\r
+                       return 1;\r
+               }\r
+               uint16_t numblocks = FirstBlockOfSector(numSectors - 1) + NumBlocksPerSector(numSectors - 1);\r
+               fwrite(carddata, 1, 16*numblocks, fout);\r
+               fclose(fout);\r
+               PrintAndLog("Dumped %d blocks (%d bytes) to file dumpdata.bin", numblocks, 16*numblocks);\r
+       }\r

        \r
        fclose(fin);\r
        \r
        fclose(fin);\r

-       fclose(fout);\r

        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r


@@ -718,7 +731,7 @@ int CmdHF14AMfRestore(const char *Cmd)
                        return 2;\r
                }\r
        }\r
                        return 2;\r
                }\r
        }\r

-       \r
+\r

        PrintAndLog("Restoring dumpdata.bin to card");\r
 \r
        for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
        PrintAndLog("Restoring dumpdata.bin to card");\r
 \r
        for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r


@@ -798,9 +811,9 @@ int CmdHF14AMfNested(const char *Cmd)
                PrintAndLog("d - write keys to binary file");\r
                PrintAndLog(" ");\r
                PrintAndLog("      sample1: hf mf nested 1 0 A FFFFFFFFFFFF ");\r
                PrintAndLog("d - write keys to binary file");\r
                PrintAndLog(" ");\r
                PrintAndLog("      sample1: hf mf nested 1 0 A FFFFFFFFFFFF ");\r

-               PrintAndLog("      sample1: hf mf nested 1 0 A FFFFFFFFFFFF t ");\r
-               PrintAndLog("      sample1: hf mf nested 1 0 A FFFFFFFFFFFF d ");\r
-               PrintAndLog("      sample2: hf mf nested o 0 A FFFFFFFFFFFF 4 A");\r
+               PrintAndLog("      sample2: hf mf nested 1 0 A FFFFFFFFFFFF t ");\r
+               PrintAndLog("      sample3: hf mf nested 1 0 A FFFFFFFFFFFF d ");\r
+               PrintAndLog("      sample4: hf mf nested o 0 A FFFFFFFFFFFF 4 A");\r

                return 0;\r
        }       \r
        \r
                return 0;\r
        }       \r
        \r


@@ -1010,19 +1023,6 @@ int CmdHF14AMfNested(const char *Cmd)
 }\r
 \r
 \r
 }\r
 \r
 \r

-static uint32_t 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
-\r
-\r

 int CmdHF14AMfChk(const char *Cmd)\r
 {\r
        FILE * f;\r
 int CmdHF14AMfChk(const char *Cmd)\r
 {\r
        FILE * f;\r


@@ -1072,8 +1072,7 @@ int CmdHF14AMfChk(const char *Cmd)
                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("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("d - write keys to binary file\n");\r

                PrintAndLog("      sample: hf mf chk 0 A 1234567890ab keys.dic");\r
                PrintAndLog("              hf mf chk *1 ? t");\r
                return 0;\r
                PrintAndLog("      sample: hf mf chk 0 A 1234567890ab keys.dic");\r
                PrintAndLog("              hf mf chk *1 ? t");\r
                return 0;\r


@@ -1183,10 +1182,22 @@ int CmdHF14AMfChk(const char *Cmd)
                        (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

+       // initialize storage for found keys\r
+       bool validKey[2][40];\r
+       uint8_t foundKey[2][40][6];\r
+       for (uint16_t t = 0; t < 2; t++) {\r
+               for (uint16_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {\r
+                       validKey[t][sectorNo] = false;\r
+                       for (uint16_t i = 0; i < 6; i++) {\r
+                               foundKey[t][sectorNo][i] = 0xff;\r
+                       }\r
+               }\r
+       }\r
+       \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
        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:%2d, block no:%3d, key type:%C, key count:%2d ", i, b, t?'B':'A', keycnt);\r
+                       PrintAndLog("--sector:%2d, block:%3d, key type:%C, key count:%2d ", i, b, t?'B':'A', keycnt);\r

                        uint32_t max_keys = keycnt>USB_CMD_DATA_SIZE/6?USB_CMD_DATA_SIZE/6:keycnt;\r
                        for (uint32_t c = 0; c < keycnt; c+=max_keys) {\r
                                uint32_t size = keycnt-c>max_keys?max_keys:keycnt-c;\r
                        uint32_t max_keys = keycnt>USB_CMD_DATA_SIZE/6?USB_CMD_DATA_SIZE/6:keycnt;\r
                        for (uint32_t c = 0; c < keycnt; c+=max_keys) {\r
                                uint32_t size = keycnt-c>max_keys?max_keys:keycnt-c;\r


@@ -1194,13 +1205,9 @@ int CmdHF14AMfChk(const char *Cmd)
                                if (res != 1) {\r
                                        if (!res) {\r
                                                PrintAndLog("Found valid key:[%012"llx"]",key64);\r
                                if (res != 1) {\r
                                        if (!res) {\r
                                                PrintAndLog("Found valid key:[%012"llx"]",key64);\r

-                                               if (transferToEml) {\r
-                                                       uint8_t block[16];\r
-                                                       mfEmlGetMem(block, get_trailer_block(b), 1);\r
-                                                       num_to_bytes(key64, 6, block + t*10);\r
-                                                       mfEmlSetMem(block, get_trailer_block(b), 1);\r
-                                               }\r
-                                       }\r
+                                               num_to_bytes(key64, 6, foundKey[t][i]);\r
+                                               validKey[t][i] = true;\r
+                                       } \r

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


@@ -1208,42 +1215,43 @@ int CmdHF14AMfChk(const char *Cmd)
                        b<127?(b+=4):(b+=16);   \r
                }\r
        }\r
                        b<127?(b+=4):(b+=16);   \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
+       if (transferToEml) {\r
+               uint8_t block[16];\r
+               for (uint16_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {\r
+                       if (validKey[0][sectorNo] || validKey[1][sectorNo]) {\r
+                               mfEmlGetMem(block, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);\r
+                               for (uint16_t t = 0; t < 2; t++) {\r
+                                       if (validKey[t][sectorNo]) {\r
+                                               memcpy(block + t*10, foundKey[t][sectorNo], 6);\r

                }\r
                }\r

-               PrintAndLog("Printing keys to binary 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
                        }\r

-                       else{\r
-                               fwrite ( &standart, 1, 6, fkeys );\r
+                               mfEmlSetMem(block, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);\r

                        }\r
                }\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
+               PrintAndLog("Found keys have been transferred to the emulator memory");\r

                        }\r
                        }\r

-                       else{\r
-                               fwrite ( &standart, 1, 6, fkeys );\r
+\r
+       if (createDumpFile) {\r
+               FILE *fkeys = fopen("dumpkeys.bin","wb");\r
+               if (fkeys == NULL) { \r
+                       PrintAndLog("Could not create file dumpkeys.bin");\r
+                       free(keyBlock);\r
+                       return 1;\r

                        }\r
                        }\r

+               for (uint16_t t = 0; t < 2; t++) {\r
+                       fwrite(foundKey[t], 1, 6*SectorsCnt, fkeys);\r

                }\r
                fclose(fkeys);\r
                }\r
                fclose(fkeys);\r

+               PrintAndLog("Found keys have been dumped to file dumpkeys.bin. 0xffffffffffff has been inserted for unknown keys.");\r

        }\r
        }\r

-*/\r
+\r
+       free(keyBlock);\r
+\r

   return 0;\r
 }\r
 \r
   return 0;\r
 }\r
 \r

+\r

 int CmdHF14AMf1kSim(const char *Cmd)\r
 {\r
        uint8_t uid[7] = {0, 0, 0, 0, 0, 0, 0};\r
 int CmdHF14AMf1kSim(const char *Cmd)\r
 {\r
        uint8_t uid[7] = {0, 0, 0, 0, 0, 0, 0};\r