FIX: correct some lookups in tnp3dump.lua, tnp3sim.lua

[proxmark3-svn] / client / cmdlft55xx.c

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 78d90e7cda17ee9f80f25daa030ce0e8bff91d29..4a1bdaa07ce6fbfb0c4d8e82733dbbaab70ff58a 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -20,180 +20,289 @@
 #include "cmdlft55xx.h"\r
 #include "util.h"\r
 #include "data.h"\r
 #include "cmdlft55xx.h"\r
 #include "util.h"\r
 #include "data.h"\r

+#include "lfdemod.h"\r

 \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_TRACE_BUFF_SIZE 20000 // 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
 #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 usage_t55xx_read(){\r
+       PrintAndLog("Usage:  lf t55xx read <block> <password>");\r
+    PrintAndLog("     <block>, block number to read. Between 0-7");\r
+    PrintAndLog("     <password>, OPTIONAL password (8 hex characters)");\r
+    PrintAndLog("");\r
+    PrintAndLog("    sample: lf t55xx read 0           = try reading data from block 0");\r
+       PrintAndLog("          : lf t55xx read 0 feedbeef  = try reading data from block 0 using password");\r
+       PrintAndLog("");\r
+       return 0;\r
+}\r
+int usage_t55xx_write(){\r
+       PrintAndLog("Usage:  lf t55xx wr <block> <data> [password]");\r
+    PrintAndLog("     <block>, block number to read. Between 0-7");\r
+       PrintAndLog("     <data>,  4 bytes of data to write (8 hex characters)");\r
+    PrintAndLog("     [password], OPTIONAL password 4bytes (8 hex characters)");\r
+    PrintAndLog("");\r
+    PrintAndLog("    sample: lf t55xx wd 3 11223344  = try writing data 11223344 to block 3");\r
+       PrintAndLog("          : lf t55xx wd 3 11223344 feedbeef  = try writing data 11223344 to block 3 using password feedbeef");\r
+       PrintAndLog("");\r
+       return 0;\r
+}\r
+int usage_t55xx_trace() {\r
+       PrintAndLog("Usage:  lf t55xx trace  [graph buffer data]");\r
+       PrintAndLog("     [graph buffer data], if set, use Graphbuffer otherwise read data from tag.");\r
+       PrintAndLog("");\r
+       PrintAndLog("     sample: lf t55xx trace");\r
+       PrintAndLog("           : lf t55xx trace 1");\r
+       PrintAndLog("");\r
+       return 0;\r
+}\r
+int usage_t55xx_info() {\r
+       PrintAndLog("Usage:  lf t55xx info [graph buffer data]");\r
+       PrintAndLog("     [graph buffer data], if set, use Graphbuffer otherwise read data from tag.");\r
+       PrintAndLog("");\r
+       PrintAndLog("    sample: lf t55xx info");\r
+       PrintAndLog("          : lf t55xx info 1");\r
+       PrintAndLog("");\r
+       return 0;\r
+}\r
+int usage_t55xx_dump(){\r
+       PrintAndLog("Usage:  lf t55xx dump <password>");\r
+    PrintAndLog("     <password>, OPTIONAL password 4bytes (8 hex characters)");\r
+       PrintAndLog("");\r
+       PrintAndLog("        sample: lf t55xx dump");\r
+       PrintAndLog("              : lf t55xx dump feedbeef");\r
+       PrintAndLog("");\r
+       return 0;\r
+}\r
+\r
+static int CmdHelp(const char *Cmd);\r

 \r
 int CmdReadBlk(const char *Cmd)\r
 {\r
 \r
 int CmdReadBlk(const char *Cmd)\r
 {\r

+       int i = 0;\r

        int block = -1;\r
        int block = -1;\r

-       sscanf(Cmd, "%d", &block);\r
+       int password = 0xFFFFFFFF; //default to blank Block 7\r
+       size_t bitlen = 0;\r
+       uint32_t blockData = 0;\r
+       uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
+       \r
+       char cmdp = param_getchar(Cmd, 0);\r
+       if (cmdp == 'h' || cmdp == 'H') {\r
+               usage_t55xx_read();\r
+               return 0;\r
+       }\r

 \r
 \r

-       if ((block > 7) | (block < 0)) {\r
+       int res = sscanf(Cmd, "%d %x", &block, &password);\r
+\r
+       if ( res < 1 || res > 2 ){\r
+               usage_t55xx_read();\r
+               return 1;\r
+       }\r
+       \r
+       if ((block < 0) | (block > 7)) {\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

-       UsbCommand c;\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[2] = 0;\r
+       UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, block, 0}};\r
+       c.d.asBytes[0] = 0x0; \r
+\r
+       //Password mode\r
+       if ( res == 2 ) {\r
+               c.arg[2] = password;\r
+               c.d.asBytes[0] = 0x1; \r
+       }\r
+\r

        SendCommand(&c);\r
        SendCommand(&c);\r

-       WaitForResponse(CMD_ACK, NULL);\r
+       if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
+               PrintAndLog("command execution time out");\r
+               return 2;\r
+       }\r
+       \r
+       uint8_t got[12000];\r
+       GetFromBigBuf(got,sizeof(got),0);\r
+       WaitForResponse(CMD_ACK,NULL);\r
+\r
+       setGraphBuf(got, 12000);\r
+       \r
+       bitlen = getFromGraphBuf(bits);\r
+\r
+       int ans = 0;\r
+       ans = CmdFSKrawdemod("");\r
+       ans = CmdFSKrawdemod("1"); //invert?\r
+       ans = Cmdaskmandemod("");\r
+       ans = Cmdaskrawdemod("");\r
+       ans = CmdNRZrawDemod("");\r
+       ans = CmdPSK1rawDemod("");\r
+       ans = CmdPSK2rawDemod("");\r
+       \r
+       // if ( !tryDemod(bits, bitlen) )\r
+               // return 3;\r

        \r
        \r

-       uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};\r
+       // //move bits back to DemodBuffer\r
+       // setDemodBuf(bits, bitlen, 0);\r
+       // printBitStream(bits, bitlen);\r
+       if ( !DemodBufferLen) \r
+               return 0;\r
+       \r
+    for (;i<DemodBufferLen;++i)\r
+               bits[i]=DemodBuffer[i];\r

        \r
        \r

