X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/9932c55a4accc135200bca93edec8022f8bdcf12..4eabb8ad382f87aaee497d35e88c169da96b8fda:/client/cmdlfem4x.c

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index a1e883e0..59a1eef3 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -14,6 +14,20 @@ uint64_t g_em410xid = 0;
 
 static int CmdHelp(const char *Cmd);
 
+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;
+}
+
 int CmdEMdemodASK(const char *Cmd)
 {
 	char cmdp = param_getchar(Cmd, 0);
@@ -33,35 +47,16 @@ int CmdEMdemodASK(const char *Cmd)
  */
 int CmdEM410xRead(const char *Cmd)
 {
-	uint32_t hi=0;
-	uint64_t lo=0;
+	uint32_t hi = 0;
+	uint64_t lo = 0;
 
 	if(!AskEm410xDemod("", &hi, &lo, false)) return 0;
-	PrintAndLog("EM410x pattern found: ");
+
 	printEM410x(hi, lo);
-	if (hi){
-		PrintAndLog ("EM410x XL pattern found");
-		return 0;
-	}
 	g_em410xid = lo;
 	return 1;
 }
 
-
-int usage_lf_em410x_sim(void) {
-	PrintAndLog("Simulating EM410x tag");
-	PrintAndLog("");
-	PrintAndLog("Usage:  lf em4x em410xsim [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 em4x em410xsim 0F0368568B");
-	PrintAndLog("      lf em4x em410xsim 0F0368568B 32");
-	return 0;
-}
-
 // emulate an EM410X tag
 int CmdEM410xSim(const char *Cmd)
 {
@@ -138,18 +133,15 @@ int CmdEM410xSim(const char *Cmd)
  *  Changed by martin, 4000 x 4 = 16000, 
  *  see http://www.proxmark.org/forum/viewtopic.php?pid=7235#p7235
 */
-int CmdEM410xWatch(const char *Cmd)
-{
+int CmdEM410xWatch(const char *Cmd) {
 	do {
 		if (ukbhit()) {
 			printf("\naborted via keyboard!\n");
 			break;
-		}
-		
+		}		
 		CmdLFRead("s");
-		getSamples("8201",true); //capture enough to get 2 complete preambles (4096*2+9)	
+		getSamples("6144",true);
 	} while (!CmdEM410xRead(""));
-
 	return 0;
 }
 
@@ -159,7 +151,7 @@ int CmdEM410xWatchnSpoof(const char *Cmd)
 {
 	// loops if the captured ID was in XL-format.
 	CmdEM410xWatch(Cmd);
-	PrintAndLog("# Replaying captured ID: %llu", g_em410xid);
+	PrintAndLog("# Replaying captured ID: %" PRIu64 , g_em410xid);
 	CmdLFaskSim("");
 	return 0;
 }
@@ -451,7 +443,7 @@ int EM4x50Read(const char *Cmd, bool verbose) {
 			}
 		}
 		if (!clk) {
-			PrintAndLog("ERROR: EM4x50 - didn't find a clock");
+			if (verbose || g_debugMode) PrintAndLog("ERROR: EM4x50 - didn't find a clock");
 			return 0;
 		}
 	} else tol = clk/8;
@@ -593,8 +585,7 @@ int CmdEM4x50Dump(const char *Cmd){
 }
 
 #define EM_PREAMBLE_LEN 6
