FIXED: Merged all Holimans code-review issues which should fix a lot of memoryleaks.

[proxmark3-svn] / client / cmdlft55xx.c

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 31261a4f112f8aef120da47e50afa5b06a1f7fa3..513eb0ef668683334191f388243951ba5567cfc3 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -23,15 +23,16 @@
 \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
-       int Block = -1;\r
-       sscanf(Cmd, "%d", &Block);\r
+       int block = -1;\r
+       sscanf(Cmd, "%d", &block);\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
@@ -40,7 +41,7 @@ int CmdReadBlk(const char *Cmd)
        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
@@ -55,7 +56,7 @@ int CmdReadBlk(const char *Cmd)
        // }\r
        // GraphTraceLen = LF_TRACE_BUFF_SIZE;\r
        CmdSamples("12000");\r
-       ManchesterDemod(Block);\r
+       ManchesterDemod(block);\r
        // RepaintGraphWindow();\r
   return 0;\r
 }\r
@@ -175,10 +176,10 @@ int CmdReadTrace(const char *Cmd)
                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
-       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
@@ -253,10 +254,10 @@ int CmdInfo(const char *Cmd){
                CmdReadBlk("0");\r
        }       \r
 \r
-       uint8_t bits[1000] = {0x00};\r
+       uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};\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
@@ -315,8 +316,8 @@ int CmdDump(const char *Cmd){
        }\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
@@ -324,7 +325,7 @@ int CmdDump(const char *Cmd){
        for ( int i = 0; i <8; ++i){\r
                memset(s,0,sizeof(s));\r
                if ( hasPwd ) {\r
-                       sprintf(s,"%d %s", i, sprint_hex(pwd,4));\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
@@ -335,6 +336,9 @@ int CmdDump(const char *Cmd){
 }\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
@@ -343,16 +347,17 @@ int CmdIceManchester(const char *Cmd){
        ManchesterDemod( -1);\r
        return 0;\r
 }\r
-int ManchesterDemod(int block){\r
+int ManchesterDemod(int blockNum){\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
-       uint8_t  bits[1000] = {0x00};\r
+       uint8_t  bits[LF_BITSSTREAM_LEN] = {0x00};\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
     blockData = PackBits(offset, sizebyte, bitstream);\r
 \r
        if ( blockNum < 0)\r
@@ -477,8 +482,8 @@ static command_t CommandTable[] =
   {"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 (page0 /blk 0)"},\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