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

chg: "hf topaz info" - textual

Browse source
This commit is contained in:
iceman1001 2020-04-17 10:30:18 +02:00
commit 69142baa7f
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/src/cmdhftopaz.c
View file

@ -408,6 +408,7 @@ static int CmdHFTopazInfo(const char *Cmd) {
char ctmp = tolower(param_getchar(Cmd, 0)); char ctmp = tolower(param_getchar(Cmd, 0));
if (ctmp == 's') verbose = false; if (ctmp == 's') verbose = false;
int status = readTopazUid(verbose); int status = readTopazUid(verbose);
if (status != PM3_SUCCESS) if (status != PM3_SUCCESS)
return status; return status;
@ -462,6 +463,7 @@ static int CmdHFTopazInfo(const char *Cmd) {
topaz_print_NDEF(&topaz_tag.data_blocks[1][0], TOPAZ_STATIC_MEMORY); topaz_print_NDEF(&topaz_tag.data_blocks[1][0], TOPAZ_STATIC_MEMORY);
PrintAndLogEx(INFO, "-------------------------------------------------------------");
topaz_switch_off_field(); topaz_switch_off_field();
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -545,7 +547,9 @@ int readTopazUid(bool verbose) {
// printing // printing
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(SUCCESS, "UID : %02x %02x %02x %02x %02x %02x %02x", PrintAndLogEx(INFO, "--- " _CYAN_("Tag Information") "---------------------------");
PrintAndLogEx(INFO, "-------------------------------------------------------------");
PrintAndLogEx(SUCCESS, " UID: %02x %02x %02x %02x %02x %02x %02x",
topaz_tag.uid[6], topaz_tag.uid[6],
topaz_tag.uid[5], topaz_tag.uid[5],
topaz_tag.uid[4], topaz_tag.uid[4],
@ -559,19 +563,19 @@ int readTopazUid(bool verbose) {
getTagInfo(topaz_tag.uid[6]) getTagInfo(topaz_tag.uid[6])
); );
PrintAndLogEx(SUCCESS, "ATQA : %02x %02x", atqa[1], atqa[0]); PrintAndLogEx(SUCCESS, " ATQA: %02x %02x", atqa[1], atqa[0]);
topaz_tag.HR01[0] = rid_response[0]; topaz_tag.HR01[0] = rid_response[0];
topaz_tag.HR01[1] = rid_response[1]; topaz_tag.HR01[1] = rid_response[1];
// ToDo: CRC check // ToDo: CRC check
PrintAndLogEx(SUCCESS, "HR0 : %02x (%sa Topaz tag (%scapable of carrying a NDEF message), %s memory map)", PrintAndLogEx(SUCCESS, " HR0: %02x (%sa Topaz tag (%scapable of carrying a NDEF message), %s memory map)",
rid_response[0], rid_response[0],
(rid_response[0] & 0xF0) == 0x10 ? "" : "not ", (rid_response[0] & 0xF0) == 0x10 ? "" : "not ",
(rid_response[0] & 0xF0) == 0x10 ? "" : "not ", (rid_response[0] & 0xF0) == 0x10 ? "" : "not ",
(rid_response[0] & 0x0F) == 0x01 ? "static" : "dynamic"); (rid_response[0] & 0x0F) == 0x01 ? "static" : "dynamic");
PrintAndLogEx(SUCCESS, "HR1 : %02x", rid_response[1]); PrintAndLogEx(SUCCESS, " HR1: %02x", rid_response[1]);
topaz_switch_off_field(); topaz_switch_off_field();
return PM3_SUCCESS; return PM3_SUCCESS;