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

fix mad v2 cps offset

Browse source 
card publisher sector is an absolute sector index but the code compared it against a relative index of mifare 4k sectors
This commit is contained in:
BIOS9 2025-06-07 23:04:34 +12:00
commit fd3a644289
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/src/mifare/mad.c
View file

@ -408,14 +408,14 @@ int MAD2DecodeAndPrint(uint8_t *sector, bool swapmad, bool verbose) {
uint16_t aid = madGetAID(sector, swapmad, 2, i); uint16_t aid = madGetAID(sector, swapmad, 2, i);
if (aid < 6) { if (aid < 6) {
PrintAndLogEx(INFO, PrintAndLogEx(INFO,
(ibs == i) ? _MAGENTA_(" %02d [%04X] %s") : " %02d [" _GREEN_("%04X") "] %s", (ibs == i + 16) ? _MAGENTA_(" %02d [%04X] %s") : " %02d [" _GREEN_("%04X") "] %s",
i + 16, i + 16,
aid, aid,
aid_admin[aid] aid_admin[aid]
); );
} else if (prev_aid == aid) { } else if (prev_aid == aid) {
PrintAndLogEx(INFO, PrintAndLogEx(INFO,
(ibs == i) ? _MAGENTA_(" %02d [%04X] continuation") : " %02d [" _YELLOW_("%04X") "] continuation", (ibs == i + 16) ? _MAGENTA_(" %02d [%04X] continuation") : " %02d [" _YELLOW_("%04X") "] continuation",
i + 16, i + 16,
aid aid
); );
@ -423,7 +423,7 @@ int MAD2DecodeAndPrint(uint8_t *sector, bool swapmad, bool verbose) {
char fmt[80]; char fmt[80];
snprintf(fmt snprintf(fmt
, sizeof(fmt) , sizeof(fmt)
, (ibs == i) ? , (ibs == i + 16) ?
_MAGENTA_(" %02d [%04X] %s") : _MAGENTA_(" %02d [%04X] %s") :
" %02d [" _GREEN_("%04X") "] %s" " %02d [" _GREEN_("%04X") "] %s"
, i + 16 , i + 16