X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a37228c8c26f32c3462f6b1641e64acddd62e0cc..f75b313b002369372bc97066a90a1593ebc2e25c:/client/cmdlfem4x.c

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 6208e63c..f9103126 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -63,6 +63,20 @@ int CmdEM410xRead(const char *Cmd)
 	return 1;
 }
 
+int usage_lf_em410x_sim(void) {
+	PrintAndLog("Simulating EM410x tag");
+	PrintAndLog("");
+	PrintAndLog("Usage:  lf em 410xsim [h] <uid> <clock>");
+	PrintAndLog("Options:");
+	PrintAndLog("       h         - this help");
+	PrintAndLog("       uid       - uid (10 HEX symbols)");
+	PrintAndLog("       clock     - clock (32|64) (optional)");
+	PrintAndLog("samples:");
+	PrintAndLog("      lf em 410xsim 0F0368568B");
+	PrintAndLog("      lf em 410xsim 0F0368568B 32");
+	return 0;
+}
+
 // emulate an EM410X tag
 int CmdEM410xSim(const char *Cmd)
 {
@@ -71,12 +85,7 @@ int CmdEM410xSim(const char *Cmd)
 	char cmdp = param_getchar(Cmd, 0);
 	uint8_t uid[5] = {0x00};
 
-	if (cmdp == 'h' || cmdp == 'H') {
-		PrintAndLog("Usage:  lf em4x em410xsim <UID> <clock>");
-		PrintAndLog("");
-		PrintAndLog("     sample: lf em4x em410xsim 0F0368568B");
-		return 0;
-	}
+	if (cmdp == 'h' || cmdp == 'H') return usage_lf_em410x_sim();
 	/* clock is 64 in EM410x tags */
 	uint8_t clock = 64;
 
@@ -174,7 +183,7 @@ int CmdEM410xWrite(const char *Cmd)
 	int card = 0xFF; // invalid card value
 	unsigned int clock = 0; // invalid clock value
 
-	sscanf(Cmd, "%" PRIx64 " %d %d", &id, &card, &clock);
+	sscanf(Cmd, "%" SCNx64 " %d %d", &id, &card, &clock);
 
 	// Check ID
 	if (id == 0xFFFFFFFFFFFFFFFF) {
@@ -530,15 +539,17 @@ 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
-	if ( !onePreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx) ) {
+	// 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 ( !preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &size, &startIdx, true) ) {
 		if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
 		return false;
 	}
@@ -548,13 +559,13 @@ bool EM4x05testDemodReadData(uint32_t *word, bool readCmd) {
 			if (g_debugMode) PrintAndLog("DEBUG: Error - End Parity check failed");
 			return false;
 		}
-		//test for even parity bits.
-		if ( removeParity(DemodBuffer, startIdx + sizeof(preamble),9,0,44) == 0 ) {		
+		// test for even parity bits and remove them. (leave out the end row of parities so 36 bits)
+		if ( removeParity(DemodBuffer, startIdx + sizeof(preamble),9,0,36) == 0 ) {		
 			if (g_debugMode) PrintAndLog("DEBUG: Error - Parity not detected");
 			return false;
 		}
 
-		setDemodBuf(DemodBuffer, 40, 0);
+		setDemodBuf(DemodBuffer, 32, 0);
 		*word = bytebits_to_byteLSBF(DemodBuffer, 32);
 	}
 	return true;
@@ -673,7 +684,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,30 +819,99 @@ 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;
 }
 
