RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-21 15:56:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix hf 14b dump - now always turn off the field even when called with --ns

Browse source
This commit is contained in:
iceman1001 2024-01-09 10:01:35 +01:00
parent d3ef9e3c1d
commit 131721c94a
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
client/src/cmdhf14b.c
View file

@ -536,6 +536,7 @@ static bool get_14b_UID(uint8_t *d, iso14b_type_t *found_type) {
// test 14b standard
packet.flags = (ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT);
clearCommandBuffer();
SendCommandNG(CMD_HF_ISO14443B_COMMAND, (uint8_t *)&packet, sizeof(iso14b_raw_cmd_t));
if (WaitForResponseTimeout(CMD_HF_ISO14443B_COMMAND, &resp, TIMEOUT)) {
@ -1493,7 +1494,7 @@ static int CmdHF14BDump(const char *Cmd) {
// select SR tag
if (WaitForResponseTimeout(CMD_HF_ISO14443B_COMMAND, &resp, 2000)) {
if (resp.status != PM3_SUCCESS) {
PrintAndLogEx(FAILED, "failed to select arg0[%" PRId64 "]", resp.oldarg[0]);
PrintAndLogEx(FAILED, "failed to select ( " _RED_("%d") " )", resp.status);
free(packet);
return switch_off_field_14b();
}
@ -1553,10 +1554,11 @@ static int CmdHF14BDump(const char *Cmd) {
free(packet);
PrintAndLogEx(NORMAL, "");
switch_off_field_14b();
if (blocknum != 0xFF) {
PrintAndLogEx(FAILED, "dump failed");
return switch_off_field_14b();
return PM3_ESOFT;
}
print_sr_blocks(data, cardsize, card.uid);
@ -1578,7 +1580,7 @@ static int CmdHF14BDump(const char *Cmd) {
pm3_save_dump(filename, data, datalen, jsf14b_v2);
}
return switch_off_field_14b();
return PM3_ESOFT;
}
/*