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

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c

index 97061c56fe664c14d942074549370b9daef70390..c64e5ef24eb00b68348d070a7b93c646de878b59 100644 (file)

--- a/client/cmdlft55xx.c

+++ b/client/cmdlft55xx.c

@@ -7,33 +7,33 @@

// Low frequency T55xx commands\r

//-----------------------------------------------------------------------------\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 "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 "cmdlft55xx.h"\r

#include "util.h"\r

-#include "data.h"\r

#include "lfdemod.h"\r

-#include "../common/crc.h"\r

-#include "../common/iso14443crc.h"\r

-#include "cmdhf14a.h"\r

+#include "protocols.h"\r

+#include "taginfo.h"\r

\r

#define T55x7_CONFIGURATION_BLOCK 0x00\r

#define T55x7_PAGE0 0x00\r

#define T55x7_PAGE1 0x01\r

-#define T55x7_PWD 0x00000010\r

+//#define T55x7_PWD 0x00000010\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, .Q5 = FALSE };\r

+t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inverted = false, .offset = 0x00, .block0 = 0x00, .Q5 = false };\r

\r

t55xx_conf_block_t Get_t55xx_Config(){\r

return config;\r

@@ -51,6 +51,7 @@ int usage_t55xx_config(){

PrintAndLog(" i [1] Invert data signal, defaults to normal");\r

PrintAndLog(" o [offset] Set offset, where data should start decode in bitstream");\r

PrintAndLog(" Q5 Set as Q5(T5555) chip instead of T55x7");\r

+ PrintAndLog(" ST Set Sequence Terminator on");\r

PrintAndLog("");\r

PrintAndLog("Examples:");\r

PrintAndLog(" lf t55xx config d FSK - FSK demodulation");\r

@@ -66,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(" 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

@@ -78,16 +81,19 @@ int usage_t55xx_read(){

return 0;\r

}\r

int usage_t55xx_write(){\r

- PrintAndLog("Usage: lf t55xx wr [b <block>] [d <data>] [p <password>] [1]");\r

+ PrintAndLog("Usage: lf t55xx write [b <block>] [d <data>] [p <password>] [1] [t]");\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(" 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 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(" lf t55xx write b 3 d 11223344 - write 11223344 to block 3");\r

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

PrintAndLog("");\r

return 0;\r

}\r

@@ -130,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(" 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

@@ -138,15 +146,29 @@ int usage_t55xx_detect(){

PrintAndLog("");\r

return 0;\r

}\r

+int usage_t55xx_detectP1(){\r

+ PrintAndLog("Command: Detect Page 1 of a t55xx chip");\r

+ PrintAndLog("Usage: lf t55xx p1detect [1] [p <password>]");\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

+ PrintAndLog("Examples:");\r

+ PrintAndLog(" lf t55xx p1detect");\r

+ PrintAndLog(" lf t55xx p1detect 1");\r

+ PrintAndLog(" lf t55xx p1detect p 11223344");\r

+ PrintAndLog("");\r

+ return 0;\r

+}\r

int usage_t55xx_wakup(){\r

- PrintAndLog("Usage: lf t55xx wakeup [h] p <password>");\r

+ PrintAndLog("Usage: lf t55xx wakeup [h] <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(" <password> - [required] password 4bytes (8 hex symbols)");\r

PrintAndLog("");\r

PrintAndLog("Examples:");\r

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

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

return 0;\r

}\r

int usage_t55xx_bruteforce(){\r

@@ -156,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(" 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(" 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

@@ -191,12 +216,12 @@ void printT5xxHeader(uint8_t page){

int CmdT55xxSetConfig(const char *Cmd) {\r

\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

uint8_t cmdp = 0;\r

- bool errors = FALSE;\r

+ bool errors = false;\r

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

{\r

tmp = param_getchar(Cmd, cmdp);\r

@@ -215,12 +240,12 @@ int CmdT55xxSetConfig(const char *Cmd) {

break;\r

}\r

- if (i==9) errors = TRUE;\r

+ if (i==9) errors = true;\r

}\r

cmdp+=2;\r

break;\r

case 'd':\r

- param_getstr(Cmd, cmdp+1, modulation);\r

+ param_getstr(Cmd, cmdp+1, modulation, sizeof(modulation));\r

cmdp += 2;\r

\r

if ( strcmp(modulation, "FSK" ) == 0) {\r

@@ -255,7 +280,7 @@ int CmdT55xxSetConfig(const char *Cmd) {

config.inverted=0;\r

} else {\r

PrintAndLog("Unknown modulation '%s'", modulation);\r

- errors = TRUE;\r

+ errors = true;\r

}\r

break;\r

case 'i':\r

@@ -270,32 +295,37 @@ int CmdT55xxSetConfig(const char *Cmd) {

break;\r

case 'Q':\r

case 'q': \r

- config.Q5 = TRUE;\r

+ config.Q5 = true;\r

+ cmdp++;\r

+ break;\r

+ case 'S':\r

+ case 's': \r

+ config.ST = true;\r

cmdp++;\r

break;\r

default:\r

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

- errors = TRUE;\r

+ errors = true;\r

break;\r

}\r

\r

// No args\r

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

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

\r

//Validations\r

if (errors) return usage_t55xx_config();\r

\r

config.block0 = 0;\r

- return printConfiguration ( config );\r

+ return printConfiguration ( config);\r

}\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

- 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

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

}\r

\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

\r

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

@@ -321,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

+ uint8_t downlink_mode = 0;\r

+ \r

bool usepwd = false;\r

bool override = false;\r

bool page1 = false;\r

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

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

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

}\r

\r

printT5xxHeader(page1);\r

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

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

}\r

\r

bool DecodeT55xxBlock(){\r

@@ -373,59 +411,60 @@ bool DecodeT55xxBlock(){

char buf[30] = {0x00};\r

char *cmdStr = buf;\r

int ans = 0;\r

+ bool ST = config.ST;\r

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

DemodBufferLen = 0x00;\r

\r

switch( config.modulation ){\r

case DEMOD_FSK:\r

snprintf(cmdStr, sizeof(buf),"%d %d", bitRate[config.bitrate], config.inverted );\r

- ans = FSKrawDemod(cmdStr, FALSE);\r

+ ans = FSKrawDemod(cmdStr, false);\r

break;\r

case DEMOD_FSK1:\r

case DEMOD_FSK1a:\r

snprintf(cmdStr, sizeof(buf),"%d %d 8 5", bitRate[config.bitrate], config.inverted );\r

- ans = FSKrawDemod(cmdStr, FALSE);\r

+ ans = FSKrawDemod(cmdStr, false);\r

break;\r

case DEMOD_FSK2:\r

case DEMOD_FSK2a:\r

snprintf(cmdStr, sizeof(buf),"%d %d 10 8", bitRate[config.bitrate], config.inverted );\r

- ans = FSKrawDemod(cmdStr, FALSE);\r

+ ans = FSKrawDemod(cmdStr, false);\r

break;\r

case DEMOD_ASK:\r

snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );\r

- ans = ASKDemod(cmdStr, FALSE, FALSE, 1);\r

+ ans = ASKDemod_ext(cmdStr, false, false, 1, &ST);\r

break;\r

case DEMOD_PSK1:\r

// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)\r

- save_restoreGB(1);\r

+ save_restoreGB(GRAPH_SAVE);\r

CmdLtrim("160");\r

snprintf(cmdStr, sizeof(buf),"%d %d 6", bitRate[config.bitrate], config.inverted );\r

- ans = PSKDemod(cmdStr, FALSE);\r

+ ans = PSKDemod(cmdStr, false);\r

//undo trim samples\r

- save_restoreGB(0);\r

+ save_restoreGB(GRAPH_RESTORE);\r

break;\r

case DEMOD_PSK2: //inverted won't affect this\r

case DEMOD_PSK3: //not fully implemented\r

// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)\r

- save_restoreGB(1);\r

+ save_restoreGB(GRAPH_SAVE);\r

CmdLtrim("160");\r

snprintf(cmdStr, sizeof(buf),"%d 0 6", bitRate[config.bitrate] );\r

- ans = PSKDemod(cmdStr, FALSE);\r

+ ans = PSKDemod(cmdStr, false);\r

psk1TOpsk2(DemodBuffer, DemodBufferLen);\r

//undo trim samples\r

- save_restoreGB(0);\r

+ save_restoreGB(GRAPH_RESTORE);\r

break;\r

case DEMOD_NRZ:\r

snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );\r

- ans = NRZrawDemod(cmdStr, FALSE);\r

+ ans = NRZrawDemod(cmdStr, false);\r

break;\r

case DEMOD_BI:\r

case DEMOD_BIa:\r

snprintf(cmdStr, sizeof(buf),"0 %d %d 1", bitRate[config.bitrate], config.inverted );\r

- ans = ASKbiphaseDemod(cmdStr, FALSE);\r

+ ans = ASKbiphaseDemod(cmdStr, false);\r

break;\r

default:\r

- return FALSE;\r

+ return false;\r

}\r

return (bool) ans;\r

}\r

@@ -434,15 +473,35 @@ bool DecodeT5555TraceBlock() {

DemodBufferLen = 0x00;\r

\r

// According to datasheet. Always: RF/64, not inverted, Manchester\r

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

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

+}\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

+ 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

\r

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

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

@@ -452,14 +511,20 @@ int CmdT55xxDetect(const char *Cmd){

case 'p':\r

case 'P':\r

password = param_get32ex(Cmd, cmdp+1, 0, 16);\r

- usepwd = TRUE;\r

+ usepwd = true;\r

cmdp += 2;\r

break;\r

case '1':\r

// use Graphbuffer data\r

- useGB = TRUE;\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

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

if (errors) return usage_t55xx_detect();\r

\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

\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

\r

@@ -484,130 +552,140 @@ bool tryDetectModulation(){

uint8_t hits = 0;\r

t55xx_conf_block_t tests[15];\r

int bitRate=0;\r

- uint8_t fc1 = 0, fc2 = 0, clk=0;\r

-\r

- if (GetFskClock("", FALSE, FALSE)){ \r

- fskClocks(&fc1, &fc2, &clk, FALSE);\r

- if ( FSKrawDemod("0 0", FALSE) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

+ uint8_t fc1 = 0, fc2 = 0, ans = 0;\r

+ int clk = 0, firstClockEdge = 0;\r

+ ans = fskClocks(&fc1, &fc2, (uint8_t *)&clk, false, &firstClockEdge);\r

+ if (ans && ((fc1==10 && fc2==8) || (fc1==8 && fc2==5))) {\r

+ if ( FSKrawDemod("0 0", false) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

tests[hits].modulation = DEMOD_FSK;\r

if (fc1==8 && fc2 == 5)\r

tests[hits].modulation = DEMOD_FSK1a;\r

else if (fc1==10 && fc2 == 8)\r

tests[hits].modulation = DEMOD_FSK2;\r

tests[hits].bitrate = bitRate;\r

- tests[hits].inverted = FALSE;\r

+ tests[hits].inverted = false;\r

tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

+ tests[hits].ST = false;\r

++hits;\r

}\r

- if ( FSKrawDemod("0 1", FALSE) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

+ if ( FSKrawDemod("0 1", false) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

tests[hits].modulation = DEMOD_FSK;\r

if (fc1 == 8 && fc2 == 5)\r

tests[hits].modulation = DEMOD_FSK1;\r

else if (fc1 == 10 && fc2 == 8)\r

tests[hits].modulation = DEMOD_FSK2a;\r

tests[hits].bitrate = bitRate;\r

- tests[hits].inverted = TRUE;\r

+ tests[hits].inverted = true;\r

tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

+ tests[hits].ST = false;\r

++hits;\r

}\r

} else {\r

- clk = GetAskClock("", FALSE, FALSE);\r

+ clk = GetAskClock("", false, false);\r

if (clk>0) {\r

- if ( ASKDemod("0 0 1", FALSE, FALSE, 1) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

+ tests[hits].ST = true;\r

+ if ( ASKDemod_ext("0 0 1", false, false, 1, &tests[hits].ST) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

tests[hits].modulation = DEMOD_ASK;\r

tests[hits].bitrate = bitRate;\r

- tests[hits].inverted = FALSE;\r

+ tests[hits].inverted = false;\r

tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

++hits;\r

}\r

- if ( ASKDemod("0 1 1", FALSE, FALSE, 1) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

+ tests[hits].ST = true;\r

+ if ( ASKDemod_ext("0 1 1", false, false, 1, &tests[hits].ST) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

tests[hits].modulation = DEMOD_ASK;\r

tests[hits].bitrate = bitRate;\r

- tests[hits].inverted = TRUE;\r

+ tests[hits].inverted = true;\r

tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

++hits;\r

}\r

- if ( ASKbiphaseDemod("0 0 0 2", FALSE) && test(DEMOD_BI, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {\r

+ if ( ASKbiphaseDemod("0 0 0 2", false) && test(DEMOD_BI, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {\r

tests[hits].modulation = DEMOD_BI;\r

tests[hits].bitrate = bitRate;\r

- tests[hits].inverted = FALSE;\r

+ tests[hits].inverted = false;\r

tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

+ tests[hits].ST = false;\r

++hits;\r

}\r

- if ( ASKbiphaseDemod("0 0 1 2", FALSE) && test(DEMOD_BIa, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {\r

+ if ( ASKbiphaseDemod("0 0 1 2", false) && test(DEMOD_BIa, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {\r

tests[hits].modulation = DEMOD_BIa;\r

tests[hits].bitrate = bitRate;\r

- tests[hits].inverted = TRUE;\r

+ tests[hits].inverted = true;\r

tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

+ tests[hits].ST = false;\r

++hits;\r

}\r

- //undo trim from ask\r

- //save_restoreGB(0);\r

- clk = GetNrzClock("", FALSE, FALSE);\r

- if (clk>0) {\r

- if ( NRZrawDemod("0 0 1", FALSE) && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

+ clk = GetNrzClock("", false, false);\r

+ if (clk>8) { //clock of rf/8 is likely a false positive, so don't use it.\r

+ if ( NRZrawDemod("0 0 1", false) && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

tests[hits].modulation = DEMOD_NRZ;\r

tests[hits].bitrate = bitRate;\r

- tests[hits].inverted = FALSE;\r

+ tests[hits].inverted = false;\r

tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

+ tests[hits].ST = false;\r

++hits;\r

}\r

\r

- if ( NRZrawDemod("0 1 1", FALSE) && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

+ if ( NRZrawDemod("0 1 1", false) && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

tests[hits].modulation = DEMOD_NRZ;\r

tests[hits].bitrate = bitRate;\r

- tests[hits].inverted = TRUE;\r

+ tests[hits].inverted = true;\r

tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

+ tests[hits].ST = false;\r

++hits;\r

}\r

\r

- // allow undo\r

- // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)\r

- save_restoreGB(1);\r

- CmdLtrim("160");\r

- clk = GetPskClock("", FALSE, FALSE);\r

+ clk = GetPskClock("", false, false);\r

if (clk>0) {\r

- if ( PSKDemod("0 0 6", FALSE) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

+ // allow undo\r

+ save_restoreGB(GRAPH_SAVE);\r

+ // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)\r

+ CmdLtrim("160");\r

+ if ( PSKDemod("0 0 6", false) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

tests[hits].modulation = DEMOD_PSK1;\r

tests[hits].bitrate = bitRate;\r

- tests[hits].inverted = FALSE;\r

+ tests[hits].inverted = false;\r

tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

+ tests[hits].ST = false;\r

++hits;\r

}\r

- if ( PSKDemod("0 1 6", FALSE) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

+ if ( PSKDemod("0 1 6", false) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

tests[hits].modulation = DEMOD_PSK1;\r

tests[hits].bitrate = bitRate;\r

- tests[hits].inverted = TRUE;\r

+ tests[hits].inverted = true;\r

tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

+ tests[hits].ST = false;\r

++hits;\r

}\r

// PSK2 - needs a call to psk1TOpsk2.\r

- if ( PSKDemod("0 0 6", FALSE)) {\r

+ if ( PSKDemod("0 0 6", false)) {\r

psk1TOpsk2(DemodBuffer, DemodBufferLen);\r

if (test(DEMOD_PSK2, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){\r

tests[hits].modulation = DEMOD_PSK2;\r

tests[hits].bitrate = bitRate;\r

- tests[hits].inverted = FALSE;\r

+ tests[hits].inverted = false;\r

tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

+ tests[hits].ST = false;\r

++hits;\r

}\r

} // inverse waves does not affect this demod\r

// PSK3 - needs a call to psk1TOpsk2.\r

- if ( PSKDemod("0 0 6", FALSE)) {\r

+ if ( PSKDemod("0 0 6", false)) {\r

psk1TOpsk2(DemodBuffer, DemodBufferLen);\r

if (test(DEMOD_PSK3, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){\r

tests[hits].modulation = DEMOD_PSK3;\r

tests[hits].bitrate = bitRate;\r

- tests[hits].inverted = FALSE;\r

+ tests[hits].inverted = false;\r

tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

+ tests[hits].ST = false;\r

++hits;\r

}\r

} // inverse waves does not affect this demod\r

+ //undo trim samples\r

+ save_restoreGB(GRAPH_RESTORE);\r

}\r

- //undo trim samples\r

- save_restoreGB(0);\r

} \r

if ( hits == 1) {\r

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

@@ -616,79 +694,81 @@ bool tryDetectModulation(){

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

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

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

- printConfiguration( config );\r

- return TRUE;\r

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

+ \r

+ printConfiguration( config);\r

+ return true;\r

}\r

\r

if ( hits > 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

+ return false;\r

}\r

\r

bool testModulation(uint8_t mode, uint8_t modread){\r

switch( mode ){\r

case DEMOD_FSK:\r

- if (modread >= DEMOD_FSK1 && modread <= DEMOD_FSK2a) return TRUE;\r

+ if (modread >= DEMOD_FSK1 && modread <= DEMOD_FSK2a) return true;\r

break;\r

case DEMOD_ASK:\r

- if (modread == DEMOD_ASK) return TRUE;\r

+ if (modread == DEMOD_ASK) return true;\r

break;\r

case DEMOD_PSK1:\r

- if (modread == DEMOD_PSK1) return TRUE;\r

+ if (modread == DEMOD_PSK1) return true;\r

break;\r

case DEMOD_PSK2:\r

- if (modread == DEMOD_PSK2) return TRUE;\r

+ if (modread == DEMOD_PSK2) return true;\r

break;\r

case DEMOD_PSK3:\r

- if (modread == DEMOD_PSK3) return TRUE;\r

+ if (modread == DEMOD_PSK3) return true;\r

break;\r

case DEMOD_NRZ:\r

- if (modread == DEMOD_NRZ) return TRUE;\r

+ if (modread == DEMOD_NRZ) return true;\r

break;\r

case DEMOD_BI:\r

- if (modread == DEMOD_BI) return TRUE;\r

+ if (modread == DEMOD_BI) return true;\r

break;\r

case DEMOD_BIa:\r

- if (modread == DEMOD_BIa) return TRUE;\r

+ if (modread == DEMOD_BIa) return true;\r

break; \r

default:\r

- return FALSE;\r

+ return false;\r

}\r

- return FALSE;\r

+ return false;\r

}\r

\r

bool testQ5Modulation(uint8_t mode, uint8_t modread){\r

switch( mode ){\r

case DEMOD_FSK:\r

- if (modread >= 4 && modread <= 5) return TRUE;\r

+ if (modread >= 4 && modread <= 5) return true;\r

break;\r

case DEMOD_ASK:\r

- if (modread == 0) return TRUE;\r

+ if (modread == 0) return true;\r

break;\r

case DEMOD_PSK1:\r

- if (modread == 1) return TRUE;\r

+ if (modread == 1) return true;\r

break;\r

case DEMOD_PSK2:\r

- if (modread == 2) return TRUE;\r

+ if (modread == 2) return true;\r

break;\r

case DEMOD_PSK3:\r

- if (modread == 3) return TRUE;\r

+ if (modread == 3) return true;\r

break;\r

case DEMOD_NRZ:\r

- if (modread == 7) return TRUE;\r

+ if (modread == 7) return true;\r

break;\r

case DEMOD_BI:\r

- if (modread == 6) return TRUE;\r

+ if (modread == 6) return true;\r

break;\r

default:\r

- return FALSE;\r

+ return false;\r

}\r

- return FALSE;\r

+ return false;\r

}\r

\r

int convertQ5bitRate(uint8_t bitRateRead) {\r

@@ -702,7 +782,7 @@ int convertQ5bitRate(uint8_t bitRateRead) {

\r

bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk){\r

\r

- if ( DemodBufferLen < 64 ) return FALSE;\r

+ if ( DemodBufferLen < 64 ) return false;\r

uint8_t si = 0;\r

for (uint8_t idx = 28; idx < 64; idx++){\r

si = idx;\r

@@ -735,9 +815,9 @@ bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk){

if (*fndBitRate < 0) continue;\r

*offset = idx;\r

\r

- return TRUE;\r

+ return true;\r

}\r

- return FALSE;\r

+ return false;\r

}\r

\r

bool testBitRate(uint8_t readRate, uint8_t clk){\r

@@ -750,7 +830,7 @@ bool testBitRate(uint8_t readRate, uint8_t clk){

\r

bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5){\r

\r

- if ( DemodBufferLen < 64 ) return FALSE;\r

+ if ( DemodBufferLen < 64 ) return false;\r

uint8_t si = 0;\r

for (uint8_t idx = 28; idx < 64; idx++){\r

si = idx;\r

@@ -762,34 +842,35 @@ bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5)

// moved test to here, since this gets most faults first.\r

if ( resv > 0x00) continue;\r

\r

- uint8_t xtRate = PackBits(si, 3, DemodBuffer); si += 3; //extended mode part of rate\r

- int bitRate = PackBits(si, 3, DemodBuffer); si += 3; //bit rate\r

- if (bitRate > 7) continue;\r

+ int bitRate = PackBits(si, 6, DemodBuffer); si += 6; //bit rate (includes extended mode part of rate)\r

uint8_t extend = PackBits(si, 1, DemodBuffer); si += 1; //bit 15 extended mode\r

uint8_t modread = PackBits(si, 5, DemodBuffer); si += 5+2+1; \r

//uint8_t pskcr = PackBits(si, 2, DemodBuffer); si += 2+1; //could check psk cr\r

- uint8_t nml01 = PackBits(si, 1, DemodBuffer); si += 1+5; //bit 24, 30, 31 could be tested for 0 if not extended mode\r

- uint8_t nml02 = PackBits(si, 2, DemodBuffer); si += 2;\r

+ //uint8_t nml01 = PackBits(si, 1, DemodBuffer); si += 1+5; //bit 24, 30, 31 could be tested for 0 if not extended mode\r

+ //uint8_t nml02 = PackBits(si, 2, DemodBuffer); si += 2;\r

\r

//if extended mode\r

- bool extMode =( (safer == 0x6 || safer == 0x9) && extend) ? TRUE : FALSE;\r

+ bool extMode =( (safer == 0x6 || safer == 0x9) && extend) ? true : false;\r

+\r

+ if (!extMode) {\r

+ if (bitRate > 7) continue;\r

+ if (!testBitRate(bitRate, clk)) continue;\r

+ } else { //extended mode bitrate = same function to calc bitrate as em4x05\r

+ if (EM4x05_GET_BITRATE(bitRate) != clk) continue;\r

\r

- if (!extMode){\r

- if (nml01 || nml02 || xtRate) continue;\r

}\r

//test modulation\r

if (!testModulation(mode, modread)) continue;\r

- if (!testBitRate(bitRate, clk)) continue;\r

*fndBitRate = bitRate;\r

*offset = idx;\r

- *Q5 = FALSE;\r

- return TRUE;\r

+ *Q5 = false;\r

+ return true;\r

}\r

if (testQ5(mode, offset, fndBitRate, clk)) {\r

- *Q5 = TRUE;\r

- return TRUE;\r

+ *Q5 = true;\r

+ return true;\r

}\r

- return FALSE;\r

+ return false;\r

}\r

\r

void printT55xxBlock(const char *blockNum){\r

@@ -836,9 +917,10 @@ int special(const char *Cmd) {

int printConfiguration( t55xx_conf_block_t b){\r

PrintAndLog("Chip Type : %s", (b.Q5) ? "T5555(Q5)" : "T55x7");\r

PrintAndLog("Modulation : %s", GetSelectedModulationStr(b.modulation) );\r

- PrintAndLog("Bit Rate : %s", GetBitRateStr(b.bitrate) );\r

+ PrintAndLog("Bit Rate : %s", GetBitRateStr(b.bitrate, (b.block0 & T55x7_X_MODE && (b.block0>>28==6 || b.block0>>28==9))) );\r

PrintAndLog("Inverted : %s", (b.inverted) ? "Yes" : "No" );\r

PrintAndLog("Offset : %d", b.offset);\r

+ PrintAndLog("Seq. Term. : %s", (b.ST) ? "Yes" : "No" );\r

PrintAndLog("Block0 : 0x%08X", b.block0);\r

PrintAndLog("");\r

return 0;\r

@@ -846,26 +928,11 @@ int printConfiguration( t55xx_conf_block_t b){

\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

- if (errors) return usage_t55xx_wakup();\r

+ if ( strlen(Cmd) <= 0 ) return usage_t55xx_wakup();\r

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

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

+\r

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

\r

UsbCommand c = {CMD_T55XX_WAKEUP, {password, 0, 0}};\r

clearCommandBuffer();\r

@@ -878,9 +945,12 @@ 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

+ uint32_t downlink_mode = 0;\r

+ \r

bool usepwd = false;\r

bool page1 = false; \r

bool gotdata = false;\r

+ bool testMode = false;\r

bool errors = false;\r

uint8_t cmdp = 0;\r

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

@@ -905,10 +975,21 @@ int CmdT55xxWriteBlock(const char *Cmd) {

usepwd = true;\r

cmdp += 2;\r

break;\r

+ case 't':\r

+ case 'T':\r

+ testMode = true;\r

+ cmdp++;\r

+ break;\r

case '1':\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

@@ -925,17 +1006,20 @@ int CmdT55xxWriteBlock(const char *Cmd) {

UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};\r

UsbCommand resp;\r

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

-\r

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

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

+ \r

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

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

\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

+ \r

clearCommandBuffer();\r

SendCommand(&c);\r

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

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

return usage_t55xx_trace();\r

\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

\r

if ( config.Q5 ) {\r

@@ -1043,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(" 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

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

return usage_t55xx_info();\r

\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

\r

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

@@ -1149,7 +1233,7 @@ int CmdT55xxInfo(const char *Cmd){

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

PrintAndLog(" Safer key : %s", GetSaferStr(safer));\r

PrintAndLog(" reserved : %d", resv);\r

- PrintAndLog(" Data bit rate : %s", GetBitRateStr(dbr));\r

+ PrintAndLog(" Data bit rate : %s", GetBitRateStr(dbr, extend));\r

PrintAndLog(" eXtended mode : %s", (extend) ? "Yes - Warning":"No");\r

PrintAndLog(" Modulation : %s", GetModulationStr(datamod));\r

PrintAndLog(" PSK clock frequency : %d", pskcf);\r

@@ -1176,7 +1260,7 @@ int CmdT55xxDump(const char *Cmd){

bool override = false;\r

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

\r

- bool usepwd = ( strlen(Cmd) > 0); \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

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

\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

\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

\r

return 1;\r

}\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 |= (downlink_mode << 3);\r

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

\r

clearCommandBuffer();\r

@@ -1207,28 +1292,28 @@ int AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password ){

PrintAndLog("command execution time out");\r

return 0;\r

}\r

-\r

- uint8_t got[12000];\r

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

- WaitForResponse(CMD_ACK,NULL);\r

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

+ getSamples(12000,true);\r

return 1;\r

}\r

\r

-char * GetBitRateStr(uint32_t id) {\r

+char * GetBitRateStr(uint32_t id, bool xmode) {\r

static char buf[25];\r

\r

char *retStr = buf;\r

- switch (id) {\r

- case 0: snprintf(retStr,sizeof(buf),"%d - RF/8",id); break;\r

- case 1: snprintf(retStr,sizeof(buf),"%d - RF/16",id); break;\r

- case 2: snprintf(retStr,sizeof(buf),"%d - RF/32",id); break;\r

- case 3: snprintf(retStr,sizeof(buf),"%d - RF/40",id); break;\r

- case 4: snprintf(retStr,sizeof(buf),"%d - RF/50",id); break;\r

- case 5: snprintf(retStr,sizeof(buf),"%d - RF/64",id); break;\r

- case 6: snprintf(retStr,sizeof(buf),"%d - RF/100",id); break;\r

- case 7: snprintf(retStr,sizeof(buf),"%d - RF/128",id); break;\r

- default: snprintf(retStr,sizeof(buf),"%d - (Unknown)",id); break;\r

+ if (xmode) { //xmode bitrate calc is same as em4x05 calc\r

+ snprintf(retStr,sizeof(buf),"%d - RF/%d", id, EM4x05_GET_BITRATE(id));\r

+ } else {\r

+ switch (id) {\r

+ case 0: snprintf(retStr,sizeof(buf),"%d - RF/8",id); break;\r

+ case 1: snprintf(retStr,sizeof(buf),"%d - RF/16",id); break;\r

+ case 2: snprintf(retStr,sizeof(buf),"%d - RF/32",id); break;\r

+ case 3: snprintf(retStr,sizeof(buf),"%d - RF/40",id); break;\r

+ case 4: snprintf(retStr,sizeof(buf),"%d - RF/50",id); break;\r

+ case 5: snprintf(retStr,sizeof(buf),"%d - RF/64",id); break;\r

+ case 6: snprintf(retStr,sizeof(buf),"%d - RF/100",id); break;\r

+ case 7: snprintf(retStr,sizeof(buf),"%d - RF/128",id); break;\r

+ default: snprintf(retStr,sizeof(buf),"%d - (Unknown)",id); break;\r

+ } \r

}\r

return buf;\r

}\r

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

}\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

@@ -1371,23 +1455,38 @@ int CmdT55xxBruteForce(const char *Cmd) {

char buf[9];\r

char filename[FILE_PATH_SIZE]={0};\r

int keycnt = 0;\r

+ int ch;\r

uint8_t stKeyBlock = 20;\r

- uint8_t *keyBlock = NULL, *p;\r

- keyBlock = calloc(stKeyBlock, 6);\r

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

-\r

+ uint8_t *keyBlock = NULL, *p = NULL;\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

+\r

+ keyBlock = calloc(stKeyBlock, 6);\r

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

\r

if (cmdp == 'i' || cmdp == 'I') {\r

\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

\r

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

\r

@@ -1405,7 +1504,7 @@ int CmdT55xxBruteForce(const char *Cmd) {

//The line start with # is comment, skip\r

if( buf[0]=='#' ) continue;\r

\r

- if (!isxdigit(buf[0])) {\r

+ if (!isxdigit((unsigned char)buf[0])) {\r

PrintAndLog("File content error. '%s' must include 8 HEX symbols", buf);\r

continue;\r

}\r

@@ -1417,6 +1516,7 @@ int CmdT55xxBruteForce(const char *Cmd) {

if (!p) {\r

PrintAndLog("Cannot allocate memory for defaultKeys");\r

free(keyBlock);\r

+ fclose(f);\r

return 2;\r

}\r

keyBlock = p;\r

@@ -1431,6 +1531,7 @@ int CmdT55xxBruteForce(const char *Cmd) {

\r

if (keycnt == 0) {\r

PrintAndLog("No keys found in file");\r

+ free(keyBlock);\r

return 1;\r

}\r

PrintAndLog("Loaded %d keys", keycnt);\r

@@ -1440,39 +1541,55 @@ int CmdT55xxBruteForce(const char *Cmd) {

for (uint16_t c = 0; c < keycnt; ++c ) {\r

\r

if (ukbhit()) {\r

- getchar();\r

+ ch = getchar();\r

+ (void)ch;\r

printf("\naborted via keyboard!\n");\r

+ free(keyBlock);\r

return 0;\r

}\r

\r

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

\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

\r

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

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

- return 0;\r

- }\r

+ found = tryDetectModulation();\r

\r

- found = tryDetectModulation();\r

+ if ( found ) {\r

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

+ free(keyBlock);\r

+ \r

+ T55xx_Print_DownlinkMode (dl_mode);\r

\r

- if ( found ) {\r

- PrintAndLog("Found valid password: [%08X]", testpwd);\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

return 0;\r

}\r

\r

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

\r

// incremental pwd range search\r

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

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

-\r

- if ( start_password >= end_password ) return usage_t55xx_bruteforce();\r

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

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

\r

+ if ( start_password >= end_password ) {\r

+ free(keyBlock);\r

+ return usage_t55xx_bruteforce();\r

+ }\r

PrintAndLog("Search password range [%08X -> %08X]", start_password, end_password);\r

\r

uint32_t i = start_password;\r

@@ -1482,35 +1599,196 @@ int CmdT55xxBruteForce(const char *Cmd) {

printf(".");\r

fflush(stdout);\r

if (ukbhit()) {\r

- getchar();\r

+ ch = getchar();\r

+ (void)ch;\r

printf("\naborted via keyboard!\n");\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

\r

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

- PrintAndLog("Aquireing data from device failed. Quitting");\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

\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

+\r

+ free(keyBlock);\r

return 0;\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

+bool tryDetectP1(bool getData) {\r

+ uint8_t preamble[] = {1,1,1,0,0,0,0,0,0,0,0,1,0,1,0,1};\r

+ size_t startIdx = 0;\r

+ uint8_t fc1 = 0, fc2 = 0, ans = 0;\r

+ int clk = 0, firstClockEdge = 0;\r

+ bool st = true;\r

+\r

+ if ( getData ) {\r

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

+ return false;\r

+ }\r

+\r

+ // try fsk clock detect. if successful it cannot be any other type of modulation... (in theory...)\r

+ ans = fskClocks(&fc1, &fc2, (uint8_t *)&clk, false, &firstClockEdge);\r

+ if (ans && ((fc1==10 && fc2==8) || (fc1==8 && fc2==5))) {\r

+ if ( FSKrawDemod("0 0", false) && \r

+ preambleSearchEx(DemodBuffer,preamble,sizeof(preamble),&DemodBufferLen,&startIdx,false) && \r

+ (DemodBufferLen == 32 || DemodBufferLen == 64) ) {\r

+ return true;\r

+ }\r

+ if ( FSKrawDemod("0 1", false) && \r

+ preambleSearchEx(DemodBuffer,preamble,sizeof(preamble),&DemodBufferLen,&startIdx,false) && \r

+ (DemodBufferLen == 32 || DemodBufferLen == 64) ) {\r

+ return true;\r

+ }\r

+ return false;\r

+ }\r

+\r

+ // try psk clock detect. if successful it cannot be any other type of modulation... (in theory...)\r

+ clk = GetPskClock("", false, false);\r

+ if (clk>0) {\r

+ // allow undo\r

+ // save_restoreGB(1);\r

+ // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)\r

+ //CmdLtrim("160");\r

+ if ( PSKDemod("0 0 6", false) &&\r

+ preambleSearchEx(DemodBuffer,preamble,sizeof(preamble),&DemodBufferLen,&startIdx,false) && \r

+ (DemodBufferLen == 32 || DemodBufferLen == 64) ) {\r

+ //save_restoreGB(0);\r

+ return true;\r

+ }\r

+ if ( PSKDemod("0 1 6", false) &&\r

+ preambleSearchEx(DemodBuffer,preamble,sizeof(preamble),&DemodBufferLen,&startIdx,false) && \r

+ (DemodBufferLen == 32 || DemodBufferLen == 64) ) {\r

+ //save_restoreGB(0);\r

+ return true;\r

+ }\r

+ // PSK2 - needs a call to psk1TOpsk2.\r

+ if ( PSKDemod("0 0 6", false)) {\r

+ psk1TOpsk2(DemodBuffer, DemodBufferLen);\r

+ if (preambleSearchEx(DemodBuffer,preamble,sizeof(preamble),&DemodBufferLen,&startIdx,false) && \r

+ (DemodBufferLen == 32 || DemodBufferLen == 64) ) {\r

+ //save_restoreGB(0);\r

+ return true;\r

+ }\r

+ } // inverse waves does not affect PSK2 demod\r

+ //undo trim samples\r

+ //save_restoreGB(0); \r

+ // no other modulation clocks = 2 or 4 so quit searching\r

+ if (fc1 != 8) return false;\r

+ }\r

+\r

+ // try ask clock detect. it could be another type even if successful.\r

+ clk = GetAskClock("", false, false);\r

+ if (clk>0) {\r

+ if ( ASKDemod_ext("0 0 1", false, false, 1, &st) &&\r

+ preambleSearchEx(DemodBuffer,preamble,sizeof(preamble),&DemodBufferLen,&startIdx,false) && \r

+ (DemodBufferLen == 32 || DemodBufferLen == 64) ) {\r

+ return true;\r

+ }\r

+ st = true;\r

+ if ( ASKDemod_ext("0 1 1", false, false, 1, &st) &&\r

+ preambleSearchEx(DemodBuffer,preamble,sizeof(preamble),&DemodBufferLen,&startIdx,false) && \r

+ (DemodBufferLen == 32 || DemodBufferLen == 64) ) {\r

+ return true;\r

+ }\r

+ if ( ASKbiphaseDemod("0 0 0 2", false) &&\r

+ preambleSearchEx(DemodBuffer,preamble,sizeof(preamble),&DemodBufferLen,&startIdx,false) && \r

+ (DemodBufferLen == 32 || DemodBufferLen == 64) ) {\r

+ return true;\r

+ }\r

+ if ( ASKbiphaseDemod("0 0 1 2", false) &&\r

+ preambleSearchEx(DemodBuffer,preamble,sizeof(preamble),&DemodBufferLen,&startIdx,false) && \r

+ (DemodBufferLen == 32 || DemodBufferLen == 64) ) {\r

+ return true;\r

+ }\r

+\r

+ // try NRZ clock detect. it could be another type even if successful.\r

+ clk = GetNrzClock("", false, false); //has the most false positives :(\r

+ if (clk>0) {\r

+ if ( NRZrawDemod("0 0 1", false) &&\r

+ preambleSearchEx(DemodBuffer,preamble,sizeof(preamble),&DemodBufferLen,&startIdx,false) && \r

+ (DemodBufferLen == 32 || DemodBufferLen == 64) ) {\r

+ return true;\r

+ }\r

+ if ( NRZrawDemod("0 1 1", false) &&\r

+ preambleSearchEx(DemodBuffer,preamble,sizeof(preamble),&DemodBufferLen,&startIdx,false) && \r

+ (DemodBufferLen == 32 || DemodBufferLen == 64) ) {\r

+ return true;\r

+ }\r

+ return false;\r

+}\r

+// does this need to be a callable command?\r

+int CmdT55xxDetectPage1(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

+\r

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

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

+ case 'h':\r

+ case 'H':\r

+ return usage_t55xx_detectP1();\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

+ // use Graphbuffer data\r

+ useGB = true;\r

+ cmdp++;\r

+ break;\r

+ default:\r

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

+ errors = true;\r

+ break;\r

+ }\r

+ if (errors) return usage_t55xx_detectP1();\r

+\r

+ if ( !useGB ) {\r

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

+ return false;\r

+ }\r

+ bool success = tryDetectP1(false);\r

+ if (success) PrintAndLog("T55xx chip found!");\r

+ return success;\r

+}\r

\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

{"read", CmdT55xxReadBlock, 0, "b <block> p [password] [o] [1] -- Read T55xx block data. Optional [p password], [override], [page1]"},\r

{"resetread", CmdResetRead, 0, "Send Reset Cmd then lf read the stream to attempt to identify the start of it (needs a demod and/or plot after)"},\r

{"write", CmdT55xxWriteBlock,0, "b <block> d <data> p [password] [1] -- Write T55xx block data. Optional [p password], [page1]"},\r