]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhfmf.c
uart_posix.c rework
[proxmark3-svn] / client / cmdhfmf.c
index ef48b825116710d04a425bf88a41be734faf590a..33790230fa7324ccae4529f0400fd1f3d26154fa 100644 (file)
@@ -34,6 +34,7 @@
 #include "mifare/mad.h"\r
 #include "mifare/ndef.h"\r
 #include "emv/dump.h"\r
+#include "protocols.h"\r
 \r
 #define NESTED_SECTOR_RETRY     10          // how often we try mfested() until we give up\r
 \r
@@ -92,10 +93,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
-  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
-  SendCommand(&c);\r
+       SendCommand(&c);\r
 \r
        UsbCommand resp;\r
        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
@@ -136,9 +137,9 @@ int CmdHF14AMfRdBl(const char *Cmd)
        }\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
+       UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};\r
        memcpy(c.d.asBytes, key, 6);\r
-  SendCommand(&c);\r
+       SendCommand(&c);\r
 \r
        UsbCommand resp;\r
        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
@@ -167,7 +168,7 @@ int CmdHF14AMfRdBl(const char *Cmd)
                return 2;\r
        }\r
 \r
-  return 0;\r
+       return 0;\r
 }\r
 \r
 int CmdHF14AMfRdSc(const char *Cmd)\r
@@ -233,7 +234,7 @@ int CmdHF14AMfRdSc(const char *Cmd)
                PrintAndLog("Command execute timeout");\r
        }\r
 \r
-  return 0;\r
+       return 0;\r
 }\r
 \r
 uint8_t FirstBlockOfSector(uint8_t sectorNo)\r
@@ -569,7 +570,7 @@ int CmdHF14AMfRestore(const char *Cmd)
 //   Nested\r
 //----------------------------------------------\r
 \r
