cvs.zerfleddert.de Git - proxmark3-svn/blobdiff

index c5a6dd3f64623ed304c2487b50ae0238dedb7602..c64e5ef24eb00b68348d070a7b93c646de878b59 100644 (file)

--- a/client/cmdlft55xx.c

+++ b/client/cmdlft55xx.c

@@ -7,24 +7,24 @@

// Low frequency T55xx commands\r

//-----------------------------------------------------------------------------\r

// Low frequency T55xx commands\r

//-----------------------------------------------------------------------------\r

+#include "cmdlft55xx.h"\r

+\r

#include <stdio.h>\r

#include <string.h>\r

#include <inttypes.h>\r

#include <ctype.h>\r

#include <time.h>\r

#include <stdio.h>\r

#include <string.h>\r

#include <inttypes.h>\r

#include <ctype.h>\r

#include <time.h>\r

-#include "proxmark3.h"\r

+#include "comms.h"\r

#include "ui.h"\r

#include "graph.h"\r

#include "cmdmain.h"\r

#include "cmdparser.h"\r

#include "cmddata.h"\r

#include "cmdlf.h"\r

#include "ui.h"\r

#include "graph.h"\r

#include "cmdmain.h"\r

#include "cmdparser.h"\r

#include "cmddata.h"\r

#include "cmdlf.h"\r

-#include "cmdlft55xx.h"\r

#include "util.h"\r

-#include "data.h"\r

#include "lfdemod.h"\r

-#include "cmdhf14a.h" //for getTagInfo\r

#include "protocols.h"\r

+#include "taginfo.h"\r

#define T55x7_CONFIGURATION_BLOCK 0x00\r

#define T55x7_PAGE0 0x00\r

#define T55x7_CONFIGURATION_BLOCK 0x00\r

#define T55x7_PAGE0 0x00\r

