CHG: some magic generation1 tags is not following protocol and answers to the "halt...

[proxmark3-svn] / client / cmdhftopaz.c

diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index 4296cc94d8c5de99bc0b2ee64118efcbf1472040..4e9d538064e50e85178805051a7ad95095d58455 100644 (file)
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -349,10 +349,16 @@ int CmdHFTopazReader(const char *Cmd)
 
        PrintAndLog("");
        bool lock_TLV_present = topaz_print_lock_control_TLVs(&topaz_tag.data_blocks[1][4]);
 
        PrintAndLog("");
        bool lock_TLV_present = topaz_print_lock_control_TLVs(&topaz_tag.data_blocks[1][4]);

-
+       if ( lock_TLV_present ) {
+               PrintAndLog("");        
+       }
+       

        PrintAndLog("");
        bool reserved_mem_present = topaz_print_reserved_memory_control_TLVs(&topaz_tag.data_blocks[1][4]);
        PrintAndLog("");
        bool reserved_mem_present = topaz_print_reserved_memory_control_TLVs(&topaz_tag.data_blocks[1][4]);

-
+       if (reserved_mem_present) {
+               PrintAndLog("");        
+       }
+       

        topaz_print_lifecycle_state(&topaz_tag.data_blocks[1][0]);
 
        topaz_print_NDEF(&topaz_tag.data_blocks[1][0]);
        topaz_print_lifecycle_state(&topaz_tag.data_blocks[1][0]);
 
        topaz_print_NDEF(&topaz_tag.data_blocks[1][0]);


@@ -384,7 +390,7 @@ static command_t CommandTable[] =
        {"help",        CmdHelp,                        1, "This help"},
        {"reader",      CmdHFTopazReader,       0, "Act like a Topaz reader"},
        {"sim",         CmdHFTopazSim,          0, "<UID> -- Simulate Topaz tag"},
        {"help",        CmdHelp,                        1, "This help"},
        {"reader",      CmdHFTopazReader,       0, "Act like a Topaz reader"},
        {"sim",         CmdHFTopazSim,          0, "<UID> -- Simulate Topaz tag"},

-       {"snoop",       CmdHF14ASnoop,          0, "Eavesdrop a Topaz reader-tag communication"},
+       {"sniff",       CmdHF14ASniff,          0, "Sniff Topaz reader-tag communication"},

        {"raw",         CmdHFTopazCmdRaw,       0, "Send raw hex data to tag"},
        {NULL,          NULL,                           0, NULL}
 };
        {"raw",         CmdHFTopazCmdRaw,       0, "Send raw hex data to tag"},
        {NULL,          NULL,                           0, NULL}
 };