FIX: The T55x7ReadBlock method, should not have the startgap since it indicats...

[proxmark3-svn] / client / cmdhf14b.c

diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 2a804c2170448d62f08aa94225699beee06930ac..7b67f8c2646759064e43f173cb34bb73d48a1152 100644 (file)
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -11,7 +11,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>

-#include <string.h>

 #include <stdint.h>
 #include "iso14443crc.h"
 #include "proxmark3.h"
 #include <stdint.h>
 #include "iso14443crc.h"
 #include "proxmark3.h"


@@ -23,128 +22,9 @@
 #include "cmdhf14b.h"
 #include "cmdmain.h"
 #include "cmdhf14a.h"
 #include "cmdhf14b.h"
 #include "cmdmain.h"
 #include "cmdhf14a.h"

-#include "sleep.h"

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

-int CmdHF14BDemod(const char *Cmd)
-{
-  int i, j, iold;
-  int isum, qsum;
-  int outOfWeakAt;
-  bool negateI, negateQ;
-
-  uint8_t data[256];
-  int dataLen = 0;
-
-  // As received, the samples are pairs, correlations against I and Q
-  // square waves. So estimate angle of initial carrier (or just
-  // quadrant, actually), and then do the demod.
-
-  // First, estimate where the tag starts modulating.
-  for (i = 0; i < GraphTraceLen; i += 2) {
-    if (abs(GraphBuffer[i]) + abs(GraphBuffer[i + 1]) > 40) {
-      break;
-    }
-  }
-  if (i >= GraphTraceLen) {
-    PrintAndLog("too weak to sync");
-    return 0;
-  }
-  PrintAndLog("out of weak at %d", i);
-  outOfWeakAt = i;
-
-  // Now, estimate the phase in the initial modulation of the tag
-  isum = 0;
-  qsum = 0;
-  for (; i < (outOfWeakAt + 16); i += 2) {
-    isum += GraphBuffer[i + 0];
-    qsum += GraphBuffer[i + 1];
-  }
-  negateI = (isum < 0);
-  negateQ = (qsum < 0);
-
-  // Turn the correlation pairs into soft decisions on the bit.
-  j = 0;
-  for (i = 0; i < GraphTraceLen / 2; i++) {
-    int si = GraphBuffer[j];
-    int sq = GraphBuffer[j + 1];
-    if (negateI) si = -si;
-    if (negateQ) sq = -sq;
-    GraphBuffer[i] = si + sq;
-    j += 2;
-  }
-  GraphTraceLen = i;
-
-  i = outOfWeakAt / 2;
-  while (GraphBuffer[i] > 0 && i < GraphTraceLen)
-    i++;
-  if (i >= GraphTraceLen) goto demodError;
-
-  iold = i;
-  while (GraphBuffer[i] < 0 && i < GraphTraceLen)
-    i++;
-  if (i >= GraphTraceLen) goto demodError;
-  if ((i - iold) > 23) goto demodError;
-
-  PrintAndLog("make it to demod loop");
-
-  for (;;) {
-    iold = i;
-    while (GraphBuffer[i] >= 0 && i < GraphTraceLen)
-      i++;
-    if (i >= GraphTraceLen) goto demodError;
-    if ((i - iold) > 6) goto demodError;
-
-    uint16_t shiftReg = 0;
-    if (i + 20 >= GraphTraceLen) goto demodError;
-
-    for (j = 0; j < 10; j++) {
-      int soft = GraphBuffer[i] + GraphBuffer[i + 1];
-
-      if (abs(soft) < (abs(isum) + abs(qsum)) / 20) {
-        PrintAndLog("weak bit");
-      }
-
-      shiftReg >>= 1;
-      if(GraphBuffer[i] + GraphBuffer[i+1] >= 0) {
-        shiftReg |= 0x200;
-      }
-
-      i+= 2;
-    }
-
-    if ((shiftReg & 0x200) && !(shiftReg & 0x001))
-    {
-      // valid data byte, start and stop bits okay
-      PrintAndLog("   %02x", (shiftReg >> 1) & 0xff);
-      data[dataLen++] = (shiftReg >> 1) & 0xff;
-      if (dataLen >= sizeof(data)) {
-        return 0;
-      }
-    } else if (shiftReg == 0x000) {
-      // this is EOF
-      break;
-    } else {
-      goto demodError;
-    }
-  }
-
-  uint8_t first, second;
-  ComputeCrc14443(CRC_14443_B, data, dataLen-2, &first, &second);
-  PrintAndLog("CRC: %02x %02x (%s)\n", first, second,
-    (first == data[dataLen-2] && second == data[dataLen-1]) ?
-      "ok" : "****FAIL****");
-
-  RepaintGraphWindow();
-  return 0;
-
-demodError:
-  PrintAndLog("demod error");
-  RepaintGraphWindow();
-  return 0;
-}
-

 int CmdHF14BList(const char *Cmd)
 {
        PrintAndLog("Deprecated command, use 'hf list 14b' instead");
 int CmdHF14BList(const char *Cmd)
 {
        PrintAndLog("Deprecated command, use 'hf list 14b' instead");


@@ -152,25 +32,20 @@ int CmdHF14BList(const char *Cmd)
        return 0;
 }
 
        return 0;
 }
 

