X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/b891758968ea76912c84a75b38e37dfdecaee23b..c631b1a216099f929a15193ec5841d980e8be8d0:/client/cmdlft55xx.c
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 10461754..1b005d96 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -6,29 +6,7 @@
//-----------------------------------------------------------------------------
// Low frequency T55xx commands
//-----------------------------------------------------------------------------
-
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
-//#include <time.h>
-#include "proxmark3.h"
-#include "ui.h"
-#include "graph.h"
-#include "cmdmain.h"
-#include "cmdparser.h"
-#include "cmddata.h"
-#include "cmdlf.h"
#include "cmdlft55xx.h"
-#include "util.h"
-#include "data.h"
-#include "lfdemod.h"
-#include "cmdhf14a.h"
-
-#define T55x7_CONFIGURATION_BLOCK 0x00
-#define T55x7_PAGE0 0x00
-#define T55x7_PAGE1 0x01
-#define T55x7_PWD 0x00000010
-#define REGULAR_READ_MODE_BLOCK 0xFF
// Default configuration
t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inverted = FALSE, .offset = 0x00, .block0 = 0x00, .Q5 = FALSE };
@@ -43,12 +21,13 @@ void Set_t55xx_Config(t55xx_conf_block_t conf){
int usage_t55xx_config(){
PrintAndLog("Usage: lf t55xx config [d <demodulation>] [i 1] [o <offset>] [Q5]");
PrintAndLog("Options:");
- PrintAndLog(" h This help");
- PrintAndLog(" b <8|16|32|40|50|64|100|128> Set bitrate");
- PrintAndLog(" d <FSK|FSK1|FSK1a|FSK2|FSK2a|ASK|PSK1|PSK2|NRZ|BI|BIa> Set demodulation FSK / ASK / PSK / NRZ / 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(" Q5 Set as Q5(T5555) chip instead of T55x7");
+ PrintAndLog(" h - This help");
+ PrintAndLog(" b <8|16|32|40|50|64|100|128> - Set bitrate");
+ PrintAndLog(" d <FSK|FSK1|FSK1a|FSK2|FSK2a|ASK|PSK1|PSK2|NRZ|BI|BIa> - Set demodulation FSK / ASK / PSK / NRZ / 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(" Q5 - Set as Q5(T5555) chip instead of T55x7");
+ PrintAndLog(" ST - Set Sequence Terminator on");
PrintAndLog("");
PrintAndLog("Examples:");
PrintAndLog(" lf t55xx config d FSK - FSK demodulation");
@@ -92,7 +71,7 @@ int usage_t55xx_write(){
int usage_t55xx_trace() {
PrintAndLog("Usage: lf t55xx trace [1]");
PrintAndLog("Options:");
- PrintAndLog(" [graph buffer data] - if set, use Graphbuffer otherwise read data from tag.");
+ PrintAndLog(" 1 - if set, use Graphbuffer otherwise read data from tag.");
PrintAndLog("");
PrintAndLog("Examples:");
PrintAndLog(" lf t55xx trace");
@@ -103,7 +82,7 @@ int usage_t55xx_trace() {
int usage_t55xx_info() {
PrintAndLog("Usage: lf t55xx info [1]");
PrintAndLog("Options:");
- PrintAndLog(" [graph buffer data] - if set, use Graphbuffer otherwise read data from tag.");
+ PrintAndLog(" 1 - if set, use Graphbuffer otherwise read data from tag.");
PrintAndLog("");
PrintAndLog("Examples:");
PrintAndLog(" lf t55xx info");
@@ -150,7 +129,8 @@ int usage_t55xx_wakup(){
int usage_t55xx_bruteforce(){
PrintAndLog("This command uses A) bruteforce to scan a number range");
PrintAndLog(" B) a dictionary attack");
- PrintAndLog("Usage: lf t55xx bruteforce <start password> <end password> [i <*.dic>]");
+ PrintAndLog("press 'enter' to cancel the command");
+ PrintAndLog("Usage: lf t55xx bruteforce [h] <start password> <end password> [i <*.dic>]");
PrintAndLog(" password must be 4 bytes (8 hex symbols)");
PrintAndLog("Options:");
PrintAndLog(" h - this help");
@@ -164,12 +144,28 @@ int usage_t55xx_bruteforce(){
PrintAndLog("");
return 0;
}
-int usage_t55xx_wipe(){
+int usage_t55xx_recoverpw(){
+ PrintAndLog("This command uses a few tricks to try to recover mangled password");
+ PrintAndLog("press 'enter' to cancel the command");
+ PrintAndLog("WARNING: this may brick non-password protected chips!");
+ PrintAndLog("Usage: lf t55xx recoverpw [password]");
+ PrintAndLog(" password must be 4 bytes (8 hex symbols)");
+ PrintAndLog(" default password is 51243648, used by many cloners");
+ PrintAndLog("Options:");
+ PrintAndLog(" h - this help");
+ PrintAndLog(" [password] - 4 byte hex value of password written by cloner");
+ PrintAndLog("");
+ PrintAndLog("Examples:");
+ PrintAndLog(" lf t55xx recoverpw");
+ PrintAndLog(" lf t55xx recoverpw 51243648");
+ PrintAndLog("");
+ return 0;
+}int usage_t55xx_wipe(){
PrintAndLog("Usage: lf t55xx wipe [h] [Q5]");
PrintAndLog("This commands wipes a tag, fills blocks 1-7 with zeros and a default configuration block");
PrintAndLog("Options:");
PrintAndLog(" h - this help");
- PrintAndLog(" Q5 - indicates to use the T555 (Q5) default configuration block");
+ PrintAndLog(" Q5 - indicates to use the T5555 (Q5) default configuration block");
PrintAndLog("");
PrintAndLog("Examples:");
PrintAndLog(" lf t55xx wipe - wipes a t55x7 tag, config block 0x000880E0");
@@ -180,8 +176,8 @@ static int CmdHelp(const char *Cmd);
void printT5xxHeader(uint8_t page){
PrintAndLog("Reading Page %d:", page);
- PrintAndLog("blk | hex data | binary");
- PrintAndLog("----+----------+---------------------------------");
+ PrintAndLog("blk | hex data | binary | ascii");
+ PrintAndLog("----+----------+----------------------------------+-------");
}
int CmdT55xxSetConfig(const char *Cmd) {
@@ -269,6 +265,11 @@ int CmdT55xxSetConfig(const char *Cmd) {
config.Q5 = TRUE;
cmdp++;
break;
+ case 'S':
+ case 's':
+ config.ST = TRUE;
+ cmdp++;
+ break;
default:
PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
errors = TRUE;
@@ -371,6 +372,7 @@ bool DecodeT55xxBlock(){
char buf[30] = {0x00};
char *cmdStr = buf;
int ans = 0;
+ bool ST = config.ST;
uint8_t bitRate[8] = {8,16,32,40,50,64,100,128};
DemodBufferLen = 0x00;
@@ -391,7 +393,7 @@ bool DecodeT55xxBlock(){
break;
case DEMOD_ASK:
snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );
- ans = ASKDemod(cmdStr, FALSE, FALSE, 1);
+ ans = ASKDemod_ext(cmdStr, FALSE, FALSE, 1, &ST);
break;
case DEMOD_PSK1:
// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
@@ -435,6 +437,14 @@ bool DecodeT5555TraceBlock() {
return (bool) ASKDemod("64 0 1", FALSE, FALSE, 1);
}
+// sanity check. Don't use proxmark if it is offline and you didn't specify useGraphbuf
+static int SanityOfflineCheck( bool useGraphBuffer ){
+ if ( !useGraphBuffer && offline) {
+ PrintAndLog("Your proxmark3 device is offline. Specify [1] to use graphbuffer data instead");
+ return 0;
+ }
+ return 1;
+}
int CmdT55xxDetect(const char *Cmd){
bool errors = FALSE;
@@ -467,15 +477,18 @@ int CmdT55xxDetect(const char *Cmd){
}
if (errors) return usage_t55xx_detect();
+ // sanity check.
+ if (!SanityOfflineCheck(useGB)) return 1;
+
if ( !useGB) {
if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, usepwd, password) )
- return 0;
+ return 1;
}
if ( !tryDetectModulation() )
PrintAndLog("Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");
- return 1;
+ return 0;
}
// detect configuration?
@@ -496,6 +509,7 @@ bool tryDetectModulation(){
tests[hits].bitrate = bitRate;
tests[hits].inverted = FALSE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ tests[hits].ST = FALSE;
++hits;
}
if ( FSKrawDemod("0 1", FALSE) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
@@ -507,19 +521,32 @@ bool tryDetectModulation(){
tests[hits].bitrate = bitRate;
tests[hits].inverted = TRUE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ tests[hits].ST = FALSE;
++hits;
}
} else {
clk = GetAskClock("", FALSE, FALSE);
if (clk>0) {
- if ( ASKDemod("0 0 1", FALSE, FALSE, 1) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+ tests[hits].ST = TRUE;
+ // "0 0 1 " == clock auto, invert false, maxError 1.
+ // false = no verbose
+ // false = no emSearch
+ // 1 = Ask/Man
+ // st = true
+ if ( ASKDemod_ext("0 0 1", FALSE, FALSE, 1, &tests[hits].ST) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
tests[hits].modulation = DEMOD_ASK;
tests[hits].bitrate = bitRate;
tests[hits].inverted = FALSE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
++hits;
}
- if ( ASKDemod("0 1 1", FALSE, FALSE, 1) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+ tests[hits].ST = TRUE;
+ // "0 0 1 " == clock auto, invert true, maxError 1.
+ // false = no verbose
+ // false = no emSearch
+ // 1 = Ask/Man
+ // st = true
+ if ( ASKDemod_ext("0 1 1", FALSE, FALSE, 1, &tests[hits].ST) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
tests[hits].modulation = DEMOD_ASK;
tests[hits].bitrate = bitRate;
tests[hits].inverted = TRUE;
@@ -531,6 +558,7 @@ bool tryDetectModulation(){
tests[hits].bitrate = bitRate;
tests[hits].inverted = FALSE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ tests[hits].ST = FALSE;
++hits;
}
if ( ASKbiphaseDemod("0 0 1 2", FALSE) && test(DEMOD_BIa, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {
@@ -538,6 +566,7 @@ bool tryDetectModulation(){
tests[hits].bitrate = bitRate;
tests[hits].inverted = TRUE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ tests[hits].ST = FALSE;
++hits;
}
}
@@ -550,6 +579,7 @@ bool tryDetectModulation(){
tests[hits].bitrate = bitRate;
tests[hits].inverted = FALSE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ tests[hits].ST = FALSE;
++hits;
}
@@ -558,6 +588,7 @@ bool tryDetectModulation(){
tests[hits].bitrate = bitRate;
tests[hits].inverted = TRUE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ tests[hits].ST = FALSE;
++hits;
}
}
@@ -573,6 +604,7 @@ bool tryDetectModulation(){
tests[hits].bitrate = bitRate;
tests[hits].inverted = FALSE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ tests[hits].ST = FALSE;
++hits;
}
if ( PSKDemod("0 1 6", FALSE) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
@@ -580,6 +612,7 @@ bool tryDetectModulation(){
tests[hits].bitrate = bitRate;
tests[hits].inverted = TRUE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ tests[hits].ST = FALSE;
++hits;
}
// PSK2 - needs a call to psk1TOpsk2.
@@ -590,6 +623,7 @@ bool tryDetectModulation(){
tests[hits].bitrate = bitRate;
tests[hits].inverted = FALSE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ tests[hits].ST = FALSE;
++hits;
}
} // inverse waves does not affect this demod
@@ -601,6 +635,7 @@ bool tryDetectModulation(){
tests[hits].bitrate = bitRate;
tests[hits].inverted = FALSE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ tests[hits].ST = FALSE;
++hits;
}
} // inverse waves does not affect this demod
@@ -615,17 +650,51 @@ bool tryDetectModulation(){
config.offset = tests[0].offset;
config.block0 = tests[0].block0;
config.Q5 = tests[0].Q5;
+ config.ST = tests[0].ST;
printConfiguration( config );
return TRUE;
}
+ bool retval = FALSE;
if ( hits > 1) {
PrintAndLog("Found [%d] possible matches for modulation.",hits);
for(int i=0; i<hits; ++i){
- PrintAndLog("--[%d]---------------", i+1);
+ retval = testKnownConfigBlock(tests[i].block0);
+ if ( retval ) {
+ PrintAndLog("--[%d]--------------- << selected this", i+1);
+ config.modulation = tests[i].modulation;
+ config.bitrate = tests[i].bitrate;
+ config.inverted = tests[i].inverted;
+ config.offset = tests[i].offset;
+ config.block0 = tests[i].block0;
+ config.Q5 = tests[i].Q5;
+ config.ST = tests[i].ST;
+ } else {
+ PrintAndLog("--[%d]---------------", i+1);
+ }
printConfiguration( tests[i] );
}
}
+ return retval;
+}
+
+bool testKnownConfigBlock(uint32_t block0) {
+ switch(block0){
+ case T55X7_DEFAULT_CONFIG_BLOCK:
+ case T55X7_RAW_CONFIG_BLOCK:
+ case T55X7_EM_UNIQUE_CONFIG_BLOCK:
+ case T55X7_FDXB_CONFIG_BLOCK:
+ case T55X7_HID_26_CONFIG_BLOCK:
+ case T55X7_PYRAMID_CONFIG_BLOCK:
+ case T55X7_INDALA_64_CONFIG_BLOCK:
+ case T55X7_INDALA_224_CONFIG_BLOCK:
+ case T55X7_GUARDPROXII_CONFIG_BLOCK:
+ case T55X7_VIKING_CONFIG_BLOCK:
+ case T55X7_NORALYS_CONFIG_BLOCK:
+ case T55X7_IOPROX_CONFIG_BLOCK:
+ case T55X7_PRESCO_CONFIG_BLOCK:
+ return TRUE;
+ }
return FALSE;
}
@@ -767,14 +836,14 @@ bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5)
uint8_t extend = PackBits(si, 1, DemodBuffer); si += 1; //bit 15 extended mode
uint8_t modread = PackBits(si, 5, DemodBuffer); si += 5+2+1;
//uint8_t pskcr = PackBits(si, 2, DemodBuffer); si += 2+1; //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;
+ //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;
+ if (xtRate) continue; //nml01 || nml02 || caused issues on noralys tags
}
//test modulation
if (!testModulation(mode, modread)) continue;
@@ -809,16 +878,18 @@ void printT55xxBlock(const char *blockNum){
bits[i - config.offset] = DemodBuffer[i];
blockData = PackBits(0, 32, bits);
+ uint8_t bytes[4] = {0};
+ num_to_bytes(blockData, 4, bytes);
- PrintAndLog(" %s | %08X | %s", blockNum, blockData, sprint_bin(bits,32));
+ PrintAndLog(" %s | %08X | %s | %s", blockNum, blockData, sprint_bin(bits,32), sprint_ascii(bytes,4));
}
int special(const char *Cmd) {
uint32_t blockData = 0;
uint8_t bits[32] = {0x00};
- PrintAndLog("OFFSET | DATA | BINARY");
- PrintAndLog("----------------------------------------------------");
+ PrintAndLog("OFFSET | DATA | BINARY | ASCII");
+ PrintAndLog("-------+-------+-------------------------------------+------");
int i,j = 0;
for (; j < 64; ++j){
@@ -838,6 +909,7 @@ int printConfiguration( t55xx_conf_block_t b){
PrintAndLog("Bit Rate : %s", GetBitRateStr(b.bitrate) );
PrintAndLog("Inverted : %s", (b.inverted) ? "Yes" : "No" );
PrintAndLog("Offset : %d", b.offset);
+ PrintAndLog("Seq. Term. : %s", (b.ST) ? "Yes" : "No" );
PrintAndLog("Block0 : 0x%08X", b.block0);
PrintAndLog("");
return 0;
@@ -937,7 +1009,7 @@ int CmdT55xxWriteBlock(const char *Cmd) {
}
clearCommandBuffer();
SendCommand(&c);
- if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)){
+ if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)){
PrintAndLog("Error occurred, device did not ACK write operation. (May be due to old firmware)");
return 0;
}
@@ -950,18 +1022,21 @@ int CmdT55xxReadTrace(const char *Cmd) {
uint32_t password = 0;
if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') return usage_t55xx_trace();
- if (strlen(Cmd)==0)
+ if (strlen(Cmd)==0) {
+ // sanity check.
+ if (!SanityOfflineCheck(FALSE)) return 1;
+
if ( !AquireData( T55x7_PAGE1, REGULAR_READ_MODE_BLOCK, pwdmode, password ) )
- return 0;
+ return 1;
+ }
if ( config.Q5 ){
- if (!DecodeT5555TraceBlock()) return 0;
- }
- else {
- if (!DecodeT55xxBlock()) return 0;
+ if (!DecodeT5555TraceBlock()) return 1;
+ } else {
+ if (!DecodeT55xxBlock()) return 1;
}
- if ( !DemodBufferLen ) return 0;
+ if ( !DemodBufferLen ) return 1;
RepaintGraphWindow();
uint8_t repeat = (config.offset > 5) ? 32 : 0;
@@ -975,7 +1050,7 @@ int CmdT55xxReadTrace(const char *Cmd) {
if (hdr != 0x1FF) {
PrintAndLog("Invalid Q5 Trace data header (expected 0x1FF, found %X)", hdr);
- return 0;
+ return 1;
}
t5555_tracedata_t data = {.bl1 = bl1, .bl2 = bl2, .icr = 0, .lotidc = '?', .lotid = 0, .wafer = 0, .dw =0};
@@ -1009,12 +1084,12 @@ int CmdT55xxReadTrace(const char *Cmd) {
} else {
- t55xx_tracedata_t data = {.bl1 = bl1, .bl2 = bl2, .acl = 0, .mfc = 0, .cid = 0, .year = 0, .quarter = 0, .icr = 0, .lotid = 0, .wafer = 0, .dw = 0};
+ t55x7_tracedata_t data = {.bl1 = bl1, .bl2 = bl2, .acl = 0, .mfc = 0, .cid = 0, .year = 0, .quarter = 0, .icr = 0, .lotid = 0, .wafer = 0, .dw = 0};
data.acl = PackBits(si, 8, DemodBuffer); si += 8;
if ( data.acl != 0xE0 ) {
PrintAndLog("The modulation is most likely wrong since the ACL is not 0xE0. ");
- return 0;
+ return 1;
}
data.mfc = PackBits(si, 8, DemodBuffer); si += 8;
@@ -1033,14 +1108,13 @@ int CmdT55xxReadTrace(const char *Cmd) {
else
data.year += 2010;
-
- printT55xxTrace(data, repeat);
+ printT55x7Trace(data, repeat);
}
return 0;
}
-void printT55xxTrace( t55xx_tracedata_t data, uint8_t repeat ){
- PrintAndLog("-- T55xx Trace Information ----------------------------------");
+void printT55x7Trace( t55x7_tracedata_t data, uint8_t repeat ){
+ PrintAndLog("-- T55x7 Trace Information ----------------------------------");
PrintAndLog("-------------------------------------------------------------");
PrintAndLog(" ACL Allocation class (ISO/IEC 15963-1) : 0x%02X (%d)", data.acl, data.acl);
PrintAndLog(" MFC Manufacturer ID (ISO/IEC 7816-6) : 0x%02X (%d) - %s", data.mfc, data.mfc, getTagInfo(data.mfc));
@@ -1074,6 +1148,7 @@ void printT55xxTrace( t55xx_tracedata_t data, uint8_t repeat ){
18-32 DW, die number sequential
*/
}
+
void printT5555Trace( t5555_tracedata_t data, uint8_t repeat ){
PrintAndLog("-- T5555 (Q5) Trace Information -----------------------------");
PrintAndLog("-------------------------------------------------------------");
@@ -1101,6 +1176,7 @@ void printT5555Trace( t5555_tracedata_t data, uint8_t repeat ){
*/
}
+//need to add Q5 info...
int CmdT55xxInfo(const char *Cmd){
/*
Page 0 Block 0 Configuration data.
@@ -1113,9 +1189,13 @@ int CmdT55xxInfo(const char *Cmd){
if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') return usage_t55xx_info();
- if (strlen(Cmd)==0)
+ if (strlen(Cmd)==0){
+ // sanity check.
+ if (!SanityOfflineCheck(FALSE)) return 1;
+
if ( !AquireData( T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, pwdmode, password ) )
return 1;
+ }
if (!DecodeT55xxBlock()) return 1;
@@ -1144,7 +1224,7 @@ int CmdT55xxInfo(const char *Cmd){
if (config.Q5) PrintAndLog("*** Warning *** Config Info read off a Q5 will not display as expected");
PrintAndLog("");
- PrintAndLog("-- T55xx Configuration & Tag Information --------------------");
+ PrintAndLog("-- T55x7 Configuration & Tag Information --------------------");
PrintAndLog("-------------------------------------------------------------");
PrintAndLog(" Safer key : %s", GetSaferStr(safer));
PrintAndLog(" reserved : %d", resv);
@@ -1195,21 +1275,26 @@ int CmdT55xxDump(const char *Cmd){
int AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password ){
// arg0 bitmodes:
- // bit0 = pwdmode
- // bit1 = page to read from
+ // bit0 = pwdmode
+ // bit1 = page to read from
+ // arg1: which block to read
+ // arg2: password
uint8_t arg0 = (page<<1) | pwdmode;
UsbCommand c = {CMD_T55XX_READ_BLOCK, {arg0, block, password}};
-
clearCommandBuffer();
SendCommand(&c);
- if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {
+ if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500) ) {
PrintAndLog("command execution time out");
return 0;
}
- uint8_t got[12000];
- GetFromBigBuf(got,sizeof(got),0);
- WaitForResponse(CMD_ACK,NULL);
+ //uint8_t got[12288];
+ uint8_t got[7679];
+ GetFromBigBuf(got, sizeof(got), 0);
+ if ( !WaitForResponseTimeout(CMD_ACK, NULL, 8000) ) {
+ PrintAndLog("command execution time out");
+ return 0;
+ }
setGraphBuf(got, sizeof(got));
return 1;
}
@@ -1325,10 +1410,9 @@ void t55x7_create_config_block( int tagtype ){
int CmdResetRead(const char *Cmd) {
UsbCommand c = {CMD_T55XX_RESET_READ, {0,0,0}};
-
clearCommandBuffer();
SendCommand(&c);
- if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {
+ if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500) ) {
PrintAndLog("command execution time out");
return 0;
}
@@ -1352,11 +1436,10 @@ int CmdT55xxWipe(const char *Cmd) {
// With a pwd should work even if pwd bit not set
PrintAndLog("\nBeginning Wipe of a T55xx tag (assuming the tag is not password protected)\n");
- if ( Q5 ){
+ if ( Q5 )
snprintf(ptrData,sizeof(writeData),"b 0 d 6001F004 p 0");
- } else {
+ else
snprintf(ptrData,sizeof(writeData),"b 0 d 000880E0 p 0");
- }
if (!CmdT55xxWriteBlock(ptrData)) PrintAndLog("Error writing blk 0");
@@ -1371,26 +1454,35 @@ int CmdT55xxWipe(const char *Cmd) {
return 0;
}
+bool IsCancelled(void) {
+ if (ukbhit()) {
+ int ch = getchar();
+ (void)ch;
+ printf("\naborted via keyboard!\n");
+ return TRUE;
+ }
+ return FALSE;
+}
+
int CmdT55xxBruteForce(const char *Cmd) {
// load a default pwd file.
- char buf[9];
+ char line[9];
char filename[FILE_PATH_SIZE]={0};
int keycnt = 0;
uint8_t stKeyBlock = 20;
- uint8_t *keyBlock = NULL, *p;
- keyBlock = calloc(stKeyBlock, 6);
- if (keyBlock == NULL) return 1;
-
+ uint8_t *keyBlock = NULL, *p = NULL;
uint32_t start_password = 0x00000000; //start password
uint32_t end_password = 0xFFFFFFFF; //end password
bool found = false;
+ memset(line, 0, sizeof(line));
+
char cmdp = param_getchar(Cmd, 0);
- if (cmdp == 'h' || cmdp == 'H') {
- free(keyBlock);
- return usage_t55xx_bruteforce();
- }
+ if (cmdp == 'h' || cmdp == 'H') return usage_t55xx_bruteforce();
+
+ keyBlock = calloc(stKeyBlock, 4);
+ if (keyBlock == NULL) return 1;
if (cmdp == 'i' || cmdp == 'I') {
@@ -1398,46 +1490,52 @@ int CmdT55xxBruteForce(const char *Cmd) {
if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
memcpy(filename, Cmd+2, len);
- FILE * f = fopen( filename , "r");
-
+ FILE * f = fopen( filename , "r");
if ( !f ) {
PrintAndLog("File: %s: not found or locked.", filename);
free(keyBlock);
return 1;
}
-
- while( fgets(buf, sizeof(buf), f) ){
- if (strlen(buf) < 8 || buf[7] == '\n') continue;
- while (fgetc(f) != '\n' && !feof(f)) ; //goto next line
-
+ while( fgets(line, sizeof(line), f) ){
+ if (strlen(line) < 8 || line[7] == '\n') continue;
+
+ //goto next line
+ while (fgetc(f) != '\n' && !feof(f)) ;
+
//The line start with # is comment, skip
- if( buf[0]=='#' ) continue;
+ if( line[0]=='#' ) continue;
- if (!isxdigit(buf[0])){
- PrintAndLog("File content error. '%s' must include 8 HEX symbols", buf);
+ if (!isxdigit(line[0])) {
+ PrintAndLog("File content error. '%s' must include 8 HEX symbols", line);
continue;
}
- buf[8] = 0;
-
+ line[8] = 0;
+
+ // realloc keyblock array size.
if ( stKeyBlock - keycnt < 2) {
- p = realloc(keyBlock, 6*(stKeyBlock+=10));
+ p = realloc(keyBlock, 4 * (stKeyBlock += 10));
if (!p) {
PrintAndLog("Cannot allocate memory for defaultKeys");
free(keyBlock);
- fclose(f);
+ if (f)
+ fclose(f);
return 2;
}
keyBlock = p;
}
+ // clear mem
memset(keyBlock + 4 * keycnt, 0, 4);
- num_to_bytes(strtoll(buf, NULL, 16), 4, keyBlock + 4*keycnt);
- PrintAndLog("chk custom pwd[%2d] %08X", keycnt, bytes_to_num(keyBlock + 4*keycnt, 4));
- keycnt++;
- memset(buf, 0, sizeof(buf));
+
+ num_to_bytes( strtoll(line, NULL, 16), 4, keyBlock + 4*keycnt);
+
+ PrintAndLog("chk custom pwd[%2d] %08X", keycnt, bytes_to_num(keyBlock + 4 * keycnt, 4) );
+ keycnt++;
+ memset(line, 0, sizeof(line));
}
- fclose(f);
+ if (f)
+ fclose(f);
if (keycnt == 0) {
PrintAndLog("No keys found in file");
@@ -1449,39 +1547,37 @@ int CmdT55xxBruteForce(const char *Cmd) {
// loop
uint64_t testpwd = 0x00;
for (uint16_t c = 0; c < keycnt; ++c ) {
-
- if (ukbhit()) {
- getchar();
- printf("\naborted via keyboard!\n");
+
+ if ( offline ) {
+ printf("Device offline\n");
+ free(keyBlock);
+ return 2;
+ }
+
+ if (IsCancelled()) {
free(keyBlock);
- free(p);
return 0;
}
testpwd = bytes_to_num(keyBlock + 4*c, 4);
PrintAndLog("Testing %08X", testpwd);
-
-
+
if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, testpwd)) {
- PrintAndLog("Aquireing data from device failed. Quitting");
+ PrintAndLog("Acquire data from device failed. Quitting");
free(keyBlock);
- free(p);
return 0;
}
found = tryDetectModulation();
-
if ( found ) {
PrintAndLog("Found valid password: [%08X]", testpwd);
- free(keyBlock);
- free(p);
- return 0;
+ //free(keyBlock);
+ //return 0;
}
}
PrintAndLog("Password NOT found.");
free(keyBlock);
- free(p);
return 0;
}
@@ -1504,15 +1600,14 @@ int CmdT55xxBruteForce(const char *Cmd) {
printf(".");
fflush(stdout);
- if (ukbhit()) {
- getchar();
- printf("\naborted via keyboard!\n");
+
+ if (IsCancelled()) {
free(keyBlock);
return 0;
}
if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, i)) {
- PrintAndLog("Aquireing data from device failed. Quitting");
+ PrintAndLog("Acquire data from device failed. Quitting");
free(keyBlock);
return 0;
}
@@ -1533,29 +1628,118 @@ int CmdT55xxBruteForce(const char *Cmd) {
return 0;
}
+int tryOnePassword(uint32_t password) {
+ PrintAndLog("Trying password %08x", password);
+ if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, password)) {
+ PrintAndLog("Acquire data from device failed. Quitting");
+ return -1;
+ }
+
+ if (tryDetectModulation())
+ return 1;
+ else
+ return 0;
+}
+
+int CmdT55xxRecoverPW(const char *Cmd) {
+ int bit = 0;
+ uint32_t orig_password = 0x0;
+ uint32_t curr_password = 0x0;
+ uint32_t prev_password = 0xffffffff;
+ uint32_t mask = 0x0;
+ int found = 0;
+ char cmdp = param_getchar(Cmd, 0);
+ if (cmdp == 'h' || cmdp == 'H') return usage_t55xx_recoverpw();
+
+ orig_password = param_get32ex(Cmd, 0, 0x51243648, 16); //password used by handheld cloners
+
+ // first try fliping each bit in the expected password
+ while (bit < 32) {
+ curr_password = orig_password ^ ( 1 << bit );
+ found = tryOnePassword(curr_password);
+ if (found == -1) return 0;
+ bit++;
+
+ if (IsCancelled()) return 0;
+ }
+
+ // now try to use partial original password, since block 7 should have been completely
+ // erased during the write sequence and it is possible that only partial password has been
+ // written
+ // not sure from which end the bit bits are written, so try from both ends
+ // from low bit to high bit
+ bit = 0;
+ while (bit < 32) {
+ mask += ( 1 << bit );
+ curr_password = orig_password & mask;
+ // if updated mask didn't change the password, don't try it again
+ if (prev_password == curr_password) {
+ bit++;
+ continue;
+ }
+ found = tryOnePassword(curr_password);
+ if (found == -1) return 0;
+ bit++;
+ prev_password = curr_password;
+
+ if (IsCancelled()) return 0;
+ }
+
+ // from high bit to low
+ bit = 0;
+ mask = 0xffffffff;
+ while (bit < 32) {
+ mask -= ( 1 << bit );
+ curr_password = orig_password & mask;
+ // if updated mask didn't change the password, don't try it again
+ if (prev_password == curr_password) {
+ bit++;
+ continue;
+ }
+ found = tryOnePassword(curr_password);
+ if (found == -1)
+ return 0;
+ bit++;
+ prev_password = curr_password;
+
+ if (IsCancelled()) return 0;
+ }
+
+ PrintAndLog("");
+
+ if (found == 1)
+ PrintAndLog("Found valid password: [%08x]", curr_password);
+ else
+ PrintAndLog("Password NOT found.");
+
+ return 0;
+}
+
static command_t CommandTable[] = {
{"help", CmdHelp, 1, "This help"},
- {"bruteforce",CmdT55xxBruteForce,0, "<start password> <end password> [i <*.dic>] Simple bruteforce attack to find password"},
+ {"bruteforce", CmdT55xxBruteForce,0, "<start password> <end password> [i <*.dic>] Simple bruteforce attack to find password"},
{"config", CmdT55xxSetConfig, 1, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"},
{"detect", CmdT55xxDetect, 1, "[1] Try detecting the tag modulation from reading the configuration block."},
{"dump", CmdT55xxDump, 0, "[password] [o] Dump T55xx card block 0-7. Optional [password], [override]"},
{"info", CmdT55xxInfo, 1, "[1] Show T55x7 configuration data (page 0/ blk 0)"},
{"read", CmdT55xxReadBlock, 0, "b <block> p [password] [o] [1] -- Read T55xx block data. Optional [p password], [override], [page1]"},
{"resetread", CmdResetRead, 0, "Send Reset Cmd then lf read the stream to attempt to identify the start of it (needs a demod and/or plot after)"},
+ {"recoverpw", CmdT55xxRecoverPW, 0, "[password] Try to recover from bad password write from a cloner. Only use on PW protected chips!"},
{"special", special, 0, "Show block changes with 64 different offsets"},
{"trace", CmdT55xxReadTrace, 1, "[1] Show T55x7 traceability data (page 1/ blk 0-1)"},
{"wakeup", CmdT55xxWakeUp, 0, "Send AOR wakeup command"},
- {"wipe", CmdT55xxWipe, 0, "Wipe a T55xx tag and set defaults (will destroy any data on tag)"},
+ {"wipe", CmdT55xxWipe, 0, "[q] Wipe a T55xx tag and set defaults (will destroy any data on tag)"},
{"write", CmdT55xxWriteBlock,0, "b <block> d <data> p [password] [1] -- Write T55xx block data. Optional [p password], [page1]"},
{NULL, NULL, 0, NULL}
};
int CmdLFT55XX(const char *Cmd) {
- CmdsParse(CommandTable, Cmd);
- return 0;
+ clearCommandBuffer();
+ CmdsParse(CommandTable, Cmd);
+ return 0;
}
int CmdHelp(const char *Cmd) {
- CmdsHelp(CommandTable);
- return 0;
+ CmdsHelp(CommandTable);
+ return 0;
}