X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7b40affb6f7087e116bccff352923834dcdc8d46..a087e9cf40bdb4d7546a7645995624a519aef2a6:/client/cmdlft55xx.c diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c index b303aced..93d8f99c 100644 --- a/client/cmdlft55xx.c +++ b/client/cmdlft55xx.c @@ -22,33 +22,24 @@ #include "data.h" #include "lfdemod.h" #include "../common/crc.h" +#include "../common/iso14443crc.h" +#include "cmdhf14a.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(" 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 +110,68 @@ 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 modulation[5] = {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 + param_getstr(Cmd, cmdp+1, modulation); + cmdp += 2; + if ( strcmp(modulation, "FSK" ) == 0) - len = 1; + config.modulation = DEMOD_FSK; else if ( strcmp(modulation, "ASK" ) == 0) - len = 2; - else if ( strcmp(modulation, "PSK" ) == 0) - len = 3; - else if ( strcmp(modulation, "NZ" ) == 0) - len = 4; + 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, "BI" ) == 0) - len = 5; + 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; } } + // 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; } @@ -225,30 +222,44 @@ int CmdT55xxReadBlock(const char *Cmd) void DecodeT55xxBlock(){ - char buf[6] = {0x00}; + char buf[8] = {0x00}; char *cmdStr = buf; + // clearing the DemodBuffer. + DemodBufferLen = 0x00; + // use the configuration switch( config.modulation ){ - case 1: + case DEMOD_FSK: sprintf(cmdStr,"0 %d", config.inversed ); FSKrawDemod(cmdStr, FALSE); break; - case 2: + case DEMOD_ASK: sprintf(cmdStr,"0 %d 1", config.inversed ); ASKmanDemod(cmdStr, FALSE, FALSE); - PrintAndLog("ice"); break; - case 3: + case DEMOD_PSK1: sprintf(cmdStr,"0 %d 1", config.inversed ); PSKDemod(cmdStr, FALSE); break; - case 4: + case DEMOD_PSK2: + sprintf(cmdStr,"0 %d 1", config.inversed ); + PSKDemod(cmdStr, FALSE); + psk1TOpsk2(DemodBuffer, DemodBufferLen); + break; + case DEMOD_PSK3: + sprintf(cmdStr,"0 %d 1", config.inversed ); + PSKDemod(cmdStr, FALSE); + psk1TOpsk2(DemodBuffer, DemodBufferLen); + break; + case DEMOD_NRZ: sprintf(cmdStr,"0 %d 1", config.inversed ); NRZrawDemod(cmdStr, FALSE); break; - case 5: - //BiphaseRawDecode("0",FALSE); + case DEMOD_BI: + sprintf(cmdStr,"0 0 %d 1", config.inversed ); + // DEPENDS ON NEW CODE IN MARSHMELLOWS PULL REQUEST + //ASKbiphDemod(cmdStr, FALSE); break; default: return; @@ -291,134 +302,224 @@ int CmdT55xxDetect(const char *Cmd){ bool tryDetectModulation(){ uint8_t hits = 0; - t55xx_conf_block_t tests[10]; + t55xx_conf_block_t tests[11]; if (GetFskClock("", FALSE, FALSE)){ - if ( FSKrawDemod("0 0", FALSE) && test()){ - tests[hits].modulation = 1; - tests[hits].inversed = 0; + if ( FSKrawDemod("0 0", FALSE) && test(DEMOD_FSK, &tests[hits].offset)){ + tests[hits].modulation = DEMOD_FSK; + tests[hits].inversed = FALSE; ++hits; } - if ( FSKrawDemod("0 1", FALSE) && test()) { - tests[hits].modulation = 1; - tests[hits].inversed = 1; + if ( FSKrawDemod("0 1", FALSE) && test(DEMOD_FSK, &tests[hits].offset)) { + tests[hits].modulation = DEMOD_FSK; + tests[hits].inversed = TRUE; ++hits; } } else { - if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test()) { - tests[hits].modulation = 2; - tests[hits].inversed = 0; + if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test(DEMOD_ASK, &tests[hits].offset)) { + tests[hits].modulation = DEMOD_ASK; + tests[hits].inversed = FALSE; ++hits; } - if ( ASKmanDemod("0 1 1", FALSE, FALSE) && test()) { - tests[hits].modulation = 2; - tests[hits].inversed = 1; + if ( ASKmanDemod("0 1 1", FALSE, FALSE) && test(DEMOD_ASK, &tests[hits].offset)) { + tests[hits].modulation = DEMOD_ASK; + tests[hits].inversed = TRUE; ++hits; } - if ( NRZrawDemod("0 0 1", FALSE) && test()) { - tests[hits].modulation = 3; - tests[hits].inversed = 0; + if ( NRZrawDemod("0 0 1", FALSE) && test(DEMOD_NRZ, &tests[hits].offset)) { + tests[hits].modulation = DEMOD_NRZ; + tests[hits].inversed = FALSE; ++hits; } - if ( NRZrawDemod("0 1 1", FALSE) && test()) { - tests[hits].modulation = 3; - tests[hits].inversed = 1; + if ( NRZrawDemod("0 1 1", FALSE) && test(DEMOD_NRZ, &tests[hits].offset)) { + tests[hits].modulation = DEMOD_NRZ; + tests[hits].inversed = TRUE; ++hits; } - if ( PSKDemod("0 0 1", FALSE) && test()) { - tests[hits].modulation = 4; - tests[hits].inversed = 0; + if ( PSKDemod("0 0 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset)) { + tests[hits].modulation = DEMOD_PSK1; + tests[hits].inversed = FALSE; ++hits; } - if ( PSKDemod("0 1 1", FALSE) && test()) { - tests[++hits].modulation = 4; - tests[hits].inversed = 1; + if ( PSKDemod("0 1 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset)) { + tests[hits].modulation = DEMOD_PSK1; + tests[hits].inversed = TRUE; ++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; - // } + + //PSK2 + if ( PSKDemod("0 0 1", FALSE)) { + psk1TOpsk2(DemodBuffer, DemodBufferLen); + if (test(DEMOD_PSK2, &tests[hits].offset)){ + tests[hits].modulation = DEMOD_PSK2; + tests[hits].inversed = FALSE; + ++hits; + } + } + if ( PSKDemod("0 1 1", FALSE)) { + psk1TOpsk2(DemodBuffer, DemodBufferLen); + if (test(DEMOD_PSK2, &tests[hits].offset)){ + tests[hits].modulation = DEMOD_PSK2; + tests[hits].inversed = TRUE; + ++hits; + } + } + + /* DEPENDANT ON NEW CODE IN MARSHMELLOWS pull request + //biphase //offset, clock, invert, maxErr + if ( ASKbiphaseDemod("0 0 0 1", FALSE) && test(DEMOD_BI, &tests[hits].offset) ) { + tests[hits].modulation = DEMOD_BI; + tests[hits].inversed = FALSE; + ++hits; + } + if ( ASKbiphaseDemod("0 0 1 1", FALSE) && test(DEMOD_BI, &tests[hits].offset) ) { + tests[hits].modulation = DEMOD_BI; + tests[hits].inversed = TRUE; + ++hits; + } + */ } if ( hits == 1) { - PrintAndLog("Modulation: %d Inverse: %d", tests[0].modulation, tests[0].inversed); config.modulation = tests[0].modulation; config.inversed = tests[0].inversed; + config.offset = tests[0].offset; + 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; +} + +bool test(uint8_t mode, uint8_t *offset){ if ( !DemodBufferLen) - return false; - - 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; + return FALSE; + if ( PackBits(0, 32, DemodBuffer) == 0x00 ) + return FALSE; + for (uint8_t idx=1; idx<33; idx++){ + uint8_t si = idx; + 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 + 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; + + bool extMode = FALSE; //PrintAndLog("test: %X %X %X ", safer, resv, extend); // 2nibble must be zeroed. - if ( resv > 0x00) return FALSE; + if ( resv > 0x00) continue; + + //if extended mode + if ( (safer == 0x6 || safer == 0x9) && extend) extMode = TRUE; - if ( safer == 0x6 || safer == 0x9){ - if ( extend == 0x00) + if (!extMode){ + if (nml01 || nml02 || xtRate) continue; + } + + //test modulation + if (!testModulation(mode, modread)) continue; + *offset = idx; 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}; + uint8_t bits[64] = {0x00}; if ( !DemodBufferLen) return; - int i =0; - for (;i DemodBufferLen){ + PrintAndLog("The configured offset is too 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}; + + 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; +} -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 +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 @@ -488,8 +589,9 @@ int CmdT55xxReadTrace(const char *Cmd) return 2; RepaintGraphWindow(); - - uint8_t si = 5; + 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); @@ -509,8 +611,8 @@ int CmdT55xxReadTrace(const char *Cmd) 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",year, quarter ); @@ -519,8 +621,8 @@ int CmdT55xxReadTrace(const char *Cmd) PrintAndLog(" Die Number : %d", dw); PrintAndLog("-------------------------------------------------------------"); PrintAndLog(" Raw Data - Page 1"); - 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(" 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("-------------------------------------------------------------"); /* TRACE - BLOCK O @@ -583,7 +685,7 @@ int CmdT55xxInfo(const char *Cmd){ return 2; - uint8_t si = 1; + uint8_t si = config.offset; uint32_t bl0 = PackBits(si, 32, DemodBuffer); uint32_t safer = PackBits(si, 4, DemodBuffer); si += 4; @@ -620,7 +722,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(DemodBuffer+5,32) ); + PrintAndLog(" Block 0 : 0x%08X %s", bl0, sprint_bin(DemodBuffer+config.offset,32) ); PrintAndLog("-------------------------------------------------------------"); return 0; @@ -752,6 +854,47 @@ 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 (%d)",id); + break; + case DEMOD_ASK: + sprintf(retStr,"ASK (%d)",id); + break; + case DEMOD_NRZ: + sprintf(retStr,"DIRECT/NRZ (%d)",id); + break; + case DEMOD_PSK1: + sprintf(retStr,"PSK1 (%d)",id); + break; + case DEMOD_PSK2: + sprintf(retStr,"PSK2 (%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; @@ -776,6 +919,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} };