#include "data.h"\r
#include "lfdemod.h"\r
\r
-\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
-static int CmdHelp(const char *Cmd);\r
\r
-// int CmdReadBlk(const char *Cmd)\r
-// {\r
- // int block = -1;\r
- // sscanf(Cmd, "%d", &block);\r
-\r
- // if ((block > 7) | (block < 0)) {\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
- // 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,0); //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
- // ManchesterDemod(block);\r
- // RepaintGraphWindow();\r
- // return 0;\r
-// }\r
+int usage_t55xx_rd(){\r
+ PrintAndLog("Usage: lf t55xx rd <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 rd 0 = try reading data from block 0");\r
+ PrintAndLog(" : lf t55xx rd 0 feedbeef = try reading data from block 0 using password");\r
+ PrintAndLog("");\r
+ return 0;\r
+}\r
+int usage_t55xx_wr(){\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
+\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
+static int CmdHelp(const char *Cmd);\r
\r
int CmdReadBlk(const char *Cmd)\r
{\r
int invert = 0;\r
int clk = 0;\r
int block = -1;\r
+ int password = 0xFFFFFFFF; //default to blank Block 7\r
int errCnt;\r
size_t bitlen;\r
- //int decodedBitlen;\r
+ int maxErr = 100;\r
+ uint8_t askAmp = 0;\r
uint32_t blockData;\r
uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
\r
- sscanf(Cmd, "%d", &block);\r
\r
- if ((block > 7) | (block < 0)) {\r
+ char cmdp = param_getchar(Cmd, 0);\r
+ if (cmdp == 'h' || cmdp == 'H') {\r
+ usage_t55xx_rd();\r
+ return 0;\r
+ }\r
+\r
+ int res = sscanf(Cmd, "%d %x", &block, &password);\r
+\r
+ if ( res < 1 || res > 2 ){\r
+ usage_t55xx_rd();\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
+ 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
- UsbCommand c = { CMD_T55XX_READ_BLOCK, { 0, block, 0 } };\r
SendCommand(&c);\r
if ( !WaitForResponseTimeout(CMD_ACK,NULL,1500) ) {\r
PrintAndLog("command execution time out");\r
\r
bitlen = getFromGraphBuf(bits);\r
\r
- errCnt = askrawdemod(bits, &bitlen, &clk, &invert);\r
+ errCnt = askrawdemod(bits, &bitlen, &clk, &invert, maxErr, askAmp);\r
\r
//throw away static - allow 1 and -1 (in case of threshold command first)\r
if ( errCnt == -1 || bitlen < 16 ){ \r
return 0;\r
}\r
\r
-int CmdReadBlkPWD(const char *Cmd)\r
+int CmdWriteBlk(const char *Cmd)\r
{\r
- int Block = -1; //default to invalid block\r
- int Password = 0xFFFFFFFF; //default to blank Block 7\r
-\r
-\r
- sscanf(Cmd, "%d %x", &Block, &Password);\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_wr();\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_wr();\r
+ return 1;\r
+ }\r
\r
- if ((Block > 7) | (Block < 0)) {\r
+ if (block > 7) {\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
-\r
- UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, Block, Password} };\r
- c.d.asBytes[0] = 0x1; //Password mode\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,0);\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
- ManchesterDemod(Block); \r
-\r
- RepaintGraphWindow();\r
- return 0;\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
-\r
- sscanf(Cmd, "%d %x", &Block, &Data);\r
-\r
- if (Block > 7) {\r
- PrintAndLog("Block must be between 0 and 7");\r
- return 1;\r
- } \r
-\r
- PrintAndLog("Writing block %d data %08X", Block, Data);\r
-\r
- UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {Data, Block, 0}};\r
- c.d.asBytes[0] = 0x0; //Normal mode\r
- SendCommand(&c);\r
- return 0;\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
-\r
-\r
- sscanf(Cmd, "%d %x %x",&Block, &Data, &Password);\r
-\r
- if (Block > 7) {\r
- PrintAndLog("Block must be between 0 and 7");\r
- return 1;\r
- } \r
-\r
- PrintAndLog("Writing block %d data %08X password %08X", Block, Data, Password);\r
-\r
- UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {Data, Block, Password}};\r
- c.d.asBytes[0] = 0x1; //Password mode\r
- SendCommand(&c);\r
- return 0;\r
+ \r
+ UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};\r
+ c.d.asBytes[0] = 0x0; \r
+\r
+ if (res == 2) {\r
+ PrintAndLog("Writing block %d data %08X", block, data);\r
+ } else {\r
+ //Password mode\r
+ c.arg[2] = password;\r
+ c.d.asBytes[0] = 0x1; \r
+ PrintAndLog("Writing block %d data %08X password %08X", block, data, password);\r
+ }\r
+ \r
+ SendCommand(&c);\r
+ return 0;\r
}\r
\r
int CmdReadTrace(const char *Cmd)\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(" : lf t55xx trace 1");\r
+ usage_t55xx_trace();\r
return 0;\r
}\r
\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
- }\r
-\r
- if ( strlen(Cmd) == 0 ){\r
+ } else {\r
CmdReadBlk("0");\r
} \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
- bool hasPwd = ( strlen(Cmd) > 0);\r
- \r
+\r
+ char cmdp = param_getchar(Cmd, 0);\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
- \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
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
+ CmdReadBlk(s);\r
}\r
return 0;\r
}\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, "<block> <data> -- Write T55xx block data (page 0)"},\r
- {"wrpwd", CmdWriteBlkPWD, 0, "<block> <password> <data> -- Write T55xx block data with password"},\r
+ {"rd", CmdReadBlk, 0, "<block> [password] -- Read T55xx block data (page 0) [optional password]"},\r
+ {"wr", 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
- {"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 password]"},\r
{"man", CmdIceManchester, 0, "Manchester demod (with SST)"},\r
{NULL, NULL, 0, NULL}\r
};\r
projects / proxmark3-svn / blobdiff