-// download samples from device
-// and copy them to Graphbuffer
+// download samples from device and copy to Graphbuffer
 bool downloadSamplesEM(){
 	
 	// 8 bit preamble + 32 bit word response (max clock (128) * 40bits = 5120 samples)
@@ -607,7 +598,8 @@ bool downloadSamplesEM(){
 	setGraphBuf(got, sizeof(got));
 	return TRUE;
 }
-//search for given preamble in given BitStream and return success=1 or fail=0 and startIndex
+
+// em_demod 
 bool doPreambleSearch(size_t *startIdx){
 	
 	// sanity check
@@ -615,26 +607,14 @@ bool doPreambleSearch(size_t *startIdx){
 		if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 demodbuffer too small");
 		return FALSE;
 	}
-	
-	// skip first two 0 bits as they might have been missed in the demod 
-	uint8_t preamble[EM_PREAMBLE_LEN] = {0,0,1,0,1,0};
-	
-	// set size to 15 to only test first 4 positions for the preamble
-	size_t size = (15 > DemodBufferLen) ? DemodBufferLen : 15;
+
+	// set size to 20 to only test first 14 positions for the preamble
+	size_t size = (20 > DemodBufferLen) ? DemodBufferLen : 20;
 	*startIdx = 0; 
-	uint8_t found = 0;
-	
-	// em only sends preamble once, so look for it once in the first x bits
-	for (int idx = 0; idx < size - EM_PREAMBLE_LEN; idx++){
-		if (memcmp(DemodBuffer+idx, preamble, EM_PREAMBLE_LEN) == 0){
-			//first index found
-			*startIdx = idx;
-			found = 1;
-			break;
-		}
-	}
+	// skip first two 0 bits as they might have been missed in the demod
+	uint8_t preamble[EM_PREAMBLE_LEN] = {0,0,1,0,1,0};
 	
-	if ( !found) {
+	if ( !preambleSearchEx(DemodBuffer, preamble, EM_PREAMBLE_LEN, &size, startIdx, TRUE)) {
 		if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", *startIdx);
 		return FALSE;
 	} 
@@ -708,19 +688,18 @@ bool setDemodBufferEM(uint32_t *word, size_t idx){
 
 	//test for even parity bits.
 	uint8_t parity[45] = {0};
-	memcpy( parity, 45, DemodBuffer);
+	memcpy( parity, DemodBuffer, 45);
 	if (!EMwordparitytest(parity) ){
 		PrintAndLog("DEBUG: Error - EM Parity tests failed");
 		return FALSE;
 	}
-	
-	size_t size = removeParity(DemodBuffer, idx + EM_PREAMBLE_LEN, 9, 0, 44);
-	if (!size) {
-		if (g_debugMode) PrintAndLog("DEBUG: Error - EM Parity not detected");
+		   
+    // test for even parity bits and remove them. (leave out the end row of parities so 36 bits)	
+	if (!removeParity(DemodBuffer, idx + EM_PREAMBLE_LEN, 9, 0, 36)) {
+		if (g_debugMode) PrintAndLog("DEBUG: Error - EM, failed removing parity");
 		return FALSE;
 	}
-	// set & copy to output
-	setDemodBuf(DemodBuffer, 40, 0);
+	setDemodBuf(DemodBuffer, 32, 0);
 	*word = bytebits_to_byteLSBF(DemodBuffer, 32);
 	return TRUE;
 }
@@ -730,7 +709,7 @@ bool setDemodBufferEM(uint32_t *word, size_t idx){
 // the rest will need to be manually demoded for now...
 bool demodEM4x05resp(uint32_t *word) {
 	size_t idx = 0;	
-	
+	*word = 0;
 	if (detectASK_MAN() && doPreambleSearch( &idx ))
 		return setDemodBufferEM(word, idx);
 	
@@ -791,6 +770,38 @@ int usage_lf_em4x05_write(void) {
 	PrintAndLog("      lf em 4x05write 1 deadc0de 11223344");
 	return 0;
 }
+int usage_lf_em4x05_info(void) {
+	PrintAndLog("Tag information EM4205/4305/4469//4569 tags.  Tag must be on antenna.");
+	PrintAndLog("");
+	PrintAndLog("Usage:  lf em 4x05info [h] <pwd>");
+	PrintAndLog("Options:");
+	PrintAndLog("       h         - this help");
+	PrintAndLog("       pwd       - password (hex) (optional)");
+	PrintAndLog("samples:");
+	PrintAndLog("      lf em 4x05info");
+	PrintAndLog("      lf em 4x05info deadc0de");
+	return 0;
+}
+
+int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word) {
+	UsbCommand c = {CMD_EM4X_READ_WORD, {addr, pwd, usePwd}};
+	clearCommandBuffer();
+	SendCommand(&c);
+	UsbCommand resp;	
+	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)){
+		PrintAndLog("Command timed out");
+		return -1;
+	}
+	if ( !downloadSamplesEM() ) {
+		return -1;
+	}
+	int testLen = (GraphTraceLen < 1000) ? GraphTraceLen : 1000;
+	if (graphJustNoise(GraphBuffer, testLen)) {
+		PrintAndLog("no tag found");
+		return -1;
+	}
+	return demodEM4x05resp(word);
+}
 
 int CmdEM4x05Dump(const char *Cmd) {
 	uint8_t addr = 0;
@@ -806,69 +817,53 @@ int CmdEM4x05Dump(const char *Cmd) {
 		usePwd = true;
 
 	int success = 1;
+	uint32_t word = 0;
 	PrintAndLog("Addr | data   | ascii");
 	PrintAndLog("-----+--------+------");
 	for (; addr < 16; addr++) {
+		
 		if (addr == 2) {
 			if (usePwd) {
-				PrintAndLog(" %02u | %08X", addr, pwd);
+				PrintAndLog(" %02u | %08X", addr, pwd, word );
 			} else {
 				PrintAndLog(" 02 | cannot read");
 			}
 		} else {
-			//success &= EM4x05Read(addr, pwd, usePwd);
+			success &= EM4x05ReadWord_ext(addr, pwd, usePwd, &word);
 		}
 	}
 
 	return success;
 }
-//ICEMAN;  mentalnote to self: -1 is not doable for uint32_t..
+
 int CmdEM4x05Read(const char *Cmd) {
-	int addr, pwd;
+	uint8_t addr;
+	uint32_t pwd;
 	bool usePwd = false;
 	uint8_t ctmp = param_getchar(Cmd, 0);
 	if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_em4x05_read();
 
-	addr = param_get8ex(Cmd, 0, -1, 10);
-	pwd =  param_get32ex(Cmd, 1, -1, 16);
+	addr = param_get8ex(Cmd, 0, 50, 10);
+	pwd =  param_get32ex(Cmd, 1, 1, 16);
 	
-	if ( (addr > 15) || (addr < 0 ) || ( addr == -1) ) {
+	if (addr > 15) {
 		PrintAndLog("Address must be between 0 and 15");
 		return 1;
 	}
-	if ( pwd == -1 )
-		PrintAndLog("Reading address %d", addr);
+	if ( pwd == 1 ) {
+		PrintAndLog("Reading address %02u", addr);
+	}
 	else {
 		usePwd = true;
-		PrintAndLog("Reading address %d | password %08X", addr, pwd);
+		PrintAndLog("Reading address %02u | password %08X", addr, pwd);
 	}
 	
-	UsbCommand c = {CMD_EM4X_READ_WORD, {addr, pwd, usePwd}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;	
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)){
-		PrintAndLog("Command timed out");
-		return -1;
-	}
-
-	if (!downloadSamplesEM())
-		return -1;
-	
-	int testLen = (GraphTraceLen < 1000) ? GraphTraceLen : 1000;
-	if (graphJustNoise(GraphBuffer, testLen)) {
-		PrintAndLog("Tag not found");
-		return -1;
-	}
-
-	//attempt demod
 	uint32_t word = 0;
-	int isOk = demodEM4x05resp(&word);
+	int isOk = EM4x05ReadWord_ext(addr, pwd, usePwd, &word);
 	if (isOk)
-		PrintAndLog("Got Address %02d | %08X",addr, word);
+		PrintAndLog("Address %02d | %08X - %s", addr, word, (addr > 13) ? "Lock" : "");
 	else
-		PrintAndLog("Read failed");
-	
+		PrintAndLog("Read Address %02d | failed",addr);
 	return isOk;
 }
 
@@ -877,19 +872,19 @@ int CmdEM4x05Write(const char *Cmd) {
 	if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_em4x05_write();
 	
 	bool usePwd = false;		
-	int addr = 16; // default to invalid address
-	int data = 0xFFFFFFFF; // default to blank data
-	int pwd = 0xFFFFFFFF; // default to blank password
+	uint8_t addr = 50; // default to invalid address
+	uint32_t data = 0; // default to blank data
+	uint32_t pwd = 1; // default to blank password
 	
-	addr = param_get8ex(Cmd, 0, -1, 10);
-	data = param_get32ex(Cmd, 1, -1, 16);
-	pwd =  param_get32ex(Cmd, 2, -1, 16);
+	addr = param_get8ex(Cmd, 0, 50, 10);
+	data = param_get32ex(Cmd, 1, 0, 16);
+	pwd =  param_get32ex(Cmd, 2, 1, 16);
 	
-	if ( (addr > 15) || (addr < 0 ) || ( addr == -1) ) {
+	if ( addr > 15 ) {
 		PrintAndLog("Address must be between 0 and 15");
 		return 1;
 	}
-	if ( pwd == -1 )
+	if ( pwd == 1 )
 		PrintAndLog("Writing address %d data %08X", addr, data);	
 	else {
 		usePwd = true;
@@ -910,29 +905,176 @@ int CmdEM4x05Write(const char *Cmd) {
 	if (!downloadSamplesEM())
 		return -1;
 
-	//todo: check response for 00001010 then write data for write confirmation!
-	
-	//attempt demod:
 	//need 0 bits demoded (after preamble) to verify write cmd
 	uint32_t dummy = 0;
 	int isOk = demodEM4x05resp(&dummy);
 	if (isOk)
 		PrintAndLog("Write Verified");
-
+	else
+		PrintAndLog("Write could not be verified");	
 	return isOk;
 }
 
+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(uint32_t block0, uint32_t serial) {
+		
+	uint8_t chipType = (block0 >> 1) & 0xF;
+	uint8_t cap = (block0 >> 5) & 3;
+	uint16_t custCode = (block0 >> 9) & 0x3FF;
+	
+	switch (chipType) {
+		case 9:  PrintAndLog("\n Chip Type:   %u | EM4305", chipType); break;
+		case 8:  PrintAndLog("\n Chip Type:   %u | EM4205", 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;
+	}
+
+	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;
+	}
+
+	PrintAndLog(" Cust Code: %03u | %s", custCode, (custCode == 0x200) ? "Default": "Unknown");
+	if (serial != 0)
+		PrintAndLog("\n  Serial #: %08X\n", serial);
+}
+
+void printEM4x05ProtectionBits(uint32_t word) {
+	for (uint8_t i = 0; i < 15; i++) {
+		PrintAndLog("      Word:  %02u | %s", i, (((1 << i) & word ) || i < 2) ? "Is Write Locked" : "Is Not Write Locked");
+		if (i==14) 
+			PrintAndLog("      Word:  %02u | %s", i+1, (((1 << i) & word ) || i < 2) ? "Is Write Locked" : "Is Not Write Locked");
+	}
+}
+
+//quick test for EM4x05/EM4x69 tag
+bool EM4x05IsBlock0(uint32_t *word) {
+	return EM4x05ReadWord_ext(0, 0, FALSE, word);
+}
+
+int CmdEM4x05Info(const char *Cmd) {
+#define EM_SERIAL_BLOCK 1
+#define EM_CONFIG_BLOCK 4
+#define EM_PROT1_BLOCK 14
+#define EM_PROT2_BLOCK 15
+	uint32_t pwd;
+	uint32_t word = 0, block0 = 0, serial = 0;
+  	bool usePwd = false;
+	uint8_t ctmp = param_getchar(Cmd, 0);
+	if ( ctmp == 'H' || ctmp == 'h' ) return usage_lf_em4x05_info();
+
+	// for now use default input of 1 as invalid (unlikely 1 will be a valid password...)
+	pwd = param_get32ex(Cmd, 0, 1, 16);
+	
+	if ( pwd != 1 )
+		usePwd = true;
+
+	// read word 0 (chip info)
+	// block 0 can be read even without a password.
+	if ( !EM4x05IsBlock0(&block0) ) 
+		return -1;
+	
+	// read word 1 (serial #) doesn't need pwd
+	// continue if failed, .. non blocking fail.
+	EM4x05ReadWord_ext(EM_SERIAL_BLOCK, 0, false, &serial);
+	printEM4x05info(block0, serial);
+
+	// read word 4 (config block) 
+	// needs password if one is set
+	if ( EM4x05ReadWord_ext(EM_CONFIG_BLOCK, pwd, usePwd, &word) != 1 )
+		return 0;
+	
+	printEM4x05config(word);
+
+	// read word 14 and 15 to see which is being used for the protection bits
+	if ( EM4x05ReadWord_ext(EM_PROT1_BLOCK, pwd, usePwd, &word) != 1 ) {
+		return 0;
+	}
+	// if status bit says this is not the used protection word
+	if (!(word & 0x8000)) {
+		if ( EM4x05ReadWord_ext(EM_PROT2_BLOCK, pwd, usePwd, &word) != 1 )
+			return 0;
+	}
+	//something went wrong
+	if (!(word & 0x8000)) return 0;
+	printEM4x05ProtectionBits(word);
+	return 1;
+}
+
 static command_t CommandTable[] = {
 	{"help", 		CmdHelp, 			1, "This help"},
 	{"410xdemod",	CmdEMdemodASK, 		0, "[findone] -- Extract ID from EM410x tag (option 0 for continuous loop, 1 for only 1 tag)"},  
 	{"410xread",	CmdEM410xRead, 		1, "[clock rate] -- Extract ID from EM410x tag in GraphBuffer"},
-	{"410xsim",		CmdEM410xSim, 		0, "<UID> -- Simulate EM410x tag"},
+	{"410xsim",		CmdEM410xSim, 		0, "simulate EM410x tag"},
 	{"410xwatch",	CmdEM410xWatch, 	0, "['h'] -- Watches for EM410x 125/134 kHz tags (option 'h' for 134)"},
 	{"410xspoof",	CmdEM410xWatchnSpoof, 0, "['h'] --- Watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)" },
 	{"410xwrite",	CmdEM410xWrite, 	0, "<UID> <'0' T5555> <'1' T55x7> [clock rate] -- Write EM410x UID to T5555(Q5) or T55x7 tag, optionally setting clock rate"},
+	{"4x05dump",	CmdEM4x05Dump,		0, "dump EM4205/4305 tag"},
+	{"4x05info",    CmdEM4x05Info,      0, "tag information EM4x05/EM4x69"},
 	{"4x05read",	CmdEM4x05Read, 		0, "read word data from EM4205/4305"},
 	{"4x05write",	CmdEM4x05Write,		0, "write word data to EM4205/4305"},
-	{"4x05dump",	CmdEM4x05Dump,		0, "dump EM4205/4305 tag"},
 	{"4x50read",	CmdEM4x50Read, 		0, "read word data from EM4x50"},
 	{"4x50write",	CmdEM4x50Write, 	0, "write word data to EM4x50"},
 	{"4x50dump",	CmdEM4x50Dump,		0, "dump EM4x50 tag"},