-int CmdHF14Sim(const char *Cmd)
+int CmdHF14BSim(const char *Cmd)

 {
 {

-  UsbCommand c={CMD_SIMULATE_TAG_ISO_14443};
-  SendCommand(&c);
-  return 0;
-}
-
-int CmdHFSimlisten(const char *Cmd)
-{
-  UsbCommand c = {CMD_SIMULATE_TAG_HF_LISTEN};
-  SendCommand(&c);
-  return 0;
+       UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443B};
+       clearCommandBuffer();
+       SendCommand(&c);
+       return 0;

 }
 
 int CmdHF14BSnoop(const char *Cmd)
 {
 }
 
 int CmdHF14BSnoop(const char *Cmd)
 {

-  UsbCommand c = {CMD_SNOOP_ISO_14443};
-  SendCommand(&c);
-  return 0;
+       UsbCommand c = {CMD_SNOOP_ISO_14443B};
+       clearCommandBuffer();
+       SendCommand(&c);
+       return 0;

 }
 
 /* New command to read the contents of a SRI512 tag
 }
 
 /* New command to read the contents of a SRI512 tag


@@ -179,9 +54,10 @@ int CmdHF14BSnoop(const char *Cmd)
  */
 int CmdSri512Read(const char *Cmd)
 {
  */
 int CmdSri512Read(const char *Cmd)
 {

-  UsbCommand c = {CMD_READ_SRI512_TAG, {strtol(Cmd, NULL, 0), 0, 0}};
-  SendCommand(&c);
-  return 0;
+       UsbCommand c = {CMD_READ_SRI512_TAG, {strtol(Cmd, NULL, 0), 0, 0}};
+       clearCommandBuffer();
+       SendCommand(&c);
+       return 0;

 }
 
 /* New command to read the contents of a SRIX4K tag
 }
 
 /* New command to read the contents of a SRIX4K tag


@@ -190,79 +66,86 @@ int CmdSri512Read(const char *Cmd)
  */
 int CmdSrix4kRead(const char *Cmd)
 {
  */
 int CmdSrix4kRead(const char *Cmd)
 {

-  UsbCommand c = {CMD_READ_SRIX4K_TAG, {strtol(Cmd, NULL, 0), 0, 0}};
-  SendCommand(&c);
-  return 0;
+       UsbCommand c = {CMD_READ_SRIX4K_TAG, {strtol(Cmd, NULL, 0), 0, 0}};
+       clearCommandBuffer();
+       SendCommand(&c);
+       return 0;

 }
 
 int rawClose(void){
 }
 
 int rawClose(void){

-    UsbCommand resp;
+       UsbCommand resp;

        UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}};
        UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}};

+       clearCommandBuffer();

        SendCommand(&c);
        if (!WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
        SendCommand(&c);
        if (!WaitForResponseTimeout(CMD_ACK,&resp,1000)) {

-               return 0;
-       }

        return 0;       
        return 0;       

+       }
+       return 0;

 }
 
 }
 

-int HF14BCmdRaw(bool reply, bool *crc, uint8_t power_trace, uint8_t *data, uint8_t *datalen, bool verbose){
-       UsbCommand resp;
+int HF14BCmdRaw(bool reply, bool *crc, bool power, uint8_t *data, uint8_t *datalen, bool verbose){
+               
+       if(*crc) {
+               ComputeCrc14443(CRC_14443_B, data, *datalen, data+*datalen, data+*datalen+1);
+               *datalen += 2;
+       }
+

        UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}}; // len,recv,power
        UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}}; // len,recv,power

-  if(*crc)
-  {
-    uint8_t first, second;
-    ComputeCrc14443(CRC_14443_B, data, *datalen, &first, &second);
-    data[*datalen] = first;
-    data[*datalen + 1] = second;
-    *datalen += 2;
-  }
-  
-  c.arg[0] = *datalen;
-  c.arg[1] = reply;
-       c.arg[2] = power_trace;
-  memcpy(c.d.asBytes,data,*datalen);
-  SendCommand(&c);
-  
-  if (!reply) return 1; 
-
-  if (!WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
-    if (verbose) PrintAndLog("timeout while waiting for reply.");
-    return 0;
-  }
-  *datalen = resp.arg[0];
+       c.arg[0] = *datalen;
+       c.arg[1] = reply;
+       c.arg[2] = power;
+       memcpy(c.d.asBytes, data, *datalen);
+       clearCommandBuffer();
+       SendCommand(&c);
+
+       if (!reply) return 1; 
+
+       UsbCommand resp;
+       if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+               if (verbose) PrintAndLog("timeout while waiting for reply.");
+               return 0;
+       }
+
+       *datalen = resp.arg[0];

        if (verbose) PrintAndLog("received %u octets", *datalen);
        if (verbose) PrintAndLog("received %u octets", *datalen);

