diff --git a/client/src/mifare/mifare4.c b/client/src/mifare/mifare4.c index 81650c6fa..166408223 100644 --- a/client/src/mifare/mifare4.c +++ b/client/src/mifare/mifare4.c @@ -489,17 +489,27 @@ int MFPGetVersion(bool activateField, bool leaveSignalON, uint8_t *dataout, int // Mifare Memory Structure: up to 32 Sectors with 4 blocks each (1k and 2k cards), // plus evtl. 8 sectors with 16 blocks each (4k cards) uint8_t mfNumBlocksPerSector(uint8_t sectorNo) { - if (sectorNo < 32) + if (sectorNo < 32) { return 4; - else + } else { return 16; + } } uint8_t mfFirstBlockOfSector(uint8_t sectorNo) { - if (sectorNo < 32) + if (sectorNo < 32) { return sectorNo * 4; - else + } else { return 32 * 4 + (sectorNo - 32) * 16; + } +} + +uint8_t mfSectorTrailerOfSector(uint8_t sectorNo) { + if (sectorNo < 32) { + return (sectorNo * 4) | 0x03; + } else { + return (32 * 4 + (sectorNo - 32) * 16) | 0x0f; + } } // assumes blockno is 0-255.. diff --git a/client/src/mifare/mifare4.h b/client/src/mifare/mifare4.h index 0b582ca99..7905f3ab6 100644 --- a/client/src/mifare/mifare4.h +++ b/client/src/mifare/mifare4.h @@ -75,6 +75,7 @@ const char *mfGetAccessConditionsDesc(uint8_t blockn, const uint8_t *data); uint8_t mfNumBlocksPerSector(uint8_t sectorNo); uint8_t mfFirstBlockOfSector(uint8_t sectorNo); +uint8_t mfSectorTrailerOfSector(uint8_t sectorNo); uint8_t mfSectorTrailer(uint8_t blockNo); bool mfIsSectorTrailer(uint8_t blockNo); uint8_t mfSectorNum(uint8_t blockNo);