X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/8713b64fdff94662bd0851e7d045f24c631ef247..ec09716a65c29dffaedcc232c0b6414bc7e0c598:/client/cmdlft55xx.c diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c index 93d8f99c..34c8e1ef 100644 --- a/client/cmdlft55xx.c +++ b/client/cmdlft55xx.c @@ -25,21 +25,25 @@ #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, .inversed = FALSE, .offset = 0x00, .block0 = 0x00}; +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 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(" b <8|16|32|40|50|64|100|128> Set bitrate"); + PrintAndLog(" d Set demodulation FSK / ASK / PSK / NZ / Biphase / Biphase A"); + PrintAndLog(" i [1] Invert 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 bitpos 3 to decode 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; } @@ -108,14 +112,15 @@ int usage_t55xx_detect(){ static int CmdHelp(const char *Cmd); -int CmdT55xxSetConfig(const char *Cmd){ +int CmdT55xxSetConfig(const char *Cmd) { uint8_t offset = 0; bool errors = FALSE; uint8_t cmdp = 0; char modulation[5] = {0x00}; char tmp = 0x00; - + uint8_t bitRate = 0; + uint8_t rates[9] = {8,16,32,40,50,64,100,128,0}; while(param_getchar(Cmd, cmdp) != 0x00 && !errors) { tmp = param_getchar(Cmd, cmdp); @@ -124,12 +129,34 @@ int CmdT55xxSetConfig(const char *Cmd){ case 'h': case 'H': return usage_t55xx_config(); + case 'b': + errors |= param_getdec(Cmd, cmdp+1, &bitRate); + if ( !errors){ + uint8_t i = 0; + for (; i < 9; i++){ + if (rates[i]==bitRate) { + config.bitrate = i; + break; + } + } + if (i==9) errors = TRUE; + } + cmdp+=2; + break; case 'd': param_getstr(Cmd, cmdp+1, modulation); cmdp += 2; - + if ( strcmp(modulation, "FSK" ) == 0) config.modulation = DEMOD_FSK; + else if ( strcmp(modulation, "FSK1" ) == 0) + config.modulation = DEMOD_FSK1; + else if ( strcmp(modulation, "FSK1a" ) == 0) + config.modulation = DEMOD_FSK1a; + else if ( strcmp(modulation, "FSK2" ) == 0) + config.modulation = DEMOD_FSK2; + else if ( strcmp(modulation, "FSK2a" ) == 0) + config.modulation = DEMOD_FSK2a; else if ( strcmp(modulation, "ASK" ) == 0) config.modulation = DEMOD_ASK; else if ( strcmp(modulation, "NRZ" ) == 0) @@ -138,6 +165,10 @@ int CmdT55xxSetConfig(const char *Cmd){ 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, "BIa" ) == 0) + config.modulation = DEMOD_BIa; else if ( strcmp(modulation, "BI" ) == 0) config.modulation = DEMOD_BI; else { @@ -146,14 +177,14 @@ int CmdT55xxSetConfig(const char *Cmd){ } break; case 'i': - config.inversed = param_getchar(Cmd,cmdp+1) == '1'; + config.inverted = param_getchar(Cmd,cmdp+1) == '1'; cmdp+=2; break; case 'o': - errors |= param_getdec(Cmd, cmdp+1,&offset); + errors |= param_getdec(Cmd, cmdp+1, &offset); if ( !errors ) config.offset = offset; - cmdp += 2; + cmdp+=2; break; default: PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp)); @@ -170,13 +201,13 @@ int CmdT55xxSetConfig(const char *Cmd){ //Validations if (errors) return usage_t55xx_config(); - config.block0 = 0; - printConfiguration( config ); + + config.block0 = 0; + printConfiguration ( config ); return 0; } -int CmdT55xxReadBlock(const char *Cmd) -{ +int CmdT55xxReadBlock(const char *Cmd) { int block = -1; int password = 0xFFFFFFFF; //default to blank Block 7 @@ -214,180 +245,221 @@ int CmdT55xxReadBlock(const char *Cmd) GetFromBigBuf(got,sizeof(got),0); WaitForResponse(CMD_ACK,NULL); setGraphBuf(got, 12000); - - DecodeT55xxBlock(); - printT55xxBlock(""); + DemodBufferLen=0; + if (!DecodeT55xxBlock()) return 3; + char blk[10]={0}; + sprintf(blk,"%d", block); + printT55xxBlock(blk); return 0; } -void DecodeT55xxBlock(){ +bool DecodeT55xxBlock(){ char buf[8] = {0x00}; char *cmdStr = buf; + int ans = 0; + uint8_t bitRate[8] = {8,16,32,40,50,64,100,128}; - // clearing the DemodBuffer. DemodBufferLen = 0x00; - - // use the configuration + switch( config.modulation ){ case DEMOD_FSK: - sprintf(cmdStr,"0 %d", config.inversed ); - FSKrawDemod(cmdStr, FALSE); + sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 ); + CmdLtrim(cmdStr); + sprintf(cmdStr,"%d %d", bitRate[config.bitrate], config.inverted ); + ans = FSKrawDemod(cmdStr, FALSE); + break; + case DEMOD_FSK1: + sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 ); + CmdLtrim(cmdStr); + sprintf(cmdStr,"%d 1 8 5", bitRate[config.bitrate] ); + ans = FSKrawDemod(cmdStr, FALSE); + break; + case DEMOD_FSK1a: + sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 ); + CmdLtrim(cmdStr); + sprintf(cmdStr,"%d 0 8 5", bitRate[config.bitrate] ); + ans = FSKrawDemod(cmdStr, FALSE); + break; + case DEMOD_FSK2: + sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 ); + CmdLtrim(cmdStr); + sprintf(cmdStr,"%d 0 10 8", bitRate[config.bitrate] ); + ans = FSKrawDemod(cmdStr, FALSE); + break; + case DEMOD_FSK2a: + sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 ); + CmdLtrim(cmdStr); + sprintf(cmdStr,"%d 1 10 8", bitRate[config.bitrate] ); + ans = FSKrawDemod(cmdStr, FALSE); break; case DEMOD_ASK: - sprintf(cmdStr,"0 %d 1", config.inversed ); - ASKmanDemod(cmdStr, FALSE, FALSE); + sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted ); + ans = ASKmanDemod(cmdStr, FALSE, FALSE); break; case DEMOD_PSK1: - sprintf(cmdStr,"0 %d 1", config.inversed ); - PSKDemod(cmdStr, FALSE); + sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted ); + ans = PSKDemod(cmdStr, FALSE); break; case DEMOD_PSK2: - sprintf(cmdStr,"0 %d 1", config.inversed ); - PSKDemod(cmdStr, FALSE); + sprintf(cmdStr,"%d 1", bitRate[config.bitrate] ); + ans = PSKDemod(cmdStr, FALSE); psk1TOpsk2(DemodBuffer, DemodBufferLen); break; case DEMOD_PSK3: - sprintf(cmdStr,"0 %d 1", config.inversed ); - PSKDemod(cmdStr, FALSE); + sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted ); + ans = PSKDemod(cmdStr, FALSE); psk1TOpsk2(DemodBuffer, DemodBufferLen); break; case DEMOD_NRZ: - sprintf(cmdStr,"0 %d 1", config.inversed ); - NRZrawDemod(cmdStr, FALSE); + sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted ); + ans = NRZrawDemod(cmdStr, FALSE); break; case DEMOD_BI: - sprintf(cmdStr,"0 0 %d 1", config.inversed ); - // DEPENDS ON NEW CODE IN MARSHMELLOWS PULL REQUEST - //ASKbiphDemod(cmdStr, FALSE); + sprintf(cmdStr,"0 %d 0 1", bitRate[config.bitrate] ); + ans = ASKbiphaseDemod(cmdStr, FALSE); + break; + case DEMOD_BIa: + sprintf(cmdStr,"0 %d 1 1", bitRate[config.bitrate] ); + ans = ASKbiphaseDemod(cmdStr, FALSE); break; default: - return; + return FALSE; } + return (bool) ans; } int CmdT55xxDetect(const char *Cmd){ + char cmdp = param_getchar(Cmd, 0); - if (cmdp == 'h' || cmdp == 'H') + if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') return usage_t55xx_detect(); - // read block 0, Page 0. Configuration. - UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, 0, 0}}; - c.d.asBytes[0] = 0x0; + if (strlen(Cmd)==0) + AquireData( CONFIGURATION_BLOCK ); - //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 FALSE; - } - - uint8_t got[12000]; - GetFromBigBuf(got,sizeof(got),0); - WaitForResponse(CMD_ACK,NULL); - setGraphBuf(got, 12000); - - if ( !tryDetectModulation() ){ + if ( !tryDetectModulation() ) PrintAndLog("Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'"); - } + return 0; } // detect configuration? bool tryDetectModulation(){ - + char cmdStr[8] = {0}; uint8_t hits = 0; - t55xx_conf_block_t tests[11]; + t55xx_conf_block_t tests[15]; if (GetFskClock("", FALSE, FALSE)){ + uint8_t fc1 = 0, fc2 = 0, clk=0; + fskClocks(&fc1, &fc2, &clk, FALSE); + sprintf(cmdStr,"%d", clk/2); + CmdLtrim(cmdStr); if ( FSKrawDemod("0 0", FALSE) && test(DEMOD_FSK, &tests[hits].offset)){ tests[hits].modulation = DEMOD_FSK; - tests[hits].inversed = FALSE; + if (fc1==8 && fc2 == 5) + tests[hits].modulation = DEMOD_FSK1a; + else if (fc1==10 && fc2 == 8) + tests[hits].modulation = DEMOD_FSK2; + + 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].inversed = TRUE; + if (fc1==8 && fc2 == 5) + tests[hits].modulation = DEMOD_FSK1; + else if (fc1==10 && fc2 == 8) + tests[hits].modulation = DEMOD_FSK2a; + + tests[hits].inverted = TRUE; + tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); ++hits; - } - } else { + } + } else { if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test(DEMOD_ASK, &tests[hits].offset)) { tests[hits].modulation = DEMOD_ASK; - tests[hits].inversed = FALSE; + 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].inversed = TRUE; + 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].inversed = FALSE; + 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].inversed = TRUE; + 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].inversed = FALSE; + 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].inversed = TRUE; + tests[hits].inverted = TRUE; + tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); ++hits; } - //PSK2 + // 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].inversed = FALSE; + tests[hits].inverted = FALSE; + tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); ++hits; } - } - if ( PSKDemod("0 1 1", FALSE)) { + } // inverse waves does not affect this demod + + // PSK3 - 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].inversed = TRUE; + 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; } - } - - /* DEPENDANT ON NEW CODE IN MARSHMELLOWS pull request - //biphase //offset, clock, invert, maxErr + } // inverse waves does not affect this demod + if ( ASKbiphaseDemod("0 0 0 1", FALSE) && test(DEMOD_BI, &tests[hits].offset) ) { tests[hits].modulation = DEMOD_BI; - tests[hits].inversed = FALSE; + 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].inversed = TRUE; + if ( ASKbiphaseDemod("0 0 1 1", FALSE) && test(DEMOD_BIa, &tests[hits].offset) ) { + tests[hits].modulation = DEMOD_BIa; + tests[hits].inverted = TRUE; + tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer); ++hits; } - */ } if ( hits == 1) { config.modulation = tests[0].modulation; - config.inversed = tests[0].inversed; + config.inverted = tests[0].inverted; config.offset = tests[0].offset; + config.block0 = tests[0].block0; printConfiguration( config ); return TRUE; } @@ -408,22 +480,112 @@ bool testModulation(uint8_t mode, uint8_t modread){ if (modread > 3 && modread < 8) return TRUE; break; case DEMOD_ASK: - if (modread == 8) return TRUE; + if (modread == DEMOD_ASK) return TRUE; + break; + case DEMOD_PSK1: + if (modread == DEMOD_PSK1) return TRUE; + break; + case DEMOD_PSK2: + if (modread == DEMOD_PSK2) return TRUE; + break; + case DEMOD_PSK3: + if (modread == DEMOD_PSK3) return TRUE; + break; + case DEMOD_NRZ: + if (modread == DEMOD_NRZ) return TRUE; + break; + case DEMOD_BI: + if (modread == DEMOD_BI) return TRUE; + break; + case DEMOD_BIa: + if (modread == DEMOD_BIa) return TRUE; + break; + default: + return FALSE; + } + return FALSE; +} + +bool testBitRate(uint8_t readRate, uint8_t mod){ + uint8_t expected[8] = {8, 16, 32, 40, 50, 64, 100, 128}; + uint8_t detRate = 0; + switch( mod ){ + case DEMOD_FSK: + detRate = GetFskClock("",FALSE, FALSE); + if (expected[readRate] == detRate) { + config.bitrate = readRate; + return TRUE; + } + break; + case DEMOD_FSK1: + detRate = GetFskClock("",FALSE, FALSE); + if (expected[readRate] == detRate) { + config.bitrate = readRate; + return TRUE; + } + break; + case DEMOD_FSK1a: + detRate = GetFskClock("",FALSE, FALSE); + if (expected[readRate] == detRate) { + config.bitrate = readRate; + return TRUE; + } + break; + case DEMOD_FSK2: + detRate = GetFskClock("",FALSE, FALSE); + if (expected[readRate] == detRate) { + config.bitrate = readRate; + return TRUE; + } + break; + case DEMOD_FSK2a: + detRate = GetFskClock("",FALSE, FALSE); + if (expected[readRate] == detRate) { + config.bitrate = readRate; + return TRUE; + } + break; + case DEMOD_ASK: + detRate = GetAskClock("",FALSE, FALSE); + if (expected[readRate] == detRate) { + config.bitrate = readRate; + return TRUE; + } break; case DEMOD_PSK1: - if (modread == 1) return TRUE; + detRate = GetPskClock("",FALSE, FALSE); + if (expected[readRate] == detRate) { + config.bitrate = readRate; + return TRUE; + } break; case DEMOD_PSK2: - if (modread == 2) return TRUE; + detRate = GetPskClock("",FALSE, FALSE); + if (expected[readRate] == detRate) { + config.bitrate = readRate; + return TRUE; + } break; case DEMOD_PSK3: - if (modread == 3) return TRUE; + detRate = GetPskClock("",FALSE, FALSE); + if (expected[readRate] == detRate) { + config.bitrate = readRate; + return TRUE; + } break; case DEMOD_NRZ: - if (!modread) return TRUE; + detRate = GetNrzClock("",FALSE, FALSE); + if (expected[readRate] == detRate) { + config.bitrate = readRate; + return TRUE; + } break; case DEMOD_BI: - if (modread == 16) return TRUE; + detRate = GetAskClock("",FALSE, FALSE); + if (expected[readRate] == detRate) { + config.bitrate = readRate; + return TRUE; + } break; default: return FALSE; @@ -433,62 +595,59 @@ bool testModulation(uint8_t mode, uint8_t modread){ bool test(uint8_t mode, uint8_t *offset){ - if ( !DemodBufferLen) - return FALSE; - if ( PackBits(0, 32, DemodBuffer) == 0x00 ) - return FALSE; - for (uint8_t idx=1; idx<33; idx++){ - uint8_t si = idx; + 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 - 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 + // 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; //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) continue; - //if extended mode - if ( (safer == 0x6 || safer == 0x9) && extend) extMode = TRUE; + 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; + if (!testBitRate(bitRate, mode)) continue; + 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 ( config.offset + 32 > DemodBufferLen){ - PrintAndLog("The configured offset is too big. (%d > %d)", config.offset, DemodBufferLen); + + if ( !DemodBufferLen) return; + + if ( endpos > DemodBufferLen){ + PrintAndLog("The configured offset %d is too big. Possible offset: %d)", i, DemodBufferLen-32); return; } - - int i = config.offset; - int pos = 32 + config.offset; - for (; i < pos; ++i) + + for (; i < endpos; ++i) bits[i - config.offset]=DemodBuffer[i]; - + blockData = PackBits(0, 32, bits); PrintAndLog("0x%08X %s [%s]", blockData, sprint_bin(bits,32), demodStr); } @@ -500,23 +659,24 @@ int special(const char *Cmd) { PrintAndLog("[OFFSET] [DATA] [BINARY]"); PrintAndLog("----------------------------------------------------"); int i,j = 0; - for (; j < 128; ++j){ + for (; j < 64; ++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)); + + PrintAndLog("[%02d] 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("Bit Rate : %s", GetBitRateStr(b.bitrate) ); + PrintAndLog("Inverted : %s", (b.inverted) ? "Yes" : "No" ); PrintAndLog("Offset : %d", b.offset); - PrintAndLog("Block0 : %08X", b.block0); + PrintAndLog("Block0 : 0x%08X", b.block0); PrintAndLog(""); } @@ -540,16 +700,14 @@ int CmdT55xxWriteBlock(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) { @@ -568,29 +726,17 @@ int CmdT55xxReadTrace(const char *Cmd) if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') return usage_t55xx_trace(); - if ( strlen(Cmd)==0){ + if (strlen(Cmd)==0) + AquireData( TRACE_BLOCK ); - UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}}; - SendCommand(&c); - if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) { - PrintAndLog("command execution time out"); - return 1; - } + if (!DecodeT55xxBlock()) return 1; - uint8_t got[12000]; - GetFromBigBuf(got,sizeof(got),0); - WaitForResponse(CMD_ACK,NULL); - setGraphBuf(got, 12000); - } - - DecodeT55xxBlock(); - - if ( !DemodBufferLen) - return 2; + if ( !DemodBufferLen) return 1; RepaintGraphWindow(); uint8_t repeat = 0; - if (config.offset > 5) repeat = 32; + 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); @@ -624,6 +770,9 @@ int CmdT55xxReadTrace(const char *Cmd) 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 @@ -652,39 +801,16 @@ int CmdT55xxInfo(const char *Cmd){ */ char cmdp = param_getchar(Cmd, 0); - if (cmdp == 'h' || cmdp == 'H') + if (strlen(Cmd) > 1 || 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; - - //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; - } - - uint8_t got[12000]; - GetFromBigBuf(got,sizeof(got),0); - WaitForResponse(CMD_ACK,NULL); - setGraphBuf(got, 12000); - } + if (strlen(Cmd)==0) + AquireData( CONFIGURATION_BLOCK ); - DecodeT55xxBlock(); + if (!DecodeT55xxBlock()) return 1; + + if ( !DemodBufferLen) return 1; - if ( !DemodBufferLen) - return 2; - - uint8_t si = config.offset; uint32_t bl0 = PackBits(si, 32, DemodBuffer); @@ -711,7 +837,7 @@ int CmdT55xxInfo(const char *Cmd){ PrintAndLog(" Data bit rate : %s", GetBitRateStr(dbr)); PrintAndLog(" eXtended mode : %s", (extend) ? "Yes - Warning":"No"); PrintAndLog(" Modulation : %s", GetModulationStr(datamod)); - PrintAndLog(" PSK clock freq : %d", pskcf); + 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); @@ -759,6 +885,39 @@ int CmdT55xxDump(const char *Cmd){ return 0; } +int AquireData( uint8_t block ){ + + 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; + + //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; + } + + 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]; char *retStr = buf; @@ -796,7 +955,7 @@ char * GetBitRateStr(uint32_t id){ } char * GetSaferStr(uint32_t id){ - static char buf[40]; + static char buf[40]; char *retStr = buf; sprintf(retStr,"%d",id); @@ -810,7 +969,7 @@ char * GetSaferStr(uint32_t id){ return buf; } char * GetModulationStr( uint32_t id){ - static char buf[40]; + static char buf[40]; char *retStr = buf; switch (id){ @@ -844,6 +1003,9 @@ char * GetModulationStr( uint32_t id){ case 16: sprintf(retStr,"%d - Biphase",id); break; + case 0x18: + sprintf(retStr,"%d - Biphase a - AKA Conditional Dephase Encoding(CDP)",id); + break; case 17: sprintf(retStr,"%d - Reserved",id); break; @@ -866,27 +1028,45 @@ char * GetModelStrFromCID(uint32_t cid){ char * GetSelectedModulationStr( uint8_t id){ - static char buf[16]; + static char buf[16]; char *retStr = buf; - + switch (id){ case DEMOD_FSK: - sprintf(retStr,"FSK (%d)",id); + sprintf(retStr,"FSK"); + break; + case DEMOD_FSK1: + sprintf(retStr,"FSK1"); + break; + case DEMOD_FSK1a: + sprintf(retStr,"FSK1a"); + break; + case DEMOD_FSK2: + sprintf(retStr,"FSK2"); + break; + case DEMOD_FSK2a: + sprintf(retStr,"FSK2a"); break; case DEMOD_ASK: - sprintf(retStr,"ASK (%d)",id); + sprintf(retStr,"ASK"); break; case DEMOD_NRZ: - sprintf(retStr,"DIRECT/NRZ (%d)",id); + sprintf(retStr,"DIRECT/NRZ"); break; case DEMOD_PSK1: - sprintf(retStr,"PSK1 (%d)",id); + sprintf(retStr,"PSK1"); break; case DEMOD_PSK2: - sprintf(retStr,"PSK2 (%d)",id); + sprintf(retStr,"PSK2"); + break; + case DEMOD_PSK3: + sprintf(retStr,"PSK3"); break; case DEMOD_BI: - sprintf(retStr,"BIPHASE (%d)",id); + sprintf(retStr,"BIPHASE"); + break; + case DEMOD_BIa: + sprintf(retStr,"BIPHASEa - (CDP)"); break; default: sprintf(retStr,"(Unknown)"); @@ -899,27 +1079,27 @@ uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){ int i = start; int j = len-1; - if (len > 32) { - return 0; - } - uint32_t tmp = 0; - for (; j >= 0; --j, ++i){ + + if (len > 32) return 0; + + uint32_t tmp = 0; + for (; j >= 0; --j, ++i) tmp |= bits[i] << j; - } + return tmp; } static command_t CommandTable[] = { {"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."}, + {"config", CmdT55xxSetConfig, 1, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"}, + {"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, "Shows how a datablock changes with 32 different offsets"}, + {"special", special, 0, "Show block changes with 64 different offsets"}, {NULL, NULL, 0, NULL} };