X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7c5f70dd9f8805967628f429f96fe1159a8bb827..385f398740895f512abc90ea5a00a9be82bf115b:/client/cmdlft55xx.c diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c index 6ea9d2d3..c023d57f 100644 --- a/client/cmdlft55xx.c +++ b/client/cmdlft55xx.c @@ -20,51 +20,115 @@ #include "cmdlft55xx.h" #include "util.h" #include "data.h" +#include "lfdemod.h" -#define LF_TRACE_BUFF_SIZE 12000 // 32 x 32 x 10 (32 bit times numofblock (7), times clock skip..) +#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 CmdReadBlk(const char *Cmd) { + int invert = 0; + int clk = 0; int block = -1; + int errCnt; + size_t bitlen; + //int decodedBitlen; + uint32_t blockData; + uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00}; + 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; + UsbCommand c = { CMD_T55XX_READ_BLOCK, { 0, block, 0 } }; SendCommand(&c); - WaitForResponse(CMD_ACK, NULL); + if ( !WaitForResponseTimeout(CMD_ACK,NULL,1500) ) { + PrintAndLog("command execution time out"); + return 2; + } - uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00}; + CmdSamples("12000"); + + bitlen = getFromGraphBuf(bits); - GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,3560); //3560 -- should be offset.. - WaitForResponseTimeout(CMD_ACK,NULL, 1500); + errCnt = askrawdemod(bits, &bitlen, &clk, &invert); + + //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); + return 3; + } + if (g_debugMode) + PrintAndLog("Using Clock: %d - invert: %d - Bits Found: %d", clk, invert, bitlen); - for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) { - GraphBuffer[j] = (int)data[j]; + //move bits back to DemodBuffer + setDemodBuf(bits, bitlen, 0); + printBitStream(bits,bitlen); + + // bits has the manchester encoded data. + errCnt = manrawdecode(bits, &bitlen); + 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); + return 4; } - GraphTraceLen = LF_TRACE_BUFF_SIZE; - ManchesterDemod(block); - RepaintGraphWindow(); - return 0; + + blockData = PackBits(0, 32, bits); + + if ( block < 0) + PrintAndLog(" Decoded : 0x%08X %s", blockData, sprint_bin(bits,32) ); + else + PrintAndLog(" Block %d : 0x%08X %s", block, blockData, sprint_bin(bits,32) ); + + return 0; } int CmdReadBlkPWD(const char *Cmd) { int Block = -1; //default to invalid block int Password = 0xFFFFFFFF; //default to blank Block 7 - UsbCommand c; + sscanf(Cmd, "%d %x", &Block, &Password); @@ -75,17 +139,14 @@ int CmdReadBlkPWD(const char *Cmd) PrintAndLog("Reading page 0 block %d pwd %08X", Block, Password); - c.cmd = CMD_T55XX_READ_BLOCK; + UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, Block, Password} }; c.d.asBytes[0] = 0x1; //Password mode - c.arg[0] = 0; - c.arg[1] = Block; - c.arg[2] = Password; SendCommand(&c); WaitForResponse(CMD_ACK, NULL); uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00}; - GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,3560); //3560 -- should be offset.. + GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,0); WaitForResponseTimeout(CMD_ACK,NULL, 1500); for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) { @@ -93,6 +154,7 @@ int CmdReadBlkPWD(const char *Cmd) } GraphTraceLen = LF_TRACE_BUFF_SIZE; ManchesterDemod(Block); + RepaintGraphWindow(); return 0; } @@ -101,22 +163,18 @@ int CmdWriteBlk(const char *Cmd) { int Block = 8; //default to invalid block int Data = 0xFFFFFFFF; //default to blank Block - UsbCommand c; - sscanf(Cmd, "%x %d", &Data, &Block); + sscanf(Cmd, "%d %x", &Block, &Data); if (Block > 7) { PrintAndLog("Block must be between 0 and 7"); return 1; } - PrintAndLog("Writting block %d with data %08X", Block, Data); + PrintAndLog("Writing block %d data %08X", Block, Data); - c.cmd = CMD_T55XX_WRITE_BLOCK; + UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {Data, Block, 0}}; c.d.asBytes[0] = 0x0; //Normal mode - c.arg[0] = Data; - c.arg[1] = Block; - c.arg[2] = 0; SendCommand(&c); return 0; } @@ -126,22 +184,19 @@ int CmdWriteBlkPWD(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 - UsbCommand c; - sscanf(Cmd, "%x %d %x", &Data, &Block, &Password); + + sscanf(Cmd, "%d %x %x",&Block, &Data, &Password); if (Block > 7) { PrintAndLog("Block must be between 0 and 7"); return 1; } - PrintAndLog("Writting block %d with data %08X and password %08X", Block, Data, Password); + PrintAndLog("Writing block %d data %08X password %08X", Block, Data, Password); - c.cmd = CMD_T55XX_WRITE_BLOCK; + UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {Data, Block, Password}}; c.d.asBytes[0] = 0x1; //Password mode - c.arg[0] = Data; - c.arg[1] = Block; - c.arg[2] = Password; SendCommand(&c); return 0; } @@ -155,18 +210,19 @@ int CmdReadTrace(const char *Cmd) PrintAndLog(" [use data from Graphbuffer], if not set, try reading data from tag."); PrintAndLog(""); PrintAndLog(" sample: lf t55xx trace"); - PrintAndLog(" sample: lf t55xx trace 1"); + PrintAndLog(" : lf t55xx trace 1"); return 0; } if ( strlen(Cmd)==0){ + 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,3560); //3560 -- should be offset.. + 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++) { @@ -249,35 +305,34 @@ int CmdInfo(const char *Cmd){ return 0; } - if ( strlen(Cmd)==0){ + if ( strlen(Cmd) == 0 ){ CmdReadBlk("0"); } 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); uint8_t si = 5; - uint32_t bl0 = PackBits(si, 32, bitstream); + uint32_t bl0 = PackBits(si, 32, bits); - uint32_t safer = PackBits(si, 4, bitstream); si += 4; - uint32_t resv = PackBits(si, 7, bitstream); si += 7; - uint32_t dbr = PackBits(si, 3, bitstream); si += 3; - uint32_t extend = PackBits(si, 1, bitstream); si += 1; - uint32_t datamodulation = PackBits(si, 5, bitstream); si += 5; - uint32_t pskcf = PackBits(si, 2, bitstream); si += 2; - uint32_t aor = PackBits(si, 1, bitstream); si += 1; - uint32_t otp = PackBits(si, 1, bitstream); si += 1; - uint32_t maxblk = PackBits(si, 3, bitstream); si += 3; - uint32_t pwd = PackBits(si, 1, bitstream); si += 1; - uint32_t sst = PackBits(si, 1, bitstream); si += 1; - uint32_t fw = PackBits(si, 1, bitstream); si += 1; - uint32_t inv = PackBits(si, 1, bitstream); si += 1; - uint32_t por = PackBits(si, 1, bitstream); si += 1; + uint32_t safer = PackBits(si, 4, bits); si += 4; + uint32_t resv = PackBits(si, 7, bits); si += 7; + uint32_t dbr = PackBits(si, 3, bits); si += 3; + uint32_t extend = PackBits(si, 1, bits); si += 1; + uint32_t datamodulation = PackBits(si, 5, bits); si += 5; + uint32_t pskcf = PackBits(si, 2, bits); si += 2; + uint32_t aor = PackBits(si, 1, bits); si += 1; + uint32_t otp = PackBits(si, 1, bits); si += 1; + uint32_t maxblk = PackBits(si, 3, bits); si += 3; + uint32_t pwd = PackBits(si, 1, bits); si += 1; + uint32_t sst = PackBits(si, 1, bits); si += 1; + uint32_t fw = PackBits(si, 1, bits); si += 1; + uint32_t inv = PackBits(si, 1, bits); si += 1; + uint32_t por = PackBits(si, 1, bits); si += 1; PrintAndLog(""); - PrintAndLog("-- T55xx Configuration --------------------------------------"); + PrintAndLog("-- T55xx Configuration & Tag Information --------------------"); PrintAndLog("-------------------------------------------------------------"); PrintAndLog(" Safer key : %s", GetSaferStr(safer)); PrintAndLog(" reserved : %d", resv); @@ -295,7 +350,7 @@ int CmdInfo(const char *Cmd){ PrintAndLog(" POR-Delay : %s", (por) ? "Yes":"No"); PrintAndLog("-------------------------------------------------------------"); PrintAndLog(" Raw Data - Page 0"); - PrintAndLog(" Block 0 : 0x%08X %s", bl0, sprint_bin(bitstream+5,32) ); + PrintAndLog(" Block 0 : 0x%08X %s", bl0, sprint_bin(bits+5,32) ); PrintAndLog("-------------------------------------------------------------"); return 0; @@ -317,7 +372,7 @@ int CmdDump(const char *Cmd){ if ( hasPwd ){ if (param_gethex(Cmd, 0, pwd, 8)) { PrintAndLog("password must include 8 HEX symbols"); - return 0; + return 1; } } @@ -357,8 +412,8 @@ 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); - blockData = PackBits(offset, sizebyte, bitstream); + manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bits, LF_BITSSTREAM_LEN); + blockData = PackBits(offset, sizebyte, bits); if ( blockNum < 0) PrintAndLog(" Decoded : 0x%08X %s", blockData, sprint_bin(bitstream+offset,sizebyte) ); @@ -483,12 +538,12 @@ 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"}, + {"wr", CmdWriteBlk, 0, " -- Write T55xx block data (page 0)"}, + {"wrpwd", CmdWriteBlkPWD, 0, " -- Write T55xx block data with 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"}, + //{"fsk", CmdIceFsk, 0, "FSK demod"}, {"man", CmdIceManchester, 0, "Manchester demod (with SST)"}, {NULL, NULL, 0, NULL} };