X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a501c82b196b614295a6e3bf7481da84affb0d8e..987c59849ef113c8111e7b3a7067b87a6837c882:/client/cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index c28563e2..9b43f411 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -7,91 +7,223 @@
 //-----------------------------------------------------------------------------
 // High frequency MIFARE commands
 //-----------------------------------------------------------------------------
-#include "../include/mifare.h"
+
 #include "cmdhfmf.h"
+#include "cmdhfmfhard.h"
+#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;
-	uint8_t isOK = 0;
-	uint8_t keyBlock[8] = {0};
-
-	UsbCommand c = {CMD_READER_MIFARE, {true, 0, 0}};
+	int16_t isOK = 0;
+	int tmpchar; 
+	uint8_t blockNo = 0;
+	
+	char cmdp = param_getchar(Cmd, 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("Press the key on the proxmark3 device to abort both proxmark3 and client.\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();
     SendCommand(&c);
 	
 	//flush queue
-	while (ukbhit())	getchar();
+	while (ukbhit()) {
+		tmpchar = getchar();
+		(void)tmpchar;
+	}
 
 	// wait cycle
 	while (true) {
         printf(".");
 		fflush(stdout);
 		if (ukbhit()) {
-			getchar();
+			tmpchar = getchar();
+			(void)tmpchar;
 			printf("\naborted via keyboard!\n");
 			break;
 		}
 		
 		UsbCommand resp;
-		if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
-			isOK  = resp.arg[0] & 0xff;
+		if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+			isOK  = resp.arg[0];
+			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);
-			printf("\n\n");
-			if (!isOK) PrintAndLog("Proxmark can't get statistic info. Execution aborted.\n");
+
+			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;
 	
 	// execute original function from util nonce2key
-	if (nonce2key(uid, nt, nr, par_list, ks_list, &r_key))
-	{
+	if (nonce2key(uid, nt, nr, par_list, ks_list, &r_key)) {
 		isOK = 2;
 		PrintAndLog("Key not found (lfsr_common_prefix list is null). Nt=%08x", nt);	
-	} else {
-		printf("------------------------------------------------------------------\n");
-		PrintAndLog("Key found:%012"llx" \n", r_key);
-
-		num_to_bytes(r_key, 6, keyBlock);
-		isOK = mfCheckKeys(0, 0, 1, keyBlock, &r_key);
-	}
-	if (!isOK) 
-		PrintAndLog("Found valid key:%012"llx, r_key);
-	else
-	{
-		if (isOK != 2) PrintAndLog("Found invalid key. ");	
 		PrintAndLog("Failing is expected to happen in 25%% of all cases. Trying again with a different reader nonce...");
 		c.arg[0] = false;
 		goto 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 %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};
@@ -123,10 +255,11 @@ int CmdHF14AMfWrBl(const char *Cmd)
 	PrintAndLog("--block no:%d, key type:%c, key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6));
 	PrintAndLog("--data: %s", sprint_hex(bldata, 16));
 	
-  UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};
+	UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};
 	memcpy(c.d.asBytes, key, 6);
 	memcpy(c.d.asBytes + 10, bldata, 16);
-  SendCommand(&c);
+	clearCommandBuffer();
+	SendCommand(&c);
 
 	UsbCommand resp;
 	if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
@@ -139,119 +272,7 @@ int CmdHF14AMfWrBl(const char *Cmd)
 	return 0;
 }
 
-/*  dublett finns i CMDHFMFU.C 
-int CmdHF14AMfUWrBl(const char *Cmd)
-{
-	uint8_t blockNo = 0;
-	bool chinese_card=0;
-	uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-	UsbCommand resp;
-       
-	if (strlen(Cmd)<3) {
-		PrintAndLog("Usage:  hf mf uwrbl    <block number> <block data (8 hex symbols)> <w>");
-		PrintAndLog("        sample: hf mf uwrbl 0 01020304");
-		return 0;
-	}      
-
-	blockNo = param_get8(Cmd, 0);
-	if (param_gethex(Cmd, 1, bldata, 8)) {
-		PrintAndLog("Block data must include 8 HEX symbols");
-		return 1;
-	}
-       
-	if (strchr(Cmd,'w') != 0) {
-	  chinese_card=1;
-	}
-       
-	switch(blockNo){
-		case 0:
-			if (!chinese_card){
-				PrintAndLog("Access Denied");
-			}else{
-				PrintAndLog("--specialblock no:%d", blockNo);
-				PrintAndLog("--data: %s", sprint_hex(bldata, 4));
-				UsbCommand d = {CMD_MIFAREU_WRITEBL, {blockNo}};
-				memcpy(d.d.asBytes,bldata, 4);
-				SendCommand(&d);
-
-				if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-					uint8_t isOK  = resp.arg[0] & 0xff;
-					PrintAndLog("isOk:%02x", isOK);
-				} else {
-					PrintAndLog("Command execute timeout");
-			      }
-			}
-			break;
-		case 1:
-			  if (!chinese_card){
-				PrintAndLog("Access Denied");
-			  }else{
-				PrintAndLog("--specialblock no:%d", blockNo);
-				PrintAndLog("--data: %s", sprint_hex(bldata, 4));
-				UsbCommand d = {CMD_MIFAREU_WRITEBL, {blockNo}};
-				memcpy(d.d.asBytes,bldata, 4);
-				SendCommand(&d);
-
-				if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-				uint8_t isOK  = resp.arg[0] & 0xff;
-				PrintAndLog("isOk:%02x", isOK);
-				} else {
-					PrintAndLog("Command execute timeout");
-				}
-			}
-			break;
-		case 2:
-			if (!chinese_card){
-				PrintAndLog("Access Denied");
-			}else{
-				PrintAndLog("--specialblock no:%d", blockNo);
-				PrintAndLog("--data: %s", sprint_hex(bldata, 4));
-				UsbCommand c = {CMD_MIFAREU_WRITEBL, {blockNo}};
-				memcpy(c.d.asBytes, bldata, 4);
-				SendCommand(&c);
-
-				if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-					uint8_t isOK  = resp.arg[0] & 0xff;
-					PrintAndLog("isOk:%02x", isOK);
-				} else {
-					PrintAndLog("Command execute timeout");
-				}
-			}
-			break;
-		case 3:
-			PrintAndLog("--specialblock no:%d", blockNo);
-			PrintAndLog("--data: %s", sprint_hex(bldata, 4));
-			UsbCommand d = {CMD_MIFAREU_WRITEBL, {blockNo}};
-			memcpy(d.d.asBytes,bldata, 4);
-			SendCommand(&d);
-
-			if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-				uint8_t isOK  = resp.arg[0] & 0xff;
-				PrintAndLog("isOk:%02x", isOK);
-			} else {
-				PrintAndLog("Command execute timeout");
-			}
-			break;
-		default: 
-			PrintAndLog("--block no:%d", blockNo);
-			PrintAndLog("--data: %s", sprint_hex(bldata, 4));        	
-			UsbCommand e = {CMD_MIFAREU_WRITEBL, {blockNo}};
-			memcpy(e.d.asBytes,bldata, 4);
-			SendCommand(&e);
-
-			if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-				uint8_t isOK  = resp.arg[0] & 0xff;
-				PrintAndLog("isOk:%02x", isOK);
-			} else {
-				PrintAndLog("Command execute timeout");
-		      }
-		      break;
-	}
-	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};
@@ -278,9 +299,10 @@ int CmdHF14AMfRdBl(const char *Cmd)
 	}
 	PrintAndLog("--block no:%d, key type:%c, key:%s ", blockNo, keyType?'B':'A', sprint_hex(key, 6));
 	
-  UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};
+	UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};
 	memcpy(c.d.asBytes, key, 6);
-  SendCommand(&c);
+	clearCommandBuffer();
+	SendCommand(&c);
 
 	UsbCommand resp;
 	if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
@@ -298,135 +320,7 @@ int CmdHF14AMfRdBl(const char *Cmd)
   return 0;
 }
 
-/* dublett finns i CMDHFMFU.C 
-int CmdHF14AMfURdBl(const char *Cmd)
-{
-	uint8_t blockNo = 0;
-
-    if (strlen(Cmd)<1) {
-		PrintAndLog("Usage:  hf mf urdbl    <block number>");
-		PrintAndLog("        sample: hf mf urdbl 0");
-        return 0;
-    }       
-        
-    blockNo = param_get8(Cmd, 0);
-    PrintAndLog("--block no:%d", blockNo);
-        
-	UsbCommand c = {CMD_MIFAREU_READBL, {blockNo}};
-	SendCommand(&c);
-
-    UsbCommand resp;
-    if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-		uint8_t isOK = resp.arg[0] & 0xff;
-        uint8_t *data = resp.d.asBytes;
-
-        if (isOK)
-            PrintAndLog("isOk:%02x data:%s", isOK, sprint_hex(data, 4));
-        else
-            PrintAndLog("isOk:%02x", isOK);
-    } else {
-        PrintAndLog("Command execute timeout");
-    }
-
-	return 0;
-}
-*/
-
-/* dublett finns i CMDHFMFU.C 
-int CmdHF14AMfURdCard(const char *Cmd)
-{
-    int i;
-    uint8_t sectorNo = 0;
-	uint8_t *lockbytes_t=NULL;
-	uint8_t lockbytes[2]={0,0};
-	bool bit[16]={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-        
-    uint8_t isOK  = 0;
-    uint8_t * data  = NULL;
-
-    if (sectorNo > 15) {
-        PrintAndLog("Sector number must be less than 16");
-        return 1;
-    }
-    PrintAndLog("Attempting to Read Ultralight... ");
-        
-  	UsbCommand c = {CMD_MIFAREU_READCARD, {sectorNo}};
-  	SendCommand(&c);
-
-    UsbCommand resp;
-    if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-        isOK = resp.arg[0] & 0xff;
-        data = resp.d.asBytes;
-
-        PrintAndLog("isOk:%02x", isOK);
-        if (isOK) 
-            for (i = 0; i < 16; i++) {
-			switch(i){
-				case 2:
-					//process lock bytes
-					lockbytes_t=data+(i*4);
-					lockbytes[0]=lockbytes_t[2];
-					lockbytes[1]=lockbytes_t[3];
-					for(int j=0; j<16; j++){
-						bit[j]=lockbytes[j/8] & ( 1 <<(7-j%8));
-					}
-					//PrintAndLog("LB %02x %02x", lockbytes[0],lockbytes[1]);
-					//PrintAndLog("LB2b %02x %02x %02x %02x %02x %02x %02x %02x",bit[8],bit[9],bit[10],bit[11],bit[12],bit[13],bit[14],bit[15]);		
-					PrintAndLog("Block %3d:%s ", i,sprint_hex(data + i * 4, 4));
-					break;
-				case 3: 
-					PrintAndLog("Block %3d:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[4]);
-					break;
-				case 4:
-                    PrintAndLog("Block %3d:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[3]);
-					break;
-				case 5:
-                    PrintAndLog("Block %3d:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[2]);
-					break;
-				case 6:
-                    PrintAndLog("Block %3d:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[1]);
-					break;
-				case 7:
-                    PrintAndLog("Block %3d:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[0]);
-					break;
-				case 8:
-                    PrintAndLog("Block %3d:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[15]);
-					break;
-				case 9:
-                    PrintAndLog("Block %3d:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[14]);
-					break;
-				case 10:
-                    PrintAndLog("Block %3d:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[13]);
-					break;
-				case 11:
-                    PrintAndLog("Block %3d:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[12]);
-					break;
-				case 12:
-                    PrintAndLog("Block %3d:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[11]);
-					break;
-				case 13:
-                    PrintAndLog("Block %3d:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[10]);
-					break;
-				case 14:
-                    PrintAndLog("Block %3d:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[9]);
-					break;
-				case 15:
-                    PrintAndLog("Block %3d:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[8]);
-					break;
-				default:
-					PrintAndLog("Block %3d:%s ", i,sprint_hex(data + i * 4, 4));
-					break;
-				}
-                        }
-        } else {
-                PrintAndLog("Command execute timeout");
-        }
-  return 0;
-}
-*/
-
-int CmdHF14AMfRdSc(const char *Cmd)
-{
+int CmdHF14AMfRdSc(const char *Cmd) {
 	int i;
 	uint8_t sectorNo = 0;
 	uint8_t keyType = 0;
@@ -460,6 +354,7 @@ int CmdHF14AMfRdSc(const char *Cmd)
 	
 	UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};
 	memcpy(c.d.asBytes, key, 6);
+	clearCommandBuffer();
 	SendCommand(&c);
 	PrintAndLog(" ");
 
@@ -482,9 +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 {
@@ -492,9 +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 {
@@ -502,9 +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];
@@ -518,14 +407,7 @@ int CmdHF14AMfDump(const char *Cmd)
 	
 	UsbCommand resp;
 
-	int size = GetCardSize();		
 	char cmdp = param_getchar(Cmd, 0);
-
-	if  ( size > -1) 
-		cmdp = (char)(48+size);
-
-	PrintAndLog("Got %d",cmdp);
-		
 	switch (cmdp) {
 		case '0' : numSectors = 5; break;
 		case '1' : 
@@ -545,13 +427,15 @@ int CmdHF14AMfDump(const char *Cmd)
 	}
 	
 	if ((fin = fopen("dumpkeys.bin","rb")) == NULL) {
-		PrintAndLog("Could not find file dumpkeys.bin");		
+		PrintAndLog("Could not find file dumpkeys.bin");
 		return 1;
 	}
 	
 	// Read keys A from file
+	size_t bytes_read;
 	for (sectorNo=0; sectorNo<numSectors; sectorNo++) {
-		if (fread( keyA[sectorNo], 1, 6, fin ) == 0) {
+		bytes_read = fread( keyA[sectorNo], 1, 6, fin );
+		if ( bytes_read == 0) {
 			PrintAndLog("File reading error.");
 			fclose(fin);
 			return 2;
@@ -560,7 +444,8 @@ int CmdHF14AMfDump(const char *Cmd)
 	
 	// Read keys B from file
 	for (sectorNo=0; sectorNo<numSectors; sectorNo++) {
-		if (fread( keyB[sectorNo], 1, 6, fin ) == 0) {
+		bytes_read = fread( keyB[sectorNo], 1, 6, fin );
+		if ( bytes_read == 0) {
 			PrintAndLog("File reading error.");
 			fclose(fin);
 			return 2;
@@ -568,7 +453,7 @@ int CmdHF14AMfDump(const char *Cmd)
 	}
 	
 	fclose(fin);
-	
+
 	PrintAndLog("|-----------------------------------------|");
 	PrintAndLog("|------ Reading sector access bits...-----|");
 	PrintAndLog("|-----------------------------------------|");
@@ -576,6 +461,7 @@ int CmdHF14AMfDump(const char *Cmd)
 	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
 		UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}};
 		memcpy(c.d.asBytes, keyA[sectorNo], 6);
+		clearCommandBuffer();
 		SendCommand(&c);
 
 		if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
@@ -610,6 +496,7 @@ int CmdHF14AMfDump(const char *Cmd)
 			if (blockNo == NumBlocksPerSector(sectorNo) - 1) {		// sector trailer. At least the Access Conditions can always be read with key A. 
 				UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};
 				memcpy(c.d.asBytes, keyA[sectorNo], 6);
+				clearCommandBuffer();
 				SendCommand(&c);
 				received = WaitForResponseTimeout(CMD_ACK,&resp,1500);
 			} else {												// data block. Check if it can be read with key A or key B
@@ -621,12 +508,13 @@ int CmdHF14AMfDump(const char *Cmd)
 					received = WaitForResponseTimeout(CMD_ACK,&resp,1500);
 				} else if (rights[sectorNo][data_area] == 0x07) {										// no key would work
 					isOK = false;
-						PrintAndLog("Access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);
+					PrintAndLog("Access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);
 				} else {																				// key A would work
-						UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};
-						memcpy(c.d.asBytes, keyA[sectorNo], 6);
-						SendCommand(&c);
-						received = WaitForResponseTimeout(CMD_ACK,&resp,1500);
+					UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};
+					memcpy(c.d.asBytes, keyA[sectorNo], 6);
+					clearCommandBuffer();
+					SendCommand(&c);
+					received = WaitForResponseTimeout(CMD_ACK,&resp,1500);
 				}
 			}
 
@@ -673,16 +561,14 @@ int CmdHF14AMfDump(const char *Cmd)
 		fclose(fout);
 		PrintAndLog("Dumped %d blocks (%d bytes) to file dumpdata.bin", numblocks, 16*numblocks);
 	}
-	
+		
 	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};
+	uint8_t key[6] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
 	uint8_t bldata[16] = {0x00};
 	uint8_t keyA[40][6];
 	uint8_t keyB[40][6];
@@ -701,7 +587,7 @@ int CmdHF14AMfRestore(const char *Cmd)
 		default:   numSectors = 16;
 	}	
 
-	if (cmdp == 'h' || cmdp == 'H') {
+	if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {
 		PrintAndLog("Usage:   hf mf restore [card memory]");
 		PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
 		PrintAndLog("");
@@ -709,28 +595,33 @@ int CmdHF14AMfRestore(const char *Cmd)
 		PrintAndLog("         hf mf restore 4");
 		return 0;
 	}
-	
+
 	if ((fkeys = fopen("dumpkeys.bin","rb")) == NULL) {
 		PrintAndLog("Could not find file dumpkeys.bin");
 		return 1;
 	}
 	
+	size_t bytes_read;
 	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
-		if (fread(keyA[sectorNo], 1, 6, fkeys) == 0) {
+		bytes_read = fread( keyA[sectorNo], 1, 6, fkeys );
+		if ( bytes_read == 0) {
 			PrintAndLog("File reading error (dumpkeys.bin).");
+			fclose(fkeys);
 			return 2;
 		}
 	}
 
 	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
-		if (fread(keyB[sectorNo], 1, 6, fkeys) == 0) {
+		bytes_read = fread( keyB[sectorNo], 1, 6, fkeys );
+		if ( bytes_read == 0) {
 			PrintAndLog("File reading error (dumpkeys.bin).");
+			fclose(fkeys);
 			return 2;
 		}
 	}
 
 	fclose(fkeys);
-	
+
 	if ((fdump = fopen("dumpdata.bin","rb")) == NULL) {
 		PrintAndLog("Could not find file dumpdata.bin");
 		return 1;
@@ -740,10 +631,11 @@ int CmdHF14AMfRestore(const char *Cmd)
 	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
 		for(blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
 			UsbCommand c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}};
-			memcpy(c.d.asBytes, key, 6);
-			
-			if (fread(bldata, 1, 16, fdump) == 0) {
+			memcpy(c.d.asBytes, key, 6);			
+			bytes_read = fread(bldata, 1, 16, fdump);
+			if ( bytes_read == 0) {
 				PrintAndLog("File reading error (dumpdata.bin).");
+				fclose(fdump);
 				return 2;
 			}
 					
@@ -765,6 +657,7 @@ int CmdHF14AMfRestore(const char *Cmd)
 			PrintAndLog("Writing to block %3d: %s", FirstBlockOfSector(sectorNo) + blockNo, sprint_hex(bldata, 16));
 			
 			memcpy(c.d.asBytes + 10, bldata, 16);
+			clearCommandBuffer();
 			SendCommand(&c);
 
 			UsbCommand resp;
@@ -778,13 +671,10 @@ int CmdHF14AMfRestore(const char *Cmd)
 	}
 	
 	fclose(fdump);
-
 	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;
@@ -793,7 +683,7 @@ int CmdHF14AMfNested(const char *Cmd)
 	uint8_t trgKeyType = 0;
 	uint8_t SectorsCnt = 0;
 	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-	uint8_t keyBlock[13*6];
+	uint8_t keyBlock[6*6];
 	uint64_t key64 = 0;
 	bool transferToEml = false;
 	
@@ -801,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;
@@ -867,39 +742,42 @@ int CmdHF14AMfNested(const char *Cmd)
 	transferToEml |= (ctmp == 'd' || ctmp == 'D');
 	
 	if (cmdp == 'o') {
-		PrintAndLog("--target block no:%3d, target key type:%c ", trgBlockNo, trgKeyType?'B':'A');
-		if (mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true)) {
-			PrintAndLog("Nested error.");
-			return 2;
-		}
-		key64 = bytes_to_num(keyBlock, 6);
-		if (key64) {
-			PrintAndLog("Found valid key:%012"llx, key64);
-
-			// transfer key to the emulator
-			if (transferToEml) {
-				uint8_t sectortrailer;
-				if (trgBlockNo < 32*4) { 	// 4 block sector
-					sectortrailer = (trgBlockNo & 0x03) + 3;
-				} else {					// 16 block sector
-					sectortrailer = (trgBlockNo & 0x0f) + 15;
+		int16_t isOK = mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true);
+		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 (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);
+
+				// transfer key to the emulator
+				if (transferToEml) {
+					uint8_t sectortrailer;
+					if (trgBlockNo < 32*4) { 	// 4 block sector
+						sectortrailer = (trgBlockNo & 0x03) + 3;
+					} else {					// 16 block sector
+						sectortrailer = (trgBlockNo & 0x0f) + 15;
+					}
+					mfEmlGetMem(keyBlock, sectortrailer, 1);
+			
+					if (!trgKeyType)
+						num_to_bytes(key64, 6, keyBlock);
+					else
+						num_to_bytes(key64, 6, &keyBlock[10]);
+					mfEmlSetMem(keyBlock, sectortrailer, 1);		
 				}
-				mfEmlGetMem(keyBlock, sectortrailer, 1);
-		
-				if (!trgKeyType)
-					num_to_bytes(key64, 6, keyBlock);
-				else
-					num_to_bytes(key64, 6, &keyBlock[10]);
-				mfEmlSetMem(keyBlock, sectortrailer, 1);		
-			}
-		} else {
-			PrintAndLog("No valid key found");
+				return 0;
+			default : PrintAndLog("Unknown Error.\n");
 		}
+		return 2;
 	}
 	else { // ------------------------------------  multiple sectors working
-		clock_t time1;
-		time1 = clock();
-
+		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;
 		
@@ -910,77 +788,103 @@ int CmdHF14AMfNested(const char *Cmd)
 		num_to_bytes(0xa0a1a2a3a4a5, 6, (uint8_t*)(keyBlock + 3 * 6));
 		num_to_bytes(0xb0b1b2b3b4b5, 6, (uint8_t*)(keyBlock + 4 * 6));
 		num_to_bytes(0xaabbccddeeff, 6, (uint8_t*)(keyBlock + 5 * 6));
-		num_to_bytes(0x4d3a99c351dd, 6, (uint8_t*)(keyBlock + 6 * 6));
-		num_to_bytes(0x1a982c7e459a, 6, (uint8_t*)(keyBlock + 7 * 6));
-		num_to_bytes(0xd3f7d3f7d3f7, 6, (uint8_t*)(keyBlock + 8 * 6));
-		num_to_bytes(0x714c5c886e97, 6, (uint8_t*)(keyBlock + 9 * 6));
-		num_to_bytes(0x587ee5f9350f, 6, (uint8_t*)(keyBlock + 10 * 6));
-		num_to_bytes(0xa0478cc39091, 6, (uint8_t*)(keyBlock + 11 * 6));
-		num_to_bytes(0x533cb6c723f6, 6, (uint8_t*)(keyBlock + 12 * 6));
-		num_to_bytes(0x8fd0a4f256e9, 6, (uint8_t*)(keyBlock + 13 * 6));
 
 		PrintAndLog("Testing known keys. Sector count=%d", SectorsCnt);
 		for (i = 0; i < SectorsCnt; i++) {
 			for (j = 0; j < 2; j++) {
 				if (e_sector[i].foundKey[j]) continue;
 				
-				res = mfCheckKeys(FirstBlockOfSector(i), j, 6, keyBlock, &key64);
+				res = mfCheckKeys(FirstBlockOfSector(i), j, true, 6, keyBlock, &key64);
 				
 				if (!res) {
 					e_sector[i].Key[j] = key64;
-					e_sector[i].foundKey[j] = 1;
+					e_sector[i].foundKey[j] = TRUE;
 				}
 			}
 		}
+		clock_t t2 = clock() - t1;
+		time(&end);
+		elapsed_time = difftime(end, start);	
+		if ( t2 > 0 )
+			PrintAndLog("Time to check 6 known keys: %.0f ticks %u seconds\n", (float)t2 , elapsed_time);
+		
+		PrintAndLog("enter nested...");	
 		
 		// nested sectors
 		iterations = 0;
-		PrintAndLog("nested...");
 		bool calibrate = true;
+
 		for (i = 0; i < NESTED_SECTOR_RETRY; i++) {
-			for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {
+			for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; ++sectorNo) {
+				for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) { 
 
-				if (ukbhit()) {
-					printf("\naborted via keyboard!\n");
-					free(e_sector);
-					return 2;
-				}			
-			
-				for (trgKeyType = 0; trgKeyType < 2; trgKeyType++) { 
 					if (e_sector[sectorNo].foundKey[trgKeyType]) continue;
-					PrintAndLog("-----------------------------------------------");
-					if(mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate)) {
-						PrintAndLog("Nested error.\n");
-						free(e_sector);
-						return 2;					}
-					else {
-						calibrate = false;
-					}
 					
-					iterations++;
-
-					key64 = bytes_to_num(keyBlock, 6);
-					if (key64) {
-						PrintAndLog("Found valid key:%012"llx, key64);
-						e_sector[sectorNo].foundKey[trgKeyType] = 1;
-						e_sector[sectorNo].Key[trgKeyType] = key64;
+					int16_t isOK = mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate);
+					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 (its random number generator is not predictable).\n"); break;
+						case -4 : //key not found
+							calibrate = false;
+							iterations++;
+							continue; 
+						case -5 :
+							calibrate = false;
+							iterations++;
+							e_sector[sectorNo].foundKey[trgKeyType] = 1;
+							e_sector[sectorNo].Key[trgKeyType] = bytes_to_num(keyBlock, 6);
+							continue;
+							
+						default : PrintAndLog("Unknown Error.\n");
 					}
+					free(e_sector);
+					return 2;
 				}
 			}
 		}
