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

adjust potential type conversion

Browse source
This commit is contained in:
iceman1001 2023-05-25 07:15:43 +02:00
commit 9ee7bd2936
3 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/src/cmdhfmf.c
View file

@ -308,7 +308,6 @@ static int mf_print_keys(uint16_t n, uint8_t *d) {
} }
for (uint16_t i = 0; i < n; i++) { for (uint16_t i = 0; i < n; i++) {
if (mfIsSectorTrailer(i)) { if (mfIsSectorTrailer(i)) {
e_sector[mfSectorNum(i)].foundKey[0] = 1; e_sector[mfSectorNum(i)].foundKey[0] = 1;
e_sector[mfSectorNum(i)].Key[0] = bytes_to_num(d + (i * MFBLOCK_SIZE), MIFARE_KEY_SIZE); e_sector[mfSectorNum(i)].Key[0] = bytes_to_num(d + (i * MFBLOCK_SIZE), MIFARE_KEY_SIZE);

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

@ -530,7 +530,7 @@ uint8_t mfSectorTrailerOfSector(uint8_t sectorNo) {
} }
// assumes blockno is 0-255.. // assumes blockno is 0-255..
uint8_t mfSectorTrailer(uint8_t blockNo) { uint8_t mfSectorTrailer(uint16_t blockNo) {
if (blockNo < 32 * 4) { if (blockNo < 32 * 4) {
return (blockNo | 0x03); return (blockNo | 0x03);
} else { } else {
@ -539,15 +539,15 @@ uint8_t mfSectorTrailer(uint8_t blockNo) {
} }
// assumes blockno is 0-255.. // assumes blockno is 0-255..
bool mfIsSectorTrailer(uint8_t blockNo) { bool mfIsSectorTrailer(uint16_t blockNo) {
return (blockNo == mfSectorTrailer(blockNo)); return (blockNo == mfSectorTrailer(blockNo));
} }
// assumes blockno is 0-255.. // assumes blockno is 0-255..
uint8_t mfSectorNum(uint8_t blockNo) { uint8_t mfSectorNum(uint16_t blockNo) {
if (blockNo < 32 * 4) if (blockNo < 32 * 4)
return blockNo / 4; return (blockNo / 4);
else else
return 32 + (blockNo - 32 * 4) / 16; return (32 + (blockNo - 32 * 4) / 16);
} }

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

@ -77,9 +77,9 @@ const char *mfGetAccessConditionsDesc(uint8_t blockn, const uint8_t *data);
uint8_t mfNumBlocksPerSector(uint8_t sectorNo); uint8_t mfNumBlocksPerSector(uint8_t sectorNo);
uint8_t mfFirstBlockOfSector(uint8_t sectorNo); uint8_t mfFirstBlockOfSector(uint8_t sectorNo);
uint8_t mfSectorTrailerOfSector(uint8_t sectorNo); uint8_t mfSectorTrailerOfSector(uint8_t sectorNo);
uint8_t mfSectorTrailer(uint8_t blockNo); uint8_t mfSectorTrailer(uint16_t blockNo);
bool mfIsSectorTrailer(uint8_t blockNo); bool mfIsSectorTrailer(uint16_t blockNo);
uint8_t mfSectorNum(uint8_t blockNo); uint8_t mfSectorNum(uint16_t blockNo);
#endif // mifare4.h #endif // mifare4.h