-       GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,3560);  //3560 -- should be offset..\r
-       WaitForResponseTimeout(CMD_ACK,NULL, 1500);\r
+       blockData = PackBits(1, 32, bits);\r

 \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
-       ManchesterDemod(block);\r
-       RepaintGraphWindow();\r
-  return 0;\r
+       if ( block < 0)\r
+               PrintAndLog(" Decoded     : 0x%08X  %s", blockData, sprint_bin(bits+1,32) );\r
+       else\r
+               PrintAndLog(" Block %d    : 0x%08X  %s", block, blockData, sprint_bin(bits+1,32) );\r
+       \r
+       return 0;\r

 }\r
 \r
 }\r
 \r

-int CmdReadBlkPWD(const char *Cmd)\r
-{\r
-       int Block = -1; //default to invalid block\r
-       int Password = 0xFFFFFFFF; //default to blank Block 7\r
-       UsbCommand c;\r

 \r
 \r

-       sscanf(Cmd, "%d %x", &Block, &Password);\r
+/*\r
+FSK1 / FSK1a\r
+size = fskdemod(dest, size, 32, 0, 8, 10);  // fsk1 RF/32 \r
+size = fskdemod(dest, size, 32, 1, 8, 10);  // fsk1a RF/32 \r

 \r
 \r

-       if ((Block > 7) | (Block < 0)) {\r
-               PrintAndLog("Block must be between 0 and 7");\r
-               return 1;\r
-       }       \r
-\r
-       PrintAndLog("Reading page 0 block %d pwd %08X", Block, Password);\r
+FSK2 / FSK2a\r
+size = fskdemod(dest, size, 32, 0, 10, 8);  // fsk2 RF/32 \r
+size = fskdemod(dest, size, 32, 1, 10, 8);  // fsk2a RF/32 \r
+size = fskdemod(dest, size, 50, 1, 10, 8);  // fsk2a RF/50 \r
+size = fskdemod(dest, size, 64, 1, 10, 8);  // FSK2a RF/64 \r

 \r
 \r

-       c.cmd = CMD_T55XX_READ_BLOCK;\r
-       c.d.asBytes[0] = 0x1; //Password mode\r
-       c.arg[0] = 0;\r
-       c.arg[1] = Block;\r
-       c.arg[2] = Password;\r
-       SendCommand(&c);\r
-       WaitForResponse(CMD_ACK, NULL);\r
-               \r
-       uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};\r
+PSK1\r
+errCnt = pskRawDemod(bits, &bitlen, 32, 0);\r
+*/\r
+bool tryDemod(uint8_t bits[], size_t bitlen) {\r
+       \r
+       int invert = 0;\r
+       int clk = 0;\r
+       int errCnt, size;\r
+       int maxErr = 100;\r
+       uint8_t rflen, fchigh, fclow, dummy = 0;\r
+       uint16_t fcs=0;\r
+\r
+       // ASK - manchester demod\r
+       errCnt = askmandemod(bits, &bitlen, &clk, &invert, maxErr);\r
+       if ( analyseDemod(errCnt, bitlen, clk, invert) ) \r
+               return true;\r
+\r
+       // FSK demod\r
+       fcs = countFC(bits, bitlen, &dummy);\r
+       if (fcs == 0){\r
+         fchigh = 10;\r
+         fclow = 8;\r
+       }else{\r
+         fchigh = (fcs >> 8) & 0xFF;\r
+         fclow = fcs & 0xFF;\r
+       }\r
+       //get bit clock length\r
+       rflen = detectFSKClk(bits, bitlen, fchigh, fclow);\r
+       rflen = (rflen == 0) ? 50 : rflen;\r

 \r
 \r

-       GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,3560);  //3560 -- should be offset..\r
-       WaitForResponseTimeout(CMD_ACK,NULL, 1500);\r
+       size = fskdemod(bits, bitlen, rflen, invert, fchigh, fclow);\r
+       if ( analyseDemod(size, bitlen, clk, invert) ) \r
+               return true;    \r
+       \r
+       // PSK demod\r
+       return false;\r
+}\r

 \r
 \r

