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

Replace rf reset with an s-block deselect when using 'hf 14a reader --ecp'

Browse source
This commit is contained in:
kormax 2022-06-16 22:31:32 +03:00
commit 8e8618c989
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
armsrc/iso14443a.c
View file

@ -2445,6 +2445,7 @@ static int GetATQA(uint8_t *resp, uint8_t *resp_par, bool use_ecp, bool use_mags
#define ECP_RETRY_TIMEOUT 100 #define ECP_RETRY_TIMEOUT 100
#define WUPA_RETRY_TIMEOUT 10 // 10ms #define WUPA_RETRY_TIMEOUT 10 // 10ms
// 0x26 - REQA // 0x26 - REQA
// 0x52 - WAKE-UP // 0x52 - WAKE-UP
// 0x7A - MAGESAFE WAKE UP // 0x7A - MAGESAFE WAKE UP
@ -2456,9 +2457,11 @@ static int GetATQA(uint8_t *resp, uint8_t *resp_par, bool use_ecp, bool use_mags
} }
if (use_ecp) { if (use_ecp) {
// We drop the field to bring the phone back into an 'IDLE' state // In case a device was already selected, we send a S-BLOCK deselect to bring it into an idle state so it can be selected again
switch_off(); uint8_t deselect_cmd[] = {0xc2, 0xe0, 0xb4};
set_tracing(true); ReaderTransmit(deselect_cmd, sizeof(deselect_cmd), NULL);
// Read response if present
ReaderReceive(resp, resp_par);
} }
uint32_t save_iso14a_timeout = iso14a_get_timeout(); uint32_t save_iso14a_timeout = iso14a_get_timeout();