X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/4e7af352b41bf13d283e25eeb049b59022f8bc46..7b40affb6f7087e116bccff352923834dcdc8d46:/client/cmdlft55xx.c?ds=inline diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c index a48945ab..b303aced 100644 --- a/client/cmdlft55xx.c +++ b/client/cmdlft55xx.c @@ -21,82 +21,177 @@ #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_t; + +// Default configuration: FSK, not inversed. +t55xx_conf_block_t config = { .modulation = 2, .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 rd 0 = try reading data from block 0"); - PrintAndLog(" : lf t55xx rd 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; } -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)"); 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; +} +int usage_t55xx_detect(){ + PrintAndLog("Usage: lf t55xx detect"); + PrintAndLog(""); + PrintAndLog("Examples:"); + PrintAndLog(" lf t55xx detect"); + PrintAndLog(" lf t55xx detect 1"); PrintAndLog(""); return 0; } static int CmdHelp(const char *Cmd); -int CmdReadBlk(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; +} + +int CmdT55xxReadBlock(const char *Cmd) { int block = -1; int password = 0xFFFFFFFF; //default to blank Block 7 - size_t bitlen; - 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(); - return 1; - } + if ( res < 1 || res > 2 ) + return usage_t55xx_read(); + if ((block < 0) | (block > 7)) { PrintAndLog("Block must be between 0 and 7"); @@ -113,41 +208,202 @@ 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); + setGraphBuf(got, 12000); - bitlen = getFromGraphBuf(bits); + DecodeT55xxBlock(); + printT55xxBlock(""); + return 0; +} - if ( !tryDemod(bits, bitlen) ) - return 3; +void DecodeT55xxBlock(){ - //move bits back to DemodBuffer - setDemodBuf(bits, bitlen, 0); - printBitStream(bits, bitlen); + char buf[6] = {0x00}; + char *cmdStr = buf; + + // use the configuration + switch( config.modulation ){ + case 1: + sprintf(cmdStr,"0 %d", config.inversed ); + FSKrawDemod(cmdStr, FALSE); + break; + case 2: + sprintf(cmdStr,"0 %d 1", config.inversed ); + ASKmanDemod(cmdStr, FALSE, FALSE); + PrintAndLog("ice"); + break; + case 3: + sprintf(cmdStr,"0 %d 1", config.inversed ); + PSKDemod(cmdStr, FALSE); + break; + case 4: + sprintf(cmdStr,"0 %d 1", config.inversed ); + NRZrawDemod(cmdStr, FALSE); + break; + case 5: + //BiphaseRawDecode("0",FALSE); + break; + default: + return; + } +} + +int CmdT55xxDetect(const char *Cmd){ + char cmdp = param_getchar(Cmd, 0); + if (cmdp == 'h' || cmdp == 'H') + return usage_t55xx_detect(); - // // bits has the manchester encoded data. - // errCnt = manrawdecode(bits, &bitlen); - // if ( errCnt == -1 || bitlen < 32 ){ - // PrintAndLog("no data found"); - // if (g_debugMode) - // PrintAndLog("errCnt: %d, bitlen: %d, clk: %d, invert: %d", errCnt, bitlen, clk, invert); - // return 4; - // } + // read block 0, Page 0. Configuration. + UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, 0, 0}}; + c.d.asBytes[0] = 0x0; - blockData = PackBits(1, 32, bits); + //Password mode + // if ( res == 2 ) { + // c.arg[2] = password; + // c.d.asBytes[0] = 0x1; + // } - 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) ); + SendCommand(&c); + if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) { + PrintAndLog("command execution time out"); + return FALSE; + } + uint8_t got[12000]; + GetFromBigBuf(got,sizeof(got),0); + WaitForResponse(CMD_ACK,NULL); + setGraphBuf(got, 12000); + + if ( !tryDetectModulation() ){ + PrintAndLog("Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'"); + } return 0; } +// detect configuration? +bool tryDetectModulation(){ + + uint8_t hits = 0; + t55xx_conf_block_t tests[10]; + + if (GetFskClock("", FALSE, FALSE)){ + if ( FSKrawDemod("0 0", FALSE) && test()){ + tests[hits].modulation = 1; + tests[hits].inversed = 0; + ++hits; + } + if ( FSKrawDemod("0 1", FALSE) && test()) { + tests[hits].modulation = 1; + tests[hits].inversed = 1; + ++hits; + } + } else { + if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test()) { + tests[hits].modulation = 2; + tests[hits].inversed = 0; + ++hits; + } + + if ( ASKmanDemod("0 1 1", FALSE, FALSE) && test()) { + tests[hits].modulation = 2; + tests[hits].inversed = 1; + ++hits; + } + + if ( NRZrawDemod("0 0 1", FALSE) && test()) { + tests[hits].modulation = 3; + tests[hits].inversed = 0; + ++hits; + } + + if ( NRZrawDemod("0 1 1", FALSE) && test()) { + tests[hits].modulation = 3; + tests[hits].inversed = 1; + ++hits; + } + + if ( PSKDemod("0 0 1", FALSE) && test()) { + tests[hits].modulation = 4; + tests[hits].inversed = 0; + ++hits; + } + + if ( PSKDemod("0 1 1", FALSE) && test()) { + tests[++hits].modulation = 4; + tests[hits].inversed = 1; + ++hits; + } + //PSK2? + // if (!BiphaseRawDecode("0",FALSE) && test()) { + // tests[++hits].modulation = 5; + // tests[hits].inversed = 0; + //} + // if (!BiphaseRawDecode("1",FALSE) && test()) { + // tests[++hits].modulation = 5; + // tests[hits].inversed = 1; + // } + } + if ( hits == 1) { + PrintAndLog("Modulation: %d Inverse: %d", tests[0].modulation, tests[0].inversed); + config.modulation = tests[0].modulation; + config.inversed = tests[0].inversed; + return TRUE; + } + + if ( hits > 1) { + PrintAndLog("Found [%d] possible matches for modulation.",hits); + for(int i=0; i 0x00) return FALSE; + + if ( safer == 0x6 || safer == 0x9){ + if ( extend == 0x00) + return TRUE; + } + if ( resv== 0x00) return TRUE; + return FALSE; +} + +void printT55xxBlock(const char *demodStr){ + + uint32_t blockData = 0; + uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00}; + + if ( !DemodBufferLen) + 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 CmdT55xxWriteBlock(const char *Cmd) { int block = 8; //default to invalid block int data = 0xFFFFFFFF; //default to blank Block @@ -219,14 +427,14 @@ int CmdWriteBlk(const char *Cmd) char cmdp = param_getchar(Cmd, 0); if (cmdp == 'h' || cmdp == 'H') { - usage_t55xx_wr(); + usage_t55xx_write(); return 0; } int res = sscanf(Cmd, "%d %x %x",&block, &data, &password); if ( res < 2 || res > 3) { - usage_t55xx_wr(); + usage_t55xx_write(); return 1; } @@ -238,86 +446,64 @@ 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 CmdT55xxReadTrace(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); - if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') { - usage_t55xx_trace(); - return 0; - } + if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') + return usage_t55xx_trace(); if ( strlen(Cmd)==0){ UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}}; SendCommand(&c); - WaitForResponse(CMD_ACK, NULL); + if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) { + PrintAndLog("command execution time out"); + return 1; + } - CmdSamples("12000"); + uint8_t got[12000]; + GetFromBigBuf(got,sizeof(got),0); + WaitForResponse(CMD_ACK,NULL); + setGraphBuf(got, 12000); } - bitlen = getFromGraphBuf(bits); + DecodeT55xxBlock(); - //errCnt = askrawdemod(bits, &bitlen, &clk, &invert, maxErr, askAmp); - errCnt = askmandemod(bits, &bitlen, &clk, &invert, maxErr); + if ( !DemodBufferLen) + return 2; - //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); - - // 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; - uint32_t bl0 = PackBits(si, 32, bits); - uint32_t bl1 = PackBits(si+32, 32, bits); - - 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); + uint32_t bl0 = PackBits(si, 32, DemodBuffer); + uint32_t bl1 = PackBits(si+32, 32, DemodBuffer); + + uint32_t acl = PackBits(si, 8, DemodBuffer); si += 8; + uint32_t mfc = PackBits(si, 8, DemodBuffer); si += 8; + uint32_t cid = PackBits(si, 5, DemodBuffer); si += 5; + uint32_t icr = PackBits(si, 3, DemodBuffer); si += 3; + uint32_t year = PackBits(si, 4, DemodBuffer); si += 4; + uint32_t quarter = PackBits(si, 2, DemodBuffer); si += 2; + uint32_t lotid = PackBits(si, 12, DemodBuffer); si += 12; + uint32_t wafer = PackBits(si, 5, DemodBuffer); si += 5; + uint32_t dw = PackBits(si, 15, DemodBuffer); + + year += 2000; PrintAndLog(""); PrintAndLog("-- T55xx Trace Information ----------------------------------"); @@ -327,14 +513,14 @@ int CmdReadTrace(const char *Cmd) PrintAndLog(" CID : 0x%02X (%d)", cid, cid); PrintAndLog(" ICR IC Revision : %d",icr ); PrintAndLog(" Manufactured"); - PrintAndLog(" Year/Quarter : %d/%d",2000+year, quarter ); + PrintAndLog(" Year/Quarter : %d/%d",year, quarter ); PrintAndLog(" Lot ID : %d", lotid ); PrintAndLog(" Wafer number : %d", wafer); PrintAndLog(" Die Number : %d", dw); PrintAndLog("-------------------------------------------------------------"); PrintAndLog(" Raw Data - Page 1"); - 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(" Block 0 : 0x%08X %s", bl0, sprint_bin(DemodBuffer+5,32) ); + PrintAndLog(" Block 0 : 0x%08X %s", bl1, sprint_bin(DemodBuffer+37,32) ); PrintAndLog("-------------------------------------------------------------"); /* TRACE - BLOCK O @@ -356,7 +542,7 @@ int CmdReadTrace(const char *Cmd) return 0; } -int CmdInfo(const char *Cmd){ +int CmdT55xxInfo(const char *Cmd){ /* Page 0 Block 0 Configuration data. Normal mode @@ -364,34 +550,56 @@ int CmdInfo(const char *Cmd){ */ char cmdp = param_getchar(Cmd, 0); - if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') { - usage_t55xx_info(); - return 0; - } else { - CmdReadBlk("0"); - } + if (cmdp == 'h' || cmdp == 'H') + return usage_t55xx_info(); + + if (strlen(Cmd)==0){ + + // read block 0, Page 0. Configuration. + UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, 0, 0}}; + c.d.asBytes[0] = 0x0; - uint8_t bits[LF_BITSSTREAM_LEN] = {0x00}; + //Password mode + // if ( res == 2 ) { + // c.arg[2] = password; + // c.d.asBytes[0] = 0x1; + // } + + SendCommand(&c); + if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) { + PrintAndLog("command execution time out"); + return 1; + } - manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bits, LF_BITSSTREAM_LEN); + uint8_t got[12000]; + GetFromBigBuf(got,sizeof(got),0); + WaitForResponse(CMD_ACK,NULL); + setGraphBuf(got, 12000); + } - uint8_t si = 5; - 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 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; + DecodeT55xxBlock(); + + if ( !DemodBufferLen) + return 2; + + + uint8_t si = 1; + uint32_t bl0 = PackBits(si, 32, DemodBuffer); + + uint32_t safer = PackBits(si, 4, DemodBuffer); si += 4; + uint32_t resv = PackBits(si, 7, DemodBuffer); si += 7; + uint32_t dbr = PackBits(si, 3, DemodBuffer); si += 3; + uint32_t extend = PackBits(si, 1, DemodBuffer); si += 1; + uint32_t datamod = PackBits(si, 5, DemodBuffer); si += 5; + uint32_t pskcf = PackBits(si, 2, DemodBuffer); si += 2; + uint32_t aor = PackBits(si, 1, DemodBuffer); si += 1; + uint32_t otp = PackBits(si, 1, DemodBuffer); si += 1; + uint32_t maxblk = PackBits(si, 3, DemodBuffer); si += 3; + uint32_t pwd = PackBits(si, 1, DemodBuffer); si += 1; + uint32_t sst = PackBits(si, 1, DemodBuffer); si += 1; + uint32_t fw = PackBits(si, 1, DemodBuffer); si += 1; + uint32_t inv = PackBits(si, 1, DemodBuffer); si += 1; + uint32_t por = PackBits(si, 1, DemodBuffer); si += 1; PrintAndLog(""); PrintAndLog("-- T55xx Configuration & Tag Information --------------------"); @@ -400,25 +608,25 @@ 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("-------------------------------------------------------------"); PrintAndLog(" Raw Data - Page 0"); - PrintAndLog(" Block 0 : 0x%08X %s", bl0, sprint_bin(bits+5,32) ); + PrintAndLog(" Block 0 : 0x%08X %s", bl0, sprint_bin(DemodBuffer+5,32) ); PrintAndLog("-------------------------------------------------------------"); return 0; } -int CmdDump(const char *Cmd){ +int CmdT55xxDump(const char *Cmd){ char s[20] = {0x00}; uint8_t pwd[4] = {0x00}; @@ -444,45 +652,11 @@ int CmdDump(const char *Cmd){ } else { sprintf(s,"%d", i); } - CmdReadBlk(s); + CmdT55xxReadBlock(s); } 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; @@ -525,10 +699,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; @@ -578,7 +752,6 @@ char * GetModulationStr( uint32_t id){ return buf; } - uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){ int i = start; @@ -595,13 +768,14 @@ 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"}, + {"detect", CmdT55xxDetect, 0, "Try detecting the tag modulation from reading the configuration block."}, + {"read", CmdT55xxReadBlock, 0, " [password] -- Read T55xx block data (page 0) [optional password]"}, + {"write", CmdT55xxWriteBlock,0, " [password] -- Write T55xx block data (page 0) [optional password]"}, + {"trace", CmdT55xxReadTrace, 0, "[1] Show T55xx traceability data (page 1/ blk 0-1)"}, + {"info", CmdT55xxInfo, 0, "[1] Show T55xx configuration data (page 0/ blk 0)"}, + {"dump", CmdT55xxDump, 0, "[password] Dump T55xx card block 0-7. [optional password]"}, {NULL, NULL, 0, NULL} };