RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-14 03:03:14 +08:00
Code Issues Projects Releases Packages Wiki Activity

chg: iclass dump textual..

Browse source
This commit is contained in:
iceman1001 2018-02-08 11:03:11 +01:00
parent 28e73824e1
commit f6d314d09e
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
client/cmdhficlass.c
View file

@ -830,7 +830,7 @@ static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool v
} }
if (isOK <= 1){ if (isOK <= 1){
PrintAndLog("[-] (%d) Failed to obtain CC! Aborting...", isOK); PrintAndLog("[-] failed to obtain CC! Tag-select is aborting... (%d)", isOK);
return false; return false;
} }
return true; return true;
@ -989,12 +989,13 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
DropField(); DropField();
return 0; return 0;
} }
DropField();
uint8_t readStatus = resp.arg[0] & 0xff; uint8_t readStatus = resp.arg[0] & 0xff;
uint8_t * data = resp.d.asBytes; uint8_t *data = resp.d.asBytes;
if (readStatus == 0){ if (readStatus == 0){
PrintAndLog("[-] no tag found"); PrintAndLog("[-] no tag found");
DropField();
return 0; return 0;
} }
@ -1006,7 +1007,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
// large memory - not able to dump pages currently // large memory - not able to dump pages currently
if (numblks > maxBlk) numblks = maxBlk; if (numblks > maxBlk) numblks = maxBlk;
} }
DropField();
// authenticate debit key and get div_key - later store in dump block 3 // authenticate debit key and get div_key - later store in dump block 3
if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose)){ if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose)){
//try twice - for some reason it sometimes fails the first time... //try twice - for some reason it sometimes fails the first time...
@ -1024,15 +1025,14 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
SendCommand(&w); SendCommand(&w);
if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) { if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
PrintAndLog("[!] command execute timeout 1"); PrintAndLog("[!] command execute timeout 1");
DropField();
return 1; return 1;
} }
// dump cmd switch off at device when finised.
uint32_t blocksRead = resp.arg[1]; uint32_t blocksRead = resp.arg[1];
uint8_t isOK = resp.arg[0] & 0xff; uint8_t isOK = resp.arg[0] & 0xff;
if (!isOK && !blocksRead) { if (!isOK && !blocksRead) {
PrintAndLog("[!] read block failed"); PrintAndLog("[!] read block failed");
DropField();
return 0; return 0;
} }
@ -1070,14 +1070,12 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
SendCommand(&w); SendCommand(&w);
if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) { if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
PrintAndLog("[!] command execute timeout 2"); PrintAndLog("[!] command execute timeout 2");
DropField();
return 0; return 0;
} }
uint8_t isOK = resp.arg[0] & 0xff; uint8_t isOK = resp.arg[0] & 0xff;
blocksRead = resp.arg[1]; blocksRead = resp.arg[1];
if (!isOK && !blocksRead) { if (!isOK && !blocksRead) {
PrintAndLog("[!] read block failed 2"); PrintAndLog("[!] read block failed 2");
DropField();
return 0; return 0;
} }
@ -1094,7 +1092,6 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
} }
} }
//field is still on - turn it off...
DropField(); DropField();
// add diversified keys to dump // add diversified keys to dump