#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
-int usage_t55xx_rd(){\r
- PrintAndLog("Usage: lf t55xx rd <block> <password>");\r
+int usage_t55xx_read(){\r
+ PrintAndLog("Usage: lf t55xx r
ead <block> <password>");
\r PrintAndLog(" <block>, block number to read. Between 0-7");\r
PrintAndLog(" <password>, OPTIONAL password (8 hex characters)");\r
PrintAndLog("");\r
- PrintAndLog(" sample: lf t55xx rd 0 = try reading data from block 0");\r
- PrintAndLog(" : lf t55xx rd 0 feedbeef = try reading data from block 0 using password");\r
+ PrintAndLog(" sample: lf t55xx read 0 = try reading data from block 0");\r
+ PrintAndLog(" : lf t55xx read 0 feedbeef = try reading data from block 0 using password");\r
PrintAndLog("");\r
return 0;\r
}\r
-int usage_t55xx_wr(){\r
+int usage_t55xx_write(){\r
PrintAndLog("Usage: lf t55xx wr <block> <data> [password]");\r
PrintAndLog(" <block>, block number to read. Between 0-7");\r
PrintAndLog(" <data>, 4 bytes of data to write (8 hex characters)");\r
PrintAndLog("");\r
return 0;\r
}\r
-\r
int usage_t55xx_dump(){\r
PrintAndLog("Usage: lf t55xx dump <password>");\r
PrintAndLog(" <password>, OPTIONAL password 4bytes (8 hex characters)");\r
PrintAndLog("");\r
return 0;\r
}\r
+\r
static int CmdHelp(const char *Cmd);\r
\r
int CmdReadBlk(const char *Cmd)\r
{\r
- int invert = 0;\r
- int clk = 0;\r
+ int i = 0;\r
int block = -1;\r
int password = 0xFFFFFFFF; //default to blank Block 7\r
- int errCnt;\r
- size_t bitlen;\r
- int maxErr = 100;\r
- uint8_t askAmp = 0;\r
- uint32_t blockData;\r
+ size_t bitlen = 0;\r
+ uint32_t blockData = 0;\r
uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
\r
- \r
char cmdp = param_getchar(Cmd, 0);\r
if (cmdp == 'h' || cmdp == 'H') {\r
- usage_t55xx_rd();\r
+ usage_t55xx_read();\r
return 0;\r
}\r
\r
int res = sscanf(Cmd, "%d %x", &block, &password);\r
\r
if ( res < 1 || res > 2 ){\r
- usage_t55xx_rd();\r
+ usage_t55xx_read();\r
return 1;\r
}\r
\r
}\r
\r
SendCommand(&c);\r
- if ( !WaitForResponseTimeout(CMD_ACK,NULL,1500) ) {\r
+ if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
PrintAndLog("command execution time out");\r
return 2;\r
}\r
\r
- CmdSamples("12000");\r
+ uint8_t got[12000];\r
+ GetFromBigBuf(got,sizeof(got),0);\r
+ WaitForResponse(CMD_ACK,NULL);\r
\r
+ setGraphBuf(got, 12000);\r
+ \r
bitlen = getFromGraphBuf(bits);\r
+\r
+ int ans = 0;\r
+ ans = CmdFSKrawdemod("");\r
+ ans = CmdFSKrawdemod("1"); //invert?\r
+ ans = Cmdaskmandemod("");\r
+ ans = Cmdaskrawdemod("");\r
+ ans = CmdNRZrawDemod("");\r
+ ans = CmdPSK1rawDemod("");\r
+ ans = CmdPSK2rawDemod("");\r
\r
- errCnt = askrawdemod(bits, &bitlen, &clk, &invert, maxErr, askAmp);\r
+ // if ( !tryDemod(bits, bitlen) )\r
+ // return 3;\r
\r
- //throw away static - allow 1 and -1 (in case of threshold command first)\r
- if ( errCnt == -1 || bitlen < 16 ){ \r
- PrintAndLog("no data found");\r
- if (g_debugMode) \r
- PrintAndLog("errCnt: %d, bitlen: %d, clk: %d, invert: %d", errCnt, bitlen, clk, invert);\r
- return 3;\r
- }\r
- if (g_debugMode) \r
- PrintAndLog("Using Clock: %d - invert: %d - Bits Found: %d", clk, invert, bitlen);\r
-\r
- //move bits back to DemodBuffer\r
- setDemodBuf(bits, bitlen, 0);\r
- printBitStream(bits,bitlen);\r
+ // //move bits back to DemodBuffer\r
+ // setDemodBuf(bits, bitlen, 0);\r
+ // printBitStream(bits, bitlen);\r
+ if ( !DemodBufferLen) \r
+ return 0;\r
\r
- // bits has the manchester encoded data.\r
- errCnt = manrawdecode(bits, &bitlen); \r
- if ( errCnt == -1 || bitlen < 16 ){ \r
- PrintAndLog("no data found");\r
- if (g_debugMode) \r
- PrintAndLog("errCnt: %d, bitlen: %d, clk: %d, invert: %d", errCnt, bitlen, clk, invert);\r
- return 4;\r
- }\r
-\r
- blockData = PackBits(0, 32, bits);\r
+ for (;i<DemodBufferLen;++i)\r
+ bits[i]=DemodBuffer[i];\r
+ \r
+ blockData = PackBits(1, 32, bits);\r
\r
if ( block < 0)\r
- PrintAndLog(" Decoded : 0x%08X %s", blockData, sprint_bin(bits,32) );\r
+ PrintAndLog(" Decoded : 0x%08X %s", blockData, sprint_bin(bits+1,32) );\r
else\r
- PrintAndLog(" Block %d : 0x%08X %s", block, blockData, sprint_bin(bits,32) );\r
+ PrintAndLog(" Block %d : 0x%08X %s", block, blockData, sprint_bin(bits+1,32) );\r
\r
return 0;\r
}\r
\r
+\r
+/*\r
+FSK1 / FSK1a\r
+size = fskdemod(dest, size, 32, 0, 8, 10); // fsk1 RF/32 \r
+size = fskdemod(dest, size, 32, 1, 8, 10); // fsk1a RF/32 \r
+\r
+FSK2 / FSK2a\r
+size = fskdemod(dest, size, 32, 0, 10, 8); // fsk2 RF/32 \r
+size = fskdemod(dest, size, 32, 1, 10, 8); // fsk2a RF/32 \r
+size = fskdemod(dest, size, 50, 1, 10, 8); // fsk2a RF/50 \r
+size = fskdemod(dest, size, 64, 1, 10, 8); // FSK2a RF/64 \r
+\r
+PSK1\r
+errCnt = pskRawDemod(bits, &bitlen, 32, 0);\r
+*/\r
+bool tryDemod(uint8_t bits[], size_t bitlen) {\r
+ \r
+ int invert = 0;\r
+ int clk = 0;\r
+ int errCnt, size;\r
+ int maxErr = 100;\r
+ uint8_t rflen, fchigh, fclow, dummy = 0;\r
+ uint16_t fcs=0;\r
+\r
+ // ASK - manchester demod\r
+ errCnt = askmandemod(bits, &bitlen, &clk, &invert, maxErr);\r
+ if ( analyseDemod(errCnt, bitlen, clk, invert) ) \r
+ return true;\r
+\r
+ // FSK demod\r
+ fcs = countFC(bits, bitlen, &dummy);\r
+ if (fcs == 0){\r
+ fchigh = 10;\r
+ fclow = 8;\r
+ }else{\r
+ fchigh = (fcs >> 8) & 0xFF;\r
+ fclow = fcs & 0xFF;\r
+ }\r
+ //get bit clock length\r
+ rflen = detectFSKClk(bits, bitlen, fchigh, fclow);\r
+ rflen = (rflen == 0) ? 50 : rflen;\r
+\r
+ size = fskdemod(bits, bitlen, rflen, invert, fchigh, fclow);\r
+ if ( analyseDemod(size, bitlen, clk, invert) ) \r
+ return true; \r
+ \r
+ // PSK demod\r
+ return false;\r
+}\r
+\r
+bool analyseDemod( int errCnt, size_t bitlen, uint8_t clock, uint8_t invert){\r
+ if (g_debugMode) \r
+ PrintAndLog("ErrorCount: %d, Bits Found: %d, Clock: %d, invert: %d", errCnt, bitlen, clock, invert);\r
+ //PrintAndLog("Args invert: %d - Clock:%d - fchigh:%d - fclow: %d",invert,rfLen,fchigh, fclow);\r
+ \r
+ //throw away static - allow 1 and -1 (in case of threshold command first)\r
+ if ( errCnt == -1 || bitlen < 32 ){ \r
+ PrintAndLog("no success demod");\r
+ return false;\r
+ }\r
+ return true;\r
+}\r
+\r
int CmdWriteBlk(const char *Cmd)\r
{\r
int block = 8; //default to invalid block\r
\r
char cmdp = param_getchar(Cmd, 0);\r
if (cmdp == 'h' || cmdp == 'H') {\r
- usage_t55xx_wr();\r
+ usage_t55xx_write();\r
return 0;\r
}\r
\r
int res = sscanf(Cmd, "%d %x %x",&block, &data, &password);\r
\r
if ( res < 2 || res > 3) {\r
- usage_t55xx_wr();\r
+ usage_t55xx_write();\r
return 1;\r
}\r
\r
UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};\r
c.d.asBytes[0] = 0x0; \r
\r
- if (res == 2) {\r
- PrintAndLog("Writing block %d data %08X", block, data);\r
- } else {\r
- //Password mode\r
+ PrintAndLog("Writing to T55x7");\r
+ PrintAndLog("block : %d", block);\r
+ PrintAndLog("data : 0x%08X", data);\r
+\r
+ //Password mode\r
+ if (res == 3) {\r
c.arg[2] = password;\r
c.d.asBytes[0] = 0x1; \r
- PrintAndLog("Writing block %d data %08X password %08X", block, data, password);\r
+ PrintAndLog("pwd : 0x%08X", password);\r
}\r
- \r
SendCommand(&c);\r
return 0;\r
}\r
\r
int CmdReadTrace(const char *Cmd)\r
{\r
- char cmdp = param_getchar(Cmd, 0);\r
+ size_t bitlen;\r
+ uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
\r
+ char cmdp = param_getchar(Cmd, 0);\r
+ \r
if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {\r
usage_t55xx_trace();\r
return 0;\r
\r
UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}};\r
SendCommand(&c);\r
- WaitForResponse(CMD_ACK, NULL);\r
-\r
- uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};\r
-\r
- GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,0); //3560 -- should be offset..\r
- WaitForResponseTimeout(CMD_ACK,NULL, 1500);\r
-\r
- for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {\r
- GraphBuffer[j] = ((int)data[j]);\r
+ if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
+ PrintAndLog("command execution time out");\r
+ return 1;\r
}\r
- GraphTraceLen = LF_TRACE_BUFF_SIZE;\r
+ //darn\r
+ //CmdSamples("12000");\r
}\r
\r
- uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};\r
- uint8_t * bitstream = bits;\r
- \r
- manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream, LF_BITSSTREAM_LEN);\r
+ bitlen = getFromGraphBuf(bits);\r
+\r
+\r
RepaintGraphWindow();\r
\r
uint8_t si = 5;\r
- uint32_t bl0 = PackBits(si, 32, bitstream);\r
- uint32_t bl1 = PackBits(si+32, 32, bitstream);\r
+ uint32_t bl0 = PackBits(si, 32, bits);\r
+ uint32_t bl1 = PackBits(si+32, 32, bits);\r
\r
- uint32_t acl = PackBits(si, 8, bitstream); si += 8;\r
- uint32_t mfc = PackBits(si, 8, bitstream); si += 8;\r
- uint32_t cid = PackBits(si, 5, bitstream); si += 5;\r
- uint32_t icr = PackBits(si, 3, bitstream); si += 3;\r
- uint32_t year = PackBits(si, 4, bitstream); si += 4;\r
- uint32_t quarter = PackBits(si, 2, bitstream); si += 2;\r
- uint32_t lotid = PackBits(si, 12, bitstream); si += 12;\r
- uint32_t wafer = PackBits(si, 5, bitstream); si += 5;\r
- uint32_t dw = PackBits(si, 15, bitstream); \r
+ uint32_t acl = PackBits(si, 8, bits); si += 8;\r
+ uint32_t mfc = PackBits(si, 8, bits); si += 8;\r
+ uint32_t cid = PackBits(si, 5, bits); si += 5;\r
+ uint32_t icr = PackBits(si, 3, bits); si += 3;\r
+ uint32_t year = PackBits(si, 4, bits); si += 4;\r
+ uint32_t quarter = PackBits(si, 2, bits); si += 2;\r
+ uint32_t lotid = PackBits(si, 12, bits); si += 12;\r
+ uint32_t wafer = PackBits(si, 5, bits); si += 5;\r
+ uint32_t dw = PackBits(si, 15, bits); \r
\r
PrintAndLog("");\r
PrintAndLog("-- T55xx Trace Information ----------------------------------");\r
PrintAndLog(" Die Number : %d", dw);\r
PrintAndLog("-------------------------------------------------------------");\r
PrintAndLog(" Raw Data - Page 1");\r
- PrintAndLog(" Block 0 : 0x%08X %s", bl0, sprint_bin(bitstream+5,32) );\r
- PrintAndLog(" Block 0 : 0x%08X %s", bl1, sprint_bin(bitstream+37,32) );\r
+ PrintAndLog(" Block 0 : 0x%08X %s", bl0, sprint_bin(bits+5,32) );\r
+ PrintAndLog(" Block 0 : 0x%08X %s", bl1, sprint_bin(bits+37,32) );\r
PrintAndLog("-------------------------------------------------------------");\r
/*\r
TRACE - BLOCK O\r
static command_t CommandTable[] =\r
{\r
{"help", CmdHelp, 1, "This help"},\r
- {"rd", CmdReadBlk, 0, "<block> [password] -- Read T55xx block data (page 0) [optional password]"},\r
- {"wr", CmdWriteBlk, 0, "<block> <data> [password] -- Write T55xx block data (page 0) [optional password]"},\r
+ {"read", CmdReadBlk, 0, "<block> [password] -- Read T55xx block data (page 0) [optional password]"},\r
+ {"write", CmdWriteBlk, 0, "<block> <data> [password] -- Write T55xx block data (page 0) [optional password]"},\r
{"trace", CmdReadTrace, 0, "[1] Read T55xx traceability data (page 1/ blk 0-1)"},\r
{"info", CmdInfo, 0, "[1] Read T55xx configuration data (page 0/ blk 0)"},\r
{"dump", CmdDump, 0, "[password] Dump T55xx card block 0-7. [optional password]"},\r
- {"man", CmdIceManchester, 0, "Manchester demod (with SST)"},\r
{NULL, NULL, 0, NULL}\r
};\r
\r
projects / proxmark3-svn / blobdiff