X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/3ac59c7fed24cc69e2c9f626e5e4392769779e13..108262a145256facb03fef99c4caa9680fa3620c:/client/cmdlft55xx.c diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c index 4a1bdaa0..f7465022 100644 --- a/client/cmdlft55xx.c +++ b/client/cmdlft55xx.c @@ -21,17 +21,45 @@ #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 = +// 0 = FSK +// 1 = ASK +// 2 = PSK +// 4 = NZR (direct) +typedef struct { + uint8_t modulation; + bool inversed; + uint32_t block0; +} t55xx_conf_block_t; + +// Default configuration: FSK, not inversed. +t55xx_conf_block_t config = { .modulation = 0, .inversed = FALSE, .block0 = 0x00}; + +int usage_t55xx_config(){ + PrintAndLog("Usage: lf t55xx config [d ] [i 1]"); + PrintAndLog("Options: "); + PrintAndLog(" h This help"); + PrintAndLog(" d Set demodulation FSK / ASK / PSK / NZ / Biphase"); + PrintAndLog(" i [1] Inverse data signal, defaults to normal"); + PrintAndLog(""); + PrintAndLog("Examples:"); + PrintAndLog(" lf t55xx config d FSK - FSK demodulation"); + PrintAndLog(" lf t55xx config d FSK i 1 - FSK demodulation, inverse data"); + PrintAndLog(""); + 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("Examples:"); + PrintAndLog(" lf t55xx read 0 - read data from block 0"); + PrintAndLog(" lf t55xx read 0 feedbeef - read data from block 0 password feedbeef"); PrintAndLog(""); return 0; } @@ -41,55 +69,115 @@ int usage_t55xx_write(){ 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("Examples:"); + PrintAndLog(" lf t55xx wd 3 11223344 - write 11223344 to block 3"); + PrintAndLog(" lf t55xx wd 3 11223344 feedbeef - write 11223344 to block 3 password feedbeef"); PrintAndLog(""); return 0; } int usage_t55xx_trace() { - PrintAndLog("Usage: lf t55xx trace [graph buffer data]"); + PrintAndLog("Usage: lf t55xx trace [1]"); 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("Examples:"); + PrintAndLog(" lf t55xx trace"); + PrintAndLog(" lf t55xx trace 1"); PrintAndLog(""); return 0; } int usage_t55xx_info() { - PrintAndLog("Usage: lf t55xx info [graph buffer data]"); + PrintAndLog("Usage: lf t55xx info [1]"); 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("Examples:"); + PrintAndLog(" 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(" , OPTIONAL password 4bytes (8 hex symbols)"); PrintAndLog(""); - PrintAndLog(" sample: lf t55xx dump"); - PrintAndLog(" : lf t55xx dump feedbeef"); + PrintAndLog("Examples:"); + PrintAndLog(" lf t55xx dump"); + PrintAndLog(" lf t55xx dump feedbeef"); PrintAndLog(""); return 0; } static int CmdHelp(const char *Cmd); +int CmdT55xxSetConfig(const char *Cmd){ + + int len; + bool inverse; + bool errors = FALSE; + uint8_t cmdp = 0; + char modulation[4] = {0x00}; + + while(param_getchar(Cmd, cmdp) != 0x00 && !errors) + { + switch(param_getchar(Cmd, cmdp)) + { + case 'h': + case 'H': + return usage_t55xx_config(); + case 'd': + len = param_getstr(Cmd, cmdp+1, modulation); + cmdp+= len+1; + //FSK|ASK|PSK|NZ|BI + if ( strcmp(modulation, "FSK" ) == 0) + len = 1; + else if ( strcmp(modulation, "ASK" ) == 0) + len = 2; + else if ( strcmp(modulation, "PSK" ) == 0) + len = 3; + else if ( strcmp(modulation, "NZ" ) == 0) + len = 4; + else if ( strcmp(modulation, "BI" ) == 0) + len = 5; + else { + PrintAndLog("Unknown modulation '%s'", modulation); + errors = TRUE; + } + break; + case 'i': + inverse = param_getchar(Cmd,cmdp+1) == '1'; + cmdp+=2; + break; + default: + PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp)); + errors = TRUE; + break; + } + } + // No args + if (cmdp == 0) { + PrintAndLog("Modulation: %d", config.modulation); + PrintAndLog("Invert : %d", config.inversed); + PrintAndLog("Block0 : %08X", config.block0); + return 0; + } + //Validations + if (errors) + return usage_t55xx_config(); + + config.modulation = len; + config.inversed = inverse; + config.block0 = 0; + return 0; +} +// detect configuration? + int CmdReadBlk(const char *Cmd) { - 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; - } + if (cmdp == 'h' || cmdp == 'H') + return usage_t55xx_read(); int res = sscanf(Cmd, "%d %x", &block, &password); @@ -123,41 +211,91 @@ int CmdReadBlk(const char *Cmd) 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(""); + + if (block == 0){ + // try a detection. + } + + if (GetFskClock("", FALSE, FALSE)){ //wave is almost certainly FSK + // FSK + if ( FSKrawDemod("0 0", FALSE) && test()) + printT55xx("FSK"); + // FSK inverted + if ( FSKrawDemod("0 1", FALSE) && test()) + printT55xx("FSK inv"); + } else { + // ASK/MAN (autoclock, normal, maxerrors 1) + if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test()) + printT55xx("ASK/MAN"); + + // ASK/MAN (autoclock, inverted, maxerrors 1) + if ( ASKmanDemod("0 1 1", FALSE, FALSE) && test()) + printT55xx("ASK/MAN Inv"); + + // NZR (autoclock, normal, maxerrors 1) + if ( NRZrawDemod("0 0 1", FALSE) && test()) + printT55xx("NZR"); + // NZR (autoclock, inverted, maxerrors 1) + if ( NRZrawDemod("0 1 1", FALSE) && test()) + printT55xx("NZR inv"); + + // PSK (autoclock, normal, maxerrors 1) + if ( PSKDemod("0 0 1", FALSE) && test()) + printT55xx("PSK"); + + // PSK (autoclock, inverted, maxerrors 1) + if ( PSKDemod("0 1 1", FALSE) && test()) + printT55xx("PSK inv"); + + //PSK2? + + // if (!BiphaseRawDecode("0",FALSE) && test()) + // printT55xx("BIPHASE"); + + // if (!BiphaseRawDecode("1",FALSE) && test()) + // printT55xx("BIPHASE inv"); + } + return 0; +} +bool test(){ + + if ( !DemodBufferLen) + return false; - // if ( !tryDemod(bits, bitlen) ) - // return 3; + uint8_t si = 1; + uint8_t safer = PackBits(si, 4, DemodBuffer); si += 4; + uint8_t resv = PackBits(si, 7, DemodBuffer); si += 7+3; + uint8_t extend = PackBits(si, 1, DemodBuffer); si += 1; + + //PrintAndLog("test: %X %X %X ", safer, resv, extend); - // //move bits back to DemodBuffer - // setDemodBuf(bits, bitlen, 0); - // printBitStream(bits, bitlen); + // 2nibble must be zeroed. + if ( resv > 0x00) return FALSE; + + if ( safer == 0x6 || safer == 0x9){ + if ( extend == 0x00) + return TRUE; + } + if ( resv== 0x00) return TRUE; + return FALSE; +} + +void printT55xx(const char *demodStr){ + + uint32_t blockData = 0; + uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00}; + if ( !DemodBufferLen) - return 0; + return; + int i =0; for (;i> 8) & 0xFF; - fclow = fcs & 0xFF; - } - //get bit clock length - rflen = detectFSKClk(bits, bitlen, fchigh, fclow); - rflen = (rflen == 0) ? 50 : rflen; - - size = fskdemod(bits, bitlen, rflen, invert, fchigh, fclow); - if ( analyseDemod(size, bitlen, clk, invert) ) - return true; - - // PSK demod - return false; -} - -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 CmdWriteBlk(const char *Cmd) { int block = 8; //default to invalid block @@ -263,7 +353,6 @@ int CmdWriteBlk(const char *Cmd) int CmdReadTrace(const char *Cmd) { - size_t bitlen; uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00}; char cmdp = param_getchar(Cmd, 0); @@ -285,9 +374,10 @@ int CmdReadTrace(const char *Cmd) //CmdSamples("12000"); } - bitlen = getFromGraphBuf(bits); - - + size_t bitlen = getFromGraphBuf(bits); + if ( bitlen == 0 ) + return 2; + RepaintGraphWindow(); uint8_t si = 5; @@ -349,25 +439,24 @@ 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; 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 datamod = 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; @@ -385,14 +474,14 @@ int CmdInfo(const char *Cmd){ PrintAndLog(" reserved : %d", resv); PrintAndLog(" Data bit rate : %s", GetBitRateStr(dbr)); PrintAndLog(" eXtended mode : %s", (extend) ? "Yes - Warning":"No"); - PrintAndLog(" Modulation : %s", GetModulationStr(datamodulation) ); + PrintAndLog(" Modulation : %s", GetModulationStr(datamod)); PrintAndLog(" PSK clock freq : %d", pskcf); PrintAndLog(" AOR - Answer on Request : %s", (aor) ? "Yes":"No"); PrintAndLog(" OTP - One Time Pad : %s", (otp) ? "Yes - Warning":"No" ); PrintAndLog(" Max block : %d", maxblk); PrintAndLog(" Password mode : %s", (pwd) ? "Yes":"No"); PrintAndLog(" Sequence Start Terminator : %s", (sst) ? "Yes":"No"); - PrintAndLog(" Fast Write : %s", (fw) ? "Yes":"No"); + PrintAndLog(" Fast Write : %s", (fw) ? "Yes":"No"); PrintAndLog(" Inverse data : %s", (inv) ? "Yes":"No"); PrintAndLog(" POR-Delay : %s", (por) ? "Yes":"No"); PrintAndLog("-------------------------------------------------------------"); @@ -434,40 +523,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; @@ -510,10 +565,10 @@ char * GetSaferStr(uint32_t id){ sprintf(retStr,"%d",id); if (id == 6) { - sprintf(retStr,"%d - pasdwd",id); + sprintf(retStr,"%d - passwd",id); } if (id == 9 ){ - sprintf(retStr,"%d - testmode ",id); + sprintf(retStr,"%d - testmode",id); } return buf; @@ -563,7 +618,6 @@ char * GetModulationStr( uint32_t id){ return buf; } - uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){ int i = start; @@ -580,12 +634,13 @@ uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){ static command_t CommandTable[] = { - {"help", CmdHelp, 1, "This help"}, - {"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]"}, + {"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} };