-       for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {\r
-               GraphBuffer[j] = ((int)data[j]);\r
+bool analyseDemod( int errCnt, size_t bitlen, uint8_t clock, uint8_t invert){\r
+       if (g_debugMode) \r
+               PrintAndLog("ErrorCount: %d, Bits Found: %d, Clock: %d, invert: %d", errCnt, bitlen, clock, invert);\r
+         //PrintAndLog("Args invert: %d - Clock:%d - fchigh:%d - fclow: %d",invert,rfLen,fchigh, fclow);\r
+         \r
+       //throw away static - allow 1 and -1 (in case of threshold command first)\r
+       if ( errCnt == -1 || bitlen < 32 ){  \r
+               PrintAndLog("no success demod");\r
+               return false;\r

        }\r
        }\r

-       GraphTraceLen = LF_TRACE_BUFF_SIZE;\r
-       ManchesterDemod(Block); \r
-       RepaintGraphWindow();\r
-  return 0;\r
+       return true;\r

 }\r
 \r
 int CmdWriteBlk(const char *Cmd)\r
 {\r
 }\r
 \r
 int CmdWriteBlk(const char *Cmd)\r
 {\r

-  int Block = 8; //default to invalid block\r
-  int Data = 0xFFFFFFFF; //default to blank Block \r
-  UsbCommand c;\r
-\r
-  sscanf(Cmd, "%x %d", &Data, &Block);\r
-\r
-  if (Block > 7) {\r
-       PrintAndLog("Block must be between 0 and 7");\r
-       return 1;\r
-  }    \r
-\r
-  PrintAndLog("Writting block %d with data %08X", Block, Data);\r
-\r
-  c.cmd = CMD_T55XX_WRITE_BLOCK;\r
-  c.d.asBytes[0] = 0x0; //Normal mode\r
-  c.arg[0] = Data;\r
-  c.arg[1] = Block;\r
-  c.arg[2] = 0;\r
-  SendCommand(&c);\r
-  return 0;\r
-}\r
+       int block = 8; //default to invalid block\r
+       int data = 0xFFFFFFFF; //default to blank Block \r
+       int password = 0xFFFFFFFF; //default to blank Block 7\r
+       \r
+       char cmdp = param_getchar(Cmd, 0);\r
+       if (cmdp == 'h' || cmdp == 'H') {\r
+               usage_t55xx_write();\r
+               return 0;\r
+       }\r
+  \r
+       int res = sscanf(Cmd, "%d %x %x",&block, &data, &password);\r
+       \r
+       if ( res < 2 || res > 3) {\r
+               usage_t55xx_write();\r
+               return 1;\r
+       }\r

 \r
 \r