-static void parseParamTDS(const char *Cmd, const uint8_t indx, bool *paramT, bool *paramD, uint8_t *timeout) {\r
+static void parseParamTDS(const char *Cmd, const uint8_t indx, bool *paramT, bool *paramD, uint16_t *timeout) {\r
        char ctmp3[4] = {0};\r
        int len = param_getlength(Cmd, indx);\r
        if (len > 0 && len < 4){\r
@@ -581,20 +582,19 @@ static void parseParamTDS(const char *Cmd, const uint8_t indx, bool *paramT, boo
 \r
                // slow and very slow\r
                if (ctmp3[0] == 's' || ctmp3[0] == 'S' || ctmp3[1] == 's' || ctmp3[1] == 'S') {\r
-                       *timeout = 11; // slow\r
+                       *timeout = MF_CHKKEYS_SLOWTIMEOUT; // slow\r
 \r
                        if (!paramS1 && (ctmp3[1] == 's' || ctmp3[1] == 'S')) {\r
-                               *timeout = 53; // very slow\r
+                               *timeout = MF_CHKKEYS_VERYSLOWTIMEOUT; // very slow\r
                        }\r
                        if (paramS1 && (ctmp3[2] == 's' || ctmp3[2] == 'S')) {\r
-                               *timeout = 53; // very slow\r
+                               *timeout = MF_CHKKEYS_VERYSLOWTIMEOUT; // very slow\r
                        }\r
                }\r
        }\r
 }\r
 \r
-int CmdHF14AMfNested(const char *Cmd)\r
-{\r
+int CmdHF14AMfNested(const char *Cmd) {\r
        int i, j, res, iterations;\r
        sector_t *e_sector = NULL;\r
        uint8_t blockNo = 0;\r
@@ -605,8 +605,8 @@ int CmdHF14AMfNested(const char *Cmd)
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
        uint8_t keyBlock[MifareDefaultKeysSize * 6];\r
        uint64_t key64 = 0;\r
-       // timeout in units. (ms * 106)/10 or us*0.0106\r
-       uint8_t btimeout14a = MF_CHKKEYS_DEFTIMEOUT; // fast by default\r
+       // timeout in units. (ms * 106) or us*0.106\r
+       uint16_t timeout14a = MF_CHKKEYS_DEFTIMEOUT; // fast by default\r
 \r
        bool autosearchKey = false;\r
 \r
@@ -653,10 +653,10 @@ int CmdHF14AMfNested(const char *Cmd)
        if (param_getchar(Cmd, 1) == '*') {\r
                autosearchKey = true;\r
 \r
-               parseParamTDS(Cmd, 2, &transferToEml, &createDumpFile, &btimeout14a);\r
+               parseParamTDS(Cmd, 2, &transferToEml, &createDumpFile, &timeout14a);\r
 \r
                PrintAndLog("--nested. sectors:%2d, block no:*, eml:%c, dmp=%c checktimeout=%d us",\r
-                       SectorsCnt, transferToEml?'y':'n', createDumpFile?'y':'n', ((int)btimeout14a * 10000) / 106);\r
+                       SectorsCnt, transferToEml?'y':'n', createDumpFile?'y':'n', ((uint32_t)timeout14a * 1000) / 106);\r
        } else {\r
                blockNo = param_get8(Cmd, 1);\r
 \r
@@ -675,7 +675,7 @@ int CmdHF14AMfNested(const char *Cmd)
                }\r
 \r
                // check if we can authenticate to sector\r
-               res = mfCheckKeys(blockNo, keyType, true, 1, key, &key64);\r
+               res = mfCheckKeys(blockNo, keyType, timeout14a, true, 1, key, &key64);\r
                if (res) {\r
                        PrintAndLog("Can't authenticate to block:%3d key type:%c key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r
                        return 3;\r
@@ -693,30 +693,30 @@ int CmdHF14AMfNested(const char *Cmd)
                        if (ctmp != 'A' && ctmp != 'a')\r
                                trgKeyType = 1;\r
 \r
-                       parseParamTDS(Cmd, 6, &transferToEml, &createDumpFile, &btimeout14a);\r
+                       parseParamTDS(Cmd, 6, &transferToEml, &createDumpFile, &timeout14a);\r
                } else {\r
-                       parseParamTDS(Cmd, 4, &transferToEml, &createDumpFile, &btimeout14a);\r
+                       parseParamTDS(Cmd, 4, &transferToEml, &createDumpFile, &timeout14a);\r
                }\r
 \r
                PrintAndLog("--nested. sectors:%2d, block no:%3d, key type:%c, eml:%c, dmp=%c checktimeout=%d us",\r
-                       SectorsCnt, blockNo, keyType?'B':'A', transferToEml?'y':'n', createDumpFile?'y':'n', ((int)btimeout14a * 10000) / 106);\r
+                       SectorsCnt, blockNo, keyType?'B':'A', transferToEml?'y':'n', createDumpFile?'y':'n', ((uint32_t)timeout14a * 1000) / 106);\r
        }\r
 \r
        // one-sector nested\r
        if (cmdp == 'o') { // ------------------------------------  one sector working\r
                PrintAndLog("--target block no:%3d, target key type:%c ", trgBlockNo, trgKeyType?'B':'A');\r
-               int16_t isOK = mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true);\r
-               if (isOK) {\r
+               int16_t isOK = mfnested(blockNo, keyType, timeout14a, key, trgBlockNo, trgKeyType, keyBlock, true);\r
+               if (isOK < 0) {\r
                        switch (isOK) {\r
                                case -1 : PrintAndLog("Error: No response from Proxmark.\n"); break;\r
                                case -2 : PrintAndLog("Button pressed. Aborted.\n"); break;\r
                                case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (random numbers are not predictable).\n"); break;\r
-                               default : PrintAndLog("Unknown Error.\n");\r
+                               default : PrintAndLog("Unknown Error (%d)\n", isOK);\r
                        }\r
                        return 2;\r
                }\r
                key64 = bytes_to_num(keyBlock, 6);\r
-               if (key64) {\r
+               if (!isOK) {\r
                        PrintAndLog("Found valid key:%012" PRIx64, key64);\r
 \r
                        // transfer key to the emulator\r
@@ -753,7 +753,7 @@ int CmdHF14AMfNested(const char *Cmd)
                }\r
 \r
                PrintAndLog("Testing known keys. Sector count=%d", SectorsCnt);\r
-               mfCheckKeysSec(SectorsCnt, 2, btimeout14a, true, MifareDefaultKeysSize, keyBlock, e_sector);\r
+               mfCheckKeysSec(SectorsCnt, 2, timeout14a, true, true, true, MifareDefaultKeysSize, keyBlock, e_sector);\r
 \r
                // get known key from array\r
                bool keyFound = false;\r
@@ -790,13 +790,13 @@ int CmdHF14AMfNested(const char *Cmd)
                                for (trgKeyType = 0; trgKeyType < 2; trgKeyType++) {\r
                                        if (e_sector[sectorNo].foundKey[trgKeyType]) continue;\r
                                        PrintAndLog("-----------------------------------------------");\r
-                                       int16_t isOK = mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate);\r
-                                       if(isOK) {\r
+                                       int16_t isOK = mfnested(blockNo, keyType, timeout14a, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate);\r
+                                       if(isOK < 0) {\r
                                                switch (isOK) {\r
                                                        case -1 : PrintAndLog("Error: No response from Proxmark.\n"); break;\r
                                                        case -2 : PrintAndLog("Button pressed. Aborted.\n"); break;\r
                                                        case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (random numbers are not predictable).\n"); break;\r
-                                                       default : PrintAndLog("Unknown Error.\n");\r
+                                                       default : PrintAndLog("Unknown Error (%d)\n", isOK);\r
                                                }\r
                                                free(e_sector);\r
                                                return 2;\r
@@ -807,13 +807,13 @@ int CmdHF14AMfNested(const char *Cmd)
                                        iterations++;\r
 \r
                                        key64 = bytes_to_num(keyBlock, 6);\r
-                                       if (key64) {\r
+                                       if (!isOK) {\r
                                                PrintAndLog("Found valid key:%012" PRIx64, key64);\r
                                                e_sector[sectorNo].foundKey[trgKeyType] = 1;\r
                                                e_sector[sectorNo].Key[trgKeyType] = key64;\r
 \r
                                                // try to check this key as a key to the other sectors\r
-                                               mfCheckKeysSec(SectorsCnt, 2, btimeout14a, true, 1, keyBlock, e_sector);\r
+                                               mfCheckKeysSec(SectorsCnt, 2, timeout14a, true, true, true, 1, keyBlock, e_sector);\r
                                        }\r
                                }\r
                        }\r
@@ -1048,13 +1048,13 @@ int CmdHF14AMfNestedHard(const char *Cmd)
 }\r
 \r
 \r
-int CmdHF14AMfChk(const char *Cmd)\r
-{\r
+int CmdHF14AMfChk(const char *Cmd) {\r
+\r
        if (strlen(Cmd)<3) {\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
@@ -1066,26 +1066,26 @@ int CmdHF14AMfChk(const char *Cmd)
                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
-       uint8_t btimeout14a = MF_CHKKEYS_DEFTIMEOUT; // fast by default\r
-       bool param3InUse = false;\r
-\r
-       bool transferToEml = 0;\r
-       bool createDumpFile = 0;\r
+       uint16_t  timeout14a    = 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
@@ -1099,9 +1099,19 @@ int CmdHF14AMfChk(const char *Cmd)
 \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
+               // 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) {\r
+                       SectorsCnt = (blockNo / 4) + 1;\r
+               } else {\r
+                       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
@@ -1123,12 +1133,18 @@ int CmdHF14AMfChk(const char *Cmd)
                };\r
        }\r
 \r
-       parseParamTDS(Cmd, 2, &transferToEml, &createDumpFile, &btimeout14a);\r
+       parseParamTDS(Cmd, 2, &transferToEml, &createDumpFile, &timeout14a);\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
+       param3InUse = transferToEml | createDumpFile | (timeout14a != MF_CHKKEYS_DEFTIMEOUT);\r
 \r
        PrintAndLog("--chk keys. sectors:%2d, block no:%3d, key type:%c, eml:%c, dmp=%c checktimeout=%d us",\r
-                       SectorsCnt, blockNo, keyType?'B':'A', transferToEml?'y':'n', createDumpFile?'y':'n', ((int)btimeout14a * 10000) / 106);\r
+                       SectorsCnt, blockNo, keyType==0?'A':keyType==1?'B':'?', transferToEml?'y':'n', createDumpFile?'y':'n', ((uint32_t)timeout14a * 1000) / 106);\r
 \r
        for (i = param3InUse; param_getchar(Cmd, 2 + i); i++) {\r
                if (!param_gethex(Cmd, 2 + i, keyBlock + 6 * keycnt, 12)) {\r
@@ -1142,7 +1158,7 @@ int CmdHF14AMfChk(const char *Cmd)
                                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
@@ -1153,8 +1169,8 @@ int CmdHF14AMfChk(const char *Cmd)
                                return 2;\r
                        }\r
 \r
-                       if ( (f = fopen( filename , "r")) ) {\r
-                               while( fgets(buf, sizeof(buf), f) ){\r
+                       if ((f = fopen( filename , "r"))) {\r
+                               while (fgets(buf, sizeof(buf), f)) {\r
                                        if (strlen(buf) < 12 || buf[11] == '\n')\r
                                                continue;\r
 \r
@@ -1162,14 +1178,20 @@ int CmdHF14AMfChk(const char *Cmd)
 \r
                                        if( buf[0]=='#' ) continue; //The line start with # is comment, skip\r
 \r
-                                       if (!isxdigit((unsigned char)buf[0])){\r
-                                               PrintAndLog("File content error. '%s' must include 12 HEX symbols",buf);\r
+                                       bool content_error = false;\r
+                                       for (int i = 0; i < 12; i++) {\r
+                                               if (!isxdigit((unsigned char)buf[i])) {\r
+                                                       content_error = true;\r
+                                               }\r
+                                       }\r
+                                       if (content_error) {\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
+                                       if (stKeyBlock - keycnt < 2) {\r
                                                p = realloc(keyBlock, 6*(stKeyBlock+=10));\r
                                                if (!p) {\r
                                                        PrintAndLog("Cannot allocate memory for defKeys");\r
@@ -1190,7 +1212,6 @@ int CmdHF14AMfChk(const char *Cmd)
                                PrintAndLog("File: %s: not found or locked.", filename);\r
                                free(keyBlock);\r
                                return 1;\r
-\r
                        }\r
                }\r
        }\r
@@ -1200,7 +1221,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
-                               (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
@@ -1219,14 +1240,20 @@ int CmdHF14AMfChk(const char *Cmd)
        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 clearTraceLog = true;\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
 \r
                        uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c;\r
-                       res = mfCheckKeysSec(SectorsCnt, keyType, btimeout14a, true, size, &keyBlock[6 * c], e_sector); // timeout is (ms * 106)/10 or us*0.0106\r
+                       bool init = (c == 0);\r
+                       bool drop_field = (c + size == keycnt);\r
+                       res = mfCheckKeysSec(SectorsCnt, keyType, timeout14a, clearTraceLog, init, drop_field, size, &keyBlock[6 * c], e_sector); // timeout is (ms * 106)/10 or us*0.0106\r
+                       clearTraceLog = false;\r
 \r
                        if (res != 1) {\r
                                if (!res) {\r
@@ -1243,36 +1270,48 @@ int CmdHF14AMfChk(const char *Cmd)
        } else {\r
                int keyAB = keyType;\r
                do {\r
-                       for (uint32_t c = 0; c < keycnt; c+=max_keys) {\r
+                       res = mfCheckKeys(blockNo, keyAB & 0x01, timeout14a, true, keycnt, keyBlock, &key64);\r
+                       clearTraceLog = false;\r
 \r
-                               uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c;\r
-                               res = mfCheckKeys(blockNo, keyAB & 0x01, true, size, &keyBlock[6 * c], &key64);\r
+                       if (res != 1) {\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
+\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
-                               if (res != 1) {\r
-                                       if (!res) {\r
-                                               PrintAndLog("Found valid key:[%d:%c]%012" PRIx64, blockNo, (keyAB & 0x01)?'B':'A', key64);\r
-                                               foundAKey = true;\r
-                                       }\r
-                               } else {\r
-                                       PrintAndLog("Command execute timeout");\r
                                }\r
+                       } else {\r
+                               PrintAndLog("Command execute timeout");\r
                        }\r
                } while(--keyAB > 0);\r
        }\r
 \r
        // print result\r
        if (foundAKey) {\r
-               if (SectorsCnt) {\r
-                       PrintAndLog("");\r
-                       PrintAndLog("|---|----------------|---|----------------|---|");\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
+               PrintAndLog("");\r
+               PrintAndLog("|---|----------------|----------------|");\r
+               PrintAndLog("|sec|key A           |key B           |");\r
+               PrintAndLog("|---|----------------|----------------|");\r
+               for (i = 0; i < SectorsCnt; i++) {\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
+                               char keyAString[13] = "      ?     ";\r
+                               char keyBString[13] = "      ?     ";\r
+                               if (e_sector[i].foundKey[0]) {\r
+                                       sprintf(keyAString, "%012" PRIx64, e_sector[i].Key[0]);\r
+                               }\r
+                               if (e_sector[i].foundKey[1]) {\r
+                                       sprintf(keyBString, "%012" PRIx64, e_sector[i].Key[1]);\r
+                               }\r
+                               PrintAndLog("|%03d|  %s  |  %s  |", i, keyAString, keyBString);\r
                        }\r
-                       PrintAndLog("|---|----------------|---|----------------|---|");\r
                }\r
+               PrintAndLog("|---|----------------|----------------|");\r
        } else {\r
                PrintAndLog("");\r
                PrintAndLog("No valid keys found.");\r
@@ -1286,15 +1325,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
+                                               keyFoundCount++; // Key found count for information\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
-       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
@@ -1319,6 +1360,7 @@ int CmdHF14AMfChk(const char *Cmd)
        return 0;\r
 }\r
 \r
+\r
 void readerAttack(nonces_t ar_resp[], bool setEmulatorMem, bool doStandardAttack) {\r
        #define ATTACK_KEY_COUNT 7 // keep same as define in iso14443a.c -> Mifare1ksim()\r
                                                           // cannot be more than 7 or it will overrun c.d.asBytes(512)\r
@@ -1666,10 +1708,10 @@ int CmdHF14AMfDbg(const char *Cmd)
                return 0;\r
        }\r
 \r
-  UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}};\r
-  SendCommand(&c);\r
+       UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}};\r
+       SendCommand(&c);\r
 \r
-  return 0;\r
+       return 0;\r
 }\r
 \r
 int CmdHF14AMfEGet(const char *Cmd)\r
@@ -1692,7 +1734,7 @@ int CmdHF14AMfEGet(const char *Cmd)
                PrintAndLog("Command execute timeout");\r
        }\r
 \r
-  return 0;\r
+       return 0;\r
 }\r
 \r
 int CmdHF14AMfEClear(const char *Cmd)\r
@@ -1703,9 +1745,9 @@ int CmdHF14AMfEClear(const char *Cmd)
                return 0;\r
        }\r
 \r
-  UsbCommand c = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}};\r
-  SendCommand(&c);\r
-  return 0;\r
+       UsbCommand c = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}};\r
+       SendCommand(&c);\r
+       return 0;\r
 }\r
 \r
 \r
