github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-07-16 10:03:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

text

Browse source
This commit is contained in:
iceman1001 2024-01-26 14:11:20 +01:00
parent 837a36f4eb
commit 6b9dde1ff7
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
client/src/cmdhf15.c
View file

@ -998,36 +998,36 @@ static int CmdHF15Info(const char *Cmd) {
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(INFO, "--- " _CYAN_("Tag Information") " ---------------------------");
PrintAndLogEx(SUCCESS, " TYPE... " _YELLOW_("%s"), getTagInfo_15(d + 2));
PrintAndLogEx(SUCCESS, " UID... " _GREEN_("%s"), iso15693_sprintUID(NULL, uid));
PrintAndLogEx(SUCCESS, " SYSINFO... %s", sprint_hex(d, resp.length - 2));
PrintAndLogEx(SUCCESS, "TYPE...... " _YELLOW_("%s"), getTagInfo_15(d + 2));
PrintAndLogEx(SUCCESS, "UID....... " _GREEN_("%s"), iso15693_sprintUID(NULL, uid));
PrintAndLogEx(SUCCESS, "SYSINFO... %s", sprint_hex(d, resp.length - 2));
// DSFID
if (d[1] & 0x01)
PrintAndLogEx(SUCCESS, " - DSFID supported [0x%02X]", d[10]);
PrintAndLogEx(SUCCESS, " - DSFID supported [0x%02X]", d[10]);
else
PrintAndLogEx(SUCCESS, " - DSFID not supported");
PrintAndLogEx(SUCCESS, " - DSFID not supported");
// AFI
if (d[1] & 0x02)
PrintAndLogEx(SUCCESS, " - AFI supported [0x%02X]", d[11]);
PrintAndLogEx(SUCCESS, " - AFI supported [0x%02X]", d[11]);
else
PrintAndLogEx(SUCCESS, " - AFI not supported");
PrintAndLogEx(SUCCESS, " - AFI not supported");
// IC reference
if (d[1] & 0x08)
PrintAndLogEx(SUCCESS, " - IC reference supported [0x%02X]", d[14]);
PrintAndLogEx(SUCCESS, " - IC reference supported [0x%02X]", d[14]);
else
PrintAndLogEx(SUCCESS, " - IC reference not supported");
PrintAndLogEx(SUCCESS, " - IC reference not supported");
// memory
if (d[1] & 0x04) {
PrintAndLogEx(SUCCESS, " - Tag provides info on memory layout (vendor dependent)");
PrintAndLogEx(SUCCESS, " - Tag provides info on memory layout (vendor dependent)");
uint8_t blocks = d[12] + 1;
uint8_t size = (d[13] & 0x1F);
PrintAndLogEx(SUCCESS, " %u (or %u) bytes/blocks x %u blocks", size + 1, size, blocks);
PrintAndLogEx(SUCCESS, " %u (or %u) bytes/blocks x %u blocks", size + 1, size, blocks);
} else {
PrintAndLogEx(SUCCESS, " - Tag does not provide information on memory layout");
PrintAndLogEx(SUCCESS, " - Tag does not provide information on memory layout");
}
// Check if SLIX2 and attempt to get NXP System Information
@ -1344,14 +1344,14 @@ static void print_tag_15693(iso15_tag_t *tag, bool dense_output, bool verbose) {
if (verbose) {
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(INFO, "--- " _CYAN_("Tag Information") " --%.*s", (tag->bytesPerPage * 3), dashes);
PrintAndLogEx(SUCCESS, " UID... " _GREEN_("%s"), iso15693_sprintUID(NULL, tag->uid));
PrintAndLogEx(SUCCESS, "UID... " _GREEN_("%s"), iso15693_sprintUID(NULL, tag->uid));
PrintAndLogEx(SUCCESS, "TYPE.. " _YELLOW_("%s"), getTagInfo_15(tag->uid));
PrintAndLogEx(SUCCESS, " - DSFID.......... 0x%02X", tag->dsfid);
PrintAndLogEx(SUCCESS, " - AFI............ 0x%02X", tag->afi);
PrintAndLogEx(SUCCESS, " - IC reference... 0x%02X", tag->ic);
PrintAndLogEx(SUCCESS, " - Tag memory layout");
PrintAndLogEx(SUCCESS, " - Tag memory layout");
PrintAndLogEx(SUCCESS, " " _YELLOW_("%u") " bytes/blocks x " _YELLOW_("%u") " blocks", tag->bytesPerPage, tag->pagesCount);
}