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

hf15sim: fix: ignore manifacturer code is present in requests

Browse source
This commit is contained in:
Yann GASCUEL 2024-01-22 13:16:02 +01:00
commit c8dce595ba
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
armsrc/iso15693.c
View file

@ -2330,14 +2330,14 @@ void SimTagIso15693(uint8_t *uid, uint8_t block_size) {
continue; continue;
if (memcmp(&cmd[cmdCpt], tag->uid, 8) != 0) if (memcmp(&cmd[cmdCpt], tag->uid, 8) != 0)
{ {
if (cmd[cmdCpt] != tag->ic || cmd_len < cmdCpt+9 \ if (cmd_len < cmdCpt+9 || memcmp(&cmd[cmdCpt+1], tag->uid, 8) != 0)
|| memcmp(&cmd[cmdCpt+1], tag->uid, 8) != 0) { // check uid even if manifacturer byte is present
{ // check uid even if IC is present
if (g_dbglevel >= DBG_DEBUG) Dbprintf("Address don't match tag uid"); if (g_dbglevel >= DBG_DEBUG) Dbprintf("Address don't match tag uid");
if (cmd[1] == ISO15693_SELECT) if (cmd[1] == ISO15693_SELECT)
tag->state = TAG_STATE_READY; // we are not anymore the selected TAG tag->state = TAG_STATE_READY; // we are not anymore the selected TAG
continue; // drop addressed request with other uid continue; // drop addressed request with other uid
} }
cmdCpt++;
} }
if (g_dbglevel >= DBG_DEBUG) Dbprintf("Address match tag uid"); if (g_dbglevel >= DBG_DEBUG) Dbprintf("Address match tag uid");
cmdCpt+=8; cmdCpt+=8;
@ -2509,7 +2509,9 @@ void SimTagIso15693(uint8_t *uid, uint8_t block_size) {
break; break;
case ISO15693_SET_PASSWORD: case ISO15693_SET_PASSWORD:
if (g_dbglevel >= DBG_DEBUG) Dbprintf("SetPassword cmd"); if (g_dbglevel >= DBG_DEBUG) Dbprintf("SetPassword cmd");
if (cmd[cmdCpt++] == tag->ic) if (cmdLen > cmdCpt+5)
cmdCpt++: // skip manifacturer code
if (cmdLen > cmdCpt+4)
{ {
pwdId = cmd[cmdCpt++]; pwdId = cmd[cmdCpt++];
if (pwdId == 4) // Privacy password if (pwdId == 4) // Privacy password