ADD: added identification for Mifare TNP3xxx tags.

[proxmark3-svn] / client / cmdlft55xx.c

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 9206fd2ad946e635ef70d82efee8ef83a0b1d902..513eb0ef668683334191f388243951ba5567cfc3 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -23,45 +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
+//     uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};\r

        \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
-       CmdIceManchester(Cmd);\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


@@ -94,12 +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
-       CmdIceManchester(Cmd);\r
-       \r
+       ManchesterDemod(Block); \r

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


@@ -161,8 +155,8 @@ int CmdReadTrace(const char *Cmd)
                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("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
+               PrintAndLog("     sample: lf t55xx trace");\r
+               PrintAndLog("     sample: lf t55xx trace 1");\r

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


@@ -182,10 +176,10 @@ int CmdReadTrace(const char *Cmd)
                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
        RepaintGraphWindow();\r
 \r
        uint8_t si = 5;\r


@@ -251,20 +245,19 @@ int CmdInfo(const char *Cmd){
                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("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
+               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
                return 0;\r
        }\r
 \r
        if ( strlen(Cmd)==0){\r
                CmdReadBlk("0");\r

-       }\r
-       \r
+       }       \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

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


@@ -314,26 +307,25 @@ int CmdDump(const char *Cmd){
        char cmdp = param_getchar(Cmd, 0);\r
        char s[20];\r
        uint8_t pwd[4] = {0x00};\r
        char cmdp = param_getchar(Cmd, 0);\r
        char s[20];\r
        uint8_t pwd[4] = {0x00};\r

-               \r
-       if (strlen(Cmd)>1 || cmdp == 'h' || cmdp == 'H') {\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
                PrintAndLog("Usage:  lf t55xx dump <password>");\r
                PrintAndLog("        sample: lf t55xx dump FFFFFFFF");\r
                return 0;\r
        }\r

-\r
-       bool hasPwd = ( strlen(Cmd) > 0);\r

        \r
        if ( hasPwd ){\r
        \r
        if ( hasPwd ){\r

-               if (param_gethex(Cmd, 0, pwd, 4)) {\r
-                       PrintAndLog("password must include 4 HEX symbols");\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
                        return 0;\r
                }\r
        }\r
 \r
        for ( int i = 0; i <8; ++i){\r

-               *s = 0;\r
+               memset(s,0,sizeof(s));\r

                if ( hasPwd ) {\r
                if ( hasPwd ) {\r

-                       sprintf(s,"%d %d", i, pwd);\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
                        CmdReadBlkPWD(s);\r
                } else {\r
                        sprintf(s,"%d", i);\r


@@ -344,25 +336,35 @@ int CmdDump(const char *Cmd){
 }\r
 \r
 int CmdIceFsk(const char *Cmd){\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
        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
 \r

-       int  blockNum = -1;\r
+       if (!HasGraphData()) return 0;\r
+               \r
+       uint8_t sizebyte = 32;\r
+       uint8_t offset = 5;\r

        uint32_t blockData;\r
        uint32_t blockData;\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
-    blockData = PackBits(5, 32, bitstream);\r
-       sscanf(Cmd, "%d", &blockNum);\r
-       if ( blockNum > -1){\r
-               PrintAndLog("   Block %d  : 0x%08X  %s", blockNum, blockData, sprint_bin(bitstream+5,32) );\r
-       }else{\r
-               PrintAndLog("   Decoded : 0x%08X  %s", blockData, sprint_bin(bitstream+5,32) );\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
        return 0;\r
 } \r
 \r


@@ -477,14 +479,14 @@ static command_t CommandTable[] =
 {\r
   {"help",   CmdHelp,        1, "This help"},\r
   {"rd",     CmdReadBlk,     0, "<block> -- Read T55xx block data (page 0)"},\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 with password mode"},\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
   {"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 (page0 /blk 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
   {"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"},\r
+  {"man",    CmdIceManchester,      0, "Manchester demod (with SST)"},\r

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