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

iclass print data now details legcay vs sio credential

Browse source
This commit is contained in:
iceman1001 2022-05-09 00:19:57 +02:00
commit fb91a1ca88
1 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

28
client/src/cmdhficlass.c
View file

@ -2571,6 +2571,8 @@ void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t e
if (i != 1) if (i != 1)
PrintAndLogEx(INFO, " ......"); PrintAndLogEx(INFO, " ......");
uint8_t fb = (iclass_dump + (6 * 8))[0];
while (i <= endblock) { while (i <= endblock) {
uint8_t *blk = iclass_dump + (i * 8); uint8_t *blk = iclass_dump + (i * 8);
@ -2629,26 +2631,38 @@ void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t e
} else { } else {
const char *info_ks[] = {"CSN", "Config", "E-purse", "Debit", "Credit", "AIA", "User"}; const char *info_ks[] = {"CSN", "Config", "E-purse", "Debit", "Credit", "AIA", "User"};
const char *s = info_ks[6];
if (i < 6) { if (i >= 6 && i <= 9 && fb != 0x30) {
s = info_ks[i]; // legacy credential
} PrintAndLogEx(INFO, "%3d/0x%02X | " _YELLOW_("%s") "| " _YELLOW_("%s") " | %s | User / Cred "
if (i >= 6 && i <= 9) { , i
PrintAndLogEx(INFO, "%3d/0x%02X | " _YELLOW_("%s") "| " _YELLOW_("%s") " | %s | %s " , i
, sprint_hex(blk, 8)
, sprint_ascii(blk, 8)
, lockstr
);
} else if (i >= 6 && i <= 11 && fb == 0x30) {
// SIO credential
PrintAndLogEx(INFO, "%3d/0x%02X | " _CYAN_("%s") "| " _CYAN_("%s") " | %s | User / SIO"
, i , i
, i , i
, sprint_hex(blk, 8) , sprint_hex(blk, 8)
, sprint_ascii(blk, 8) , sprint_ascii(blk, 8)
, lockstr , lockstr
, s
); );
} else { } else {
const char *s = info_ks[6];
if (i < 6) {
s = info_ks[i];
}
PrintAndLogEx(INFO, "%3d/0x%02X | %s | %s | %s ", i, i, sprint_hex_ascii(blk, 8), lockstr, s); PrintAndLogEx(INFO, "%3d/0x%02X | %s | %s | %s ", i, i, sprint_hex_ascii(blk, 8), lockstr, s);
} }
} }
i++; i++;
} }
PrintAndLogEx(INFO, "---------+-------------------------+----------+---+--------------"); PrintAndLogEx(INFO, "---------+-------------------------+----------+---+--------------");
PrintAndLogEx(HINT, _YELLOW_("yellow") " = legacy credential");
PrintAndLogEx(HINT, _CYAN_("cyan") " = SIO credential");
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
} }