github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

chg: 'hf iclass dump' - more texts

Browse source
This commit is contained in:
iceman1001 2018-02-08 10:49:44 +01:00
commit 28e73824e1
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
client/cmdhficlass.c
View file

@ -896,8 +896,8 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
bool verbose = false; bool verbose = false;
uint8_t cmdp = 0; uint8_t cmdp = 0;
while(param_getchar(Cmd, cmdp) != 0x00 && !errors) { while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
switch(param_getchar(Cmd, cmdp)) { switch (param_getchar(Cmd, cmdp)) {
case 'h': case 'h':
case 'H': case 'H':
return usage_hf_iclass_dump(); return usage_hf_iclass_dump();
@ -992,7 +992,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
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(); DropField();
return 0; return 0;
@ -1012,6 +1012,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
//try twice - for some reason it sometimes fails the first time... //try twice - for some reason it sometimes fails the first time...
PrintAndLog("[+] retry to select card"); PrintAndLog("[+] retry to select card");
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)){
PrintAndLog("[!] failed authenticating with debit key");
DropField(); DropField();
return 0; return 0;
} }
@ -1026,6 +1027,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
DropField(); DropField();
return 1; return 1;
} }
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) {
@ -1033,11 +1035,13 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
DropField(); DropField();
return 0; return 0;
} }
uint32_t startindex = resp.arg[2]; uint32_t startindex = resp.arg[2];
if (blocksRead*8 > sizeof(tag_data)-(blockno*8)) { if (blocksRead*8 > sizeof(tag_data) - (blockno*8)) {
PrintAndLog("[-] data exceeded Buffer size!"); PrintAndLog("[-] data exceeded buffer size!");
blocksRead = (sizeof(tag_data)/8) - blockno; blocksRead = (sizeof(tag_data)/8) - blockno;
} }
// response ok - now get bigbuf content of the dump // response ok - now get bigbuf content of the dump
GetFromBigBuf(tag_data+(blockno*8), blocksRead*8, startindex); GetFromBigBuf(tag_data+(blockno*8), blocksRead*8, startindex);
WaitForResponse(CMD_ACK, NULL); WaitForResponse(CMD_ACK, NULL);
@ -1052,6 +1056,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
if (!select_and_auth(CreditKEY, MAC, c_div_key, true, elite, rawkey, verbose)){ if (!select_and_auth(CreditKEY, MAC, c_div_key, true, 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...
if (!select_and_auth(CreditKEY, MAC, c_div_key, true, elite, rawkey, verbose)){ if (!select_and_auth(CreditKEY, MAC, c_div_key, true, elite, rawkey, verbose)){
PrintAndLog("[!] failed authenticating with credit key");
DropField(); DropField();
return 0; return 0;
} }
@ -1086,14 +1091,16 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
WaitForResponse(CMD_ACK, NULL); WaitForResponse(CMD_ACK, NULL);
gotBytes += blocksRead * 8; gotBytes += blocksRead * 8;
} else { //field is still on - turn it off...
DropField();
} }
} }
//field is still on - turn it off...
DropField();
// add diversified keys to dump // add diversified keys to dump
if (have_debit_key) memcpy(tag_data+(3*8),div_key,8); if (have_debit_key) memcpy(tag_data+(3*8),div_key,8);
if (have_credit_key) memcpy(tag_data+(4*8),c_div_key,8); if (have_credit_key) memcpy(tag_data+(4*8),c_div_key,8);
// print the dump // print the dump
printf("------+--+-------------------------+\n"); printf("------+--+-------------------------+\n");
printf("CSN |00| %s|\n", sprint_hex(tag_data, 8)); printf("CSN |00| %s|\n", sprint_hex(tag_data, 8));