#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 "ui.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 "cmdhf14a.h" //for getTagInfo\r
+#include "protocols.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
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
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
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
PrintAndLog("");\r
return 0;\r
}\r
+int usage_t55xx_detectP1(){\r
+ PrintAndLog("Usage: lf t55xx page1detect [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 page1detect");\r
+ PrintAndLog(" lf t55xx page1detect 1");\r
+ PrintAndLog(" lf t55xx page1detect 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
PrintAndLog("");\r
return 0;\r
}\r
+int usage_t55xx_wipe(){\r
+ PrintAndLog("Usage: lf t55xx wipe [h] [Q5]");\r
+ PrintAndLog("This commands wipes a tag, fills blocks 1-7 with zeros and a default configuration block");\r
+ PrintAndLog("Options:");\r
+ PrintAndLog(" h - this help");\r
+ PrintAndLog(" Q5 - indicates to use the T5555 (Q5) default configuration block");\r
+ PrintAndLog("");\r
+ PrintAndLog("Examples:");\r
+ PrintAndLog(" lf t55xx wipe - wipes a t55x7 tag, config block 0x000880E0");\r
+ PrintAndLog(" lf t55xx wipe Q5 - wipes a t5555 Q5 tag, config block 0x6001F004");\r
+ return 0;\r
+}\r
+\r
\r
static int CmdHelp(const char *Cmd);\r
\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
- config.Q5 = FALSE;\r
- bool errors = FALSE;\r
+ bool errors = false;\r
while(param_getchar(Cmd, cmdp) != 0x00 && !errors)\r
{\r
tmp = param_getchar(Cmd, cmdp);\r
break;\r
}\r
}\r
- if (i==9) errors = TRUE;\r
+ if (i==9) errors = true;\r
}\r
cmdp+=2;\r
break;\r
config.inverted=0;\r
} else {\r
PrintAndLog("Unknown modulation '%s'", modulation);\r
- errors = TRUE;\r
+ errors = true;\r
}\r
break;\r
case 'i':\r
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
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
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
break;\r
save_restoreGB(1);\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
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
\r
+bool DecodeT5555TraceBlock() {\r
+ DemodBufferLen = 0x00;\r
+ \r
+ // According to datasheet. Always: RF/64, not inverted, Manchester\r
+ return (bool) ASKDemod("64 0 1", false, false, 1);\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
\r
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
default:\r
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;\r
+ ans = fskClocks(&fc1, &fc2, (uint8_t *)&clk, false);\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
}\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
\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(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) && 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(0);\r
}\r
- //undo trim samples\r
- save_restoreGB(0);\r
} \r
if ( hits == 1) {\r
config.modulation = tests[0].modulation;\r
config.offset = tests[0].offset;\r
config.block0 = tests[0].block0;\r
config.Q5 = tests[0].Q5;\r
+ config.ST = tests[0].ST;\r
printConfiguration( config );\r
- return TRUE;\r
+ return true;\r
}\r
\r
if ( hits > 1) {\r
printConfiguration( tests[i] );\r
}\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
+ uint8_t expected[] = {8, 16, 32, 40, 50, 64, 100, 128};\r
+ for (int i=0; i<8; i++)\r
+ if (expected[i] == bitRateRead)\r
+ return i;\r
+\r
+ return -1;\r
}\r
\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
//test modulation\r
if (!testQ5Modulation(mode, modread)) continue;\r
if (bitRate != clk) continue;\r
- *fndBitRate = bitRate;\r
+ *fndBitRate = convertQ5bitRate(bitRate);\r
+ 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
\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
// 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 (nml01 || nml02 || xtRate) continue;\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
//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
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)) );\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
\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
- 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
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
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
UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};\r
UsbCommand resp;\r
c.d.asBytes[0] = (page1) ? 0x2 : 0; \r
+ c.d.asBytes[0] |= (testMode) ? 0x4 : 0; \r
\r
char pwdStr[16] = {0};\r
snprintf(pwdStr, sizeof(pwdStr), "pwd: 0x%08X", password);\r
if (strlen(Cmd)==0)\r
if ( !AquireData( T55x7_PAGE1, REGULAR_READ_MODE_BLOCK, pwdmode, password ) )\r
return 0;\r
- \r
- if (!DecodeT55xxBlock()) return 0;\r
\r
- if ( !DemodBufferLen) return 0;\r
+ if ( config.Q5 ) {\r
+ if (!DecodeT5555TraceBlock()) return 0;\r
+ } else {\r
+ if (!DecodeT55xxBlock()) return 0;\r
+ }\r
+\r
+ if ( !DemodBufferLen ) return 0;\r
\r
RepaintGraphWindow();\r
- uint8_t repeat = 0;\r
- if (config.offset > 5) \r
- repeat = 32;\r
+ uint8_t repeat = (config.offset > 5) ? 32 : 0;\r
+\r
uint8_t si = config.offset+repeat;\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
- uint32_t cid = PackBits(si, 5, DemodBuffer); si += 5;\r
- uint32_t icr = PackBits(si, 3, DemodBuffer); si += 3;\r
- uint32_t year = PackBits(si, 4, DemodBuffer); si += 4;\r
- uint32_t quarter = PackBits(si, 2, DemodBuffer); si += 2;\r
- uint32_t lotid = PackBits(si, 14, DemodBuffer); si += 14;\r
- uint32_t wafer = PackBits(si, 5, DemodBuffer); si += 5;\r
- uint32_t dw = PackBits(si, 15, DemodBuffer); \r
- \r
- time_t t = time(NULL);\r
- struct tm tm = *localtime(&t);\r
- if ( year > tm.tm_year-110)\r
- year += 2000;\r
- else\r
- year += 2010;\r
\r
- if (config.Q5) PrintAndLog("*** Warning *** Info read off a Q5 will not work as expected");\r
- if ( acl != 0xE0 ) {\r
- PrintAndLog("The modulation is most likely wrong since the ACL is not 0xE0. ");\r
- return 0;\r
+ if (config.Q5) {\r
+ uint32_t hdr = PackBits(si, 9, DemodBuffer); si += 9;\r
+\r
+ if (hdr != 0x1FF) {\r
+ PrintAndLog("Invalid Q5 Trace data header (expected 0x1FF, found %X)", hdr);\r
+ return 0;\r
+ }\r
+\r
+ t5555_tracedata_t data = {.bl1 = bl1, .bl2 = bl2, .icr = 0, .lotidc = '?', .lotid = 0, .wafer = 0, .dw =0};\r
+\r
+ data.icr = PackBits(si, 2, DemodBuffer); si += 2;\r
+ data.lotidc = 'Z' - PackBits(si, 2, DemodBuffer); si += 3;\r
+\r
+ data.lotid = PackBits(si, 4, DemodBuffer); si += 5;\r
+ data.lotid <<= 4;\r
+ data.lotid |= PackBits(si, 4, DemodBuffer); si += 5;\r
+ data.lotid <<= 4;\r
+ data.lotid |= PackBits(si, 4, DemodBuffer); si += 5;\r
+ data.lotid <<= 4;\r
+ data.lotid |= PackBits(si, 4, DemodBuffer); si += 5;\r
+ data.lotid <<= 1;\r
+ data.lotid |= PackBits(si, 1, DemodBuffer); si += 1;\r
+\r
+ data.wafer = PackBits(si, 3, DemodBuffer); si += 4;\r
+ data.wafer <<= 2;\r
+ data.wafer |= PackBits(si, 2, DemodBuffer); si += 2;\r
+\r
+ data.dw = PackBits(si, 2, DemodBuffer); si += 3;\r
+ data.dw <<= 4;\r
+ data.dw |= PackBits(si, 4, DemodBuffer); si += 5;\r
+ data.dw <<= 4;\r
+ data.dw |= PackBits(si, 4, DemodBuffer); si += 5;\r
+ data.dw <<= 4;\r
+ data.dw |= PackBits(si, 4, DemodBuffer); si += 5;\r
+\r
+ printT5555Trace(data, repeat);\r
+\r
+ } else {\r
+\r
+ t55x7_tracedata_t data = {.bl1 = bl1, .bl2 = bl2, .acl = 0, .mfc = 0, .cid = 0, .year = 0, .quarter = 0, .icr = 0, .lotid = 0, .wafer = 0, .dw = 0};\r
+ \r
+ data.acl = PackBits(si, 8, DemodBuffer); si += 8;\r
+ if ( data.acl != 0xE0 ) {\r
+ PrintAndLog("The modulation is most likely wrong since the ACL is not 0xE0. ");\r
+ return 0;\r
+ }\r
+\r
+ data.mfc = PackBits(si, 8, DemodBuffer); si += 8;\r
+ data.cid = PackBits(si, 5, DemodBuffer); si += 5;\r
+ data.icr = PackBits(si, 3, DemodBuffer); si += 3;\r
+ data.year = PackBits(si, 4, DemodBuffer); si += 4;\r
+ data.quarter = PackBits(si, 2, DemodBuffer); si += 2;\r
+ data.lotid = PackBits(si, 14, DemodBuffer); si += 14;\r
+ data.wafer = PackBits(si, 5, DemodBuffer); si += 5;\r
+ data.dw = PackBits(si, 15, DemodBuffer); \r
+\r
+ time_t t = time(NULL);\r
+ struct tm tm = *localtime(&t);\r
+ if ( data.year > tm.tm_year-110)\r
+ data.year += 2000;\r
+ else\r
+ data.year += 2010;\r
+\r
+ printT55x7Trace(data, repeat);\r
}\r
- PrintAndLog("");\r
- PrintAndLog("-- T55xx Trace Information ----------------------------------");\r
+ return 0;\r
+}\r
+\r
+void printT55x7Trace( t55x7_tracedata_t data, uint8_t repeat ){\r
+ PrintAndLog("-- T55x7 Trace Information ----------------------------------");\r
PrintAndLog("-------------------------------------------------------------");\r
- PrintAndLog(" ACL Allocation class (ISO/IEC 15963-1) : 0x%02X (%d)", acl, acl);\r
- PrintAndLog(" MFC Manufacturer ID (ISO/IEC 7816-6) : 0x%02X (%d) - %s", mfc, mfc, getTagInfo(mfc));\r
- PrintAndLog(" CID : 0x%02X (%d) - %s", cid, cid, GetModelStrFromCID(cid));\r
- PrintAndLog(" ICR IC Revision : %d",icr );\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(" 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(" Year/Quarter : %d/%d",year, quarter);\r
- PrintAndLog(" Lot ID : %d", lotid );\r
- PrintAndLog(" Wafer number : %d", wafer);\r
- PrintAndLog(" Die Number : %d", dw);\r
+ PrintAndLog(" Year/Quarter : %d/%d", data.year, data.quarter);\r
+ PrintAndLog(" Lot ID : %d", data.lotid );\r
+ PrintAndLog(" Wafer number : %d", data.wafer);\r
+ PrintAndLog(" Die Number : %d", data.dw);\r
PrintAndLog("-------------------------------------------------------------");\r
PrintAndLog(" Raw Data - Page 1");\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
+ PrintAndLog(" Block 1 : 0x%08X %s", data.bl1, sprint_bin(DemodBuffer+config.offset+repeat,32) );\r
+ PrintAndLog(" Block 2 : 0x%08X %s", data.bl2, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );\r
+ PrintAndLog("-------------------------------------------------------------"); \r
\r
/*\r
TRACE - BLOCK O\r
13-17 Wafer number\r
18-32 DW, die number sequential\r
*/\r
+}\r
+\r
+void printT5555Trace( t5555_tracedata_t data, uint8_t repeat ){\r
+ PrintAndLog("-- T5555 (Q5) Trace Information -----------------------------");\r
+ PrintAndLog("-------------------------------------------------------------");\r
+ PrintAndLog(" ICR IC Revision : %d", data.icr ); \r
+ PrintAndLog(" Lot : %c%d", data.lotidc, data.lotid);\r
+ PrintAndLog(" Wafer number : %d", data.wafer);\r
+ PrintAndLog(" Die Number : %d", data.dw);\r
+ PrintAndLog("-------------------------------------------------------------");\r
+ PrintAndLog(" Raw Data - Page 1");\r
+ PrintAndLog(" Block 1 : 0x%08X %s", data.bl1, sprint_bin(DemodBuffer+config.offset+repeat,32) );\r
+ PrintAndLog(" Block 2 : 0x%08X %s", data.bl2, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );\r
\r
- return 0;\r
+ /*\r
+ ** Q5 **\r
+ TRACE - BLOCK O and BLOCK1\r
+ Bits Definition HEX\r
+ 1-9 Header 0x1FF\r
+ 10-11 IC Revision\r
+ 12-13 Lot ID char\r
+ 15-35 Lot ID (NB parity)\r
+ 36-41 Wafer number (NB parity)\r
+ 42-58 DW, die number sequential (NB parity)\r
+ 60-63 Parity bits\r
+ 64 Always zero\r
+ */\r
}\r
\r
+//need to add Q5 info...\r
int CmdT55xxInfo(const char *Cmd){\r
/*\r
Page 0 Block 0 Configuration data.\r
\r
if (!DecodeT55xxBlock()) return 1;\r
\r
+ // too little space to start with\r
if ( DemodBufferLen < 32) return 1;\r
\r
uint8_t si = config.offset;\r
uint32_t fw = PackBits(si, 1, DemodBuffer); si += 1;\r
uint32_t inv = PackBits(si, 1, DemodBuffer); si += 1; \r
uint32_t por = PackBits(si, 1, DemodBuffer); si += 1;\r
+ \r
if (config.Q5) PrintAndLog("*** Warning *** Config Info read off a Q5 will not display as expected");\r
PrintAndLog("");\r
- PrintAndLog("-- T55xx Configuration & Tag Information --------------------");\r
+ PrintAndLog("-- T55x7 Configuration & Tag Information --------------------");\r
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
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
return 1;\r
}\r
\r
-char * GetBitRateStr(uint32_t id){\r
- static char buf[25];\r
+char * GetBitRateStr(uint32_t id, bool xmode) {\r
+ static char buf[25];\r
\r
char *retStr = buf;\r
- switch (id){\r
- case 0: \r
- snprintf(retStr,sizeof(buf),"%d - RF/8",id);\r
- break;\r
- case 1:\r
- snprintf(retStr,sizeof(buf),"%d - RF/16",id);\r
- break;\r
- case 2: \r
- snprintf(retStr,sizeof(buf),"%d - RF/32",id);\r
- break;\r
- case 3:\r
- snprintf(retStr,sizeof(buf),"%d - RF/40",id);\r
- break;\r
- case 4:\r
- snprintf(retStr,sizeof(buf),"%d - RF/50",id);\r
- break;\r
- case 5:\r
- snprintf(retStr,sizeof(buf),"%d - RF/64",id);\r
- break;\r
- case 6:\r
- snprintf(retStr,sizeof(buf),"%d - RF/100",id);\r
- break;\r
- case 7:\r
- snprintf(retStr,sizeof(buf),"%d - RF/128",id);\r
- break;\r
- default:\r
- snprintf(retStr,sizeof(buf),"%d - (Unknown)",id);\r
- break;\r
- }\r
-\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
\r
-char * GetSaferStr(uint32_t id){\r
+char * GetSaferStr(uint32_t id) {\r
static char buf[40];\r
char *retStr = buf;\r
\r
char *retStr = buf;\r
\r
switch (id){\r
- case 0: \r
- snprintf(retStr,sizeof(buf),"%d - DIRECT (ASK/NRZ)",id);\r
- break;\r
- case 1:\r
- snprintf(retStr,sizeof(buf),"%d - PSK 1 phase change when input changes",id);\r
- break;\r
- case 2: \r
- snprintf(retStr,sizeof(buf),"%d - PSK 2 phase change on bitclk if input high",id);\r
- break;\r
- case 3:\r
- snprintf(retStr,sizeof(buf),"%d - PSK 3 phase change on rising edge of input",id);\r
- break;\r
- case 4:\r
- snprintf(retStr,sizeof(buf),"%d - FSK 1 RF/8 RF/5",id);\r
- break;\r
- case 5:\r
- snprintf(retStr,sizeof(buf),"%d - FSK 2 RF/8 RF/10",id);\r
- break;\r
- case 6:\r
- snprintf(retStr,sizeof(buf),"%d - FSK 1a RF/5 RF/8",id);\r
- break;\r
- case 7:\r
- snprintf(retStr,sizeof(buf),"%d - FSK 2a RF/10 RF/8",id);\r
- break;\r
- case 8:\r
- snprintf(retStr,sizeof(buf),"%d - Manchester",id);\r
- break;\r
- case 16:\r
- snprintf(retStr,sizeof(buf),"%d - Biphase",id);\r
- break;\r
- case 0x18:\r
- snprintf(retStr,sizeof(buf),"%d - Biphase a - AKA Conditional Dephase Encoding(CDP)",id);\r
- break;\r
- case 17:\r
- snprintf(retStr,sizeof(buf),"%d - Reserved",id);\r
- break;\r
- default:\r
- snprintf(retStr,sizeof(buf),"0x%02X (Unknown)",id);\r
- break;\r
+ case 0: snprintf(retStr,sizeof(buf),"%d - DIRECT (ASK/NRZ)",id); break;\r
+ case 1: snprintf(retStr,sizeof(buf),"%d - PSK 1 phase change when input changes",id); break;\r
+ case 2: snprintf(retStr,sizeof(buf),"%d - PSK 2 phase change on bitclk if input high",id); break;\r
+ case 3: snprintf(retStr,sizeof(buf),"%d - PSK 3 phase change on rising edge of input",id); break;\r
+ case 4: snprintf(retStr,sizeof(buf),"%d - FSK 1 RF/8 RF/5",id); break;\r
+ case 5: snprintf(retStr,sizeof(buf),"%d - FSK 2 RF/8 RF/10",id); break;\r
+ case 6: snprintf(retStr,sizeof(buf),"%d - FSK 1a RF/5 RF/8",id); break;\r
+ case 7: snprintf(retStr,sizeof(buf),"%d - FSK 2a RF/10 RF/8",id); break;\r
+ case 8: snprintf(retStr,sizeof(buf),"%d - Manchester",id); break;\r
+ case 16: snprintf(retStr,sizeof(buf),"%d - Biphase",id); break;\r
+ case 0x18: snprintf(retStr,sizeof(buf),"%d - Biphase a - AKA Conditional Dephase Encoding(CDP)",id); break;\r
+ case 17: snprintf(retStr,sizeof(buf),"%d - Reserved",id); break;\r
+ default: snprintf(retStr,sizeof(buf),"0x%02X (Unknown)",id); break;\r
}\r
return buf;\r
}\r
static char buf[20];\r
char *retStr = buf;\r
\r
- switch (id){\r
- case DEMOD_FSK:\r
- snprintf(retStr,sizeof(buf),"FSK");\r
- break;\r
- case DEMOD_FSK1:\r
- snprintf(retStr,sizeof(buf),"FSK1");\r
- break;\r
- case DEMOD_FSK1a:\r
- snprintf(retStr,sizeof(buf),"FSK1a");\r
- break;\r
- case DEMOD_FSK2:\r
- snprintf(retStr,sizeof(buf),"FSK2");\r
- break;\r
- case DEMOD_FSK2a:\r
- snprintf(retStr,sizeof(buf),"FSK2a");\r
- break;\r
- case DEMOD_ASK: \r
- snprintf(retStr,sizeof(buf),"ASK");\r
- break;\r
- case DEMOD_NRZ:\r
- snprintf(retStr,sizeof(buf),"DIRECT/NRZ");\r
- break;\r
- case DEMOD_PSK1:\r
- snprintf(retStr,sizeof(buf),"PSK1");\r
- break;\r
- case DEMOD_PSK2:\r
- snprintf(retStr,sizeof(buf),"PSK2");\r
- break;\r
- case DEMOD_PSK3:\r
- snprintf(retStr,sizeof(buf),"PSK3");\r
- break;\r
- case DEMOD_BI:\r
- snprintf(retStr,sizeof(buf),"BIPHASE");\r
- break;\r
- case DEMOD_BIa:\r
- snprintf(retStr,sizeof(buf),"BIPHASEa - (CDP)");\r
- break;\r
- default:\r
- snprintf(retStr,sizeof(buf),"(Unknown)");\r
- break;\r
- }\r
+ switch (id) {\r
+ case DEMOD_FSK: snprintf(retStr,sizeof(buf),"FSK"); break;\r
+ case DEMOD_FSK1: snprintf(retStr,sizeof(buf),"FSK1"); break;\r
+ case DEMOD_FSK1a: snprintf(retStr,sizeof(buf),"FSK1a"); break;\r
+ case DEMOD_FSK2: snprintf(retStr,sizeof(buf),"FSK2"); break;\r
+ case DEMOD_FSK2a: snprintf(retStr,sizeof(buf),"FSK2a"); break;\r
+ case DEMOD_ASK: snprintf(retStr,sizeof(buf),"ASK"); break;\r
+ case DEMOD_NRZ: snprintf(retStr,sizeof(buf),"DIRECT/NRZ"); break;\r
+ case DEMOD_PSK1: snprintf(retStr,sizeof(buf),"PSK1"); break;\r
+ case DEMOD_PSK2: snprintf(retStr,sizeof(buf),"PSK2"); break;\r
+ case DEMOD_PSK3: snprintf(retStr,sizeof(buf),"PSK3"); break;\r
+ case DEMOD_BI: snprintf(retStr,sizeof(buf),"BIPHASE"); break;\r
+ case DEMOD_BIa: snprintf(retStr,sizeof(buf),"BIPHASEa - (CDP)"); break;\r
+ default: snprintf(retStr,sizeof(buf),"(Unknown)"); break;\r
+ }\r
return buf;\r
}\r
\r
char writeData[20] = {0};\r
char *ptrData = writeData;\r
\r
+ char cmdp = param_getchar(Cmd, 0); \r
+ if ( cmdp == 'h' || cmdp == 'H') return usage_t55xx_wipe();\r
+\r
+ bool Q5 = (cmdp == 'q' || cmdp == 'Q');\r
+\r
+ // Try with the default password to reset block 0\r
+ // With a pwd should work even if pwd bit not set\r
PrintAndLog("\nBeginning Wipe of a T55xx tag (assuming the tag is not password protected)\n");\r
\r
- //try with the default password to reset block 0 (with a pwd should work even if pwd bit not set)\r
- snprintf(ptrData,sizeof(writeData),"b 0 d 00088040 p 0");\r
+ if ( Q5 ){\r
+ snprintf(ptrData,sizeof(writeData),"b 0 d 6001F004 p 0");\r
+ } else {\r
+ snprintf(ptrData,sizeof(writeData),"b 0 d 00088040 p 0");\r
+ }\r
\r
- if (!CmdT55xxWriteBlock(ptrData))\r
- PrintAndLog("Error writing blk 0");\r
+ if (!CmdT55xxWriteBlock(ptrData)) PrintAndLog("Error writing blk 0");\r
\r
for (uint8_t blk = 1; blk<8; blk++) {\r
snprintf(ptrData,sizeof(writeData),"b %d d 0", blk);\r
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
char cmdp = param_getchar(Cmd, 0);\r
if (cmdp == 'h' || cmdp == 'H') return usage_t55xx_bruteforce();\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
return 1;\r
}\r
\r
- while( fgets(buf, sizeof(buf), f) ){\r
+ while( fgets(buf, sizeof(buf), f) ) {\r
if (strlen(buf) < 8 || buf[7] == '\n') continue;\r
\r
while (fgetc(f) != '\n' && !feof(f)) ; //goto next line\r
//The line start with # is comment, skip\r
if( buf[0]=='#' ) continue;\r
\r
- if (!isxdigit(buf[0])){\r
+ if (!isxdigit(buf[0])) {\r
PrintAndLog("File content error. '%s' must include 8 HEX symbols", buf);\r
continue;\r
}\r
if (!p) {\r
PrintAndLog("Cannot allocate memory for defaultKeys");\r
free(keyBlock);\r
+ fclose(f);\r
return 2;\r
}\r
keyBlock = p;\r
\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
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
\r
PrintAndLog("Testing %08X", testpwd);\r
\r
- if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, testpwd)) {\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
\r
\r
if ( found ) {\r
PrintAndLog("Found valid password: [%08X]", testpwd);\r
+ free(keyBlock);\r
return 0;\r
}\r
}\r
PrintAndLog("Password NOT found.");\r
+ free(keyBlock);\r
return 0;\r
}\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
\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
\r
- while ((!found) && (i <= end_password)){\r
+ while ((!found) && (i <= end_password)) {\r
\r
- printf(".");\r
- fflush(stdout);\r
- if (ukbhit()) {\r
- getchar();\r
- printf("\naborted via keyboard!\n");\r
- return 0;\r
- }\r
+ printf(".");\r
+ fflush(stdout);\r
+ if (ukbhit()) {\r
+ ch = getchar();\r
+ (void)ch;\r
+ printf("\naborted via keyboard!\n");\r
+ free(keyBlock);\r
+ return 0;\r
+ }\r
\r
- if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, i)) {\r
- PrintAndLog("Aquireing data from device failed. Quitting");\r
- return 0;\r
- }\r
- found = tryDetectModulation();\r
- \r
- if (found) break;\r
- i++;\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
+ }\r
+ found = tryDetectModulation();\r
+\r
+ if (found) break;\r
+ i++;\r
}\r
\r
PrintAndLog("");\r
\r
if (found)\r
- PrintAndLog("Found valid password: [%08x]", i);\r
+ PrintAndLog("Found valid password: [%08x]", i);\r
else\r
- PrintAndLog("Password NOT found. Last tried: [%08x]", --i);\r
+ PrintAndLog("Password NOT found. Last tried: [%08x]", --i);\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
+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;\r
+ bool st = true;\r
+\r
+ if ( getData ) {\r
+ if ( !AquireData(T55x7_PAGE1, 1, false, 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);\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
+\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
+ }\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
+ }\r
+ if (errors) return usage_t55xx_detectP1();\r
+\r
+ if ( !useGB ) {\r
+ if ( !AquireData(T55x7_PAGE1, 1, usepwd, password) )\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
{"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
{"dump", CmdT55xxDump, 0, "[password] [o] Dump T55xx card block 0-7. Optional [password], [override]"},\r
{"special", special, 0, "Show block changes with 64 different offsets"},\r
{"wakeup", CmdT55xxWakeUp, 0, "Send AOR wakeup command"},\r
- {"wipe", CmdT55xxWipe, 0, "Wipe a T55xx tag and set defaults (will destroy any data on tag)"},\r
+ {"wipe", CmdT55xxWipe, 0, "[q] Wipe a T55xx tag and set defaults (will destroy any data on tag)"},\r
{NULL, NULL, 0, NULL}\r
};\r
\r
projects / proxmark3-svn / blobdiff