X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/33add1876412aca37722ccbce81583d45737a121..545158b39874595933a3358e6c4685249ce62d3f:/client/cmdlft55xx.c diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c index 4165f712..b33c165a 100644 --- a/client/cmdlft55xx.c +++ b/client/cmdlft55xx.c @@ -22,33 +22,23 @@ #include "data.h" #include "lfdemod.h" #include "../common/crc.h" +#include "../common/iso14443crc.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 = 2, .inversed = FALSE, .block0 = 0x00}; +// Default configuration +t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inversed = FALSE, .offset = 0x00, .block0 = 0x00}; int usage_t55xx_config(){ - PrintAndLog("Usage: lf t55xx config [d ] [i 1]"); + PrintAndLog("Usage: lf t55xx config [d ] [i 1] [o ]"); 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(" 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 - 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 bitpos 3 to decode data"); PrintAndLog(""); return 0; } @@ -119,62 +109,63 @@ static int CmdHelp(const char *Cmd); int CmdT55xxSetConfig(const char *Cmd){ - int len; - bool inverse; + uint8_t offset = 0; bool errors = FALSE; uint8_t cmdp = 0; char modulation[4] = {0x00}; + char tmp = 0x00; while(param_getchar(Cmd, cmdp) != 0x00 && !errors) { - switch(param_getchar(Cmd, cmdp)) + tmp = param_getchar(Cmd, cmdp); + switch(tmp) { 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; + 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, "PSK" ) == 0) config.modulation = DEMOD_PSK; + else if ( strcmp(modulation, "NZ" ) == 0) config.modulation = DEMOD_NZR; + else if ( strcmp(modulation, "BI" ) == 0) config.modulation = DEMOD_BI; else { PrintAndLog("Unknown modulation '%s'", modulation); errors = TRUE; } break; case 'i': - inverse = param_getchar(Cmd,cmdp+1) == '1'; + config.inversed = 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; } + + PrintAndLog(" %c %d [%d]", param_getchar(Cmd, cmdp) , errors, cmdp); } // No args if (cmdp == 0) { - PrintAndLog("Modulation: %d", config.modulation); - PrintAndLog("Invert : %d", config.inversed); - PrintAndLog("Block0 : %08X", config.block0); + printConfiguration( config ); return 0; } //Validations if (errors) return usage_t55xx_config(); - config.modulation = len; - config.inversed = inverse; config.block0 = 0; + printConfiguration( config ); return 0; } @@ -189,10 +180,9 @@ int CmdT55xxReadBlock(const char *Cmd) 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"); @@ -220,9 +210,7 @@ int CmdT55xxReadBlock(const char *Cmd) setGraphBuf(got, 12000); DecodeT55xxBlock(); - PrintAndLog("FIRE"); printT55xxBlock(""); - return 0; } @@ -231,6 +219,9 @@ void DecodeT55xxBlock(){ char buf[6] = {0x00}; char *cmdStr = buf; + // clearing the DemodBuffer. + DemodBufferLen = 0x00; + // use the configuration switch( config.modulation ){ case 1: @@ -240,7 +231,6 @@ void DecodeT55xxBlock(){ 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 ); @@ -284,7 +274,9 @@ int CmdT55xxDetect(const char *Cmd){ WaitForResponse(CMD_ACK,NULL); setGraphBuf(got, 12000); - tryDetectModulation(); + if ( !tryDetectModulation() ){ + PrintAndLog("Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'"); + } return 0; } @@ -292,62 +284,79 @@ int CmdT55xxDetect(const char *Cmd){ bool tryDetectModulation(){ uint8_t hits = 0; + t55xx_conf_block_t tests[10]; - //IF true, the wave is almost certainly FSK if (GetFskClock("", FALSE, FALSE)){ - if ( FSKrawDemod("0 0", FALSE) && test()){ - printT55xxBlock("FSK"); + tests[hits].modulation = DEMOD_FSK; + tests[hits].inversed = FALSE; ++hits; } if ( FSKrawDemod("0 1", FALSE) && test()) { - printT55xxBlock("FSK inv"); + tests[hits].modulation = DEMOD_FSK; + tests[hits].inversed = TRUE; ++hits; - } + } } else { if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test()) { - printT55xxBlock("ASK/MAN"); + tests[hits].modulation = DEMOD_ASK; + tests[hits].inversed = FALSE; ++hits; - } + } if ( ASKmanDemod("0 1 1", FALSE, FALSE) && test()) { - printT55xxBlock("ASK/MAN Inv"); + tests[hits].modulation = DEMOD_ASK; + tests[hits].inversed = TRUE; ++hits; - } + } if ( NRZrawDemod("0 0 1", FALSE) && test()) { - printT55xxBlock("NZR"); + tests[hits].modulation = DEMOD_NZR; + tests[hits].inversed = FALSE; ++hits; } if ( NRZrawDemod("0 1 1", FALSE) && test()) { - printT55xxBlock("NZR inv"); + tests[hits].modulation = DEMOD_NZR; + tests[hits].inversed = TRUE; ++hits; - } + } - if ( PSKDemod("0 0 1", FALSE) && test()) { - printT55xxBlock("PSK"); + if ( PSKDemod("0 0 1", FALSE) && test()) { + tests[hits].modulation = DEMOD_PSK; + tests[hits].inversed = FALSE; ++hits; } if ( PSKDemod("0 1 1", FALSE) && test()) { - printT55xxBlock("PSK inv"); + tests[hits].modulation = DEMOD_PSK; + tests[hits].inversed = TRUE; ++hits; } //PSK2? // if (!BiphaseRawDecode("0",FALSE) && test()) { - // printT55xx("BIPHASE"); + // tests[++hits].modulation = DEMOD_BI; + // tests[hits].inversed = FALSE; //} // if (!BiphaseRawDecode("1",FALSE) && test()) { - // printT55xx("BIPHASE inv"); + // tests[++hits].modulation = DEMOD_BI; + // tests[hits].inversed = TRUE; // } } - if ( hits == 1) + if ( hits == 1) { + config.modulation = tests[0].modulation; + config.inversed = tests[0].inversed; + printConfiguration( config ); return TRUE; + } - if ( hits > 1) + if ( hits > 1) { PrintAndLog("Found [%d] possible matches for modulation.",hits); - + for(int i=0; i DemodBufferLen){ + PrintAndLog("The configured offset is to big. (%d > %d)", config.offset, DemodBufferLen); + return; + } + + int i = config.offset; + int pos = 32 + config.offset; + for (; i < pos; ++i) + bits[i - config.offset]=DemodBuffer[i]; - blockData = PackBits(1, 32, bits); - PrintAndLog("0x%08X %s [%s]", blockData, sprint_bin(bits+1,32), demodStr); + blockData = PackBits(0, 32, bits); + PrintAndLog("0x%08X %s [%s]", blockData, sprint_bin(bits,32), demodStr); } -/* -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 special(const char *Cmd) { + uint32_t blockData = 0; + uint8_t bits[32] = {0x00}; -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 + PrintAndLog("[OFFSET] [DATA] [BINARY]"); + PrintAndLog("----------------------------------------------------"); + int i,j = 0; + for (; j < 128; ++j){ + + for (i = 0; i < 32; ++i) + bits[i]=DemodBuffer[j+i]; + + blockData = PackBits(0, 32, bits); + PrintAndLog("[%d] 0x%08X %s",j , blockData, sprint_bin(bits,32)); + } + + return 0; +} + +void printConfiguration( t55xx_conf_block_t b){ + PrintAndLog("Modulation : %s", GetSelectedModulationStr(b.modulation) ); + PrintAndLog("Inverted : %s", (b.inversed) ? "Yes" : "No" ); + PrintAndLog("Offset : %d", b.offset); + PrintAndLog("Block0 : %08X", b.block0); + PrintAndLog(""); +} -PSK1 -errCnt = pskRawDemod(bits, &bitlen, 32, 0); -*/ int CmdT55xxWriteBlock(const char *Cmd) { int block = 8; //default to invalid block @@ -447,14 +479,10 @@ int CmdT55xxWriteBlock(const char *Cmd) int CmdT55xxReadTrace(const char *Cmd) { - 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){ @@ -464,29 +492,35 @@ int CmdT55xxReadTrace(const char *Cmd) PrintAndLog("command execution time out"); return 1; } - //darn - //CmdSamples("12000"); + + uint8_t got[12000]; + GetFromBigBuf(got,sizeof(got),0); + WaitForResponse(CMD_ACK,NULL); + setGraphBuf(got, 12000); } - size_t bitlen = getFromGraphBuf(bits); - if ( bitlen == 0 ) + DecodeT55xxBlock(); + + if ( !DemodBufferLen) return 2; RepaintGraphWindow(); - uint8_t si = 5; - uint32_t bl0 = PackBits(si, 32, bits); - uint32_t bl1 = PackBits(si+32, 32, bits); + uint8_t si = config.offset; + 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); - 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); + year += 2000; PrintAndLog(""); PrintAndLog("-- T55xx Trace Information ----------------------------------"); @@ -496,14 +530,14 @@ int CmdT55xxReadTrace(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 1 : 0x%08X %s", bl1, sprint_bin(DemodBuffer+37,32) ); PrintAndLog("-------------------------------------------------------------"); /* TRACE - BLOCK O @@ -533,33 +567,56 @@ int CmdT55xxInfo(const char *Cmd){ */ char cmdp = param_getchar(Cmd, 0); - if (cmdp == 'h' || cmdp == 'H') { + if (cmdp == 'h' || cmdp == 'H') return usage_t55xx_info(); - } else { - CmdT55xxReadBlock("0"); - } + + if (strlen(Cmd)==0){ + + // read block 0, Page 0. Configuration. + UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, 0, 0}}; + c.d.asBytes[0] = 0x0; + + //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; + } - // config - - uint8_t bits[LF_BITSSTREAM_LEN] = {0x00}; - - 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 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; - 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; + uint8_t got[12000]; + GetFromBigBuf(got,sizeof(got),0); + WaitForResponse(CMD_ACK,NULL); + setGraphBuf(got, 12000); + } + + DecodeT55xxBlock(); + + if ( !DemodBufferLen) + return 2; + + + 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 --------------------"); @@ -580,7 +637,7 @@ int CmdT55xxInfo(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(bits+5,32) ); + PrintAndLog(" Block 0 : 0x%08X %s", bl0, sprint_bin(DemodBuffer+5,32) ); PrintAndLog("-------------------------------------------------------------"); return 0; @@ -712,6 +769,34 @@ char * GetModulationStr( uint32_t id){ return buf; } +char * GetSelectedModulationStr( uint8_t id){ + + static char buf[16]; + char *retStr = buf; + + switch (id){ + case DEMOD_FSK: + sprintf(retStr,"FSK (%d)",id); + break; + case DEMOD_ASK: + sprintf(retStr,"ASK (%d)",id); + break; + case DEMOD_NZR: + sprintf(retStr,"DIRECT/NRZ (%d)",id); + break; + case DEMOD_PSK: + sprintf(retStr,"PSK (%d)",id); + break; + case DEMOD_BI: + sprintf(retStr,"BIPHASE (%d)",id); + break; + default: + sprintf(retStr,"(Unknown)"); + break; + } + return buf; +} + uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){ int i = start; @@ -736,6 +821,7 @@ static command_t CommandTable[] = {"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, "Shows how a datablock changes with 32 different offsets"}, {NULL, NULL, 0, NULL} };