ADD: added the possibility to choose which block num to attack with "hf mf mifare...

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index e10a88f3940c7ef37b7cf6496fa64609f70834b2..bd27ba0caa40ac08250d631a305d9d7b4a33e150 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -21,8 +21,17 @@ int CmdHF14AMifare(const char *Cmd)
        uint64_t par_list = 0, ks_list = 0, r_key = 0;\r
        int16_t isOK = 0;\r
        int tmpchar; \r
+       uint8_t blockNo = 0;\r
+       \r
+       char cmdp = param_getchar(Cmd, 0);      \r
+       if ( cmdp == 'H' || cmdp == 'h') {\r
+               PrintAndLog("Usage:  hf mf mifare <block number>");\r
+               PrintAndLog("        sample: hf mf mifare 0");\r
+               return 0;\r
+       }       \r
        \r
-       UsbCommand c = {CMD_READER_MIFARE, {true, 0, 0}};\r
+       blockNo = param_get8(Cmd, 0);\r
+       UsbCommand c = {CMD_READER_MIFARE, {true, blockNo, 0}};\r
 \r
        // message\r
        printf("-------------------------------------------------------------------------\n");\r
@@ -754,6 +763,8 @@ int CmdHF14AMfNested(const char *Cmd)
                                \r
                                uint8_t sectrail = (FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);\r
                                \r
+                               PrintAndLog("Reading block %d", sectrail);\r
+                                                       \r
                                UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}};\r
                                num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A\r
                                clearCommandBuffer();\r
@@ -1159,9 +1170,11 @@ int CmdHF14AMfChk(const char *Cmd)
        for (i = 0; i < SectorsCnt; i++) {\r
                // KEY A  but not KEY B\r
                if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {\r
-                       \r
+                                               \r
                        uint8_t sectrail = (FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);\r
                        \r
+                       PrintAndLog("Reading block %d", sectrail);\r
+                       \r
                        UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}};\r
                        num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A\r
                        clearCommandBuffer();\r