@@ -67,6 +67,8 @@ int usage_t55xx_read(){

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(" 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(" r <mode> - OPTIONAL downlink encoding '0' fixed bit length (default), '1' long leading reference");\r

+ PrintAndLog(" '2' leading zero, '3' 1 of 4 coding reference"); \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(" ****WARNING****");\r

PrintAndLog(" Use of read with password on a tag not configured for a pwd");\r

PrintAndLog(" can damage the tag");\r

@@ -86,6 +88,8 @@ int usage_t55xx_write(){

PrintAndLog(" p <password> - OPTIONAL password 4bytes (8 hex characters)");\r

PrintAndLog(" 1 - OPTIONAL write Page 1 instead of Page 0");\r

PrintAndLog(" t - OPTIONAL test mode write - ****DANGER****"); \r

PrintAndLog(" p <password> - OPTIONAL password 4bytes (8 hex characters)");\r

PrintAndLog(" 1 - OPTIONAL write Page 1 instead of Page 0");\r

PrintAndLog(" t - OPTIONAL test mode write - ****DANGER****"); \r

+ PrintAndLog(" r <mode> - OPTIONAL downlink encoding '0' fixed bit length (default), '1' long leading reference");\r

+ PrintAndLog(" '2' leading zero, '3' 1 of 4 coding reference"); \r

PrintAndLog("");\r

PrintAndLog("Examples:");\r

PrintAndLog(" lf t55xx write b 3 d 11223344 - write 11223344 to block 3");\r

PrintAndLog("");\r

PrintAndLog("Examples:");\r

PrintAndLog(" lf t55xx write b 3 d 11223344 - write 11223344 to block 3");\r

@@ -132,6 +136,8 @@ int usage_t55xx_detect(){

PrintAndLog("Options:");\r

PrintAndLog(" 1 - if set, use Graphbuffer otherwise read data from tag.");\r

PrintAndLog(" p <password> - OPTIONAL password (8 hex characters)");\r

PrintAndLog("Options:");\r

PrintAndLog(" 1 - if set, use Graphbuffer otherwise read data from tag.");\r

PrintAndLog(" p <password> - OPTIONAL password (8 hex characters)");\r

+ PrintAndLog(" r <mode> - OPTIONAL downlink encoding '0' fixed bit length (default), '1' long leading reference");\r

+ PrintAndLog(" '2' leading zero, '3' 1 of 4 coding reference"); \r

PrintAndLog("");\r

PrintAndLog("Examples:");\r

PrintAndLog(" lf t55xx detect");\r

PrintAndLog("");\r

PrintAndLog("Examples:");\r

PrintAndLog(" lf t55xx detect");\r

@@ -162,7 +168,7 @@ int usage_t55xx_wakup(){

PrintAndLog(" <password> - [required] password 4bytes (8 hex symbols)");\r

PrintAndLog("");\r

PrintAndLog("Examples:");\r

PrintAndLog(" <password> - [required] password 4bytes (8 hex symbols)");\r

PrintAndLog("");\r

PrintAndLog("Examples:");\r

- PrintAndLog(" lf t55xx wakeup 11223344 - send wakeup password");\r

+ PrintAndLog(" lf t55xx wakeup 11223344 - send wakeup password");\r

return 0;\r

}\r

int usage_t55xx_bruteforce(){\r

return 0;\r

}\r

int usage_t55xx_bruteforce(){\r

@@ -172,13 +178,16 @@ int usage_t55xx_bruteforce(){

PrintAndLog(" password must be 4 bytes (8 hex symbols)");\r

PrintAndLog("Options:");\r

PrintAndLog(" h - this help");\r

PrintAndLog(" password must be 4 bytes (8 hex symbols)");\r

PrintAndLog("Options:");\r

PrintAndLog(" h - this help");\r

+ PrintAndLog(" r <mode> - OPTIONAL downlink encoding '0' fixed bit length (default)"); \r

+ PrintAndLog(" '1' long leading reference, '2' leading zero ");\r

+ PrintAndLog(" '3' 1 of 4 coding reference, '4' special - try all downlink modes");\r

PrintAndLog(" <start_pwd> - 4 byte hex value to start pwd search at");\r

PrintAndLog(" <end_pwd> - 4 byte hex value to end pwd search at");\r

PrintAndLog(" i <*.dic> - loads a default keys dictionary file <*.dic>");\r

PrintAndLog("");\r

PrintAndLog("Examples:");\r

PrintAndLog(" <start_pwd> - 4 byte hex value to start pwd search at");\r

PrintAndLog(" <end_pwd> - 4 byte hex value to end pwd search at");\r

PrintAndLog(" i <*.dic> - loads a default keys dictionary file <*.dic>");\r

PrintAndLog("");\r

PrintAndLog("Examples:");\r

- PrintAndLog(" lf t55xx bruteforce aaaaaaaa bbbbbbbb");\r

- PrintAndLog(" lf t55xx bruteforce i default_pwd.dic");\r

+ PrintAndLog(" lf t55xx bruteforce [r 2] aaaaaaaa bbbbbbbb");\r

+ PrintAndLog(" lf t55xx bruteforce [r 2] i default_pwd.dic");\r

PrintAndLog("");\r

return 0;\r

}\r

PrintAndLog("");\r

return 0;\r

}\r

@@ -207,7 +216,7 @@ void printT5xxHeader(uint8_t page){

int CmdT55xxSetConfig(const char *Cmd) {\r

uint8_t offset = 0;\r

int CmdT55xxSetConfig(const char *Cmd) {\r

uint8_t offset = 0;\r

- char modulation[5] = {0x00};\r

+ char modulation[6] = {0x00};\r

char tmp = 0x00;\r

uint8_t bitRate = 0;\r

uint8_t rates[9] = {8,16,32,40,50,64,100,128,0};\r

char tmp = 0x00;\r

uint8_t bitRate = 0;\r

uint8_t rates[9] = {8,16,32,40,50,64,100,128,0};\r

@@ -302,21 +311,21 @@ int CmdT55xxSetConfig(const char *Cmd) {

}\r

// No args\r

}\r

// No args\r

- if (cmdp == 0) return printConfiguration( config );\r

+ if (cmdp == 0) return printConfiguration( config);\r

//Validations\r

if (errors) return usage_t55xx_config();\r

config.block0 = 0;\r

//Validations\r

if (errors) return usage_t55xx_config();\r

config.block0 = 0;\r

- return printConfiguration ( config );\r

+ return printConfiguration ( config);\r

}\r

-int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32_t password){\r

+int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32_t password, uint8_t downlink_mode){\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

//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(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, false, 0 ) ) return 0;\r

+ if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, false, 0,downlink_mode ) ) 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

if ( !tryDetectModulation() ) {\r

PrintAndLog("Safety Check: Could not detect if PWD bit is set in config block. Exits.");\r

return 0;\r

@@ -330,7 +339,7 @@ int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32

}\r

- if (!AquireData(page1, block, usepwd, password) ) return 0;\r

+ if (!AquireData(page1, block, usepwd, password,downlink_mode) ) return 0;\r

if (!DecodeT55xxBlock()) return 0;\r

char blk[10]={0};\r

if (!DecodeT55xxBlock()) return 0;\r

char blk[10]={0};\r

@@ -342,6 +351,8 @@ int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32

int CmdT55xxReadBlock(const char *Cmd) {\r

uint8_t block = REGULAR_READ_MODE_BLOCK;\r

uint32_t password = 0; //default to blank Block 7\r

int CmdT55xxReadBlock(const char *Cmd) {\r

uint8_t block = REGULAR_READ_MODE_BLOCK;\r

uint32_t password = 0; //default to blank Block 7\r

+ uint8_t downlink_mode = 0;\r

+ \r

bool usepwd = false;\r

bool override = false;\r

bool page1 = false;\r

bool usepwd = false;\r

bool override = false;\r

bool page1 = false;\r

@@ -372,6 +383,12 @@ int CmdT55xxReadBlock(const char *Cmd) {

page1 = true;\r

cmdp++;\r

break;\r

page1 = true;\r

cmdp++;\r

break;\r

+ case 'r':\r

+ case 'R':\r

+ downlink_mode = param_getchar(Cmd, cmdp+1) - '0';\r

+ if (downlink_mode > 3) downlink_mode = 0;\r

+ cmdp +=2;\r

+ break;\r

default:\r

PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r

errors = true;\r

default:\r

PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r

errors = true;\r

@@ -386,7 +403,7 @@ int CmdT55xxReadBlock(const char *Cmd) {

}\r

printT5xxHeader(page1);\r

}\r

printT5xxHeader(page1);\r

- return T55xxReadBlock(block, page1, usepwd, override, password);\r

+ return T55xxReadBlock(block, page1, usepwd, override, password, downlink_mode);\r

}\r

bool DecodeT55xxBlock(){\r

}\r

bool DecodeT55xxBlock(){\r

@@ -459,12 +476,32 @@ bool DecodeT5555TraceBlock() {

return (bool) ASKDemod("64 0 1", false, false, 1);\r

}\r

return (bool) ASKDemod("64 0 1", false, false, 1);\r

}\r

+void T55xx_Print_DownlinkMode (uint8_t downlink_mode)\r

+{\r

+ char Msg[80];\r

+ sprintf (Msg,"Downlink Mode used : ");\r

+ \r

+ switch (downlink_mode) {\r

+ case 0 : strcat (Msg,"default/fixed bit length"); break;\r

+ case 1 : strcat (Msg,"long leading reference (r 1)"); break;\r

+ case 2 : strcat (Msg,"leading zero reference (r 2)"); break;\r

+ case 3 : strcat (Msg,"1 of 4 coding reference (r 3)"); break;\r

+ default :\r

+ strcat (Msg,"default/fixed bit length"); break;\r

+\r

+ }\r

+ \r

+ PrintAndLog (Msg);\r

+ \r

+}\r

+\r

int CmdT55xxDetect(const char *Cmd){\r

bool errors = false;\r

bool useGB = false;\r

bool usepwd = false;\r

uint32_t password = 0;\r

uint8_t cmdp = 0;\r

int CmdT55xxDetect(const char *Cmd){\r

bool errors = false;\r

bool useGB = false;\r

bool usepwd = false;\r

uint32_t password = 0;\r

uint8_t cmdp = 0;\r

+ uint8_t downlink_mode = 0;\r

while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {\r

switch(param_getchar(Cmd, cmdp)) {\r

while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {\r

switch(param_getchar(Cmd, cmdp)) {\r

@@ -482,6 +519,12 @@ int CmdT55xxDetect(const char *Cmd){

useGB = true;\r

cmdp++;\r

break;\r

useGB = true;\r

cmdp++;\r

break;\r

+ case 'r':\r

+ case 'R':\r

+ downlink_mode = param_getchar(Cmd, cmdp+1) - '0';\r

+ if (downlink_mode > 3) downlink_mode = 0;\r

+ cmdp +=2;\r

+ break; \r

default:\r

PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r

errors = true;\r

default:\r

PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r

errors = true;\r

@@ -491,13 +534,16 @@ int CmdT55xxDetect(const char *Cmd){

if (errors) return usage_t55xx_detect();\r

if ( !useGB) {\r

if (errors) return usage_t55xx_detect();\r

if ( !useGB) {\r

- if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, usepwd, password) )\r

+ if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, usepwd, password,downlink_mode) )\r

return 0;\r

}\r

if ( !tryDetectModulation() )\r

PrintAndLog("Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");\r

return 0;\r

}\r

if ( !tryDetectModulation() )\r

PrintAndLog("Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");\r

-\r

+ else {\r

+ // Add downlink mode for reference.\r

+ T55xx_Print_DownlinkMode (downlink_mode);\r

+ }\r

return 1;\r

}\r

return 1;\r

}\r

@@ -649,7 +695,8 @@ bool tryDetectModulation(){

config.block0 = tests[0].block0;\r

config.Q5 = tests[0].Q5;\r

config.ST = tests[0].ST;\r

config.block0 = tests[0].block0;\r

config.Q5 = tests[0].Q5;\r

config.ST = tests[0].ST;\r

- printConfiguration( config );\r

+ \r

+ printConfiguration( config);\r

return true;\r

}\r

return true;\r

}\r

@@ -657,7 +704,7 @@ bool tryDetectModulation(){

PrintAndLog("Found [%d] possible matches for modulation.",hits);\r

for(int i=0; i<hits; ++i){\r

PrintAndLog("--[%d]---------------", i+1);\r

PrintAndLog("Found [%d] possible matches for modulation.",hits);\r

for(int i=0; i<hits; ++i){\r

PrintAndLog("--[%d]---------------", i+1);\r

- printConfiguration( tests[i] );\r

+ printConfiguration( tests[i]);\r

}\r

return false;\r

}\r

return false;\r

@@ -898,6 +945,8 @@ int CmdT55xxWriteBlock(const char *Cmd) {

uint8_t block = 0xFF; //default to invalid block\r

uint32_t data = 0; //default to blank Block \r

uint32_t password = 0; //default to blank Block 7\r

uint8_t block = 0xFF; //default to invalid block\r

uint32_t data = 0; //default to blank Block \r

uint32_t password = 0; //default to blank Block 7\r

+ uint32_t downlink_mode = 0;\r

+ \r

bool usepwd = false;\r

bool page1 = false; \r

bool gotdata = false;\r

bool usepwd = false;\r

bool page1 = false; \r

bool gotdata = false;\r

@@ -935,6 +984,12 @@ int CmdT55xxWriteBlock(const char *Cmd) {

page1 = true;\r

cmdp++;\r

break;\r

page1 = true;\r

cmdp++;\r

break;\r

+ case 'r':\r

+ case 'R':\r

+ downlink_mode = param_getchar(Cmd, cmdp+1) - '0';\r

+ if (downlink_mode > 3) downlink_mode = 0;\r

+ cmdp +=2;\r

+ break;\r

default:\r

PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r

errors = true;\r

default:\r

PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r

errors = true;\r

@@ -952,17 +1007,19 @@ int CmdT55xxWriteBlock(const char *Cmd) {

UsbCommand resp;\r

c.d.asBytes[0] = (page1) ? 0x2 : 0; \r

c.d.asBytes[0] |= (testMode) ? 0x4 : 0; \r

UsbCommand resp;\r

c.d.asBytes[0] = (page1) ? 0x2 : 0; \r

c.d.asBytes[0] |= (testMode) ? 0x4 : 0; \r

-\r

+ c.d.asBytes[0] |= (downlink_mode << 3);\r

+ \r

char pwdStr[16] = {0};\r

snprintf(pwdStr, sizeof(pwdStr), "pwd: 0x%08X", password);\r

PrintAndLog("Writing page %d block: %02d data: 0x%08X %s", page1, block, data, (usepwd) ? pwdStr : "" );\r

char pwdStr[16] = {0};\r

snprintf(pwdStr, sizeof(pwdStr), "pwd: 0x%08X", password);\r

PrintAndLog("Writing page %d block: %02d data: 0x%08X %s", page1, block, data, (usepwd) ? pwdStr : "" );\r

-\r

+ \r

//Password mode\r

if (usepwd) {\r

c.arg[2] = password;\r

c.d.asBytes[0] |= 0x1; \r

}\r

//Password mode\r

if (usepwd) {\r

c.arg[2] = password;\r

c.d.asBytes[0] |= 0x1; \r

}\r

+ \r

clearCommandBuffer();\r

SendCommand(&c);\r

if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)){\r

clearCommandBuffer();\r

SendCommand(&c);\r

if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)){\r

@@ -980,7 +1037,7 @@ int CmdT55xxReadTrace(const char *Cmd) {

return usage_t55xx_trace();\r

if (strlen(Cmd)==0)\r

return usage_t55xx_trace();\r

if (strlen(Cmd)==0)\r

- if ( !AquireData( T55x7_PAGE1, REGULAR_READ_MODE_BLOCK, pwdmode, password ) )\r

+ if ( !AquireData( T55x7_PAGE1, REGULAR_READ_MODE_BLOCK, pwdmode, password,0 ) )\r

return 0;\r

if ( config.Q5 ) {\r

return 0;\r

if ( config.Q5 ) {\r

@@ -1070,7 +1127,7 @@ void printT55x7Trace( t55x7_tracedata_t data, uint8_t repeat ){

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

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

PrintAndLog(" ACL Allocation class (ISO/IEC 15963-1) : 0x%02X (%d)", data.acl, data.acl);\r

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

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

PrintAndLog(" ACL Allocation class (ISO/IEC 15963-1) : 0x%02X (%d)", data.acl, data.acl);\r

- PrintAndLog(" MFC Manufacturer ID (ISO/IEC 7816-6) : 0x%02X (%d) - %s", data.mfc, data.mfc, getTagInfo(data.mfc));\r

+ PrintAndLog(" MFC Manufacturer ID (ISO/IEC 7816-6) : 0x%02X (%d) - %s", data.mfc, data.mfc, getManufacturerName(data.mfc));\r

PrintAndLog(" CID : 0x%02X (%d) - %s", data.cid, data.cid, GetModelStrFromCID(data.cid));\r

PrintAndLog(" ICR IC Revision : %d", data.icr );\r

PrintAndLog(" Manufactured");\r

PrintAndLog(" CID : 0x%02X (%d) - %s", data.cid, data.cid, GetModelStrFromCID(data.cid));\r

PrintAndLog(" ICR IC Revision : %d", data.icr );\r

PrintAndLog(" Manufactured");\r

@@ -1144,7 +1201,7 @@ int CmdT55xxInfo(const char *Cmd){

return usage_t55xx_info();\r

if (strlen(Cmd)==0)\r

return usage_t55xx_info();\r

if (strlen(Cmd)==0)\r

- if ( !AquireData( T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, pwdmode, password ) )\r

+ if ( !AquireData( T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, pwdmode, password,0 ) )\r

return 1;\r

if (!DecodeT55xxBlock()) return 1;\r

return 1;\r

if (!DecodeT55xxBlock()) return 1;\r

@@ -1212,20 +1269,21 @@ int CmdT55xxDump(const char *Cmd){

printT5xxHeader(0);\r

for ( uint8_t i = 0; i <8; ++i)\r

printT5xxHeader(0);\r

for ( uint8_t i = 0; i <8; ++i)\r

- T55xxReadBlock(i, 0, usepwd, override, password);\r

+ T55xxReadBlock(i, 0, usepwd, override, password,0);\r

printT5xxHeader(1);\r

for ( uint8_t i = 0; i<4; i++)\r

printT5xxHeader(1);\r

for ( uint8_t i = 0; i<4; i++)\r

- T55xxReadBlock(i, 1, usepwd, override, password); \r

+ T55xxReadBlock(i, 1, usepwd, override, password,0); \r

return 1;\r

}\r

return 1;\r

}\r

-int AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password ){\r

+int AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password, uint8_t downlink_mode ){\r

// arg0 bitmodes:\r

// bit0 = pwdmode\r

// bit1 = page to read from\r

uint8_t arg0 = (page<<1) | pwdmode;\r

// arg0 bitmodes:\r

// bit0 = pwdmode\r

// bit1 = page to read from\r

uint8_t arg0 = (page<<1) | pwdmode;\r

+ arg0 |= (downlink_mode << 3);\r

UsbCommand c = {CMD_T55XX_READ_BLOCK, {arg0, block, password}};\r

clearCommandBuffer();\r

UsbCommand c = {CMD_T55XX_READ_BLOCK, {arg0, block, password}};\r

clearCommandBuffer();\r

@@ -1355,8 +1413,7 @@ int CmdResetRead(const char *Cmd) {

}\r

uint8_t got[BIGBUF_SIZE-1];\r

}\r

uint8_t got[BIGBUF_SIZE-1];\r

- GetFromBigBuf(got,sizeof(got),0);\r

- WaitForResponse(CMD_ACK,NULL);\r

+ GetFromBigBuf(got, sizeof(got), 0, NULL, -1 , 0);\r

setGraphBuf(got, sizeof(got));\r

return 1;\r

}\r

setGraphBuf(got, sizeof(got));\r

return 1;\r

}\r

@@ -1404,9 +1461,23 @@ int CmdT55xxBruteForce(const char *Cmd) {

uint32_t start_password = 0x00000000; //start password\r

uint32_t end_password = 0xFFFFFFFF; //end password\r

bool found = false;\r

uint32_t start_password = 0x00000000; //start password\r

uint32_t end_password = 0xFFFFFFFF; //end password\r

bool found = false;\r

-\r

+ uint8_t downlink_mode = 0;\r

+ bool try_all_dl_modes = false;\r

+ uint8_t dl_mode = 0;\r

+ uint8_t cmd_offset = 0;\r

+ int cmd_opt = 0;\r

+ \r

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

+ \r

if (cmdp == 'h' || cmdp == 'H') return usage_t55xx_bruteforce();\r

+ if (cmdp == 'r' || cmdp == 'R') {\r

+ downlink_mode = param_getchar(Cmd, 1) - '0'; // get 2nd option, as this is fixed order.\r

+ if (downlink_mode == 4) try_all_dl_modes = true;\r

+ if (downlink_mode > 3) downlink_mode = 0;\r

+ cmd_opt += 2; // To help start/end passwords for range to be found\r

+ cmd_offset += 4; // r <sp> x <sp> To help the string offset for filename start position in cmd\r

+ cmdp = param_getchar(Cmd, 2); // get 3rd option, as this is fixed order.\r

+ }\r

keyBlock = calloc(stKeyBlock, 6);\r

if (keyBlock == NULL) return 1;\r

keyBlock = calloc(stKeyBlock, 6);\r

if (keyBlock == NULL) return 1;\r

@@ -1415,7 +1486,7 @@ int CmdT55xxBruteForce(const char *Cmd) {

int len = strlen(Cmd+2);\r

if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;\r

int len = strlen(Cmd+2);\r

if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;\r

- memcpy(filename, Cmd+2, len);\r

+ memcpy(filename, Cmd+2+cmd_offset, len);\r

FILE * f = fopen( filename , "r");\r

@@ -1480,20 +1551,29 @@ int CmdT55xxBruteForce(const char *Cmd) {

testpwd = bytes_to_num(keyBlock + 4*c, 4);\r

PrintAndLog("Testing %08X", testpwd);\r

testpwd = bytes_to_num(keyBlock + 4*c, 4);\r

PrintAndLog("Testing %08X", testpwd);\r

+ \r

+ // Try each downlink_mode if asked to \r

+ // donwlink_mode will = 0 if > 3 or set to 0, so loop from 0 - 3\r

+ for (dl_mode = downlink_mode; dl_mode <= 3; dl_mode++){\r

+ if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, testpwd, dl_mode)) {\r

+ PrintAndLog("Acquiring data from device failed. Quitting");\r

+ free(keyBlock);\r

+ return 0;\r

+ }\r

- if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, testpwd)) {\r

- PrintAndLog("Aquireing data from device failed. Quitting");\r

- free(keyBlock);\r

- return 0;\r

- }\r

+ found = tryDetectModulation();\r

- found = tryDetectModulation();\r

+ if ( found ) {\r

+ PrintAndLog("Found valid password: [%08X]", testpwd);\r

+ free(keyBlock);\r

+ \r

+ T55xx_Print_DownlinkMode (dl_mode);\r

- if ( found ) {\r

- PrintAndLog("Found valid password: [%08X]", testpwd);\r

- free(keyBlock);\r

- return 0;\r

- }\r

+ return 0;\r

+ }\r

+ if (!try_all_dl_modes) // Exit loop if not trying all downlink modes\r

+ dl_mode = 4;\r

+ } \r

}\r

PrintAndLog("Password NOT found.");\r

free(keyBlock);\r

}\r

PrintAndLog("Password NOT found.");\r

free(keyBlock);\r

@@ -1503,8 +1583,8 @@ int CmdT55xxBruteForce(const char *Cmd) {

// Try to read Block 7, first :)\r

// incremental pwd range search\r

// Try to read Block 7, first :)\r

// incremental pwd range search\r

- start_password = param_get32ex(Cmd, 0, 0, 16);\r

- end_password = param_get32ex(Cmd, 1, 0, 16);\r

+ start_password = param_get32ex(Cmd, cmd_opt , 0, 16);\r

+ end_password = param_get32ex(Cmd, cmd_opt+1 , 0, 16);\r

if ( start_password >= end_password ) {\r

free(keyBlock);\r

if ( start_password >= end_password ) {\r

free(keyBlock);\r

@@ -1525,29 +1605,36 @@ int CmdT55xxBruteForce(const char *Cmd) {

free(keyBlock);\r

return 0;\r

}\r

free(keyBlock);\r

return 0;\r

}\r

+ // Try each downlink_mode if asked to \r

+ // donwlink_mode will = 0 if > 3 or set to 0, so loop from 0 - 3\r

+ for (dl_mode = downlink_mode; dl_mode <= 3; dl_mode++){\r

+ if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, i,dl_mode)) {\r

+ PrintAndLog("Acquiring data from device failed. Quitting");\r

+ free(keyBlock);\r

+ return 0;\r

+ }\r

+ found = tryDetectModulation();\r

- if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, i)) {\r

- PrintAndLog("Aquireing data from device failed. Quitting");\r

- free(keyBlock);\r

- return 0;\r

+ if (found) break;\r

+ if (!try_all_dl_modes) // Exit loop if not trying all downlink modes\r

+ dl_mode = 4; \r

}\r

- found = tryDetectModulation();\r

-\r

if (found) break;\r

i++;\r

}\r

if (found) break;\r

i++;\r

}\r

- PrintAndLog("");\r

-\r

- if (found)\r

+ if (found){\r

PrintAndLog("Found valid password: [%08x]", i);\r

- else\r

+ T55xx_Print_DownlinkMode (downlink_mode);\r

+ }\r

+ else{\r

+ PrintAndLog("");\r

PrintAndLog("Password NOT found. Last tried: [%08x]", --i);\r

+ }\r

free(keyBlock);\r

return 0;\r

}\r

free(keyBlock);\r

return 0;\r

}\r

