X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7cfc777b0eb3b87f09d51207b01c05e49365c14e..8e99ec25edb501c00d1d0a9fc57709ff88f56495:/client/cmdlft55xx.c

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 5a86d612..efa6c22d 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -49,13 +49,18 @@ int usage_t55xx_config(){
 	return 0;
 }
 int usage_t55xx_read(){
-	PrintAndLog("Usage:  lf t55xx read <block> <password>");
+	PrintAndLog("Usage:  lf t55xx read <block> <password> <override_safety>");
 	PrintAndLog("     <block>, block number to read. Between 0-7");
 	PrintAndLog("     <password>, OPTIONAL password (8 hex characters)");
+	PrintAndLog("     <override_safety>, OPTIONAL override safety check = 1");
+	PrintAndLog("     ****WARNING****");
+	PrintAndLog("     Use of read with password on a tag not configured for a pwd");
+	PrintAndLog("     can damage the tag");
 	PrintAndLog("");
 	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("      lf t55xx read 0            - read data from block 0");
+	PrintAndLog("      lf t55xx read 0 feedbeef   - read data from block 0 password feedbeef");
+	PrintAndLog("      lf t55xx read 0 feedbeef 1 - read data from block 0 password feedbeef safety check");
 	PrintAndLog("");
 	return 0;
 }
@@ -116,12 +121,12 @@ static int CmdHelp(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};
+	uint8_t cmdp = 0;
+	bool errors = FALSE;
 	while(param_getchar(Cmd, cmdp) != 0x00 && !errors)
 	{
 		tmp = param_getchar(Cmd, cmdp);
@@ -215,31 +220,73 @@ int CmdT55xxSetConfig(const char *Cmd) {
 }
 
 int CmdT55xxReadBlock(const char *Cmd) {
-	int block = -1;
-	int password = 0xFFFFFFFF; //default to blank Block 7
-
-	char cmdp = param_getchar(Cmd, 0);
-	if (cmdp == 'h' || cmdp == 'H')
-		return usage_t55xx_read();
-
-	int res = sscanf(Cmd, "%d %x", &block, &password);
-
-	if ( res < 1 || res > 2 )
-		return usage_t55xx_read();
-
-	
-	if ((block < 0) | (block > 7)) {
+	uint8_t block = 255;
+	uint8_t wake = 0;
+	uint8_t usepwd = 0;
+	uint32_t password = 0xFFFFFFFF; //default to blank Block 7
+	uint8_t override = 0;
+	uint8_t cmdp = 0;
+	bool errors = false;
+	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch(param_getchar(Cmd, cmdp)) {
+		case 'h':
+		case 'H':
+			return usage_t55xx_read();
+		case 'b':
+		case 'B':
+			errors |= param_getdec(Cmd, cmdp+1, &block);
+			cmdp+=2;
+			break;
+		case 'o':
+		case 'O':
+			override = 1;
+			cmdp++;
+			break;
+		case 'p':
+		case 'P':
+			password = param_get32ex(Cmd, cmdp+1, 0, 10);
+			usepwd = 1;
+			cmdp+=2;
+			break;
+		case 'w':
+		case 'W':
+			wake = 1;
+			cmdp++;
+			break;
+		default:
+			PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+			errors = true;
+			break;
+		}
+	}
+	if (errors) return usage_t55xx_read();
+	if (wake && !usepwd) {
+		PrintAndLog("Wake command must use a pwd");
+		return 1;
+	}
+	if ((block > 7) && !wake) {
 		PrintAndLog("Block must be between 0 and 7");
 		return 1;
-	}	
+	}
 
-	UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, block, 0}};
- 	c.d.asBytes[0] = 0x0; 
+	UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, block, password}};
 
 	//Password mode
-	if ( res == 2 ) {
-		c.arg[2] = password;
-		c.d.asBytes[0] = 0x1; 
+	if ( usepwd || wake ) {
+		// try reading the config block and verify that PWD bit is set before doing this!
+		if ( wake || override ) {
+			c.arg[0] = (wake<<8) & usepwd;
+			if ( !wake && override )
+				PrintAndLog("Safety Check Overriden - proceeding despite risk");
+		} else {
+			AquireData( CONFIGURATION_BLOCK );
+			if ( !tryDetectModulation() ) {
+				PrintAndLog("Safety Check: Could not detect if PWD bit is set in config block. Exits.");
+				return 1;
+			} else {
+				PrintAndLog("Safety Check: PWD bit is NOT set in config block. Reading without password...");	
+			}
+		}
 	}
 
 	clearCommandBuffer();
@@ -256,7 +303,11 @@ int CmdT55xxReadBlock(const char *Cmd) {
 	//DemodBufferLen=0;
 	if (!DecodeT55xxBlock()) return 3;
 	char blk[10]={0};
-	sprintf(blk,"%d", block);
+	if ( wake ) {
+		sprintf(blk,"wake");
+	} else {
+		sprintf(blk,"%d", block);
+	}
 	printT55xxBlock(blk);
 	return 0;
 }