X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/118bfa1b1f10fb62bdad0c9fdbda8f23d4756f67..7b40affb6f7087e116bccff352923834dcdc8d46:/client/cmdlft55xx.c?ds=sidebyside

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 7a377cc9..b303aced 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -37,7 +37,7 @@ typedef struct {
 } t55xx_conf_block_t;
 
 // Default configuration: FSK, not inversed.
-t55xx_conf_block_t config = { .modulation = 0, .inversed = FALSE, .block0 = 0x00};
+t55xx_conf_block_t config = { .modulation = 2, .inversed = FALSE, .block0 = 0x00};
 
 int usage_t55xx_config(){
 	PrintAndLog("Usage: lf t55xx config [d <demodulation>] [i 1]");
@@ -105,6 +105,15 @@ int usage_t55xx_dump(){
 	PrintAndLog("");
 	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;
+}
 
 static int CmdHelp(const char *Cmd);
 
@@ -168,9 +177,8 @@ int CmdT55xxSetConfig(const char *Cmd){
 	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
@@ -181,10 +189,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");
@@ -209,56 +216,180 @@ 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;
+
+	// 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);
+			PrintAndLog("ice");
+			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();
+	
+	// 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;
 	}
 	
-	if (CmdDetectClockRate("f")){ //wave is almost certainly FSK
-	  	// FSK
-		if ( FSKrawDemod("0 0", FALSE))
-			printT55xx("FSK");
-		// FSK inverted
-		if ( FSKrawDemod("0 1", FALSE)) 
-			printT55xx("FSK inv");
+	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 = 1;
+			tests[hits].inversed = 0;
+			++hits;
+		}
+		if ( FSKrawDemod("0 1", FALSE) && test()) {
+			tests[hits].modulation = 1;
+			tests[hits].inversed = 1;
+			++hits;
+			}
     } else {
-		// ASK/MAN (autoclock, normal, maxerrors 1)
-		if ( ASKmanDemod("0 0 1", FALSE, FALSE) )
-			printT55xx("ASK/MAN");
-		
-		// 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");
-		
-		// PSK (autoclock, normal, maxerrors 1)
-		if (!PSKDemod("0 0 1", FALSE))
-			printT55xx("PSK");
+		if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test()) {
+			tests[hits].modulation = 2;
+			tests[hits].inversed = 0;
+			++hits;
+			}
 
-		// PSK (autoclock, inverted, maxerrors 1)
-		if (!PSKDemod("0 1 1", FALSE))
-			printT55xx("PSK inv");
+		if ( ASKmanDemod("0 1 1", FALSE, FALSE)  && test()) {
+			tests[hits].modulation = 2;
+			tests[hits].inversed = 1;
+			++hits;
+			}
 		
-		//PSK2?
+		if ( NRZrawDemod("0 0 1", FALSE)  && test()) {
+			tests[hits].modulation = 3;
+			tests[hits].inversed = 0;
+			++hits;
+		}
+
+		if ( NRZrawDemod("0 1 1", FALSE)  && test()) {
+			tests[hits].modulation = 3;
+			tests[hits].inversed = 1;
+			++hits;
+			}
 		
-		// if (!BiphaseRawDecode("0",FALSE))
-			// printT55xx("BIPHASE");
+		if ( PSKDemod("0 0 1", FALSE)  && test()) {
+			tests[hits].modulation = 4;
+			tests[hits].inversed = 0;
+			++hits;
+		}
 		
-		// if (!BiphaseRawDecode("1",FALSE))
-			// printT55xx("BIPHASE inv");
+		if ( PSKDemod("0 1 1", FALSE) && test()) {
+			tests[++hits].modulation = 4;
+			tests[hits].inversed = 1;
+			++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;
+		// }
+	}		
+	if ( hits == 1) {
+		PrintAndLog("Modulation: %d  Inverse: %d", tests[0].modulation, tests[0].inversed);
+		config.modulation = tests[0].modulation;
+		config.inversed = tests[0].inversed;
+		return TRUE;
 	}
-	return 0;
+	
+	if ( hits > 1) {
+		PrintAndLog("Found [%d] possible matches for modulation.",hits);
+		for(int i=0; i<hits; ++i){
+			PrintAndLog("Modulation: %d  Inverse: %d", tests[i].modulation, tests[i].inversed);
+		}
+	}
+	return FALSE;
 }
 
-void printT55xx(const char *demodStr){
+bool test(){
+
+	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;
+
+	//PrintAndLog("test: %X %X %X ", safer, resv, extend);
+	
+	// 2nibble must be zeroed.
+	if ( resv > 0x00) return FALSE;
+
+	if ( safer == 0x6 || safer == 0x9){
+		if ( extend == 0x00)
+			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};
@@ -271,7 +402,7 @@ 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);
 }
 
 /*
@@ -288,7 +419,7 @@ 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 
@@ -329,16 +460,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){
 	
@@ -348,29 +475,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 ----------------------------------");
@@ -380,14 +513,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 0  : 0x%08X  %s", bl1, sprint_bin(DemodBuffer+37,32) );
 	PrintAndLog("-------------------------------------------------------------");
 	/*
 	TRACE - BLOCK O
@@ -409,7 +542,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
@@ -417,33 +550,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; 
 
-	// config
+		//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);
+	}
 	
-	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 --------------------");
@@ -452,25 +608,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};
@@ -496,7 +652,7 @@ int CmdDump(const char *Cmd){
 		} else {
 			sprintf(s,"%d", i);
 		}
-		CmdReadBlk(s);
+		CmdT55xxReadBlock(s);
 	}
 	return 0;
 }
@@ -543,10 +699,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;
@@ -614,11 +770,12 @@ static command_t CommandTable[] =
 {
   {"help",   CmdHelp,           1, "This help"},
   {"config", CmdT55xxSetConfig, 1, "Set T55XX config for modulation, inversed data"},
-  {"read",   CmdReadBlk,        0, "<block> [password] -- Read T55xx block data (page 0) [optional password]"},
-  {"write",  CmdWriteBlk,       0, "<block> <data> [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, "<block> [password] -- Read T55xx block data (page 0) [optional password]"},
+  {"write",  CmdT55xxWriteBlock,0, "<block> <data> [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}
 };