add: hf topaz reader (basic functionality)

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 66c8e53c77e950ca6ecb29170df56357d6a01663..ad8e53690ff8db1114e9c8647c65f6e71c99b997 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -603,8 +603,8 @@ int CmdHFList(const char *Cmd)
        PrintAndLog("iso14443a - All times are in carrier periods (1/13.56Mhz)");
        PrintAndLog("iClass    - Timings are not as accurate");
        PrintAndLog("");
        PrintAndLog("iso14443a - All times are in carrier periods (1/13.56Mhz)");
        PrintAndLog("iClass    - Timings are not as accurate");
        PrintAndLog("");

-       PrintAndLog("     Start |       End | Src | Data (! denotes parity error)                                   | CRC | Annotation         |");
-       PrintAndLog("-----------|-----------|-----|-----------------------------------------------------------------|-----|--------------------|");
+       PrintAndLog("      Start |        End | Src | Data (! denotes parity error)                                   | CRC | Annotation         |");
+       PrintAndLog("------------|------------|-----|-----------------------------------------------------------------|-----|--------------------|");

 
        while(tracepos < traceLen)
        {
 
        while(tracepos < traceLen)
        {

diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index aed5f023c4789a76ac0d4a7063b68dea8f6f79ba..95e988edf009dd021f2a4b90acfce44095106d3c 100644 (file)
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -24,13 +24,11 @@
 
 
 
 
 
 

+

 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}};
        SendCommand(&c);
 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}};
        SendCommand(&c);

-
-       UsbCommand resp;
-       WaitForResponse(CMD_ACK, &resp);

 }
 
 
 }
 
 


@@ -38,13 +36,10 @@ static void topaz_switch_off_field(void)
 {
        UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
        SendCommand(&c);
 {
        UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
        SendCommand(&c);

-
-       UsbCommand resp;
-       WaitForResponse(CMD_ACK, &resp);

 }
 
 
 }
 
 

-static void topaz_send_cmd_raw(uint8_t *cmd, uint8_t len, uint8_t *response)
+static int topaz_send_cmd_raw(uint8_t *cmd, uint8_t len, uint8_t *response)

 {
        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE, len, 0}};
        memcpy(c.d.asBytes, cmd, len);
 {
        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE, len, 0}};
        memcpy(c.d.asBytes, cmd, len);


@@ -53,39 +48,310 @@ static void topaz_send_cmd_raw(uint8_t *cmd, uint8_t len, uint8_t *response)
        UsbCommand resp;
        WaitForResponse(CMD_ACK, &resp);
 
        UsbCommand resp;
        WaitForResponse(CMD_ACK, &resp);
 

-       memcpy(response, resp.d.asBytes, resp.arg[0]);
+       if (resp.arg[0] > 0) {
+               memcpy(response, resp.d.asBytes, resp.arg[0]);
+       }
+       
+       return resp.arg[0];

 }
 
 
 }
 
 

-static void topaz_send_cmd(uint8_t *cmd, uint8_t len, uint8_t *response)
+static int topaz_send_cmd(uint8_t *cmd, uint8_t len, uint8_t *response)

 {
        if (len > 1) {
         uint8_t first, second;
 {
        if (len > 1) {
         uint8_t first, second;

-               ComputeCrc14443(CRC_14443_B, cmd, len, &first, &second);
-        cmd[len] = first;
-        cmd[len+1] = second;
+               ComputeCrc14443(CRC_14443_B, cmd, len-2, &first, &second);
+        cmd[len-2] = first;
+        cmd[len-1] = second;

        }
 
        }
 

-       topaz_send_cmd_raw(cmd, len+2, response);
+       return topaz_send_cmd_raw(cmd, len, response);

 }
 
 
 }
 
 

-static void topaz_select(uint8_t *atqa, uint8_t *uid)
+static int topaz_select(uint8_t *atqa, uint8_t *rid_response)

 {
        // ToDo: implement anticollision
 {
        // ToDo: implement anticollision

-       uint8_t rid_cmd[] = {TOPAZ_RID, 0, 0, 0, 0, 0, 0, 0, 0};
+

        uint8_t wupa_cmd[] = {TOPAZ_WUPA};
        uint8_t wupa_cmd[] = {TOPAZ_WUPA};

-       
+       uint8_t rid_cmd[] = {TOPAZ_RID, 0, 0, 0, 0, 0, 0, 0, 0};
+

        topaz_switch_on_field();
        topaz_switch_on_field();

-       topaz_send_cmd(wupa_cmd, sizeof(wupa_cmd), atqa);
-       topaz_send_cmd(rid_cmd, sizeof(rid_cmd) - 2, uid);
-       topaz_switch_off_field();
+
+       if (!topaz_send_cmd(wupa_cmd, sizeof(wupa_cmd), atqa)) {
+               topaz_switch_off_field();
+               return -1;              // WUPA failed
+       }
+
+       if (!topaz_send_cmd(rid_cmd, sizeof(rid_cmd), rid_response)) {
+               topaz_switch_off_field();
+               return -2;              // RID failed
+       }
+       
+       return 0;               // OK
+}
+
+
+static int topaz_rall(uint8_t *uid, uint8_t *rall_response)
+{
+       uint8_t rall_cmd[] = {TOPAZ_RALL, 0, 0, 0, 0, 0, 0, 0, 0};
+
+       memcpy(&rall_cmd[3], uid, 4);
+       if (!topaz_send_cmd(rall_cmd, sizeof(rall_cmd), rall_response)) {
+               topaz_switch_off_field();
+               return -1;              // RALL failed
+       }
+       
+       return 0;

 }
 
 
 }
 
 

