X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/480e2f239421563263d07f6d11f2c929d7f14d1f..8b89fcae134bd1a106738a99481e9a5dea47e2c4:/client/cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index d6cae59f..9797126b 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -13,9 +13,120 @@
 #include "nonce2key/nonce2key.h"
 
 static int CmdHelp(const char *Cmd);
+int usage_hf14_mifare(void){
+	PrintAndLog("Usage:  hf mf mifare [h] <block number>");
+	PrintAndLog("options:");
+	PrintAndLog("           h    this help");
+	PrintAndLog("           <block number>  (Optional) target other key A than block 0.");
+	PrintAndLog("samples:");
+	PrintAndLog("           hf mf mifare");
+	PrintAndLog("           hf mf mifare 16");
+	return 0;
+}
+int usage_hf14_mf1ksim(void){
+	PrintAndLog("Usage:  hf mf sim  [h] u <uid (8,14,20 hex symbols)> n <numreads> i x");
+	PrintAndLog("options:");
+	PrintAndLog("      h    this help");
+	PrintAndLog("      u    (Optional) UID 4,7 or 10bytes. If not specified, the UID 4b from emulator memory will be used");
+	PrintAndLog("      n    (Optional) Automatically exit simulation after <numreads> blocks have been read by reader. 0 = infinite");
+	PrintAndLog("      i    (Optional) Interactive, means that console will not be returned until simulation finishes or is aborted");
+	PrintAndLog("      x    (Optional) Crack, performs the 'reader attack', nr/ar attack against a legitimate reader, fishes out the key(s)");
+	PrintAndLog("samples:");
+	PrintAndLog("           hf mf sim u 0a0a0a0a");
+	PrintAndLog("           hf mf sim u 11223344556677");
+	PrintAndLog("           hf mf sim u 112233445566778899AA");	
+	return 0;
+}
+int usage_hf14_dbg(void){
+	PrintAndLog("Usage:  hf mf dbg [h] <debug level>");
+	PrintAndLog("options:");
+	PrintAndLog("           h    this help");	
+	PrintAndLog("       <debug level>  (Optional) see list for valid levels");
+	PrintAndLog("           0 - no debug messages");
+	PrintAndLog("           1 - error messages");
+	PrintAndLog("           2 - plus information messages");
+	PrintAndLog("           3 - plus debug messages");
+	PrintAndLog("           4 - print even debug messages in timing critical functions");
+	PrintAndLog("               Note: this option therefore may cause malfunction itself");
+	PrintAndLog("samples:");
+	PrintAndLog("           hf mf dbg 3");
+	return 0;
+}
+int usage_hf14_sniff(void){
+	PrintAndLog("It continuously gets data from the field and saves it to: log, emulator, emulator file.");
+	PrintAndLog("Usage:  hf mf sniff [h] [l] [d] [f]");
+	PrintAndLog("options:");
+	PrintAndLog("      h    this help");
+	PrintAndLog("      l    save encrypted sequence to logfile `uid.log`");
+	PrintAndLog("      d    decrypt sequence and put it to log file `uid.log`");
+//	PrintAndLog(" n/a  e     decrypt sequence, collect read and write commands and save the result of the sequence to emulator memory");
+	PrintAndLog("      f    decrypt sequence, collect read and write commands and save the result of the sequence to emulator dump file `uid.eml`");
+	PrintAndLog("sample:");
+	PrintAndLog("           hf mf sniff l d f");
+	return 0;
+}
+int usage_hf14_nested(void){
+	PrintAndLog("Usage:");
+	PrintAndLog(" all sectors:  hf mf nested  <card memory> <block number> <key A/B> <key (12 hex symbols)> [t,d]");
+	PrintAndLog(" one sector:   hf mf nested  o <block number> <key A/B> <key (12 hex symbols)>");
+	PrintAndLog("               <target block number> <target key A/B> [t]");
+	PrintAndLog("options:");
+	PrintAndLog("      h    this help");
+	PrintAndLog("      card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");
+	PrintAndLog("      t    transfer keys into emulator memory");
+	PrintAndLog("      d    write keys to binary file");
+	PrintAndLog(" ");
+	PrintAndLog("samples:");
+	PrintAndLog("      hf mf nested 1 0 A FFFFFFFFFFFF ");
+	PrintAndLog("      hf mf nested 1 0 A FFFFFFFFFFFF t ");
+	PrintAndLog("      hf mf nested 1 0 A FFFFFFFFFFFF d ");
+	PrintAndLog("      hf mf nested o 0 A FFFFFFFFFFFF 4 A");
+	return 0;
+}
+int usage_hf14_hardnested(void){
+	PrintAndLog("Usage:");
+	PrintAndLog("      hf mf hardnested <block number> <key A|B> <key (12 hex symbols)>");
+	PrintAndLog("                       <target block number> <target key A|B> [known target key (12 hex symbols)] [w] [s]");
+	PrintAndLog("  or  hf mf hardnested r [known target key]");
+	PrintAndLog(" ");
+	PrintAndLog("options:");
+	PrintAndLog("      h    this help");	
+	PrintAndLog("      w    acquire nonces and write them to binary file nonces.bin");
+	PrintAndLog("      s    slower acquisition (required by some non standard cards)");
+	PrintAndLog("      r    read nonces.bin and start attack");
+	PrintAndLog("      t    tests?");
+	PrintAndLog(" ");
+	PrintAndLog("samples:");
+	PrintAndLog("      hf mf hardnested 0 A FFFFFFFFFFFF 4 A");
+	PrintAndLog("      hf mf hardnested 0 A FFFFFFFFFFFF 4 A w");
+	PrintAndLog("      hf mf hardnested 0 A FFFFFFFFFFFF 4 A w s");
+	PrintAndLog("      hf mf hardnested r");
+	PrintAndLog("      hf mf hardnested r a0a1a2a3a4a5");
+	PrintAndLog(" ");
+	PrintAndLog("Add the known target key to check if it is present in the remaining key space:");
+	PrintAndLog("      sample5: hf mf hardnested 0 A A0A1A2A3A4A5 4 A FFFFFFFFFFFF");
+	return 0;
+}
+int usage_hf14_chk(void){
+	PrintAndLog("Usage:  hf mf chk <block number>|<*card memory> <key type (A/B/?)> [t|d] [<key (12 hex symbols)>] [<dic (*.dic)>]");
+	PrintAndLog("options:");
+	PrintAndLog("      h    this help");	
+	PrintAndLog("      *    all sectors based on card memory, other values then below defaults to 1k");
+	PrintAndLog("      			0 - MINI(320 bytes)");
+	PrintAndLog("      			1 - 1K");
+	PrintAndLog("      			2 - 2K");
+	PrintAndLog("      			4 - 4K");
+	PrintAndLog("      d    write keys to binary file");
+	PrintAndLog("      t    write keys to emulator memory\n");
+	PrintAndLog(" ");
+	PrintAndLog("samples:");
+	PrintAndLog("      hf mf chk 0 A 1234567890ab keys.dic     -- target block 0, Key A");
+	PrintAndLog("      hf mf chk *1 ? t                        -- target all blocks, all keys, 1K, write to emul");
+	PrintAndLog("      hf mf chk *1 ? d                        -- target all blocks, all keys, 1K, write to file");
+	return 0;
+}
 
