\r
#define CONFIGURATION_BLOCK 0x00\r
#define TRACE_BLOCK 0x01\r
+#define REGULAR_READ_MODE_BLOCK 0xFF\r
\r
// Default configuration\r
t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inverted = FALSE, .offset = 0x00, .block0 = 0x00};\r
\r
int usage_t55xx_config(){\r
PrintAndLog("Usage: lf t55xx config [d <demodulation>] [i 1] [o <offset>]");\r
- PrintAndLog("Options: ");\r
+ PrintAndLog("Options:");\r
PrintAndLog(" h This help");\r
PrintAndLog(" b <8|16|32|40|50|64|100|128> Set bitrate");\r
PrintAndLog(" d <FSK|FSK1|FSK1a|FSK2|FSK2a|ASK|PSK1|PSK2|NRZ|BI|BIa> Set demodulation FSK / ASK / PSK / NRZ / Biphase / Biphase A");\r
return 0;\r
}\r
int usage_t55xx_read(){\r
- PrintAndLog("Usage: lf t55xx read <block> <password> <override_safety>");\r
- PrintAndLog(" <block>, block number to read. Between 0-7");\r
- PrintAndLog(" <password>, OPTIONAL password (8 hex characters)");\r
- PrintAndLog(" <override_safety>, OPTIONAL override safety check = 1");\r
+ PrintAndLog("Usage: lf t55xx read b <block> p <password> <override_safety> <page1>");\r
+ PrintAndLog("Options:");\r
+ PrintAndLog(" b <block>, block number to read. Between 0-7");\r
+ PrintAndLog(" p <password>, OPTIONAL password (8 hex characters)");\r
+ PrintAndLog(" o, OPTIONAL override safety check");\r
+ PrintAndLog(" 1, OPTIONAL read Page 1 instead of Page 0");\r
PrintAndLog(" ****WARNING****");\r
PrintAndLog(" Use of read with password on a tag not configured for a pwd");\r
PrintAndLog(" can damage the tag");\r
PrintAndLog("");\r
PrintAndLog("Examples:");\r
- PrintAndLog(" lf t55xx read 0 - read data from block 0");\r
- PrintAndLog(" lf t55xx read 0 feedbeef - read data from block 0 password feedbeef");\r
- PrintAndLog(" lf t55xx read 0 feedbeef 1 - read data from block 0 password feedbeef safety check");\r
+ PrintAndLog(" lf t55xx read b 0 - read data from block 0");\r
+ PrintAndLog(" lf t55xx read b 0 p feedbeef - read data from block 0 password feedbeef");\r
+ PrintAndLog(" lf t55xx read b 0 p feedbeef o - read data from block 0 password feedbeef safety check");\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 write. 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("Usage: lf t55xx wr b <block> d <data> p [password] [1]");\r
+ PrintAndLog("Options:");\r
+ PrintAndLog(" b <block>, block number to write. Between 0-7");\r
+ PrintAndLog(" d <data>, 4 bytes of data to write (8 hex characters)");\r
+ PrintAndLog(" p [password], OPTIONAL password 4bytes (8 hex characters)");\r
+ PrintAndLog(" 1, OPTIONAL write Page 1 instead of Page 0");\r
PrintAndLog("");\r
PrintAndLog("Examples:");\r
- PrintAndLog(" lf t55xx wr 3 11223344 - write 11223344 to block 3");\r
- PrintAndLog(" lf t55xx wr 3 11223344 feedbeef - write 11223344 to block 3 password feedbeef");\r
+ PrintAndLog(" lf t55xx wr b 3 d 11223344 - write 11223344 to block 3");\r
+ PrintAndLog(" lf t55xx wr b 3 d 11223344 p feedbeef - write 11223344 to block 3 password feedbeef");\r
PrintAndLog("");\r
return 0;\r
}\r
int usage_t55xx_trace() {\r
PrintAndLog("Usage: lf t55xx trace [1]");\r
+ PrintAndLog("Options:");\r
PrintAndLog(" [graph buffer data], if set, use Graphbuffer otherwise read data from tag.");\r
PrintAndLog("");\r
PrintAndLog("Examples:");\r
}\r
int usage_t55xx_info() {\r
PrintAndLog("Usage: lf t55xx info [1]");\r
+ PrintAndLog("Options:");\r
PrintAndLog(" [graph buffer data], if set, use Graphbuffer otherwise read data from tag.");\r
PrintAndLog("");\r
PrintAndLog("Examples:");\r
return 0;\r
}\r
int usage_t55xx_dump(){\r
- PrintAndLog("Usage: lf t55xx dump <password>");\r
- PrintAndLog(" <password>, OPTIONAL password 4bytes (8 hex symbols)");\r
+ PrintAndLog("Usage: lf t55xx dump <password> [o]");\r
+ PrintAndLog("Options:");\r
+ PrintAndLog(" <password>, OPTIONAL password 4bytes (8 hex symbols)");\r
+ PrintAndLog(" <Override>, OPTIONAL Force pwd read despite danger to card");\r
PrintAndLog("");\r
PrintAndLog("Examples:");\r
PrintAndLog(" lf t55xx dump");\r
- PrintAndLog(" lf t55xx dump feedbeef");\r
+ PrintAndLog(" lf t55xx dump feedbeef o");\r
PrintAndLog("");\r
return 0;\r
}\r
int usage_t55xx_detect(){\r
- PrintAndLog("Usage: lf t55xx detect");\r
+ PrintAndLog("Usage: lf t55xx detect [1]");\r
+ PrintAndLog("Options:");\r
+ PrintAndLog(" [graph buffer data], if set, use Graphbuffer otherwise read data from tag.");\r
PrintAndLog("");\r
PrintAndLog("Examples:");\r
PrintAndLog(" lf t55xx detect");\r
PrintAndLog("");\r
return 0;\r
}\r
+int usage_t55xx_wakup(){\r
+ PrintAndLog("Usage: lf t55xx wakeup [h] p <password>");\r
+ PrintAndLog("This commands send the Answer-On-Request command and leaves the readerfield ON afterwards.");\r
+ PrintAndLog("Options:");\r
+ PrintAndLog(" h - this help");\r
+ PrintAndLog(" p <password> - password 4bytes (8 hex symbols)");\r
+ PrintAndLog("");\r
+ PrintAndLog("Examples:");\r
+ PrintAndLog(" lf t55xx wakeup p 11223344 - send wakeup password");\r
+ return 0;\r
+}\r
\r
static int CmdHelp(const char *Cmd);\r
\r
}\r
\r
// No args\r
- if (cmdp == 0) {\r
- printConfiguration( config );\r
- return 0;\r
- }\r
+ if (cmdp == 0) return printConfiguration( config );\r
+\r
//Validations\r
- if (errors)\r
- return usage_t55xx_config();\r
+ if (errors) return usage_t55xx_config();\r
\r
- config.block0 = 0;\r
- printConfiguration ( config );\r
- return 0;\r
+ config.block0 = 0;\r
+ return printConfiguration ( config );\r
+}\r
+\r
+int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32_t password){\r
+ //Password mode\r
+ if ( usepwd ) {\r
+ // try reading the config block and verify that PWD bit is set before doing this!\r
+ if ( !override ) {\r
+ if ( !AquireData(0, CONFIGURATION_BLOCK, false, 0 ) ) return 0;\r
+ if ( !tryDetectModulation() ) {\r
+ PrintAndLog("Safety Check: Could not detect if PWD bit is set in config block. Exits.");\r
+ return 0;\r
+ } else {\r
+ PrintAndLog("Safety Check: PWD bit is NOT set in config block. Reading without password..."); \r
+ usepwd = false;\r
+ page1 = false;\r
+ }\r
+ } else {\r
+ PrintAndLog("Safety Check Overriden - proceeding despite risk");\r
+ }\r
+ }\r
+\r
+ if (!AquireData(page1, block, usepwd, password) ) return 0;\r
+ if (!DecodeT55xxBlock()) return 0;\r
+\r
+ char blk[10]={0};\r
+ sprintf(blk,"%d", block);\r
+ printT55xxBlock(blk); \r
+ return 1;\r
}\r
\r
int CmdT55xxReadBlock(const char *Cmd) {\r
- uint8_t block = 255;\r
- uint8_t wake = 0;\r
- uint8_t usepwd = 0;\r
- uint32_t password = 0xFFFFFFFF; //default to blank Block 7\r
- uint8_t override = 0;\r
- uint8_t cmdp = 0;\r
+ uint8_t block = REGULAR_READ_MODE_BLOCK;\r
+ uint32_t password = 0; //default to blank Block 7\r
+ bool usepwd = false;\r
+ bool override = false;\r
+ bool page1 = false;\r
bool errors = false;\r
+ uint8_t cmdp = 0;\r
while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {\r
switch(param_getchar(Cmd, cmdp)) {\r
case 'h':\r
case 'b':\r
case 'B':\r
errors |= param_getdec(Cmd, cmdp+1, &block);\r
- cmdp+=2;\r
+ cmdp += 2;\r
break;\r
case 'o':\r
case 'O':\r
- override = 1;\r
+ override = true;\r
cmdp++;\r
break;\r
case 'p':\r
case 'P':\r
- password = param_get32ex(Cmd, cmdp+1, 0, 10);\r
- usepwd = 1;\r
- cmdp+=2;\r
+ password = param_get32ex(Cmd, cmdp+1, 0, 16);\r
+ usepwd = true;\r
+ cmdp += 2;\r
break;\r
- case 'w':\r
- case 'W':\r
- wake = 1;\r
+ case '1':\r
+ page1 = true;\r
cmdp++;\r
break;\r
default:\r
}\r
}\r
if (errors) return usage_t55xx_read();\r
- if (wake && !usepwd) {\r
- PrintAndLog("Wake command must use a pwd");\r
- return 1;\r
- }\r
- if ((block > 7) && !wake) {\r
- PrintAndLog("Block must be between 0 and 7");\r
- return 1;\r
- }\r
\r
- UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, block, password}};\r
-\r
- //Password mode\r
- if ( usepwd || wake ) {\r
- // try reading the config block and verify that PWD bit is set before doing this!\r
- if ( wake || override ) {\r
- c.arg[0] = (wake<<8) & usepwd;\r
- if ( !wake && override )\r
- PrintAndLog("Safety Check Overriden - proceeding despite risk");\r
- } else {\r
- AquireData( CONFIGURATION_BLOCK );\r
- if ( !tryDetectModulation() ) {\r
- PrintAndLog("Safety Check: Could not detect if PWD bit is set in config block. Exits.");\r
- return 1;\r
- } else {\r
- PrintAndLog("Safety Check: PWD bit is NOT set in config block. Reading without password..."); \r
- }\r
- }\r
- }\r
-\r
- clearCommandBuffer();\r
- SendCommand(&c);\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
- setGraphBuf(got, sizeof(got));\r
- //DemodBufferLen=0;\r
- if (!DecodeT55xxBlock()) return 3;\r
- char blk[10]={0};\r
- if ( wake ) {\r
- sprintf(blk,"wake");\r
- } else {\r
- sprintf(blk,"%d", block);\r
+ if (block > 7 && block != REGULAR_READ_MODE_BLOCK ) {\r
+ PrintAndLog("Block must be between 0 and 7");\r
+ return 0;\r
}\r
- printT55xxBlock(blk);\r
- return 0;\r
+ PrintAndLog("Reading Page %d:", page1); \r
+ PrintAndLog("blk | hex data | binary");\r
+ return T55xxReadBlock(block, page1, usepwd, override, password);\r
}\r
\r
bool DecodeT55xxBlock(){\r
uint8_t bitRate[8] = {8,16,32,40,50,64,100,128};\r
DemodBufferLen = 0x00;\r
\r
- //trim 1/2 a clock from beginning\r
- //snprintf(cmdStr, sizeof(buf),"%d", bitRate[config.bitrate]/2 );\r
- //CmdLtrim(cmdStr);\r
switch( config.modulation ){\r
case DEMOD_FSK:\r
snprintf(cmdStr, sizeof(buf),"%d %d", bitRate[config.bitrate], config.inverted );\r
return usage_t55xx_detect();\r
\r
if (strlen(Cmd)==0)\r
- AquireData( CONFIGURATION_BLOCK );\r
+ if ( !AquireData(0, CONFIGURATION_BLOCK, false, 0) )\r
+ return 0;\r
\r
if ( !tryDetectModulation() )\r
PrintAndLog("Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");\r
\r
- return 0;\r
+ return 1;\r
}\r
\r
// detect configuration?\r
bool tryDetectModulation(){\r
- //char cmdStr[8] = {0};\r
uint8_t hits = 0;\r
t55xx_conf_block_t tests[15];\r
int bitRate=0;\r
save_restoreGB(1);\r
if (GetFskClock("", FALSE, FALSE)){ \r
fskClocks(&fc1, &fc2, &clk, FALSE);\r
- //sprintf(cmdStr,"%d", clk/2);\r
- //CmdLtrim(cmdStr);\r
if ( FSKrawDemod("0 0", FALSE) && test(DEMOD_FSK, &tests[hits].offset, &bitRate)){\r
tests[hits].modulation = DEMOD_FSK;\r
if (fc1==8 && fc2 == 5)\r
} else {\r
clk = GetAskClock("", FALSE, FALSE);\r
if (clk>0) {\r
- //sprintf(cmdStr,"%d", clk/2);\r
- //CmdLtrim(cmdStr);\r
if ( ASKDemod("0 0 0", FALSE, FALSE, 1) && test(DEMOD_ASK, &tests[hits].offset, &bitRate)) {\r
tests[hits].modulation = DEMOD_ASK;\r
tests[hits].bitrate = bitRate;\r
save_restoreGB(0);\r
clk = GetNrzClock("", FALSE, FALSE);\r
if (clk>0) {\r
- //sprintf(cmdStr,"%d", clk/2);\r
- //CmdLtrim(cmdStr);\r
if ( NRZrawDemod("0 0 1", FALSE) && test(DEMOD_NRZ, &tests[hits].offset, &bitRate)) {\r
tests[hits].modulation = DEMOD_NRZ;\r
tests[hits].bitrate = bitRate;\r
save_restoreGB(0);\r
clk = GetPskClock("", FALSE, FALSE);\r
if (clk>0) {\r
- //PrintAndLog("clk %d",clk);\r
- //sprintf(cmdStr,"%d", clk/2);\r
- //CmdLtrim(cmdStr); \r
if ( PSKDemod("0 0 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate)) {\r
tests[hits].modulation = DEMOD_PSK1;\r
tests[hits].bitrate = bitRate;\r
bits[i - config.offset]=DemodBuffer[i];\r
\r
blockData = PackBits(0, 32, bits);\r
- PrintAndLog("[%s] 0x%08X %s", blockNum, blockData, sprint_bin(bits,32));\r
+ PrintAndLog(" %s | %08X | %s", blockNum, blockData, sprint_bin(bits,32));\r
}\r
\r
int special(const char *Cmd) {\r
uint32_t blockData = 0;\r
uint8_t bits[32] = {0x00};\r
\r
- PrintAndLog("[OFFSET] [DATA] [BINARY]");\r
+ PrintAndLog("OFFSET | DATA | BINARY");\r
PrintAndLog("----------------------------------------------------");\r
int i,j = 0;\r
for (; j < 64; ++j){\r
\r
blockData = PackBits(0, 32, bits);\r
\r
- PrintAndLog("[%02d] 0x%08X %s",j , blockData, sprint_bin(bits,32)); \r
+ PrintAndLog(" %02d | 0x%08X | %s",j , blockData, sprint_bin(bits,32)); \r
}\r
return 0;\r
}\r
\r
-void printConfiguration( t55xx_conf_block_t b){\r
+int printConfiguration( t55xx_conf_block_t b){\r
PrintAndLog("Modulation : %s", GetSelectedModulationStr(b.modulation) );\r
PrintAndLog("Bit Rate : %s", GetBitRateStr(b.bitrate) );\r
PrintAndLog("Inverted : %s", (b.inverted) ? "Yes" : "No" );\r
PrintAndLog("Offset : %d", b.offset);\r
PrintAndLog("Block0 : 0x%08X", b.block0);\r
PrintAndLog("");\r
+ return 0;\r
}\r
\r
-int CmdT55xxWriteBlock(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
- char cmdp = param_getchar(Cmd, 0);\r
- if (cmdp == 'h' || cmdp == 'H') {\r
- usage_t55xx_write();\r
- return 0;\r
+int CmdT55xxWakeUp(const char *Cmd) {\r
+ uint32_t password = 0;\r
+ uint8_t cmdp = 0;\r
+ bool errors = true;\r
+ while(param_getchar(Cmd, cmdp) != 0x00) {\r
+ switch(param_getchar(Cmd, cmdp)) {\r
+ case 'h':\r
+ case 'H':\r
+ return usage_t55xx_wakup();\r
+ case 'p':\r
+ case 'P':\r
+ password = param_get32ex(Cmd, cmdp+1, 0xFFFFFFFF, 16);\r
+ cmdp += 2;\r
+ errors = false;\r
+ break;\r
+ default:\r
+ PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r
+ errors = true;\r
+ break;\r
+ }\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
+ if (errors) return usage_t55xx_wakup();\r
+\r
+ UsbCommand c = {CMD_T55XX_WAKEUP, {password, 0, 0}};\r
+ clearCommandBuffer();\r
+ SendCommand(&c);\r
+ PrintAndLog("Wake up command sent. Try read now");\r
+ return 0;\r
+}\r
+\r
+int CmdT55xxWriteBlock(const char *Cmd) {\r
+ uint8_t block = 0xFF; //default to invalid block\r
+ uint32_t data = 0xFFFFFFFF; //default to blank Block \r
+ uint32_t password = 0xFFFFFFFF; //default to blank Block 7\r
+ bool usepwd = false;\r
+ bool page1 = false; \r
+ bool gotdata = false;\r
+ bool errors = false;\r
+ uint8_t cmdp = 0;\r
+ while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {\r
+ switch(param_getchar(Cmd, cmdp)) {\r
+ case 'h':\r
+ case 'H':\r
+ return usage_t55xx_write();\r
+ case 'b':\r
+ case 'B':\r
+ errors |= param_getdec(Cmd, cmdp+1, &block);\r
+ cmdp += 2;\r
+ break;\r
+ case 'd':\r
+ case 'D':\r
+ data = param_get32ex(Cmd, cmdp+1, 0, 16);\r
+ gotdata = true;\r
+ cmdp += 2;\r
+ break;\r
+ case 'p':\r
+ case 'P':\r
+ password = param_get32ex(Cmd, cmdp+1, 0, 16);\r
+ usepwd = true;\r
+ cmdp += 2;\r
+ break;\r
+ case '1':\r
+ page1 = true;\r
+ cmdp++;\r
+ break;\r
+ default:\r
+ PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r
+ errors = true;\r
+ break;\r
+ }\r
}\r
+ if (errors || !gotdata) return usage_t55xx_write();\r
\r
if (block > 7) {\r
PrintAndLog("Block number must be between 0 and 7");\r
- return 1;\r
+ return 0;\r
}\r
\r
UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};\r
UsbCommand resp;\r
- c.d.asBytes[0] = 0x0; \r
+ c.d.asBytes[0] = (page1) ? 0x2 : 0; \r
\r
- PrintAndLog("Writing to block: %d data : 0x%08X", block, data);\r
+ PrintAndLog("Writing to page: %d block: %d data : 0x%08X", page1, block, data);\r
\r
//Password mode\r
- if (res == 3) {\r
+ if (usepwd) {\r
c.arg[2] = password;\r
- c.d.asBytes[0] = 0x1; \r
+ c.d.asBytes[0] |= 0x1; \r
PrintAndLog("pwd : 0x%08X", password);\r
}\r
clearCommandBuffer();\r
SendCommand(&c);\r
if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)){\r
PrintAndLog("Error occurred, device did not ACK write operation. (May be due to old firmware)");\r
- return -1;\r
+ return 0;\r
}\r
- return 0;\r
+ return 1;\r
}\r
\r
-int CmdT55xxReadTrace(const char *Cmd)\r
-{\r
+int CmdT55xxReadTrace(const char *Cmd) {\r
char cmdp = param_getchar(Cmd, 0);\r
- \r
+ bool pwdmode = false;\r
+ uint32_t password = 0;\r
if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') \r
return usage_t55xx_trace();\r
\r
if (strlen(Cmd)==0)\r
- AquireData( TRACE_BLOCK );\r
+ if ( !AquireData( TRACE_BLOCK, REGULAR_READ_MODE_BLOCK, pwdmode, password ) )\r
+ return 0;\r
\r
- if (!DecodeT55xxBlock()) return 1;\r
+ if (!DecodeT55xxBlock()) return 0;\r
+\r
+ if ( !DemodBufferLen) return 0;\r
\r
- if ( !DemodBufferLen) return 1;\r
- \r
RepaintGraphWindow();\r
uint8_t repeat = 0;\r
if (config.offset > 5) \r
repeat = 32;\r
uint8_t si = config.offset+repeat;\r
- uint32_t bl0 = PackBits(si, 32, DemodBuffer);\r
- uint32_t bl1 = PackBits(si+32, 32, DemodBuffer);\r
+ uint32_t bl1 = PackBits(si, 32, DemodBuffer);\r
+ uint32_t bl2 = PackBits(si+32, 32, DemodBuffer);\r
\r
uint32_t acl = PackBits(si, 8, DemodBuffer); si += 8;\r
uint32_t mfc = PackBits(si, 8, DemodBuffer); si += 8;\r
\r
if ( acl != 0xE0 ) {\r
PrintAndLog("The modulation is most likely wrong since the ACL is not 0xE0. ");\r
- return 1;\r
+ return 0;\r
}\r
\r
PrintAndLog("");\r
PrintAndLog(" Die Number : %d", dw);\r
PrintAndLog("-------------------------------------------------------------");\r
PrintAndLog(" Raw Data - Page 1");\r
- PrintAndLog(" Block 0 : 0x%08X %s", bl0, sprint_bin(DemodBuffer+config.offset+repeat,32) );\r
- PrintAndLog(" Block 1 : 0x%08X %s", bl1, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );\r
+ PrintAndLog(" Block 1 : 0x%08X %s", bl1, sprint_bin(DemodBuffer+config.offset+repeat,32) );\r
+ PrintAndLog(" Block 2 : 0x%08X %s", bl2, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );\r
PrintAndLog("-------------------------------------------------------------");\r
\r
/*\r
Normal mode\r
Extended mode\r
*/\r
+ bool pwdmode = false;\r
+ uint32_t password = 0;\r
char cmdp = param_getchar(Cmd, 0);\r
\r
if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H')\r
return usage_t55xx_info();\r
\r
if (strlen(Cmd)==0)\r
- AquireData( CONFIGURATION_BLOCK );\r
+ if ( !AquireData( 0, CONFIGURATION_BLOCK, pwdmode, password ) )\r
+ return 1;\r
\r
if (!DecodeT55xxBlock()) return 1;\r
\r
\r
int CmdT55xxDump(const char *Cmd){\r
\r
- char s[20] = {0x00};\r
- uint8_t pwd[4] = {0x00};\r
-\r
+ uint32_t password = 0;\r
char cmdp = param_getchar(Cmd, 0);\r
- if ( cmdp == 'h' || cmdp == 'H') {\r
- usage_t55xx_dump();\r
- return 0;\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
- return 1;\r
- }\r
+ bool override = false;\r
+ if ( cmdp == 'h' || cmdp == 'H') return usage_t55xx_dump();\r
+\r
+ bool usepwd = ( strlen(Cmd) > 0); \r
+ if ( usepwd ){\r
+ password = param_get32ex(Cmd, 0, 0, 16);\r
+ if (param_getchar(Cmd, 1) =='o' )\r
+ override = true;\r
}\r
\r
- for ( int i = 0; i <8; ++i){\r
- memset(s,0,sizeof(s));\r
+ PrintAndLog("Reading Page 0:"); \r
+ PrintAndLog("blk | hex data | binary");\r
+ for ( uint8_t i = 0; i <8; ++i){\r
+ T55xxReadBlock(i, 0, usepwd, override, password);\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
+ if ( override ) {\r
+ sprintf(s,"b %d p %02x%02x%02x%02x o", i, pwd[0],pwd[1],pwd[2],pwd[3]); \r
+ } else {\r
+ sprintf(s,"b %d p %02x%02x%02x%02x", i, pwd[0],pwd[1],pwd[2],pwd[3]); \r
+ }\r
} else {\r
- sprintf(s,"%d", i);\r
+ sprintf(s,"b %d", i);\r
}\r
- CmdT55xxReadBlock(s);\r
+ CmdT55xxReadBlock(s);*/\r
}\r
- return 0;\r
+ PrintAndLog("Reading Page 1:"); \r
+ PrintAndLog("blk | hex data | binary");\r
+ for ( uint8_t i = 0; i<4; i++){\r
+ T55xxReadBlock(i, 1, usepwd, override, password); \r
+ }\r
+ return 1;\r
}\r
\r
-int AquireData( uint8_t block ){\r
-\r
- UsbCommand c;\r
- \r
- if ( block == CONFIGURATION_BLOCK ) \r
- c.cmd = CMD_T55XX_READ_BLOCK;\r
- else if (block == TRACE_BLOCK )\r
- c.cmd = CMD_T55XX_READ_TRACE;\r
- \r
- c.arg[0] = 0x00;\r
- c.arg[1] = 0x00;\r
- c.arg[2] = 0x00;\r
- c.d.asBytes[0] = 0x0; \r
+int AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password ){\r
\r
- //Password mode\r
- // if ( res == 2 ) {\r
- // c.arg[2] = password;\r
- // c.d.asBytes[0] = 0x1; \r
- // }\r
+ uint8_t arg0 = (page<<1) | pwdmode;\r
+ UsbCommand c = {CMD_T55XX_READ_BLOCK, {arg0, block, password}};\r
\r
clearCommandBuffer();\r
SendCommand(&c);\r
if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
PrintAndLog("command execution time out");\r
- return 1;\r
+ return 0;\r
}\r
\r
uint8_t got[12000];\r
GetFromBigBuf(got,sizeof(got),0);\r
WaitForResponse(CMD_ACK,NULL);\r
- setGraphBuf(got, 12000);\r
- return 0;\r
+ setGraphBuf(got, sizeof(got));\r
+ return 1;\r
}\r
\r
char * GetBitRateStr(uint32_t id){\r
{"help", CmdHelp, 1, "This help"},\r
{"config", CmdT55xxSetConfig, 1, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"},\r
{"detect", CmdT55xxDetect, 0, "[1] Try detecting the tag modulation from reading the configuration block."},\r
- {"read", CmdT55xxReadBlock, 0, "<block> [password] -- Read T55xx block data (page 0) [optional password]"},\r
- {"write", CmdT55xxWriteBlock,0, "<block> <data> [password] -- Write T55xx block data (page 0) [optional password]"},\r
+ {"read", CmdT55xxReadBlock, 0, "b <block> p [password] [o] [1] -- Read T55xx block data (page 0) [optional password]"},\r
+ {"write", CmdT55xxWriteBlock,0, "b <block> d <data> p [password] [1] -- Write T55xx block data (page 0) [optional password]"},\r
{"trace", CmdT55xxReadTrace, 0, "[1] Show T55xx traceability data (page 1/ blk 0-1)"},\r
{"info", CmdT55xxInfo, 0, "[1] Show T55xx configuration data (page 0/ blk 0)"},\r
- {"dump", CmdT55xxDump, 0, "[password] Dump T55xx card block 0-7. [optional password]"},\r
+ {"dump", CmdT55xxDump, 0, "[password] [o] Dump T55xx card block 0-7. [optional password]"},\r
{"special", special, 0, "Show block changes with 64 different offsets"},\r
+ {"wakeup", CmdT55xxWakeUp, 0, "Send AOR wakeup command"},\r
{NULL, NULL, 0, NULL}\r
};\r
\r
projects / proxmark3-svn / blobdiff