-
-		printf("Time in nested: %1.3f (%1.3f sec per key)\n\n", ((float)clock() - time1)/CLOCKS_PER_SEC, ((float)clock() - time1)/iterations/CLOCKS_PER_SEC);
 		
-		PrintAndLog("-----------------------------------------------\nIterations count: %d\n\n", iterations);
-		//print them
-		PrintAndLog("|---|----------------|---|----------------|---|");
-		PrintAndLog("|sec|key A           |res|key B           |res|");
-		PrintAndLog("|---|----------------|---|----------------|---|");
+		t1 = clock() - t1;
+		time(&end);
+		elapsed_time = difftime(end, start);	
+		if ( t1 > 0 )
+			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...");
 		for (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]);
+			// 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;
+					
+				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] = TRUE;
+					e_sector[i].Key[1] = key64;
+				}
+			}
 		}
-		PrintAndLog("|---|----------------|---|----------------|---|");
+
+		
+		//print them
+		printKeyTable( SectorsCnt, e_sector );
 		
 		// transfer them to the emulator
 		if (transferToEml) {
@@ -1022,33 +926,119 @@ int CmdHF14AMfNested(const char *Cmd)
 			}
 			fclose(fkeys);
 		}
-
+		
 		free(e_sector);
 	}
 	return 0;
 }
 
