X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/0a85edf471497a491fa3900fca9a585a6ed8f0c6..refs/pull/216/head:/client/cmdlfem4x.c?ds=inline

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 662629f0..0788b138 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -72,9 +72,9 @@ int CmdEM410xSim(const char *Cmd)
 	uint8_t uid[5] = {0x00};
 
 	if (cmdp == 'h' || cmdp == 'H') {
-		PrintAndLog("Usage:  lf em4x em410xsim <UID> <clock>");
+		PrintAndLog("Usage:  lf em 410xsim <UID> <clock>");
 		PrintAndLog("");
-		PrintAndLog("     sample: lf em4x em410xsim 0F0368568B");
+		PrintAndLog("     sample: lf em 410xsim 0F0368568B");
 		return 0;
 	}
 	/* clock is 64 in EM410x tags */
@@ -530,14 +530,16 @@ bool downloadSamplesEM() {
 }
 
 bool EM4x05testDemodReadData(uint32_t *word, bool readCmd) {
-	// em4x05/em4x69 preamble is 00001010
+	// em4x05/em4x69 command response preamble is 00001010
 	// skip first two 0 bits as they might have been missed in the demod
 	uint8_t preamble[] = {0,0,1,0,1,0};
 	size_t startIdx = 0;
-	// set size to 20 to only test first 14 positions for the preamble
-	size_t size = (20 > DemodBufferLen) ? DemodBufferLen : 20;
 
-	//test preamble
+	// set size to 20 to only test first 14 positions for the preamble or less if not a read command
+	size_t size = (readCmd) ? 20 : 11;
+	// sanity check
+	size = (size > DemodBufferLen) ? DemodBufferLen : size;
+	// test preamble
 	if ( !onePreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx) ) {
 		if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
 		return false;
@@ -548,7 +550,7 @@ bool EM4x05testDemodReadData(uint32_t *word, bool readCmd) {
 			if (g_debugMode) PrintAndLog("DEBUG: Error - End Parity check failed");
 			return false;
 		}
-		//test for even parity bits.
+		// test for even parity bits.
 		if ( removeParity(DemodBuffer, startIdx + sizeof(preamble),9,0,44) == 0 ) {		
 			if (g_debugMode) PrintAndLog("DEBUG: Error - Parity not detected");
 			return false;
@@ -673,7 +675,7 @@ int EM4x05ReadWord(uint8_t addr, uint32_t pwd, bool usePwd) {
 	uint32_t wordData = 0;
 	int success = EM4x05ReadWord_ext(addr, pwd, usePwd, &wordData);
 	if (success == 1)
-		PrintAndLog(" Got Address %02d | %08X",addr,wordData);
+		PrintAndLog("%s Address %02d | %08X", (addr>13) ? "Lock":" Got",addr,wordData);
 	else
 		PrintAndLog("Read Address %02d | failed",addr);
 
@@ -808,6 +810,8 @@ int CmdEM4x05WriteWord(const char *Cmd) {
 	int result = demodEM4x05resp(&dummy,false);
 	if (result == 1) {
 		PrintAndLog("Write Verified");
+	} else {
+		PrintAndLog("Write could not be verified");
 	}
 	return result;
 }
@@ -855,11 +859,11 @@ void printEM4x05config(uint32_t wordData) {
 	}
 	PrintAndLog("ConfigWord: %08X (Word 4)\n", wordData);
 	PrintAndLog("Config Breakdown:", wordData);
-	PrintAndLog(" Data Rate:  %02X | RF/%u", wordData & 0x3F, datarate);
+	PrintAndLog(" Data Rate:  %02u | RF/%u", wordData & 0x3F, datarate);
 	PrintAndLog("   Encoder:   %u | %s", encoder, enc);
 	PrintAndLog("    PSK CF:   %u | %s", PSKcf, cf);
 	PrintAndLog("     Delay:   %u | %s", delay, cdelay);
-	PrintAndLog(" LastWordR:  %02u | Address of last default word read", LWR);
+	PrintAndLog(" LastWordR:  %02u | Address of last word for default read", LWR);
 	PrintAndLog(" ReadLogin:   %u | Read Login is %s", (wordData & 0x40000)>>18, (wordData & 0x40000) ? "Required" : "Not Required");	
 	PrintAndLog("   ReadHKL:   %u | Read Housekeeping Words Login is %s", (wordData & 0x80000)>>19, (wordData & 0x80000) ? "Required" : "Not Required");	
 	PrintAndLog("WriteLogin:   %u | Write Login is %s", (wordData & 0x100000)>>20, (wordData & 0x100000) ? "Required" : "Not Required");	
@@ -893,6 +897,15 @@ void printEM4x05info(uint8_t chipType, uint8_t cap, uint16_t custCode, uint32_t
 	}
 }
 
+void printEM4x05ProtectionBits(uint32_t wordData) {
+	for (uint8_t i = 0; i < 15; i++) {
+		PrintAndLog("      Word:  %02u | %s", i, (((1 << i) & wordData ) || i < 2) ? "Is Write Locked" : "Is Not Write Locked");
+		if (i==14) {
+			PrintAndLog("      Word:  %02u | %s", i+1, (((1 << i) & wordData ) || i < 2) ? "Is Write Locked" : "Is Not Write Locked");
+		}
+	}
+}
+
 //quick test for EM4x05/EM4x69 tag
 bool EM4x05Block0Test(uint32_t *wordData) {
 	if (EM4x05ReadWord_ext(0,0,false,wordData) == 1) {
@@ -940,6 +953,26 @@ int CmdEM4x05info(const char *Cmd) {
 		return 0;
 	}
 	printEM4x05config(wordData);
+
+	// read word 14 and 15 to see which is being used for the protection bits
+	wordData = 0;
+	if ( EM4x05ReadWord_ext(14, pwd, usePwd, &wordData) != 1 ) {
+		//failed
+		return 0;
+	}
+	// if status bit says this is not the used protection word
+	if (!(wordData & 0x8000)) {
+		if ( EM4x05ReadWord_ext(15, pwd, usePwd, &wordData) != 1 ) {
+			//failed
+			return 0;
+		}
+	}
+	if (!(wordData & 0x8000)) {
+		//something went wrong
+		return 0;
+	}
+	printEM4x05ProtectionBits(wordData);
+
 	return 1;
 }