github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-24 06:55:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update cmdhfmf.c

Browse source 
Issue #843 : hf mf chk t save to emulator fix.
This commit is contained in:
mwalker33 2019-07-16 20:10:50 +10:00
commit f7bcfead7f
1 changed files with 52 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

83
client/cmdhfmf.c
View file

@ -1054,7 +1054,7 @@ int CmdHF14AMfChk(const char *Cmd)
PrintAndLog("Usage: hf mf chk <block number>|<*card memory> <key type (A/B/?)> [t|d|s|ss] [<key (12 hex symbols)>] [<dic (*.dic)>]"); PrintAndLog("Usage: hf mf chk <block number>|<*card memory> <key type (A/B/?)> [t|d|s|ss] [<key (12 hex symbols)>] [<dic (*.dic)>]");
PrintAndLog(" * - all sectors"); PrintAndLog(" * - all sectors");
PrintAndLog("card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K"); PrintAndLog("card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");
PrintAndLog("d - write keys to binary file\n"); PrintAndLog("d - write keys to binary file (not used when <block number> supplied)\n");
PrintAndLog("t - write keys to emulator memory"); PrintAndLog("t - write keys to emulator memory");
PrintAndLog("s - slow execute. timeout 1ms"); PrintAndLog("s - slow execute. timeout 1ms");
PrintAndLog("ss - very slow execute. timeout 5ms"); PrintAndLog("ss - very slow execute. timeout 5ms");
@ -1066,26 +1066,26 @@ int CmdHF14AMfChk(const char *Cmd)
return 0; return 0;
} }
FILE * f; FILE * f;
char filename[FILE_PATH_SIZE]={0}; char filename[FILE_PATH_SIZE]={0};
char buf[13]; char buf[13];
uint8_t *keyBlock = NULL, *p; uint8_t *keyBlock = NULL, *p;
uint16_t stKeyBlock = 20; uint16_t stKeyBlock = 20;
int i, res;
int i, res; int keycnt = 0;
int keycnt = 0; char ctmp = 0x00;
char ctmp = 0x00; int clen = 0;
int clen = 0; uint8_t blockNo = 0;
uint8_t blockNo = 0; uint8_t SectorsCnt = 0;
uint8_t SectorsCnt = 0; uint8_t keyType = 0;
uint8_t keyType = 0; uint64_t key64 = 0;
uint64_t key64 = 0;
// timeout in units. (ms * 106)/10 or us*0.0106 // timeout in units. (ms * 106)/10 or us*0.0106
uint8_t btimeout14a = MF_CHKKEYS_DEFTIMEOUT; // fast by default uint8_t btimeout14a = MF_CHKKEYS_DEFTIMEOUT; // fast by default
bool param3InUse = false; bool param3InUse = false;
bool transferToEml = 0;
bool transferToEml = 0; bool createDumpFile = 0;
bool createDumpFile = 0; bool SingleKey = false; // Flag to ID if a single or multi key check
uint8_t KeyFoundCount = 0; // Counter to display the number of keys found/transfered to emulator
sector_t *e_sector = NULL; sector_t *e_sector = NULL;
@ -1100,8 +1100,12 @@ int CmdHF14AMfChk(const char *Cmd)
if (param_getchar(Cmd, 0)=='*') { if (param_getchar(Cmd, 0)=='*') {
SectorsCnt = ParamCardSizeSectors(param_getchar(Cmd + 1, 0)); SectorsCnt = ParamCardSizeSectors(param_getchar(Cmd + 1, 0));
} }
else else {
blockNo = param_get8(Cmd, 0); blockNo = param_get8(Cmd, 0);
// Singe Key check, so Set Sector count to cover sectors (1 to sector that contains the block)
SectorsCnt = (blockNo/4) + 1;
SingleKey = true; // Set flag for single key check
}
ctmp = param_getchar(Cmd, 1); ctmp = param_getchar(Cmd, 1);
clen = param_getlength(Cmd, 1); clen = param_getlength(Cmd, 1);
@ -1142,7 +1146,7 @@ int CmdHF14AMfChk(const char *Cmd)
keyBlock = p; keyBlock = p;
} }
PrintAndLog("chk key[%2d] %02x%02x%02x%02x%02x%02x", keycnt, PrintAndLog("chk key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
(keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2], (keyBlock + 6*keycnt)[0], (keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
(keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6); (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6);
keycnt++; keycnt++;
} else { } else {
@ -1200,7 +1204,7 @@ int CmdHF14AMfChk(const char *Cmd)
PrintAndLog("No key specified, trying default keys"); PrintAndLog("No key specified, trying default keys");
for (;keycnt < defaultKeysSize; keycnt++) for (;keycnt < defaultKeysSize; keycnt++)
PrintAndLog("chk default key[%2d] %02x%02x%02x%02x%02x%02x", keycnt, PrintAndLog("chk default key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
(keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2], (keyBlock + 6*keycnt)[0], (keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
(keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6); (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6);
} }
@ -1218,9 +1222,11 @@ int CmdHF14AMfChk(const char *Cmd)
} }
printf("\n"); printf("\n");
bool foundAKey = false; bool foundAKey = false;
uint32_t max_keys = keycnt > USB_CMD_DATA_SIZE / 6 ? USB_CMD_DATA_SIZE / 6 : keycnt; uint32_t max_keys = keycnt > USB_CMD_DATA_SIZE / 6 ? USB_CMD_DATA_SIZE / 6 : keycnt;
if (SectorsCnt) {
// !SingleKey, so all key check
if ((SectorsCnt) && !SingleKey) {
PrintAndLog("To cancel this operation press the button on the proxmark..."); PrintAndLog("To cancel this operation press the button on the proxmark...");
printf("--"); printf("--");
for (uint32_t c = 0; c < keycnt; c += max_keys) { for (uint32_t c = 0; c < keycnt; c += max_keys) {
@ -1250,9 +1256,15 @@ int CmdHF14AMfChk(const char *Cmd)
if (res != 1) { if (res != 1) {
if (!res) { if (!res) {
PrintAndLog("Found valid key:[%d:%c]%012" PRIx64, blockNo, (keyAB & 0x01)?'B':'A', key64);
// Use the common format below
// PrintAndLog("Found valid key:[%d:%c]%012" PRIx64, blockNo, (keyAB & 0x01)?'B':'A', key64);
foundAKey = true; foundAKey = true;
}
// Store the Single Key for display list
e_sector[(blockNo/4)].foundKey[(keyAB & 0x01)] = true; // flag key found
e_sector[(blockNo/4)].Key[(keyAB & 0x01)] = key64; // Save key data
}
} else { } else {
PrintAndLog("Command execute timeout"); PrintAndLog("Command execute timeout");
} }
@ -1268,8 +1280,11 @@ int CmdHF14AMfChk(const char *Cmd)
PrintAndLog("|sec|key A |res|key B |res|"); PrintAndLog("|sec|key A |res|key B |res|");
PrintAndLog("|---|----------------|---|----------------|---|"); PrintAndLog("|---|----------------|---|----------------|---|");
for (i = 0; i < SectorsCnt; i++) { for (i = 0; i < SectorsCnt; i++) {
PrintAndLog("|%03d| %012" PRIx64 " | %d | %012" PRIx64 " | %d |", i, // If a block key check, only print a line if a key was found.
e_sector[i].Key[0], e_sector[i].foundKey[0], e_sector[i].Key[1], e_sector[i].foundKey[1]); if (!SingleKey || (e_sector[i].foundKey[0]) || (e_sector[i].foundKey[1]) ){
PrintAndLog("|%03d| %012" PRIx64 " | %d | %012" PRIx64 " | %d |", i,
e_sector[i].Key[0], e_sector[i].foundKey[0], e_sector[i].Key[1], e_sector[i].foundKey[1]);
}
} }
PrintAndLog("|---|----------------|---|----------------|---|"); PrintAndLog("|---|----------------|---|----------------|---|");
} }
@ -1286,15 +1301,18 @@ int CmdHF14AMfChk(const char *Cmd)
for (uint16_t t = 0; t < 2; t++) { for (uint16_t t = 0; t < 2; t++) {
if (e_sector[sectorNo].foundKey[t]) { if (e_sector[sectorNo].foundKey[t]) {
num_to_bytes(e_sector[sectorNo].Key[t], 6, block + t * 10); num_to_bytes(e_sector[sectorNo].Key[t], 6, block + t * 10);
KeyFoundCount++; // Key found count for information
} }
} }
mfEmlSetMem(block, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1); mfEmlSetMem(block, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);
} }
} }
PrintAndLog("Found keys have been transferred to the emulator memory"); // PrintAndLog("Found keys have been transferred to the emulator memory");
// Updated to show the actual number of keys found/transfered.
PrintAndLog("%d keys(s) found have been transferred to the emulator memory",KeyFoundCount);
} }
if (createDumpFile) { if (createDumpFile && !SingleKey) {
FILE *fkeys = fopen("dumpkeys.bin","wb"); FILE *fkeys = fopen("dumpkeys.bin","wb");
if (fkeys == NULL) { if (fkeys == NULL) {
PrintAndLog("Could not create file dumpkeys.bin"); PrintAndLog("Could not create file dumpkeys.bin");
@ -1313,6 +1331,7 @@ int CmdHF14AMfChk(const char *Cmd)
PrintAndLog("Found keys have been dumped to file dumpkeys.bin. 0xffffffffffff has been inserted for unknown keys."); PrintAndLog("Found keys have been dumped to file dumpkeys.bin. 0xffffffffffff has been inserted for unknown keys.");
} }
free(e_sector); free(e_sector);
free(keyBlock); free(keyBlock);
PrintAndLog(""); PrintAndLog("");