+int CmdHF14AMfNestedHard(const char *Cmd) {
+	uint8_t blockNo = 0;
+	uint8_t keyType = 0;
+	uint8_t trgBlockNo = 0;
+	uint8_t trgKeyType = 0;
+	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
+	uint8_t trgkey[6] = {0, 0, 0, 0, 0, 0};
+	
+	char ctmp;
+	ctmp = param_getchar(Cmd, 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;
+	bool nonce_file_write = false;
+	bool slow = false;
+	int tests = 0;
+	
+	if (ctmp == 'R' || ctmp == 'r') {
+		nonce_file_read = true;
+		if (!param_gethex(Cmd, 1, trgkey, 12)) {
+			know_target_key = true;
+		}
+	} else if (ctmp == 'T' || ctmp == 't') {
+		tests = param_get32ex(Cmd, 1, 100, 10);
+	} else {
+		blockNo = param_get8(Cmd, 0);
+		ctmp = param_getchar(Cmd, 1);
+		if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {
+			PrintAndLog("Key type must be A or B");
+			return 1;
+		}
+		if (ctmp != 'A' && ctmp != 'a') { 
+			keyType = 1;
+		}
+		
+		if (param_gethex(Cmd, 2, key, 12)) {
+			PrintAndLog("Key must include 12 HEX symbols");
+			return 1;
+		}
+		
+		trgBlockNo = param_get8(Cmd, 3);
+		ctmp = param_getchar(Cmd, 4);
+		if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {
+			PrintAndLog("Target key type must be A or B");
+			return 1;
+		}
+		if (ctmp != 'A' && ctmp != 'a') {
+			trgKeyType = 1;
+		}
+
+		uint16_t i = 5;
 
-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\n");
-		PrintAndLog("t - write keys to emulator memory");
-		PrintAndLog("      sample: hf mf chk 0 A 1234567890ab keys.dic");
-		PrintAndLog("              hf mf chk *1 ? t");
-		PrintAndLog("              hf mf chk *1 ? d");
-		return 0;
+		if (!param_gethex(Cmd, 5, trgkey, 12)) {
+			know_target_key = true;
+			i++;
+		}
+
+		while ((ctmp = param_getchar(Cmd, i))) {
+			if (ctmp == 's' || ctmp == 'S') {
+				slow = true;
+			} else if (ctmp == 'w' || ctmp == 'W') {
+				nonce_file_write = true;
+			} else {
+				PrintAndLog("Possible options are w and/or s");
+				return 1;
+			}
+			i++;
+		}
 	}
-	
+
+	PrintAndLog("--target block no:%3d, target key type:%c, known target key: 0x%02x%02x%02x%02x%02x%02x%s, file action: %s, Slow: %s, Tests: %d ", 
+			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",
+			tests);
+
+	int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key?trgkey:NULL, nonce_file_read, nonce_file_write, slow, tests);
+
+	if (isOK) {
+		switch (isOK) {
+			case 1 : PrintAndLog("Error: No response from Proxmark.\n"); break;
+			case 2 : PrintAndLog("Button pressed. Aborted.\n"); break;
+			default : break;
+		}
+		return 2;
+	}
+
+	return 0;
+}
+
+int CmdHF14AMfChk(const char *Cmd) {
+
+	if (strlen(Cmd)<3) return usage_hf14_chk();
+
 	FILE * f;
 	char filename[FILE_PATH_SIZE]={0};
 	char buf[13];
 	uint8_t *keyBlock = NULL, *p;
 	uint8_t stKeyBlock = 20;
 	
+	sector *e_sector = NULL;
+	
 	int i, res;
 	int	keycnt = 0;
 	char ctmp	= 0x00;
@@ -1057,14 +1047,15 @@ int CmdHF14AMfChk(const char *Cmd)
 	uint8_t keyType = 0;
 	uint64_t key64 = 0;
 	
+	uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+		
 	int transferToEml = 0;
 	int createDumpFile = 0;
 
 	keyBlock = calloc(stKeyBlock, 6);
 	if (keyBlock == NULL) return 1;
 
-	uint64_t defaultKeys[] =
-	{
+	uint64_t defaultKeys[] = {
 		0xffffffffffff, // Default key (first key used by program if no user defined key)
 		0x000000000000, // Blank key
 		0xa0a1a2a3a4a5, // NFCForum MAD key
@@ -1082,9 +1073,8 @@ int CmdHF14AMfChk(const char *Cmd)
 	int defaultKeysSize = sizeof(defaultKeys) / sizeof(uint64_t);
 
 	for (int defaultKeyCounter = 0; defaultKeyCounter < defaultKeysSize; defaultKeyCounter++)
-	{
 		num_to_bytes(defaultKeys[defaultKeyCounter], 6, (uint8_t*)(keyBlock + defaultKeyCounter * 6));
-	}
+
 	
 	if (param_getchar(Cmd, 0)=='*') {
 		blockNo = 3;
@@ -1095,9 +1085,9 @@ int CmdHF14AMfChk(const char *Cmd)
 			case '4': SectorsCnt = 40; break;
 			default:  SectorsCnt = 16;
 		}
-	}
-	else
+	} else {
 		blockNo = param_get8(Cmd, 0);
+	}
 	
 	ctmp = param_getchar(Cmd, 1);
 	switch (ctmp) {	
@@ -1112,6 +1102,7 @@ int CmdHF14AMfChk(const char *Cmd)
 		break;
 	default:
 		PrintAndLog("Key type must be A , B or ?");
+		free(keyBlock);
 		return 1;
 	};
 	
@@ -1130,7 +1121,7 @@ int CmdHF14AMfChk(const char *Cmd)
 				}
 				keyBlock = p;
 			}
