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

hf mf chk: fix CodeQL warning, fix sector number in case of provided block, display one single block in such case too

Browse source
This commit is contained in:
Philippe Teuwen 2022-02-17 01:30:17 +01:00
commit d031f4bac5
1 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

24
client/src/cmdhfmf.c
View file

@ -209,13 +209,6 @@ static uint8_t NumOfSectors(char card) {
} }
} }
static uint8_t GetSectorFromBlockNo(uint8_t blockNo) {
if (blockNo < 32 * 4)
return blockNo / 4;
else
return 32 + ((blockNo - (32 * 4)) / 16);
}
static char GetFormatFromSector(uint8_t sectors) { static char GetFormatFromSector(uint8_t sectors) {
switch (sectors) { switch (sectors) {
case MIFARE_MINI_MAXSECTOR: case MIFARE_MINI_MAXSECTOR:
@ -3120,12 +3113,12 @@ static int CmdHF14AMfChk(const char *Cmd) {
// loop sectors but block is used as to keep track of from which blocks to test // loop sectors but block is used as to keep track of from which blocks to test
int b = blockNo; int b = blockNo;
for (int i = 0; i < SectorsCnt; ++i) { for (int i = mfSectorNum(b); i < SectorsCnt; ++i) {
// skip already found keys. // skip already found keys.
if (e_sector[i].foundKey[trgKeyType]) continue; if (e_sector[i].foundKey[trgKeyType]) continue;
for (uint16_t c = 0; c < keycnt; c += max_keys) { for (uint32_t c = 0; c < keycnt; c += max_keys) {
PrintAndLogEx(NORMAL, "." NOLF); PrintAndLogEx(NORMAL, "." NOLF);
fflush(stdout); fflush(stdout);
@ -3135,7 +3128,7 @@ static int CmdHF14AMfChk(const char *Cmd) {
goto out; goto out;
} }
uint16_t size = keycnt - c > max_keys ? max_keys : keycnt - c; uint32_t size = keycnt - c > max_keys ? max_keys : keycnt - c;
if (mfCheckKeys(b, trgKeyType, clearLog, size, &keyBlock[6 * c], &key64) == PM3_SUCCESS) { if (mfCheckKeys(b, trgKeyType, clearLog, size, &keyBlock[6 * c], &key64) == PM3_SUCCESS) {
e_sector[i].Key[trgKeyType] = key64; e_sector[i].Key[trgKeyType] = key64;
@ -3159,14 +3152,13 @@ static int CmdHF14AMfChk(const char *Cmd) {
// loop sectors but block is used as to keep track of from which blocks to test // loop sectors but block is used as to keep track of from which blocks to test
int b = blockNo; int b = blockNo;
for (int i = 0; i < SectorsCnt; i++) { for (int i = mfSectorNum(b); i < SectorsCnt; i++) {
// KEY A but not KEY B // KEY A but not KEY B
if (e_sector[i].foundKey[0] && !e_sector[i].foundKey[1]) { if (e_sector[i].foundKey[0] && !e_sector[i].foundKey[1]) {
uint8_t s = GetSectorFromBlockNo(b); uint8_t sectrail = mfSectorTrailerOfSector(i);
uint8_t sectrail = (mfFirstBlockOfSector(s) + mfNumBlocksPerSector(s) - 1); PrintAndLogEx(INFO, "Sector: %u, First block: %u, Last block: %u, Num of blocks: %u", i, mfFirstBlockOfSector(i), sectrail, mfNumBlocksPerSector(i));
PrintAndLogEx(INFO, "Sector: %u, First block: %u, Last block: %u, Num of blocks: %u", s, mfFirstBlockOfSector(s), sectrail, mfNumBlocksPerSector(s));
PrintAndLogEx(INFO, "Reading sector trailer"); PrintAndLogEx(INFO, "Reading sector trailer");
mf_readblock_t payload; mf_readblock_t payload;
@ -3203,8 +3195,8 @@ out:
PrintAndLogEx(SUCCESS, _GREEN_("found keys:")); PrintAndLogEx(SUCCESS, _GREEN_("found keys:"));
//print keys //print keys
if (SectorsCnt == 1) if (singleSector)
printKeyTableEx(SectorsCnt, e_sector, GetSectorFromBlockNo(blockNo)); printKeyTableEx(1, e_sector, mfSectorNum(blockNo));
else else
printKeyTable(SectorsCnt, e_sector); printKeyTable(SectorsCnt, e_sector);