X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/8cdf15c2b3b83ef3f6bbb11f5921b69efce69fe9..243f899b92dd075ed32fc9a42e30f9cdb912967e:/client/cmdlft55xx.c

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 25b9ba27..5d36547b 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -195,8 +195,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) {
@@ -674,13 +674,46 @@ bool tryDetectModulation(){
 		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;
 }
 
@@ -864,16 +897,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){
 		
@@ -993,7 +1028,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;
 	}
@@ -1263,20 +1298,22 @@ int AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password ){
 	// 	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;
 }
@@ -1419,11 +1456,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");