hf15sim: fix: ignore manifacturer code is present in requests
This commit is contained in:
1 parent
548b804650
commit
c8dce595ba
1 file changed
+6
-4
+6
-4
@@ -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
|
||||||
|
|||||||
Reference in new issue
Block a user