FIX: I think the dumping of data is correct now in tnp3.lua. MD5 string vs bytearra...

[proxmark3-svn] / client / cmdlft55xx.c

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 30f5e68e97af0904bf6b679ca114491d0551ede4..513eb0ef668683334191f388243951ba5567cfc3 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -23,50 +23,41 @@
 \r
 \r
 #define LF_TRACE_BUFF_SIZE 12000 // 32 x 32 x 10  (32 bit times numofblock (7), times clock skip..)\r
 \r
 \r
 #define LF_TRACE_BUFF_SIZE 12000 // 32 x 32 x 10  (32 bit times numofblock (7), times clock skip..)\r

+#define LF_BITSSTREAM_LEN 1000 // more then 1000 bits shouldn't happend..  8block * 4 bytes * 8bits = \r

 static int CmdHelp(const char *Cmd);\r
 \r
 \r
 int CmdReadBlk(const char *Cmd)\r
 {\r
 static int CmdHelp(const char *Cmd);\r
 \r
 \r
 int CmdReadBlk(const char *Cmd)\r
 {\r

-       //default to invalid block\r
-       int Block = -1;\r
-       UsbCommand c;\r
-\r
-       sscanf(Cmd, "%d", &Block);\r
+       int block = -1;\r
+       sscanf(Cmd, "%d", &block);\r

 \r
 \r

-       if ((Block > 7) | (Block < 0)) {\r
+       if ((block > 7) | (block < 0)) {\r

                PrintAndLog("Block must be between 0 and 7");\r
                return 1;\r
        }       \r
 \r
                PrintAndLog("Block must be between 0 and 7");\r
                return 1;\r
        }       \r
 \r

-       PrintAndLog(" Reading page 0 block : %d", Block);\r
-\r
-       // this command fills up BigBuff\r
-       // \r
+       UsbCommand c;\r

        c.cmd = CMD_T55XX_READ_BLOCK;\r
        c.d.asBytes[0] = 0x00;\r
        c.arg[0] = 0;\r
        c.cmd = CMD_T55XX_READ_BLOCK;\r
        c.d.asBytes[0] = 0x00;\r
        c.arg[0] = 0;\r

-       c.arg[1] = Block;\r
+       c.arg[1] = block;\r

        c.arg[2] = 0;\r
        SendCommand(&c);\r
        WaitForResponse(CMD_ACK, NULL);\r
        \r
        c.arg[2] = 0;\r
        SendCommand(&c);\r
        WaitForResponse(CMD_ACK, NULL);\r
        \r

-       uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};\r
-       \r
-       GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,3560);  //3560 -- should be offset..\r
-       WaitForResponseTimeout(CMD_ACK,NULL, 1500);\r
-\r
-       for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {\r
-               GraphBuffer[j] = ((int)data[j]) ;\r
-       }\r
-       GraphTraceLen = LF_TRACE_BUFF_SIZE;\r
-       \r
-       uint8_t bits[1000] = {0x00};\r
-       uint8_t * bitstream = bits;\r
-       \r
-       manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream);\r
+//     uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};\r

        \r
        \r

-       RepaintGraphWindow();\r
+       // GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,3560);  //3560 -- should be offset..\r
+       // WaitForResponseTimeout(CMD_ACK,NULL, 1500);\r
+\r
+       // for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {\r
+               // GraphBuffer[j] = (int)data[j];\r
+       // }\r
+       // GraphTraceLen = LF_TRACE_BUFF_SIZE;\r
+       CmdSamples("12000");\r
+       ManchesterDemod(block);\r
+       // RepaintGraphWindow();\r

   return 0;\r
 }\r
 \r
   return 0;\r
 }\r
 \r


