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

function to support figuring out if block 0-3 , 0-15 is sectortrailer. The previous function uses 0-255..

Browse source
This commit is contained in:
iceman1001 2023-06-23 17:08:32 +02:00
commit 88e2618131
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/src/mifare/mifare4.c
View file

@ -534,7 +534,7 @@ uint8_t mfSectorTrailer(uint16_t blockNo) {
if (blockNo < 32 * 4) {
return (blockNo | 0x03);
} else {
return (blockNo | 0x0f);
return (blockNo | 0x0F);
}
}
@ -551,3 +551,11 @@ uint8_t mfSectorNum(uint16_t blockNo) {
return (32 + (blockNo - 32 * 4) / 16);
}
bool mfIsSectorTrailerBasedOnBlocks(uint8_t sectorno, uint16_t blockno) {
if (sectorno < 32) {
return ((blockno | 0x03) == blockno);
} else {
return ((blockno | 0x0F) == blockno);
}
}

1
client/src/mifare/mifare4.h
View file

@ -79,6 +79,7 @@ uint8_t mfFirstBlockOfSector(uint8_t sectorNo);
uint8_t mfSectorTrailerOfSector(uint8_t sectorNo);
uint8_t mfSectorTrailer(uint16_t blockNo);
bool mfIsSectorTrailer(uint16_t blockNo);
bool mfIsSectorTrailerBasedOnBlocks(uint8_t sectorno, uint16_t blockno);
uint8_t mfSectorNum(uint16_t blockNo);