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

Fix issue 1288

Browse source
This commit is contained in:
Philippe Teuwen 2021-05-26 13:33:53 +02:00
commit d0e0fa1a80
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/src/cmdhfmf.c
View file

@ -210,10 +210,10 @@ static uint8_t NumBlocksPerSector(uint8_t sectorNo) {
} }
static uint8_t GetSectorFromBlockNo(uint8_t blockNo) { static uint8_t GetSectorFromBlockNo(uint8_t blockNo) {
if (blockNo < 128) if (blockNo < 32 * 4)
return blockNo / 4; return blockNo / 4;
else else
return 32 + ((128 - blockNo) / 16); return 32 + ((blockNo - (32 * 4)) / 16);
} }
static char GetFormatFromSector(uint8_t sectorNo) { static char GetFormatFromSector(uint8_t sectorNo) {
@ -3126,8 +3126,8 @@ static int CmdHF14AMfChk(const char *Cmd) {
uint8_t s = GetSectorFromBlockNo(b); uint8_t s = GetSectorFromBlockNo(b);
uint8_t sectrail = (FirstBlockOfSector(s) + NumBlocksPerSector(s) - 1); uint8_t sectrail = (FirstBlockOfSector(s) + NumBlocksPerSector(s) - 1);
PrintAndLogEx(INFO, "Sector %u, First block of sector %u, Num of block %u", s, FirstBlockOfSector(s), NumBlocksPerSector(s)); PrintAndLogEx(INFO, "Sector: %u, First block: %u, Last block: %u, Num of blocks: %u", s, FirstBlockOfSector(s), sectrail, NumBlocksPerSector(s));
PrintAndLogEx(INFO, "Reading block %d", sectrail); PrintAndLogEx(INFO, "Reading last block");
mf_readblock_t payload; mf_readblock_t payload;
payload.blockno = sectrail; payload.blockno = sectrail;