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

now colors SR types of iclass

Browse source
This commit is contained in:
iceman1001 2022-07-09 13:47:44 +02:00
commit 08c797a638
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
client/src/cmdhficlass.c
View file

@ -2494,7 +2494,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];
uint8_t fb1 = (iclass_dump + (6 * 8))[0];
uint8_t fb2 = (iclass_dump + (10 * 8))[0];
while (i <= endblock) {
uint8_t *blk = iclass_dump + (i * 8);
@ -2555,7 +2556,7 @@ 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"};
if (i >= 6 && i <= 9 && fb != 0x30) {
if (i >= 6 && i <= 9 && fb1 != 0x30) {
// legacy credential
PrintAndLogEx(INFO, "%3d/0x%02X | " _YELLOW_("%s") "| " _YELLOW_("%s") " | %s | User / Cred "
, i
@ -2564,7 +2565,16 @@ void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t e
, sprint_ascii(blk, 8)
, lockstr
);
} else if (i >= 6 && i <= 11 && fb == 0x30) {
} else if (i >= 6 && i <= 11 && fb1 == 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
);
} else if (i >= 10 && i <= 16 && fb2 == 0x30) {
// SIO credential
PrintAndLogEx(INFO, "%3d/0x%02X | " _CYAN_("%s") "| " _CYAN_("%s") " | %s | User / SIO"
, i