Merge pull request #246 from McEloff/hf_mf_sim_anticol

Fix. More flexible anti-collision frame check (hf_mf_sim)
This commit is contained in:
Iceman 2019-07-14 22:31:25 +02:00 committed by GitHub
commit 9af039e2d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -625,7 +625,8 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
}
// Incoming anti-collision frame
if (receivedCmd_len >= 2 && receivedCmd_len <= 6 && receivedCmd[1] == 0x50) {
// receivedCmd[1] indicates number of byte and bit collision, supports only for bit collision is zero
if (receivedCmd_len >= 3 && receivedCmd_len <= 6 && (receivedCmd[1] & 0x0f) == 0) {
// we can process only full-byte frame anti-collision procedure
if (memcmp(&receivedCmd[2], responses[uid_index].response, receivedCmd_len - 2) == 0) {
// response missing part of UID via relative array index