-int CmdHF14AMifare(const char *Cmd)
-{
+int CmdHF14AMifare(const char *Cmd) {
 	uint32_t uid = 0;
 	uint32_t nt = 0, nr = 0;
 	uint64_t par_list = 0, ks_list = 0, r_key = 0;
@@ -24,22 +135,19 @@ int CmdHF14AMifare(const char *Cmd)
 	uint8_t blockNo = 0;
 	
 	char cmdp = param_getchar(Cmd, 0);	
-	if ( cmdp == 'H' || cmdp == 'h') {
-		PrintAndLog("Usage:  hf mf mifare <block number>");
-		PrintAndLog("        sample: hf mf mifare 0");
-		return 0;
-	}	
+	if ( cmdp == 'H' || cmdp == 'h') return usage_hf14_mifare();
 	
 	blockNo = param_get8(Cmd, 0);
 	UsbCommand c = {CMD_READER_MIFARE, {true, blockNo, 0}};
 
 	// message
 	printf("-------------------------------------------------------------------------\n");
-	printf("Executing command. Expected execution time: 25sec on average  :-)\n");
+	printf("Executing darkside attack. Expected execution time: 25sec on average :-)\n");
 	printf("Press button on the proxmark3 device to abort both proxmark3 and client.\n");
 	printf("-------------------------------------------------------------------------\n");
-
 	clock_t t1 = clock();
+	time_t start, end;
+	time(&start);
 	
 start:
     clearCommandBuffer();
@@ -65,26 +173,34 @@ start:
 		UsbCommand resp;
 		if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
 			isOK  = resp.arg[0];
-			printf("\n\n");
-			switch (isOK) {
-				case -1 : PrintAndLog("Button pressed. Aborted.\n"); break;
-				case -2 : PrintAndLog("Card is not vulnerable to Darkside attack (doesn't send NACK on authentication requests).\n"); break;
-				case -3 : PrintAndLog("Card is not vulnerable to Darkside attack (its random number generator is not predictable).\n"); break;
-				case -4 : PrintAndLog("Card is not vulnerable to Darkside attack (its random number generator seems to be based on the wellknown");
-						  PrintAndLog("generating polynomial with 16 effective bits only, but shows unexpected behaviour.\n"); break;
-				default: ;
-			}
+			printf("\n");
 			uid = (uint32_t)bytes_to_num(resp.d.asBytes +  0, 4);
 			nt =  (uint32_t)bytes_to_num(resp.d.asBytes +  4, 4);
 			par_list = bytes_to_num(resp.d.asBytes +  8, 8);
 			ks_list = bytes_to_num(resp.d.asBytes +  16, 8);
 			nr = bytes_to_num(resp.d.asBytes + 24, 4);
+
+			switch (isOK) {
+				case -1 : PrintAndLog("Button pressed. Aborted.\n"); break;
+				case -2 : PrintAndLog("Card isn't vulnerable to Darkside attack (doesn't send NACK on authentication requests).\n"); break;
+				case -3 : PrintAndLog("Card isn't vulnerable to Darkside attack (its random number generator is not predictable).\n"); break;
+				case -4 : PrintAndLog("Card isn't vulnerable to Darkside attack (its random number generator seems to be based on the wellknown");
+						  PrintAndLog("generating polynomial with 16 effective bits only, but shows unexpected behaviour.\n"); break;
+				default: ;
+			}
 			break;
 		}
 	}	
-
 	printf("\n");
 	
+	// par == 0
+	if (isOK == -1 && par_list == 0) {
+		if (!nonce2key_ex(uid, nt, nr, ks_list, &r_key) ){
+			PrintAndLog("Found valid key: %012"llx" \n", r_key);
+			goto END;
+		}
+	}
+	
 	// error
 	if (isOK != 1) return 1;
 	
@@ -98,15 +214,16 @@ start:
 	} else {
 		PrintAndLog("Found valid key: %012"llx" \n", r_key);
 	}
-	
+END:
 	t1 = clock() - t1;
+	time(&end);
+	unsigned long elapsed_time = difftime(end, start);	
 	if ( t1 > 0 )
-		PrintAndLog("Time in darkside: %.0f ticks - %4.2f sec\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC);
+		PrintAndLog("Time in darkside: %.0f ticks %u seconds\n", (float)t1, elapsed_time);
 	return 0;
 }
 