@@ -99,14 +90,10 @@ int CmdReadBlkPWD(const char *Cmd)
        WaitForResponseTimeout(CMD_ACK,NULL, 1500);\r
 \r
        for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {\r
        WaitForResponseTimeout(CMD_ACK,NULL, 1500);\r
 \r
        for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {\r

-               GraphBuffer[j] = ((int)data[j]) - 128;\r
+               GraphBuffer[j] = ((int)data[j]);\r

        }\r
        GraphTraceLen = LF_TRACE_BUFF_SIZE;\r
        }\r
        GraphTraceLen = LF_TRACE_BUFF_SIZE;\r

-\r
-       uint8_t bits[1000] = {0x00};\r
-       uint8_t * bitstream = bits;\r
-       \r
-       manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream);  \r
+       ManchesterDemod(Block); \r

        RepaintGraphWindow();\r
   return 0;\r
 }\r
        RepaintGraphWindow();\r
   return 0;\r
 }\r


@@ -162,48 +149,52 @@ int CmdWriteBlkPWD(const char *Cmd)
 \r
 int CmdReadTrace(const char *Cmd)\r
 {\r
 \r
 int CmdReadTrace(const char *Cmd)\r
 {\r

-       UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}};\r
-       SendCommand(&c);\r
-       WaitForResponse(CMD_ACK, NULL);\r
+       char cmdp = param_getchar(Cmd, 0);\r
+\r
+       if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {\r
+               PrintAndLog("Usage:  lf t55xx trace  [use data from Graphbuffer]");\r
+               PrintAndLog("     [use data from Graphbuffer], if not set, try reading data from tag.");\r
+               PrintAndLog("");\r
+               PrintAndLog("     sample: lf t55xx trace");\r
+               PrintAndLog("     sample: lf t55xx trace 1");\r
+               return 0;\r
+       }\r

 \r
 \r

-       uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};\r
+       if ( strlen(Cmd)==0){\r
+               UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}};\r
+               SendCommand(&c);\r
+               WaitForResponse(CMD_ACK, NULL);\r

 \r
 \r

-       GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,3560);  //3560 -- should be offset..\r
-       WaitForResponseTimeout(CMD_ACK,NULL, 1500);\r
+               uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};\r

 \r
 \r

-       for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {\r
-               GraphBuffer[j] = ((int)data[j]);\r
-               //GraphBuffer[j] = ((int)data[j]) - 128;\r
+               GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,3560);  //3560 -- should be offset..\r
+               WaitForResponseTimeout(CMD_ACK,NULL, 1500);\r
+\r
+               for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {\r
+                       GraphBuffer[j] = ((int)data[j]);\r
+               }\r
+               GraphTraceLen = LF_TRACE_BUFF_SIZE;\r

        }\r
        }\r

-       GraphTraceLen = LF_TRACE_BUFF_SIZE;\r

        \r
        \r

-       uint8_t bits[1000] = {0x00};\r
+       uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};\r

        uint8_t * bitstream = bits;\r
        \r
        uint8_t * bitstream = bits;\r
        \r

-       manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream);\r
+       manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream, LF_BITSSTREAM_LEN);\r

        RepaintGraphWindow();\r
 \r
        uint8_t si = 5;\r
        uint32_t bl0     = PackBits(si, 32, bitstream);\r
        uint32_t bl1     = PackBits(si+32, 32, bitstream);\r
        \r
        RepaintGraphWindow();\r
 \r
        uint8_t si = 5;\r
        uint32_t bl0     = PackBits(si, 32, bitstream);\r
        uint32_t bl1     = PackBits(si+32, 32, bitstream);\r
        \r

