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

APDU finder: Prevent reactivating the field (speedup).

Browse source
This commit is contained in:
ikarus 2020-12-14 23:27:47 +01:00
commit b9b92c6bc3
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
client/src/cmdhf14a.c
View file

@ -2198,7 +2198,7 @@ static int CmdHf14AFindapdu(const char *Cmd) {
bool inc_p1 = true; bool inc_p1 = true;
uint64_t t_start = msclock(); uint64_t t_start = msclock();
uint64_t t_last_select = msclock(); uint64_t t_last_reset = msclock();
// Enumerate APDUs. // Enumerate APDUs.
do { do {
@ -2259,6 +2259,7 @@ static int CmdHf14AFindapdu(const char *Cmd) {
sprint_ascii(response, response_n - 2)); sprint_ascii(response, response_n - 2));
} }
} }
activate_field = false; // Do not reativate the filed until the next reset.
} while (++ins != ins_arg[0]); } while (++ins != ins_arg[0]);
// Increment P1/P2 in an alternating fashion. // Increment P1/P2 in an alternating fashion.
if (inc_p1) { if (inc_p1) {
@ -2268,10 +2269,12 @@ static int CmdHf14AFindapdu(const char *Cmd) {
} }
inc_p1 = !inc_p1; inc_p1 = !inc_p1;
// Check if re-selecting the card is needed. // Check if re-selecting the card is needed.
if (((msclock() - t_last_select) / 1000) > reset_time) { uint64_t t_since_last_reset = ((msclock() - t_last_reset) / 1000);
if (t_since_last_reset > reset_time) {
DropField(); DropField();
t_last_select = msclock(); activate_field = true;
PrintAndLogEx(INFO, "Reseting the tag to prevent timeout issues"); t_last_reset = msclock();
PrintAndLogEx(INFO, "Last reset was %" PRIu64 " seconds ago. Reseting the tag to prevent timeout issues", t_since_last_reset);
} }
PrintAndLogEx(INFO, "Status: [ CLA " _GREEN_("%02X") " INS " _GREEN_("%02X") " P1 " _GREEN_("%02X") " P2 " _GREEN_("%02X") " ]", cla, ins, p1, p2); PrintAndLogEx(INFO, "Status: [ CLA " _GREEN_("%02X") " INS " _GREEN_("%02X") " P1 " _GREEN_("%02X") " P2 " _GREEN_("%02X") " ]", cla, ins, p1, p2);
} while (p1 != p1_arg[0] || p2 != p2_arg[0]); } while (p1 != p1_arg[0] || p2 != p2_arg[0]);