X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/c4e3b1b6a2170ee0da2224b7446c59e1141173bb..96f39a47a98990dbe0ea35f15d9a764d188e1ead:/client/cmdlft55xx.c diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c index f35edaa4..4a1bdaa0 100644 --- a/client/cmdlft55xx.c +++ b/client/cmdlft55xx.c @@ -22,174 +22,254 @@ #include "data.h" #include "lfdemod.h" - #define LF_TRACE_BUFF_SIZE 20000 // 32 x 32 x 10 (32 bit times numofblock (7), times clock skip..) #define LF_BITSSTREAM_LEN 1000 // more then 1000 bits shouldn't happend.. 8block * 4 bytes * 8bits = -static int CmdHelp(const char *Cmd); -// int CmdReadBlk(const char *Cmd) -// { - // int block = -1; - // sscanf(Cmd, "%d", &block); - - // if ((block > 7) | (block < 0)) { - // PrintAndLog("Block must be between 0 and 7"); - // return 1; - // } - - // UsbCommand c; - // c.cmd = CMD_T55XX_READ_BLOCK; - // c.d.asBytes[0] = 0x00; - // c.arg[0] = 0; - // c.arg[1] = block; - // c.arg[2] = 0; - // SendCommand(&c); - // WaitForResponse(CMD_ACK, NULL); - - // uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00}; - - // GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,0); //3560 -- should be offset.. - // WaitForResponseTimeout(CMD_ACK,NULL, 1500); - - // for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) { - // GraphBuffer[j] = (int)data[j]; - // } - // GraphTraceLen = LF_TRACE_BUFF_SIZE; - // ManchesterDemod(block); - // RepaintGraphWindow(); - // return 0; -// } +int usage_t55xx_read(){ + PrintAndLog("Usage: lf t55xx read "); + PrintAndLog(" , block number to read. Between 0-7"); + PrintAndLog(" , OPTIONAL password (8 hex characters)"); + PrintAndLog(""); + PrintAndLog(" sample: lf t55xx read 0 = try reading data from block 0"); + PrintAndLog(" : lf t55xx read 0 feedbeef = try reading data from block 0 using password"); + PrintAndLog(""); + return 0; +} +int usage_t55xx_write(){ + PrintAndLog("Usage: lf t55xx wr [password]"); + PrintAndLog(" , block number to read. Between 0-7"); + PrintAndLog(" , 4 bytes of data to write (8 hex characters)"); + PrintAndLog(" [password], OPTIONAL password 4bytes (8 hex characters)"); + PrintAndLog(""); + PrintAndLog(" sample: lf t55xx wd 3 11223344 = try writing data 11223344 to block 3"); + PrintAndLog(" : lf t55xx wd 3 11223344 feedbeef = try writing data 11223344 to block 3 using password feedbeef"); + PrintAndLog(""); + return 0; +} +int usage_t55xx_trace() { + PrintAndLog("Usage: lf t55xx trace [graph buffer data]"); + PrintAndLog(" [graph buffer data], if set, use Graphbuffer otherwise read data from tag."); + PrintAndLog(""); + PrintAndLog(" sample: lf t55xx trace"); + PrintAndLog(" : lf t55xx trace 1"); + PrintAndLog(""); + return 0; +} +int usage_t55xx_info() { + PrintAndLog("Usage: lf t55xx info [graph buffer data]"); + PrintAndLog(" [graph buffer data], if set, use Graphbuffer otherwise read data from tag."); + PrintAndLog(""); + PrintAndLog(" sample: lf t55xx info"); + PrintAndLog(" : lf t55xx info 1"); + PrintAndLog(""); + return 0; +} +int usage_t55xx_dump(){ + PrintAndLog("Usage: lf t55xx dump "); + PrintAndLog(" , OPTIONAL password 4bytes (8 hex characters)"); + PrintAndLog(""); + PrintAndLog(" sample: lf t55xx dump"); + PrintAndLog(" : lf t55xx dump feedbeef"); + PrintAndLog(""); + return 0; +} + +static int CmdHelp(const char *Cmd); int CmdReadBlk(const char *Cmd) { - int invert = 0; - int clk = 0; + int i = 0; int block = -1; + int password = 0xFFFFFFFF; //default to blank Block 7 + size_t bitlen = 0; + uint32_t blockData = 0; uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00}; + + char cmdp = param_getchar(Cmd, 0); + if (cmdp == 'h' || cmdp == 'H') { + usage_t55xx_read(); + return 0; + } - sscanf(Cmd, "%d", &block); + int res = sscanf(Cmd, "%d %x", &block, &password); + + if ( res < 1 || res > 2 ){ + usage_t55xx_read(); + return 1; + } - if ((block > 7) | (block < 0)) { + if ((block < 0) | (block > 7)) { PrintAndLog("Block must be between 0 and 7"); return 1; + } + + UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, block, 0}}; + c.d.asBytes[0] = 0x0; + + //Password mode + if ( res == 2 ) { + c.arg[2] = password; + c.d.asBytes[0] = 0x1; } - UsbCommand c = { CMD_T55XX_READ_BLOCK, { 0, block, 0 } }; SendCommand(&c); - if ( !WaitForResponseTimeout(CMD_ACK,NULL,1500) ) { + if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) { PrintAndLog("command execution time out"); - return 1; + return 2; } - CmdSamples(""); - - size_t bitlen = getFromGraphBuf(bits); + uint8_t got[12000]; + GetFromBigBuf(got,sizeof(got),0); + WaitForResponse(CMD_ACK,NULL); + + setGraphBuf(got, 12000); + + bitlen = getFromGraphBuf(bits); + + int ans = 0; + ans = CmdFSKrawdemod(""); + ans = CmdFSKrawdemod("1"); //invert? + ans = Cmdaskmandemod(""); + ans = Cmdaskrawdemod(""); + ans = CmdNRZrawDemod(""); + ans = CmdPSK1rawDemod(""); + ans = CmdPSK2rawDemod(""); - int errCnt = askrawdemod(bits, &bitlen, &clk, &invert); + // if ( !tryDemod(bits, bitlen) ) + // return 3; - //throw away static - allow 1 and -1 (in case of threshold command first) - if ( errCnt == -1 || bitlen < 16 ){ - PrintAndLog("no data found"); - if (g_debugMode) - PrintAndLog("errCnt: %d, bitlen: %d, clk: %d, invert: %d", errCnt, bitlen, clk, invert); + // //move bits back to DemodBuffer + // setDemodBuf(bits, bitlen, 0); + // printBitStream(bits, bitlen); + if ( !DemodBufferLen) return 0; - } - if (g_debugMode) - PrintAndLog("Using Clock: %d - invert: %d - Bits Found: %d", clk, invert, bitlen); + + for (;i 7) | (Block < 0)) { - PrintAndLog("Block must be between 0 and 7"); - return 1; - } - - PrintAndLog("Reading page 0 block %d pwd %08X", Block, Password); - UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, Block, Password} }; - c.d.asBytes[0] = 0x1; //Password mode - SendCommand(&c); - WaitForResponse(CMD_ACK, NULL); - - uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00}; +/* +FSK1 / FSK1a +size = fskdemod(dest, size, 32, 0, 8, 10); // fsk1 RF/32 +size = fskdemod(dest, size, 32, 1, 8, 10); // fsk1a RF/32 - GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,0); - WaitForResponseTimeout(CMD_ACK,NULL, 1500); +FSK2 / FSK2a +size = fskdemod(dest, size, 32, 0, 10, 8); // fsk2 RF/32 +size = fskdemod(dest, size, 32, 1, 10, 8); // fsk2a RF/32 +size = fskdemod(dest, size, 50, 1, 10, 8); // fsk2a RF/50 +size = fskdemod(dest, size, 64, 1, 10, 8); // FSK2a RF/64 - for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) { - GraphBuffer[j] = ((int)data[j]); +PSK1 +errCnt = pskRawDemod(bits, &bitlen, 32, 0); +*/ +bool tryDemod(uint8_t bits[], size_t bitlen) { + + int invert = 0; + int clk = 0; + int errCnt, size; + int maxErr = 100; + uint8_t rflen, fchigh, fclow, dummy = 0; + uint16_t fcs=0; + + // ASK - manchester demod + errCnt = askmandemod(bits, &bitlen, &clk, &invert, maxErr); + if ( analyseDemod(errCnt, bitlen, clk, invert) ) + return true; + + // FSK demod + fcs = countFC(bits, bitlen, &dummy); + if (fcs == 0){ + fchigh = 10; + fclow = 8; + }else{ + fchigh = (fcs >> 8) & 0xFF; + fclow = fcs & 0xFF; } - GraphTraceLen = LF_TRACE_BUFF_SIZE; - ManchesterDemod(Block); + //get bit clock length + rflen = detectFSKClk(bits, bitlen, fchigh, fclow); + rflen = (rflen == 0) ? 50 : rflen; - RepaintGraphWindow(); - return 0; + size = fskdemod(bits, bitlen, rflen, invert, fchigh, fclow); + if ( analyseDemod(size, bitlen, clk, invert) ) + return true; + + // PSK demod + return false; } -int CmdWriteBlk(const char *Cmd) -{ - int Block = 8; //default to invalid block - int Data = 0xFFFFFFFF; //default to blank Block - - sscanf(Cmd, "%d %x", &Block, &Data); - - if (Block > 7) { - PrintAndLog("Block must be between 0 and 7"); - return 1; - } - - PrintAndLog("Writing block %d data %08X", Block, Data); - - UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {Data, Block, 0}}; - c.d.asBytes[0] = 0x0; //Normal mode - SendCommand(&c); - return 0; +bool analyseDemod( int errCnt, size_t bitlen, uint8_t clock, uint8_t invert){ + if (g_debugMode) + PrintAndLog("ErrorCount: %d, Bits Found: %d, Clock: %d, invert: %d", errCnt, bitlen, clock, invert); + //PrintAndLog("Args invert: %d - Clock:%d - fchigh:%d - fclow: %d",invert,rfLen,fchigh, fclow); + + //throw away static - allow 1 and -1 (in case of threshold command first) + if ( errCnt == -1 || bitlen < 32 ){ + PrintAndLog("no success demod"); + return false; + } + return true; } -int CmdWriteBlkPWD(const char *Cmd) +int CmdWriteBlk(const char *Cmd) { - int Block = 8; //default to invalid block - int Data = 0xFFFFFFFF; //default to blank Block - int Password = 0xFFFFFFFF; //default to blank Block 7 - - - sscanf(Cmd, "%d %x %x",&Block, &Data, &Password); - - if (Block > 7) { - PrintAndLog("Block must be between 0 and 7"); - return 1; - } - - PrintAndLog("Writing block %d data %08X password %08X", Block, Data, Password); + int block = 8; //default to invalid block + int data = 0xFFFFFFFF; //default to blank Block + int password = 0xFFFFFFFF; //default to blank Block 7 + + char cmdp = param_getchar(Cmd, 0); + if (cmdp == 'h' || cmdp == 'H') { + usage_t55xx_write(); + return 0; + } + + int res = sscanf(Cmd, "%d %x %x",&block, &data, &password); + + if ( res < 2 || res > 3) { + usage_t55xx_write(); + return 1; + } - UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {Data, Block, Password}}; - c.d.asBytes[0] = 0x1; //Password mode - SendCommand(&c); - return 0; + if (block > 7) { + PrintAndLog("Block must be between 0 and 7"); + return 1; + } + + UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}}; + c.d.asBytes[0] = 0x0; + + PrintAndLog("Writing to T55x7"); + PrintAndLog("block : %d", block); + PrintAndLog("data : 0x%08X", data); + + //Password mode + if (res == 3) { + c.arg[2] = password; + c.d.asBytes[0] = 0x1; + PrintAndLog("pwd : 0x%08X", password); + } + SendCommand(&c); + return 0; } int CmdReadTrace(const char *Cmd) { - char cmdp = param_getchar(Cmd, 0); + size_t bitlen; + uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00}; + char cmdp = param_getchar(Cmd, 0); + if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') { - PrintAndLog("Usage: lf t55xx trace [use data from Graphbuffer]"); - PrintAndLog(" [use data from Graphbuffer], if not set, try reading data from tag."); - PrintAndLog(""); - PrintAndLog(" sample: lf t55xx trace"); - PrintAndLog(" : lf t55xx trace 1"); + usage_t55xx_trace(); return 0; } @@ -197,38 +277,32 @@ int CmdReadTrace(const char *Cmd) UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}}; SendCommand(&c); - WaitForResponse(CMD_ACK, NULL); - - uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00}; - - GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,0); //3560 -- should be offset.. - WaitForResponseTimeout(CMD_ACK,NULL, 1500); - - for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) { - GraphBuffer[j] = ((int)data[j]); + if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) { + PrintAndLog("command execution time out"); + return 1; } - GraphTraceLen = LF_TRACE_BUFF_SIZE; + //darn + //CmdSamples("12000"); } - uint8_t bits[LF_BITSSTREAM_LEN] = {0x00}; - uint8_t * bitstream = bits; - - manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream, LF_BITSSTREAM_LEN); + bitlen = getFromGraphBuf(bits); + + RepaintGraphWindow(); uint8_t si = 5; - uint32_t bl0 = PackBits(si, 32, bitstream); - uint32_t bl1 = PackBits(si+32, 32, bitstream); + uint32_t bl0 = PackBits(si, 32, bits); + uint32_t bl1 = PackBits(si+32, 32, bits); - uint32_t acl = PackBits(si, 8, bitstream); si += 8; - uint32_t mfc = PackBits(si, 8, bitstream); si += 8; - uint32_t cid = PackBits(si, 5, bitstream); si += 5; - uint32_t icr = PackBits(si, 3, bitstream); si += 3; - uint32_t year = PackBits(si, 4, bitstream); si += 4; - uint32_t quarter = PackBits(si, 2, bitstream); si += 2; - uint32_t lotid = PackBits(si, 12, bitstream); si += 12; - uint32_t wafer = PackBits(si, 5, bitstream); si += 5; - uint32_t dw = PackBits(si, 15, bitstream); + uint32_t acl = PackBits(si, 8, bits); si += 8; + uint32_t mfc = PackBits(si, 8, bits); si += 8; + uint32_t cid = PackBits(si, 5, bits); si += 5; + uint32_t icr = PackBits(si, 3, bits); si += 3; + uint32_t year = PackBits(si, 4, bits); si += 4; + uint32_t quarter = PackBits(si, 2, bits); si += 2; + uint32_t lotid = PackBits(si, 12, bits); si += 12; + uint32_t wafer = PackBits(si, 5, bits); si += 5; + uint32_t dw = PackBits(si, 15, bits); PrintAndLog(""); PrintAndLog("-- T55xx Trace Information ----------------------------------"); @@ -244,8 +318,8 @@ int CmdReadTrace(const char *Cmd) PrintAndLog(" Die Number : %d", dw); PrintAndLog("-------------------------------------------------------------"); PrintAndLog(" Raw Data - Page 1"); - PrintAndLog(" Block 0 : 0x%08X %s", bl0, sprint_bin(bitstream+5,32) ); - PrintAndLog(" Block 0 : 0x%08X %s", bl1, sprint_bin(bitstream+37,32) ); + PrintAndLog(" Block 0 : 0x%08X %s", bl0, sprint_bin(bits+5,32) ); + PrintAndLog(" Block 0 : 0x%08X %s", bl1, sprint_bin(bits+37,32) ); PrintAndLog("-------------------------------------------------------------"); /* TRACE - BLOCK O @@ -276,15 +350,9 @@ int CmdInfo(const char *Cmd){ char cmdp = param_getchar(Cmd, 0); if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') { - PrintAndLog("Usage: lf t55xx info [use data from Graphbuffer]"); - PrintAndLog(" [use data from Graphbuffer], if not set, try reading data from tag."); - PrintAndLog(""); - PrintAndLog(" sample: lf t55xx info"); - PrintAndLog(" sample: lf t55xx info 1"); + usage_t55xx_info(); return 0; - } - - if ( strlen(Cmd) == 0 ){ + } else { CmdReadBlk("0"); } @@ -337,17 +405,16 @@ int CmdInfo(const char *Cmd){ int CmdDump(const char *Cmd){ - char cmdp = param_getchar(Cmd, 0); - char s[20]; + char s[20] = {0x00}; uint8_t pwd[4] = {0x00}; - bool hasPwd = ( strlen(Cmd) > 0); - + + char cmdp = param_getchar(Cmd, 0); if ( cmdp == 'h' || cmdp == 'H') { - PrintAndLog("Usage: lf t55xx dump "); - PrintAndLog(" sample: lf t55xx dump FFFFFFFF"); + usage_t55xx_dump(); return 0; } - + + bool hasPwd = ( strlen(Cmd) > 0); if ( hasPwd ){ if (param_gethex(Cmd, 0, pwd, 8)) { PrintAndLog("password must include 8 HEX symbols"); @@ -359,11 +426,10 @@ int CmdDump(const char *Cmd){ memset(s,0,sizeof(s)); if ( hasPwd ) { sprintf(s,"%d %02x%02x%02x%02x", i, pwd[0],pwd[1],pwd[2],pwd[3]); - CmdReadBlkPWD(s); } else { sprintf(s,"%d", i); - CmdReadBlk(s); } + CmdReadBlk(s); } return 0; } @@ -391,9 +457,7 @@ int ManchesterDemod(int blockNum){ uint8_t bits[LF_BITSSTREAM_LEN] = {0x00}; uint8_t * bitstream = bits; - //manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream, LF_BITSSTREAM_LEN); manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bits, LF_BITSSTREAM_LEN); - //blockData = PackBits(offset, sizebyte, bitstream); blockData = PackBits(offset, sizebyte, bits); if ( blockNum < 0) @@ -517,15 +581,11 @@ uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){ static command_t CommandTable[] = { {"help", CmdHelp, 1, "This help"}, - {"rd", CmdReadBlk, 0, " -- Read T55xx block data (page 0)"}, - {"rdpwd", CmdReadBlkPWD, 0, " -- Read T55xx block data with password mode"}, - {"wr", CmdWriteBlk, 0, " -- Write T55xx block data (page 0)"}, - {"wrpwd", CmdWriteBlkPWD, 0, " -- Write T55xx block data with password"}, + {"read", CmdReadBlk, 0, " [password] -- Read T55xx block data (page 0) [optional password]"}, + {"write", CmdWriteBlk, 0, " [password] -- Write T55xx block data (page 0) [optional password]"}, {"trace", CmdReadTrace, 0, "[1] Read T55xx traceability data (page 1/ blk 0-1)"}, {"info", CmdInfo, 0, "[1] Read T55xx configuration data (page 0/ blk 0)"}, - {"dump", CmdDump, 0, "[password] Dump T55xx card block 0-7. optional with password"}, - {"fsk", CmdIceFsk, 0, "FSK demod"}, - {"man", CmdIceManchester, 0, "Manchester demod (with SST)"}, + {"dump", CmdDump, 0, "[password] Dump T55xx card block 0-7. [optional password]"}, {NULL, NULL, 0, NULL} };