X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/83a42ef965b5d04ae98cce58103b6201b6155d6c..2c5ed706511e60aacc291bc4c47d0efe1892596c:/client/cmdlft55xx.c diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c index 61c8ec2b..aec47dc0 100644 --- a/client/cmdlft55xx.c +++ b/client/cmdlft55xx.c @@ -26,53 +26,20 @@ #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; - -// Default configuration: FSK, not inversed. -t55xx_conf_block config = {0x00, FALSE, 0x00}; - - // FSK - // FSK inverted - //FSKrawDemod("", FALSE) - //FSKrawDemod("1", FALSE) - - // ASK/MAN - // ASK/MAN inverted - //ASKmanDemod("", FALSE, FALSE) - - // NZR (autoclock, normal, maxerrors 1) - // NZR (autoclock, inverse, maxerrors 1) - //NRZrawDemod("0 0 1", FALSE) ) { - - // PSK (autoclock, normal, maxerrors 1) - // PSK (autoclock, inverse, maxerrors 1) - //PSKDemod("0 0 1", FALSE) +// Default configuration: ASK, not inversed. +t55xx_conf_block_t config = { .modulation = 2, .inversed = FALSE, .block0 = 0x00}; int usage_t55xx_config(){ - PrintAndLog("Usage: lf t55xx config [d ] [i 0|1]"); + PrintAndLog("Usage: lf t55xx config [d ] [i 1]"); PrintAndLog("Options: "); - PrintAndLog(" h This help"); - PrintAndLog(" d <> Set demodulation FSK / ASK / PSK / NZR"); - PrintAndLog(" i [0|1] Inverse data signal, Default: 0"); + 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 "); - PrintAndLog(" FSK demodulation"); - PrintAndLog(" lf t55xx config d FSK i 1"); - PrintAndLog(" FSK demodulation, inverse data"); - PrintAndLog(" lf dump"); - PrintAndLog(" Dumps all block from tag"); - PrintAndLog(" lf trace"); - PrintAndLog(" Read trace block and decode it"); - PrintAndLog(" lf info"); - PrintAndLog(" Read configuration and decode it"); + 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(){ @@ -80,8 +47,9 @@ int usage_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; } @@ -91,35 +59,48 @@ 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("Examples:"); + PrintAndLog(" lf t55xx dump"); + PrintAndLog(" lf t55xx dump feedbeef"); PrintAndLog(""); - PrintAndLog(" sample: lf t55xx dump"); - PrintAndLog(" : lf t55xx dump feedbeef"); + 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; } @@ -127,25 +108,66 @@ int usage_t55xx_dump(){ static int CmdHelp(const char *Cmd); int CmdT55xxSetConfig(const char *Cmd){ + + int len = 0; + int foundModulation = 2; + bool inverse = FALSE; + bool errors = FALSE; + uint8_t cmdp = 0; + char modulation[4] = {0x00}; - uint8_t paramNum =0; - if(param_getchar(Cmd, paramNum) == 'h') + while(param_getchar(Cmd, cmdp) != 0x00 && !errors) { - return usage_t55xx_config(); + 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) + foundModulation = 1; + else if ( strcmp(modulation, "ASK" ) == 0) + foundModulation = 2; + else if ( strcmp(modulation, "PSK" ) == 0) + foundModulation = 3; + else if ( strcmp(modulation, "NZ" ) == 0) + foundModulation = 4; + else if ( strcmp(modulation, "BI" ) == 0) + foundModulation = 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; + } } - - uint8_t buff[] = { 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, - 0x01, 0x40, 0x01, 0x01, 0x04 }; - PrintAndLog("CRC-8: %x",CRC8Maxim(buff, 13)); - - //config = { 0, FALSE}; + // No args + if (cmdp == 0) { + printConfiguration( config ); + return 0; + } + //Validations + if (errors) + return usage_t55xx_config(); + + config.modulation = foundModulation; + config.inversed = inverse; + config.block0 = 0; return 0; } -// detect configuration? - -int CmdReadBlk(const char *Cmd) +int CmdT55xxReadBlock(const char *Cmd) { int block = -1; int password = 0xFFFFFFFF; //default to blank Block 7 @@ -156,10 +178,9 @@ int CmdReadBlk(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"); @@ -184,50 +205,183 @@ int CmdReadBlk(const char *Cmd) uint8_t got[12000]; GetFromBigBuf(got,sizeof(got),0); WaitForResponse(CMD_ACK,NULL); - setGraphBuf(got, 12000); - if (block == 0){ - // try a detection. - + DecodeT55xxBlock(); + printT55xxBlock(""); + return 0; +} + +void DecodeT55xxBlock(){ + + char buf[6] = {0x00}; + char *cmdStr = buf; + + // clearing the DemodBuffer. + DemodBufferLen = 0x00; + + // 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); + 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(); - if (CmdDetectClockRate("f")){ //wave is almost certainly FSK - //call FSK DEMOD - // FSK - if ( FSKrawDemod("", FALSE)) - printT55xx("FSK"); - // FSK inverted - if ( FSKrawDemod("1", FALSE)) - printT55xx("FSK inv"); + // 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 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 = DEMOD_FSK; + tests[hits].inversed = FALSE; + ++hits; + } + if ( FSKrawDemod("0 1", FALSE) && test()) { + tests[hits].modulation = DEMOD_FSK; + tests[hits].inversed = TRUE; + ++hits; + } } else { - // ASK/MAN (autoclock, normal, maxerrors 1) - if ( ASKmanDemod("0 0 1", FALSE, FALSE) ) - printT55xx("ASK/MAN"); + if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test()) { + tests[hits].modulation = DEMOD_ASK; + tests[hits].inversed = FALSE; + ++hits; + } + + if ( ASKmanDemod("0 1 1", FALSE, FALSE) && test()) { + tests[hits].modulation = DEMOD_ASK; + tests[hits].inversed = TRUE; + ++hits; + } + + if ( NRZrawDemod("0 0 1", FALSE) && test()) { + tests[hits].modulation = DEMOD_NZR; + tests[hits].inversed = FALSE; + ++hits; + } + + if ( NRZrawDemod("0 1 1", FALSE) && test()) { + tests[hits].modulation = DEMOD_NZR; + tests[hits].inversed = TRUE; + ++hits; + } - // ASK/MAN (autoclock, inverted, maxerrors 1) - if ( ASKmanDemod("0 1 1", FALSE, FALSE) ) - printT55xx("ASK/MAN Inv"); - - // NZR (autoclock, normal, maxerrors 1) - if ( NRZrawDemod("0 0 1", FALSE) ) - printT55xx("NZR"); - // NZR (autoclock, inverted, maxerrors 1) - if ( NRZrawDemod("0 1 1", FALSE) ) - printT55xx("NZR inv"); + if ( PSKDemod("0 0 1", FALSE) >= 0 && test()) { + tests[hits].modulation = DEMOD_PSK; + tests[hits].inversed = FALSE; + ++hits; + } - // PSK (autoclock, normal, maxerrors 1) - if (!PSKDemod("0 0 1", FALSE)) - printT55xx("PSK"); + if ( PSKDemod("0 1 1", FALSE) >= 0 && test()) { + tests[hits].modulation = DEMOD_PSK; + tests[hits].inversed = TRUE; + ++hits; + } + //PSK2? + // if (!BiphaseRawDecode("0",FALSE) && test()) { + // tests[++hits].modulation = DEMOD_BI; + // tests[hits].inversed = FALSE; + //} + // if (!BiphaseRawDecode("1",FALSE) && test()) { + // tests[++hits].modulation = DEMOD_BI; + // tests[hits].inversed = TRUE; + // } + } + if ( hits == 1) { + config.modulation = tests[0].modulation; + config.inversed = tests[0].inversed; + printConfiguration( config ); + 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; } - return 0; + if ( resv== 0x00) return TRUE; + return FALSE; } -void printT55xx(const char *demodStr){ +void printT55xxBlock(const char *demodStr){ uint32_t blockData = 0; uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00}; @@ -240,24 +394,17 @@ void printT55xx(const char *demodStr){ bits[i]=DemodBuffer[i]; blockData = PackBits(1, 32, bits); - PrintAndLog("0x%08X %s [%s]", blockData, sprint_bin(bits+1,32), demodStr ); + PrintAndLog("0x%08X %s [%s]", blockData, sprint_bin(bits+1,32), demodStr); +} + +void printConfiguration( t55xx_conf_block_t b){ + PrintAndLog("Modulation : %s", GetSelectedModulationStr(b.modulation) ); + PrintAndLog("Inverted : %s", (b.inversed) ? "Yes" : "No" ); + PrintAndLog("Block0 : %08X", b.block0); + PrintAndLog(""); } -/* -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); -*/ -int CmdWriteBlk(const char *Cmd) +int CmdT55xxWriteBlock(const char *Cmd) { int block = 8; //default to invalid block int data = 0xFFFFFFFF; //default to blank Block @@ -298,16 +445,12 @@ int CmdWriteBlk(const char *Cmd) return 0; } -int CmdReadTrace(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){ @@ -317,29 +460,35 @@ int CmdReadTrace(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); - - 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 ----------------------------------"); @@ -349,14 +498,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 1 : 0x%08X %s", bl1, sprint_bin(DemodBuffer+37,32) ); PrintAndLog("-------------------------------------------------------------"); /* TRACE - BLOCK O @@ -378,7 +527,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 @@ -386,33 +535,56 @@ int CmdInfo(const char *Cmd){ */ char cmdp = param_getchar(Cmd, 0); - if (cmdp == 'h' || cmdp == 'H') { + if (cmdp == 'h' || cmdp == 'H') return usage_t55xx_info(); - } else { - CmdReadBlk("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; + // } - // config + 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); + } - uint8_t bits[LF_BITSSTREAM_LEN] = {0x00}; + DecodeT55xxBlock(); + if ( !DemodBufferLen) + return 2; + + 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 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; + 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 --------------------"); @@ -421,25 +593,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}; @@ -465,7 +637,7 @@ int CmdDump(const char *Cmd){ } else { sprintf(s,"%d", i); } - CmdReadBlk(s); + CmdT55xxReadBlock(s); } return 0; } @@ -512,10 +684,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; @@ -565,6 +737,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; @@ -583,11 +783,12 @@ static command_t CommandTable[] = { {"help", CmdHelp, 1, "This help"}, {"config", CmdT55xxSetConfig, 1, "Set T55XX config for modulation, inversed data"}, - {"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]"}, + {"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} };