-int CmdWriteBlkPWD(const char *Cmd)\r
-{\r
-  int Block = 8; //default to invalid block\r
-  int Data = 0xFFFFFFFF; //default to blank Block \r
-  int Password = 0xFFFFFFFF; //default to blank Block 7\r
-  UsbCommand c;\r
-\r
-  sscanf(Cmd, "%x %d %x", &Data, &Block, &Password);\r
-\r
-  if (Block > 7) {\r
-       PrintAndLog("Block must be between 0 and 7");\r
-       return 1;\r
-  }    \r
-\r
-  PrintAndLog("Writting block %d with data %08X and password %08X", Block, Data, Password);\r
-\r
-  c.cmd = CMD_T55XX_WRITE_BLOCK;\r
-  c.d.asBytes[0] = 0x1; //Password mode\r
-  c.arg[0] = Data;\r
-  c.arg[1] = Block;\r
-  c.arg[2] = Password;\r
-  SendCommand(&c);\r
-  return 0;\r
+       if (block > 7) {\r
+               PrintAndLog("Block must be between 0 and 7");\r
+               return 1;\r
+       }\r
+       \r
+       UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};\r
+       c.d.asBytes[0] = 0x0; \r
+\r
+       PrintAndLog("Writing to T55x7");\r
+       PrintAndLog("block : %d", block);\r
+       PrintAndLog("data  : 0x%08X", data);\r
+\r
+       //Password mode\r
+       if (res == 3) {\r
+               c.arg[2] = password;\r
+               c.d.asBytes[0] = 0x1; \r
+               PrintAndLog("pwd   : 0x%08X", password);\r
+       }\r
+       SendCommand(&c);\r
+       return 0;\r

 }\r
 \r
 int CmdReadTrace(const char *Cmd)\r
 {\r
 }\r
 \r
 int CmdReadTrace(const char *Cmd)\r
 {\r

-       char cmdp = param_getchar(Cmd, 0);\r
+       size_t bitlen;\r
+       uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r

 \r
 \r

+       char cmdp = param_getchar(Cmd, 0);\r
+       \r

        if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {\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
+               usage_t55xx_trace();\r

                return 0;\r
        }\r
 \r
        if ( strlen(Cmd)==0){\r
                return 0;\r
        }\r
 \r
        if ( strlen(Cmd)==0){\r

+       \r

                UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}};\r
                SendCommand(&c);\r
                UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 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
+               if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
+                       PrintAndLog("command execution time out");\r
+                       return 1;\r

                }\r
                }\r

-               GraphTraceLen = LF_TRACE_BUFF_SIZE;\r
+               //darn\r
+               //CmdSamples("12000");\r

        }\r
        \r
        }\r
        \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