-       uint32_t acl     = PackBits(si,  8, bitstream);\r
-       si += 8;\r
-       uint32_t mfc     = PackBits(si, 8, bitstream);\r
-       si += 8;\r
-       uint32_t cid     = PackBits(si, 5, bitstream);\r
-       si += 5;\r
-       uint32_t icr     = PackBits(si, 3, bitstream);\r
-       si += 3;\r
-       uint32_t year    = PackBits(si, 4, bitstream);\r
-       si += 4;\r
-       uint32_t quarter = PackBits(si, 2, bitstream);\r
-       si += 2;\r
-       uint32_t num     = PackBits(si, 12, bitstream);\r
-       si += 12;\r
-       uint32_t wafer   = PackBits(si, 5, bitstream);\r
-       si += 5;\r
-       uint32_t dw      = PackBits(si, 15, bitstream);\r
+       uint32_t acl     = PackBits(si,  8, bitstream); si += 8;\r
+       uint32_t mfc     = PackBits(si, 8, bitstream); si += 8;\r
+       uint32_t cid     = PackBits(si, 5, bitstream); si += 5;\r
+       uint32_t icr     = PackBits(si, 3, bitstream); si += 3;\r
+       uint32_t year    = PackBits(si, 4, bitstream); si += 4;\r
+       uint32_t quarter = PackBits(si, 2, bitstream); si += 2;\r
+       uint32_t lotid    = PackBits(si, 12, bitstream); si += 12;\r
+       uint32_t wafer   = PackBits(si, 5, bitstream); si += 5;\r
+       uint32_t dw      = PackBits(si, 15, bitstream); \r

        \r
        PrintAndLog("");\r
        PrintAndLog("-- T55xx Trace Information ----------------------------------");\r
        \r
        PrintAndLog("");\r
        PrintAndLog("-- T55xx Trace Information ----------------------------------");\r


@@ -214,13 +205,13 @@ int CmdReadTrace(const char *Cmd)
        PrintAndLog(" ICR IC Revision                         : %d",icr );\r
        PrintAndLog(" Manufactured");\r
        PrintAndLog("     Year/Quarter : %d/%d",2000+year, quarter );\r
        PrintAndLog(" ICR IC Revision                         : %d",icr );\r
        PrintAndLog(" Manufactured");\r
        PrintAndLog("     Year/Quarter : %d/%d",2000+year, quarter );\r

-       PrintAndLog("     Number       : %d", num );\r
+       PrintAndLog("     Lot ID       : %d", lotid );\r

        PrintAndLog("     Wafer number : %d", wafer);\r
        PrintAndLog("     Die Number   : %d", dw);\r
        PrintAndLog("-------------------------------------------------------------");\r
        PrintAndLog("     Wafer number : %d", wafer);\r
        PrintAndLog("     Die Number   : %d", dw);\r
        PrintAndLog("-------------------------------------------------------------");\r

-       PrintAndLog(" Raw Data");\r
-       PrintAndLog("     Block 0  : %08X", bl0);\r
-       PrintAndLog("     Block 1  : %08X", bl1);\r
+       PrintAndLog(" Raw Data - Page 1");\r
+       PrintAndLog("     Block 0  : 0x%08X  %s", bl0, sprint_bin(bitstream+5,32) );\r
+       PrintAndLog("     Block 0  : 0x%08X  %s", bl1, sprint_bin(bitstream+37,32) );\r

        PrintAndLog("-------------------------------------------------------------");\r
        /*\r
        TRACE - BLOCK O\r
        PrintAndLog("-------------------------------------------------------------");\r
        /*\r
        TRACE - BLOCK O\r


@@ -231,10 +222,10 @@ int CmdReadTrace(const char *Cmd)
                22-24   ICR IC revision\r
                25-28   YEAR (BCD encoded)                                              9 (= 2009)\r
                29-30   QUARTER                                                                 1,2,3,4 \r
                22-24   ICR IC revision\r
                25-28   YEAR (BCD encoded)                                              9 (= 2009)\r
                29-30   QUARTER                                                                 1,2,3,4 \r

-               31-32   Number\r
+               31-32   LOT ID\r

        \r
        TRACE - BLOCK 1\r
        \r
        TRACE - BLOCK 1\r

-               1-12    Number\r
+               1-12    LOT ID  \r

                13-17   Wafer number\r
                18-32   DW,  die number sequential\r
        */\r
                13-17   Wafer number\r
                18-32   DW,  die number sequential\r
        */\r