@@ -1912,7 +1954,7 @@ int CmdHF14AMfESave(const char *Cmd)
 \r
        PrintAndLog("Saved %d blocks to file: %s", numBlocks, filename);\r
 \r
-  return 0;\r
+       return 0;\r
 }\r
 \r
 \r
@@ -1982,7 +2024,7 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
                        case '\0': numSectors = 16; break;\r
                        case '2' : numSectors = 32; break;\r
                        case '4' : numSectors = 40; break;\r
-                       case 'd' : \r
+                       case 'd' :\r
                        case 'D' : createDumpFile = true; break;\r
                }\r
                cmdp++;\r
@@ -2015,7 +2057,7 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
                                PrintAndLog("error get block %d", FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);\r
                                break;\r
                        }\r
-                       fwrite(data+6, 1, 6, fkeys);\r
+                       fwrite(data, 1, 6, fkeys);\r
                }\r
                for(i = 0; i < numSectors; i++) {\r
                        if (mfEmlGetMem(data, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1)) {\r
@@ -2630,7 +2672,7 @@ int CmdHF14AMfSniff(const char *Cmd){
                }\r
 \r
                UsbCommand resp;\r
-               if (WaitForResponseTimeoutW(CMD_ACK, &resp, 2000, false)) {\r
+               if (WaitForResponseTimeoutW(CMD_UNKNOWN, &resp, 2000, false)) {\r
                        res = resp.arg[0] & 0xff;\r
                        uint16_t traceLen = resp.arg[1];\r
                        len = resp.arg[2];\r
@@ -2965,51 +3007,130 @@ int CmdHFMFNDEF(const char *cmd) {
        return 0;\r
 }\r
 \r
-static command_t CommandTable[] =\r
-{\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
-  {"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
-  {"auth4",            CmdHF14AMfAuth4,         0, "ISO14443-4 AES authentication"},\r
-  {"chk",              CmdHF14AMfChk,           0, "Test block keys"},\r
-  {"mifare",           CmdHF14AMifare,          0, "Read parity error messages."},\r
-  {"hardnested",       CmdHF14AMfNestedHard,    0, "Nested attack for hardened Mifare cards"},\r
-  {"nested",           CmdHF14AMfNested,        0, "Test nested authentication"},\r
-  {"sniff",            CmdHF14AMfSniff,         0, "Sniff card-reader communication"},\r
-  {"sim",              CmdHF14AMfSim,           0, "Simulate MIFARE card"},\r
-  {"eclr",             CmdHF14AMfEClear,        0, "Clear 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
-  {"cwipe",            CmdHF14AMfCWipe,         0, "Wipe magic Chinese card"},\r
-  {"csetuid",          CmdHF14AMfCSetUID,       0, "Set UID for magic Chinese card"},\r
-  {"csetblk",          CmdHF14AMfCSetBlk,       0, "Write block - Magic Chinese card"},\r
-  {"cgetblk",          CmdHF14AMfCGetBlk,       0, "Read block - Magic Chinese card"},\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",          CmdDecryptTraceCmds,     1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"},\r
-  {"mad",              CmdHF14AMfMAD,           0, "Checks and prints MAD"},\r
-  {"ndef",             CmdHFMFNDEF,             0, "Prints NDEF records from card"},\r
-  {NULL,               NULL,                    0, NULL}\r
+int CmdHFMFPersonalize(const char *cmd) {\r
+\r
+       CLIParserInit("hf mf personalize",\r
+                                 "Personalize the UID of a Mifare Classic EV1 card. This is only possible if it is a 7Byte UID card and if it is not already personalized.",\r
+                                 "Usage:\n\thf mf personalize UIDF0                        -> double size UID according to ISO/IEC14443-3\n"\r
+                                 "\thf mf personalize UIDF1                        -> double size UID according to ISO/IEC14443-3, optional usage of selection process shortcut\n"\r
+                                 "\thf mf personalize UIDF2                        -> single size random ID according to ISO/IEC14443-3\n"\r
+                                 "\thf mf personalize UIDF3                        -> single size NUID according to ISO/IEC14443-3\n"\r
+                                 "\thf mf personalize -t B -k B0B1B2B3B4B5 UIDF3   -> use key B = 0xB0B1B2B3B4B5 instead of default key A\n");\r
+\r
+       void *argtable[] = {\r
+               arg_param_begin,\r
+               arg_str0("tT",  "keytype", "<A|B>",                     "key type (A or B) to authenticate sector 0 (default: A)"),\r
+               arg_str0("kK",  "key",     "<key (hex 6 Bytes)>",       "key to authenticate sector 0 (default: FFFFFFFFFFFF)"),\r
+               arg_str1(NULL,  NULL,      "<UIDF0|UIDF1|UIDF2|UIDF3>", "Personalization Option"),\r
+               arg_param_end\r
+       };\r
+       CLIExecWithReturn(cmd, argtable, true);\r
+\r
+       char keytypestr[2] = "A";\r
+       uint8_t keytype = 0x00;\r
+       int keytypestr_len;\r
+       int res = CLIParamStrToBuf(arg_get_str(1), (uint8_t*)keytypestr, 1, &keytypestr_len);\r
+       if (res || (keytypestr[0] != 'a' && keytypestr[0] != 'A' && keytypestr[0] != 'b' && keytypestr[0] != 'B')) {\r
+               PrintAndLog("ERROR: not a valid key type. Key type must be A or B");\r
+               CLIParserFree();\r
+               return 1;\r
+       }\r
+       if (keytypestr[0] == 'B' || keytypestr[0] == 'b') {\r
+               keytype = 0x01;\r
+       }\r
+\r
+       uint8_t key[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};\r
+       int key_len;\r
+       res = CLIParamHexToBuf(arg_get_str(2), key, 6, &key_len);\r
+       if (res || (!res && key_len > 0 && key_len != 6)) {\r
+               PrintAndLog("ERROR: not a valid key. Key must be 12 hex digits");\r
+               CLIParserFree();\r
+               return 1;\r
+       }\r
+\r
+       char pers_optionstr[6];\r
+       int opt_len;\r
+       uint8_t pers_option;\r
+       res = CLIParamStrToBuf(arg_get_str(3), (uint8_t*)pers_optionstr, 5, &opt_len);\r
+       if (res || (!res && opt_len > 0 && opt_len != 5)\r
+                       || (strncmp(pers_optionstr, "UIDF0", 5) && strncmp(pers_optionstr, "UIDF1", 5) && strncmp(pers_optionstr, "UIDF2", 5) && strncmp(pers_optionstr, "UIDF3", 5))) {\r
+               PrintAndLog("ERROR: invalid personalization option. Must be one of UIDF0, UIDF1, UIDF2, or UIDF3");\r
+               CLIParserFree();\r
+               return 1;\r
+       }\r
+       if (!strncmp(pers_optionstr, "UIDF0", 5)) {\r
+               pers_option = MIFARE_EV1_UIDF0;\r
+       } else if (!strncmp(pers_optionstr, "UIDF1", 5)) {\r
+               pers_option = MIFARE_EV1_UIDF1;\r
+       } else if (!strncmp(pers_optionstr, "UIDF2", 5)) {\r
+               pers_option = MIFARE_EV1_UIDF2;\r
+       } else {\r
+               pers_option = MIFARE_EV1_UIDF3;\r
+       }\r
+\r
+       CLIParserFree();\r
+\r
+       UsbCommand c = {CMD_MIFARE_PERSONALIZE_UID, {keytype, pers_option, 0}};\r
+       memcpy(c.d.asBytes, key, 6);\r
+       SendCommand(&c);\r
+\r
+       UsbCommand resp;\r
+       if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {\r
+               uint8_t isOK  = resp.arg[0] & 0xff;\r
+               PrintAndLog("Personalization %s", isOK ? "FAILED" : "SUCCEEDED");\r
+       } else {\r
+               PrintAndLog("Command execute timeout");\r
+       }\r
+\r
+       return 0;\r
+}\r
+\r
+\r
+static command_t CommandTable[] = {\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
+       {"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
+       {"auth4",            CmdHF14AMfAuth4,         0, "ISO14443-4 AES authentication"},\r
+       {"chk",              CmdHF14AMfChk,           0, "Test block keys"},\r
+       {"mifare",           CmdHF14AMifare,          0, "Read parity error messages."},\r
+       {"hardnested",       CmdHF14AMfNestedHard,    0, "Nested attack for hardened Mifare cards"},\r
+       {"nested",           CmdHF14AMfNested,        0, "Test nested authentication"},\r
+       {"sniff",            CmdHF14AMfSniff,         0, "Sniff card-reader communication"},\r
+       {"sim",              CmdHF14AMfSim,           0, "Simulate MIFARE card"},\r
+       {"eclr",             CmdHF14AMfEClear,        0, "Clear 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
+       {"cwipe",            CmdHF14AMfCWipe,         0, "Wipe magic Chinese card"},\r
+       {"csetuid",          CmdHF14AMfCSetUID,       0, "Set UID for magic Chinese card"},\r
+       {"csetblk",          CmdHF14AMfCSetBlk,       0, "Write block - Magic Chinese card"},\r
+       {"cgetblk",          CmdHF14AMfCGetBlk,       0, "Read block - Magic Chinese card"},\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",          CmdDecryptTraceCmds,     1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"},\r
+       {"mad",              CmdHF14AMfMAD,           0, "Checks and prints MAD"},\r
+       {"ndef",             CmdHFMFNDEF,             0, "Prints NDEF records from card"},\r
+       {"personalize",      CmdHFMFPersonalize,      0, "Personalize UID (Mifare Classic EV1 only)"},\r
+       {NULL,               NULL,                    0, NULL}\r
 };\r
 \r
-int CmdHFMF(const char *Cmd)\r
-{\r
+\r
+int CmdHFMF(const char *Cmd) {\r
        (void)WaitForResponseTimeout(CMD_ACK,NULL,100);\r
        CmdsParse(CommandTable, Cmd);\r
        return 0;\r
 }\r
 \r
-int CmdHelp(const char *Cmd)\r
-{\r
-  CmdsHelp(CommandTable);\r
-  return 0;\r
+\r
+int CmdHelp(const char *Cmd) {\r
+       CmdsHelp(CommandTable);\r
+       return 0;\r
 }\r
Impressum, Datenschutz