github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-22 22:23:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 437d052b38 into 6b758d652d

Browse source
This commit is contained in:
etmatrix 2017-08-16 07:43:35 +00:00 • committed by GitHub
commit 1e44d6819c
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
armsrc/iso14443a.c
View file

@ -2359,6 +2359,7 @@ typedef struct {
uint32_t nonce; uint32_t nonce;
uint32_t ar; uint32_t ar;
uint32_t nr; uint32_t nr;
uint32_t at;
uint32_t nonce2; uint32_t nonce2;
uint32_t ar2; uint32_t ar2;
uint32_t nr2; uint32_t nr2;
@ -2562,7 +2563,10 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
LED_A_ON(); LED_A_ON();
} }
} }
if (cardSTATE == MFEMUL_NOFIELD) continue; if (cardSTATE == MFEMUL_NOFIELD) {
button_pushed = BUTTON_PRESS();
continue;
}
//Now, get data //Now, get data
res = EmGetCmd(receivedCmd, &len, receivedCmd_par); res = EmGetCmd(receivedCmd, &len, receivedCmd_par);