#include "hardnested/hardnested_bf_core.h"\r
#include "cliparser/cliparser.h"\r
#include "cmdhf14a.h"\r
+#include "mifare/mifaredefault.h"\r
#include "mifare/mifare4.h"\r
#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
+#define NESTED_SECTOR_RETRY 10 // how often we try mfested() until we give up\r
\r
static int CmdHelp(const char *Cmd);\r
\r
uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};\r
\r
- char cmdp = 0x00;\r
+ char cmdp = 0x00;\r
\r
if (strlen(Cmd)<3) {\r
PrintAndLog("Usage: hf mf wrbl <block number> <key A/B> <key (12 hex symbols)> <block data (32 hex symbols)>");\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
- SendCommand(&c);\r
+ SendCommand(&c);\r
\r
UsbCommand resp;\r
if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
uint8_t keyType = 0;\r
uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
\r
- char cmdp = 0x00;\r
+ char cmdp = 0x00;\r
\r
\r
if (strlen(Cmd)<3) {\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
+ 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
return 2;\r
}\r
\r
- return 0;\r
+ return 0;\r
}\r
\r
int CmdHF14AMfRdSc(const char *Cmd)\r
uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
uint8_t isOK = 0;\r
uint8_t *data = NULL;\r
- char cmdp = 0x00;\r
+ char cmdp = 0x00;\r
\r
if (strlen(Cmd)<3) {\r
PrintAndLog("Usage: hf mf rdsc <sector number> <key A/B> <key (12 hex symbols)>");\r
PrintAndLog("data : %s", sprint_hex(data + i * 16, 16));\r
}\r
PrintAndLog("trailer: %s", sprint_hex(data + (sectorNo<32?3:15) * 16, 16));\r
- \r
+\r
PrintAndLogEx(NORMAL, "Trailer decoded:");\r
- int bln = mfFirstBlockOfSector(sectorNo);\r
- int blinc = (mfNumBlocksPerSector(sectorNo) > 4) ? 5 : 1;\r
- for (i = 0; i < 4; i++) {\r
- PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &(data + (sectorNo<32?3:15) * 16)[6]));\r
- bln += blinc;\r
- }\r
- PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&(data + (sectorNo<32?3:15) * 16)[9], 1));\r
+ int bln = mfFirstBlockOfSector(sectorNo);\r
+ int blinc = (mfNumBlocksPerSector(sectorNo) > 4) ? 5 : 1;\r
+ for (i = 0; i < 4; i++) {\r
+ PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &(data + (sectorNo<32?3:15) * 16)[6]));\r
+ bln += blinc;\r
+ }\r
+ PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&(data + (sectorNo<32?3:15) * 16)[9], 1));\r
}\r
} else {\r
PrintAndLog("Command execute timeout");\r
}\r
\r
- return 0;\r
+ return 0;\r
}\r
\r
uint8_t FirstBlockOfSector(uint8_t sectorNo)\r
fclose(fin);\r
return 2;\r
}\r
- } \r
+ }\r
}\r
\r
fclose(fin);\r
for (blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {\r
bool received = false;\r
for (tries = 0; tries < 3; tries++) {\r
- if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer. At least the Access Conditions can always be read with key A.\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, keys[0][sectorNo], 6);\r
SendCommand(&c);\r
// Don't try the other one on success.\r
if (resp.arg[0] & 0xff) break;\r
}\r
- } else { // data block. Check if it can be read with key A or key B\r
+ } else { // data block. Check if it can be read with key A or key B\r
uint8_t data_area = sectorNo<32?blockNo:blockNo/5;\r
- if ((rights[sectorNo][data_area] == 0x03) || (rights[sectorNo][data_area] == 0x05)) { // only key B would work\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, keys[1][sectorNo], 6);\r
SendCommand(&c);\r
received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
- } else if (rights[sectorNo][data_area] == 0x07) { // no key would work\r
+ } else if (rights[sectorNo][data_area] == 0x07) { // no key would work\r
PrintAndLog("Access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);\r
if (nullMissingKeys) {\r
memset(resp.d.asBytes, 0, 16);\r
isOK = false;\r
tries = 2;\r
}\r
- } else { // key A would work\r
+ } else { // key A would work\r
UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};\r
memcpy(c.d.asBytes, keys[0][sectorNo], 6);\r
SendCommand(&c);\r
if (received) {\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
+ if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer. Fill in the keys.\r
memcpy(data, keys[0][sectorNo], 6);\r
memcpy(data + 10, keys[1][sectorNo], 6);\r
}\r
if (isOK) {\r
memcpy(carddata[FirstBlockOfSector(sectorNo) + blockNo], data, 16);\r
- PrintAndLog("Successfully read block %2d of sector %2d.", blockNo, sectorNo);\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
break;\r
return 2;\r
}\r
\r
- if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer\r
+ if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer\r
bldata[0] = (keyA[sectorNo][0]);\r
bldata[1] = (keyA[sectorNo][1]);\r
bldata[2] = (keyA[sectorNo][2]);\r
// 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
param_getstr(Cmd, indx, ctmp3, sizeof(ctmp3));\r
- \r
+\r
*paramT |= (ctmp3[0] == 't' || ctmp3[0] == 'T');\r
*paramD |= (ctmp3[0] == 'd' || ctmp3[0] == 'D');\r
bool paramS1 = *paramT || *paramD;\r
\r
// slow and very slow\r
if (ctmp3[0] == 's' || ctmp3[0] == 'S' || ctmp3[1] == 's' || ctmp3[1] == 'S') {\r
- *timeout = 11; // slow\r
- \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
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
- \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
bool transferToEml = false;\r
} else {\r
SectorsCnt = ParamCardSizeSectors(cmdp);\r
}\r
- \r
+\r
// <block number>. number or autosearch key (*)\r
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
+ PrintAndLog("--nested. sectors:%2d, block no:*, eml:%c, dmp=%c checktimeout=%d us",\r
+ SectorsCnt, transferToEml?'y':'n', createDumpFile?'y':'n', ((uint32_t)timeout14a * 1000) / 106);\r
} else {\r
blockNo = param_get8(Cmd, 1);\r
\r
}\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
+ PrintAndLog("Can't authenticate to block %d, key type %c, key %s", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r
return 3;\r
}\r
\r
// one sector nested\r
- if (cmdp == 'o') { \r
+ if (cmdp == 'o') {\r
trgBlockNo = param_get8(Cmd, 4);\r
\r
ctmp = param_getchar(Cmd, 5);\r
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
+ 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', ((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
if (transferToEml) {\r
uint8_t sectortrailer;\r
- if (trgBlockNo < 32*4) { // 4 block sector\r
+ if (trgBlockNo < 32*4) { // 4 block sector\r
sectortrailer = trgBlockNo | 0x03;\r
- } else { // 16 block sector\r
+ } else { // 16 block sector\r
sectortrailer = trgBlockNo | 0x0f;\r
}\r
mfEmlGetMem(keyBlock, sectortrailer, 1);\r
}\r
\r
PrintAndLog("Testing known keys. Sector count=%d", SectorsCnt);\r
- mfCheckKeysSec(SectorsCnt, 2, btimeout14a, true, MifareDefaultKeysSize, keyBlock, e_sector);\r
- \r
+ mfCheckKeysSec(SectorsCnt, 2, timeout14a, true, true, true, MifareDefaultKeysSize, keyBlock, e_sector);\r
+\r
// get known key from array\r
bool keyFound = false;\r
if (autosearchKey) {\r
}\r
}\r
if (keyFound) break;\r
- } \r
+ }\r
\r
// Can't found a key....\r
if (!keyFound) {\r
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
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
+\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
// print nested statistic\r
PrintAndLog("\n\n-----------------------------------------------\nNested statistic:\nIterations count: %d", iterations);\r
PrintAndLog("Time in nested: %1.3f (%1.3f sec per key)", ((float)(msclock() - msclock1))/1000.0, ((float)(msclock() - msclock1))/iterations/1000.0);\r
- \r
+\r
// print result\r
PrintAndLog("|---|----------------|---|----------------|---|");\r
PrintAndLog("|sec|key A |res|key B |res|");\r
i++;\r
}\r
}\r
- \r
+\r
SetSIMDInstr(SIMD_AUTO);\r
if (iindx > 0) {\r
while ((ctmp = param_getchar(Cmd, iindx))) {\r
}\r
}\r
iindx++;\r
- } \r
+ }\r
}\r
\r
PrintAndLog("--target block no:%3d, target key type:%c, known target key: 0x%02x%02x%02x%02x%02x%02x%s, file action: %s, Slow: %s, Tests: %d ",\r
}\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
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
+ 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
- bool transferToEml = 0;\r
- bool createDumpFile = 0;\r
- \r
sector_t *e_sector = NULL;\r
\r
keyBlock = calloc(stKeyBlock, 6);\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
+ // 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
};\r
}\r
\r
- parseParamTDS(Cmd, 2, &transferToEml, &createDumpFile, &btimeout14a);\r
- \r
- param3InUse = transferToEml | createDumpFile | (btimeout14a != MF_CHKKEYS_DEFTIMEOUT);\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 | (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==0?'A':keyType==1?'B':'?', transferToEml?'y':'n', createDumpFile?'y':'n', ((uint32_t)timeout14a * 1000) / 106);\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
- \r
for (i = param3InUse; param_getchar(Cmd, 2 + i); i++) {\r
if (!param_gethex(Cmd, 2 + i, keyBlock + 6 * keycnt, 12)) {\r
if ( stKeyBlock - keycnt < 2) {\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)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6);\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
// May be a dic file\r
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
while (fgetc(f) != '\n' && !feof(f)) ; //goto next line\r
\r
- if( buf[0]=='#' ) continue; //The line start with # is comment, skip\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
PrintAndLog("File: %s: not found or locked.", filename);\r
free(keyBlock);\r
return 1;\r
-\r
}\r
}\r
}\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)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6);\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
// initialize storage for found keys\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 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
} 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
+ 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
- uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c;\r
- res = mfCheckKeys(blockNo, keyAB & 0x01, true, size, &keyBlock[6 * c], &key64); \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
+\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
- } \r
- \r
+ }\r
+\r
if (transferToEml) {\r
uint8_t block[16];\r
for (uint16_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {\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
- 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
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
+ // cannot be more than 7 or it will overrun c.d.asBytes(512)\r
uint64_t key = 0;\r
typedef struct {\r
uint64_t keyA;\r
st_t sector_trailer[ATTACK_KEY_COUNT];\r
memset(sector_trailer, 0x00, sizeof(sector_trailer));\r
\r
- uint8_t stSector[ATTACK_KEY_COUNT];\r
+ uint8_t stSector[ATTACK_KEY_COUNT];\r
memset(stSector, 0x00, sizeof(stSector));\r
uint8_t key_cnt[ATTACK_KEY_COUNT];\r
memset(key_cnt, 0x00, sizeof(key_cnt));\r
if (setEmulatorMem) {\r
for (uint8_t i = 0; i<ATTACK_KEY_COUNT; i++) {\r
if (key_cnt[i]>0) {\r
- uint8_t memBlock[16];\r
+ uint8_t memBlock[16];\r
memset(memBlock, 0x00, sizeof(memBlock));\r
char cmd1[36];\r
memset(cmd1,0x00,sizeof(cmd1));\r
\r
while(param_getchar(Cmd, cmdp) != 0x00) {\r
switch(param_getchar(Cmd, cmdp)) {\r
- case '*': \r
+ case '*':\r
cardsize = param_getchar(Cmd + 1, cmdp);\r
switch(cardsize) {\r
case '0':\r
break;\r
case 'u':\r
case 'U':\r
- param_gethex_ex(Cmd, cmdp+1, uid, &uidlen);\r
- switch(uidlen) {\r
+ uidlen = 14;\r
+ if (param_gethex_ex(Cmd, cmdp+1, uid, &uidlen)) {\r
+ return usage_hf14_mfsim();\r
+ }\r
+ switch (uidlen) {\r
case 14: flags = FLAG_7B_UID_IN_DATA; break;\r
case 8: flags = FLAG_4B_UID_IN_DATA; break;\r
default: return usage_hf14_mfsim();\r
cardsize == '2' ? "2K" :\r
cardsize == '4' ? "4K" : "1K",\r
flags & FLAG_4B_UID_IN_DATA ? sprint_hex(uid,4):\r
- flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7): "N/A",\r
+ flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7): "N/A",\r
exitAfterNReads,\r
flags,\r
flags);\r
cardsize == '2' ? "2K" :\r
cardsize == '4' ? "4K" : "1K",\r
flags & FLAG_4B_UID_IN_DATA ? sprint_hex(uid,4):\r
- flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7): "N/A",\r
+ flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7): "N/A",\r
exitAfterNReads,\r
flags,\r
flags);\r
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
PrintAndLog("Command execute timeout");\r
}\r
\r
- return 0;\r
+ return 0;\r
}\r
\r
int CmdHF14AMfEClear(const char *Cmd)\r
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
\r
PrintAndLog("Saved %d blocks to file: %s", numBlocks, filename);\r
\r
- return 0;\r
+ return 0;\r
}\r
\r
\r
return 0;\r
}\r
\r
+\r
int CmdHF14AMfEKeyPrn(const char *Cmd)\r
{\r
int i;\r
- uint8_t numSectors;\r
+ uint8_t numSectors = 16;\r
uint8_t data[16];\r
uint64_t keyA, keyB;\r
+ bool createDumpFile = false;\r
\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("Usage: hf mf ekeyprn [card memory] [d]");\r
PrintAndLog(" [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r
+ PrintAndLog(" [d] : write keys to binary file dumpkeys.bin");\r
PrintAndLog("");\r
PrintAndLog(" sample: hf mf ekeyprn 1");\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
- case '\0': numSectors = 16; break;\r
- case '2' : numSectors = 32; break;\r
- case '4' : numSectors = 40; break;\r
- default: numSectors = 16;\r
+ uint8_t cmdp = 0;\r
+ while (param_getchar(Cmd, cmdp) != 0x00) {\r
+ switch (param_getchar(Cmd, cmdp)) {\r
+ case '0' : numSectors = 5; break;\r
+ case '1' :\r
+ case '\0': numSectors = 16; break;\r
+ case '2' : numSectors = 32; break;\r
+ case '4' : numSectors = 40; break;\r
+ case 'd' :\r
+ case 'D' : createDumpFile = true; break;\r
+ }\r
+ cmdp++;\r
}\r
\r
PrintAndLog("|---|----------------|----------------|");\r
}\r
PrintAndLog("|---|----------------|----------------|");\r
\r
+ // Create dump file\r
+ if (createDumpFile) {\r
+ FILE *fkeys;\r
+ if ((fkeys = fopen("dumpkeys.bin","wb")) == NULL) {\r
+ PrintAndLog("Could not create file dumpkeys.bin");\r
+ return 1;\r
+ }\r
+ PrintAndLog("Printing keys to binary file dumpkeys.bin...");\r
+ for(i = 0; i < numSectors; i++) {\r
+ if (mfEmlGetMem(data, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1)) {\r
+ PrintAndLog("error get block %d", FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);\r
+ break;\r
+ }\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
+ PrintAndLog("error get block %d", FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);\r
+ break;\r
+ }\r
+ fwrite(data+10, 1, 6, fkeys);\r
+ }\r
+ fclose(fkeys);\r
+ }\r
+\r
return 0;\r
}\r
\r
+\r
int CmdHF14AMfCSetUID(const char *Cmd)\r
{\r
uint8_t uid[8] = {0x00};\r
\r
uint8_t needHelp = 0;\r
char cmdp = 1;\r
- \r
+\r
if (param_getchar(Cmd, 0) && param_gethex(Cmd, 0, uid, 8)) {\r
PrintAndLog("UID must include 8 HEX symbols");\r
return 1;\r
if (param_getlength(Cmd, 1) > 1 && param_getlength(Cmd, 2) > 1) {\r
atqaPresent = 1;\r
cmdp = 3;\r
- \r
+\r
if (param_gethex(Cmd, 1, atqa, 4)) {\r
PrintAndLog("ATQA must include 4 HEX symbols");\r
return 1;\r
}\r
- \r
+\r
if (param_gethex(Cmd, 2, sak, 2)) {\r
PrintAndLog("SAK must include 2 HEX symbols");\r
return 1;\r
int numBlocks = 16 * 4;\r
bool wipeCard = false;\r
bool fillCard = false;\r
- \r
+\r
if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
PrintAndLog("Usage: hf mf cwipe [card size] [w] [f]");\r
PrintAndLog("sample: hf mf cwipe 1 w f");\r
}\r
\r
gen = mfCIdentify();\r
- if ((gen != 1) && (gen != 2)) \r
+ if ((gen != 1) && (gen != 2))\r
return 1;\r
- \r
+\r
numBlocks = ParamCardSizeBlocks(param_getchar(Cmd, 0));\r
\r
char cmdp = 0;\r
cmdp++;\r
}\r
\r
- if (!wipeCard && !fillCard) \r
+ if (!wipeCard && !fillCard)\r
wipeCard = true;\r
\r
PrintAndLog("--blocks count:%2d wipe:%c fill:%c", numBlocks, (wipeCard)?'y':'n', (fillCard)?'y':'n');\r
if (wipeCard) {\r
PrintAndLog("WARNING: can't wipe magic card 1b generation");\r
}\r
- res = mfCWipe(numBlocks, true, false, fillCard); \r
+ res = mfCWipe(numBlocks, true, false, fillCard);\r
} else {\r
/* generation 1a magic card by default */\r
- res = mfCWipe(numBlocks, false, wipeCard, fillCard); \r
+ res = mfCWipe(numBlocks, false, wipeCard, fillCard);\r
}\r
\r
if (res) {\r
}\r
\r
gen = mfCIdentify();\r
- if ((gen != 1) && (gen != 2)) \r
+ if ((gen != 1) && (gen != 2))\r
return 1;\r
\r
blockNo = param_get8(Cmd, 0);\r
PrintAndLog("Cant get block: %d", blockNum);\r
return 2;\r
}\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 == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Magic Halt and switch off field.\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 == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Magic Halt and switch off field.\r
\r
if (gen == 2)\r
/* generation 1b magic card */\r
for (i = 0; i < 32; i += 2)\r
sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);\r
\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 == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Switch off field.\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 == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Switch off field.\r
\r
if (gen == 2)\r
/* generation 1b magic card */\r
}\r
\r
PrintAndLog("block data:%s", sprint_hex(memBlock, 16));\r
- \r
+\r
if (mfIsSectorTrailer(blockNo)) {\r
PrintAndLogEx(NORMAL, "Trailer decoded:");\r
PrintAndLogEx(NORMAL, "Key A: %s", sprint_hex_inrow(memBlock, 6));\r
}\r
PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&memBlock[9], 1));\r
}\r
- \r
+\r
return 0;\r
}\r
\r
}\r
\r
PrintAndLog("block %3d data:%s", baseblock + i, sprint_hex(memBlock, 16));\r
- \r
+\r
if (mfIsSectorTrailer(baseblock + i)) {\r
- PrintAndLogEx(NORMAL, "Trailer decoded:");\r
- PrintAndLogEx(NORMAL, "Key A: %s", sprint_hex_inrow(memBlock, 6));\r
- PrintAndLogEx(NORMAL, "Key B: %s", sprint_hex_inrow(&memBlock[10], 6));\r
- int bln = baseblock;\r
- int blinc = (mfNumBlocksPerSector(sectorNo) > 4) ? 5 : 1;\r
- for (int i = 0; i < 4; i++) {\r
- PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &memBlock[6]));\r
- bln += blinc;\r
- }\r
- PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&memBlock[9], 1));\r
- }\r
+ PrintAndLogEx(NORMAL, "Trailer decoded:");\r
+ PrintAndLogEx(NORMAL, "Key A: %s", sprint_hex_inrow(memBlock, 6));\r
+ PrintAndLogEx(NORMAL, "Key B: %s", sprint_hex_inrow(&memBlock[10], 6));\r
+ int bln = baseblock;\r
+ int blinc = (mfNumBlocksPerSector(sectorNo) > 4) ? 5 : 1;\r
+ for (int i = 0; i < 4; i++) {\r
+ PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &memBlock[6]));\r
+ bln += blinc;\r
+ }\r
+ PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&memBlock[9], 1));\r
+ }\r
}\r
return 0;\r
}\r
}\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
\r
- if (res == 0) { // we are done\r
+ if (res == 0) { // we are done\r
break;\r
}\r
\r
- if (res == 1) { // there is (more) data to be transferred\r
- if (pckNum == 0) { // first packet, (re)allocate necessary buffer\r
+ if (res == 1) { // there is (more) data to be transferred\r
+ if (pckNum == 0) { // first packet, (re)allocate necessary buffer\r
if (traceLen > bufsize || buf == NULL) {\r
uint8_t *p;\r
- if (buf == NULL) { // not yet allocated\r
+ if (buf == NULL) { // not yet allocated\r
p = malloc(traceLen);\r
- } else { // need more memory\r
+ } else { // need more memory\r
p = realloc(buf, traceLen);\r
}\r
if (p == NULL) {\r
pckNum++;\r
}\r
\r
- if (res == 2) { // received all data, start displaying\r
+ if (res == 2) { // received all data, start displaying\r
blockLen = bufPtr - buf;\r
bufPtr = buf;\r
printf(">\n");\r
PrintAndLog("received trace len: %d packages: %d", blockLen, pckNum);\r
while (bufPtr - buf < blockLen) {\r
- bufPtr += 6; // skip (void) timing information\r
+ bufPtr += 6; // skip (void) timing information\r
len = *((uint16_t *)bufPtr);\r
if(len & 0x8000) {\r
isTag = true;\r
mfTraceInit(uid, atqa, sak, wantSaveToEmlFile);\r
} else {\r
oddparitybuf(bufPtr, len, parity);\r
- PrintAndLog("%s(%d):%s [%s] c[%s]%c", \r
- isTag ? "TAG":"RDR", \r
- num, \r
- sprint_hex(bufPtr, len), \r
- printBitsPar(bufPtr + len, len), \r
+ PrintAndLog("%s(%d):%s [%s] c[%s]%c",\r
+ isTag ? "TAG":"RDR",\r
+ num,\r
+ sprint_hex(bufPtr, len),\r
+ printBitsPar(bufPtr + len, len),\r
printBitsPar(parity, len),\r
memcmp(bufPtr + len, parity, len / 8 + 1) ? '!' : ' ');\r
if (wantLogToFile)\r
num++;\r
}\r
bufPtr += len;\r
- bufPtr += parlen; // ignore parity\r
+ bufPtr += parlen; // ignore parity\r
}\r
pckNum = 0;\r
}\r
} // while (true)\r
\r
free(buf);\r
- \r
+\r
msleep(300); // wait for exiting arm side.\r
PrintAndLog("Done.");\r
return 0;\r
//needs nt, ar, at, Data to decrypt\r
int CmdDecryptTraceCmds(const char *Cmd){\r
uint8_t data[50];\r
- int len = 0;\r
- param_gethex_ex(Cmd,3,data,&len);\r
- return tryDecryptWord(param_get32ex(Cmd,0,0,16),param_get32ex(Cmd,1,0,16),param_get32ex(Cmd,2,0,16),data,len/2);\r
+ int len = 100;\r
+ param_gethex_ex(Cmd, 3, data, &len);\r
+ return tryDecryptWord(param_get32ex(Cmd, 0, 0, 16), param_get32ex(Cmd, 1, 0, 16), param_get32ex(Cmd, 2, 0, 16), data, len/2);\r
}\r
\r
int CmdHF14AMfAuth4(const char *cmd) {\r
uint8_t key[16] = {0};\r
int keylen = 0;\r
\r
- CLIParserInit("hf mf auth4", \r
- "Executes AES authentication command in ISO14443-4", \r
+ CLIParserInit("hf mf auth4",\r
+ "Executes AES authentication command in ISO14443-4",\r
"Usage:\n\thf mf auth4 4000 000102030405060708090a0b0c0d0e0f -> executes authentication\n"\r
"\thf mf auth4 9003 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> executes authentication\n");\r
\r
arg_param_end\r
};\r
CLIExecWithReturn(cmd, argtable, true);\r
- \r
+\r
CLIGetHexWithReturn(1, keyn, &keynlen);\r
CLIGetHexWithReturn(2, key, &keylen);\r
CLIParserFree();\r
- \r
+\r
if (keynlen != 2) {\r
PrintAndLog("ERROR: <Key Num> must be 2 bytes long instead of: %d", keynlen);\r
return 1;\r
}\r
- \r
+\r
if (keylen != 16) {\r
PrintAndLog("ERROR: <Key Value> must be 16 bytes long instead of: %d", keylen);\r
return 1;\r
// https://www.nxp.com/docs/en/application-note/AN10787.pdf\r
int CmdHF14AMfMAD(const char *cmd) {\r
\r
- CLIParserInit("hf mf mad",\r
- "Checks and prints Mifare Application Directory (MAD)",\r
- "Usage:\n\thf mf mad -> shows MAD if exists\n"\r
- "\thf mf mad -a 03e1 -k ffffffffffff -b -> shows NDEF data if exists. read card with custom key and key B\n");\r
-\r
- void *argtable[] = {\r
- arg_param_begin,\r
- arg_lit0("vV", "verbose", "show technical data"),\r
- arg_str0("aA", "aid", "print all sectors with aid", NULL),\r
- arg_str0("kK", "key", "key for printing sectors", NULL),\r
- arg_lit0("bB", "keyb", "use key B for access printing sectors (by default: key A)"),\r
- arg_param_end\r
- };\r
- CLIExecWithReturn(cmd, argtable, true);\r
- bool verbose = arg_get_lit(1);\r
- uint8_t aid[2] = {0};\r
- int aidlen;\r
- CLIGetHexWithReturn(2, aid, &aidlen);\r
- uint8_t key[6] = {0};\r
- int keylen;\r
- CLIGetHexWithReturn(3, key, &keylen);\r
- bool keyB = arg_get_lit(4);\r
-\r
- CLIParserFree();\r
-\r
- if (aidlen != 2 && keylen > 0) {\r
- PrintAndLogEx(WARNING, "do not need a key without aid.");\r
- }\r
-\r
- uint8_t sector0[16 * 4] = {0};\r
- uint8_t sector10[16 * 4] = {0};\r
- if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector0)) {\r
- PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");\r
- return 2;\r
- }\r
-\r
- if (verbose) {\r
- for (int i = 0; i < 4; i ++)\r
- PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(§or0[i * 16], 16));\r
- }\r
-\r
- bool haveMAD2 = false;\r
- MAD1DecodeAndPrint(sector0, verbose, &haveMAD2);\r
-\r
- if (haveMAD2) {\r
- if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector10)) {\r
- PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");\r
- return 2;\r
- }\r
-\r
- MAD2DecodeAndPrint(sector10, verbose);\r
- }\r
-\r
- if (aidlen == 2) {\r
- uint16_t aaid = (aid[0] << 8) + aid[1];\r
- PrintAndLogEx(NORMAL, "\n-------------- AID 0x%04x ---------------", aaid);\r
-\r
- uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};\r
- size_t madlen = 0;\r
- if (MADDecode(sector0, sector10, mad, &madlen)) {\r
- PrintAndLogEx(ERR, "can't decode mad.");\r
- return 10;\r
- }\r
-\r
- uint8_t akey[6] = {0};\r
- memcpy(akey, g_mifare_ndef_key, 6);\r
- if (keylen == 6) {\r
- memcpy(akey, key, 6);\r
- }\r
-\r
- for (int i = 0; i < madlen; i++) {\r
- if (aaid == mad[i]) {\r
- uint8_t vsector[16 * 4] = {0};\r
- if (mfReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, akey, vsector)) {\r
- PrintAndLogEx(NORMAL, "");\r
- PrintAndLogEx(ERR, "read sector %d error.", i + 1);\r
- return 2;\r
- }\r
-\r
- for (int j = 0; j < (verbose ? 4 : 3); j ++)\r
- PrintAndLogEx(NORMAL, " [%03d] %s", (i + 1) * 4 + j, sprint_hex(&vsector[j * 16], 16));\r
- }\r
- }\r
- }\r
-\r
- return 0;\r
+ CLIParserInit("hf mf mad",\r
+ "Checks and prints Mifare Application Directory (MAD)",\r
+ "Usage:\n\thf mf mad -> shows MAD if exists\n"\r
+ "\thf mf mad -a 03e1 -k ffffffffffff -b -> shows NDEF data if exists. read card with custom key and key B\n");\r
+\r
+ void *argtable[] = {\r
+ arg_param_begin,\r
+ arg_lit0("vV", "verbose", "show technical data"),\r
+ arg_str0("aA", "aid", "print all sectors with aid", NULL),\r
+ arg_str0("kK", "key", "key for printing sectors", NULL),\r
+ arg_lit0("bB", "keyb", "use key B for access printing sectors (by default: key A)"),\r
+ arg_param_end\r
+ };\r
+ CLIExecWithReturn(cmd, argtable, true);\r
+ bool verbose = arg_get_lit(1);\r
+ uint8_t aid[2] = {0};\r
+ int aidlen;\r
+ CLIGetHexWithReturn(2, aid, &aidlen);\r
+ uint8_t key[6] = {0};\r
+ int keylen;\r
+ CLIGetHexWithReturn(3, key, &keylen);\r
+ bool keyB = arg_get_lit(4);\r
+\r
+ CLIParserFree();\r
+\r
+ if (aidlen != 2 && keylen > 0) {\r
+ PrintAndLogEx(WARNING, "do not need a key without aid.");\r
+ }\r
+\r
+ uint8_t sector0[16 * 4] = {0};\r
+ uint8_t sector10[16 * 4] = {0};\r
+ if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector0)) {\r
+ PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");\r
+ return 2;\r
+ }\r
+\r
+ if (verbose) {\r
+ for (int i = 0; i < 4; i ++)\r
+ PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(§or0[i * 16], 16));\r
+ }\r
+\r
+ bool haveMAD2 = false;\r
+ MAD1DecodeAndPrint(sector0, verbose, &haveMAD2);\r
+\r
+ if (haveMAD2) {\r
+ if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector10)) {\r
+ PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");\r
+ return 2;\r
+ }\r
+\r
+ MAD2DecodeAndPrint(sector10, verbose);\r
+ }\r
+\r
+ if (aidlen == 2) {\r
+ uint16_t aaid = (aid[0] << 8) + aid[1];\r
+ PrintAndLogEx(NORMAL, "\n-------------- AID 0x%04x ---------------", aaid);\r
+\r
+ uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};\r
+ size_t madlen = 0;\r
+ if (MADDecode(sector0, sector10, mad, &madlen)) {\r
+ PrintAndLogEx(ERR, "can't decode mad.");\r
+ return 10;\r
+ }\r
+\r
+ uint8_t akey[6] = {0};\r
+ memcpy(akey, g_mifare_ndef_key, 6);\r
+ if (keylen == 6) {\r
+ memcpy(akey, key, 6);\r
+ }\r
+\r
+ for (int i = 0; i < madlen; i++) {\r
+ if (aaid == mad[i]) {\r
+ uint8_t vsector[16 * 4] = {0};\r
+ if (mfReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, akey, vsector)) {\r
+ PrintAndLogEx(NORMAL, "");\r
+ PrintAndLogEx(ERR, "read sector %d error.", i + 1);\r
+ return 2;\r
+ }\r
+\r
+ for (int j = 0; j < (verbose ? 4 : 3); j ++)\r
+ PrintAndLogEx(NORMAL, " [%03d] %s", (i + 1) * 4 + j, sprint_hex(&vsector[j * 16], 16));\r
+ }\r
+ }\r
+ }\r
+\r
+ return 0;\r
}\r
\r
int CmdHFMFNDEF(const char *cmd) {\r
\r
- CLIParserInit("hf mf ndef",\r
- "Prints NFC Data Exchange Format (NDEF)",\r
- "Usage:\n\thf mf ndef -> shows NDEF data\n"\r
- "\thf mf ndef -a 03e1 -k ffffffffffff -b -> shows NDEF data with custom AID, key and with key B\n");\r
-\r
- void *argtable[] = {\r
- arg_param_begin,\r
- arg_litn("vV", "verbose", 0, 2, "show technical data"),\r
- arg_str0("aA", "aid", "replace default aid for NDEF", NULL),\r
- arg_str0("kK", "key", "replace default key for NDEF", NULL),\r
- arg_lit0("bB", "keyb", "use key B for access sectors (by default: key A)"),\r
- arg_param_end\r
- };\r
- CLIExecWithReturn(cmd, argtable, true);\r
-\r
- bool verbose = arg_get_lit(1);\r
- bool verbose2 = arg_get_lit(1) > 1;\r
- uint8_t aid[2] = {0};\r
- int aidlen;\r
- CLIGetHexWithReturn(2, aid, &aidlen);\r
- uint8_t key[6] = {0};\r
- int keylen;\r
- CLIGetHexWithReturn(3, key, &keylen);\r
- bool keyB = arg_get_lit(4);\r
-\r
- CLIParserFree();\r
-\r
- uint16_t ndefAID = 0x03e1;\r
- if (aidlen == 2)\r
- ndefAID = (aid[0] << 8) + aid[1];\r
-\r
- uint8_t ndefkey[6] = {0};\r
- memcpy(ndefkey, g_mifare_ndef_key, 6);\r
- if (keylen == 6) {\r
- memcpy(ndefkey, key, 6);\r
- }\r
-\r
- uint8_t sector0[16 * 4] = {0};\r
- uint8_t sector10[16 * 4] = {0};\r
- uint8_t data[4096] = {0};\r
- int datalen = 0;\r
-\r
- PrintAndLogEx(NORMAL, "");\r
-\r
- if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector0)) {\r
- PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");\r
- return 2;\r
- }\r
-\r
- bool haveMAD2 = false;\r
- int res = MADCheck(sector0, NULL, verbose, &haveMAD2);\r
- if (res) {\r
- PrintAndLogEx(ERR, "MAD error %d.", res);\r
- return res;\r
- }\r
-\r
- if (haveMAD2) {\r
- if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector10)) {\r
- PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");\r
- return 2;\r
- }\r
- }\r
-\r
- uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};\r
- size_t madlen = 0;\r
- if (MADDecode(sector0, (haveMAD2 ? sector10 : NULL), mad, &madlen)) {\r
- PrintAndLogEx(ERR, "can't decode mad.");\r
- return 10;\r
- }\r
-\r
- printf("data reading:");\r
- for (int i = 0; i < madlen; i++) {\r
- if (ndefAID == mad[i]) {\r
- uint8_t vsector[16 * 4] = {0};\r
- if (mfReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, ndefkey, vsector)) {\r
- PrintAndLogEx(ERR, "read sector %d error.", i + 1);\r
- return 2;\r
- }\r
-\r
- memcpy(&data[datalen], vsector, 16 * 3);\r
- datalen += 16 * 3;\r
-\r
- printf(".");\r
- }\r
- }\r
- printf(" OK\n");\r
-\r
- if (!datalen) {\r
- PrintAndLogEx(ERR, "no NDEF data.");\r
- return 11;\r
- }\r
-\r
- if (verbose2) {\r
- PrintAndLogEx(NORMAL, "NDEF data:");\r
- dump_buffer(data, datalen, stdout, 1);\r
- }\r
-\r
- NDEFDecodeAndPrint(data, datalen, verbose);\r
-\r
- return 0;\r
+ CLIParserInit("hf mf ndef",\r
+ "Prints NFC Data Exchange Format (NDEF)",\r
+ "Usage:\n\thf mf ndef -> shows NDEF data\n"\r
+ "\thf mf ndef -a 03e1 -k ffffffffffff -b -> shows NDEF data with custom AID, key and with key B\n");\r
+\r
+ void *argtable[] = {\r
+ arg_param_begin,\r
+ arg_litn("vV", "verbose", 0, 2, "show technical data"),\r
+ arg_str0("aA", "aid", "replace default aid for NDEF", NULL),\r
+ arg_str0("kK", "key", "replace default key for NDEF", NULL),\r
+ arg_lit0("bB", "keyb", "use key B for access sectors (by default: key A)"),\r
+ arg_param_end\r
+ };\r
+ CLIExecWithReturn(cmd, argtable, true);\r
+\r
+ bool verbose = arg_get_lit(1);\r
+ bool verbose2 = arg_get_lit(1) > 1;\r
+ uint8_t aid[2] = {0};\r
+ int aidlen;\r
+ CLIGetHexWithReturn(2, aid, &aidlen);\r
+ uint8_t key[6] = {0};\r
+ int keylen;\r
+ CLIGetHexWithReturn(3, key, &keylen);\r
+ bool keyB = arg_get_lit(4);\r
+\r
+ CLIParserFree();\r
+\r
+ uint16_t ndefAID = 0x03e1;\r
+ if (aidlen == 2)\r
+ ndefAID = (aid[0] << 8) + aid[1];\r
+\r
+ uint8_t ndefkey[6] = {0};\r
+ memcpy(ndefkey, g_mifare_ndef_key, 6);\r
+ if (keylen == 6) {\r
+ memcpy(ndefkey, key, 6);\r
+ }\r
+\r
+ uint8_t sector0[16 * 4] = {0};\r
+ uint8_t sector10[16 * 4] = {0};\r
+ uint8_t data[4096] = {0};\r
+ int datalen = 0;\r
+\r
+ PrintAndLogEx(NORMAL, "");\r
+\r
+ if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector0)) {\r
+ PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");\r
+ return 2;\r
+ }\r
+\r
+ bool haveMAD2 = false;\r
+ int res = MADCheck(sector0, NULL, verbose, &haveMAD2);\r
+ if (res) {\r
+ PrintAndLogEx(ERR, "MAD error %d.", res);\r
+ return res;\r
+ }\r
+\r
+ if (haveMAD2) {\r
+ if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector10)) {\r
+ PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");\r
+ return 2;\r
+ }\r
+ }\r
+\r
+ uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};\r
+ size_t madlen = 0;\r
+ if (MADDecode(sector0, (haveMAD2 ? sector10 : NULL), mad, &madlen)) {\r
+ PrintAndLogEx(ERR, "can't decode mad.");\r
+ return 10;\r
+ }\r
+\r
+ printf("data reading:");\r
+ for (int i = 0; i < madlen; i++) {\r
+ if (ndefAID == mad[i]) {\r
+ uint8_t vsector[16 * 4] = {0};\r
+ if (mfReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, ndefkey, vsector)) {\r
+ PrintAndLogEx(ERR, "read sector %d error.", i + 1);\r
+ return 2;\r
+ }\r
+\r
+ memcpy(&data[datalen], vsector, 16 * 3);\r
+ datalen += 16 * 3;\r
+\r
+ printf(".");\r
+ }\r
+ }\r
+ printf(" OK\n");\r
+\r
+ if (!datalen) {\r
+ PrintAndLogEx(ERR, "no NDEF data.");\r
+ return 11;\r
+ }\r
+\r
+ if (verbose2) {\r
+ PrintAndLogEx(NORMAL, "NDEF data:");\r
+ dump_buffer(data, datalen, stdout, 1);\r
+ }\r
+\r
+ NDEFDecodeAndPrint(data, datalen, verbose);\r
+\r
+ 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
+ bool isOK = resp.arg[0];\r
+ PrintAndLog("Personalization %s", isOK ? "SUCCEEDED" : "FAILED");\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
projects / proxmark3-svn / blobdiff