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

Fixes 2 bugs in mifare simulate (#380)

Browse source 
- Check button press when there is NOFIELD, so we can exit also without FIELD
- struct nonces_t is moved to include/mifare.h so client and arm has the same definition
This commit is contained in:
etmatrix 2017-08-17 16:59:48 +02:00 • committed by pwpiwi
commit 4efdfbe638
4 changed files with 18 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

17
armsrc/iso14443a.c
View file

@ -2352,18 +2352,6 @@ void ReaderMifare(bool first_try)
set_tracing(false);
}
typedef struct {
uint32_t cuid;
uint8_t sector;
uint8_t keytype;
uint32_t nonce;
uint32_t ar;
uint32_t nr;
uint32_t nonce2;
uint32_t ar2;
uint32_t nr2;
} nonces_t;
/**
*MIFARE 1K simulate.
*
@ -2562,7 +2550,10 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
LED_A_ON();
}
}
if (cardSTATE == MFEMUL_NOFIELD) continue;
if (cardSTATE == MFEMUL_NOFIELD) {
button_pushed = BUTTON_PRESS();
continue;
}
//Now, get data
res = EmGetCmd(receivedCmd, &len, receivedCmd_par);