github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 13:23:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

iso15sim: safer flag ckecking

Browse source
This commit is contained in:
Yann GASCUEL 2024-01-19 13:52:34 +01:00
commit 4365378a2c
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
armsrc/iso15693.c
View file

@ -2234,7 +2234,7 @@ void SimTagIso15693(uint8_t *uid, uint8_t block_size) {
if ((( crc & 0xff ) != cmd[cmd_len - 2]) || (( crc >> 8 ) != cmd[cmd_len - 1])) { if ((( crc & 0xff ) != cmd[cmd_len - 2]) || (( crc >> 8 ) != cmd[cmd_len - 1])) {
crc = CalculateCrc15(cmd, ++cmd_len - 2); // if crc end with 00 00 crc = CalculateCrc15(cmd, ++cmd_len - 2); // if crc end with 00 00
if ((( crc & 0xff ) != cmd[cmd_len - 2]) || (( crc >> 8 ) != cmd[cmd_len - 1])) { if ((( crc & 0xff ) != cmd[cmd_len - 2]) || (( crc >> 8 ) != cmd[cmd_len - 1])) {
if (g_dbglevel >= DBG_DEBUG) Dbprintf("CrcFail!"); if (g_dbglevel >= DBG_DEBUG) Dbprintf("CrcFail!, expected CRC=%02X%02X", crc & 0xff, crc >> 8);
continue; continue;
} }
else if (g_dbglevel >= DBG_DEBUG) else if (g_dbglevel >= DBG_DEBUG)
@ -2249,19 +2249,19 @@ void SimTagIso15693(uint8_t *uid, uint8_t block_size) {
cmd_len -= 2; // remove the CRC from the cmd cmd_len -= 2; // remove the CRC from the cmd
recvLen = 0; recvLen = 0;
tag->expectFast = cmd[0] & ISO15_REQ_DATARATE_HIGH; tag->expectFast = ((cmd[0] & ISO15_REQ_DATARATE_HIGH) == ISO15_REQ_DATARATE_HIGH);
tag->expectFsk = cmd[0] & ISO15_REQ_SUBCARRIER_TWO; tag->expectFsk = ((cmd[0] & ISO15_REQ_SUBCARRIER_TWO) == ISO15_REQ_SUBCARRIER_TWO);
if (g_dbglevel >= DBG_DEBUG) { if (g_dbglevel >= DBG_DEBUG) {
if (tag->expectFsk) if (tag->expectFsk)
Dbprintf("ISO15_REQ_SUBCARRIER_TWO support is currently experimental!"); Dbprintf("ISO15_REQ_SUBCARRIER_TWO support is currently experimental!");
if (cmd[0] & ISO15_REQ_PROTOCOL_EXT) if ((cmd[0] & ISO15_REQ_PROTOCOL_EXT) == ISO15_REQ_PROTOCOL_EXT)
Dbprintf("ISO15_REQ_PROTOCOL_EXT not supported!"); Dbprintf("ISO15_REQ_PROTOCOL_EXT not supported!");
if (cmd[0] & ISO15_REQ_OPTION) if ((cmd[0] & ISO15_REQ_OPTION) == ISO15_REQ_OPTION)
Dbprintf("ISO15_REQ_OPTION not supported!"); Dbprintf("ISO15_REQ_OPTION not supported!");
} }
if (cmd[0] & ISO15_REQ_INVENTORY && tag->state != TAG_STATE_SILENCED) { if (((cmd[0] & ISO15_REQ_INVENTORY) == ISO15_REQ_INVENTORY) && tag->state != TAG_STATE_SILENCED) {
// REQ_INVENTORY flaged requests are interpreted as a INVENTORY no matter // REQ_INVENTORY flaged requests are interpreted as a INVENTORY no matter
// what is the CMD (as observed from various actual tags) // what is the CMD (as observed from various actual tags)
@ -2269,14 +2269,14 @@ void SimTagIso15693(uint8_t *uid, uint8_t block_size) {
if (g_dbglevel >= DBG_DEBUG) { if (g_dbglevel >= DBG_DEBUG) {
Dbprintf("Inventory req"); Dbprintf("Inventory req");
if (cmd[0] & ISO15_REQINV_SLOT1) if ((cmd[0] & ISO15_REQINV_SLOT1) == ISO15_REQINV_SLOT1)
Dbprintf("ISO15_REQINV_SLOT1/SLOT16 not supported!"); Dbprintf("ISO15_REQINV_SLOT1/SLOT16 not supported!");
} }
cmdCpt = 2; cmdCpt = 2;
// Check AFI // Check AFI
if (cmd[0] & ISO15_REQINV_AFI) { if ((cmd[0] & ISO15_REQINV_AFI) == ISO15_REQINV_AFI) {
if (cmd[cmdCpt] != tag->afi && cmd[cmdCpt] != 0) if (cmd[cmdCpt] != tag->afi && cmd[cmdCpt] != 0)
continue; // bad AFI : drop request continue; // bad AFI : drop request
cmdCpt++; cmdCpt++;
@ -2318,7 +2318,7 @@ void SimTagIso15693(uint8_t *uid, uint8_t block_size) {
recvLen = 10; recvLen = 10;
} }
else { else {
if (cmd[0]&ISO15_REQ_SELECT) { if ((cmd[0] & ISO15_REQ_SELECT) == ISO15_REQ_SELECT) {
if (g_dbglevel >= DBG_DEBUG) Dbprintf("Selected Request"); if (g_dbglevel >= DBG_DEBUG) Dbprintf("Selected Request");
if (tag->state != TAG_STATE_SELECTED) if (tag->state != TAG_STATE_SELECTED)
continue; // drop selected request if not selected continue; // drop selected request if not selected
@ -2326,7 +2326,7 @@ void SimTagIso15693(uint8_t *uid, uint8_t block_size) {
} }
cmdCpt = 2; cmdCpt = 2;
if (cmd[0]&ISO15_REQ_ADDRESS) { if ((cmd[0] & ISO15_REQ_ADDRESS) == ISO15_REQ_ADDRESS) {
if (g_dbglevel >= DBG_DEBUG) Dbprintf("Addressed Request"); if (g_dbglevel >= DBG_DEBUG) Dbprintf("Addressed Request");
if (cmd_len <= cmdCpt+8) if (cmd_len <= cmdCpt+8)
continue; continue;
@ -2366,7 +2366,7 @@ void SimTagIso15693(uint8_t *uid, uint8_t block_size) {
else { else {
recv[0] = ISO15_NOERROR; recv[0] = ISO15_NOERROR;
recvLen = 1; recvLen = 1;
if ((cmd[0] & ISO15_REQ_OPTION)) { // ask for lock status if ((cmd[0] & ISO15_REQ_OPTION) == ISO15_REQ_OPTION) { // ask for lock status
recv[1] = tag->locks[pageNum]; recv[1] = tag->locks[pageNum];
recvLen++; recvLen++;
} }