+void printEM4x05config(uint32_t wordData) {
+	uint16_t datarate = (((wordData & 0x3F)+1)*2);
+	uint8_t encoder = ((wordData >> 6) & 0xF);
+	char enc[14];
+	memset(enc,0,sizeof(enc));
+
+	uint8_t PSKcf = (wordData >> 10) & 0x3;
+	char cf[10];
+	memset(cf,0,sizeof(cf));
+	uint8_t delay = (wordData >> 12) & 0x3;
+	char cdelay[33];
+	memset(cdelay,0,sizeof(cdelay));
+	uint8_t LWR = (wordData >> 14) & 0xF; //last word read
+
+	switch (encoder) {
+		case 0: snprintf(enc,sizeof(enc),"NRZ"); break;
+		case 1: snprintf(enc,sizeof(enc),"Manchester"); break;
+		case 2: snprintf(enc,sizeof(enc),"Biphase"); break;
+		case 3: snprintf(enc,sizeof(enc),"Miller"); break;
+		case 4: snprintf(enc,sizeof(enc),"PSK1"); break;
+		case 5: snprintf(enc,sizeof(enc),"PSK2"); break;
+		case 6: snprintf(enc,sizeof(enc),"PSK3"); break;
+		case 7: snprintf(enc,sizeof(enc),"Unknown"); break;
+		case 8: snprintf(enc,sizeof(enc),"FSK1"); break;
+		case 9: snprintf(enc,sizeof(enc),"FSK2"); break;
+		default: snprintf(enc,sizeof(enc),"Unknown"); break;
+	}
+
+	switch (PSKcf) {
+		case 0: snprintf(cf,sizeof(cf),"RF/2"); break;
+		case 1: snprintf(cf,sizeof(cf),"RF/8"); break;
+		case 2: snprintf(cf,sizeof(cf),"RF/4"); break;
+		case 3: snprintf(cf,sizeof(cf),"unknown"); break;
+	}
+
+	switch (delay) {
+		case 0: snprintf(cdelay, sizeof(cdelay),"no delay"); break;
+		case 1: snprintf(cdelay, sizeof(cdelay),"BP/8 or 1/8th bit period delay"); break;
+		case 2: snprintf(cdelay, sizeof(cdelay),"BP/4 or 1/4th bit period delay"); break;
+		case 3: snprintf(cdelay, sizeof(cdelay),"no delay"); break;
+	}
+	PrintAndLog("ConfigWord: %08X (Word 4)\n", wordData);
+	PrintAndLog("Config Breakdown:", wordData);
+	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 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");	
+	PrintAndLog("  WriteHKL:   %u | Write Housekeeping Words Login is %s", (wordData & 0x200000)>>21, (wordData & 0x200000) ? "Required" : "Not Required");	
+	PrintAndLog("    R.A.W.:   %u | Read After Write is %s", (wordData & 0x400000)>>22, (wordData & 0x400000) ? "On" : "Off");
+	PrintAndLog("   Disable:   %u | Disable Command is %s", (wordData & 0x800000)>>23, (wordData & 0x800000) ? "Accepted" : "Not Accepted");
+	PrintAndLog("    R.T.F.:   %u | Reader Talk First is %s", (wordData & 0x1000000)>>24, (wordData & 0x1000000) ? "Enabled" : "Disabled");
+	PrintAndLog("    Pigeon:   %u | Pigeon Mode is %s\n", (wordData & 0x4000000)>>26, (wordData & 0x4000000) ? "Enabled" : "Disabled");
+}
+
 void printEM4x05info(uint8_t chipType, uint8_t cap, uint16_t custCode, uint32_t serial) {
 	switch (chipType) {
-		case 9: PrintAndLog("\nChip Type:   %u | EM4305", chipType); break;
-		case 4: PrintAndLog("Chip Type:   %u | Unknown", chipType); break;
-		case 2: PrintAndLog("Chip Type:   %u | EM4469", chipType); break;
+		case 9: PrintAndLog("\n Chip Type:   %u | EM4305", chipType); break;
+		case 4: PrintAndLog(" Chip Type:   %u | Unknown", chipType); break;
+		case 2: PrintAndLog(" Chip Type:   %u | EM4469", chipType); break;
 		//add more here when known
-		default: PrintAndLog("Chip Type:   %u Unknown", chipType); break;
+		default: PrintAndLog(" Chip Type:   %u Unknown", chipType); break;
 	}
 
 	switch (cap) {
-		case 3: PrintAndLog(" Cap Type:   %u | 330pF",cap); break;
-		case 2: PrintAndLog(" Cap Type:   %u | %spF",cap, (chipType==2)? "75":"210"); break;
-		case 1: PrintAndLog(" Cap Type:   %u | 250pF",cap); break;
-		case 0: PrintAndLog(" Cap Type:   %u | no resonant capacitor",cap); break;
-		default: PrintAndLog(" Cap Type:   %u | unknown",cap); break;
+		case 3: PrintAndLog("  Cap Type:   %u | 330pF",cap); break;
+		case 2: PrintAndLog("  Cap Type:   %u | %spF",cap, (chipType==2)? "75":"210"); break;
+		case 1: PrintAndLog("  Cap Type:   %u | 250pF",cap); break;
+		case 0: PrintAndLog("  Cap Type:   %u | no resonant capacitor",cap); break;
+		default: PrintAndLog("  Cap Type:   %u | unknown",cap); break;
 	}
 
-	PrintAndLog("Cust Code: %03u | %s", custCode, (custCode == 0x200) ? "Default": "Unknown");
+	PrintAndLog(" Cust Code: %03u | %s", custCode, (custCode == 0x200) ? "Default": "Unknown");
 	if (serial != 0) {
-		PrintAndLog("\n Serial #: %08X\n", serial);
+		PrintAndLog("\n  Serial #: %08X\n", serial);
+	}
+}
+
+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");
+		}
 	}
 }
 
@@ -845,22 +925,21 @@ bool EM4x05Block0Test(uint32_t *wordData) {
 
 int CmdEM4x05info(const char *Cmd) {
 	//uint8_t addr = 0;
-	//uint32_t pwd;
+	uint32_t pwd;
 	uint32_t wordData = 0;
-  //	bool usePwd = false;
+  	bool usePwd = false;
 	uint8_t ctmp = param_getchar(Cmd, 0);
 	if ( ctmp == 'H' || ctmp == 'h' ) return usage_lf_em_dump();
 
 	// for now use default input of 1 as invalid (unlikely 1 will be a valid password...)
-	//pwd = param_get32ex(Cmd, 0, 1, 16);
+	pwd = param_get32ex(Cmd, 0, 1, 16);
 	
-	//if ( pwd != 1 ) {
-	//	usePwd = true;
-	//}
-	int success = 1;
-	// read blk 0
+	if ( pwd != 1 ) {
+		usePwd = true;
+	}
 
-	//block 0 can be read even without a password.
+	// read word 0 (chip info)
+	// block 0 can be read even without a password.
 	if ( !EM4x05Block0Test(&wordData) ) 
 		return -1;
 	
@@ -868,16 +947,42 @@ int CmdEM4x05info(const char *Cmd) {
 	uint8_t cap = (wordData >> 5) & 3;
 	uint16_t custCode = (wordData >> 9) & 0x3FF;
 	
+	// read word 1 (serial #) doesn't need pwd
 	wordData = 0;
 	if (EM4x05ReadWord_ext(1, 0, false, &wordData) != 1) {
 		//failed, but continue anyway...
 	}
 	printEM4x05info(chipType, cap, custCode, wordData);
 
-	// add read block 4 and read out config if successful
+	// read word 4 (config block) 
 	// needs password if one is set
+	wordData = 0;
+	if ( EM4x05ReadWord_ext(4, pwd, usePwd, &wordData) != 1 ) {
+		//failed
+		return 0;
+	}
+	printEM4x05config(wordData);
 
-	return success;
+	// 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;
 }