@@ -248,31 +239,43 @@ int CmdInfo(const char *Cmd){
                Normal mode\r
                Extended mode\r
        */\r
                Normal mode\r
                Extended mode\r
        */\r

-       // läs block 0 -  data finns i graphbuff\r
-       CmdReadBlk("0");\r
-       \r
-       uint8_t bits[1000] = {0x00};\r
+       char cmdp = param_getchar(Cmd, 0);\r
+\r
+       if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {\r
+               PrintAndLog("Usage:  lf t55xx info  [use data from Graphbuffer]");\r
+               PrintAndLog("     [use data from Graphbuffer], if not set, try reading data from tag.");\r
+               PrintAndLog("");\r
+               PrintAndLog("    sample: lf t55xx info");\r
+               PrintAndLog("    sample: lf t55xx info 1");\r
+               return 0;\r
+       }\r
+\r
+       if ( strlen(Cmd)==0){\r
+               CmdReadBlk("0");\r
+       }       \r
+\r
+       uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};\r

        uint8_t * bitstream = bits;\r
        \r
        uint8_t * bitstream = bits;\r
        \r

-       manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream);\r
+       manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream, LF_BITSSTREAM_LEN);\r

        \r
        uint8_t si = 5;\r
        \r
        uint8_t si = 5;\r

-       uint32_t bl0     = PackBits(si, 32, bitstream);\r
+       uint32_t bl0      = PackBits(si, 32, bitstream);\r

        \r
        \r

-       uint32_t safer   = PackBits(si, 4, bitstream); si += 4; \r
-       uint32_t resv   = PackBits(si, 7, bitstream); si += 7;\r
-       uint32_t dbr   = PackBits(si, 3, bitstream); si += 3;\r
+       uint32_t safer    = PackBits(si, 4, bitstream); si += 4;        \r
+       uint32_t resv     = PackBits(si, 7, bitstream); si += 7;\r
+       uint32_t dbr      = PackBits(si, 3, bitstream); si += 3;\r

        uint32_t extend   = PackBits(si, 1, bitstream); si += 1;\r
        uint32_t datamodulation   = PackBits(si, 5, bitstream); si += 5;\r
        uint32_t extend   = PackBits(si, 1, bitstream); si += 1;\r
        uint32_t datamodulation   = PackBits(si, 5, bitstream); si += 5;\r

-       uint32_t pskcf   = PackBits(si, 2, bitstream); si += 2;\r
-       uint32_t aor   = PackBits(si, 1, bitstream); si += 1;   \r
-       uint32_t otp   = PackBits(si, 1, bitstream); si += 1;   \r
+       uint32_t pskcf    = PackBits(si, 2, bitstream); si += 2;\r
+       uint32_t aor      = PackBits(si, 1, bitstream); si += 1;        \r
+       uint32_t otp      = PackBits(si, 1, bitstream); si += 1;        \r

        uint32_t maxblk   = PackBits(si, 3, bitstream); si += 3;\r
        uint32_t maxblk   = PackBits(si, 3, bitstream); si += 3;\r

-       uint32_t pwd   = PackBits(si, 1, bitstream); si += 1;   \r
-       uint32_t sst   = PackBits(si, 1, bitstream); si += 1;   \r
-       uint32_t fw   = PackBits(si, 1, bitstream); si += 1;\r
-       uint32_t inv   = PackBits(si, 1, bitstream); si += 1;   \r
-       uint32_t por   = PackBits(si, 1, bitstream); si += 1;\r
+       uint32_t pwd      = PackBits(si, 1, bitstream); si += 1;        \r
+       uint32_t sst      = PackBits(si, 1, bitstream); si += 1;        \r
+       uint32_t fw       = PackBits(si, 1, bitstream); si += 1;\r
+       uint32_t inv      = PackBits(si, 1, bitstream); si += 1;        \r
+       uint32_t por      = PackBits(si, 1, bitstream); si += 1;\r

                \r
        PrintAndLog("");\r
        PrintAndLog("-- T55xx Configuration --------------------------------------");\r
                \r
        PrintAndLog("");\r
        PrintAndLog("-- T55xx Configuration --------------------------------------");\r