-  if(!*datalen)
-    return 0;
-
-  memcpy(data, resp.d.asBytes, *datalen);
-  if (verbose) PrintAndLog("%s", sprint_hex(data, *datalen));
-
-  uint8_t first, second;
-  ComputeCrc14443(CRC_14443_B, data, *datalen-2, &first, &second);
-  if(data[*datalen-2] == first && data[*datalen-1] == second) {
-    if (verbose) PrintAndLog("CRC OK");
-    *crc = true;
-  } else {
-    if (verbose) PrintAndLog("CRC failed");
-    *crc = false;
-  }
-  return 1;
+       if(*datalen<3) return 0;
+
+       memcpy(data, resp.d.asBytes, *datalen);
+       
+       uint8_t first = 0, second = 0;
+       ComputeCrc14443(CRC_14443_B, data, *datalen-2, &first, &second);
+       *crc = ( data[*datalen-2] == first && data[*datalen-1] == second);
+
+       if (verbose)
+               PrintAndLog("[LEN %u] %s[%02X %02X] %s",
+                               *datalen,
+                               sprint_hex(data, *datalen-2),
+                               data[*datalen-2],
+                               data[*datalen-1],
+                               (*crc)?"OK":"FAIL"
+                               );
+       
+       return 1;

 }
 
 int CmdHF14BCmdRaw (const char *Cmd) {
     bool reply = true;
     bool crc = false;
 }
 
 int CmdHF14BCmdRaw (const char *Cmd) {
     bool reply = true;
     bool crc = false;

-       uint8_t power_trace = 0;
+       bool power = false;
+       bool select = false;
+       bool SRx = false;

     char buf[5]="";
     char buf[5]="";

-    uint8_t data[100] = {0x00};
+    uint8_t data[USB_CMD_DATA_SIZE] = {0x00};

     uint8_t datalen = 0;
     unsigned int temp;
     int i = 0;
     if (strlen(Cmd)<3) {
     uint8_t datalen = 0;
     unsigned int temp;
     int i = 0;
     if (strlen(Cmd)<3) {

-        PrintAndLog("Usage: hf 14b raw [-r] [-c] [-p] <0A 0B 0C ... hex>");
+               PrintAndLog("Usage: hf 14b raw [-r] [-c] [-p] [-s || -ss] <0A 0B 0C ... hex>");

         PrintAndLog("       -r    do not read response");
         PrintAndLog("       -c    calculate and append CRC");
         PrintAndLog("       -p    leave the field on after receive");
         PrintAndLog("       -r    do not read response");
         PrintAndLog("       -c    calculate and append CRC");
         PrintAndLog("       -p    leave the field on after receive");

+               PrintAndLog("       -s    active signal field ON with select");
+               PrintAndLog("       -ss   active signal field ON with select for SRx ST Microelectronics tags");

         return 0;    
     }
 
         return 0;    
     }
 


@@ -283,8 +166,16 @@ int CmdHF14BCmdRaw (const char *Cmd) {
                     break;
                 case 'p': 
                 case 'P': 
                     break;
                 case 'p': 
                 case 'P': 

-                                       power_trace |= 1;
+                                       power = true;

                     break;
                     break;

+                               case 's':
+                               case 'S':
+                                       select = true;
+                                       if (Cmd[i+2]=='s' || Cmd[i+2]=='S') {
+                                               SRx = true;
+                                               i++;
+                                       }
+                                       break;

                 default:
                     PrintAndLog("Invalid option");
                     return 0;
                 default:
                     PrintAndLog("Invalid option");
                     return 0;


@@ -303,11 +194,12 @@ int CmdHF14BCmdRaw (const char *Cmd) {
                 sscanf(buf,"%x",&temp);
                 data[datalen++]=(uint8_t)(temp & 0xff);
                 *buf=0;
                 sscanf(buf,"%x",&temp);
                 data[datalen++]=(uint8_t)(temp & 0xff);
                 *buf=0;

+                               memset(buf, 0x00, sizeof(buf));

             }
             continue;
         }
         PrintAndLog("Invalid char on input");
             }
             continue;
         }
         PrintAndLog("Invalid char on input");

-        return 1;
+               return 0;

     }
     if (datalen == 0)
     {
     }
     if (datalen == 0)
     {


@@ -315,57 +207,99 @@ int CmdHF14BCmdRaw (const char *Cmd) {
       return 0;
     }
 
       return 0;
     }
 