+       bitlen = getFromGraphBuf(bits);\r
+\r
+\r

        RepaintGraphWindow();\r
 \r
        uint8_t si = 5;\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
+       uint32_t bl0     = PackBits(si, 32, bits);\r
+       uint32_t bl1     = PackBits(si+32, 32, bits);\r

        \r
        \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
+       uint32_t acl     = PackBits(si,  8, bits); si += 8;\r
+       uint32_t mfc     = PackBits(si, 8, bits); si += 8;\r
+       uint32_t cid     = PackBits(si, 5, bits); si += 5;\r
+       uint32_t icr     = PackBits(si, 3, bits); si += 3;\r
+       uint32_t year    = PackBits(si, 4, bits); si += 4;\r
+       uint32_t quarter = PackBits(si, 2, bits); si += 2;\r
+       uint32_t lotid    = PackBits(si, 12, bits); si += 12;\r
+       uint32_t wafer   = PackBits(si, 5, bits); si += 5;\r
+       uint32_t dw      = PackBits(si, 15, bits); \r

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


@@ -209,8 +318,8 @@ int CmdReadTrace(const char *Cmd)
        PrintAndLog("     Die Number   : %d", dw);\r
        PrintAndLog("-------------------------------------------------------------");\r
        PrintAndLog(" Raw Data - Page 1");\r
        PrintAndLog("     Die Number   : %d", dw);\r
        PrintAndLog("-------------------------------------------------------------");\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("     Block 0  : 0x%08X  %s", bl0, sprint_bin(bits+5,32) );\r
+       PrintAndLog("     Block 0  : 0x%08X  %s", bl1, sprint_bin(bits+37,32) );\r

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


@@ -241,43 +350,36 @@ int CmdInfo(const char *Cmd){
        char cmdp = param_getchar(Cmd, 0);\r
 \r
        if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {\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
+               usage_t55xx_info();\r

                return 0;\r
                return 0;\r

-       }\r
-\r
-       if ( strlen(Cmd)==0){\r
+       } else {\r

                CmdReadBlk("0");\r
        }       \r
 \r
        uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};\r
                CmdReadBlk("0");\r
        }       \r
 \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
+\r
+       manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bits, 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, bits);\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 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 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 safer    = PackBits(si, 4, bits); si += 4;     \r
+       uint32_t resv     = PackBits(si, 7, bits); si += 7;\r
+       uint32_t dbr      = PackBits(si, 3, bits); si += 3;\r
+       uint32_t extend   = PackBits(si, 1, bits); si += 1;\r
+       uint32_t datamodulation   = PackBits(si, 5, bits); si += 5;\r
+       uint32_t pskcf    = PackBits(si, 2, bits); si += 2;\r
+       uint32_t aor      = PackBits(si, 1, bits); si += 1;     \r
+       uint32_t otp      = PackBits(si, 1, bits); si += 1;     \r
+       uint32_t maxblk   = PackBits(si, 3, bits); si += 3;\r
+       uint32_t pwd      = PackBits(si, 1, bits); si += 1;     \r
+       uint32_t sst      = PackBits(si, 1, bits); si += 1;     \r
+       uint32_t fw       = PackBits(si, 1, bits); si += 1;\r
+       uint32_t inv      = PackBits(si, 1, bits); si += 1;     \r
+       uint32_t por      = PackBits(si, 1, bits); si += 1;\r

                \r
        PrintAndLog("");\r
                \r
        PrintAndLog("");\r

-       PrintAndLog("-- T55xx Configuration --------------------------------------");\r
+       PrintAndLog("-- T55xx Configuration & Tag Information --------------------");\r

        PrintAndLog("-------------------------------------------------------------");\r
        PrintAndLog(" Safer key                 : %s", GetSaferStr(safer));\r
        PrintAndLog(" reserved                  : %d", resv);\r
        PrintAndLog("-------------------------------------------------------------");\r
        PrintAndLog(" Safer key                 : %s", GetSaferStr(safer));\r
        PrintAndLog(" reserved                  : %d", resv);\r