+static bool topaz_block_is_locked(uint8_t blockno, uint8_t *lockbits)
+{
+       if(lockbits[blockno/8] >> (blockno % 8) & 0x01) {
+               return true;
+       } else {
+               return false;
+       }
+}
+
+
+static int topaz_print_CC(uint8_t *data)
+{
+       if(data[0] != 0xe1) {
+               return -1;              // no NDEF message
+       }
+
+       PrintAndLog("Capability Container: %02x %02x %02x %02x", data[0], data[1], data[2], data[3]);
+       PrintAndLog("  %02x: NDEF Magic Number", data[0]); 
+       PrintAndLog("  %02x: version %d.%d supported by tag", data[1], (data[1] & 0xF0) >> 4, data[1] & 0x0f);
+       PrintAndLog("  %02x: Physical Memory Size of this tag: %d bytes", data[2], (data[2] + 1) * 8);
+       PrintAndLog("  %02x: %s / %s", data[3], 
+                               (data[3] & 0xF0) ? "(RFU)" : "Read access granted without any security", 
+                               (data[3] & 0x0F)==0 ? "Write access granted without any security" : (data[3] & 0x0F)==0x0F ? "No write access granted at all" : "(RFU)");
+       return 0;                               
+}
+
+
+static void get_TLV(uint8_t **TLV_ptr, uint8_t *tag, uint16_t *length, uint8_t **value)
+{
+       *length = 0;
+       *value = NULL;
+
+       *tag = **TLV_ptr;
+       *TLV_ptr += 1;
+       switch (*tag) {
+               case 0x00:                      // NULL TLV.
+               case 0xFE:                      // Terminator TLV.
+                       break;
+               case 0x01:                      // Lock Control TLV
+               case 0x02:                      // Reserved Memory TLV
+               case 0x03:                      // NDEF message TLV
+               case 0xFD:                      // proprietary TLV
+                       *length = **TLV_ptr;
+                       *TLV_ptr += 1;
+                       if (*length == 0xff) {
+                               *length = **TLV_ptr << 8;
+                               *TLV_ptr += 1;
+                               *length |= **TLV_ptr;
+                               *TLV_ptr += 1;
+                       }
+                       *value = *TLV_ptr;
+                       *TLV_ptr += *length;
+                       break;
+               default:                        // RFU
+                       break;
+       }
+}
+
+
+static bool topaz_print_lock_control_TLVs(uint8_t *memory)
+{
+       uint8_t *TLV_ptr = memory;
+       uint8_t tag = 0;
+       uint16_t length;
+       uint8_t *value;
+       bool lock_TLV_present = false;
+       
+       while(*TLV_ptr != 0x03 && *TLV_ptr != 0xFD && *TLV_ptr != 0xFE) {       
+               // all Lock Control TLVs shall be present before the NDEF message TLV, the proprietary TLV (and the Terminator TLV)
+               get_TLV(&TLV_ptr, &tag, &length, &value);
+               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 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.", 
+                                               size_in_bits,
+                                               pages_addr * bytes_per_page + byte_offset,
+                                               bytes_locked_per_bit);
+                       lock_TLV_present = true;
+               }
+       }
+       
+       if (!lock_TLV_present) {
+               PrintAndLog("(No Lock Control TLV present)");
+               return -1;
+       } else {
+               return 0;
+       }
+}
+
+
+static int topaz_print_reserved_memory_control_TLVs(uint8_t *memory)
+{
+       uint8_t *TLV_ptr = memory;
+       uint8_t tag = 0;
+       uint16_t length;
+       uint8_t *value;
+       bool reserved_memory_control_TLV_present = false;
+       
+       while(*TLV_ptr != 0x03 && *TLV_ptr != 0xFD && *TLV_ptr != 0xFE) {       
+               // all Reserved Memory Control TLVs shall be present before the NDEF message TLV, the proprietary TLV (and the Terminator TLV)
+               get_TLV(&TLV_ptr, &tag, &length, &value);
+               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 bytes_per_page = 1 << (value[2] & 0x0f);
+                       PrintAndLog("Reserved Memory of %d bytes at byte offset 0x%02x.", 
+                                               size_in_bytes,
+                                               pages_addr * bytes_per_page + byte_offset);
+                       reserved_memory_control_TLV_present = true;
+               }
+       }
+       
+       if (!reserved_memory_control_TLV_present) {
+               PrintAndLog("(No Reserved Memory Control TLV present)");
+               return -1;
+       } else {
+               return 0;
+       }
+}
+
+
+static void topaz_print_lifecycle_state(uint8_t *data)
+{
+
+}
+
+
+static void topaz_print_NDEF(uint8_t *data)
+{
+
+}
+
+       

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