@@ -292,13 +295,79 @@ int CmdInfo(const char *Cmd){
        PrintAndLog(" Inverse data              : %s", (inv) ? "Yes":"No");\r
        PrintAndLog(" POR-Delay                 : %s", (por) ? "Yes":"No");\r
        PrintAndLog("-------------------------------------------------------------");\r
        PrintAndLog(" Inverse data              : %s", (inv) ? "Yes":"No");\r
        PrintAndLog(" POR-Delay                 : %s", (por) ? "Yes":"No");\r
        PrintAndLog("-------------------------------------------------------------");\r

-       PrintAndLog(" Raw Data");\r
-       PrintAndLog("     Block 0  : 0x%08X", bl0);\r
+       PrintAndLog(" Raw Data - Page 0");\r
+       PrintAndLog("     Block 0  : 0x%08X  %s", bl0, sprint_bin(bitstream+5,32) );\r

        PrintAndLog("-------------------------------------------------------------");\r
        \r
        return 0;\r
 }\r
 \r
        PrintAndLog("-------------------------------------------------------------");\r
        \r
        return 0;\r
 }\r
 \r

+int CmdDump(const char *Cmd){\r
+\r
+       char cmdp = param_getchar(Cmd, 0);\r
+       char s[20];\r
+       uint8_t pwd[4] = {0x00};\r
+       bool hasPwd = ( strlen(Cmd) > 0);\r
+       \r
+       if ( cmdp == 'h' || cmdp == 'H') {\r
+               PrintAndLog("Usage:  lf t55xx dump <password>");\r
+               PrintAndLog("        sample: lf t55xx dump FFFFFFFF");\r
+               return 0;\r
+       }\r
+       \r
+       if ( hasPwd ){\r
+               if (param_gethex(Cmd, 0, pwd, 8)) {\r
+                       PrintAndLog("password must include 8 HEX symbols");\r
+                       return 0;\r
+               }\r
+       }\r
+\r
+       for ( int i = 0; i <8; ++i){\r
+               memset(s,0,sizeof(s));\r
+               if ( hasPwd ) {\r
+                       sprintf(s,"%d %02x%02x%02x%02x", i, pwd[0],pwd[1],pwd[2],pwd[3]);\r
+                       CmdReadBlkPWD(s);\r
+               } else {\r
+                       sprintf(s,"%d", i);\r
+                       CmdReadBlk(s);\r
+               }\r
+       }\r
+       return 0;\r
+}\r
+\r
+int CmdIceFsk(const char *Cmd){\r
+\r
+       if (!HasGraphData()) return 0;\r
+\r
+       iceFsk3(GraphBuffer, LF_TRACE_BUFF_SIZE);\r
+       RepaintGraphWindow();\r
+       return 0;\r
+}\r
+int CmdIceManchester(const char *Cmd){\r
+       ManchesterDemod( -1);\r
+       return 0;\r
+}\r
+int ManchesterDemod(int blockNum){\r
+\r
+       if (!HasGraphData()) return 0;\r
+               \r
+       uint8_t sizebyte = 32;\r
+       uint8_t offset = 5;\r
+       uint32_t blockData;\r
+       uint8_t  bits[LF_BITSSTREAM_LEN] = {0x00};\r
+       uint8_t * bitstream = bits;\r
+       \r
+       manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream, LF_BITSSTREAM_LEN);       \r
+    blockData = PackBits(offset, sizebyte, bitstream);\r
+\r
+       if ( blockNum < 0)\r
+               PrintAndLog(" Decoded     : 0x%08X  %s", blockData, sprint_bin(bitstream+offset,sizebyte) );\r
+               else\r
+               PrintAndLog(" Block %d    : 0x%08X  %s", blockNum, blockData, sprint_bin(bitstream+offset,sizebyte) );\r
+       \r
+       return 0;\r
+} \r
+\r

 char * GetBitRateStr(uint32_t id){\r
        static char buf[40];\r
        char *retStr = buf;\r
 char * GetBitRateStr(uint32_t id){\r
        static char buf[40];\r
        char *retStr = buf;\r


@@ -335,7 +404,6 @@ char * GetBitRateStr(uint32_t id){
        return buf;\r
 }\r
 \r
        return buf;\r
 }\r
 \r

-\r

 char * GetSaferStr(uint32_t id){\r
        static char buf[40];\r
        char *retStr = buf;\r
 char * GetSaferStr(uint32_t id){\r
        static char buf[40];\r
        char *retStr = buf;\r


@@ -356,7 +424,7 @@ char * GetModulationStr( uint32_t id){
        \r
        switch (id){\r
                case 0: \r
        \r
        switch (id){\r
                case 0: \r

-                       sprintf(retStr,"%d - direct",id);\r
+                       sprintf(retStr,"%d - DIRECT (ASK/NRZ)",id);\r

                        break;\r
                case 1:\r
                        sprintf(retStr,"%d - PSK 1 phase change when input changes",id);\r
                        break;\r
                case 1:\r
                        sprintf(retStr,"%d - PSK 1 phase change when input changes",id);\r


@@ -410,12 +478,15 @@ uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){
 static command_t CommandTable[] =\r
 {\r
   {"help",   CmdHelp,        1, "This help"},\r
 static command_t CommandTable[] =\r
 {\r
   {"help",   CmdHelp,        1, "This help"},\r

-  {"rd",     CmdReadBlk,     0, "<Block> -- Read T55xx block data (page 0)"},\r
-  {"rdPWD",  CmdReadBlkPWD,  0, "<Block> <Password> -- Read T55xx block data in password mode(page 0)"},\r
-  {"wr",     CmdWriteBlk,    0, "<Data> <Block> -- Write T55xx block data (page 0)"},\r
-  {"wrPWD",  CmdWriteBlkPWD, 0, "<Data> <Block> <Password> -- Write T55xx block data in password mode(page 0)"},\r
-  {"trace",  CmdReadTrace,   0, "Read T55xx traceability data (page 1)"},\r
-  {"info",   CmdInfo,        0, "Read T55xx configuration data (page 0 / block 0"},\r
+  {"rd",     CmdReadBlk,     0, "<block> -- Read T55xx block data (page 0)"},\r
+  {"rdpwd",  CmdReadBlkPWD,  0, "<block> <password> -- Read T55xx block data with password mode"},\r
+  {"wr",     CmdWriteBlk,    0, "<data> <block> -- Write T55xx block data (page 0)"},\r
+  {"wrpwd",  CmdWriteBlkPWD, 0, "<data> <block> <password> -- Write T55xx block data with password"},\r
+  {"trace",  CmdReadTrace,   0, "[1] Read T55xx traceability data (page 1/ blk 0-1)"},\r
+  {"info",   CmdInfo,        0, "[1] Read T55xx configuration data (page 0/ blk 0)"},\r
+  {"dump",   CmdDump,        0, "[password] Dump T55xx card block 0-7. optional with password"},\r
+  {"fsk",    CmdIceFsk,      0, "FSK demod"},\r
+  {"man",    CmdIceManchester,      0, "Manchester demod (with SST)"},\r

   {NULL, NULL, 0, NULL}\r
 };\r
 \r
   {NULL, NULL, 0, NULL}\r
 };\r
 \r