#include "data.h"\r
#include "lfdemod.h"\r
#include "../common/crc.h"\r
+#include "../common/iso14443crc.h"\r
+#include "cmdhf14a.h"\r
\r
-#define LF_TRACE_BUFF_SIZE 20000 // 32 x 32 x 10 (32 bit times numofblock (7), times clock skip..)\r
-#define LF_BITSSTREAM_LEN 1000 // more then 1000 bits shouldn't happend.. 8block * 4 bytes * 8bits = \r
-\r
-// Default configuration: ASK, not inversed.\r
-t55xx_conf_block_t config = { .modulation = 2, .inversed = FALSE, .block0 = 0x00};\r
+// Default configuration\r
+t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inversed = FALSE, .offset = 0x00, .block0 = 0x00};\r
\r
int usage_t55xx_config(){\r
- PrintAndLog("Usage: lf t55xx config [d <demodulation>] [i 1]");\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|PSK|NZ|BI> Set demodulation FSK / ASK / PSK / NZ / Biphase");\r
+ PrintAndLog(" d <FSK|ASK|PSK1|PSK2|NZ|BI> Set demodulation FSK / ASK / PSK / NZ / Biphase");\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("");\r
PrintAndLog("Examples:");\r
- PrintAndLog(" lf t55xx config d FSK - FSK demodulation");\r
- PrintAndLog(" lf t55xx config d FSK i 1 - FSK demodulation, inverse data");\r
+ PrintAndLog(" lf t55xx config d FSK - FSK demodulation");\r
+ PrintAndLog(" lf t55xx config d FSK i 1 - FSK demodulation, inverse data");\r
+ PrintAndLog(" lf t55xx config d FSK i 1 o 3 - FSK demodulation, inverse data, offset=3,start from bitpos 3 to decode data");\r
PrintAndLog("");\r
return 0;\r
}\r
\r
int CmdT55xxSetConfig(const char *Cmd){\r
\r
- int len = 0;\r
- int foundModulation = 2;\r
- bool inverse = FALSE;\r
+ uint8_t offset = 0;\r
bool errors = FALSE;\r
uint8_t cmdp = 0;\r
- char modulation[4] = {0x00};\r
+ char modulation[5] = {0x00};\r
+ char tmp = 0x00;\r
\r
while(param_getchar(Cmd, cmdp) != 0x00 && !errors)\r
{\r
- switch(param_getchar(Cmd, cmdp))\r
+ tmp = param_getchar(Cmd, cmdp);\r
+ switch(tmp)\r
{\r
case 'h':\r
case 'H':\r
return usage_t55xx_config();\r
case 'd':\r
- len = param_getstr(Cmd, cmdp+1, modulation);\r
- cmdp+= len+1;\r
- //FSK|ASK|PSK|NZ|BI\r
+ param_getstr(Cmd, cmdp+1, modulation);\r
+ cmdp += 2;\r
+ \r
if ( strcmp(modulation, "FSK" ) == 0)\r
- foundModulation = 1;\r
+ config.modulation = DEMOD_FSK;\r
else if ( strcmp(modulation, "ASK" ) == 0)\r
- foundModulation = 2;\r
- else if ( strcmp(modulation, "PSK" ) == 0)\r
- foundModulation = 3;\r
- else if ( strcmp(modulation, "NZ" ) == 0)\r
- foundModulation = 4;\r
+ config.modulation = DEMOD_ASK;\r
+ else if ( strcmp(modulation, "NRZ" ) == 0)\r
+ config.modulation = DEMOD_NRZ;\r
+ else if ( strcmp(modulation, "PSK1" ) == 0)\r
+ config.modulation = DEMOD_PSK1;\r
+ else if ( strcmp(modulation, "PSK2" ) == 0)\r
+ config.modulation = DEMOD_PSK2;\r
else if ( strcmp(modulation, "BI" ) == 0)\r
- foundModulation = 5;\r
+ config.modulation = DEMOD_BI;\r
else {\r
PrintAndLog("Unknown modulation '%s'", modulation);\r
errors = TRUE;\r
}\r
break;\r
case 'i':\r
- inverse = param_getchar(Cmd,cmdp+1) == '1';\r
+ config.inversed = param_getchar(Cmd,cmdp+1) == '1';\r
cmdp+=2;\r
break;\r
+ case 'o':\r
+ errors |= param_getdec(Cmd, cmdp+1,&offset);\r
+ if ( !errors )\r
+ config.offset = offset;\r
+ cmdp += 2;\r
+ break;\r
default:\r
PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r
errors = TRUE;\r
break;\r
}\r
}\r
+\r
// No args\r
if (cmdp == 0) {\r
printConfiguration( config );\r
//Validations\r
if (errors)\r
return usage_t55xx_config();\r
- \r
- config.modulation = foundModulation;\r
- config.inversed = inverse;\r
config.block0 = 0;\r
+ printConfiguration( config );\r
return 0;\r
}\r
\r
\r
void DecodeT55xxBlock(){\r
\r
- char buf[6] = {0x00};\r
+ char buf[8] = {0x00};\r
char *cmdStr = buf;\r
\r
// clearing the DemodBuffer.\r
\r
// use the configuration\r
switch( config.modulation ){\r
- case 1:\r
+ case DEMOD_FSK:\r
sprintf(cmdStr,"0 %d", config.inversed );\r
FSKrawDemod(cmdStr, FALSE);\r
break;\r
- case 2:\r
+ case DEMOD_ASK:\r
sprintf(cmdStr,"0 %d 1", config.inversed );\r
ASKmanDemod(cmdStr, FALSE, FALSE);\r
break;\r
- case 3:\r
+ case DEMOD_PSK1:\r
sprintf(cmdStr,"0 %d 1", config.inversed );\r
PSKDemod(cmdStr, FALSE);\r
break;\r
- case 4:\r
+ case DEMOD_PSK2:\r
+ sprintf(cmdStr,"0 %d 1", config.inversed );\r
+ PSKDemod(cmdStr, FALSE);\r
+ psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
+ break;\r
+ case DEMOD_PSK3:\r
+ sprintf(cmdStr,"0 %d 1", config.inversed );\r
+ PSKDemod(cmdStr, FALSE);\r
+ psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
+ break;\r
+ case DEMOD_NRZ:\r
sprintf(cmdStr,"0 %d 1", config.inversed );\r
NRZrawDemod(cmdStr, FALSE);\r
break;\r
- case 5:\r
- //BiphaseRawDecode("0",FALSE);\r
+ case DEMOD_BI:\r
+ sprintf(cmdStr,"0 0 %d 1", config.inversed );\r
+ // DEPENDS ON NEW CODE IN MARSHMELLOWS PULL REQUEST\r
+ //ASKbiphDemod(cmdStr, FALSE);\r
break;\r
default:\r
return;\r
bool tryDetectModulation(){\r
\r
uint8_t hits = 0;\r
- t55xx_conf_block_t tests[10];\r
+ t55xx_conf_block_t tests[11];\r
\r
if (GetFskClock("", FALSE, FALSE)){ \r
- if ( FSKrawDemod("0 0", FALSE) && test()){\r
+ if ( FSKrawDemod("0 0", FALSE) && test(DEMOD_FSK, &tests[hits].offset)){\r
tests[hits].modulation = DEMOD_FSK;\r
tests[hits].inversed = FALSE;\r
++hits;\r
}\r
- if ( FSKrawDemod("0 1", FALSE) && test()) {\r
+ if ( FSKrawDemod("0 1", FALSE) && test(DEMOD_FSK, &tests[hits].offset)) {\r
tests[hits].modulation = DEMOD_FSK;\r
tests[hits].inversed = TRUE;\r
++hits;\r
}\r
} else {\r
- if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test()) {\r
+ if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test(DEMOD_ASK, &tests[hits].offset)) {\r
tests[hits].modulation = DEMOD_ASK;\r
tests[hits].inversed = FALSE;\r
++hits;\r
}\r
\r
- if ( ASKmanDemod("0 1 1", FALSE, FALSE) && test()) {\r
+ if ( ASKmanDemod("0 1 1", FALSE, FALSE) && test(DEMOD_ASK, &tests[hits].offset)) {\r
tests[hits].modulation = DEMOD_ASK;\r
tests[hits].inversed = TRUE;\r
++hits;\r
}\r
\r
- if ( NRZrawDemod("0 0 1", FALSE) && test()) {\r
- tests[hits].modulation = DEMOD_NZR;\r
+ if ( NRZrawDemod("0 0 1", FALSE) && test(DEMOD_NRZ, &tests[hits].offset)) {\r
+ tests[hits].modulation = DEMOD_NRZ;\r
tests[hits].inversed = FALSE;\r
++hits;\r
}\r
\r
- if ( NRZrawDemod("0 1 1", FALSE) && test()) {\r
- tests[hits].modulation = DEMOD_NZR;\r
+ if ( NRZrawDemod("0 1 1", FALSE) && test(DEMOD_NRZ, &tests[hits].offset)) {\r
+ tests[hits].modulation = DEMOD_NRZ;\r
tests[hits].inversed = TRUE;\r
++hits;\r
}\r
\r
- if ( PSKDemod("0 0 1", FALSE) >= 0 && test()) {\r
- tests[hits].modulation = DEMOD_PSK;\r
+ if ( PSKDemod("0 0 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset)) {\r
+ tests[hits].modulation = DEMOD_PSK1;\r
tests[hits].inversed = FALSE;\r
++hits;\r
}\r
\r
- if ( PSKDemod("0 1 1", FALSE) >= 0 && test()) {\r
- tests[hits].modulation = DEMOD_PSK;\r
+ if ( PSKDemod("0 1 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset)) {\r
+ tests[hits].modulation = DEMOD_PSK1;\r
tests[hits].inversed = TRUE;\r
++hits;\r
}\r
- //PSK2?\r
- // if (!BiphaseRawDecode("0",FALSE) && test()) {\r
- // tests[++hits].modulation = DEMOD_BI;\r
- // tests[hits].inversed = FALSE;\r
- //}\r
- // if (!BiphaseRawDecode("1",FALSE) && test()) {\r
- // tests[++hits].modulation = DEMOD_BI;\r
- // tests[hits].inversed = TRUE;\r
- // }\r
+\r
+ //PSK2\r
+ if ( PSKDemod("0 0 1", FALSE)) {\r
+ psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
+ if (test(DEMOD_PSK2, &tests[hits].offset)){\r
+ tests[hits].modulation = DEMOD_PSK2;\r
+ tests[hits].inversed = FALSE;\r
+ ++hits;\r
+ }\r
+ }\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].inversed = TRUE;\r
+ ++hits;\r
+ }\r
+ }\r
+\r
+ /* DEPENDANT ON NEW CODE IN MARSHMELLOWS pull request\r
+ //biphase //offset, clock, invert, maxErr\r
+ if ( ASKbiphaseDemod("0 0 0 1", FALSE) && test(DEMOD_BI, &tests[hits].offset) ) {\r
+ tests[hits].modulation = DEMOD_BI;\r
+ tests[hits].inversed = FALSE;\r
+ ++hits;\r
+ }\r
+ if ( ASKbiphaseDemod("0 0 1 1", FALSE) && test(DEMOD_BI, &tests[hits].offset) ) {\r
+ tests[hits].modulation = DEMOD_BI;\r
+ tests[hits].inversed = TRUE;\r
+ ++hits;\r
+ }\r
+ */\r
} \r
if ( hits == 1) {\r
config.modulation = tests[0].modulation;\r
config.inversed = tests[0].inversed;\r
+ config.offset = tests[0].offset;\r
printConfiguration( config );\r
return TRUE;\r
}\r
return FALSE;\r
}\r
\r
-bool test(){\r
+bool testModulation(uint8_t mode, uint8_t modread){\r
+ switch( mode ){\r
+ case DEMOD_FSK:\r
+ if (modread > 3 && modread < 8) return TRUE;\r
+ break;\r
+ case DEMOD_ASK:\r
+ if (modread == 8) return TRUE;\r
+ break;\r
+ case DEMOD_PSK1:\r
+ if (modread == 1) return TRUE;\r
+ break;\r
+ case DEMOD_PSK2:\r
+ if (modread == 2) return TRUE;\r
+ break;\r
+ case DEMOD_PSK3:\r
+ if (modread == 3) return TRUE;\r
+ break;\r
+ case DEMOD_NRZ:\r
+ if (!modread) return TRUE;\r
+ break;\r
+ case DEMOD_BI:\r
+ if (modread == 16) return TRUE;\r
+ break;\r
+ default:\r
+ return FALSE;\r
+ }\r
+ return FALSE;\r
+}\r
+\r
+bool test(uint8_t mode, uint8_t *offset){\r
\r
if ( !DemodBufferLen) \r
- return false;\r
- \r
- uint8_t si = 1;\r
- uint8_t safer = PackBits(si, 4, DemodBuffer); si += 4; \r
- uint8_t resv = PackBits(si, 7, DemodBuffer); si += 7+3;\r
- uint8_t extend = PackBits(si, 1, DemodBuffer); si += 1;\r
+ return FALSE;\r
+ if ( PackBits(0, 32, DemodBuffer) == 0x00 )\r
+ return FALSE;\r
+ for (uint8_t idx=1; idx<33; idx++){\r
+ uint8_t si = idx;\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
+ 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 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
+ 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
+ bool extMode = FALSE;\r
\r
//PrintAndLog("test: %X %X %X ", safer, resv, extend);\r
\r
// 2nibble must be zeroed.\r
- if ( resv > 0x00) return FALSE;\r
+ if ( resv > 0x00) continue;\r
+\r
+ //if extended mode\r
+ if ( (safer == 0x6 || safer == 0x9) && extend) extMode = TRUE;\r
+\r
+ if (!extMode){\r
+ if (nml01 || nml02 || xtRate) continue;\r
+ }\r
\r
- if ( safer == 0x6 || safer == 0x9){\r
- if ( extend == 0x00)\r
+ //test modulation\r
+ if (!testModulation(mode, modread)) continue;\r
+ *offset = idx;\r
return TRUE;\r
}\r
- if ( resv== 0x00) return TRUE;\r
return FALSE;\r
}\r
\r
void printT55xxBlock(const char *demodStr){\r
\r
uint32_t blockData = 0;\r
- uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
+ uint8_t bits[64] = {0x00};\r
\r
if ( !DemodBufferLen) \r
return;\r
\r
- int i =0;\r
- for (;i<DemodBufferLen;++i)\r
- bits[i]=DemodBuffer[i];\r
+ if ( config.offset + 32 > DemodBufferLen){\r
+ PrintAndLog("The configured offset is too big. (%d > %d)", config.offset, DemodBufferLen);\r
+ return;\r
+ }\r
+ \r
+ int i = config.offset;\r
+ int pos = 32 + config.offset;\r
+ for (; i < pos; ++i)\r
+ bits[i - config.offset]=DemodBuffer[i];\r
\r
- blockData = PackBits(1, 32, bits);\r
- PrintAndLog("0x%08X %s [%s]", blockData, sprint_bin(bits+1,32), demodStr);\r
+ blockData = PackBits(0, 32, bits);\r
+ PrintAndLog("0x%08X %s [%s]", blockData, sprint_bin(bits,32), demodStr);\r
+}\r
+\r
+int special(const char *Cmd) {\r
+ uint32_t blockData = 0;\r
+ uint8_t bits[32] = {0x00};\r
+\r
+ PrintAndLog("[OFFSET] [DATA] [BINARY]");\r
+ PrintAndLog("----------------------------------------------------");\r
+ int i,j = 0;\r
+ for (; j < 128; ++j){\r
+ \r
+ for (i = 0; i < 32; ++i)\r
+ bits[i]=DemodBuffer[j+i];\r
+ \r
+ blockData = PackBits(0, 32, bits);\r
+ PrintAndLog("[%d] 0x%08X %s",j , blockData, sprint_bin(bits,32)); \r
+ }\r
+ \r
+ return 0;\r
}\r
\r
void printConfiguration( t55xx_conf_block_t b){\r
PrintAndLog("Modulation : %s", GetSelectedModulationStr(b.modulation) );\r
PrintAndLog("Inverted : %s", (b.inversed) ? "Yes" : "No" );\r
+ PrintAndLog("Offset : %d", b.offset);\r
PrintAndLog("Block0 : %08X", b.block0);\r
PrintAndLog("");\r
}\r
return 2;\r
\r
RepaintGraphWindow();\r
-\r
- uint8_t si = 5;\r
+ uint8_t repeat = 0;\r
+ if (config.offset > 5) repeat = 32;\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
\r
PrintAndLog("-- T55xx 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)", mfc, mfc);\r
- PrintAndLog(" CID : 0x%02X (%d)", cid, cid);\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(" Manufactured");\r
PrintAndLog(" Year/Quarter : %d/%d",year, quarter );\r
PrintAndLog(" Die Number : %d", dw);\r
PrintAndLog("-------------------------------------------------------------");\r
PrintAndLog(" Raw Data - Page 1");\r
- PrintAndLog(" Block 0 : 0x%08X %s", bl0, sprint_bin(DemodBuffer+5,32) );\r
- PrintAndLog(" Block 1 : 0x%08X %s", bl1, sprint_bin(DemodBuffer+37,32) );\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("-------------------------------------------------------------");\r
/*\r
TRACE - BLOCK O\r
return 2;\r
\r
\r
- uint8_t si = 1;\r
+ uint8_t si = config.offset;\r
uint32_t bl0 = PackBits(si, 32, DemodBuffer);\r
\r
uint32_t safer = PackBits(si, 4, DemodBuffer); si += 4; \r
PrintAndLog(" POR-Delay : %s", (por) ? "Yes":"No");\r
PrintAndLog("-------------------------------------------------------------");\r
PrintAndLog(" Raw Data - Page 0");\r
- PrintAndLog(" Block 0 : 0x%08X %s", bl0, sprint_bin(DemodBuffer+5,32) );\r
+ PrintAndLog(" Block 0 : 0x%08X %s", bl0, sprint_bin(DemodBuffer+config.offset,32) );\r
PrintAndLog("-------------------------------------------------------------");\r
\r
return 0;\r
return buf;\r
}\r
\r
+char * GetModelStrFromCID(uint32_t cid){\r
+ \r
+ static char buf[10];\r
+ char *retStr = buf;\r
+ \r
+ if (cid == 1) sprintf(retStr,"ATA5577M1");\r
+ if (cid == 2) sprintf(retStr,"ATA5577M2"); \r
+ return buf;\r
+}\r
+\r
char * GetSelectedModulationStr( uint8_t id){\r
\r
static char buf[16];\r
case DEMOD_ASK: \r
sprintf(retStr,"ASK (%d)",id);\r
break;\r
- case DEMOD_NZR:\r
+ case DEMOD_NRZ:\r
sprintf(retStr,"DIRECT/NRZ (%d)",id);\r
break;\r
- case DEMOD_PSK:\r
- sprintf(retStr,"PSK (%d)",id);\r
+ case DEMOD_PSK1:\r
+ sprintf(retStr,"PSK1 (%d)",id);\r
+ break;\r
+ case DEMOD_PSK2:\r
+ sprintf(retStr,"PSK2 (%d)",id);\r
break;\r
case DEMOD_BI:\r
sprintf(retStr,"BIPHASE (%d)",id);\r
{"trace", CmdT55xxReadTrace, 0, "[1] Show T55xx traceability data (page 1/ blk 0-1)"},\r
{"info", CmdT55xxInfo, 0, "[1] Show T55xx configuration data (page 0/ blk 0)"},\r
{"dump", CmdT55xxDump, 0, "[password] Dump T55xx card block 0-7. [optional password]"},\r
+ {"special", special, 0, "Shows how a datablock changes with 32 different offsets"},\r
{NULL, NULL, 0, NULL}\r
};\r
\r
projects / proxmark3-svn / blobdiff