@@ -295,7 +397,7 @@ int CmdInfo(const char *Cmd){
        PrintAndLog(" POR-Delay                 : %s", (por) ? "Yes":"No");\r
        PrintAndLog("-------------------------------------------------------------");\r
        PrintAndLog(" Raw Data - Page 0");\r
        PrintAndLog(" POR-Delay                 : %s", (por) ? "Yes":"No");\r
        PrintAndLog("-------------------------------------------------------------");\r
        PrintAndLog(" Raw Data - Page 0");\r

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

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


@@ -303,21 +405,20 @@ int CmdInfo(const char *Cmd){
 \r
 int CmdDump(const char *Cmd){\r
 \r
 \r
 int CmdDump(const char *Cmd){\r
 \r

-       char cmdp = param_getchar(Cmd, 0);\r
-       char s[20];\r
+       char s[20] = {0x00};\r

        uint8_t pwd[4] = {0x00};\r
        uint8_t pwd[4] = {0x00};\r

-       bool hasPwd = ( strlen(Cmd) > 0);\r
-       \r
+\r
+       char cmdp = param_getchar(Cmd, 0);\r

        if ( cmdp == 'h' || cmdp == 'H') {\r
        if ( cmdp == 'h' || cmdp == 'H') {\r

-               PrintAndLog("Usage:  lf t55xx dump <password>");\r
-               PrintAndLog("        sample: lf t55xx dump FFFFFFFF");\r
+               usage_t55xx_dump();\r

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

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

        if ( hasPwd ){\r
                if (param_gethex(Cmd, 0, pwd, 8)) {\r
                        PrintAndLog("password must include 8 HEX symbols");\r
        if ( hasPwd ){\r
                if (param_gethex(Cmd, 0, pwd, 8)) {\r
                        PrintAndLog("password must include 8 HEX symbols");\r

-                       return 0;\r
+                       return 1;\r

                }\r
        }\r
        \r
                }\r
        }\r
        \r


@@ -325,11 +426,10 @@ int CmdDump(const char *Cmd){
                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
                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
                } else {\r
                        sprintf(s,"%d", i);\r

-                       CmdReadBlk(s);\r

                }\r
                }\r

+               CmdReadBlk(s);\r

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


@@ -357,8 +457,8 @@ int ManchesterDemod(int blockNum){
        uint8_t  bits[LF_BITSSTREAM_LEN] = {0x00};\r
        uint8_t * bitstream = bits;\r
        \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
+       manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bits, LF_BITSSTREAM_LEN);    \r
+       blockData = PackBits(offset, sizebyte, bits);\r

 \r
        if ( blockNum < 0)\r
                PrintAndLog(" Decoded     : 0x%08X  %s", blockData, sprint_bin(bitstream+offset,sizebyte) );\r
 \r
        if ( blockNum < 0)\r
                PrintAndLog(" Decoded     : 0x%08X  %s", blockData, sprint_bin(bitstream+offset,sizebyte) );\r


@@ -468,6 +568,9 @@ uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){
        \r
        int i = start;\r
        int j = len-1;\r
        \r
        int i = start;\r
        int j = len-1;\r

+       if (len > 32) {\r
+               return 0;\r
+       }\r

        uint32_t tmp = 0;\r
        for (; j >= 0; --j, ++i){\r
                tmp     |= bits[i] << j;\r
        uint32_t tmp = 0;\r
        for (; j >= 0; --j, ++i){\r
                tmp     |= bits[i] << j;\r


@@ -478,15 +581,11 @@ 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 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
+  {"read",   CmdReadBlk,     0, "<block> [password] -- Read T55xx block data (page 0) [optional password]"},\r
+  {"write",  CmdWriteBlk,    0, "<block> <data> [password] -- Write T55xx block data (page 0) [optional 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
   {"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
+  {"dump",   CmdDump,        0, "[password] Dump T55xx card block 0-7. [optional password]"},\r

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