-       PrintAndLog("not yet implemented");
+       int status;
+       uint8_t atqa[2];
+       uint8_t rid_response[8];
+       uint8_t *uid_echo = &rid_response[2];
+       union {
+               uint8_t raw_content[124];
+               struct {
+                       uint8_t HR[2];
+                       uint8_t data_block[15][8];
+                       uint8_t CRC[2];
+               } static_memory;
+       } rall_response;
+       uint8_t *static_lock_bytes = rall_response.static_memory.data_block[0x0e];
+       
+       status = topaz_select(atqa, rid_response);
+       
+       if (status == -1) {
+               PrintAndLog("Error: couldn't receive ATQA");
+               return -1;
+       }
+
+       PrintAndLog("ATQA : %02x %02x", atqa[1], atqa[0]);
+       if (atqa[1] != 0x0c && atqa[0] != 0x00) {
+               PrintAndLog("Tag doesn't support the Topaz protocol.");
+               topaz_switch_off_field();
+               return -1;
+       }
+       
+       if (status == -2) {
+               PrintAndLog("Error: tag didn't answer to RID");
+               topaz_switch_off_field();
+               return -1;
+       }
+
+       // ToDo: CRC check
+       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");
+       PrintAndLog("HR1  : %02x", rid_response[1]);
+       
+       status = topaz_rall(uid_echo, rall_response.raw_content);
+
+       if(status == -1) {
+               PrintAndLog("Error: tag didn't answer to RALL");
+               topaz_switch_off_field();
+               return -1;
+       }
+
+       PrintAndLog("UID  : %02x %02x %02x %02x %02x %02x %02x", 
+                       rall_response.static_memory.data_block[0][6], 
+                       rall_response.static_memory.data_block[0][5], 
+                       rall_response.static_memory.data_block[0][4], 
+                       rall_response.static_memory.data_block[0][3], 
+                       rall_response.static_memory.data_block[0][2], 
+                       rall_response.static_memory.data_block[0][1], 
+                       rall_response.static_memory.data_block[0][0]);
+       PrintAndLog("       UID[6] (Manufacturer Byte) = %02x, Manufacturer: %s", 
+                       rall_response.static_memory.data_block[0][6], 
+                       getTagInfo(rall_response.static_memory.data_block[0][6]));
+       
+       PrintAndLog("");
+       PrintAndLog("Static Data blocks 00 to 0c:");
+       PrintAndLog("block# | offset | Data                    | Locked?");
+       char line[80];
+       for (uint16_t i = 0; i <= 0x0c; i++) {
+               for (uint16_t j = 0; j < 8; j++) {
+                       sprintf(&line[3*j], "%02x ", rall_response.static_memory.data_block[i][j] /*rall_response[2 + 8*i + j]*/);
+               }
+               PrintAndLog("  0x%02x |  0x%02x  | %s|   %-3s", i, i*8, line, topaz_block_is_locked(i, static_lock_bytes) ? "yes" : "no");
+       }
+       
+       PrintAndLog("");
+       PrintAndLog("Static Reserved block 0d:");
+       for (uint16_t j = 0; j < 8; j++) {
+               sprintf(&line[3*j], "%02x ", rall_response.static_memory.data_block[0x0d][j]);
+       }
+       PrintAndLog("  0x%02x |  0x%02x  | %s|   %-3s", 0x0d, 0x0d*8, line, "n/a");
+       
+       PrintAndLog("");
+       PrintAndLog("Static Lockbits / OTP block 0e:");
+       for (uint16_t j = 0; j < 8; j++) {
+               sprintf(&line[3*j], "%02x ", static_lock_bytes[j]);
+       }
+       PrintAndLog("  0x%02x |  0x%02x  | %s|   %-3s", 0x0e, 0x0e*8, line, "n/a");
+
+       PrintAndLog("");
+
+       status = topaz_print_CC(&rall_response.static_memory.data_block[1][0]);
+       
+       if (status == -1) {
+               PrintAndLog("No NDEF message present");
+               topaz_switch_off_field();
+               return 0;
+       }
+
+       PrintAndLog("");
+       bool lock_TLV_present = topaz_print_lock_control_TLVs(&rall_response.static_memory.data_block[1][4]);
+
+       PrintAndLog("");
+       bool reserved_mem_present = topaz_print_reserved_memory_control_TLVs(&rall_response.static_memory.data_block[1][4]);
+
+       topaz_print_lifecycle_state(&rall_response.static_memory.data_block[1][0]);
+
+       topaz_print_NDEF(&rall_response.static_memory.data_block[1][0]);
+       
+       topaz_switch_off_field();

        return 0;
 }
 
        return 0;
 }