RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-04-02 02:19:57 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix cppcheck shadowing

Browse source
This commit is contained in:
iceman1001 2022-01-29 10:05:26 +01:00
parent b51081ff73
commit c5e9201dd8
1 changed files with 8 additions and 3 deletions

11
client/src/cmdhfgallagher.c
View file

@ -237,6 +237,7 @@ static uint32_t find_available_gallagher_aid(DesfireContext_t *ctx, bool verbose
// Retrieve the AID list // Retrieve the AID list
uint8_t aid_buf[DESFIRE_BUFFER_SIZE] = {0}; uint8_t aid_buf[DESFIRE_BUFFER_SIZE] = {0};
size_t aid_buf_len = 0; size_t aid_buf_len = 0;
int res = DesfireGetAIDList(ctx, aid_buf, &aid_buf_len); int res = DesfireGetAIDList(ctx, aid_buf, &aid_buf_len);
if (res != PM3_SUCCESS) { if (res != PM3_SUCCESS) {
PM3_RET_ERR(0, "Failed retrieving AID list"); PM3_RET_ERR(0, "Failed retrieving AID list");
@ -245,6 +246,7 @@ static uint32_t find_available_gallagher_aid(DesfireContext_t *ctx, bool verbose
if (verbose) { if (verbose) {
// Print what we got // Print what we got
PrintAndLogEx(INFO, "Retrieved AID list:" NOLF); PrintAndLogEx(INFO, "Retrieved AID list:" NOLF);
for (int i = 0; i < aid_buf_len; i += 3) { for (int i = 0; i < aid_buf_len; i += 3) {
PrintAndLogEx(NORMAL, "%s %06X" NOLF, PrintAndLogEx(NORMAL, "%s %06X" NOLF,
(i == 0) ? "" : ",", (i == 0) ? "" : ",",
@ -256,20 +258,23 @@ static uint32_t find_available_gallagher_aid(DesfireContext_t *ctx, bool verbose
// Find lowest available in range F48120 -> F481FE, excluding the CAD // Find lowest available in range F48120 -> F481FE, excluding the CAD
for (uint8_t aid_increment = 0x20; aid_increment < 0xFF; aid_increment++) { for (uint8_t aid_increment = 0x20; aid_increment < 0xFF; aid_increment++) {
uint32_t aid = 0x0081F4 | (aid_increment << 16); uint32_t aid = 0x0081F4 | (aid_increment << 16);
if (aid == CAD_AID) { if (aid == CAD_AID) {
continue; continue;
} }
// Check if AID exists in aid_buf // Check if AID exists in aid_buf
bool aid_exists = false; bool found = false;
for (uint8_t idx = 0; idx < aid_buf_len; idx += 3) { for (uint8_t idx = 0; idx < aid_buf_len; idx += 3) {
if (DesfireAIDByteToUint(&aid_buf[idx]) == aid) { if (DesfireAIDByteToUint(&aid_buf[idx]) == aid) {
aid_exists = true; found = true;
break; break;
} }
} }
if (aid_exists == false) {
if (found == false) {
return aid; return aid;
} }
} }