X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/31b3689f0b54048de31957e001c60bbd8dfca5a3..f2d46122d30004b152f9c581a438b9939707bab9:/client/cmdlft55xx.c diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c index b060bdee..61c8ec2b 100644 --- a/client/cmdlft55xx.c +++ b/client/cmdlft55xx.c @@ -21,21 +21,71 @@ #include "util.h" #include "data.h" #include "lfdemod.h" +#include "../common/crc.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 = -int usage_t55xx_rd(){ - PrintAndLog("Usage: lf t55xx rd "); +// 0 = FSK +// 1 = ASK +// 2 = PSK +// 4 = NZR (direct) +typedef struct { + uint8_t modulation; + bool inversed; + uint32_t block0; +} t55xx_conf_block; + +// Default configuration: FSK, not inversed. +t55xx_conf_block config = {0x00, FALSE, 0x00}; + + // FSK + // FSK inverted + //FSKrawDemod("", FALSE) + //FSKrawDemod("1", FALSE) + + // ASK/MAN + // ASK/MAN inverted + //ASKmanDemod("", FALSE, FALSE) + + // NZR (autoclock, normal, maxerrors 1) + // NZR (autoclock, inverse, maxerrors 1) + //NRZrawDemod("0 0 1", FALSE) ) { + + // PSK (autoclock, normal, maxerrors 1) + // PSK (autoclock, inverse, maxerrors 1) + //PSKDemod("0 0 1", FALSE) + +int usage_t55xx_config(){ + PrintAndLog("Usage: lf t55xx config [d ] [i 0|1]"); + PrintAndLog("Options: "); + PrintAndLog(" h This help"); + PrintAndLog(" d <> Set demodulation FSK / ASK / PSK / NZR"); + PrintAndLog(" i [0|1] Inverse data signal, Default: 0"); + PrintAndLog("Examples:"); + PrintAndLog(" lf t55xx config d FSK "); + PrintAndLog(" FSK demodulation"); + PrintAndLog(" lf t55xx config d FSK i 1"); + PrintAndLog(" FSK demodulation, inverse data"); + PrintAndLog(" lf dump"); + PrintAndLog(" Dumps all block from tag"); + PrintAndLog(" lf trace"); + PrintAndLog(" Read trace block and decode it"); + PrintAndLog(" lf info"); + PrintAndLog(" Read configuration and decode it"); + 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 rd 0 = try reading data from block 0"); - PrintAndLog(" : lf t55xx rd 0 feedbeef = try reading data from block 0 using password"); + 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_wr(){ +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)"); @@ -76,43 +126,38 @@ int usage_t55xx_dump(){ static int CmdHelp(const char *Cmd); -/* -FSK1 / FSK1a -size = fskdemod(dest, size, 32, 0, 8, 10); // fsk1 RF/32 -size = fskdemod(dest, size, 32, 1, 8, 10); // fsk1a RF/32 +int CmdT55xxSetConfig(const char *Cmd){ + + uint8_t paramNum =0; + if(param_getchar(Cmd, paramNum) == 'h') + { + return usage_t55xx_config(); + } -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 + uint8_t buff[] = { 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, + 0x01, 0x40, 0x01, 0x01, 0x04 }; + PrintAndLog("CRC-8: %x",CRC8Maxim(buff, 13)); -*/ + //config = { 0, FALSE}; + return 0; +} + +// detect configuration? int CmdReadBlk(const char *Cmd) { - int invert = 0; - int clk = 0; int block = -1; int password = 0xFFFFFFFF; //default to blank Block 7 - int errCnt; - size_t bitlen; - int maxErr = 100; - //uint8_t askAmp = 0; - uint32_t blockData; - uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00}; - - + char cmdp = param_getchar(Cmd, 0); - if (cmdp == 'h' || cmdp == 'H') { - usage_t55xx_rd(); - return 0; - } + if (cmdp == 'h' || cmdp == 'H') + return usage_t55xx_read(); int res = sscanf(Cmd, "%d %x", &block, &password); if ( res < 1 || res > 2 ){ - usage_t55xx_rd(); + usage_t55xx_read(); return 1; } @@ -131,51 +176,87 @@ int CmdReadBlk(const char *Cmd) } SendCommand(&c); - if ( !WaitForResponseTimeout(CMD_ACK,NULL,1500) ) { + if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) { PrintAndLog("command execution time out"); return 2; } - CmdSamples("12000"); + uint8_t got[12000]; + GetFromBigBuf(got,sizeof(got),0); + WaitForResponse(CMD_ACK,NULL); - bitlen = getFromGraphBuf(bits); - - //errCnt = askrawdemod(bits, &bitlen, &clk, &invert, maxErr, askAmp); - errCnt = askmandemod(bits, &bitlen, &clk, &invert, maxErr); - - //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); + setGraphBuf(got, 12000); - //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; + if (block == 0){ + // try a detection. + } + + if (CmdDetectClockRate("f")){ //wave is almost certainly FSK + //call FSK DEMOD + // FSK + if ( FSKrawDemod("", FALSE)) + printT55xx("FSK"); + // FSK inverted + if ( FSKrawDemod("1", FALSE)) + printT55xx("FSK inv"); + } else { + // ASK/MAN (autoclock, normal, maxerrors 1) + if ( ASKmanDemod("0 0 1", FALSE, FALSE) ) + printT55xx("ASK/MAN"); + + // ASK/MAN (autoclock, inverted, maxerrors 1) + if ( ASKmanDemod("0 1 1", FALSE, FALSE) ) + printT55xx("ASK/MAN Inv"); + + // NZR (autoclock, normal, maxerrors 1) + if ( NRZrawDemod("0 0 1", FALSE) ) + printT55xx("NZR"); + // NZR (autoclock, inverted, maxerrors 1) + if ( NRZrawDemod("0 1 1", FALSE) ) + printT55xx("NZR inv"); + + // PSK (autoclock, normal, maxerrors 1) + if (!PSKDemod("0 0 1", FALSE)) + printT55xx("PSK"); - blockData = PackBits(1, 32, bits); + // PSK (autoclock, inverted, maxerrors 1) + if (!PSKDemod("0 1 1", FALSE)) + printT55xx("PSK inv"); + } + return 0; +} - if ( block < 0) - PrintAndLog(" Decoded : 0x%08X %s", blockData, sprint_bin(bits+1,32) ); - else - PrintAndLog(" Block %d : 0x%08X %s", block, blockData, sprint_bin(bits+1,32) ); +void printT55xx(const char *demodStr){ - return 0; + uint32_t blockData = 0; + uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00}; + + if ( !DemodBufferLen) + return; + + int i =0; + for (;i 3) { - usage_t55xx_wr(); + usage_t55xx_write(); return 1; } @@ -203,26 +284,22 @@ int CmdWriteBlk(const char *Cmd) UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}}; c.d.asBytes[0] = 0x0; - if (res == 2) { - PrintAndLog("Writing block %d data %08X", block, data); - } else { - //Password mode + 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("Writing block %d data %08X password %08X", block, data, password); + PrintAndLog("pwd : 0x%08X", password); } - SendCommand(&c); return 0; } int CmdReadTrace(const char *Cmd) { - int invert = 0; - int clk = 0; - int errCnt; - size_t bitlen; - int maxErr = 100; uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00}; char cmdp = param_getchar(Cmd, 0); @@ -236,38 +313,18 @@ int CmdReadTrace(const char *Cmd) UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}}; SendCommand(&c); - WaitForResponse(CMD_ACK, NULL); - - CmdSamples("12000"); + if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) { + PrintAndLog("command execution time out"); + return 1; + } + //darn + //CmdSamples("12000"); } - bitlen = getFromGraphBuf(bits); - - //errCnt = askrawdemod(bits, &bitlen, &clk, &invert, maxErr, askAmp); - errCnt = askmandemod(bits, &bitlen, &clk, &invert, maxErr); - - //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); - - //move bits back to DemodBuffer - setDemodBuf(bits, bitlen, 0); + size_t bitlen = getFromGraphBuf(bits); + if ( bitlen == 0 ) + return 2; - // 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; - } - RepaintGraphWindow(); uint8_t si = 5; @@ -329,18 +386,17 @@ int CmdInfo(const char *Cmd){ */ char cmdp = param_getchar(Cmd, 0); - if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') { - usage_t55xx_info(); - return 0; + if (cmdp == 'h' || cmdp == 'H') { + return usage_t55xx_info(); } else { CmdReadBlk("0"); } + // config + uint8_t bits[LF_BITSSTREAM_LEN] = {0x00}; - manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bits, LF_BITSSTREAM_LEN); - - uint8_t si = 5; + uint8_t si = 1; uint32_t bl0 = PackBits(si, 32, bits); uint32_t safer = PackBits(si, 4, bits); si += 4; @@ -414,40 +470,6 @@ int CmdDump(const char *Cmd){ return 0; } -int CmdIceFsk(const char *Cmd){ - - if (!HasGraphData()) return 0; - - iceFsk3(GraphBuffer, LF_TRACE_BUFF_SIZE); - RepaintGraphWindow(); - return 0; -} -int CmdIceManchester(const char *Cmd){ - ManchesterDemod( -1); - return 0; -} -int ManchesterDemod(int blockNum){ - - if (!HasGraphData()) return 0; - - uint8_t sizebyte = 32; - // the value 5 was selected during empirical studies of the decoded data. Some signal noise to skip. - uint8_t offset = 5; - uint32_t blockData; - uint8_t bits[LF_BITSSTREAM_LEN] = {0x00}; - uint8_t * bitstream = bits; - - 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) ); - else - PrintAndLog(" Block %d : 0x%08X %s", blockNum, blockData, sprint_bin(bitstream+offset,sizebyte) ); - - return 0; -} - char * GetBitRateStr(uint32_t id){ static char buf[40]; char *retStr = buf; @@ -543,7 +565,6 @@ char * GetModulationStr( uint32_t id){ return buf; } - uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){ int i = start; @@ -560,13 +581,13 @@ uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){ static command_t CommandTable[] = { - {"help", CmdHelp, 1, "This help"}, - {"rd", CmdReadBlk, 0, " [password] -- Read T55xx block data (page 0) [optional password]"}, - {"wr", 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 password]"}, - {"man", CmdIceManchester, 0, "Manchester demod (with SST)"}, + {"help", CmdHelp, 1, "This help"}, + {"config", CmdT55xxSetConfig, 1, "Set T55XX config for modulation, inversed data"}, + {"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 password]"}, {NULL, NULL, 0, NULL} };