-int CmdHF14AMfWrBl(const char *Cmd)
-{
+int CmdHF14AMfWrBl(const char *Cmd) {
 	uint8_t blockNo = 0;
 	uint8_t keyType = 0;
 	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
@@ -155,8 +272,7 @@ int CmdHF14AMfWrBl(const char *Cmd)
 	return 0;
 }
 
-int CmdHF14AMfRdBl(const char *Cmd)
-{
+int CmdHF14AMfRdBl(const char *Cmd) {
 	uint8_t blockNo = 0;
 	uint8_t keyType = 0;
 	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
@@ -204,8 +320,7 @@ int CmdHF14AMfRdBl(const char *Cmd)
   return 0;
 }
 
-int CmdHF14AMfRdSc(const char *Cmd)
-{
+int CmdHF14AMfRdSc(const char *Cmd) {
 	int i;
 	uint8_t sectorNo = 0;
 	uint8_t keyType = 0;
@@ -262,8 +377,7 @@ int CmdHF14AMfRdSc(const char *Cmd)
   return 0;
 }
 
-uint8_t FirstBlockOfSector(uint8_t sectorNo)
-{
+uint8_t FirstBlockOfSector(uint8_t sectorNo) {
 	if (sectorNo < 32) {
 		return sectorNo * 4;
 	} else {
@@ -271,8 +385,7 @@ uint8_t FirstBlockOfSector(uint8_t sectorNo)
 	}
 }
 
-uint8_t NumBlocksPerSector(uint8_t sectorNo)
-{
+uint8_t NumBlocksPerSector(uint8_t sectorNo) {
 	if (sectorNo < 32) {
 		return 4;
 	} else {
@@ -280,8 +393,7 @@ uint8_t NumBlocksPerSector(uint8_t sectorNo)
 	}
 }
 
-int CmdHF14AMfDump(const char *Cmd)
-{
+int CmdHF14AMfDump(const char *Cmd) {
 	uint8_t sectorNo, blockNo;
 	
 	uint8_t keyA[40][6];
@@ -453,8 +565,7 @@ int CmdHF14AMfDump(const char *Cmd)
 	return 0;
 }
 
-int CmdHF14AMfRestore(const char *Cmd)
-{
+int CmdHF14AMfRestore(const char *Cmd) {
 	uint8_t sectorNo,blockNo;
 	uint8_t keyType = 0;
 	uint8_t key[6] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
@@ -563,8 +674,7 @@ int CmdHF14AMfRestore(const char *Cmd)
 	return 0;
 }
 
-int CmdHF14AMfNested(const char *Cmd)
-{
+int CmdHF14AMfNested(const char *Cmd) {
 	int i, j, res, iterations;
 	sector *e_sector = NULL;
 	uint8_t blockNo = 0;
@@ -581,29 +691,14 @@ int CmdHF14AMfNested(const char *Cmd)
 	FILE *fkeys;
 	uint8_t standart[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
 	uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
-	
-	char cmdp, ctmp;
 
-	if (strlen(Cmd)<3) {
-		PrintAndLog("Usage:");
-		PrintAndLog(" all sectors:  hf mf nested  <card memory> <block number> <key A/B> <key (12 hex symbols)> [t,d]");
-		PrintAndLog(" one sector:   hf mf nested  o <block number> <key A/B> <key (12 hex symbols)>");
-		PrintAndLog("               <target block number> <target key A/B> [t]");
-		PrintAndLog("card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");
-		PrintAndLog("t - transfer keys into emulator memory");
-		PrintAndLog("d - write keys to binary file");
-		PrintAndLog(" ");
-		PrintAndLog("      sample1: hf mf nested 1 0 A FFFFFFFFFFFF ");
-		PrintAndLog("      sample2: hf mf nested 1 0 A FFFFFFFFFFFF t ");
-		PrintAndLog("      sample3: hf mf nested 1 0 A FFFFFFFFFFFF d ");
-		PrintAndLog("      sample4: hf mf nested o 0 A FFFFFFFFFFFF 4 A");
-		return 0;
-	}	
+	if (strlen(Cmd)<3) return usage_hf14_nested();
 	
+	char cmdp, ctmp;
 	cmdp = param_getchar(Cmd, 0);
 	blockNo = param_get8(Cmd, 1);
 	ctmp = param_getchar(Cmd, 2);
-	
+
 	if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {
 		PrintAndLog("Key type must be A or B");
 		return 1;
@@ -651,7 +746,7 @@ int CmdHF14AMfNested(const char *Cmd)
 		switch (isOK) {
 			case -1 : PrintAndLog("Error: No response from Proxmark.\n"); break;
 			case -2 : PrintAndLog("Button pressed. Aborted.\n"); break;
-			case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (random numbers are not predictable).\n"); break;
+			case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (its random number generator is not predictable).\n"); break;
 			case -4 : PrintAndLog("No valid key found"); break;
 			case -5 : 
 				key64 = bytes_to_num(keyBlock, 6);
@@ -679,7 +774,10 @@ int CmdHF14AMfNested(const char *Cmd)
 	}
 	else { // ------------------------------------  multiple sectors working
 		clock_t t1 = clock();
-
+		unsigned long elapsed_time;
+		time_t start, end;
+		time(&start);
+		
 		e_sector = calloc(SectorsCnt, sizeof(sector));
 		if (e_sector == NULL) return 1;
 		
@@ -705,14 +803,15 @@ int CmdHF14AMfNested(const char *Cmd)
 			}
 		}
 		clock_t t2 = clock() - t1;
+		time(&end);
+		elapsed_time = difftime(end, start);	
 		if ( t2 > 0 )
-			PrintAndLog("Time to check 6 known keys: %.0f ticks %4.2f sec", (float)t2, ((float)t2)/CLOCKS_PER_SEC);
-
+			PrintAndLog("Time to check 6 known keys: %.0f ticks %u seconds\n", (float)t2 , elapsed_time);
+		
 		PrintAndLog("enter nested...");	
 		
 		// nested sectors
 		iterations = 0;
-		PrintAndLog("enter nested...");
 		bool calibrate = true;
 
 		for (i = 0; i < NESTED_SECTOR_RETRY; i++) {
@@ -725,7 +824,7 @@ int CmdHF14AMfNested(const char *Cmd)
 					switch (isOK) {
 						case -1 : PrintAndLog("Error: No response from Proxmark.\n"); break;
 						case -2 : PrintAndLog("Button pressed. Aborted.\n"); break;
-						case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (random numbers are not predictable).\n"); break;
+						case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (its random number generator is not predictable).\n"); break;
 						case -4 : //key not found
 							calibrate = false;
 							iterations++;
@@ -746,8 +845,11 @@ int CmdHF14AMfNested(const char *Cmd)
 		}
 		
 		t1 = clock() - t1;
+		time(&end);
+		elapsed_time = difftime(end, start);	
 		if ( t1 > 0 )
-			PrintAndLog("Time in nested: %.0f ticks %4.2f sec (%4.2f sec per key)\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC, ((float)t1)/iterations/CLOCKS_PER_SEC);
+			PrintAndLog("Time in nested: %.0f ticks %u seconds\n", (float)t1, elapsed_time);
+
 
 		// 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?
 		PrintAndLog("trying to read key B...");
@@ -830,8 +932,7 @@ int CmdHF14AMfNested(const char *Cmd)
 	return 0;
 }
 
-int CmdHF14AMfNestedHard(const char *Cmd)
-{
+int CmdHF14AMfNestedHard(const char *Cmd) {
 	uint8_t blockNo = 0;
 	uint8_t keyType = 0;
 	uint8_t trgBlockNo = 0;
@@ -841,27 +942,8 @@ int CmdHF14AMfNestedHard(const char *Cmd)
 	
 	char ctmp;
 	ctmp = param_getchar(Cmd, 0);
-
-	if (ctmp != 'R' && ctmp != 'r' && ctmp != 'T' && ctmp != 't' && strlen(Cmd) < 20) {
-		PrintAndLog("Usage:");
-		PrintAndLog("      hf mf hardnested <block number> <key A|B> <key (12 hex symbols)>");
-		PrintAndLog("                       <target block number> <target key A|B> [known target key (12 hex symbols)] [w] [s]");
-		PrintAndLog("  or  hf mf hardnested r [known target key]");
-		PrintAndLog(" ");
-		PrintAndLog("Options: ");
-		PrintAndLog("      w: Acquire nonces and write them to binary file nonces.bin");
-		PrintAndLog("      s: Slower acquisition (required by some non standard cards)");
-		PrintAndLog("      r: Read nonces.bin and start attack");
-		PrintAndLog(" ");
-		PrintAndLog("      sample1: hf mf hardnested 0 A FFFFFFFFFFFF 4 A");
-		PrintAndLog("      sample2: hf mf hardnested 0 A FFFFFFFFFFFF 4 A w");
-		PrintAndLog("      sample3: hf mf hardnested 0 A FFFFFFFFFFFF 4 A w s");
-		PrintAndLog("      sample4: hf mf hardnested r");
-		PrintAndLog(" ");
-		PrintAndLog("Add the known target key to check if it is present in the remaining key space:");
-		PrintAndLog("      sample5: hf mf hardnested 0 A A0A1A2A3A4A5 4 A FFFFFFFFFFFF");
-		return 0;
-	}	
+	if (ctmp == 'H' || ctmp == 'h' ) return usage_hf14_hardnested();
+	if (ctmp != 'R' && ctmp != 'r' && ctmp != 'T' && ctmp != 't' && strlen(Cmd) < 20) return usage_hf14_hardnested();
 	
 	bool know_target_key = false;
 	bool nonce_file_read = false;
@@ -869,7 +951,6 @@ int CmdHF14AMfNestedHard(const char *Cmd)
 	bool slow = false;
 	int tests = 0;
 	
-	
 	if (ctmp == 'R' || ctmp == 'r') {
 		nonce_file_read = true;
 		if (!param_gethex(Cmd, 1, trgkey, 12)) {
@@ -927,9 +1008,9 @@ int CmdHF14AMfNestedHard(const char *Cmd)
 			trgBlockNo, 
 			trgKeyType?'B':'A', 
 			trgkey[0], trgkey[1], trgkey[2], trgkey[3], trgkey[4], trgkey[5],
-			know_target_key?"":" (not set)",
-			nonce_file_write?"write":nonce_file_read?"read":"none",
-			slow?"Yes":"No",
+			know_target_key ? "" : " (not set)",
+			nonce_file_write ? "write": nonce_file_read ? "read" : "none",
+			slow ? "Yes" : "No",
 			tests);
 
 	int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key?trgkey:NULL, nonce_file_read, nonce_file_write, slow, tests);
@@ -946,19 +1027,9 @@ int CmdHF14AMfNestedHard(const char *Cmd)
 	return 0;
 }
 
-int CmdHF14AMfChk(const char *Cmd)
-{
-	if (strlen(Cmd)<3) {
-		PrintAndLog("Usage:  hf mf chk <block number>|<*card memory> <key type (A/B/?)> [t|d] [<key (12 hex symbols)>] [<dic (*.dic)>]");
-		PrintAndLog("          * - all sectors");
-		PrintAndLog("card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");
-		PrintAndLog("d - write keys to binary file");
-		PrintAndLog("t - write keys to emulator memory\n");
-		PrintAndLog("      sample: hf mf chk 0 A 1234567890ab keys.dic");
-		PrintAndLog("              hf mf chk *1 ? t");
-		PrintAndLog("              hf mf chk *1 ? d");
-		return 0;
-	}	
+int CmdHF14AMfChk(const char *Cmd) {
+
+	if (strlen(Cmd)<3) return usage_hf14_chk();
 
 	FILE * f;
 	char filename[FILE_PATH_SIZE]={0};
@@ -1119,73 +1190,84 @@ int CmdHF14AMfChk(const char *Cmd)
 		return 1;
 	}
 
+	// empty e_sector
+	for(int i = 0; i < SectorsCnt; ++i){
+		e_sector[i].Key[0] = 0xffffffffffff;
+		e_sector[i].Key[1] = 0xffffffffffff;
+		e_sector[i].foundKey[0] = FALSE;
+		e_sector[i].foundKey[1] = FALSE;
+	}
+		
+	
 	uint8_t trgKeyType = 0;
 	uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;
 	
 	// time
 	clock_t t1 = clock();
+	time_t start, end;
+	time(&start);
 	
 	// check keys.
-	for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) {
+	for (trgKeyType = !keyType;  trgKeyType < 2;  (keyType==2) ? (++trgKeyType) : (trgKeyType=2) ) {
 
 		int b = blockNo;
 		for (int i = 0; i < SectorsCnt; ++i) {
 			
 			// skip already found keys.
 			if (e_sector[i].foundKey[trgKeyType]) continue;
-			
-			
+						
 			for (uint32_t c = 0; c < keycnt; c += max_keys) {
 				
 				uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c;
 				
 				res = mfCheckKeys(b, trgKeyType, true, size, &keyBlock[6*c], &key64);
 				if (!res) {
-					//PrintAndLog("Sector:%3d Block:%3d, key type: %C  -- Found key [%012"llx"]", i, b, trgKeyType ? 'B':'A', key64);
-										 
 					e_sector[i].Key[trgKeyType] = key64;
 					e_sector[i].foundKey[trgKeyType] = TRUE;
 					break;
-				} else {					
-					e_sector[i].Key[trgKeyType] = 0xffffffffffff;
-					e_sector[i].foundKey[trgKeyType] = FALSE;
 				}
+				printf(".");
+				fflush(stdout);
 			}
 			b < 127 ? ( b +=4 ) : ( b += 16 );	
 		}
 	}
-	
 	t1 = clock() - t1;
+	time(&end);
+	unsigned long elapsed_time = difftime(end, start);	
 	if ( t1 > 0 )
-		printf("Time in checkkeys: %.0f ticks  %1.2f sec (%1.2f sec per key)\n\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC, ((float)t1)/keycnt/CLOCKS_PER_SEC);
+		PrintAndLog("\nTime in checkkeys: %.0f ticks %u seconds\n", (float)t1, elapsed_time);
 
+		
 	// 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?
-	PrintAndLog("testing to read B...");
-	for (i = 0; i < SectorsCnt; i++) {
-		// KEY A  but not KEY B
-		if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {
-						
-			uint8_t sectrail = (FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
-			
-			PrintAndLog("Reading block %d", sectrail);
-			
-			UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}};
-			num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A
-			clearCommandBuffer();
-			SendCommand(&c);
-
-			UsbCommand resp;
-			if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) continue;
+	if ( keyType != 1 ) {
+		PrintAndLog("testing to read key B...");
+		for (i = 0; i < SectorsCnt; i++) {
+			// KEY A  but not KEY B
+			if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {
+							
+				uint8_t sectrail = (FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
 				
-			uint8_t isOK  = resp.arg[0] & 0xff;
-			if (!isOK) continue;
-
-			uint8_t *data = resp.d.asBytes;
-			key64 = bytes_to_num(data+10, 6);
-			if (key64) {
-				PrintAndLog("Data:%s", sprint_hex(data+10, 6));
-				e_sector[i].foundKey[1] = 1;
-				e_sector[i].Key[1] = key64;
+				PrintAndLog("Reading block %d", sectrail);
+				
+				UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}};
+				num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A
+				clearCommandBuffer();
+				SendCommand(&c);
+
+				UsbCommand resp;
+				if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) continue;
+					
+				uint8_t isOK  = resp.arg[0] & 0xff;
+				if (!isOK) continue;
+
+				uint8_t *data = resp.d.asBytes;
+				key64 = bytes_to_num(data+10, 6);
+				if (key64) {
+					PrintAndLog("Data:%s", sprint_hex(data+10, 6));
+					e_sector[i].foundKey[1] = 1;
+					e_sector[i].Key[1] = key64;
+				}
 			}
 		}
 	}
@@ -1235,148 +1317,263 @@ int CmdHF14AMfChk(const char *Cmd)
 	return 0;
 }
 
-void printKeyTable( uint8_t sectorscnt, sector *e_sector ){
-	PrintAndLog("|---|----------------|---|----------------|---|");
-	PrintAndLog("|sec|key A           |res|key B           |res|");
-	PrintAndLog("|---|----------------|---|----------------|---|");
-	for (uint8_t i = 0; i < sectorscnt; ++i) {
-		PrintAndLog("|%03d|  %012"llx"  | %d |  %012"llx"  | %d |", i,
-			e_sector[i].Key[0], e_sector[i].foundKey[0], 
-			e_sector[i].Key[1], e_sector[i].foundKey[1]
-		);
-	}
-	PrintAndLog("|---|----------------|---|----------------|---|");
-}
-
-int CmdHF14AMf1kSim(const char *Cmd)
-{
-	uint8_t uid[7] = {0, 0, 0, 0, 0, 0, 0};
+int CmdHF14AMf1kSim(const char *Cmd) {
+	uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 	uint8_t exitAfterNReads = 0;
-	uint8_t flags = 0;
-	
+	uint8_t flags = (FLAG_UID_IN_EMUL | FLAG_4B_UID_IN_DATA);
+	int uidlen = 0;
+	uint8_t pnr = 0;
 	uint8_t cmdp = param_getchar(Cmd, 0);
 
-	if (cmdp == 'h' || cmdp == 'H') {
-		PrintAndLog("Usage:  hf mf sim  u <uid (8 hex symbols)> n <numreads> i x");
-		PrintAndLog("           h    this help");
-		PrintAndLog("           u    (Optional) UID. If not specified, the UID from emulator memory will be used");
-		PrintAndLog("           n    (Optional) Automatically exit simulation after <numreads> blocks have been read by reader. 0 = infinite");
-		PrintAndLog("           i    (Optional) Interactive, means that console will not be returned until simulation finishes or is aborted");
-		PrintAndLog("           x    (Optional) Crack, performs the 'reader attack', nr/ar attack against a legitimate reader, fishes out the key(s)");
-		PrintAndLog("");
-		PrintAndLog("           sample: hf mf sim u 0a0a0a0a ");
-		return 0;
-	}
-	uint8_t pnr = 0;
-	if (param_getchar(Cmd, pnr) == 'u') {
-		if(param_gethex(Cmd, pnr+1, uid, 8) == 0)
-		{
-			flags |= FLAG_4B_UID_IN_DATA; // UID from packet
-		} else if(param_gethex(Cmd,pnr+1,uid,14) == 0) {
-			flags |= FLAG_7B_UID_IN_DATA;// UID from packet
-		} else {
-			PrintAndLog("UID, if specified, must include 8 or 14 HEX symbols");
-			return 1;
+	if (cmdp == 'h' || cmdp == 'H') return usage_hf14_mf1ksim();
+
+	cmdp = param_getchar(Cmd, pnr);
+	if (cmdp == 'u' || cmdp == 'U') {
+		param_gethex_ex(Cmd, pnr+1, uid, &uidlen);
+		switch(uidlen){
+			case 20: flags = FLAG_10B_UID_IN_DATA;	break;
+			case 14: flags = FLAG_7B_UID_IN_DATA; break;
+			case  8: flags = FLAG_4B_UID_IN_DATA; break;
+			default: return usage_hf14_mf1ksim();
 		}
 		pnr +=2;
 	}
-	
-	if (param_getchar(Cmd, pnr) == 'n') {
-		exitAfterNReads = param_get8(Cmd,pnr+1);
+
+	cmdp = param_getchar(Cmd, pnr);	
+	if (cmdp == 'n' || cmdp == 'N') {
+		exitAfterNReads = param_get8(Cmd, pnr+1);
 		pnr += 2;
 	}
-	
-	if (param_getchar(Cmd, pnr) == 'i' ) {
-		//Using a flag to signal interactiveness, least significant bit
+
+	cmdp = param_getchar(Cmd, pnr);		
+	if (cmdp == 'i' || cmdp == 'I' ) {
 		flags |= FLAG_INTERACTIVE;
 		pnr++;
 	}
 
-	if (param_getchar(Cmd, pnr) == 'x' ) {
-		//Using a flag to signal interactiveness, least significant bit
+	cmdp = param_getchar(Cmd, pnr);	
+	if (cmdp == 'x' || cmdp == 'X') {
 		flags |= FLAG_NR_AR_ATTACK;
 	}
 	
-	PrintAndLog(" uid:%s, numreads:%d, flags:%d (0x%02x) ",
-				flags & FLAG_4B_UID_IN_DATA ? sprint_hex(uid,4):
-											  flags & FLAG_7B_UID_IN_DATA	? sprint_hex(uid,7): "N/A"
+	PrintAndLog(" uid:%s, numreads:%d, flags:%d (0x%02x) "
+				, (uidlen == 0 ) ? "N/A" : sprint_hex(uid, uidlen>>1)
 				, exitAfterNReads
 				, flags
 				, flags);
 
-
-	UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads,0}};
+	UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads, 0}};
 	memcpy(c.d.asBytes, uid, sizeof(uid));
 	clearCommandBuffer();
 	SendCommand(&c);
 
-	if(flags & FLAG_INTERACTIVE)
-	{		
-		uint8_t data[40];
-		uint8_t key[6];
-
+	if(flags & FLAG_INTERACTIVE) {		
+		uint8_t data[32];
+		uint64_t key;
 		UsbCommand resp;		
 		PrintAndLog("Press pm3-button or send another cmd to abort simulation");
-
 		while( !ukbhit() ){
 			if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;
 
 			if ( !(flags & FLAG_NR_AR_ATTACK) ) break;
-			
 			if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;
 
-				memset(data, 0x00, sizeof(data));
-				memset(key, 0x00, sizeof(key));
-				int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1];
-				
-				memcpy(data, resp.d.asBytes, len);
-				
-				uint64_t corr_uid = 0;
-				
-				// this IF?  what was I thinking of?
-				if ( memcmp(data, "\x00\x00\x00\x00", 4) == 0 ) {
-					corr_uid = ((uint64_t)(data[3] << 24)) | (data[2] << 16) | (data[1] << 8) | data[0];
-					tryMfk32(corr_uid, data, key);
-				} else {
-					corr_uid |= (uint64_t)data[2] << 48; 
-					corr_uid |= (uint64_t)data[1] << 40; 
-					corr_uid |= (uint64_t)data[0] << 32;
-					corr_uid |= (uint64_t)data[7] << 24;
-					corr_uid |= (uint64_t)data[6] << 16;
-					corr_uid |= (uint64_t)data[5] << 8;
-					corr_uid |= (uint64_t)data[4];
-					tryMfk64(corr_uid, data, key);
-				}
-			PrintAndLog("--");
+			memset(data, 0x00, sizeof(data));	
+			int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1];
+
+			memcpy(data, resp.d.asBytes, len);			
+			key = 0;
+			bool found = tryMfk32(data, &key);
+			found ^= tryMfk32_moebius(data, &key);
+			if ( found ) break;
 		}
 	}
 	return 0;
 }
 
-int CmdHF14AMfDbg(const char *Cmd)
-{
-	int dbgMode = param_get32ex(Cmd, 0, 0, 10);
-	if (dbgMode > 4) {
-		PrintAndLog("Max debug mode parameter is 4 \n");
-	}
-
-	if (strlen(Cmd) < 1 || !param_getchar(Cmd, 0) || dbgMode > 4) {
-		PrintAndLog("Usage:  hf mf dbg  <debug level>");
-		PrintAndLog(" 0 - no debug messages");
-		PrintAndLog(" 1 - error messages");
-		PrintAndLog(" 2 - plus information messages");
-		PrintAndLog(" 3 - plus debug messages");
-		PrintAndLog(" 4 - print even debug messages in timing critical functions");
-		PrintAndLog("     Note: this option therefore may cause malfunction itself");
-		return 0;
-	}	
+int CmdHF14AMfSniff(const char *Cmd){
+	bool wantLogToFile = FALSE;
+	bool wantDecrypt = FALSE;
+	//bool wantSaveToEml = FALSE; TODO
+	bool wantSaveToEmlFile = FALSE;
 
-	UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}};
+	//var 
+	int tmpchar;
+	int res = 0;
+	int len = 0;
+	int blockLen = 0;
+	int pckNum = 0;
+	int num = 0;
+	uint8_t uid[10];
+	uint8_t uid_len = 0;
+	uint8_t atqa[2] = {0x00, 0x00};
+	uint8_t sak = 0;
+	bool isTag = FALSE;
+	uint8_t *buf = NULL;
+	uint16_t bufsize = 0;
+	uint8_t *bufPtr = NULL;
+	uint16_t traceLen = 0;
+	
+	memset(uid, 0x00, sizeof(uid));
+	
+	char ctmp = param_getchar(Cmd, 0);
+	if ( ctmp == 'h' || ctmp == 'H' ) return usage_hf14_sniff();
+	
+	for (int i = 0; i < 4; i++) {
+		ctmp = param_getchar(Cmd, i);
+		if (ctmp == 'l' || ctmp == 'L') wantLogToFile = true;
+		if (ctmp == 'd' || ctmp == 'D') wantDecrypt = true;
+		//if (ctmp == 'e' || ctmp == 'E') wantSaveToEml = true; TODO
+		if (ctmp == 'f' || ctmp == 'F') wantSaveToEmlFile = true;
+	}
+	
+	printf("-------------------------------------------------------------------------\n");
+	printf("Executing mifare sniffing command. \n");
+	printf("Press the key on the proxmark3 device to abort both proxmark3 and client.\n");
+	printf("Press the key on pc keyboard to abort the client.\n");
+	printf("-------------------------------------------------------------------------\n");
+
+	UsbCommand c = {CMD_MIFARE_SNIFFER, {0, 0, 0}};
+	clearCommandBuffer();
 	SendCommand(&c);
 
+	// wait cycle
+	while (true) {
+		printf(".");
+		fflush(stdout);
+		if (ukbhit()) {
+			tmpchar = getchar();
+			(void)tmpchar;
+			printf("\naborted via keyboard!\n");
+			break;
+		}
+		
+		UsbCommand resp;
+		if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+			res = resp.arg[0] & 0xff;
+			traceLen = resp.arg[1];
+			len = resp.arg[2];
+
+			// we are done?
+			if (res == 0) {
+				free(buf);
+				return 0;
+			}
+
+			if (res == 1) {								// there is (more) data to be transferred
+				if (pckNum == 0) {						// first packet, (re)allocate necessary buffer
+					if (traceLen > bufsize) {
+						uint8_t *p;
+						if (buf == NULL)				// not yet allocated
+							p = malloc(traceLen);
+						else						// need more memory
+							p = realloc(buf, traceLen);
+						
+						if (p == NULL) {
+							PrintAndLog("Cannot allocate memory for trace");
+							free(buf);
+							return 2;
+						}
+						buf = p;
+					}
+					bufPtr = buf;
+					bufsize = traceLen;
+					memset(buf, 0x00, traceLen);
+				}
+				if (bufPtr == NULL) {
+					PrintAndLog("Cannot allocate memory for trace");
+					free(buf);
+					return 2;
+				}
+				// what happens if LEN is bigger then TRACELEN --iceman
+				memcpy(bufPtr, resp.d.asBytes, len);
+				bufPtr += len;
+				pckNum++;
+			}
+
+			if (res == 2) {								// received all data, start displaying
+				blockLen = bufPtr - buf;
+				bufPtr = buf;
+				printf(">\n");
+				PrintAndLog("received trace len: %d packages: %d", blockLen, pckNum);
+				while (bufPtr - buf < blockLen) {
+					bufPtr += 6;						// skip (void) timing information
+					len = *((uint16_t *)bufPtr);
+					if(len & 0x8000) {
+						isTag = true;
+						len &= 0x7fff;
+					} else {
+						isTag = false;
+					}
+					bufPtr += 2;
+					if ((len == 17) && (bufPtr[0] == 0xff) && (bufPtr[1] == 0xff) && (bufPtr[15] == 0xff) && (bufPtr[16] == 0xff)) {
+						memcpy(uid, bufPtr + 2, 10);
+						memcpy(atqa, bufPtr + 2 + 10, 2);
+						switch (atqa[0] & 0xC0) {
+							case 0x80: uid_len = 10; break;
+							case 0x40: uid_len = 7; break;
+							default:   uid_len = 4; break;
+						}
+						sak = bufPtr[14];
+						PrintAndLog("tag select uid| %s atqa:0x%02x%02x sak:0x%02x", 
+							sprint_hex(uid, uid_len),
+							atqa[1], 
+							atqa[0], 
+							sak);
+						if (wantLogToFile || wantDecrypt) {
+							FillFileNameByUID(logHexFileName, uid, ".log", uid_len);
+							AddLogCurrentDT(logHexFileName);
+						}						
+						if (wantDecrypt)
+							mfTraceInit(uid, uid_len, atqa, sak, wantSaveToEmlFile);
+					} else {
+						PrintAndLog("%03d| %s |%s", num, isTag ? "TAG" : "RDR", sprint_hex(bufPtr, len));
+						if (wantLogToFile) 
+							AddLogHex(logHexFileName, isTag ? "TAG| ":"RDR| ", bufPtr, len);
+						if (wantDecrypt) 
+							mfTraceDecode(bufPtr, len, wantSaveToEmlFile);
+						num++;	
+					}
+					bufPtr += len;
+					bufPtr += ((len-1)/8+1);	// ignore parity
+				}
+				pckNum = 0;
+			}
+		} // resp not NULL
+	} // while (true)
+
+	free(buf);
+	return 0;
+}
+
+int CmdHF14AMfDbg(const char *Cmd) {
+
+	char ctmp = param_getchar(Cmd, 0);
+	if (strlen(Cmd) < 1  || ctmp == 'h'|| ctmp == 'H') return usage_hf14_dbg();
+	
+	uint8_t dbgMode = param_get8ex(Cmd, 0, 0, 10);
+	if (dbgMode > 4) return usage_hf14_dbg();
+
+	UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}};
+	SendCommand(&c);
 	return 0;
 }
 
+void printKeyTable( uint8_t sectorscnt, sector *e_sector ){
+	PrintAndLog("|---|----------------|---|----------------|---|");
+	PrintAndLog("|sec|key A           |res|key B           |res|");
+	PrintAndLog("|---|----------------|---|----------------|---|");
+	for (uint8_t i = 0; i < sectorscnt; ++i) {
+		PrintAndLog("|%03d|  %012"llx"  | %d |  %012"llx"  | %d |", i,
+			e_sector[i].Key[0], e_sector[i].foundKey[0], 
+			e_sector[i].Key[1], e_sector[i].foundKey[1]
+		);
+	}
+	PrintAndLog("|---|----------------|---|----------------|---|");
+}
+
+// EMULATOR COMMANDS
+
 int CmdHF14AMfEGet(const char *Cmd)
 {
 	uint8_t blockNo = 0;
@@ -1706,8 +1903,9 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
 	return 0;
 }
 
-int CmdHF14AMfCSetUID(const char *Cmd)
-{
+// CHINESE MAGIC COMMANDS 
+
+int CmdHF14AMfCSetUID(const char *Cmd) {
 	uint8_t wipeCard = 0;
 	uint8_t uid[8] = {0x00};
 	uint8_t oldUid[8] = {0x00};
@@ -1719,11 +1917,13 @@ int CmdHF14AMfCSetUID(const char *Cmd)
 	int argi=0;
 
 	if (strlen(Cmd) < 1 || param_getchar(Cmd, argi) == 'h') {
-		PrintAndLog("Usage:  hf mf csetuid <UID 8 hex symbols> [ATQA 4 hex symbols SAK 2 hex symbols] [w]");
-		PrintAndLog("sample:  hf mf csetuid 01020304");
-		PrintAndLog("sample:  hf mf csetuid 01020304 0004 08 w");
 		PrintAndLog("Set UID, ATQA, and SAK for magic Chinese card (only works with such cards)");
 		PrintAndLog("If you also want to wipe the card then add 'w' at the end of the command line.");
+		PrintAndLog("");
+		PrintAndLog("Usage:  hf mf csetuid <UID 8 hex symbols> [ATQA 4 hex symbols SAK 2 hex symbols] [w]");
+		PrintAndLog("");
+		PrintAndLog("sample:  hf mf csetuid 01020304");
+		PrintAndLog("         hf mf csetuid 01020304 0004 08 w");
 		return 0;
 	}
 
@@ -1764,7 +1964,7 @@ int CmdHF14AMfCSetUID(const char *Cmd)
 
 	PrintAndLog("--wipe card:%s  uid:%s", (wipeCard)?"YES":"NO", sprint_hex(uid, 4));
 
-	res = mfCSetUID(uid, (atqaPresent)?atqa:NULL, (atqaPresent)?sak:NULL, oldUid, wipeCard);
+	res = mfCSetUID(uid, (atqaPresent) ? atqa : NULL, (atqaPresent) ? sak : NULL, oldUid, wipeCard);
 	if (res) {
 			PrintAndLog("Can't set UID. error=%d", res);
 			return 1;
@@ -1775,8 +1975,7 @@ int CmdHF14AMfCSetUID(const char *Cmd)
 	return 0;
 }
 
-int CmdHF14AMfCSetBlk(const char *Cmd)
-{
+int CmdHF14AMfCSetBlk(const char *Cmd) {
 	uint8_t block[16] = {0x00};
 	uint8_t blockNo = 0;
 	uint8_t params = MAGIC_SINGLE;
@@ -1811,8 +2010,7 @@ int CmdHF14AMfCSetBlk(const char *Cmd)
 	return 0;
 }
 
-int CmdHF14AMfCLoad(const char *Cmd)
-{
+int CmdHF14AMfCLoad(const char *Cmd) {
 	FILE * f;
 	char filename[FILE_PATH_SIZE];
 	char * fnameptr = filename;
@@ -2075,167 +2273,9 @@ int CmdHF14AMfCSave(const char *Cmd) {
 	}
 }
 
-int CmdHF14AMfSniff(const char *Cmd){
-
-	bool wantLogToFile = 0;
-	bool wantDecrypt = 0;
-	//bool wantSaveToEml = 0; TODO
-	bool wantSaveToEmlFile = 0;
-
-	//var 
-	int tmpchar;
-	int res = 0;
-	int len = 0;
-	int blockLen = 0;
-	int pckNum = 0;
-	int num = 0;
-	uint8_t uid[7];
-	uint8_t uid_len;
-	uint8_t atqa[2] = {0x00};
-	uint8_t sak;
-	bool isTag;
-	uint8_t *buf = NULL;
-	uint16_t bufsize = 0;
-	uint8_t *bufPtr = NULL;
-	
-	char ctmp = param_getchar(Cmd, 0);
-	if ( ctmp == 'h' || ctmp == 'H' ) {
-		PrintAndLog("It continuously gets data from the field and saves it to: log, emulator, emulator file.");
-		PrintAndLog("You can specify:");
-		PrintAndLog("    l - save encrypted sequence to logfile `uid.log`");
-		PrintAndLog("    d - decrypt sequence and put it to log file `uid.log`");
-		PrintAndLog(" n/a   e - decrypt sequence, collect read and write commands and save the result of the sequence to emulator memory");
-		PrintAndLog("    f - decrypt sequence, collect read and write commands and save the result of the sequence to emulator dump file `uid.eml`");
-		PrintAndLog("Usage:  hf mf sniff [l][d][e][f]");
-		PrintAndLog("  sample: hf mf sniff l d e");
-		return 0;
-	}	
-	
-	for (int i = 0; i < 4; i++) {
-		ctmp = param_getchar(Cmd, i);
-		if (ctmp == 'l' || ctmp == 'L') wantLogToFile = true;
-		if (ctmp == 'd' || ctmp == 'D') wantDecrypt = true;
-		//if (ctmp == 'e' || ctmp == 'E') wantSaveToEml = true; TODO
-		if (ctmp == 'f' || ctmp == 'F') wantSaveToEmlFile = true;
-	}
-	
-	printf("-------------------------------------------------------------------------\n");
-	printf("Executing command. \n");
-	printf("Press the key on the proxmark3 device to abort both proxmark3 and client.\n");
-	printf("Press the key on pc keyboard to abort the client.\n");
-	printf("-------------------------------------------------------------------------\n");
-
-	UsbCommand c = {CMD_MIFARE_SNIFFER, {0, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-
-	// wait cycle
-	while (true) {
-		printf(".");
-		fflush(stdout);
-		if (ukbhit()) {
-			tmpchar = getchar();
-			(void)tmpchar;
-			printf("\naborted via keyboard!\n");
-			break;
-		}
-		
-		UsbCommand resp;
-		if (WaitForResponseTimeout(CMD_ACK,&resp,2000)) {
-			res = resp.arg[0] & 0xff;
-			uint16_t traceLen = resp.arg[1];
-			len = resp.arg[2];
-
-			if (res == 0) {
-				free(buf);
-				return 0;						// we are done
-			}
-
-			if (res == 1) {								// there is (more) data to be transferred
-				if (pckNum == 0) {						// first packet, (re)allocate necessary buffer
-					if (traceLen > bufsize) {
-						uint8_t *p;
-						if (buf == NULL) {				// not yet allocated
-							p = malloc(traceLen);
-						} else {						// need more memory
-							p = realloc(buf, traceLen);
-						}
-						if (p == NULL) {
-							PrintAndLog("Cannot allocate memory for trace");
-							free(buf);
-							return 2;
-						}
-						buf = p;
-					}
-					bufPtr = buf;
-					bufsize = traceLen;
-					memset(buf, 0x00, traceLen);
-				}
-				if (bufPtr == NULL) {
-					PrintAndLog("Cannot allocate memory for trace");
-					free(buf);
-					return 2;
-				}
-				memcpy(bufPtr, resp.d.asBytes, len);
-				bufPtr += len;
-				pckNum++;
-			}
-
-			if (res == 2) {								// received all data, start displaying
-				blockLen = bufPtr - buf;
-				bufPtr = buf;
-				printf(">\n");
-				PrintAndLog("received trace len: %d packages: %d", blockLen, pckNum);
-				while (bufPtr - buf < blockLen) {
-					bufPtr += 6;						// skip (void) timing information
-					len = *((uint16_t *)bufPtr);
-					if(len & 0x8000) {
-						isTag = true;
-						len &= 0x7fff;
-					} else {
-						isTag = false;
-					}
-					bufPtr += 2;
-					if ((len == 14) && (bufPtr[0] == 0xff) && (bufPtr[1] == 0xff) && (bufPtr[12] == 0xff) && (bufPtr[13] == 0xff)) {
-						memcpy(uid, bufPtr + 2, 7);
-						memcpy(atqa, bufPtr + 2 + 7, 2);
-						uid_len = (atqa[0] & 0xC0) == 0x40 ? 7 : 4;
-						sak = bufPtr[11];
-						PrintAndLog("tag select uid:%s atqa:0x%02x%02x sak:0x%02x", 
-							sprint_hex(uid + (7 - uid_len), uid_len),
-							atqa[1], 
-							atqa[0], 
-							sak);
-						if (wantLogToFile || wantDecrypt) {
-							FillFileNameByUID(logHexFileName, uid + (7 - uid_len), ".log", uid_len);
-							AddLogCurrentDT(logHexFileName);
-						}						
-						if (wantDecrypt) 
-							mfTraceInit(uid, atqa, sak, wantSaveToEmlFile);
-					} else {
-						PrintAndLog("%s(%d):%s", isTag ? "TAG":"RDR", num, sprint_hex(bufPtr, len));
-						if (wantLogToFile) 
-							AddLogHex(logHexFileName, isTag ? "TAG: ":"RDR: ", bufPtr, len);
-						if (wantDecrypt) 
-							mfTraceDecode(bufPtr, len, wantSaveToEmlFile);
-						num++;	
-					}
-					bufPtr += len;
-					bufPtr += ((len-1)/8+1);	// ignore parity
-				}
-				pckNum = 0;
-			}
-		} // resp not NULL
-	} // while (true)
-
-	free(buf);
-	return 0;
-}
-
 //needs nt, ar, at, Data to decrypt
 int CmdHf14MfDecryptBytes(const char *Cmd){
 	uint8_t data[50];
-	
 	uint32_t nt 	= param_get32ex(Cmd,0,0,16);
 	uint32_t ar_enc = param_get32ex(Cmd,1,0,16);
 	uint32_t at_enc = param_get32ex(Cmd,2,0,16);
@@ -2284,9 +2324,7 @@ static command_t CommandTable[] = {
 };
 
 int CmdHFMF(const char *Cmd) {
-	// flush
 	clearCommandBuffer();
-	//WaitForResponseTimeout(CMD_ACK,NULL,100);
 	CmdsParse(CommandTable, Cmd);
 	return 0;
 }