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 4

fix cppchecker warnings

Browse source
This commit is contained in:
iceman1001 2025-03-24 18:00:06 +01:00
commit 176d8fe6a6
1 changed files with 29 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

53
armsrc/hitag2.c
View file

@ -454,11 +454,16 @@ static bool hitag1_plain(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *t
/*tx[0] = 0xb0; // Rev 3.0*/ /*tx[0] = 0xb0; // Rev 3.0*/
tx[0] = HITAG1_SET_CC; // Rev 2.0 tx[0] = HITAG1_SET_CC; // Rev 2.0
*txlen = 5; *txlen = 5;
if (!bCollision) blocknr--;
if (bCollision == false) {
blocknr--;
}
if (blocknr < 0) { if (blocknr < 0) {
blocknr = 0; blocknr = 0;
} }
if (!hitag_s) {
if (hitag_s == false) {
if (blocknr > 1 && blocknr < 31) { if (blocknr > 1 && blocknr < 31) {
blocknr = 31; blocknr = 31;
} }
@ -483,11 +488,13 @@ static bool hitag1_plain(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *t
} else { } else {
memcpy(tag.sectors[blocknr], rx, 4); memcpy(tag.sectors[blocknr], rx, 4);
blocknr++; blocknr++;
if (!hitag_s) {
if (hitag_s == false) {
if (blocknr > 1 && blocknr < 31) { if (blocknr > 1 && blocknr < 31) {
blocknr = 31; blocknr = 31;
} }
} }
if (blocknr > 63) { if (blocknr > 63) {
DbpString("Read successful!"); DbpString("Read successful!");
*txlen = 0; *txlen = 0;
@ -503,18 +510,16 @@ static bool hitag1_plain(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *t
tx[2] = crc << 4; tx[2] = crc << 4;
*txlen = 20; *txlen = 20;
} }
}
break; break;
}
default: { default: {
Dbprintf("Unknown frame length: %d", rxlen); Dbprintf("Unknown frame length: %d", rxlen);
return false; return false;
} }
break;
} }
return true; return true;
} }
static bool hitag1_authenticate(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) { static bool hitag1_authenticate(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) {
uint8_t crc; uint8_t crc;
*txlen = 0; *txlen = 0;
@ -524,18 +529,24 @@ static bool hitag1_authenticate(uint8_t *rx, const size_t rxlen, uint8_t *tx, si
/*tx[0] = 0xb0; // Rev 3.0*/ /*tx[0] = 0xb0; // Rev 3.0*/
tx[0] = HITAG1_SELECT; // Rev 2.0 tx[0] = HITAG1_SELECT; // Rev 2.0
*txlen = 5; *txlen = 5;
if (bCrypto && byte_value <= 0xff) { if (bCrypto && byte_value <= 0xff) {
// to retry // to retry
bCrypto = false; bCrypto = false;
} }
if (!bCollision) blocknr--;
if (bCollision == false) {
blocknr--;
}
if (blocknr < 0) { if (blocknr < 0) {
blocknr = 0; blocknr = 0;
} }
bCollision = true; bCollision = true;
// will receive 32-bit UID // will receive 32-bit UID
}
break; break;
}
case 2: { case 2: {
if (bAuthenticating) { if (bAuthenticating) {
// received Auth init ACK, send nonce // received Auth init ACK, send nonce
@ -560,8 +571,8 @@ static bool hitag1_authenticate(uint8_t *rx, const size_t rxlen, uint8_t *tx, si
*txlen = 20; *txlen = 20;
// will receive 32-bit encrypted page // will receive 32-bit encrypted page
} }
}
break; break;
}
case 32: { case 32: {
if (bCollision) { if (bCollision) {
// Select card by serial from response // Select card by serial from response
@ -627,13 +638,12 @@ static bool hitag1_authenticate(uint8_t *rx, const size_t rxlen, uint8_t *tx, si
*txlen = 20; *txlen = 20;
*/ */
} }
}
break; break;
}
default: { default: {
Dbprintf("Unknown frame length: %d", rxlen); Dbprintf("Unknown frame length: %d", rxlen);
return false; return false;
} }
break;
} }
return true; return true;
@ -713,8 +723,8 @@ static bool hitag2_password(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t
} }
*txlen = 5; *txlen = 5;
memcpy(tx, "\xC0", nbytes(*txlen)); memcpy(tx, "\xC0", nbytes(*txlen));
}
break; break;
}
// Received UID, tag password // Received UID, tag password
case 32: { case 32: {
@ -728,7 +738,9 @@ static bool hitag2_password(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t
// stage 2, got config byte+password TAG, discard as will read later // stage 2, got config byte+password TAG, discard as will read later
if (bAuthenticating) { if (bAuthenticating) {
bAuthenticating = false; bAuthenticating = false;
if (write) { if (write) {
if (!hitag2_write_page(rx, rxlen, tx, txlen)) { if (!hitag2_write_page(rx, rxlen, tx, txlen)) {
return false; return false;
} }
@ -750,15 +762,13 @@ static bool hitag2_password(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t
tx[0] = HITAG2_READ_PAGE | (blocknr << 3) | ((blocknr ^ 7) >> 2); tx[0] = HITAG2_READ_PAGE | (blocknr << 3) | ((blocknr ^ 7) >> 2);
tx[1] = ((blocknr ^ 7) << 6); tx[1] = ((blocknr ^ 7) << 6);
} }
}
break; break;
}
// Unexpected response // Unexpected response
default: { default: {
DBG Dbprintf("Unknown frame length: " _RED_("%d"), rxlen); DBG Dbprintf("Unknown frame length: " _RED_("%d"), rxlen);
return false; return false;
} }
break;
} }
} }
@ -1003,9 +1013,8 @@ static bool hitag2_test_auth_attempts(uint8_t *rx, const size_t rxlen, uint8_t *
} }
*txlen = 5; *txlen = 5;
memcpy(tx, "\xc0", nbytes(*txlen)); memcpy(tx, "\xc0", nbytes(*txlen));
}
break; break;
}
// Received UID, crypto tag answer, or read block response // Received UID, crypto tag answer, or read block response
case 32: { case 32: {
if (bCrypto == false) { if (bCrypto == false) {
@ -1021,16 +1030,13 @@ static bool hitag2_test_auth_attempts(uint8_t *rx, const size_t rxlen, uint8_t *
auth_table_pos += 8; auth_table_pos += 8;
memcpy(NrAr, auth_table + auth_table_pos, 8); memcpy(NrAr, auth_table + auth_table_pos, 8);
} }
}
break; break;
}
default: { default: {
Dbprintf("Unknown frame length: " _RED_("%d"), rxlen); Dbprintf("Unknown frame length: " _RED_("%d"), rxlen);
return false; return false;
} }
break;
} }
return true; return true;
} }
@ -2093,8 +2099,8 @@ void WriterHitag(const lf_hitag_data_t *payload, bool ledcontrol) {
blocknr = payload->page; blocknr = payload->page;
bCrypto = false; bCrypto = false;
bAuthenticating = false; bAuthenticating = false;
}
break; break;
}
case HT2F_PASSWORD: { case HT2F_PASSWORD: {
DBG DbpString("Authenticating using password:"); DBG DbpString("Authenticating using password:");
if (memcmp(payload->pwd, "\x00\x00\x00\x00", 4) == 0) { if (memcmp(payload->pwd, "\x00\x00\x00\x00", 4) == 0) {
@ -2107,14 +2113,13 @@ void WriterHitag(const lf_hitag_data_t *payload, bool ledcontrol) {
blocknr = payload->page; blocknr = payload->page;
bPwd = false; bPwd = false;
bAuthenticating = false; bAuthenticating = false;
}
break; break;
}
default: { default: {
DBG Dbprintf("Error, unknown function: " _RED_("%d"), payload->cmd); DBG Dbprintf("Error, unknown function: " _RED_("%d"), payload->cmd);
reply_ng(CMD_LF_HITAG2_WRITE, PM3_ESOFT, NULL, 0); reply_ng(CMD_LF_HITAG2_WRITE, PM3_ESOFT, NULL, 0);
return; return;
} }
break;
} }
if (ledcontrol) LED_D_ON(); if (ledcontrol) LED_D_ON();