UPD: got the latest updates (@badboy) from @zhovner mfdread.

[proxmark3-svn] / client / cmdhftopaz.c

diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index 4296cc94d8c5de99bc0b2ee64118efcbf1472040..2f9bc3dc0102ddf1bbbe4c199726eb3d3ccc7d04 100644 (file)
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -21,6 +21,7 @@
 #include "proxmark3.h"
 #include "iso14443crc.h"
 #include "protocols.h"
 #include "proxmark3.h"
 #include "iso14443crc.h"
 #include "protocols.h"

+#include "cmdhf.h"

 
 #define TOPAZ_MAX_MEMORY       2048
 
 
 #define TOPAZ_MAX_MEMORY       2048
 


@@ -33,7 +34,6 @@ static struct {
        uint8_t *dynamic_reserved_areas;
 } topaz_tag;
 
        uint8_t *dynamic_reserved_areas;
 } topaz_tag;
 

-

 static void topaz_switch_on_field(void)
 {
        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_SELECT | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE, 0, 0}};
 static void topaz_switch_on_field(void)
 {
        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_SELECT | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE, 0, 0}};


@@ -188,7 +188,7 @@ static bool topaz_print_lock_control_TLVs(uint8_t *memory)
                if (tag == 0x01) {                      // the Lock Control TLV
                        uint8_t pages_addr = value[0] >> 4;
                        uint8_t byte_offset = value[0] & 0x0f;
                if (tag == 0x01) {                      // the Lock Control TLV
                        uint8_t pages_addr = value[0] >> 4;
                        uint8_t byte_offset = value[0] & 0x0f;

-                       uint8_t size_in_bits = value[1] ? value[1] : 256;
+                       uint8_t size_in_bits = value[1] ? value[1] : 255;

                        uint8_t bytes_per_page = 1 << (value[2] & 0x0f);
                        uint8_t bytes_locked_per_bit = 1 << (value[2] >> 4);
                        PrintAndLog("Lock Area of %d bits at byte offset 0x%02x. Each Lock Bit locks %d bytes.", 
                        uint8_t bytes_per_page = 1 << (value[2] & 0x0f);
                        uint8_t bytes_locked_per_bit = 1 << (value[2] >> 4);
                        PrintAndLog("Lock Area of %d bits at byte offset 0x%02x. Each Lock Bit locks %d bytes.", 


@@ -222,7 +222,7 @@ static int topaz_print_reserved_memory_control_TLVs(uint8_t *memory)
                if (tag == 0x02) {                      // the Reserved Memory Control TLV
                        uint8_t pages_addr = value[0] >> 4;
                        uint8_t byte_offset = value[0] & 0x0f;
                if (tag == 0x02) {                      // the Reserved Memory Control TLV
                        uint8_t pages_addr = value[0] >> 4;
                        uint8_t byte_offset = value[0] & 0x0f;

-                       uint8_t size_in_bytes = value[1] ? value[1] : 256;
+                       uint8_t size_in_bytes = value[1] ? value[1] : 255;

                        uint8_t bytes_per_page = 1 << (value[2] & 0x0f);
                        PrintAndLog("Reserved Memory of %d bytes at byte offset 0x%02x.", 
                                                size_in_bytes,
                        uint8_t bytes_per_page = 1 << (value[2] & 0x0f);
                        PrintAndLog("Reserved Memory of %d bytes at byte offset 0x%02x.", 
                                                size_in_bytes,


@@ -252,18 +252,21 @@ static void topaz_print_NDEF(uint8_t *data)
 }
 
        
 }
 
        

-int CmdHFTopazReader(const char *Cmd)
-{
+int CmdHFTopazReader(const char *Cmd) {

        int status;
        uint8_t atqa[2];
        uint8_t rid_response[8];
        uint8_t *uid_echo = &rid_response[2];
        int status;
        uint8_t atqa[2];
        uint8_t rid_response[8];
        uint8_t *uid_echo = &rid_response[2];

-       uint8_t rall_response[124];
+       uint8_t rall_response[130];
+       bool verbose = TRUE;
+
+       char ctmp = param_getchar(Cmd, 0);
+       if ( ctmp == 'S' || ctmp == 's') verbose = FALSE;

        
        status = topaz_select(atqa, rid_response);
        
        status = topaz_select(atqa, rid_response);

-       
+

        if (status == -1) {
        if (status == -1) {

-               PrintAndLog("Error: couldn't receive ATQA");
+               if (verbose) PrintAndLog("Error: couldn't receive ATQA");

                return -1;
        }
 
                return -1;
        }
 


@@ -287,7 +290,7 @@ int CmdHFTopazReader(const char *Cmd)
        PrintAndLog("HR0  : %02x (%sa Topaz tag (%scapable of carrying a NDEF message), %s memory map)", rid_response[0], 
                                                (rid_response[0] & 0xF0) == 0x10 ? "" : "not ",
                                                (rid_response[0] & 0xF0) == 0x10 ? "" : "not ",
        PrintAndLog("HR0  : %02x (%sa Topaz tag (%scapable of carrying a NDEF message), %s memory map)", rid_response[0], 
                                                (rid_response[0] & 0xF0) == 0x10 ? "" : "not ",
                                                (rid_response[0] & 0xF0) == 0x10 ? "" : "not ",

-                                               (rid_response[0] & 0x0F) == 0x10 ? "static" : "dynamic");
+                                               (rid_response[0] & 0x0F) == 0x01 ? "static" : "dynamic");

        PrintAndLog("HR1  : %02x", rid_response[1]);
        
        status = topaz_rall(uid_echo, rall_response);
        PrintAndLog("HR1  : %02x", rid_response[1]);
        
        status = topaz_rall(uid_echo, rall_response);


@@ -307,6 +310,7 @@ int CmdHFTopazReader(const char *Cmd)
                        topaz_tag.uid[2], 
                        topaz_tag.uid[1], 
                        topaz_tag.uid[0]);
                        topaz_tag.uid[2], 
                        topaz_tag.uid[1], 
                        topaz_tag.uid[0]);

+                       

        PrintAndLog("       UID[6] (Manufacturer Byte) = %02x, Manufacturer: %s", 
                        topaz_tag.uid[6], 
                        getTagInfo(topaz_tag.uid[6]));
        PrintAndLog("       UID[6] (Manufacturer Byte) = %02x, Manufacturer: %s", 
                        topaz_tag.uid[6], 
                        getTagInfo(topaz_tag.uid[6]));


@@ -349,10 +353,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]);


@@ -361,39 +371,39 @@ int CmdHFTopazReader(const char *Cmd)
        return 0;
 }
 
        return 0;
 }
 

-
-int CmdHFTopazSim(const char *Cmd)
-{
+int CmdHFTopazSim(const char *Cmd) {

        PrintAndLog("not yet implemented");
        return 0;
 }
 
        PrintAndLog("not yet implemented");
        return 0;
 }
 

-
-int CmdHFTopazCmdRaw(const char *Cmd)
-{
+int CmdHFTopazCmdRaw(const char *Cmd) {

        PrintAndLog("not yet implemented");
        return 0;
 }
 
        PrintAndLog("not yet implemented");
        return 0;
 }
 

+int CmdHFTopazList(const char *Cmd) {
+       CmdHFList("topaz");
+       return 0;
+}

 
 static int CmdHelp(const char *Cmd);
 
 
 static int CmdHelp(const char *Cmd);
 

-

 static command_t CommandTable[] = 
 {
        {"help",        CmdHelp,                        1, "This help"},
        {"reader",      CmdHFTopazReader,       0, "Act like a Topaz reader"},
        {"sim",         CmdHFTopazSim,          0, "<UID> -- Simulate Topaz tag"},
 static command_t CommandTable[] = 
 {
        {"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"},
        {"raw",         CmdHFTopazCmdRaw,       0, "Send raw hex data to tag"},

+       {"list",        CmdHFTopazList,         0, "[Deprecated] List Topaz history"},

        {NULL,          NULL,                           0, NULL}
 };
 
        {NULL,          NULL,                           0, NULL}
 };
 

-

 int CmdHFTopaz(const char *Cmd) {
        // flush
 int CmdHFTopaz(const char *Cmd) {
        // flush

-       WaitForResponseTimeout(CMD_ACK,NULL,100);
-
+       //WaitForResponseTimeout(CMD_ACK,NULL,100);
+       clearCommandBuffer();
+       

        // parse
        CmdsParse(CommandTable, Cmd);
        return 0;
        // parse
        CmdsParse(CommandTable, Cmd);
        return 0;