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 
log message if single block check and write to binary file (d) options both used.
This commit is contained in:
mwalker33 2019-07-23 17:35:18 +10:00
commit 9be45786a3
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
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 (not used when <block number> supplied)\n"); PrintAndLog("d - write keys to binary file (not used when <block number> supplied)");
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");
@ -1134,6 +1134,12 @@ int CmdHF14AMfChk(const char *Cmd)
parseParamTDS(Cmd, 2, &transferToEml, &createDumpFile, &btimeout14a); parseParamTDS(Cmd, 2, &transferToEml, &createDumpFile, &btimeout14a);
if (singleBlock & createDumpFile) {
PrintAndLog (" block key check (<block no>) and write to dump file (d) combination is not supported ");
PrintAndLog (" please remove option d and try again");
return 1;
}
param3InUse = transferToEml | createDumpFile | (btimeout14a != MF_CHKKEYS_DEFTIMEOUT); param3InUse = transferToEml | createDumpFile | (btimeout14a != MF_CHKKEYS_DEFTIMEOUT);
PrintAndLog("--chk keys. sectors:%2d, block no:%3d, key type:%c, eml:%c, dmp=%c checktimeout=%d us", PrintAndLog("--chk keys. sectors:%2d, block no:%3d, key type:%c, eml:%c, dmp=%c checktimeout=%d us",
@ -1230,7 +1236,7 @@ int CmdHF14AMfChk(const char *Cmd)
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;
// !SingleKey, so all key check (if SectorsCnt > 0) // !SingleKey, so all key check (if SectorsCnt > 0)
if (SectorsCnt && !singleBlock) { if (!singleBlock) {
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,7 +1256,7 @@ int CmdHF14AMfChk(const char *Cmd)
PrintAndLog("Command execute timeout"); PrintAndLog("Command execute timeout");
} }
} }
} else if (singleBlock) { // Ensure single block mode in case SectorsCnt == 0 } else {
int keyAB = keyType; int keyAB = keyType;
do { do {
for (uint32_t c = 0; c < keycnt; c+=max_keys) { for (uint32_t c = 0; c < keycnt; c+=max_keys) {