-       return HF14BCmdRaw(reply, &crc, power_trace, data, &datalen, true);
+       if (select){ //auto select 14b tag
+               uint8_t cmd2[16];
+               bool crc2 = true;
+               uint8_t cmdLen;
+
+               if (SRx) {
+                       // REQ SRx
+                       cmdLen = 2;
+                       cmd2[0] = 0x06;
+                       cmd2[1] = 0x00;
+               } else {
+                       // REQB
+                       cmdLen = 3;
+                       cmd2[0] = 0x05;
+                       cmd2[1] = 0x00;
+                       cmd2[2] = 0x08;
+               }
+               
+               // REQB
+               if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose();
+                                                                         
+               PrintAndLog("REQB   : %s", sprint_hex(cmd2, cmdLen));
+               
+               if ( SRx && (cmdLen != 3 || !crc2) ) return rawClose();
+               else if (cmd2[0] != 0x50 || cmdLen != 14 || !crc2) return rawClose();
+               
+               uint8_t chipID = 0;
+               if (SRx) {
+                       // select
+                       chipID = cmd2[0];
+                       cmd2[0] = 0x0E;
+                       cmd2[1] = chipID;
+                       cmdLen = 2;
+               } else {
+                       // attrib
+                       cmd2[0] = 0x1D; 
+                       // UID from cmd2[1 - 4]
+                       cmd2[5] = 0x00;
+                       cmd2[6] = 0x08;
+                       cmd2[7] = 0x01;
+                       cmd2[8] = 0x00;
+                       cmdLen = 9;
+               }
+               // wait         
+               
+               // attrib
+               if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose();
+               PrintAndLog("ATTRIB : %s", sprint_hex(cmd2, cmdLen));
+               
+               if (cmdLen != 3 || !crc2) return rawClose();            
+               if (SRx && cmd2[0] != chipID) return rawClose();
+       
+       }
+       return HF14BCmdRaw(reply, &crc, power, data, &datalen, true);

 }
 
 }
 

+// print full atqb info

 static void print_atqb_resp(uint8_t *data){
 static void print_atqb_resp(uint8_t *data){

-  PrintAndLog ("           UID: %s", sprint_hex(data+1,4));
-  PrintAndLog ("      App Data: %s", sprint_hex(data+5,4));
-  PrintAndLog ("      Protocol: %s", sprint_hex(data+9,3));
-  uint8_t BitRate = data[9];
-  if (!BitRate) 
-    PrintAndLog ("      Bit Rate: 106 kbit/s only PICC <-> PCD");
-  if (BitRate & 0x10)
-    PrintAndLog ("      Bit Rate: 212 kbit/s PICC -> PCD supported");
-  if (BitRate & 0x20)
-    PrintAndLog ("      Bit Rate: 424 kbit/s PICC -> PCD supported"); 
-  if (BitRate & 0x40)
-    PrintAndLog ("      Bit Rate: 847 kbit/s PICC -> PCD supported"); 
-  if (BitRate & 0x01)
-    PrintAndLog ("      Bit Rate: 212 kbit/s PICC <- PCD supported");
-  if (BitRate & 0x02)
-    PrintAndLog ("      Bit Rate: 424 kbit/s PICC <- PCD supported"); 
-  if (BitRate & 0x04)
-    PrintAndLog ("      Bit Rate: 847 kbit/s PICC <- PCD supported"); 
-  if (BitRate & 0x80) 
-    PrintAndLog ("                Same bit rate <-> required");
-
-  uint16_t maxFrame = data[10]>>4;
-  if (maxFrame < 5) 
-    maxFrame = 8*maxFrame + 16;
-  else if (maxFrame == 5)
-    maxFrame = 64;
-  else if (maxFrame == 6)
-    maxFrame = 96;
-  else if (maxFrame == 7)
-    maxFrame = 128;
-  else if (maxFrame == 8)
-    maxFrame = 256;
-  else
-    maxFrame = 257;
-
-  PrintAndLog ("Max Frame Size: %d%s",maxFrame, (maxFrame == 257) ? "+ RFU" : "");
-
-  uint8_t protocolT = data[10] & 0xF;
-  PrintAndLog (" Protocol Type: Protocol is %scompliant with ISO/IEC 14443-4",(protocolT) ? "" : "not " );
-  PrintAndLog ("Frame Wait Int: %d", data[11]>>4);
-  PrintAndLog (" App Data Code: Application is %s",(data[11]&4) ? "Standard" : "Proprietary");
-  PrintAndLog (" Frame Options: NAD is %ssupported",(data[11]&2) ? "" : "not ");
-  PrintAndLog (" Frame Options: CID is %ssupported",(data[11]&1) ? "" : "not ");
-  
-  return;
+       //PrintAndLog ("           UID: %s", sprint_hex(data+1,4));
+       PrintAndLog ("      App Data: %s", sprint_hex(data+5,4));
+       PrintAndLog ("      Protocol: %s", sprint_hex(data+9,3));
+       uint8_t BitRate = data[9];
+       if (!BitRate) PrintAndLog ("      Bit Rate: 106 kbit/s only PICC <-> PCD");
+       if (BitRate & 0x10)     PrintAndLog ("      Bit Rate: 212 kbit/s PICC -> PCD supported");
+       if (BitRate & 0x20)     PrintAndLog ("      Bit Rate: 424 kbit/s PICC -> PCD supported"); 
+       if (BitRate & 0x40)     PrintAndLog ("      Bit Rate: 847 kbit/s PICC -> PCD supported"); 
+       if (BitRate & 0x01)     PrintAndLog ("      Bit Rate: 212 kbit/s PICC <- PCD supported");
+       if (BitRate & 0x02)     PrintAndLog ("      Bit Rate: 424 kbit/s PICC <- PCD supported"); 
+       if (BitRate & 0x04)     PrintAndLog ("      Bit Rate: 847 kbit/s PICC <- PCD supported"); 
+       if (BitRate & 0x80)     PrintAndLog ("                Same bit rate <-> required");
+
+       uint16_t maxFrame = data[10]>>4;
+       if (maxFrame < 5)               maxFrame = 8 * maxFrame + 16;
+       else if (maxFrame == 5) maxFrame = 64;
+       else if (maxFrame == 6) maxFrame = 96;
+       else if (maxFrame == 7) maxFrame = 128;
+       else if (maxFrame == 8) maxFrame = 256;
+       else maxFrame = 257;
+
+       PrintAndLog ("Max Frame Size: %u%s",maxFrame, (maxFrame == 257) ? "+ RFU" : "");
+
+       uint8_t protocolT = data[10] & 0xF;
+       PrintAndLog (" Protocol Type: Protocol is %scompliant with ISO/IEC 14443-4",(protocolT) ? "" : "not " );
+       PrintAndLog ("Frame Wait Int: %u", data[11]>>4);
+       PrintAndLog (" App Data Code: Application is %s",(data[11]&4) ? "Standard" : "Proprietary");
+       PrintAndLog (" Frame Options: NAD is %ssupported",(data[11]&2) ? "" : "not ");
+       PrintAndLog (" Frame Options: CID is %ssupported",(data[11]&1) ? "" : "not ");
+       PrintAndLog ("Max Buf Length: %u (MBLI) %s",data[14]>>4, (data[14] & 0xF0) ? "" : "not supported");
+
+       return;

 }
 
 }
 