-\r

// note length of data returned is different for different chips. \r

// some return all page 1 (64 bits) and others return just that block (32 bits) \r

// unfortunately the 64 bits makes this more likely to get a false positive...\r

// note length of data returned is different for different chips. \r

// some return all page 1 (64 bits) and others return just that block (32 bits) \r

// unfortunately the 64 bits makes this more likely to get a false positive...\r

@@ -1559,7 +1646,7 @@ bool tryDetectP1(bool getData) {

bool st = true;\r

if ( getData ) {\r

bool st = true;\r

if ( getData ) {\r

- if ( !AquireData(T55x7_PAGE1, 1, false, 0) )\r

+ if ( !AquireData(T55x7_PAGE1, 1, false, 0,0) )\r

return false;\r

}\r

return false;\r

}\r

@@ -1688,7 +1775,7 @@ int CmdT55xxDetectPage1(const char *Cmd){

if (errors) return usage_t55xx_detectP1();\r

if ( !useGB ) {\r

if (errors) return usage_t55xx_detectP1();\r

if ( !useGB ) {\r

- if ( !AquireData(T55x7_PAGE1, 1, usepwd, password) )\r

+ if ( !AquireData(T55x7_PAGE1, 1, usepwd, password,0) )\r

return false;\r

}\r

bool success = tryDetectP1(false);\r

return false;\r

}\r

bool success = tryDetectP1(false);\r

@@ -1698,7 +1785,7 @@ int CmdT55xxDetectPage1(const char *Cmd){

static command_t CommandTable[] = {\r

{"help", CmdHelp, 1, "This help"},\r

static command_t CommandTable[] = {\r

{"help", CmdHelp, 1, "This help"},\r

- {"bruteforce",CmdT55xxBruteForce,0, "<start password> <end password> [i <*.dic>] Simple bruteforce attack to find password"},\r

+ {"bruteforce",CmdT55xxBruteForce,0, "<start password> <end password> [i <*.dic>] Simple bruteforce attack to find password"},\r

{"config", CmdT55xxSetConfig, 1, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"},\r

{"detect", CmdT55xxDetect, 1, "[1] Try detecting the tag modulation from reading the configuration block."},\r

{"p1detect", CmdT55xxDetectPage1,1, "[1] Try detecting if this is a t55xx tag by reading page 1"},\r

{"config", CmdT55xxSetConfig, 1, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"},\r

{"detect", CmdT55xxDetect, 1, "[1] Try detecting the tag modulation from reading the configuration block."},\r

{"p1detect", CmdT55xxDetectPage1,1, "[1] Try detecting if this is a t55xx tag by reading page 1"},\r