github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-16 02:03:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

SNF_WUPREQ and SNF_SAK harmonized)

Browse source
This commit is contained in:
merlokk 2018-01-17 15:48:01 +02:00
parent 968cb35498
commit 543a6ed3c9
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
armsrc/mifaresniff.c
View file

@ -59,25 +59,22 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
memset(sniffUID, 0x00, 8); memset(sniffUID, 0x00, 8);
memset(sniffATQA, 0x00, 2); memset(sniffATQA, 0x00, 2);
sniffSAK = 0; sniffSAK = 0;
sniffState = SNF_WUPREQ;
}
break;
}
case SNF_WUPREQ:{
if ((!reader) && (len == 2)) { // ATQA from tag
memcpy(sniffATQA, data, 2);
sniffState = SNF_ATQA; sniffState = SNF_ATQA;
} }
break; break;
} }
case SNF_ATQA: case SNF_ATQA:{
if ((!reader) && (len == 2)) { // ATQA from tag
memcpy(sniffATQA, data, 2);
sniffState = SNF_UID1;
}
break;
}
case SNF_UID1:{ case SNF_UID1:{
// SNF_ATQA
if ((reader) && (len == 2) && (data[0] == 0x93) && (data[1] == 0x20)) { // Select ALL from reader if ((reader) && (len == 2) && (data[0] == 0x93) && (data[1] == 0x20)) { // Select ALL from reader
sniffState = SNF_ANTICOL1; sniffState = SNF_ANTICOL1;
} }
// SNF_UID1
if ((reader) && (len == 9) && (data[0] == 0x93) && (data[1] == 0x70) && (CheckCrc14443(CRC_14443_A, data, 9))) { // Select 4 Byte UID from reader if ((reader) && (len == 9) && (data[0] == 0x93) && (data[1] == 0x70) && (CheckCrc14443(CRC_14443_A, data, 9))) { // Select 4 Byte UID from reader
memcpy(sniffUID + 3, &data[2], 4); memcpy(sniffUID + 3, &data[2], 4);
sniffState = SNF_SAK; sniffState = SNF_SAK;