Merge pull request #362 from merlokk/master

[proxmark3-svn] / client / cmdhf14b.c

diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index bec1d19c9b8727bc7f7f7829612c78eb11cd3af7..36932cbd31d887f252afc29852a883706ef2e9c7 100644 (file)
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -133,17 +133,19 @@ int CmdHF14BCmdRaw (const char *Cmd) {
        bool crc = false;
        bool power = false;
        bool select = false;
        bool crc = false;
        bool power = false;
        bool select = false;

+       bool SRx = false;

        char buf[5] = "";
        uint8_t data[100] = {0x00};
        uint8_t datalen = 0;
        unsigned int temp;
        int i = 0;
        if (strlen(Cmd)<3) {
        char buf[5] = "";
        uint8_t data[100] = {0x00};
        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("       -s    active signal field ON with select");
                        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;
        }
 


@@ -169,6 +171,10 @@ int CmdHF14BCmdRaw (const char *Cmd) {
                                case 's':
                                case 'S':
                                        select = true;
                                case 's':
                                case 'S':
                                        select = true;

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

                                        break;
                                default:
                                        PrintAndLog("Invalid option");
                                        break;
                                default:
                                        PrintAndLog("Invalid option");


@@ -192,7 +198,7 @@ int CmdHF14BCmdRaw (const char *Cmd) {
                        continue;
                }
                PrintAndLog("Invalid char on input");
                        continue;
                }
                PrintAndLog("Invalid char on input");

-               return 1;
+               return 0;

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


@@ -202,31 +208,50 @@ int CmdHF14BCmdRaw (const char *Cmd) {
 
        if (select){ //auto select 14b tag
                uint8_t cmd2[16];
 
        if (select){ //auto select 14b tag
                uint8_t cmd2[16];

-               uint8_t cmdLen = 3;

                bool crc2 = true;
                bool crc2 = true;

-               cmd2[0] = 0x05;
-               cmd2[1] = 0x00;
-               cmd2[2] = 0x00;
+               uint8_t cmdLen;
+
+               if (SRx) {
+                       // REQ SRx
+                       cmdLen = 2;
+                       cmd2[0] = 0x06;
+                       cmd2[1] = 0x00;
+               } else {
+                       cmdLen = 3;
+                       // REQB
+                       cmd2[0] = 0x05;
+                       cmd2[1] = 0x00;
+                       cmd2[2] = 0x08;
+               }

 
 

-               // REQB

                if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose();
 
                if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose();
 

-               if (cmd2[0] != 0x50 || cmdLen != 14 || !crc2) return rawClose();
-
-               cmd2[0] = 0x1D; 
-               // UID from data[1 - 4]
-               cmd2[5] = 0x00;
-               cmd2[6] = 0x08;
-               cmd2[7] = 0x01;
-               cmd2[8] = 0x00;
-               cmdLen = 9;
+               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;
+               }

 
 

-               // attrib

                if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose();
 
                if (cmdLen != 3 || !crc2) return rawClose();
                if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose();
 
                if (cmdLen != 3 || !crc2) return rawClose();

+               if (SRx && cmd2[0] != chipID) return rawClose();

        }
        }

-

        return HF14BCmdRaw(reply, &crc, power, data, &datalen, true);
 }
 
        return HF14BCmdRaw(reply, &crc, power, data, &datalen, true);
 }
 


@@ -397,7 +422,7 @@ int HF14BStdReader(uint8_t *data, uint8_t *datalen){
        //std read cmd
        data[0] = 0x05;
        data[1] = 0x00;
        //std read cmd
        data[0] = 0x05;
        data[1] = 0x00;

-       data[2] = 0x00;
+       data[2] = 0x08;

 
        if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose();
 
 
        if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose();