mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2024-09-20 15:26:13 +08:00
iclass print data now details legcay vs sio credential
This commit is contained in:
parent
ac42615e91
commit
fb91a1ca88
|
@ -2571,6 +2571,8 @@ void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t e
|
|||
if (i != 1)
|
||||
PrintAndLogEx(INFO, " ......");
|
||||
|
||||
uint8_t fb = (iclass_dump + (6 * 8))[0];
|
||||
|
||||
while (i <= endblock) {
|
||||
uint8_t *blk = iclass_dump + (i * 8);
|
||||
|
||||
|
@ -2629,26 +2631,38 @@ void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t e
|
|||
|
||||
} else {
|
||||
const char *info_ks[] = {"CSN", "Config", "E-purse", "Debit", "Credit", "AIA", "User"};
|
||||
const char *s = info_ks[6];
|
||||
if (i < 6) {
|
||||
s = info_ks[i];
|
||||
}
|
||||
if (i >= 6 && i <= 9) {
|
||||
PrintAndLogEx(INFO, "%3d/0x%02X | " _YELLOW_("%s") "| " _YELLOW_("%s") " | %s | %s "
|
||||
|
||||
if (i >= 6 && i <= 9 && fb != 0x30) {
|
||||
// legacy credential
|
||||
PrintAndLogEx(INFO, "%3d/0x%02X | " _YELLOW_("%s") "| " _YELLOW_("%s") " | %s | User / Cred "
|
||||
, i
|
||||
, 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
|
||||
, sprint_hex(blk, 8)
|
||||
, sprint_ascii(blk, 8)
|
||||
, lockstr
|
||||
, s
|
||||
);
|
||||
} 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);
|
||||
}
|
||||
}
|
||||
i++;
|
||||
}
|
||||
PrintAndLogEx(INFO, "---------+-------------------------+----------+---+--------------");
|
||||
PrintAndLogEx(HINT, _YELLOW_("yellow") " = legacy credential");
|
||||
PrintAndLogEx(HINT, _CYAN_("cyan") " = SIO credential");
|
||||
PrintAndLogEx(NORMAL, "");
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue