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

text

Browse source
This commit is contained in:
iceman1001 2020-06-11 19:53:21 +02:00
commit 6a8ea64feb
1 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

46
client/src/cmdhficlass.c
View file

@ -465,27 +465,27 @@ static void mem_app_config(const picopass_hdr *hdr) {
if (applimit < 6) applimit = 26; if (applimit < 6) applimit = 26;
if (kb == 2 && (applimit > 0x1f)) applimit = 26; if (kb == 2 && (applimit > 0x1f)) applimit = 26;
PrintAndLogEx(NORMAL, " Mem: %u KBits/%u App Areas (%u * 8 bytes) [%02X]", kb, app_areas, max_blk, mem); PrintAndLogEx(INFO, " Mem: %u KBits/%u App Areas (%u * 8 bytes) [%02X]", kb, app_areas, max_blk, mem);
PrintAndLogEx(NORMAL, " AA1: blocks 06-%02X", applimit); PrintAndLogEx(INFO, " AA1: blocks 06-%02X", applimit);
PrintAndLogEx(NORMAL, " AA2: blocks %02X-%02X", applimit + 1, max_blk); PrintAndLogEx(INFO, " AA2: blocks %02X-%02X", applimit + 1, max_blk);
PrintAndLogEx(NORMAL, " OTP: 0x%02X%02X", hdr->conf.otp[1], hdr->conf.otp[0]); PrintAndLogEx(INFO, " OTP: 0x%02X%02X", hdr->conf.otp[1], hdr->conf.otp[0]);
PrintAndLogEx(NORMAL, " KeyAccess:"); PrintAndLogEx(INFO, " KeyAccess:");
uint8_t book = isset(mem, 0x20); uint8_t book = isset(mem, 0x20);
if (book) { if (book) {
PrintAndLogEx(NORMAL, " Read A - Kd"); PrintAndLogEx(INFO, " Read A - Kd");
PrintAndLogEx(NORMAL, " Read B - Kc"); PrintAndLogEx(INFO, " Read B - Kc");
PrintAndLogEx(NORMAL, " Write A - Kd"); PrintAndLogEx(INFO, " Write A - Kd");
PrintAndLogEx(NORMAL, " Write B - Kc"); PrintAndLogEx(INFO, " Write B - Kc");
PrintAndLogEx(NORMAL, " Debit - Kd or Kc"); PrintAndLogEx(INFO, " Debit - Kd or Kc");
PrintAndLogEx(NORMAL, " Credit - Kc"); PrintAndLogEx(INFO, " Credit - Kc");
} else { } else {
PrintAndLogEx(NORMAL, " Read A - Kd or Kc"); PrintAndLogEx(INFO, " Read A - Kd or Kc");
PrintAndLogEx(NORMAL, " Read B - Kd or Kc"); PrintAndLogEx(INFO, " Read B - Kd or Kc");
PrintAndLogEx(NORMAL, " Write A - Kc"); PrintAndLogEx(INFO, " Write A - Kc");
PrintAndLogEx(NORMAL, " Write B - Kc"); PrintAndLogEx(INFO, " Write B - Kc");
PrintAndLogEx(NORMAL, " Debit - Kd or Kc"); PrintAndLogEx(INFO, " Debit - Kd or Kc");
PrintAndLogEx(NORMAL, " Credit - Kc"); PrintAndLogEx(INFO, " Credit - Kc");
} }
} }
@ -2943,7 +2943,7 @@ int readIclass(bool loop, bool verbose) {
if (readStatus & FLAG_ICLASS_READER_CSN) { if (readStatus & FLAG_ICLASS_READER_CSN) {
PrintAndLogEx(NORMAL, "\n"); PrintAndLogEx(NORMAL, "\n");
PrintAndLogEx(SUCCESS, " CSN: %s", sprint_hex(data, 8)); PrintAndLogEx(SUCCESS, " CSN: " _YELLOW_("%s"), sprint_hex(data, 8));
tagFound = true; tagFound = true;
} }
@ -2964,17 +2964,19 @@ int readIclass(bool loop, bool verbose) {
bool se_enabled = (memcmp((uint8_t *)(data + 8 * 5), "\xff\xff\xff\x00\x06\xff\xff\xff", 8) == 0); bool se_enabled = (memcmp((uint8_t *)(data + 8 * 5), "\xff\xff\xff\x00\x06\xff\xff\xff", 8) == 0);
PrintAndLogEx(SUCCESS, " App IA: %s", sprint_hex(data + 8 * 5, 8)); PrintAndLogEx(SUCCESS, " App IA: %s", sprint_hex(data + 8 * 5, 8));
PrintAndLogEx(INFO, "------ " _CYAN_("fingerprint") " ------");
if (isHidRange) { if (isHidRange) {
PrintAndLogEx(SUCCESS, _YELLOW_(" iClass")" (CSN is in HID range)");
if (legacy) if (legacy)
PrintAndLogEx(SUCCESS, " : Possible iClass - "_YELLOW_("legacy")" credential tag"); PrintAndLogEx(SUCCESS, " possible "_YELLOW_("iClass legacy")" credential");
if (se_enabled) if (se_enabled)
PrintAndLogEx(SUCCESS, " : Possible iClass - "_YELLOW_("SE")" credential tag"); PrintAndLogEx(SUCCESS, " possible "_YELLOW_("iClass SE")" credential");
PrintAndLogEx(SUCCESS, " : Tag is "_YELLOW_("iClass")", CSN is in HID range");
} else { } else {
PrintAndLogEx(SUCCESS, " : Tag is "_YELLOW_("PicoPass")", CSN is not in HID range"); PrintAndLogEx(SUCCESS, _YELLOW_(" PicoPass")" (CSN is not in HID range)");
} }
} }