X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/12d708fec157dfde6f94d61e5fdc265713a71578..ca65d3af861fefa3395825cb39ba2ac144d2ff3b:/client/cmdlft55xx.c diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c index 4a1bdaa0..61758bde 100644 --- a/client/cmdlft55xx.c +++ b/client/cmdlft55xx.c @@ -21,17 +21,39 @@ #include "util.h" #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 = - +#include "../common/crc.h" +#include "../common/iso14443crc.h" +#include "cmdhf14a.h" + +#define CONFIGURATION_BLOCK 0x00 +#define TRACE_BLOCK 0x01 + +// Default configuration +t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inverted = FALSE, .offset = 0x00, .block0 = 0x00}; + +int usage_t55xx_config(){ + PrintAndLog("Usage: lf t55xx config [d ] [i 1] [o ]"); + PrintAndLog("Options:"); + PrintAndLog(" h This help"); + PrintAndLog(" d Set demodulation"); + PrintAndLog(" i [1] Inverse data signal, defaults to normal"); + PrintAndLog(" o [offset] Set offset where data should start decode in bitstream"); + PrintAndLog(""); + PrintAndLog("Examples:"); + PrintAndLog(" lf t55xx config d FSK - FSK demodulation"); + PrintAndLog(" lf t55xx config d FSK i 1 - FSK demodulation, inverse data"); + PrintAndLog(" lf t55xx config d FSK i 1 o 3 - FSK demodulation, inverse data, offset=3,start from position 3 to decode 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,62 +63,138 @@ 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; +} +int usage_t55xx_detect(){ + PrintAndLog("Usage: lf t55xx detect [1]"); + PrintAndLog(" [graph buffer data], if set, use Graphbuffer otherwise read data from tag."); + 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 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}; +int CmdT55xxSetConfig(const char *Cmd) { + + uint8_t offset = 0; + bool errors = FALSE; + uint8_t cmdp = 0; + char modulation[5] = {0x00}; + char tmp = 0x00; - char cmdp = param_getchar(Cmd, 0); - if (cmdp == 'h' || cmdp == 'H') { - usage_t55xx_read(); + while(param_getchar(Cmd, cmdp) != 0x00 && !errors) + { + tmp = param_getchar(Cmd, cmdp); + switch(tmp) + { + case 'h': + case 'H': + return usage_t55xx_config(); + case 'd': + param_getstr(Cmd, cmdp+1, modulation); + cmdp += 2; + + if ( strcmp(modulation, "FSK" ) == 0) + config.modulation = DEMOD_FSK; + else if ( strcmp(modulation, "ASK" ) == 0) + config.modulation = DEMOD_ASK; + else if ( strcmp(modulation, "NRZ" ) == 0) + config.modulation = DEMOD_NRZ; + else if ( strcmp(modulation, "PSK1" ) == 0) + config.modulation = DEMOD_PSK1; + else if ( strcmp(modulation, "PSK2" ) == 0) + config.modulation = DEMOD_PSK2; + else if ( strcmp(modulation, "PSK3" ) == 0) + config.modulation = DEMOD_PSK3; + else if ( strcmp(modulation, "BI" ) == 0) + config.modulation = DEMOD_BI; + else { + PrintAndLog("Unknown modulation '%s'", modulation); + errors = TRUE; + } + break; + case 'i': + config.inverted = param_getchar(Cmd,cmdp+1) == '1'; + cmdp+=2; + break; + case 'o': + errors |= param_getdec(Cmd, cmdp+1,&offset); + if ( !errors ) + config.offset = offset; + cmdp += 2; + break; + default: + PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp)); + errors = TRUE; + break; + } + } + + // No args + if (cmdp == 0) { + printConfiguration( config ); return 0; } + //Validations + if (errors) + return usage_t55xx_config(); + + config.block0 = 0; + printConfiguration( config ); + return 0; +} + +int CmdT55xxReadBlock(const char *Cmd) { + int block = -1; + int password = 0xFFFFFFFF; //default to blank Block 7 + + char cmdp = param_getchar(Cmd, 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_read(); - return 1; - } + if ( res < 1 || res > 2 ) + return usage_t55xx_read(); + if ((block < 0) | (block > 7)) { PrintAndLog("Block must be between 0 and 7"); @@ -121,106 +219,333 @@ int CmdReadBlk(const char *Cmd) 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(""); - - // if ( !tryDemod(bits, bitlen) ) - // return 3; - - // //move bits back to DemodBuffer - // setDemodBuf(bits, bitlen, 0); - // printBitStream(bits, bitlen); - if ( !DemodBufferLen) - return 0; + + DecodeT55xxBlock(); + printT55xxBlock(""); + return 0; +} + +void DecodeT55xxBlock(){ + + char buf[8] = {0x00}; + char *cmdStr = buf; + + DemodBufferLen = 0x00; - for (;i 1 || cmdp == 'h' || cmdp == 'H') + return usage_t55xx_detect(); - 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) ); + if (strlen(Cmd)==0) + AquireData( CONFIGURATION_BLOCK ); + if ( !tryDetectModulation() ) + PrintAndLog("Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'"); + return 0; } +bool tryDetectModulation(){ + + uint8_t hits = 0; + t55xx_conf_block_t tests[15]; + + if (GetFskClock("", FALSE, FALSE)){ + if ( FSKrawDemod("0 0", FALSE) && test(DEMOD_FSK, &tests[hits].offset)){ + tests[hits].modulation = DEMOD_FSK; + tests[hits].inverted = FALSE; + tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); + ++hits; + } + if ( FSKrawDemod("0 1", FALSE) && test(DEMOD_FSK, &tests[hits].offset)) { + tests[hits].modulation = DEMOD_FSK; + tests[hits].inverted = TRUE; + tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); + ++hits; + } + } else { + if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test(DEMOD_ASK, &tests[hits].offset)) { + tests[hits].modulation = DEMOD_ASK; + tests[hits].inverted = FALSE; + tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); + ++hits; + } + + if ( ASKmanDemod("0 1 1", FALSE, FALSE) && test(DEMOD_ASK, &tests[hits].offset)) { + tests[hits].modulation = DEMOD_ASK; + tests[hits].inverted = TRUE; + tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); + ++hits; + } + + if ( NRZrawDemod("0 0 1", FALSE) && test(DEMOD_NRZ, &tests[hits].offset)) { + tests[hits].modulation = DEMOD_NRZ; + tests[hits].inverted = FALSE; + tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); + ++hits; + } + + if ( NRZrawDemod("0 1 1", FALSE) && test(DEMOD_NRZ, &tests[hits].offset)) { + tests[hits].modulation = DEMOD_NRZ; + tests[hits].inverted = TRUE; + tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); + ++hits; + } + + if ( PSKDemod("0 0 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset)) { + tests[hits].modulation = DEMOD_PSK1; + tests[hits].inverted = FALSE; + tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); + ++hits; + } + + if ( PSKDemod("0 1 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset)) { + tests[hits].modulation = DEMOD_PSK1; + tests[hits].inverted = TRUE; + tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); + ++hits; + } -/* -FSK1 / FSK1a -size = fskdemod(dest, size, 32, 0, 8, 10); // fsk1 RF/32 -size = fskdemod(dest, size, 32, 1, 8, 10); // fsk1a RF/32 - -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 - -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; + // PSK2 - needs a call to psk1TOpsk2. + if ( PSKDemod("0 0 1", FALSE)) { + psk1TOpsk2(DemodBuffer, DemodBufferLen); + if (test(DEMOD_PSK2, &tests[hits].offset)){ + tests[hits].modulation = DEMOD_PSK2; + tests[hits].inverted = FALSE; + tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); + ++hits; + } + } + // PSK2 - needs a call to psk1TOpsk2. + if ( PSKDemod("0 1 1", FALSE)) { + psk1TOpsk2(DemodBuffer, DemodBufferLen); + if (test(DEMOD_PSK2, &tests[hits].offset)){ + tests[hits].modulation = DEMOD_PSK2; + tests[hits].inverted = TRUE; + tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); + ++hits; + } + } + + // PSK3 - needs a call to psk1TOpsk2. + if ( PSKDemod("0 0 1", FALSE)) { + psk1TOpsk2(DemodBuffer, DemodBufferLen); + if (test(DEMOD_PSK3, &tests[hits].offset)){ + tests[hits].modulation = DEMOD_PSK3; + tests[hits].inverted = FALSE; + tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); + ++hits; + } + } + // PSK3 - needs a call to psk1TOpsk2. + if ( PSKDemod("0 1 1", FALSE)) { + psk1TOpsk2(DemodBuffer, DemodBufferLen); + if (test(DEMOD_PSK3, &tests[hits].offset)){ + tests[hits].modulation = DEMOD_PSK3; + tests[hits].inverted = TRUE; + tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); + ++hits; + } + } + + if ( ASKbiphaseDemod("0 0 0 1", FALSE) && test(DEMOD_BI, &tests[hits].offset) ) { + tests[hits].modulation = DEMOD_BI; + tests[hits].inverted = FALSE; + tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); + ++hits; + } + if ( ASKbiphaseDemod("0 0 1 1", FALSE) && test(DEMOD_BI, &tests[hits].offset) ) { + tests[hits].modulation = DEMOD_BI; + tests[hits].inverted = TRUE; + tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); + ++hits; + } + } + + if ( hits == 1) { + config.modulation = tests[0].modulation; + config.inverted = tests[0].inverted; + config.offset = tests[0].offset; + + DecodeT55xxBlock(); + if (DemodBufferLen > config.offset + 32) + config.block0 = PackBits(config.offset, 32, DemodBuffer); + printConfiguration( config ); + return TRUE; + } + + if ( hits > 1) { + PrintAndLog("Found [%d] possible matches for modulation.",hits); + for(int i=0; i 3 && modread < 8) return TRUE; + break; + case DEMOD_ASK: + if (modread == 8) return TRUE; + break; + case DEMOD_PSK1: + if (modread == 1) return TRUE; + break; + case DEMOD_PSK2: + if (modread == 2) return TRUE; + break; + case DEMOD_PSK3: + if (modread == 3) return TRUE; + break; + case DEMOD_NRZ: + if (!modread) return TRUE; + break; + case DEMOD_BI: + if (modread == 16) return TRUE; + break; + default: + return FALSE; + } + return FALSE; +} - size = fskdemod(bits, bitlen, rflen, invert, fchigh, fclow); - if ( analyseDemod(size, bitlen, clk, invert) ) - return true; +bool test(uint8_t mode, uint8_t *offset){ + + if ( !DemodBufferLen) return FALSE; + + uint8_t si = 0; + for (uint8_t idx = 0; idx < 64; ++idx){ + si = idx; + if ( PackBits(si, 32, DemodBuffer) == 0x00 ) continue; + + uint8_t safer = PackBits(si, 4, DemodBuffer); si += 4; //master key + uint8_t resv = PackBits(si, 4, DemodBuffer); si += 4; //was 7 & +=7+3 //should be only 4 bits if extended mode + + // 2nibble must be zeroed. + // moved test to here, since this gets most faults first. + if ( resv > 0x00) continue; + + uint8_t xtRate = PackBits(si, 3, DemodBuffer); si += 3+3; //new + //uint8_t bitRate = PackBits(si, 3, DemodBuffer); si += 3; //new could check bit rate + uint8_t extend = PackBits(si, 1, DemodBuffer); si += 1; //bit 15 extended mode + uint8_t modread = PackBits(si, 5, DemodBuffer); si += 5+2+1; //new + //uint8_t pskcr = PackBits(si, 2, DemodBuffer); si += 2+1; //new could check psk cr + uint8_t nml01 = PackBits(si, 1, DemodBuffer); si += 1+5; //bit 24 , 30, 31 could be tested for 0 if not extended mode + uint8_t nml02 = PackBits(si, 2, DemodBuffer); si += 2; + + //if extended mode + bool extMode =( (safer == 0x6 || safer == 0x9) && extend) ? TRUE : FALSE; + + if (!extMode){ + if (nml01 || nml02 || xtRate) continue; + } + + //test modulation + if (!testModulation(mode, modread)) continue; + + *offset = idx; + return TRUE; + } + return FALSE; +} + +void printT55xxBlock(const char *demodStr){ + + uint8_t i = config.offset; + uint8_t endpos = 32 + i; + uint32_t blockData = 0; + uint8_t bits[64] = {0x00}; + + if ( !DemodBufferLen) return; + + if ( endpos > DemodBufferLen){ + PrintAndLog("The configured offset %d is too big. Possible offset: %d)", i, DemodBufferLen-32); + return; + } + + for (; i < endpos; ++i) + bits[i - config.offset] = DemodBuffer[i]; - // PSK demod - return false; + blockData = PackBits(0, 32, bits); + PrintAndLog("0x%08X %s [%s]", blockData, sprint_bin(bits,32), demodStr); } -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; +int special(const char *Cmd) { + uint32_t blockData = 0; + uint8_t bits[32] = {0x00}; + + PrintAndLog("[OFFSET] [DATA] [BINARY]"); + PrintAndLog("----------------------------------------------------"); + int i,j = 0; + for (; j < 64; ++j){ + + for (i = 0; i < 32; ++i) + bits[i]=DemodBuffer[j+i]; + + blockData = PackBits(0, 32, bits); + + //char indicate[4] = {0x00}; + // if ( (blockData >> 24) == 0xE0 ) + // sprintf(indicate,"<--"); + //PrintAndLog("[%02d] 0x%08X %s %s",j , blockData, sprint_bin(bits,32), indicate); + PrintAndLog("[%02d] 0x%08X %s",j , blockData, sprint_bin(bits,32)); } - return true; + return 0; } -int CmdWriteBlk(const char *Cmd) +void printConfiguration( t55xx_conf_block_t b){ + PrintAndLog("Modulation : %s", GetSelectedModulationStr(b.modulation) ); + PrintAndLog("Inverted : %s", (b.inverted) ? "Yes" : "No" ); + PrintAndLog("Offset : %d", b.offset); + PrintAndLog("Block0 : 0x%08X", b.block0); + PrintAndLog(""); +} + +int CmdT55xxWriteBlock(const char *Cmd) { int block = 8; //default to invalid block int data = 0xFFFFFFFF; //default to blank Block @@ -240,16 +565,14 @@ int CmdWriteBlk(const char *Cmd) } if (block > 7) { - PrintAndLog("Block must be between 0 and 7"); + PrintAndLog("Block number 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); + PrintAndLog("Writing to block: %d data: 0x%08X", block, data); //Password mode if (res == 3) { @@ -261,66 +584,60 @@ int CmdWriteBlk(const char *Cmd) return 0; } -int CmdReadTrace(const char *Cmd) +int CmdT55xxReadTrace(const char *Cmd) { - 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') { - 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); - if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) { - PrintAndLog("command execution time out"); - return 1; - } - //darn - //CmdSamples("12000"); - } + if (strlen(Cmd)==0) + AquireData( TRACE_BLOCK ); - bitlen = getFromGraphBuf(bits); - + DecodeT55xxBlock(); + if (!DemodBufferLen) return 1; + RepaintGraphWindow(); - - uint8_t si = 5; - uint32_t bl0 = PackBits(si, 32, bits); - uint32_t bl1 = PackBits(si+32, 32, bits); + uint8_t repeat = 0; + if (config.offset > 5) + repeat = 32; + uint8_t si = config.offset+repeat; + uint32_t bl0 = PackBits(si, 32, DemodBuffer); + uint32_t bl1 = PackBits(si+32, 32, DemodBuffer); - 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 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 ----------------------------------"); PrintAndLog("-------------------------------------------------------------"); PrintAndLog(" ACL Allocation class (ISO/IEC 15963-1) : 0x%02X (%d)", acl, acl); - PrintAndLog(" MFC Manufacturer ID (ISO/IEC 7816-6) : 0x%02X (%d)", mfc, mfc); - PrintAndLog(" CID : 0x%02X (%d)", cid, cid); + PrintAndLog(" MFC Manufacturer ID (ISO/IEC 7816-6) : 0x%02X (%d) - %s", mfc, mfc, getTagInfo(mfc)); + PrintAndLog(" CID : 0x%02X (%d) - %s", cid, cid, GetModelStrFromCID(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+config.offset+repeat,32) ); + PrintAndLog(" Block 1 : 0x%08X %s", bl1, sprint_bin(DemodBuffer+config.offset+repeat+32,32) ); PrintAndLog("-------------------------------------------------------------"); + + if ( acl != 0xE0 ) + PrintAndLog("The modulation is most likely wrong since the ACL is not 0xE0. "); /* TRACE - BLOCK O Bits Definition HEX @@ -341,7 +658,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 @@ -349,34 +666,33 @@ 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 (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') + return usage_t55xx_info(); + + if (strlen(Cmd)==0) + AquireData( CONFIGURATION_BLOCK ); + + DecodeT55xxBlock(); - uint8_t bits[LF_BITSSTREAM_LEN] = {0x00}; - - manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bits, LF_BITSSTREAM_LEN); - - 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; + if (!DemodBufferLen) return 1; + + uint8_t si = config.offset; + 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 --------------------"); @@ -385,25 +701,24 @@ 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(" PSK clock freq : %d", pskcf); + PrintAndLog(" Modulation : %s", GetModulationStr(datamod)); + PrintAndLog(" PSK clock frequency : %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+config.offset,32) ); PrintAndLog("-------------------------------------------------------------"); - return 0; } -int CmdDump(const char *Cmd){ +int CmdT55xxDump(const char *Cmd){ char s[20] = {0x00}; uint8_t pwd[4] = {0x00}; @@ -429,44 +744,43 @@ int CmdDump(const char *Cmd){ } else { sprintf(s,"%d", i); } - CmdReadBlk(s); + CmdT55xxReadBlock(s); } return 0; } -int CmdIceFsk(const char *Cmd){ +int AquireData( uint8_t block ){ - if (!HasGraphData()) return 0; + UsbCommand c; + + if ( block == CONFIGURATION_BLOCK ) + c.cmd = CMD_T55XX_READ_BLOCK; + else if (block == TRACE_BLOCK ) + c.cmd = CMD_T55XX_READ_TRACE; + + c.arg[0] = 0x00; + c.arg[1] = 0x00; + c.arg[2] = 0x00; + c.d.asBytes[0] = 0x0; - iceFsk3(GraphBuffer, LF_TRACE_BUFF_SIZE); - RepaintGraphWindow(); - return 0; -} -int CmdIceManchester(const char *Cmd){ - ManchesterDemod( -1); - return 0; -} -int ManchesterDemod(int blockNum){ + //Password mode + // if ( res == 2 ) { + // c.arg[2] = password; + // c.d.asBytes[0] = 0x1; + // } - 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); + SendCommand(&c); + if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) { + PrintAndLog("command execution time out"); + return 1; + } - 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) ); - + uint8_t got[12000]; + GetFromBigBuf(got,sizeof(got),0); + WaitForResponse(CMD_ACK,NULL); + setGraphBuf(got, 12000); return 0; -} +} char * GetBitRateStr(uint32_t id){ static char buf[40]; @@ -510,10 +824,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,29 +877,75 @@ char * GetModulationStr( uint32_t id){ return buf; } +char * GetModelStrFromCID(uint32_t cid){ + + static char buf[10]; + char *retStr = buf; + + if (cid == 1) sprintf(retStr,"ATA5577M1"); + if (cid == 2) sprintf(retStr,"ATA5577M2"); + return buf; +} + +char * GetSelectedModulationStr( uint8_t id){ + + static char buf[16]; + char *retStr = buf; + + switch (id){ + case DEMOD_FSK: + sprintf(retStr,"FSK"); + break; + case DEMOD_ASK: + sprintf(retStr,"ASK"); + break; + case DEMOD_NRZ: + sprintf(retStr,"DIRECT/NRZ"); + break; + case DEMOD_PSK1: + sprintf(retStr,"PSK1"); + break; + case DEMOD_PSK2: + sprintf(retStr,"PSK2"); + break; + case DEMOD_PSK3: + sprintf(retStr,"PSK3"); + break; + case DEMOD_BI: + sprintf(retStr,"BIPHASE"); + break; + default: + sprintf(retStr,"(Unknown)"); + break; + } + return buf; +} uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){ int i = start; int j = len-1; - if (len > 32) { - return 0; - } + + if (len > 32) return 0; + uint32_t tmp = 0; - for (; j >= 0; --j, ++i){ + for (; j >= 0; --j, ++i) tmp |= bits[i] << j; - } + return tmp; } 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/Get T55XX configuration (modulation, inverted, offset)"}, + {"detect", CmdT55xxDetect, 0, "[1] 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]"}, + {"special", special, 0, "Show block changes with 64 different offsets"}, {NULL, NULL, 0, NULL} };