-			PrintAndLog("chk key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
+			PrintAndLog("key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
 			(keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
 			(keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],	(keyBlock + 6*keycnt)[5], 6);
 			keycnt++;
@@ -1163,13 +1154,14 @@ int CmdHF14AMfChk(const char *Cmd)
 						if (!p) {
 							PrintAndLog("Cannot allocate memory for defKeys");
 							free(keyBlock);
+							fclose(f);
 							return 2;
 						}
 						keyBlock = p;
 					}
 					memset(keyBlock + 6 * keycnt, 0, 6);
 					num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);
-					PrintAndLog("chk custom key[%2d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));
+					PrintAndLog("check key[%2d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));
 					keycnt++;
 					memset(buf, 0, sizeof(buf));
 				}
@@ -1186,175 +1178,405 @@ int CmdHF14AMfChk(const char *Cmd)
 	if (keycnt == 0) {
 		PrintAndLog("No key specified, trying default keys");
 		for (;keycnt < defaultKeysSize; keycnt++)
-			PrintAndLog("chk default key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
-			(keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
-			(keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],	(keyBlock + 6*keycnt)[5], 6);
+			PrintAndLog("key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
+				(keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
+				(keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],	(keyBlock + 6*keycnt)[5], 6);
 	}
 	
 	// initialize storage for found keys
-	bool validKey[2][40];
-	uint8_t foundKey[2][40][6];
-	for (uint16_t t = 0; t < 2; t++) {
-		for (uint16_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {
-			validKey[t][sectorNo] = false;
-			for (uint16_t i = 0; i < 6; i++) {
-				foundKey[t][sectorNo][i] = 0xff;
-			}
-		}
+	e_sector = calloc(SectorsCnt, sizeof(sector));
+	if (e_sector == NULL) {
+		free(keyBlock);
+		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;
 	}
+		
 	
-	for ( int t = !keyType; t < 2; keyType==2?(t++):(t=2) ) {
-		int b=blockNo;
+	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 = !keyType;  trgKeyType < 2;  (keyType==2) ? (++trgKeyType) : (trgKeyType=2) ) {
+
+		int b = blockNo;
 		for (int i = 0; i < SectorsCnt; ++i) {
-			PrintAndLog("--sector:%2d, block:%3d, key type:%C, key count:%2d ", i, b, t?'B':'A', keycnt);
-			uint32_t max_keys = keycnt>USB_CMD_DATA_SIZE/6?USB_CMD_DATA_SIZE/6:keycnt;
-			for (uint32_t c = 0; c < keycnt; c+=max_keys) {
-				uint32_t size = keycnt-c>max_keys?max_keys:keycnt-c;
-				res = mfCheckKeys(b, t, size, &keyBlock[6*c], &key64);
-				if (res != 1) {
-					if (!res) {
-						PrintAndLog("Found valid key:[%012"llx"]",key64);
-						num_to_bytes(key64, 6, foundKey[t][i]);
-						validKey[t][i] = true;
-					} 
-				} else {
-					PrintAndLog("Command execute timeout");
+			
+			// skip already found keys.
+			if (e_sector[i].foundKey[trgKeyType]) continue;
+						
+			for (uint32_t c = 0; c < keycnt; c += max_keys) {
+				printf(".");
+				fflush(stdout);			
+				uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c;
+				
+				res = mfCheckKeys(b, trgKeyType, true, size, &keyBlock[6*c], &key64);
+				if (!res) {
+					e_sector[i].Key[trgKeyType] = key64;
+					e_sector[i].foundKey[trgKeyType] = TRUE;
+					break;
 				}
 			}
-			b<127?(b+=4):(b+=16);	
+			b < 127 ? ( b +=4 ) : ( b += 16 );	
 		}
 	}
+	t1 = clock() - t1;
+	time(&end);
+	unsigned long elapsed_time = difftime(end, start);	
+	if ( t1 > 0 )
+		PrintAndLog("\nTime in checkkeys: %.0f ticks %u seconds\n", (float)t1, elapsed_time);
 
-	if (transferToEml) {
-		uint8_t block[16];
-		for (uint16_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {
-			if (validKey[0][sectorNo] || validKey[1][sectorNo]) {
-				mfEmlGetMem(block, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);
-				for (uint16_t t = 0; t < 2; t++) {
-					if (validKey[t][sectorNo]) {
-						memcpy(block + t*10, foundKey[t][sectorNo], 6);
-		}
-			}
-				mfEmlSetMem(block, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);
+		
+	// 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?
+	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);
+				
+				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;
+				}
 			}
 		}
-		PrintAndLog("Found keys have been transferred to the emulator memory");
-			}
+	}
 
+
+	//print them
+	printKeyTable( SectorsCnt, e_sector );
+	
+	if (transferToEml) {
+		uint8_t block[16] = {0x00};
+		for (uint8_t i = 0; i < SectorsCnt; ++i ) {
+			mfEmlGetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
+			if (e_sector[i].foundKey[0])
+				num_to_bytes(e_sector[i].Key[0], 6, block);
+			if (e_sector[i].foundKey[1])
+				num_to_bytes(e_sector[i].Key[1], 6, block+10);
+			mfEmlSetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
+		}
+		PrintAndLog("Found keys have been transferred to the emulator memory");
+	}
+	
 	if (createDumpFile) {
 		FILE *fkeys = fopen("dumpkeys.bin","wb");
 		if (fkeys == NULL) { 
 			PrintAndLog("Could not create file dumpkeys.bin");
 			free(keyBlock);
+			free(e_sector);
 			return 1;
-			}
-		for (uint16_t t = 0; t < 2; t++) {
-			fwrite(foundKey[t], 1, 6*SectorsCnt, fkeys);
+		}
+		PrintAndLog("Printing keys to binary file dumpkeys.bin...");
+	
+		for( i=0; i<SectorsCnt; i++) {
+			num_to_bytes(e_sector[i].Key[0], 6, tempkey);
+			fwrite ( tempkey, 1, 6, fkeys );
+		}
+		for(i=0; i<SectorsCnt; i++) {
+			num_to_bytes(e_sector[i].Key[1], 6, tempkey);
+			fwrite ( tempkey, 1, 6, fkeys );
 		}
 		fclose(fkeys);
-		PrintAndLog("Found keys have been dumped to file dumpkeys.bin. 0xffffffffffff has been inserted for unknown keys.");
+		PrintAndLog("Found keys have been dumped to file dumpkeys.bin. 0xffffffffffff has been inserted for unknown keys.");			
 	}
-
+	
 	free(keyBlock);
-
-  return 0;
+	free(e_sector);
+	PrintAndLog("");
+	return 0;
 }
 
-
-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;
-
-	if (param_getchar(Cmd, 0) == 'h') {
-		PrintAndLog("Usage:  hf mf sim  u <uid (8 hex symbols)> n <numreads> i x");
-		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("           sample: hf mf sim u 0a0a0a0a ");
-		return 0;
-	}
+	uint8_t flags = (FLAG_UID_IN_EMUL | FLAG_4B_UID_IN_DATA);
+	int uidlen = 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;
+	uint8_t cmdp = param_getchar(Cmd, 0);
+
+	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"
-				, exitAfterNReads, flags,flags);
-
+	
+	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)
-	{
-		UsbCommand resp;
-		PrintAndLog("Press pm3-button to abort simulation");
-		while(! WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-			//We're waiting only 1.5 s at a time, otherwise we get the
-			// annoying message about "Waiting for a response... "
+	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));	
+			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 CmdHF14AMfSniff(const char *Cmd){
+	bool wantLogToFile = FALSE;
+	bool wantDecrypt = FALSE;
+	//bool wantSaveToEml = FALSE; TODO
+	bool wantSaveToEmlFile = FALSE;
+
+	//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) {
 
-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;
-	}	
+	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);
+	UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}};
+	SendCommand(&c);
+	return 0;
+}
 
