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

fix cid 395490, and 14a simulation

Browse source
This commit is contained in:
iceman1001 2022-07-06 14:00:19 +02:00
commit edffa21598
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
armsrc/iso14443a.c
View file

@ -927,9 +927,13 @@ bool GetIso14443aCommandFromReader(uint8_t *received, uint8_t *par, int *len) {
(void)b; (void)b;
uint8_t flip = 0; uint8_t flip = 0;
uint16_t checker = 0; uint16_t checker = 4000;
for (;;) { for (;;) {
WDT_HIT(); WDT_HIT();
// ever 3 * 4000, check if we got any data from client
// takes long time, usually messes with simualtion
if (flip == 3) { if (flip == 3) {
if (data_available()) if (data_available())
return false; return false;
@ -937,14 +941,14 @@ bool GetIso14443aCommandFromReader(uint8_t *received, uint8_t *par, int *len) {
flip = 0; flip = 0;
} }
if (checker >= 3000) { // button press, takes a bit time, might mess with simualtion
if (checker-- == 0) {
if (BUTTON_PRESS()) if (BUTTON_PRESS())
return false; return false;
flip++; flip++;
checker = 0; checker = 4000;
} }
++checker;
if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) { if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
b = (uint8_t)AT91C_BASE_SSC->SSC_RHR; b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
@ -2461,7 +2465,7 @@ static int GetATQA(uint8_t *resp, uint8_t *resp_par, bool use_ecp, bool use_mags
uint8_t deselect_cmd[] = {0xc2, 0xe0, 0xb4}; uint8_t deselect_cmd[] = {0xc2, 0xe0, 0xb4};
ReaderTransmit(deselect_cmd, sizeof(deselect_cmd), NULL); ReaderTransmit(deselect_cmd, sizeof(deselect_cmd), NULL);
// Read response if present // Read response if present
ReaderReceive(resp, resp_par); (void) ReaderReceive(resp, resp_par);
} }
uint32_t save_iso14a_timeout = iso14a_get_timeout(); uint32_t save_iso14a_timeout = iso14a_get_timeout();