#include <stdio.h>\r
#include <string.h>\r
#include <inttypes.h>\r
-#include <time.h>\r
#include "proxmark3.h"\r
#include "ui.h"\r
#include "graph.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
\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
return 0;\r
}\r
int usage_t55xx_bruteforce(){\r
+ PrintAndLog("This command uses A) bruteforce to scan a number range");\r
+ PrintAndLog(" B) a dictionary attack");\r
PrintAndLog("Usage: lf t55xx bruteforce <start password> <end password> [i <*.dic>]");\r
PrintAndLog(" password must be 4 bytes (8 hex symbols)");\r
PrintAndLog("Options:");\r
- PrintAndLog(" h - this help");\r
- PrintAndLog(" i <*.dic> - loads a default keys dictionary file <*.dic>");\r
+ PrintAndLog(" h - this help");\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 mykeys.dic");\r
+ PrintAndLog(" lf t55xx bruteforce i default_pwd.dic");\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
while(param_getchar(Cmd, cmdp) != 0x00 && !errors)\r
{\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
+ //undo trim samples\r
+ save_restoreGB(0);\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
CmdLtrim("160");\r
snprintf(cmdStr, sizeof(buf),"%d 0 6", bitRate[config.bitrate] );\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
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
\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
+ 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
tests[hits].modulation = DEMOD_FSK1;\r
else if (fc1 == 10 && fc2 == 8)\r
tests[hits].modulation = DEMOD_FSK2a;\r
-\r
tests[hits].bitrate = bitRate;\r
tests[hits].inverted = TRUE;\r
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
config.inverted = tests[0].inverted;\r
config.offset = tests[0].offset;\r
config.block0 = tests[0].block0;\r
+ config.Q5 = tests[0].Q5;\r
printConfiguration( config );\r
return TRUE;\r
}\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
uint8_t safer = PackBits(si, 4, DemodBuffer); si += 4; //master key\r
uint8_t resv = PackBits(si, 8, DemodBuffer); si += 8;\r
// 2nibble must be zeroed.\r
- if (safer != 0x6) continue;\r
+ if (safer != 0x6 && safer != 0x9) continue;\r
if ( resv > 0x00) continue;\r
//uint8_t pageSel = PackBits(si, 1, DemodBuffer); si += 1;\r
//uint8_t fastWrite = PackBits(si, 1, DemodBuffer); si += 1;\r
si += 1+1;\r
- int bitRate = PackBits(si, 5, DemodBuffer)*2 + 2; si += 5; //bit rate\r
+ int bitRate = PackBits(si, 6, DemodBuffer)*2 + 2; si += 6; //bit rate\r
if (bitRate > 128 || bitRate < 8) continue;\r
\r
//uint8_t AOR = PackBits(si, 1, DemodBuffer); si += 1; \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
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
return 1;\r
}\r
\r
-char * GetBitRateStr(uint32_t id){\r
- static char buf[25];\r
+char * GetBitRateStr(uint32_t id) {\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
+ 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
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
if (!CmdT55xxWriteBlock(ptrData))\r
PrintAndLog("Error writing blk %d", blk);\r
\r
- memset(writeData, sizeof(writeData), 0x00);\r
+ memset(writeData, 0x00, sizeof(writeData));\r
}\r
return 0;\r
}\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
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
{"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