-  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;
-	uint8_t data[16];
+	uint8_t data[16] = {0x00};
 
 	if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {
 		PrintAndLog("Usage:  hf mf eget <block number>");
@@ -1374,7 +1596,6 @@ int CmdHF14AMfEGet(const char *Cmd)
   return 0;
 }
 
-
 int CmdHF14AMfEClear(const char *Cmd)
 {
 	if (param_getchar(Cmd, 0) == 'h') {
@@ -1383,12 +1604,11 @@ int CmdHF14AMfEClear(const char *Cmd)
 		return 0;
 	}	
 
-  UsbCommand c = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}};
-  SendCommand(&c);
-  return 0;
+	UsbCommand c = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}};
+	SendCommand(&c);
+	return 0;
 }
 
-
 int CmdHF14AMfESet(const char *Cmd)
 {
 	uint8_t memBlock[16];
@@ -1416,26 +1636,22 @@ int CmdHF14AMfESet(const char *Cmd)
 	return 0;
 }
 
-
 int CmdHF14AMfELoad(const char *Cmd)
 {
 	FILE * f;
 	char filename[FILE_PATH_SIZE];
 	char *fnameptr = filename;
-	char buf[64];
-	uint8_t buf8[64];
+	char buf[64] = {0x00};
+	uint8_t buf8[64] = {0x00};
 	int i, len, blockNum, numBlocks;
 	int nameParamNo = 1;
-	
-	memset(filename, 0, sizeof(filename));
-	memset(buf, 0, sizeof(buf));
-
+	uint8_t blockWidth = 32;
 	char ctmp = param_getchar(Cmd, 0);
 		
-	if ( ctmp == 'h' || ctmp == 0x00) {
+	if ( ctmp == 'h' || ctmp == 'H' || ctmp == 0x00) {
 		PrintAndLog("It loads emul dump from the file `filename.eml`");
-		PrintAndLog("Usage:  hf mf eload [card memory] <file name w/o `.eml`>");
-		PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
+		PrintAndLog("Usage:  hf mf eload [card memory] <file name w/o `.eml`> [numblocks]");
+		PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K, u = UL");
 		PrintAndLog("");
 		PrintAndLog(" sample: hf mf eload filename");
 		PrintAndLog("         hf mf eload 4 filename");
@@ -1448,15 +1664,19 @@ int CmdHF14AMfELoad(const char *Cmd)
 		case '\0': numBlocks = 16*4; break;
 		case '2' : numBlocks = 32*4; break;
 		case '4' : numBlocks = 256; break;
+		case 'U' : // fall through
+		case 'u' : numBlocks = 255; blockWidth = 8; break;
 		default:  {
 			numBlocks = 16*4;
 			nameParamNo = 0;
 		}
 	}
+	uint32_t numblk2 = param_get32ex(Cmd,2,0,10);
+	if (numblk2 > 0) numBlocks = numblk2;	
 
 	len = param_getstr(Cmd,nameParamNo,filename);
 	
-	if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
+	if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;
 
 	fnameptr += len;
 
@@ -1469,9 +1689,6 @@ int CmdHF14AMfELoad(const char *Cmd)
 		return 1;
 	}
 	
-//		for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
-//		for(blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
-	
 	blockNum = 0;
 	while(!feof(f)){
 		memset(buf, 0, sizeof(buf));
@@ -1485,37 +1702,38 @@ int CmdHF14AMfELoad(const char *Cmd)
 			return 2;
 		}
 		
-		if (strlen(buf) < 32){
+		if (strlen(buf) < blockWidth){
 			if(strlen(buf) && feof(f))
 				break;
-			PrintAndLog("File content error. Block data must include 32 HEX symbols");
+			PrintAndLog("File content error. Block data must include %d HEX symbols", blockWidth);
+			fclose(f);
 			return 2;
 		}
 		
-		for (i = 0; i < 32; i += 2) {
+		for (i = 0; i < blockWidth; i += 2) {
 			sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);
 		}
-		
-		if (mfEmlSetMem(buf8, blockNum, 1)) {
+		if (mfEmlSetMem_xt(buf8, blockNum, 1, blockWidth/2)) {
 			PrintAndLog("Cant set emul block: %3d", blockNum);
+			fclose(f);
 			return 3;
 		}
+		printf(".");
 		blockNum++;
 		
 		if (blockNum >= numBlocks) break;
 	}
 	fclose(f);
+	printf("\n");
 	
 	if ((blockNum != numBlocks)) {
 		PrintAndLog("File content error. Got %d must be %d blocks.",blockNum, numBlocks);
-		fclose(f);
 		return 4;
 	}
 	PrintAndLog("Loaded %d blocks from file: %s", blockNum, filename);
 	return 0;
 }
 
-
 int CmdHF14AMfESave(const char *Cmd)
 {
 	FILE * f;
@@ -1530,8 +1748,8 @@ int CmdHF14AMfESave(const char *Cmd)
 
 	char ctmp = param_getchar(Cmd, 0);
 	
-	if ( ctmp == 'h') {
-		PrintAndLog("It saves emul dump into the file `filename.eml` or `cardID.eml`");		
+	if ( ctmp == 'h' || ctmp == 'H') {
+		PrintAndLog("It saves emul dump into the file `filename.eml` or `cardID.eml`");
 		PrintAndLog(" Usage:  hf mf esave [card memory] [file name w/o `.eml`]");
 		PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
 		PrintAndLog("");
@@ -1540,7 +1758,7 @@ int CmdHF14AMfESave(const char *Cmd)
 		PrintAndLog("         hf mf esave 4 filename");
 		return 0;
 	}	
-	
+
 	switch (ctmp) {
 		case '0' : numBlocks = 5*4; break;
 		case '1' : 
@@ -1555,17 +1773,20 @@ int CmdHF14AMfESave(const char *Cmd)
 
 	len = param_getstr(Cmd,nameParamNo,filename);
 	
-	if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
+	if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;
 	
 	// user supplied filename?
 	if (len < 1) {
 		// get filename (UID from memory)
 		if (mfEmlGetMem(buf, 0, 1)) {
 			PrintAndLog("Can\'t get UID from block: %d", 0);
-			sprintf(filename, "dump.eml"); 
+			len = sprintf(fnameptr, "dump");
+			fnameptr += len;
+		}
+		else {
+			for (j = 0; j < 7; j++, fnameptr += 2)
+				sprintf(fnameptr, "%02X", buf[j]);
 		}
-		for (j = 0; j < 7; j++, fnameptr += 2)
-			sprintf(fnameptr, "%02X", buf[j]); 
 	} else {
 		fnameptr += len;
 	}
@@ -1576,6 +1797,11 @@ int CmdHF14AMfESave(const char *Cmd)
 	// open file
 	f = fopen(filename, "w+");
 
+	if ( !f ) {
+		PrintAndLog("Can't open file %s ", filename);
+		return 1;
+	}
+	
 	// put hex
 	for (i = 0; i < numBlocks; i++) {
 		if (mfEmlGetMem(buf, i, 1)) {
@@ -1593,7 +1819,6 @@ int CmdHF14AMfESave(const char *Cmd)
   return 0;
 }
 
-
 int CmdHF14AMfECFill(const char *Cmd)
 {
 	uint8_t keyType = 0;
@@ -1633,15 +1858,16 @@ int CmdHF14AMfECFill(const char *Cmd)
 	return 0;
 }
 
-
 int CmdHF14AMfEKeyPrn(const char *Cmd)
 {
 	int i;
 	uint8_t numSectors;
 	uint8_t data[16];
 	uint64_t keyA, keyB;
+
+	char cmdp = param_getchar(Cmd, 0);
 	
-	if (param_getchar(Cmd, 0) == 'h') {
+	if ( cmdp == 'h' || cmdp == 'H' ) {
 		PrintAndLog("It prints the keys loaded in the emulator memory");
 		PrintAndLog("Usage:  hf mf ekeyprn [card memory]");
 		PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
@@ -1650,8 +1876,6 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
 		return 0;
 	}	
 
-	char cmdp = param_getchar(Cmd, 0);
-	
 	switch (cmdp) {
 		case '0' : numSectors = 5; break;
 		case '1' : 
@@ -1678,93 +1902,128 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
 	return 0;
 }
 
+// CHINESE MAGIC COMMANDS 
 
-int CmdHF14AMfCSetUID(const char *Cmd)
-{
+int CmdHF14AMfCSetUID(const char *Cmd) {
 	uint8_t wipeCard = 0;
 	uint8_t uid[8] = {0x00};
 	uint8_t oldUid[8] = {0x00};
+	uint8_t atqa[2] = {0x00};
+	uint8_t sak[1] = {0x00};
+	uint8_t atqaPresent = 1;
 	int res;
+	char ctmp;
+	int argi=0;
 
-	if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {
-		PrintAndLog("Usage:  hf mf csetuid <UID 8 hex symbols> <w>");
-		PrintAndLog("sample:  hf mf csetuid 01020304 w");
-		PrintAndLog("Set UID for magic Chinese card (only works with!!!)");
-		PrintAndLog("If you want wipe card then add 'w' into command line. \n");
+	if (strlen(Cmd) < 1 || param_getchar(Cmd, argi) == 'h') {
+		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;
-	}	
+	}
 
-	if (param_getchar(Cmd, 0) && param_gethex(Cmd, 0, uid, 8)) {
+	if (param_getchar(Cmd, argi) && param_gethex(Cmd, argi, uid, 8)) {
 		PrintAndLog("UID must include 8 HEX symbols");
 		return 1;
 	}
+	argi++;
 
-	char ctmp = param_getchar(Cmd, 1);
-	if (ctmp == 'w' || ctmp == 'W') wipeCard = 1;
-	
-	PrintAndLog("--wipe card:%02x uid:%s", wipeCard, sprint_hex(uid, 4));
+	ctmp = param_getchar(Cmd, argi);
+	if (ctmp == 'w' || ctmp == 'W') {
+		wipeCard = 1;
+		atqaPresent = 0;
+	}
+
+	if (atqaPresent) {
+		if (param_getchar(Cmd, argi)) {
+			if (param_gethex(Cmd, argi, atqa, 4)) {
+				PrintAndLog("ATQA must include 4 HEX symbols");
+				return 1;
+			}
+			argi++;
+			if (!param_getchar(Cmd, argi) || param_gethex(Cmd, argi, sak, 2)) {
+				PrintAndLog("SAK must include 2 HEX symbols");
+				return 1;
+			}
+			argi++;
+		} else
+			atqaPresent = 0;
+	}
 
-	res = mfCSetUID(uid, oldUid, wipeCard);
+	if(!wipeCard) {
+		ctmp = param_getchar(Cmd, argi);
+		if (ctmp == 'w' || ctmp == 'W') {
+			wipeCard = 1;
+		}
+	}
+
+	PrintAndLog("--wipe card:%s  uid:%s", (wipeCard)?"YES":"NO", sprint_hex(uid, 4));
+
+	res = mfCSetUID(uid, (atqaPresent) ? atqa : NULL, (atqaPresent) ? sak : NULL, oldUid, wipeCard);
 	if (res) {
 			PrintAndLog("Can't set UID. error=%d", res);
 			return 1;
 		}
 	
 	PrintAndLog("old UID:%s", sprint_hex(oldUid, 4));
+	PrintAndLog("new UID:%s", sprint_hex(uid, 4));
 	return 0;
 }
 
-int CmdHF14AMfCSetBlk(const char *Cmd)
-{
-	uint8_t uid[8];
-	uint8_t memBlock[16];
+int CmdHF14AMfCSetBlk(const char *Cmd) {
+	uint8_t block[16] = {0x00};
 	uint8_t blockNo = 0;
+	uint8_t params = MAGIC_SINGLE;
 	int res;
-	memset(memBlock, 0x00, sizeof(memBlock));
 
 	if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {
-		PrintAndLog("Usage:  hf mf csetblk <block number> <block data (32 hex symbols)>");
+		PrintAndLog("Usage:  hf mf csetblk <block number> <block data (32 hex symbols)> [w]");
 		PrintAndLog("sample:  hf mf csetblk 1 01020304050607080910111213141516");
-		PrintAndLog("Set block data for magic Chinese card (only works with!!!)");
-		PrintAndLog("If you want wipe card then add 'w' into command line. \n");
+		PrintAndLog("Set block data for magic Chinese card (only works with such cards)");
+		PrintAndLog("If you also want wipe the card then add 'w' at the end of the command line");
 		return 0;
 	}	
 
 	blockNo = param_get8(Cmd, 0);
 
-	if (param_gethex(Cmd, 1, memBlock, 32)) {
+	if (param_gethex(Cmd, 1, block, 32)) {
 		PrintAndLog("block data must include 32 HEX symbols");
 		return 1;
 	}
 
-	PrintAndLog("--block number:%2d data:%s", blockNo, sprint_hex(memBlock, 16));
+	char ctmp = param_getchar(Cmd, 2);
+	if (ctmp == 'w' || ctmp == 'W')
+		params |= MAGIC_WIPE;
+	
+	PrintAndLog("--block number:%2d data:%s", blockNo, sprint_hex(block, 16));
 
-	res = mfCSetBlock(blockNo, memBlock, uid, 0, CSETBLOCK_SINGLE_OPER);
+	res = mfCSetBlock(blockNo, block, NULL, params);
 	if (res) {
-			PrintAndLog("Can't write block. error=%d", res);
-			return 1;
-		}
-	
-	PrintAndLog("UID:%s", sprint_hex(uid, 4));
+		PrintAndLog("Can't write block. error=%d", res);
+		return 1;
+	}
 	return 0;
 }
 
-
-int CmdHF14AMfCLoad(const char *Cmd)
-{
+int CmdHF14AMfCLoad(const char *Cmd) {
 	FILE * f;
 	char filename[FILE_PATH_SIZE];
 	char * fnameptr = filename;
-	char buf[64];
-	uint8_t buf8[64];
+	char buf[64] = {0x00};
+	uint8_t buf8[64] = {0x00};
 	uint8_t fillFromEmulator = 0;
-	int i, len, blockNum, flags;
-	
-	memset(filename, 0, sizeof(filename));
-	memset(buf, 0, sizeof(buf));
+	int i, len, blockNum, flags=0;
 
-	if (param_getchar(Cmd, 0) == 'h' || param_getchar(Cmd, 0)== 0x00) {
-		PrintAndLog("It loads magic Chinese card (only works with!!!) from the file `filename.eml`");
+	memset(filename, 0, sizeof(filename));
+	
+	char ctmp = param_getchar(Cmd, 0);
+	
+	if (ctmp == 'h' || ctmp == 'H' || ctmp == 0x00) {
+		PrintAndLog("It loads magic Chinese card from the file `filename.eml`");
 		PrintAndLog("or from emulator memory (option `e`)");
 		PrintAndLog("Usage:  hf mf cload <file name w/o `.eml`>");
 		PrintAndLog("   or:  hf mf cload e ");
@@ -1772,21 +2031,19 @@ int CmdHF14AMfCLoad(const char *Cmd)
 		return 0;
 	}	
 
-	char ctmp = param_getchar(Cmd, 0);
 	if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;
 	
 	if (fillFromEmulator) {
-		flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;
 		for (blockNum = 0; blockNum < 16 * 4; blockNum += 1) {
 			if (mfEmlGetMem(buf8, blockNum, 1)) {
 				PrintAndLog("Cant get block: %d", blockNum);
 				return 2;
 			}
-			
-			if (blockNum == 2) flags = 0;
-			if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;
+			if (blockNum == 0) flags = MAGIC_INIT + MAGIC_WUPC;				// switch on field and send magic sequence
+			if (blockNum == 1) flags = 0;													// just write
+			if (blockNum == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;		// Done. Magic Halt and switch off field.
 
-			if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {
+			if (mfCSetBlock(blockNum, buf8, NULL, flags)) {
 				PrintAndLog("Cant set magic card block: %d", blockNum);
 				return 3;
 			}
@@ -1794,7 +2051,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
 		return 0;
 	} else {
 		len = strlen(Cmd);
-		if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
+		if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;
 
 		memcpy(filename, Cmd, len);
 		fnameptr += len;
@@ -1809,28 +2066,33 @@ int CmdHF14AMfCLoad(const char *Cmd)
 		}
 	
 		blockNum = 0;
-		flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;
 		while(!feof(f)){
+		
 			memset(buf, 0, sizeof(buf));
+			
 			if (fgets(buf, sizeof(buf), f) == NULL) {
+				fclose(f);
 				PrintAndLog("File reading error.");
 				return 2;
 			}
 
-			if (strlen(buf) < 32){
+			if (strlen(buf) < 32) {
 				if(strlen(buf) && feof(f))
 					break;
 				PrintAndLog("File content error. Block data must include 32 HEX symbols");
+				fclose(f);
 				return 2;
 			}
 			for (i = 0; i < 32; i += 2)
 				sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);
 
-			if (blockNum == 2) flags = 0;
-			if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;
+			if (blockNum == 0) flags = MAGIC_INIT + MAGIC_WUPC;				// switch on field and send magic sequence
+			if (blockNum == 1) flags = 0;													// just write
+			if (blockNum == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;		// Done. Switch off field.
 
-			if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {
+			if (mfCSetBlock(blockNum, buf8, NULL, flags)) {
 				PrintAndLog("Can't set magic card block: %d", blockNum);
+				fclose(f);
 				return 3;
 			}
 			blockNum++;
@@ -1839,6 +2101,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
 		}
 		fclose(f);
 	
+		// 64 or 256blocks.
 		if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){
 			PrintAndLog("File content error. There must be 64 blocks");
 			return 4;
@@ -1846,18 +2109,20 @@ int CmdHF14AMfCLoad(const char *Cmd)
 		PrintAndLog("Loaded from file: %s", filename);
 		return 0;
 	}
+	return 0;
 }
 
 int CmdHF14AMfCGetBlk(const char *Cmd) {
-	uint8_t memBlock[16];
+	uint8_t data[16];
 	uint8_t blockNo = 0;
 	int res;
-	memset(memBlock, 0x00, sizeof(memBlock));
+	memset(data, 0x00, sizeof(data));
+	char ctmp = param_getchar(Cmd, 0);
 
-	if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {
+	if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') {
 		PrintAndLog("Usage:  hf mf cgetblk <block number>");
 		PrintAndLog("sample:  hf mf cgetblk 1");
-		PrintAndLog("Get block data from magic Chinese card (only works with!!!)\n");
+		PrintAndLog("Get block data from magic Chinese card (only works with such cards)\n");
 		return 0;
 	}	
 
@@ -1865,27 +2130,27 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
 
 	PrintAndLog("--block number:%2d ", blockNo);
 
-	res = mfCGetBlock(blockNo, memBlock, CSETBLOCK_SINGLE_OPER);
+	res = mfCGetBlock(blockNo, data, MAGIC_SINGLE);
 	if (res) {
-			PrintAndLog("Can't read block. error=%d", res);
-			return 1;
-		}
+		PrintAndLog("Can't read block. error=%d", res);
+		return 1;
+	}
 	
-	PrintAndLog("block data:%s", sprint_hex(memBlock, 16));
+	PrintAndLog("data: %s", sprint_hex(data, sizeof(data)));
 	return 0;
 }
 
-
 int CmdHF14AMfCGetSc(const char *Cmd) {
-	uint8_t memBlock[16];
+	uint8_t data[16];
 	uint8_t sectorNo = 0;
 	int i, res, flags;
-	memset(memBlock, 0x00, sizeof(memBlock));
-
-	if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {
+	memset(data, 0x00, sizeof(data));
+	char ctmp = param_getchar(Cmd, 0);
+	
+	if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') {
 		PrintAndLog("Usage:  hf mf cgetsc <sector number>");
 		PrintAndLog("sample:  hf mf cgetsc 0");
-		PrintAndLog("Get sector data from magic Chinese card (only works with!!!)\n");
+		PrintAndLog("Get sector data from magic Chinese card (only works with such cards)\n");
 		return 0;
 	}	
 
@@ -1896,24 +2161,23 @@ int CmdHF14AMfCGetSc(const char *Cmd) {
 	}
 
 	PrintAndLog("--sector number:%d ", sectorNo);
+	PrintAndLog("block | data");
 
-	flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;
+	flags = MAGIC_INIT + MAGIC_WUPC;
 	for (i = 0; i < 4; i++) {
 		if (i == 1) flags = 0;
-		if (i == 3) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;
+		if (i == 3) flags = MAGIC_HALT + MAGIC_OFF;
 
-		res = mfCGetBlock(sectorNo * 4 + i, memBlock, flags);
+		res = mfCGetBlock(sectorNo * 4 + i, data, flags);
 		if (res) {
 			PrintAndLog("Can't read block. %d error=%d", sectorNo * 4 + i, res);
 			return 1;
-		}
-	
-		PrintAndLog("block %3d data:%s", sectorNo * 4 + i, sprint_hex(memBlock, 16));
+		}	
+		PrintAndLog(" %3d | %s", sectorNo * 4 + i, sprint_hex(data, sizeof(data)));
 	}
 	return 0;
 }
 
-
 int CmdHF14AMfCSave(const char *Cmd) {
 
 	FILE * f;
@@ -1925,8 +2189,9 @@ int CmdHF14AMfCSave(const char *Cmd) {
 	
 	memset(filename, 0, sizeof(filename));
 	memset(buf, 0, sizeof(buf));
-
-	if (param_getchar(Cmd, 0) == 'h') {
+	char ctmp = param_getchar(Cmd, 0);
+	
+	if ( ctmp == 'h' || ctmp == 'H' ) {
 		PrintAndLog("It saves `magic Chinese` card dump into the file `filename.eml` or `cardID.eml`");
 		PrintAndLog("or into emulator memory (option `e`)");
 		PrintAndLog("Usage:  hf mf esave [file name w/o `.eml`][e]");
@@ -1935,16 +2200,14 @@ int CmdHF14AMfCSave(const char *Cmd) {
 		PrintAndLog("         hf mf esave e \n");
 		return 0;
 	}	
-
-	char ctmp = param_getchar(Cmd, 0);
 	if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;
 
 	if (fillFromEmulator) {
 		// put into emulator
-		flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;
+		flags = MAGIC_INIT + MAGIC_WUPC;
 		for (i = 0; i < 16 * 4; i++) {
 			if (i == 1) flags = 0;
-			if (i == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;
+			if (i == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;
 		
 			if (mfCGetBlock(i, buf, flags)) {
 				PrintAndLog("Cant get block: %d", i);
@@ -1959,31 +2222,40 @@ int CmdHF14AMfCSave(const char *Cmd) {
 		return 0;
 	} else {
 		len = strlen(Cmd);
-		if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
+		if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;
 	
+		// get filename based on UID
 		if (len < 1) {
-			// get filename
-			if (mfCGetBlock(0, buf, CSETBLOCK_SINGLE_OPER)) {
+		
+			if (mfCGetBlock(0, buf, MAGIC_SINGLE)) {
 				PrintAndLog("Cant get block: %d", 0);
-				return 1;
+				len = sprintf(fnameptr, "dump");
+				fnameptr += len;
+			} else {
+				for (j = 0; j < 7; j++, fnameptr += 2)
+					sprintf(fnameptr, "%02x", buf[j]); 
 			}
-			for (j = 0; j < 7; j++, fnameptr += 2)
-				sprintf(fnameptr, "%02x", buf[j]); 
 		} else {
 			memcpy(filename, Cmd, len);
 			fnameptr += len;
 		}
 
+		// add .eml extension
 		sprintf(fnameptr, ".eml"); 
 	
 		// open file
 		f = fopen(filename, "w+");
 
+		if (f == NULL) {
+			PrintAndLog("File not found or locked.");
+			return 1;
+		}
+
 		// put hex
-		flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;
+		flags = MAGIC_INIT + MAGIC_WUPC;
 		for (i = 0; i < 16 * 4; i++) {
 			if (i == 1) flags = 0;
-			if (i == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;
+			if (i == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;
 		
 			if (mfCGetBlock(i, buf, flags)) {
 				PrintAndLog("Cant get block: %d", i);
@@ -1993,282 +2265,70 @@ int CmdHF14AMfCSave(const char *Cmd) {
 				fprintf(f, "%02x", buf[j]); 
 			fprintf(f,"\n");
 		}
+		fflush(f);
 		fclose(f);
-	
 		PrintAndLog("Saved to file: %s", filename);
-	
 		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);
 
-int CmdHF14AMfSniff(const char *Cmd){
-
-	bool wantLogToFile = 0;
-	bool wantDecrypt = 0;
-	//bool wantSaveToEml = 0; TODO
-	bool wantSaveToEmlFile = 0;
-
-	//var 
-	int res = 0;
 	int len = 0;
-	int blockLen = 0;
-	int num = 0;
-	int pckNum = 0;
-	uint8_t uid[7];
-	uint8_t uid_len;
-	uint8_t atqa[2];
-	uint8_t sak;
-	bool isTag;
-	uint8_t buf[3000];
-	uint8_t * bufPtr = buf;
-	memset(buf, 0x00, 3000);
-	
-	if (param_getchar(Cmd, 0) == '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++) {
-		char 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()) {
-			getchar();
-			printf("\naborted via keyboard!\n");
-			break;
-		}
-		
-    UsbCommand resp;
-    if (WaitForResponseTimeout(CMD_ACK,&resp,2000)) {
-			res = resp.arg[0] & 0xff;
-			len = resp.arg[1];
-			num = resp.arg[2];
-			
-			if (res == 0) return 0;
-			if (res == 1) {
-				if (num ==0) {
-					bufPtr = buf;
-					memset(buf, 0x00, 3000);
-				}
-				memcpy(bufPtr, resp.d.asBytes, len);
-				bufPtr += len;
-				pckNum++;
-			}
-			if (res == 2) {
-				blockLen = bufPtr - buf;
-				bufPtr = buf;
-				printf(">\n");
-				PrintAndLog("received trace len: %d packages: %d", blockLen, pckNum);
-				num = 0;
-				while (bufPtr - buf < blockLen) {
-					bufPtr += 6;
-					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);
-					}
-					bufPtr += len;
-					bufPtr += ((len-1)/8+1); // ignore parity
-					num++;
-				}
-			}
-		} // resp not NULL
-	} // while (true)
-	
-	return 0;
-}
-
-// Tries to identify cardsize.
-// Returns <num>  where num is:
-// -1  unidentified
-//  0 - MINI (320bytes)
-//  1 - 1K
-//  2 - 2K
-//  4 - 4K
-int GetCardSize()
-{
-	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
-	SendCommand(&c);
-
-	UsbCommand resp;
-	WaitForResponse(CMD_ACK,&resp);
-
-	if(resp.arg[0] == 0) {
-		PrintAndLog("iso14443a card select failed");
-		return -1;
-	}
-	
-	iso14a_card_select_t *card = (iso14a_card_select_t *)resp.d.asBytes;
-
-	PrintAndLog("Trying to detect card size.");
-	
-	uint16_t atqa = 0;
-	uint8_t sak = 0;
-	atqa = (card->atqa[1] & 0xff) << 8;
-    atqa += card->atqa[0] & 0xff;
-	sak = card->sak;
-	
-	// https://code.google.com/p/libnfc/source/browse/libnfc/target-subr.c
-	
-	PrintAndLog("found ATAQ: %04X SAK: %02X", atqa, sak);
-	
-	
-	// NXP MIFARE Mini 0.3k
-	if ( ( (atqa & 0xff0f) == 0x0004) && (sak == 0x09) ) return 0;
+	param_gethex_ex(Cmd, 3, data, &len);
 	
-	// MIFARE Classic 1K
-	if ( ((atqa & 0xff0f) == 0x0004) && (sak == 0x08) ) return 1;
+	len /= 2;	
+	int limit = sizeof(data) / 2;
 	
-	// MIFARE Classik 4K
-	if ( ((atqa & 0xff0f) == 0x0002) && (sak == 0x18) ) return 4;
+	if ( len >= limit )
+		len = limit;
 	
-	// SmartMX with MIFARE 1K emulation 
-	if ( ((atqa & 0xf0ff) == 0x0004) ) return 1;
-
-	// SmartMX with MIFARE 4K emulation 
-	if ( ((atqa & 0xf0ff) == 0x0002) ) return 4;	
-	
-	// Infineon MIFARE CLASSIC 1K
-	if ( ((atqa & 0xffff) == 0x0004) && (sak == 0x88) ) return 1;
-	
-	// MFC 4K emulated by Nokia 6212 Classic
-	if ( ((atqa & 0xffff) == 0x0002) && (sak == 0x38) ) return 4;
-
-	// MFC 4K emulated by Nokia 6131 NFC
-	if ( ((atqa & 0xffff) == 0x0008) && (sak == 0x38) ) return 4;
-
-	
-	PrintAndLog("BEFOOO  1K %02X",  (atqa & 0xff0f));
-	
-	// MIFARE Plus (4 Byte UID or 4 Byte RID)
-	// MIFARE Plus (7 Byte UID)
-	if (
-			((atqa & 0xffff) == 0x0002) |
-			((atqa & 0xffff) == 0x0004) |
-			((atqa & 0xffff) == 0x0042) |	
-			((atqa & 0xffff) == 0x0044) 
-		)
-	{
-		switch(sak){
-			case 0x08:
-			case 0x10: {
-			//case 0x20:
-				PrintAndLog("2");
-				return 2;
-				break;
-				}
-			case 0x11:
-			case 0x18:{
-			//case 0x20:
-				PrintAndLog("4");
-				return 4;
-				break;
-				}
-		}
-	}
-	
-	return -1;
+	return tryDecryptWord( nt, ar_enc, at_enc, data, len);
 }
 
-static command_t CommandTable[] =
-{
-  {"help",		CmdHelp,				1, "This help"},
-  {"dbg",		CmdHF14AMfDbg,			0, "Set default debug mode"},
-  {"rdbl",		CmdHF14AMfRdBl,			0, "Read MIFARE classic block"},
-  //{"urdbl",              CmdHF14AMfURdBl,                 0, "Read MIFARE Ultralight block"},
-  //{"urdcard",           CmdHF14AMfURdCard,               0,"Read MIFARE Ultralight Card"},
-  //{"uwrbl",		CmdHF14AMfUWrBl,		0,"Write MIFARE Ultralight block"},
-  {"rdsc",		CmdHF14AMfRdSc,			0, "Read MIFARE classic sector"},
-  {"dump",		CmdHF14AMfDump,			0, "Dump MIFARE classic tag to binary file"},
-  {"restore",	CmdHF14AMfRestore,		0, "Restore MIFARE classic binary file to BLANK tag"},
-  {"wrbl",		CmdHF14AMfWrBl,			0, "Write MIFARE classic block"},
-  {"chk",		CmdHF14AMfChk,			0, "Test block keys"},
-  {"mifare",	CmdHF14AMifare,			0, "Read parity error messages."},
-  {"nested",	CmdHF14AMfNested,		0, "Test nested authentication"},
-  {"sniff",		CmdHF14AMfSniff,		0, "Sniff card-reader communication"},
-  {"sim",		CmdHF14AMf1kSim,		0, "Simulate MIFARE card"},
-  {"eclr",		CmdHF14AMfEClear,		0, "Clear simulator memory block"},
-  {"eget",		CmdHF14AMfEGet,			0, "Get simulator memory block"},
-  {"eset",		CmdHF14AMfESet,			0, "Set simulator memory block"},
-  {"eload",		CmdHF14AMfELoad,		0, "Load from file emul dump"},
-  {"esave",		CmdHF14AMfESave,		0, "Save to file emul dump"},
-  {"ecfill",	CmdHF14AMfECFill,		0, "Fill simulator memory with help of keys from simulator"},
-  {"ekeyprn",	CmdHF14AMfEKeyPrn,		0, "Print keys from simulator memory"},
-  {"csetuid",	CmdHF14AMfCSetUID,		0, "Set UID for magic Chinese card"},
-  {"csetblk",	CmdHF14AMfCSetBlk,		0, "Write block into magic Chinese card"},
-  {"cgetblk",	CmdHF14AMfCGetBlk,		0, "Read block from magic Chinese card"},
-  {"cgetsc",	CmdHF14AMfCGetSc,		0, "Read sector from magic Chinese card"},
-  {"cload",		CmdHF14AMfCLoad,		0, "Load dump into magic Chinese card"},
-  {"csave",		CmdHF14AMfCSave,		0, "Save dump from magic Chinese card into file or emulator"},
-  {NULL, NULL, 0, NULL}
+static command_t CommandTable[] = {
+	{"help",		CmdHelp,				1, "This help"},
+	{"dbg",			CmdHF14AMfDbg,			0, "Set default debug mode"},
+	{"rdbl",		CmdHF14AMfRdBl,			0, "Read MIFARE classic block"},
+	{"rdsc",		CmdHF14AMfRdSc,			0, "Read MIFARE classic sector"},
+	{"dump",		CmdHF14AMfDump,			0, "Dump MIFARE classic tag to binary file"},
+	{"restore",		CmdHF14AMfRestore,		0, "Restore MIFARE classic binary file to BLANK tag"},
+	{"wrbl",		CmdHF14AMfWrBl,			0, "Write MIFARE classic block"},
+	{"chk",			CmdHF14AMfChk,			0, "Test block keys"},
+	{"mifare",		CmdHF14AMifare,			0, "Read parity error messages."},
+	{"nested",		CmdHF14AMfNested,		0, "Test nested authentication"},
+	{"hardnested", 	CmdHF14AMfNestedHard, 	0, "Nested attack for hardened Mifare cards"},
+	{"sniff",		CmdHF14AMfSniff,		0, "Sniff card-reader communication"},
+	{"sim",			CmdHF14AMf1kSim,		0, "Simulate MIFARE card"},
+	{"eclr",		CmdHF14AMfEClear,		0, "Clear simulator memory block"},
+	{"eget",		CmdHF14AMfEGet,			0, "Get simulator memory block"},
+	{"eset",		CmdHF14AMfESet,			0, "Set simulator memory block"},
+	{"eload",		CmdHF14AMfELoad,		0, "Load from file emul dump"},
+	{"esave",		CmdHF14AMfESave,		0, "Save to file emul dump"},
+	{"ecfill",		CmdHF14AMfECFill,		0, "Fill simulator memory with help of keys from simulator"},
+	{"ekeyprn",		CmdHF14AMfEKeyPrn,		0, "Print keys from simulator memory"},
+	{"csetuid",		CmdHF14AMfCSetUID,		0, "Set UID for magic Chinese card"},
+	{"csetblk",		CmdHF14AMfCSetBlk,		0, "Write block - Magic Chinese card"},
+	{"cgetblk",		CmdHF14AMfCGetBlk,		0, "Read block - Magic Chinese card"},
+	{"cgetsc",		CmdHF14AMfCGetSc,		0, "Read sector - Magic Chinese card"},
+	{"cload",		CmdHF14AMfCLoad,		0, "Load dump into magic Chinese card"},
+	{"csave",		CmdHF14AMfCSave,		0, "Save dump from magic Chinese card into file or emulator"},
+	{"decrypt",		CmdHf14MfDecryptBytes,  1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"},
+	{NULL, NULL, 0, NULL}
 };
 
-int CmdHFMF(const char *Cmd)
-{
-	// flush
-	WaitForResponseTimeout(CMD_ACK,NULL,100);
-
-  CmdsParse(CommandTable, Cmd);
-  return 0;
+int CmdHFMF(const char *Cmd) {
+	clearCommandBuffer();
+	CmdsParse(CommandTable, Cmd);
+	return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
-  CmdsHelp(CommandTable);
-  return 0;
+int CmdHelp(const char *Cmd) {
+	CmdsHelp(CommandTable);
+	return 0;
 }