+// get SRx chip model (from UID) // from ST Microelectronics

 char *get_ST_Chip_Model(uint8_t data){
        static char model[20];
        char *retStr = model;
 char *get_ST_Chip_Model(uint8_t data){
        static char model[20];
        char *retStr = model;


@@ -384,100 +318,303 @@ char *get_ST_Chip_Model(uint8_t data){
        return retStr;
 }
 
        return retStr;
 }
 

-static void print_st_info(uint8_t *data){
+int print_ST_Lock_info(uint8_t model){
+       //assume connection open and tag selected...
+       uint8_t data[16] = {0x00};
+       uint8_t datalen = 2;
+       bool crc = true;
+       uint8_t resplen;
+       uint8_t blk1;
+       data[0] = 0x08;
+
+       if (model == 0x2) { //SR176 has special command:
+               data[1] = 0xf;
+               resplen = 4;                    
+       } else {
+               data[1] = 0xff;
+               resplen = 6;
+       }
+
+       //std read cmd
+       if (HF14BCmdRaw(true, &crc, true, data, &datalen, false)==0) return rawClose();
+
+       if (datalen != resplen || !crc) return rawClose();
+
+       PrintAndLog("Chip Write Protection Bits:");
+       // now interpret the data
+       switch (model){
+               case 0x0: //fall through (SRIX4K special)
+               case 0x3: //fall through (SRIx4K)
+               case 0x7: //             (SRI4K)
+                       //only need data[3]
+                       blk1 = 9;
+                       PrintAndLog("   raw: %s",printBits(1,data+3));
+                       PrintAndLog(" 07/08:%slocked", (data[3] & 1) ? " not " : " " );
+                       for (uint8_t i = 1; i<8; i++){
+                               PrintAndLog("    %02u:%slocked", blk1, (data[3] & (1 << i)) ? " not " : " " );
+                               blk1++;
+                       }
+                       break;
+               case 0x4: //fall through (SRIX512)
+               case 0x6: //fall through (SRI512)
+               case 0xC: //             (SRT512)
+                       //need data[2] and data[3]
+                       blk1 = 0;
+                       PrintAndLog("   raw: %s",printBits(2,data+2));
+                       for (uint8_t b=2; b<4; b++){
+                               for (uint8_t i=0; i<8; i++){
+                                       PrintAndLog("    %02u:%slocked", blk1, (data[b] & (1 << i)) ? " not " : " " );
+                                       blk1++;
+                               }
+                       }
+                       break;
+               case 0x2: //             (SR176)
+                       //need data[2]
+                       blk1 = 0;
+                       PrintAndLog("   raw: %s",printBits(1,data+2));
+                       for (uint8_t i = 0; i<8; i++){
+                               PrintAndLog(" %02u/%02u:%slocked", blk1, blk1+1, (data[2] & (1 << i)) ? " " : " not " );
+                               blk1+=2;
+                       }
+                       break;
+               default:
+                       return rawClose();
+       }
+       return 1;
+}
+
+// print UID info from SRx chips (ST Microelectronics)
+static void print_st_general_info(uint8_t *data){

        //uid = first 8 bytes in data
        //uid = first 8 bytes in data

-       PrintAndLog(" UID: %s", sprint_hex(data,8));
-       PrintAndLog(" MFG: %02X, %s", data[1], getTagInfo(data[1]));
-       PrintAndLog("Chip: %02X, %s", data[2]>>2, get_ST_Chip_Model(data[2]>>2));
+       PrintAndLog(" UID: %s", sprint_hex(SwapEndian64(data,8,8),8));
+       PrintAndLog(" MFG: %02X, %s", data[6], getTagInfo(data[6]));
+       PrintAndLog("Chip: %02X, %s", data[5]>>2, get_ST_Chip_Model(data[5]>>2));

        return;
 }
 
        return;
 }
 

-int HF14BStdRead(uint8_t *data, uint8_t *datalen){
-  bool crc = true;
-  *datalen = 3;
-  //std read cmd
-  data[0] = 0x05;
-  data[1] = 0x00;
-  data[2] = 0x08;
+// 14b get and print UID only (general info)
+int HF14BStdReader(uint8_t *data, uint8_t *datalen){
+       //05 00 00 = find one tag in field
+       //1d xx xx xx xx 00 08 01 00 = attrib xx=UID (resp 10 [f9 e0])
+       //a3 = ?  (resp 03 [e2 c2])
+       //02 = ?  (resp 02 [6a d3])
+       // 022b (resp 02 67 00 [29  5b])
+       // 0200a40400 (resp 02 67 00 [29 5b])
+       // 0200a4040c07a0000002480300 (resp 02 67 00 [29 5b])
+       // 0200a4040c07a0000002480200 (resp 02 67 00 [29 5b])
+       // 0200a4040006a0000000010100 (resp 02 6a 82 [4b 4c])
+       // 0200a4040c09d27600002545500200 (resp 02 67 00 [29 5b])
+       // 0200a404000cd2760001354b414e4d30310000 (resp 02 6a 82 [4b 4c])
+       // 0200a404000ca000000063504b43532d313500 (resp 02 6a 82 [4b 4c])
+       // 0200a4040010a000000018300301000000000000000000 (resp 02 6a 82 [4b 4c])
+       //03 = ?  (resp 03 [e3 c2])
+       //c2 = ?  (resp c2 [66 15])
+       //b2 = ?  (resp a3 [e9 67])             
+       //a2 = ?  (resp 02 [6a d3])
+       bool crc = true;
+       *datalen = 3;
+       //std read cmd
+       data[0] = 0x05;
+       data[1] = 0x00;
+       data[2] = 0x08;
+
+       if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose();
+
+       if (data[0] != 0x50 || *datalen != 14 || !crc) return rawClose();
+
+       PrintAndLog ("\n14443-3b tag found:");
+       PrintAndLog ("           UID: %s", sprint_hex(data+1,4));
+
+       uint8_t cmd2[16];
+       uint8_t cmdLen = 3;
+       bool crc2 = true;
+
+       cmd2[0] = 0x1D; 
+       // UID from data[1 - 4]
+       cmd2[1] = data[1];
+       cmd2[2] = data[2];
+       cmd2[3] = data[3];
+       cmd2[4] = data[4];
+       cmd2[5] = 0x00;
+       cmd2[6] = 0x08;
+       cmd2[7] = 0x01;
+       cmd2[8] = 0x00;
+       cmdLen = 9;
+
+       // attrib
+       if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose();
+
+       if (cmdLen != 3 || !crc2) return rawClose();
+       // add attrib responce to data
+       data[14] = cmd2[0];
+       rawClose();
+       return 1;
+}

 
 

-       int ans = HF14BCmdRaw(true, &crc, 2, data, datalen, false);
+// 14b get and print Full Info (as much as we know)
+int HF14BStdInfo(uint8_t *data, uint8_t *datalen){
+       if (!HF14BStdReader(data,datalen)) return 0;

 
 

-  if (!ans) return 0;
-  if (data[0] != 0x50  || *datalen < 14 || !crc) return 0;
+       //add more info here
+       print_atqb_resp(data);

 
 

-  PrintAndLog ("\n14443-3b tag found:");
-  print_atqb_resp(data);

 
 

-  return 1;
+       return 1;

 }
 
 }
 

-
-
-int HF14B_ST_Read(uint8_t *data, uint8_t *datalen){
-  bool crc = true;
-  *datalen = 2;
+// SRx get and print general info about SRx chip from UID
+int HF14B_ST_Reader(uint8_t *data, uint8_t *datalen, bool closeCon){
+       bool crc = true;
+       *datalen = 2;

        //wake cmd
        //wake cmd

-  data[0] = 0x06;
-  data[1] = 0x00;
-       //power on and reset tracing
-       int ans = HF14BCmdRaw(true, &crc, 3, data, datalen, true);
+       data[0] = 0x06;
+       data[1] = 0x00;
+
+       //leave power on
+       // verbose on for now for testing - turn off when functional
+       if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose();

 
 

-       if (!ans) return rawClose();
-       if (*datalen < 3 || !crc) return rawClose();
+       if (*datalen != 3 || !crc) return rawClose();

 
 

-  uint8_t chipID = data[0];
+       uint8_t chipID = data[0];

        // select
        // select

-  data[0] = 0x0E;
-  data[1] = chipID;
-  *datalen = 2;
-       msleep(100);
-       //power on
-       ans = HF14BCmdRaw(true, &crc, 1, data, datalen, true);
+       data[0] = 0x0E;
+       data[1] = chipID;
+       *datalen = 2;

 
 

-       if (!ans) return rawClose();
-       if (*datalen < 3 || !crc) return rawClose();
+       //leave power on
+       if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose();
+
+       if (*datalen != 3 || !crc || data[0] != chipID) return rawClose();

 
        // get uid
 
        // get uid

-  data[0] = 0x0B;
-  *datalen = 1;
-       msleep(100);
-       //power off
-       ans = HF14BCmdRaw(true, &crc, 0, data, datalen, true);
+       data[0] = 0x0B;
+       *datalen = 1;
+
+       //leave power on
+       if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose();
+
+       if (*datalen != 10 || !crc) return rawClose();

 
 

-  if (!ans) return 0;
-  if (*datalen < 10 || !crc) return 0;
+       //power off ?
+       if (closeCon) rawClose();

 
        PrintAndLog("\n14443-3b ST tag found:");
 
        PrintAndLog("\n14443-3b ST tag found:");

-       print_st_info(data);
-  return 1;
+       print_st_general_info(data);
+       return 1;
+}
+
+// SRx get and print full info (needs more info...)
+int HF14B_ST_Info(uint8_t *data, uint8_t *datalen){
+       if (!HF14B_ST_Reader(data, datalen, false)) return 0;
+       
+       //add locking bit information here.
+       if (print_ST_Lock_info(data[5]>>2)) 
+               rawClose();

 
 

+       return 1;

 }
 
 }
 

-int HF14BReader(bool verbose){
-  uint8_t data[100];
-  uint8_t datalen = 5;
-  
-  // try std 14b (atqb)
-  int ans = HF14BStdRead(data, &datalen);
-  if (ans) return 1;
-
-  // try st 14b
-  ans = HF14B_ST_Read(data, &datalen);
-  if (ans) return 1;
+// test for other 14b type tags (mimic another reader - don't have tags to identify)
+int HF14B_Other_Reader(uint8_t *data, uint8_t *datalen){
+       bool crc = true;
+       *datalen = 4;
+       //std read cmd
+       data[0] = 0x00;
+       data[1] = 0x0b;
+       data[2] = 0x3f;
+       data[3] = 0x80;
+
+       if (HF14BCmdRaw(true, &crc, true, data, datalen, false)!=0) {
+               if (*datalen > 2 || !crc) {
+                       PrintAndLog ("\n14443-3b tag found:");
+                       PrintAndLog ("Unknown tag type answered to a 0x000b3f80 command ans:");
+                       PrintAndLog ("%s",sprint_hex(data,*datalen));
+                       rawClose();
+                       return 1;
+               }
+       }
+
+       crc = false;
+       *datalen = 1;
+       data[0] = 0x0a;
+
+       if (HF14BCmdRaw(true, &crc, true, data, datalen, false)!=0) {
+               if (*datalen > 0) {
+                       PrintAndLog ("\n14443-3b tag found:");
+                       PrintAndLog ("Unknown tag type answered to a 0x0A command ans:");
+                       PrintAndLog ("%s",sprint_hex(data,*datalen));
+                       rawClose();
+                       return 1;
+               }
+       }
+       
+       crc = false;
+       *datalen = 1;
+       data[0] = 0x0c;
+
+       if (HF14BCmdRaw(true, &crc, true, data, datalen, false)!=0) {
+               if (*datalen > 0) {
+                       PrintAndLog ("\n14443-3b tag found:");
+                       PrintAndLog ("Unknown tag type answered to a 0x0C command ans:");
+                       PrintAndLog ("%s",sprint_hex(data,*datalen));
+                       rawClose();
+                       return 1;
+               }
+       }
+       rawClose();
+       return 0;
+}
+
+// get and print all info known about any known 14b tag
+int HF14BInfo(bool verbose){
+       uint8_t data[USB_CMD_DATA_SIZE];
+       uint8_t datalen = 5;
+
+       // try std 14b (atqb)
+       if (HF14BStdInfo(data, &datalen)) return 1;
+
+       // try st 14b
+       if (HF14B_ST_Info(data, &datalen)) return 1;
+
+       // try unknown 14b read commands (to be identified later)
+       //   could be read of calypso, CEPAS, moneo, or pico pass.
+       if (HF14B_Other_Reader(data, &datalen)) return 1;
+

        if (verbose) PrintAndLog("no 14443B tag found");
        return 0;
        if (verbose) PrintAndLog("no 14443B tag found");
        return 0;

+}

 
 

+// menu command to get and print all info known about any known 14b tag
+int CmdHF14Binfo(const char *Cmd){
+       return HF14BInfo(true);

 }
 
 }
 

-int CmdHF14BReader(const char *Cmd)
-{
-       return HF14BReader(true);
-  //UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443, {strtol(Cmd, NULL, 0), 0, 0}};
-  //SendCommand(&c);
+// get and print general info about all known 14b chips
+int HF14BReader(bool verbose){
+       uint8_t data[USB_CMD_DATA_SIZE];
+       uint8_t datalen = 5;
+       
+       // try std 14b (atqb)
+       if (HF14BStdReader(data, &datalen)) return 1;
+
+       // try st 14b
+       if (HF14B_ST_Reader(data, &datalen, true)) return 1;
+
+       // try unknown 14b read commands (to be identified later)
+       //   could be read of calypso, CEPAS, moneo, or pico pass.
+       if (HF14B_Other_Reader(data, &datalen)) return 1;
+
+       if (verbose) PrintAndLog("no 14443B tag found");
+       return 0;

 }
 
 }
 

-int CmdHF14BWrite( const char *Cmd){
+// menu command to get and print general info about all known 14b chips
+int CmdHF14BReader(const char *Cmd){
+       return HF14BReader(true);
+}

 
 

+int CmdSriWrite( const char *Cmd){

 /*
  * For SRIX4K  blocks 00 - 7F
  * hf 14b raw -c -p 09 $srix4kwblock $srix4kwdata
 /*
  * For SRIX4K  blocks 00 - 7F
  * hf 14b raw -c -p 09 $srix4kwblock $srix4kwdata


@@ -546,28 +683,27 @@ int CmdHF14BWrite( const char *Cmd){
 
 static command_t CommandTable[] = 
 {
 
 static command_t CommandTable[] = 
 {

-  {"help",        CmdHelp,        1, "This help"},
-  {"demod",       CmdHF14BDemod,  1, "Demodulate ISO14443 Type B from tag"},
-  {"list",        CmdHF14BList,   0, "[Deprecated] List ISO 14443b history"},
-  {"reader",      CmdHF14BReader, 0, "Find 14b tag (HF ISO 14443b)"},
-  {"sim",         CmdHF14Sim,     0, "Fake ISO 14443 tag"},
-  {"simlisten",   CmdHFSimlisten, 0, "Get HF samples as fake tag"},
-  {"snoop",       CmdHF14BSnoop,  0, "Eavesdrop ISO 14443"},
-  {"sri512read",  CmdSri512Read,  0, "Read contents of a SRI512 tag"},
-  {"srix4kread",  CmdSrix4kRead,  0, "Read contents of a SRIX4K tag"},
-  {"raw",         CmdHF14BCmdRaw, 0, "Send raw hex data to tag"},
-  {"write",       CmdHF14BWrite,  0, "Write data to a SRI512 | SRIX4K tag"},
-  {NULL, NULL, 0, NULL}
+       {"help",        CmdHelp,        1, "This help"},
+       {"info",        CmdHF14Binfo,   0, "Find and print details about a 14443B tag"},
+       {"list",        CmdHF14BList,   0, "[Deprecated] List ISO 14443B history"},
+       {"reader",      CmdHF14BReader, 0, "Act as a 14443B reader to identify a tag"},
+       {"sim",         CmdHF14BSim,    0, "Fake ISO 14443B tag"},
+       {"snoop",       CmdHF14BSnoop,  0, "Eavesdrop ISO 14443B"},
+       {"sri512read",  CmdSri512Read,  0, "Read contents of a SRI512 tag"},
+       {"srix4kread",  CmdSrix4kRead,  0, "Read contents of a SRIX4K tag"},
+       {"sriwrite",    CmdSriWrite,    0, "Write data to a SRI512 | SRIX4K tag"},
+       {"raw",         CmdHF14BCmdRaw, 0, "Send raw hex data to tag"},
+       {NULL, NULL, 0, NULL}

 };
 
 int CmdHF14B(const char *Cmd)
 {
 };
 
 int CmdHF14B(const char *Cmd)
 {

-  CmdsParse(CommandTable, Cmd);
-  return 0;
+       CmdsParse(CommandTable, Cmd);
+       return 0;

 }
 
 int CmdHelp(const char *Cmd)
 {
 }
 
 int CmdHelp(const char *Cmd)
 {

-  CmdsHelp(CommandTable);
-  return 0;
+       CmdsHelp(CommandTable);
+       return 0;

 }
 }