add -s to hf 14b raw to select a std 14b tag first

[proxmark3-svn] / client / cmdhf14b.c

diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 8e0c54ba01f205c5d34b7d6ddd101a9efd794e03..9c65bb2fcc68e313f8da0d063963b5087cf59593 100644 (file)
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -132,6 +132,7 @@ int CmdHF14BCmdRaw (const char *Cmd) {
        bool reply = true;
        bool crc = false;
        bool power = false;
+       bool select = false;
        char buf[5] = "";
        uint8_t data[100] = {0x00};
        uint8_t datalen = 0;
@@ -142,7 +143,8 @@ int CmdHF14BCmdRaw (const char *Cmd) {
                        PrintAndLog("       -r    do not read response");
                        PrintAndLog("       -c    calculate and append CRC");
                        PrintAndLog("       -p    leave the field on after receive");
-                       return 0;    
+                       PrintAndLog("       -s    active signal field ON with select");
+                       return 0;
        }
 
        // strip
@@ -164,6 +166,10 @@ int CmdHF14BCmdRaw (const char *Cmd) {
                                case 'P': 
                                        power = true;
                                        break;
+                               case 's':
+                               case 'S':
+                                       select = true;
+                                       break;
                                default:
                                        PrintAndLog("Invalid option");
                                        return 0;
@@ -194,6 +200,30 @@ int CmdHF14BCmdRaw (const char *Cmd) {
                return 0;
        }
 
+       if (select){
+               uint8_t cmd2[16];
+               uint8_t cmdLen = 3;
+               bool crc2 = true;
+               cmd2[0] = 0x05;
+               cmd2[1] = 0x00;
+               cmd2[2] = 0x08;
+
+               if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose();
+
+               if (cmd2[0] != 0x50 || cmdLen != 14 || !crc2) return rawClose();
+
+               data[0] = 0x1D;
+               data[5] = 0x00;
+               data[6] = 0x08;
+               data[7] = 0x01;
+               data[8] = 0x00;
+
+               cmdLen = 9;
+               if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose();
+
+               if (cmd2[0] != 0x10 || cmdLen != 3 || !crc2) return rawClose();
+       }
+
        return HF14BCmdRaw(reply, &crc, power, data, &datalen, true);
 }
 
@@ -267,7 +297,7 @@ char *get_ST_Chip_Model(uint8_t data){
 
 int print_ST_Lock_info(uint8_t model){
        //assume connection open and tag selected...
-       uint8_t data[8] = {0x00};
+       uint8_t data[16] = {0x00};
        uint8_t datalen = 2;
        bool crc = true;
        uint8_t resplen;
@@ -295,10 +325,10 @@ int print_ST_Lock_info(uint8_t model){
                case 0x7: //             (SRI4K)
                        //only need data[3]
                        blk1 = 9;
-                       PrintAndLog("   raw: %s",printBits(8,data+3));
-                       PrintAndLog(" 07/08: %slocked", blk1, (data[3] & 1) ? "not " : "" );
+                       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 " : "" );
+                               PrintAndLog("    %02u:%slocked", blk1, (data[3] & (1 << i)) ? " not " : " " );
                                blk1++;
                        }
                        break;
@@ -307,10 +337,10 @@ int print_ST_Lock_info(uint8_t model){
                case 0xC: //             (SRT512)
                        //need data[2] and data[3]
                        blk1 = 0;
-                       PrintAndLog("   raw: %s",printBits(16,data+2));
+                       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 " : "" );
+                                       PrintAndLog("    %02u:%slocked", blk1, (data[b] & (1 << i)) ? " not " : " " );
                                        blk1++;
                                }
                        }
@@ -318,9 +348,9 @@ int print_ST_Lock_info(uint8_t model){
                case 0x2: //             (SR176)
                        //need data[2]
                        blk1 = 0;
-                       PrintAndLog("   raw: %s",printBits(8,data+2));
+                       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 " );
+                               PrintAndLog(" %02u/%02u:%slocked", blk1, blk1+1, (data[2] & (1 << i)) ? " " : " not " );
                                blk1+=2;
                        }
                        break;
@@ -342,9 +372,9 @@ static void print_st_general_info(uint8_t *data){
 // 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 20 00 08 01 00 = attrib xx=crc
-       //a3 = ?  (resp 03 e2 c2)
-       //02 = ?  (resp 02 6a d3)
+       //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])
@@ -366,7 +396,7 @@ int HF14BStdReader(uint8_t *data, uint8_t *datalen){
 
        if (HF14BCmdRaw(true, &crc, false, data, datalen, false)==0) return 0;
 
-       if (data[0] != 0x50  || *datalen != 14 || !crc) return 0;
+       if (data[0] != 0x50 || *datalen != 14 || !crc) return 0;
 
        PrintAndLog ("\n14443-3b tag found:");
        PrintAndLog ("           UID: %s", sprint_hex(data+1,4));
@@ -415,11 +445,12 @@ int HF14B_ST_Reader(uint8_t *data, uint8_t *datalen, bool closeCon){
 
        //leave power on
        if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose();
+
+       if (*datalen != 10 || !crc) return rawClose();
+
        //power off ?
        if (closeCon) rawClose();
 
-       if (*datalen != 10 || !crc) return 0;
-
        PrintAndLog("\n14443-3b ST tag found:");
        print_st_general_info(data);
        return 1;