BUG: fixed a bug with the initialization of IV in cmdhfmfu.c CmdHF14AMfucAuth

[proxmark3-svn] / client / cmdlft55xx.c

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 63cc2ee4e6624794d541474b25b85e0b75b621a3..31261a4f112f8aef120da47e50afa5b06a1f7fa3 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -29,7 +29,6 @@ static int CmdHelp(const char *Cmd);
 int CmdReadBlk(const char *Cmd)\r
 {\r
        int Block = -1;\r
-\r
        sscanf(Cmd, "%d", &Block);\r
 \r
        if ((Block > 7) | (Block < 0)) {\r
@@ -37,7 +36,6 @@ int CmdReadBlk(const char *Cmd)
                return 1;\r
        }       \r
 \r
-       // this command fills up BigBuff\r
        UsbCommand c;\r
        c.cmd = CMD_T55XX_READ_BLOCK;\r
        c.d.asBytes[0] = 0x00;\r
@@ -47,17 +45,18 @@ int CmdReadBlk(const char *Cmd)
        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
-       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
+       // 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
+       // RepaintGraphWindow();\r
   return 0;\r
 }\r
 \r
@@ -90,7 +89,7 @@ int CmdReadBlkPWD(const char *Cmd)
        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
        ManchesterDemod(Block); \r
@@ -155,8 +154,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("        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
@@ -245,15 +244,14 @@ 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("        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
-       }\r
-       \r
+       }       \r
 \r
        uint8_t bits[1000] = {0x00};\r
        uint8_t * bitstream = bits;\r
@@ -308,14 +306,13 @@ int CmdDump(const char *Cmd){
        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
-\r
-       bool hasPwd = ( strlen(Cmd) > 0);\r
        \r
        if ( hasPwd ){\r
                if (param_gethex(Cmd, 0, pwd, 4)) {\r
@@ -325,9 +322,9 @@ int CmdDump(const char *Cmd){
        }\r
 \r
        for ( int i = 0; i <8; ++i){\r
-               *s = 0;\r
+               memset(s,0,sizeof(s));\r
                if ( hasPwd ) {\r
-                       sprintf(s,"%d %d", i, pwd);\r
+                       sprintf(s,"%d %s", i, sprint_hex(pwd,4));\r
                        CmdReadBlkPWD(s);\r
                } else {\r
                        sprintf(s,"%d", i);\r
@@ -349,18 +346,20 @@ int CmdIceManchester(const char *Cmd){
 int ManchesterDemod(int block){\r
 \r
        int  blockNum = -1;\r
+       uint8_t sizebyte = 32;\r
+       uint8_t offset = 5;\r
        uint32_t blockData;\r
        uint8_t  bits[1000] = {0x00};\r
        uint8_t * bitstream = bits;\r
        \r
        manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream);  \r
-    blockData = PackBits(5, 32, bitstream);\r
+    blockData = PackBits(offset, sizebyte, bitstream);\r
 \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
+       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