#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
\r
int usage_t55xx_config(){\r
PrintAndLog("Usage: lf t55xx config [d <demodulation>] [i 1] [o <offset>]");\r
- PrintAndLog("Options:");\r
- PrintAndLog(" h This help");\r
- PrintAndLog(" d <FSK|ASK|PSK1|PSK2|PSK3|NRZ|BI> Set demodulation");\r
- PrintAndLog(" i [1] Inverse data signal, defaults to normal");\r
- PrintAndLog(" o [offset] Set offset where data should start decode in bitstream");\r
+ PrintAndLog("Options: ");\r
+ PrintAndLog(" h This help");\r
+ PrintAndLog(" b <8|16|32|40|50|64|100|128> Set bitrate");\r
+ PrintAndLog(" d <FSK|FSK1|FSK1a|FSK2|FSK2a|ASK|PSK1|PSK2|NZ|BI|BIa> Set demodulation FSK / ASK / PSK / NZ / Biphase / Biphase A");\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("");\r
PrintAndLog("Examples:");\r
PrintAndLog(" lf t55xx config d FSK - FSK demodulation");\r
return 0;\r
}\r
int usage_t55xx_detect(){\r
- PrintAndLog("Usage: lf t55xx detect [1]");\r
- PrintAndLog(" [graph buffer data], if set, use Graphbuffer otherwise read data from tag.");\r
+ PrintAndLog("Usage: lf t55xx detect");\r
PrintAndLog("");\r
PrintAndLog("Examples:");\r
PrintAndLog(" lf t55xx detect");\r
uint8_t cmdp = 0;\r
char modulation[5] = {0x00};\r
char tmp = 0x00;\r
- \r
+ uint8_t bitRate = 0;\r
+ uint8_t rates[9] = {8,16,32,40,50,64,100,128,0};\r
while(param_getchar(Cmd, cmdp) != 0x00 && !errors)\r
{\r
tmp = param_getchar(Cmd, cmdp);\r
case 'h':\r
case 'H':\r
return usage_t55xx_config();\r
+ case 'b':\r
+ errors |= param_getdec(Cmd, cmdp+1, &bitRate);\r
+ if ( !errors){\r
+ uint8_t i = 0;\r
+ for (; i < 9; i++){\r
+ if (rates[i]==bitRate) {\r
+ config.bitrate = i;\r
+ break;\r
+ }\r
+ }\r
+ if (i==9) errors = TRUE;\r
+ }\r
+ cmdp+=2;\r
+ break;\r
case 'd':\r
param_getstr(Cmd, cmdp+1, modulation);\r
cmdp += 2;\r
- \r
+\r
if ( strcmp(modulation, "FSK" ) == 0)\r
config.modulation = DEMOD_FSK;\r
+ else if ( strcmp(modulation, "FSK1" ) == 0)\r
+ config.modulation = DEMOD_FSK1;\r
+ else if ( strcmp(modulation, "FSK1a" ) == 0)\r
+ config.modulation = DEMOD_FSK1a;\r
+ else if ( strcmp(modulation, "FSK2" ) == 0)\r
+ config.modulation = DEMOD_FSK2;\r
+ else if ( strcmp(modulation, "FSK2a" ) == 0)\r
+ config.modulation = DEMOD_FSK2a;\r
else if ( strcmp(modulation, "ASK" ) == 0)\r
config.modulation = DEMOD_ASK;\r
else if ( strcmp(modulation, "NRZ" ) == 0)\r
else if ( strcmp(modulation, "PSK2" ) == 0)\r
config.modulation = DEMOD_PSK2;\r
else if ( strcmp(modulation, "PSK3" ) == 0)\r
- config.modulation = DEMOD_PSK3; \r
+ config.modulation = DEMOD_PSK3;\r
+ else if ( strcmp(modulation, "BIa" ) == 0)\r
+ config.modulation = DEMOD_BIa;\r
else if ( strcmp(modulation, "BI" ) == 0)\r
config.modulation = DEMOD_BI;\r
else {\r
cmdp+=2;\r
break;\r
case 'o':\r
- errors |= param_getdec(Cmd, cmdp+1,&offset);\r
+ errors |= param_getdec(Cmd, cmdp+1, &offset);\r
if ( !errors )\r
config.offset = offset;\r
- cmdp += 2;\r
+ cmdp+=2;\r
break;\r
default:\r
PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r
//Validations\r
if (errors)\r
return usage_t55xx_config();\r
- \r
- config.block0 = 0;\r
- printConfiguration( config );\r
+\r
+ config.block0 = 0;\r
+ printConfiguration ( config );\r
return 0;\r
}\r
\r
GetFromBigBuf(got,sizeof(got),0);\r
WaitForResponse(CMD_ACK,NULL);\r
setGraphBuf(got, 12000);\r
-\r
- DecodeT55xxBlock();\r
- printT55xxBlock("");\r
+ DemodBufferLen=0;\r
+ if (!DecodeT55xxBlock()) return 3;\r
+ char blk[10]={0};\r
+ sprintf(blk,"%d", block);\r
+ printT55xxBlock(blk);\r
return 0;\r
}\r
\r
-void DecodeT55xxBlock(){\r
+bool DecodeT55xxBlock(){\r
\r
- char buf[8] = {0x00};\r
+ char buf[9] = {0x00};\r
char *cmdStr = buf;\r
+ int ans = 0;\r
+ uint8_t bitRate[8] = {8,16,32,40,50,64,100,128};\r
\r
DemodBufferLen = 0x00;\r
- \r
+\r
switch( config.modulation ){\r
case DEMOD_FSK:\r
- sprintf(cmdStr,"0 %d", config.inverted );\r
- FSKrawDemod(cmdStr, FALSE);\r
+ sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 );\r
+ CmdLtrim(cmdStr); \r
+ sprintf(cmdStr,"%d %d", bitRate[config.bitrate], config.inverted );\r
+ ans = FSKrawDemod(cmdStr, FALSE);\r
+ break;\r
+ case DEMOD_FSK1:\r
+ case DEMOD_FSK1a: \r
+ sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 );\r
+ CmdLtrim(cmdStr); \r
+ sprintf(cmdStr,"%d %d 8 5", bitRate[config.bitrate], config.inverted );\r
+ ans = FSKrawDemod(cmdStr, FALSE);\r
+ break;\r
+ case DEMOD_FSK2:\r
+ case DEMOD_FSK2a:\r
+ sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 );\r
+ CmdLtrim(cmdStr); \r
+ sprintf(cmdStr,"%d %d 10 8", bitRate[config.bitrate], config.inverted );\r
+ ans = FSKrawDemod(cmdStr, FALSE);\r
break;\r
case DEMOD_ASK:\r
- sprintf(cmdStr,"0 %d 1", config.inverted );\r
- ASKmanDemod(cmdStr, FALSE, FALSE);\r
+ sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );\r
+ ans = ASKmanDemod(cmdStr, FALSE, FALSE);\r
break;\r
case DEMOD_PSK1:\r
- sprintf(cmdStr,"0 %d 1", config.inverted );\r
- PSKDemod(cmdStr, FALSE);\r
+ sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );\r
+ ans = PSKDemod(cmdStr, FALSE);\r
break;\r
case DEMOD_PSK2:\r
- sprintf(cmdStr,"0 %d 1", config.inverted );\r
- PSKDemod(cmdStr, FALSE);\r
+ sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );\r
+ ans = PSKDemod(cmdStr, FALSE);\r
psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
break;\r
case DEMOD_PSK3:\r
- sprintf(cmdStr,"0 %d 1", config.inverted );\r
- PSKDemod(cmdStr, FALSE);\r
+ sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );\r
+ ans = PSKDemod(cmdStr, FALSE);\r
psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
break;\r
case DEMOD_NRZ:\r
- sprintf(cmdStr,"0 %d 1", config.inverted );\r
- NRZrawDemod(cmdStr, FALSE);\r
+ sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );\r
+ ans = NRZrawDemod(cmdStr, FALSE);\r
break;\r
case DEMOD_BI:\r
- sprintf(cmdStr,"0 0 %d 1", config.inverted );\r
- ASKbiphaseDemod(cmdStr, FALSE);\r
+ case DEMOD_BIa:\r
+ sprintf(cmdStr,"0 %d %d 1", bitRate[config.bitrate], config.inverted );\r
+ ans = ASKbiphaseDemod(cmdStr, FALSE);\r
break;\r
default:\r
- return;\r
+ return FALSE;\r
}\r
+ return (bool) ans;\r
}\r
\r
int CmdT55xxDetect(const char *Cmd){\r
\r
char cmdp = param_getchar(Cmd, 0);\r
- \r
- if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') \r
+ if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H')\r
return usage_t55xx_detect();\r
-\r
+ \r
if (strlen(Cmd)==0)\r
AquireData( CONFIGURATION_BLOCK );\r
- \r
+\r
if ( !tryDetectModulation() )\r
PrintAndLog("Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");\r
\r
return 0;\r
}\r
\r
+// detect configuration?\r
bool tryDetectModulation(){\r
- \r
+ char cmdStr[8] = {0};\r
uint8_t hits = 0;\r
t55xx_conf_block_t tests[15];\r
\r
if (GetFskClock("", FALSE, FALSE)){ \r
+ uint8_t fc1 = 0, fc2 = 0, clk=0;\r
+ fskClocks(&fc1, &fc2, &clk, FALSE);\r
+ sprintf(cmdStr,"%d", clk/2);\r
+ CmdLtrim(cmdStr);\r
if ( FSKrawDemod("0 0", FALSE) && test(DEMOD_FSK, &tests[hits].offset)){\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
+\r
tests[hits].inverted = FALSE;\r
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); \r
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
++hits;\r
}\r
if ( FSKrawDemod("0 1", FALSE) && test(DEMOD_FSK, &tests[hits].offset)) {\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
+\r
tests[hits].inverted = TRUE;\r
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); \r
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
++hits;\r
- }\r
- } else {\r
+ }\r
+ } else {\r
if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test(DEMOD_ASK, &tests[hits].offset)) {\r
tests[hits].modulation = DEMOD_ASK;\r
tests[hits].inverted = FALSE;\r
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); \r
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
++hits;\r
}\r
\r
if ( PSKDemod("0 0 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset)) {\r
tests[hits].modulation = DEMOD_PSK1;\r
tests[hits].inverted = FALSE;\r
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); \r
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
++hits;\r
}\r
\r
if ( PSKDemod("0 1 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset)) {\r
tests[hits].modulation = DEMOD_PSK1;\r
tests[hits].inverted = TRUE;\r
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); \r
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
++hits;\r
}\r
\r
if (test(DEMOD_PSK2, &tests[hits].offset)){\r
tests[hits].modulation = DEMOD_PSK2;\r
tests[hits].inverted = FALSE;\r
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); \r
- ++hits;\r
- }\r
- }\r
- // PSK2 - needs a call to psk1TOpsk2.\r
- if ( PSKDemod("0 1 1", FALSE)) {\r
- psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
- if (test(DEMOD_PSK2, &tests[hits].offset)){\r
- tests[hits].modulation = DEMOD_PSK2;\r
- tests[hits].inverted = TRUE;\r
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); \r
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
++hits;\r
}\r
- }\r
+ } // inverse waves does not affect this demod\r
\r
// PSK3 - needs a call to psk1TOpsk2.\r
if ( PSKDemod("0 0 1", FALSE)) {\r
if (test(DEMOD_PSK3, &tests[hits].offset)){\r
tests[hits].modulation = DEMOD_PSK3;\r
tests[hits].inverted = FALSE;\r
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); \r
- ++hits;\r
- }\r
- }\r
- // PSK3 - needs a call to psk1TOpsk2.\r
- if ( PSKDemod("0 1 1", FALSE)) {\r
- psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
- if (test(DEMOD_PSK3, &tests[hits].offset)){\r
- tests[hits].modulation = DEMOD_PSK3;\r
- tests[hits].inverted = TRUE;\r
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
++hits;\r
}\r
- }\r
- \r
+ } // inverse waves does not affect this demod\r
+ \r
if ( ASKbiphaseDemod("0 0 0 1", FALSE) && test(DEMOD_BI, &tests[hits].offset) ) {\r
tests[hits].modulation = DEMOD_BI;\r
tests[hits].inverted = FALSE;\r
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
++hits;\r
}\r
- if ( ASKbiphaseDemod("0 0 1 1", FALSE) && test(DEMOD_BI, &tests[hits].offset) ) {\r
- tests[hits].modulation = DEMOD_BI;\r
+ if ( ASKbiphaseDemod("0 0 1 1", FALSE) && test(DEMOD_BIa, &tests[hits].offset) ) {\r
+ tests[hits].modulation = DEMOD_BIa;\r
tests[hits].inverted = TRUE;\r
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
++hits;\r
}\r
} \r
-\r
if ( hits == 1) {\r
config.modulation = tests[0].modulation;\r
config.inverted = tests[0].inverted;\r
config.offset = tests[0].offset;\r
- \r
- DecodeT55xxBlock();\r
- if (DemodBufferLen > config.offset + 32) \r
- config.block0 = PackBits(config.offset, 32, DemodBuffer);\r
+ config.block0 = tests[0].block0;\r
printConfiguration( config );\r
return TRUE;\r
}\r
if (modread > 3 && modread < 8) return TRUE;\r
break;\r
case DEMOD_ASK:\r
- if (modread == 8) return TRUE;\r
+ if (modread == DEMOD_ASK) return TRUE;\r
break;\r
case DEMOD_PSK1:\r
- if (modread == 1) return TRUE;\r
+ if (modread == DEMOD_PSK1) return TRUE;\r
break;\r
case DEMOD_PSK2:\r
- if (modread == 2) return TRUE;\r
+ if (modread == DEMOD_PSK2) return TRUE;\r
break;\r
case DEMOD_PSK3:\r
- if (modread == 3) return TRUE;\r
+ if (modread == DEMOD_PSK3) return TRUE;\r
break;\r
case DEMOD_NRZ:\r
- if (!modread) return TRUE;\r
+ if (modread == DEMOD_NRZ) return TRUE;\r
break;\r
case DEMOD_BI:\r
- if (modread == 16) return TRUE;\r
+ if (modread == DEMOD_BI) return TRUE;\r
+ break;\r
+ case DEMOD_BIa:\r
+ if (modread == DEMOD_BIa) return TRUE;\r
+ break; \r
+ default:\r
+ return FALSE;\r
+ }\r
+ return FALSE;\r
+}\r
+\r
+bool testBitRate(uint8_t readRate, uint8_t mod){\r
+ uint8_t expected[8] = {8, 16, 32, 40, 50, 64, 100, 128};\r
+ uint8_t detRate = 0;\r
+ switch( mod ){\r
+ case DEMOD_FSK:\r
+ detRate = GetFskClock("",FALSE, FALSE); \r
+ if (expected[readRate] == detRate) {\r
+ config.bitrate = readRate;\r
+ return TRUE;\r
+ }\r
+ break;\r
+ case DEMOD_FSK1:\r
+ detRate = GetFskClock("",FALSE, FALSE); \r
+ if (expected[readRate] == detRate) {\r
+ config.bitrate = readRate;\r
+ return TRUE;\r
+ }\r
+ break;\r
+ case DEMOD_FSK1a:\r
+ detRate = GetFskClock("",FALSE, FALSE); \r
+ if (expected[readRate] == detRate) {\r
+ config.bitrate = readRate;\r
+ return TRUE;\r
+ }\r
+ break;\r
+ case DEMOD_FSK2:\r
+ detRate = GetFskClock("",FALSE, FALSE); \r
+ if (expected[readRate] == detRate) {\r
+ config.bitrate = readRate;\r
+ return TRUE;\r
+ }\r
+ break;\r
+ case DEMOD_FSK2a:\r
+ detRate = GetFskClock("",FALSE, FALSE); \r
+ if (expected[readRate] == detRate) {\r
+ config.bitrate = readRate;\r
+ return TRUE;\r
+ }\r
+ break;\r
+ case DEMOD_ASK:\r
+ detRate = GetAskClock("",FALSE, FALSE); \r
+ if (expected[readRate] == detRate) {\r
+ config.bitrate = readRate;\r
+ return TRUE;\r
+ }\r
+ break;\r
+ case DEMOD_PSK1:\r
+ detRate = GetPskClock("",FALSE, FALSE); \r
+ if (expected[readRate] == detRate) {\r
+ config.bitrate = readRate;\r
+ return TRUE;\r
+ }\r
+ break;\r
+ case DEMOD_PSK2:\r
+ detRate = GetPskClock("",FALSE, FALSE); \r
+ if (expected[readRate] == detRate) {\r
+ config.bitrate = readRate;\r
+ return TRUE;\r
+ }\r
+ break;\r
+ case DEMOD_PSK3:\r
+ detRate = GetPskClock("",FALSE, FALSE); \r
+ if (expected[readRate] == detRate) {\r
+ config.bitrate = readRate;\r
+ return TRUE;\r
+ }\r
+ break;\r
+ case DEMOD_NRZ:\r
+ detRate = GetNrzClock("",FALSE, FALSE); \r
+ if (expected[readRate] == detRate) {\r
+ config.bitrate = readRate;\r
+ return TRUE;\r
+ }\r
+ break;\r
+ case DEMOD_BI:\r
+ case DEMOD_BIa:\r
+ detRate = GetAskClock("",FALSE, FALSE); \r
+ if (expected[readRate] == detRate) {\r
+ config.bitrate = readRate;\r
+ return TRUE;\r
+ }\r
break;\r
default:\r
return FALSE;\r
bool test(uint8_t mode, uint8_t *offset){\r
\r
if ( !DemodBufferLen) return FALSE;\r
- \r
uint8_t si = 0;\r
- for (uint8_t idx = 0; idx < 64; ++idx){\r
+ for (uint8_t idx = 0; idx < 64; idx++){\r
si = idx;\r
- if ( PackBits(si, 32, DemodBuffer) == 0x00 ) continue;\r
+ if ( PackBits(si, 32, DemodBuffer) == 0x00 ) continue; // configuration block with only zeros is impossible.\r
\r
uint8_t safer = PackBits(si, 4, DemodBuffer); si += 4; //master key\r
uint8_t resv = PackBits(si, 4, DemodBuffer); si += 4; //was 7 & +=7+3 //should be only 4 bits if extended mode\r
-\r
// 2nibble must be zeroed.\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+3; //new\r
- //uint8_t bitRate = PackBits(si, 3, DemodBuffer); si += 3; //new could check bit rate\r
+ uint8_t xtRate = PackBits(si, 3, DemodBuffer); si += 3; //new\r
+ uint8_t bitRate = PackBits(si, 3, DemodBuffer); si += 3; //new could check bit 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; //new\r
//uint8_t pskcr = PackBits(si, 2, DemodBuffer); si += 2+1; //new could check psk cr\r
if (!extMode){\r
if (nml01 || nml02 || xtRate) continue;\r
}\r
-\r
//test modulation\r
if (!testModulation(mode, modread)) continue;\r
- \r
+\r
*offset = idx;\r
+ if (!testBitRate(bitRate, mode)) continue;\r
return TRUE;\r
}\r
return FALSE;\r
}\r
\r
-void printT55xxBlock(const char *demodStr){\r
-\r
+void printT55xxBlock(const char *blockNum){\r
+ \r
uint8_t i = config.offset;\r
- uint8_t endpos = 32 + i; \r
+ uint8_t endpos = 32 + i;\r
uint32_t blockData = 0;\r
uint8_t bits[64] = {0x00};\r
\r
if ( !DemodBufferLen) return;\r
- \r
+\r
if ( endpos > DemodBufferLen){\r
PrintAndLog("The configured offset %d is too big. Possible offset: %d)", i, DemodBufferLen-32);\r
return;\r
}\r
\r
- for (; i < endpos; ++i)\r
- bits[i - config.offset] = DemodBuffer[i];\r
- \r
+ for (; i < endpos; ++i)\r
+ bits[i - config.offset]=DemodBuffer[i];\r
+\r
blockData = PackBits(0, 32, bits);\r
- PrintAndLog("0x%08X %s [%s]", blockData, sprint_bin(bits,32), demodStr);\r
+ PrintAndLog("[%s] 0x%08X %s", blockNum, blockData, sprint_bin(bits,32));\r
}\r
\r
int special(const char *Cmd) {\r
bits[i]=DemodBuffer[j+i];\r
\r
blockData = PackBits(0, 32, bits);\r
-\r
- //char indicate[4] = {0x00};\r
- // if ( (blockData >> 24) == 0xE0 )\r
- // sprintf(indicate,"<--");\r
- //PrintAndLog("[%02d] 0x%08X %s %s",j , blockData, sprint_bin(bits,32), indicate); \r
+ \r
PrintAndLog("[%02d] 0x%08X %s",j , blockData, sprint_bin(bits,32)); \r
}\r
return 0;\r
\r
void printConfiguration( t55xx_conf_block_t b){\r
PrintAndLog("Modulation : %s", GetSelectedModulationStr(b.modulation) );\r
+ PrintAndLog("Bit Rate : %s", GetBitRateStr(b.bitrate) );\r
PrintAndLog("Inverted : %s", (b.inverted) ? "Yes" : "No" );\r
PrintAndLog("Offset : %d", b.offset);\r
PrintAndLog("Block0 : 0x%08X", b.block0);\r
UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};\r
c.d.asBytes[0] = 0x0; \r
\r
- PrintAndLog("Writing to block: %d data: 0x%08X", block, data);\r
+ PrintAndLog("Writing to block: %d data : 0x%08X", block, data);\r
\r
//Password mode\r
if (res == 3) {\r
if (strlen(Cmd)==0)\r
AquireData( TRACE_BLOCK );\r
\r
- DecodeT55xxBlock();\r
+ if (!DecodeT55xxBlock()) return 1;\r
\r
- if (!DemodBufferLen) return 1;\r
+ if ( !DemodBufferLen) return 1;\r
\r
RepaintGraphWindow();\r
uint8_t repeat = 0;\r
uint8_t si = config.offset+repeat;\r
uint32_t bl0 = PackBits(si, 32, DemodBuffer);\r
uint32_t bl1 = PackBits(si+32, 32, DemodBuffer);\r
+ // uint32_t bl2 = PackBits(si+64, 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 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, 12, DemodBuffer); si += 12;\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
- year += 2000;\r
\r
- PrintAndLog("");\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 ( acl != 0xE0 ) {\r
+ PrintAndLog("The modulation is most likely wrong since the ACL is not 0xE0. ");\r
+ return 1;\r
+ }\r
+\r
PrintAndLog("-- T55xx Trace Information ----------------------------------");\r
PrintAndLog("-------------------------------------------------------------");\r
PrintAndLog(" ACL Allocation class (ISO/IEC 15963-1) : 0x%02X (%d)", acl, acl);\r
PrintAndLog(" CID : 0x%02X (%d) - %s", cid, cid, GetModelStrFromCID(cid));\r
PrintAndLog(" ICR IC Revision : %d",icr );\r
PrintAndLog(" Manufactured");\r
- PrintAndLog(" Year/Quarter : %d/%d",year, quarter );\r
+ PrintAndLog(" Year/Quarter : 20?%d/%d",year, quarter);\r
PrintAndLog(" Lot ID : %d", lotid );\r
PrintAndLog(" Wafer number : %d", wafer);\r
PrintAndLog(" Die Number : %d", dw);\r
PrintAndLog(" Raw Data - Page 1");\r
PrintAndLog(" Block 0 : 0x%08X %s", bl0, sprint_bin(DemodBuffer+config.offset+repeat,32) );\r
PrintAndLog(" Block 1 : 0x%08X %s", bl1, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );\r
+ //PrintAndLog(" Block 2 : 0x%08X %s", bl2, sprint_bin(DemodBuffer+config.offset+repeat+64,32) );\r
PrintAndLog("-------------------------------------------------------------");\r
- \r
- if ( acl != 0xE0 ) \r
- PrintAndLog("The modulation is most likely wrong since the ACL is not 0xE0. ");\r
+\r
+\r
/*\r
TRACE - BLOCK O\r
Bits Definition HEX\r
*/\r
char cmdp = param_getchar(Cmd, 0);\r
\r
- if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') \r
+ if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H')\r
return usage_t55xx_info();\r
\r
if (strlen(Cmd)==0)\r
AquireData( CONFIGURATION_BLOCK );\r
\r
- DecodeT55xxBlock();\r
+ if (!DecodeT55xxBlock()) return 1;\r
+\r
+ if ( !DemodBufferLen) return 1;\r
\r
- if (!DemodBufferLen) return 1;\r
- \r
uint8_t si = config.offset;\r
uint32_t bl0 = PackBits(si, 32, DemodBuffer);\r
\r
PrintAndLog(" Raw Data - Page 0");\r
PrintAndLog(" Block 0 : 0x%08X %s", bl0, sprint_bin(DemodBuffer+config.offset,32) );\r
PrintAndLog("-------------------------------------------------------------");\r
+ \r
return 0;\r
}\r
\r
}\r
\r
char * GetBitRateStr(uint32_t id){\r
- static char buf[40];\r
+ static char buf[20];\r
char *retStr = buf;\r
switch (id){\r
case 0: \r
- sprintf(retStr,"%d - RF/8",id);\r
+ snprintf(retStr,sizeof(buf),"%d - RF/8",id);\r
break;\r
case 1:\r
- sprintf(retStr,"%d - RF/16",id);\r
+ snprintf(retStr,sizeof(buf),"%d - RF/16",id);\r
break;\r
case 2: \r
- sprintf(retStr,"%d - RF/32",id);\r
+ snprintf(retStr,sizeof(buf),"%d - RF/32",id);\r
break;\r
case 3:\r
- sprintf(retStr,"%d - RF/40",id);\r
+ snprintf(retStr,sizeof(buf),"%d - RF/40",id);\r
break;\r
case 4:\r
- sprintf(retStr,"%d - RF/50",id);\r
+ snprintf(retStr,sizeof(buf),"%d - RF/50",id);\r
break;\r
case 5:\r
- sprintf(retStr,"%d - RF/64",id);\r
+ snprintf(retStr,sizeof(buf),"%d - RF/64",id);\r
break;\r
case 6:\r
- sprintf(retStr,"%d - RF/100",id);\r
+ snprintf(retStr,sizeof(buf),"%d - RF/100",id);\r
break;\r
case 7:\r
- sprintf(retStr,"%d - RF/128",id);\r
+ snprintf(retStr,sizeof(buf),"%d - RF/128",id);\r
break;\r
default:\r
- sprintf(retStr,"%d - (Unknown)",id);\r
+ snprintf(retStr,sizeof(buf),"%d - (Unknown)",id);\r
break;\r
}\r
\r
return buf;\r
}\r
\r
+\r
char * GetSaferStr(uint32_t id){\r
- static char buf[40];\r
+ static char buf[20];\r
char *retStr = buf;\r
\r
- sprintf(retStr,"%d",id);\r
+ snprintf(retStr,sizeof(buf),"%d",id);\r
if (id == 6) {\r
- sprintf(retStr,"%d - passwd",id);\r
+ snprintf(retStr,sizeof(buf),"%d - passwd",id);\r
}\r
if (id == 9 ){\r
- sprintf(retStr,"%d - testmode",id);\r
+ snprintf(retStr,sizeof(buf),"%d - testmode",id);\r
}\r
\r
return buf;\r
}\r
+\r
char * GetModulationStr( uint32_t id){\r
- static char buf[40];\r
+ static char buf[60];\r
char *retStr = buf;\r
\r
switch (id){\r
case 0: \r
- sprintf(retStr,"%d - DIRECT (ASK/NRZ)",id);\r
+ snprintf(retStr,sizeof(buf),"%d - DIRECT (ASK/NRZ)",id);\r
break;\r
case 1:\r
- sprintf(retStr,"%d - PSK 1 phase change when input changes",id);\r
+ snprintf(retStr,sizeof(buf),"%d - PSK 1 phase change when input changes",id);\r
break;\r
case 2: \r
- sprintf(retStr,"%d - PSK 2 phase change on bitclk if input high",id);\r
+ snprintf(retStr,sizeof(buf),"%d - PSK 2 phase change on bitclk if input high",id);\r
break;\r
case 3:\r
- sprintf(retStr,"%d - PSK 3 phase change on rising edge of input",id);\r
+ snprintf(retStr,sizeof(buf),"%d - PSK 3 phase change on rising edge of input",id);\r
break;\r
case 4:\r
- sprintf(retStr,"%d - FSK 1 RF/8 RF/5",id);\r
+ snprintf(retStr,sizeof(buf),"%d - FSK 1 RF/8 RF/5",id);\r
break;\r
case 5:\r
- sprintf(retStr,"%d - FSK 2 RF/8 RF/10",id);\r
+ snprintf(retStr,sizeof(buf),"%d - FSK 2 RF/8 RF/10",id);\r
break;\r
case 6:\r
- sprintf(retStr,"%d - FSK 1a RF/5 RF/8",id);\r
+ snprintf(retStr,sizeof(buf),"%d - FSK 1a RF/5 RF/8",id);\r
break;\r
case 7:\r
- sprintf(retStr,"%d - FSK 2a RF/10 RF/8",id);\r
+ snprintf(retStr,sizeof(buf),"%d - FSK 2a RF/10 RF/8",id);\r
break;\r
case 8:\r
- sprintf(retStr,"%d - Manschester",id);\r
+ snprintf(retStr,sizeof(buf),"%d - Manschester",id);\r
break;\r
case 16:\r
- sprintf(retStr,"%d - Biphase",id);\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
- sprintf(retStr,"%d - Reserved",id);\r
+ snprintf(retStr,sizeof(buf),"%d - Reserved",id);\r
break;\r
default:\r
- sprintf(retStr,"0x%02X (Unknown)",id);\r
+ snprintf(retStr,sizeof(buf),"0x%02X (Unknown)",id);\r
break;\r
}\r
return buf;\r
\r
char * GetSelectedModulationStr( uint8_t id){\r
\r
- static char buf[16];\r
+ static char buf[20];\r
char *retStr = buf;\r
- \r
+\r
switch (id){\r
case DEMOD_FSK:\r
- sprintf(retStr,"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
- sprintf(retStr,"ASK");\r
+ snprintf(retStr,sizeof(buf),"ASK");\r
break;\r
case DEMOD_NRZ:\r
- sprintf(retStr,"DIRECT/NRZ");\r
+ snprintf(retStr,sizeof(buf),"DIRECT/NRZ");\r
break;\r
case DEMOD_PSK1:\r
- sprintf(retStr,"PSK1");\r
+ snprintf(retStr,sizeof(buf),"PSK1");\r
break;\r
case DEMOD_PSK2:\r
- sprintf(retStr,"PSK2");\r
+ snprintf(retStr,sizeof(buf),"PSK2");\r
break;\r
case DEMOD_PSK3:\r
- sprintf(retStr,"PSK3");\r
- break; \r
+ snprintf(retStr,sizeof(buf),"PSK3");\r
+ break;\r
case DEMOD_BI:\r
- sprintf(retStr,"BIPHASE");\r
+ snprintf(retStr,sizeof(buf),"BIPHASE");\r
+ break;\r
+ case DEMOD_BIa:\r
+ snprintf(retStr,sizeof(buf),"BIPHASEa - (CDP)");\r
break;\r
default:\r
- sprintf(retStr,"(Unknown)");\r
+ snprintf(retStr,sizeof(buf),"(Unknown)");\r
break;\r
}\r
return buf;\r
\r
if (len > 32) return 0;\r
\r
- uint32_t tmp = 0;\r
+ uint32_t tmp = 0;\r
for (; j >= 0; --j, ++i)\r
tmp |= bits[i] << j;\r
- \r
+\r
return tmp;\r
}\r
\r
static command_t CommandTable[] =\r
{\r
{"help", CmdHelp, 1, "This help"},\r
- {"config", CmdT55xxSetConfig, 1, "Set/Get T55XX configuration (modulation, inverted, offset)"},\r
+ {"config", CmdT55xxSetConfig, 1, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"},\r
{"detect", CmdT55xxDetect, 0, "[1] Try detecting the tag modulation from reading the configuration block."},\r
{"read", CmdT55xxReadBlock, 0, "<block> [password] -- Read T55xx block data (page 0) [optional password]"},\r
{"write", CmdT55xxWriteBlock,0, "<block> <data> [password] -- Write T55xx block data (page 0) [optional password]"},\r
projects / proxmark3-svn / blobdiff