X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/660d641a03456e99ea83c68dbd3d03bae2b64573..b216af9a24fb5691ec47e6e961e0a61a343a16d7:/client/cmdhfmf.c?ds=inline

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 11288085..1d2de683 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -7,7 +7,7 @@
 //-----------------------------------------------------------------------------
 // High frequency MIFARE commands
 //-----------------------------------------------------------------------------
-
+#include "../include/mifare.h"
 #include "cmdhfmf.h"
 
 static int CmdHelp(const char *Cmd);
@@ -15,33 +15,31 @@ static int CmdHelp(const char *Cmd);
 int CmdHF14AMifare(const char *Cmd)
 {
 	uint32_t uid = 0;
-	uint32_t nt = 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};
 
-	if (param_getchar(Cmd, 0) && param_gethex(Cmd, 0, keyBlock, 8)) {
-		PrintAndLog("Nt must include 8 HEX symbols");
-		return 1;
-	}
+	UsbCommand c = {CMD_READER_MIFARE, {true, 0, 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("-------------------------------------------------------------------------\n");
 
 	
-	UsbCommand c = {CMD_READER_MIFARE, {(uint32_t)bytes_to_num(keyBlock, 4), 0, 0}};
 start:
-	SendCommand(&c);
+    clearCommandBuffer();
+    SendCommand(&c);
 	
 	//flush queue
 	while (ukbhit())	getchar();
 
-	// message
-	printf("-------------------------------------------------------------------------\n");
-	printf("Executing command. It may take up to 30 min.\n");
-	printf("Press the key on the proxmark3 device to abort both proxmark3 and client.\n");
-	printf("-------------------------------------------------------------------------\n");
 	
 	// wait cycle
 	while (true) {
-		printf(".");
+        printf(".");
 		fflush(stdout);
 		if (ukbhit()) {
 			getchar();
@@ -50,27 +48,26 @@ start:
 		}
 		
 		UsbCommand resp;
-		if (WaitForResponseTimeout(CMD_ACK,&resp,2000)) {
+		if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
 			isOK  = resp.arg[0] & 0xff;
-	
 			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");
-			PrintAndLog("isOk:%02x", isOK);
 			if (!isOK) PrintAndLog("Proxmark can't get statistic info. Execution aborted.\n");
 			break;
 		}
 	}	
+
 	printf("\n");
 	
 	// error
 	if (isOK != 1) return 1;
 	
 	// execute original function from util nonce2key
-	if (nonce2key(uid, nt, 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);	
@@ -85,8 +82,9 @@ start:
 		PrintAndLog("Found valid key:%012"llx, r_key);
 	else
 	{
-		if (isOK != 2) PrintAndLog("Found invalid key. ( Nt=%08x ,Trying use it to run again...", nt);	
-		c.arg[0] = nt;
+		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;
 	}
 	
@@ -123,7 +121,7 @@ int CmdHF14AMfWrBl(const char *Cmd)
 		PrintAndLog("Block data must include 32 HEX symbols");
 		return 1;
 	}
-	PrintAndLog("--block no:%02x key type:%02x key:%s", blockNo, keyType, sprint_hex(key, 6));
+	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}};
@@ -142,6 +140,117 @@ 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)
 {
 	uint8_t blockNo = 0;
@@ -168,7 +277,7 @@ int CmdHF14AMfRdBl(const char *Cmd)
 		PrintAndLog("Key must include 12 HEX symbols");
 		return 1;
 	}
-	PrintAndLog("--block no:%02x key type:%02x key:%s ", blockNo, keyType, sprint_hex(key, 6));
+	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}};
 	memcpy(c.d.asBytes, key, 6);
@@ -176,8 +285,8 @@ int CmdHF14AMfRdBl(const char *Cmd)
 
 	UsbCommand resp;
 	if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-		uint8_t                isOK  = resp.arg[0] & 0xff;
-		uint8_t              * data  = resp.d.asBytes;
+		uint8_t isOK  = resp.arg[0] & 0xff;
+		uint8_t *data = resp.d.asBytes;
 
 		if (isOK)
 			PrintAndLog("isOk:%02x data:%s", isOK, sprint_hex(data, 16));
@@ -190,16 +299,141 @@ 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 i;
 	uint8_t sectorNo = 0;
 	uint8_t keyType = 0;
 	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-	
 	uint8_t isOK  = 0;
-	uint8_t * data  = NULL;
-
+	uint8_t *data  = NULL;
 	char cmdp	= 0x00;
 
 	if (strlen(Cmd)<3) {
@@ -209,12 +443,12 @@ int CmdHF14AMfRdSc(const char *Cmd)
 	}	
 	
 	sectorNo = param_get8(Cmd, 0);
-	if (sectorNo > 63) {
-		PrintAndLog("Sector number must be less than 64");
+	if (sectorNo > 39) {
+		PrintAndLog("Sector number must be less than 40");
 		return 1;
 	}
 	cmdp = param_getchar(Cmd, 1);
-	if (cmdp == 0x00) {
+	if (cmdp != 'a' && cmdp != 'A' && cmdp != 'b' && cmdp != 'B') {
 		PrintAndLog("Key type must be A or B");
 		return 1;
 	}
@@ -223,11 +457,11 @@ int CmdHF14AMfRdSc(const char *Cmd)
 		PrintAndLog("Key must include 12 HEX symbols");
 		return 1;
 	}
-	PrintAndLog("--sector no:%02x key type:%02x key:%s ", sectorNo, keyType, sprint_hex(key, 6));
+	PrintAndLog("--sector no:%d key type:%c key:%s ", sectorNo, keyType?'B':'A', sprint_hex(key, 6));
 	
-  UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};
+	UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};
 	memcpy(c.d.asBytes, key, 6);
-  SendCommand(&c);
+	SendCommand(&c);
 	PrintAndLog(" ");
 
 	UsbCommand resp;
@@ -236,176 +470,248 @@ int CmdHF14AMfRdSc(const char *Cmd)
 		data  = resp.d.asBytes;
 
 		PrintAndLog("isOk:%02x", isOK);
-		if (isOK) 
-			for (i = 0; i < 2; i++) {
-				PrintAndLog("data:%s", sprint_hex(data + i * 16, 16));
+		if (isOK) {
+			for (i = 0; i < (sectorNo<32?3:15); i++) {
+				PrintAndLog("data   : %s", sprint_hex(data + i * 16, 16));
 			}
+			PrintAndLog("trailer: %s", sprint_hex(data + (sectorNo<32?3:15) * 16, 16));
+		}
 	} else {
-		PrintAndLog("Command1 execute timeout");
+		PrintAndLog("Command execute timeout");
 	}
 
-  // response2
-	PrintAndLog(" ");
-	if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-		isOK  = resp.arg[0] & 0xff;
-		data  = resp.d.asBytes;
+  return 0;
+}
 
-		if (isOK) 
-			for (i = 0; i < 2; i++) {
-				PrintAndLog("data:%s", sprint_hex(data + i * 16, 16));
-		}
+
+uint8_t FirstBlockOfSector(uint8_t sectorNo)
+{
+	if (sectorNo < 32) {
+		return sectorNo * 4;
 	} else {
-		PrintAndLog("Command2 execute timeout");
+		return 32 * 4 + (sectorNo - 32) * 16;
 	}
-	
-  return 0;
 }
 
+
+uint8_t NumBlocksPerSector(uint8_t sectorNo)
+{
+	if (sectorNo < 32) {
+		return 4;
+	} else {
+		return 16;
+	}
+}
+
+
 int CmdHF14AMfDump(const char *Cmd)
 {
-	int i, j;
+	uint8_t sectorNo, blockNo;
 	
 	uint8_t keyA[40][6];
 	uint8_t keyB[40][6];
 	uint8_t rights[40][4];
+	uint8_t carddata[256][16];
+	uint8_t numSectors = 16;
 	
 	FILE *fin;
 	FILE *fout;
 	
 	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' : 
+		case '\0': numSectors = 16; break;
+		case '2' : numSectors = 32; break;
+		case '4' : numSectors = 40; break;
+		default:   numSectors = 16;
+	}	
 	
-	if ((fin = fopen("dumpkeys.bin","rb")) == NULL) {
-		PrintAndLog("Could not find file dumpkeys.bin");
-		return 1;
+	if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {
+		PrintAndLog("Usage:   hf mf dump [card memory]");
+		PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
+		PrintAndLog("");
+		PrintAndLog("Samples: hf mf dump");
+		PrintAndLog("         hf mf dump 4");
+		return 0;
 	}
 	
-	if ((fout = fopen("dumpdata.bin","wb")) == NULL) { 
-		PrintAndLog("Could not create file name dumpdata.bin");
+	if ((fin = fopen("dumpkeys.bin","rb")) == NULL) {
+		PrintAndLog("Could not find file dumpkeys.bin");		
 		return 1;
 	}
 	
-	// Read key file
-	
-	for (i=0 ; i<16 ; i++) {
-		fread ( keyA[i], 1, 6, fin );
+	// Read keys A from file
+	for (sectorNo=0; sectorNo<numSectors; sectorNo++) {
+		if (fread( keyA[sectorNo], 1, 6, fin ) == 0) {
+			PrintAndLog("File reading error.");
+			fclose(fin);
+			return 2;
+		}
 	}
-	for (i=0 ; i<16 ; i++) {
-		fread ( keyB[i], 1, 6, fin );
+	
+	// Read keys B from file
+	for (sectorNo=0; sectorNo<numSectors; sectorNo++) {
+		if (fread( keyB[sectorNo], 1, 6, fin ) == 0) {
+			PrintAndLog("File reading error.");
+			fclose(fin);
+			return 2;
+		}
 	}
 	
-	// Read access rights to sectors
+	fclose(fin);
 	
 	PrintAndLog("|-----------------------------------------|");
 	PrintAndLog("|------ Reading sector access bits...-----|");
 	PrintAndLog("|-----------------------------------------|");
 	
-	for (i = 0 ; i < 16 ; i++) {
-		UsbCommand c = {CMD_MIFARE_READBL, {4*i + 3, 0, 0}};
-		memcpy(c.d.asBytes, keyA[i], 6);
+	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);
 		SendCommand(&c);
 
-    if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+		if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
 			uint8_t isOK  = resp.arg[0] & 0xff;
 			uint8_t *data  = resp.d.asBytes;
 			if (isOK){
-				rights[i][0] = ((data[7] & 0x10)>>4) | ((data[8] & 0x1)<<1) | ((data[8] & 0x10)>>2);
-				rights[i][1] = ((data[7] & 0x20)>>5) | ((data[8] & 0x2)<<0) | ((data[8] & 0x20)>>3);
-				rights[i][2] = ((data[7] & 0x40)>>6) | ((data[8] & 0x4)>>1) | ((data[8] & 0x40)>>4);
-				rights[i][3] = ((data[7] & 0x80)>>7) | ((data[8] & 0x8)>>2) | ((data[8] & 0x80)>>5);
-				}
-			else{
-				PrintAndLog("Could not get access rights for block %d", i);
+				rights[sectorNo][0] = ((data[7] & 0x10)>>2) | ((data[8] & 0x1)<<1) | ((data[8] & 0x10)>>4); // C1C2C3 for data area 0
+				rights[sectorNo][1] = ((data[7] & 0x20)>>3) | ((data[8] & 0x2)<<0) | ((data[8] & 0x20)>>5); // C1C2C3 for data area 1
+				rights[sectorNo][2] = ((data[7] & 0x40)>>4) | ((data[8] & 0x4)>>1) | ((data[8] & 0x40)>>6); // C1C2C3 for data area 2
+				rights[sectorNo][3] = ((data[7] & 0x80)>>5) | ((data[8] & 0x8)>>2) | ((data[8] & 0x80)>>7); // C1C2C3 for sector trailer
+			} else {
+				PrintAndLog("Could not get access rights for sector %2d. Trying with defaults...", sectorNo);
+				rights[sectorNo][0] = rights[sectorNo][1] = rights[sectorNo][2] = 0x00;
+				rights[sectorNo][3] = 0x01;
 			}
-		}
-		else {
-			PrintAndLog("Command execute timeout");
+		} else {
+			PrintAndLog("Command execute timeout when trying to read access rights for sector %2d. Trying with defaults...", sectorNo);
+			rights[sectorNo][0] = rights[sectorNo][1] = rights[sectorNo][2] = 0x00;
+			rights[sectorNo][3] = 0x01;
 		}
 	}
 	
-	// Read blocks and print to file
-	
 	PrintAndLog("|-----------------------------------------|");
 	PrintAndLog("|----- Dumping all blocks to file... -----|");
 	PrintAndLog("|-----------------------------------------|");
 	
-  
-	for (i=0 ; i<16 ; i++) {
-		for (j=0 ; j<4 ; j++) {
-      bool received = false;
-      
-      if (j == 3){
-				UsbCommand c = {CMD_MIFARE_READBL, {i*4 + j, 0, 0}};
-				memcpy(c.d.asBytes, keyA[i], 6);
+	bool isOK = true;
+	for (sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {
+		for (blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
+			bool received = false;
+			
+			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);
 				SendCommand(&c);
-        received = WaitForResponseTimeout(CMD_ACK,&resp,1500);
-			}
-			else{
-				if ((rights[i][j] == 6) | (rights[i][j] == 5)) {
-					UsbCommand c = {CMD_MIFARE_READBL, {i*4+j, 1, 0}};
-					memcpy(c.d.asBytes, keyB[i], 6);
-					SendCommand(&c);
-          received = WaitForResponseTimeout(CMD_ACK,&resp,1500);
-				}
-				else if (rights[i][j] == 7) {
-					PrintAndLog("Access rights do not allow reading of sector %d block %d",i,j);
-				}
-				else {
-					UsbCommand c = {CMD_MIFARE_READBL, {i*4+j, 0, 0}};
-					memcpy(c.d.asBytes, keyA[i], 6);
+				received = WaitForResponseTimeout(CMD_ACK,&resp,1500);
+			} else {												// data block. Check if it can be read with key A or key B
+				uint8_t data_area = sectorNo<32?blockNo:blockNo/5;
+				if ((rights[sectorNo][data_area] == 0x03) || (rights[sectorNo][data_area] == 0x05)) {	// only key B would work
+					UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 1, 0}};
+					memcpy(c.d.asBytes, keyB[sectorNo], 6);
 					SendCommand(&c);
-          received = WaitForResponseTimeout(CMD_ACK,&resp,1500);
+					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);
+				} 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);
 				}
 			}
 
 			if (received) {
-				uint8_t isOK  = resp.arg[0] & 0xff;
+				isOK  = resp.arg[0] & 0xff;
 				uint8_t *data  = resp.d.asBytes;
-				if (j == 3) {
-					data[0]  = (keyA[i][0]);
-					data[1]  = (keyA[i][1]);
-					data[2]  = (keyA[i][2]);
-					data[3]  = (keyA[i][3]);
-					data[4]  = (keyA[i][4]);
-					data[5]  = (keyA[i][5]);
-					data[10] = (keyB[i][0]);
-					data[11] = (keyB[i][1]);
-					data[12] = (keyB[i][2]);
-					data[13] = (keyB[i][3]);
-					data[14] = (keyB[i][4]);
-					data[15] = (keyB[i][5]);
+				if (blockNo == NumBlocksPerSector(sectorNo) - 1) {		// sector trailer. Fill in the keys.
+					data[0]  = (keyA[sectorNo][0]);
+					data[1]  = (keyA[sectorNo][1]);
+					data[2]  = (keyA[sectorNo][2]);
+					data[3]  = (keyA[sectorNo][3]);
+					data[4]  = (keyA[sectorNo][4]);
+					data[5]  = (keyA[sectorNo][5]);
+					data[10] = (keyB[sectorNo][0]);
+					data[11] = (keyB[sectorNo][1]);
+					data[12] = (keyB[sectorNo][2]);
+					data[13] = (keyB[sectorNo][3]);
+					data[14] = (keyB[sectorNo][4]);
+					data[15] = (keyB[sectorNo][5]);
 				}
 				if (isOK) {
-					fwrite ( data, 1, 16, fout );
-				}
-				else {
-					PrintAndLog("Could not get access rights for block %d", i);
+					memcpy(carddata[FirstBlockOfSector(sectorNo) + blockNo], data, 16);
+                    PrintAndLog("Successfully read block %2d of sector %2d.", blockNo, sectorNo);
+				} else {
+					PrintAndLog("Could not read block %2d of sector %2d", blockNo, sectorNo);
+					break;
 				}
 			}
 			else {
-				PrintAndLog("Command execute timeout");
+				isOK = false;
+				PrintAndLog("Command execute timeout when trying to read block %2d of sector %2d.", blockNo, sectorNo);
+				break;
 			}
 		}
 	}
+
+	if (isOK) {
+		if ((fout = fopen("dumpdata.bin","wb")) == NULL) { 
+			PrintAndLog("Could not create file name dumpdata.bin");
+			return 1;
+		}
+		uint16_t numblocks = FirstBlockOfSector(numSectors - 1) + NumBlocksPerSector(numSectors - 1);
+		fwrite(carddata, 1, 16*numblocks, fout);
+		fclose(fout);
+		PrintAndLog("Dumped %d blocks (%d bytes) to file dumpdata.bin", numblocks, 16*numblocks);
+	}
 	
-	fclose(fin);
-	fclose(fout);
-	
-  return 0;
+	return 0;
 }
 
+
 int CmdHF14AMfRestore(const char *Cmd)
 {
 
-	int i,j;
+	uint8_t sectorNo,blockNo;
 	uint8_t keyType = 0;
 	uint8_t key[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
 	uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-	uint8_t keyA[16][6];
-	uint8_t keyB[16][6];
+	uint8_t keyA[40][6];
+	uint8_t keyB[40][6];
+	uint8_t numSectors;
 	
 	FILE *fdump;
 	FILE *fkeys;
-	
+
+	char cmdp = param_getchar(Cmd, 0);
+	switch (cmdp) {
+		case '0' : numSectors = 5; break;
+		case '1' : 
+		case '\0': numSectors = 16; break;
+		case '2' : numSectors = 32; break;
+		case '4' : numSectors = 40; break;
+		default:   numSectors = 16;
+	}	
+
+	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("");
+		PrintAndLog("Samples: hf mf restore");
+		PrintAndLog("         hf mf restore 4");
+		return 0;
+	}
+
 	if ((fdump = fopen("dumpdata.bin","rb")) == NULL) {
 		PrintAndLog("Could not find file dumpdata.bin");
 		return 1;
@@ -415,54 +721,54 @@ int CmdHF14AMfRestore(const char *Cmd)
 		return 1;
 	}
 	
-	for (i=0 ; i<16 ; i++) {
-		fread(keyA[i], 1, 6, fkeys);
+	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
+		if (fread(keyA[sectorNo], 1, 6, fkeys) == 0) {
+			PrintAndLog("File reading error (dumpkeys.bin).");
+			return 2;
+		}
 	}
-	for (i=0 ; i<16 ; i++) {
-		fread(keyB[i], 1, 6, fkeys);
+
+	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
+		if (fread(keyB[sectorNo], 1, 6, fkeys) == 0) {
+			PrintAndLog("File reading error (dumpkeys.bin).");
+			return 2;
+		}
 	}
-	
+
 	PrintAndLog("Restoring dumpdata.bin to card");
 
-	for (i=0 ; i<16 ; i++) {
-		for( j=0 ; j<4 ; j++) {
-			UsbCommand c = {CMD_MIFARE_WRITEBL, {i*4 + j, keyType, 0}};
+	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);
 			
-			fread(bldata, 1, 16, fdump);
+			if (fread(bldata, 1, 16, fdump) == 0) {
+				PrintAndLog("File reading error (dumpdata.bin).");
+				return 2;
+			}
 					
-			if (j == 3) {
-				bldata[0]  = (keyA[i][0]);
-				bldata[1]  = (keyA[i][1]);
-				bldata[2]  = (keyA[i][2]);
-				bldata[3]  = (keyA[i][3]);
-				bldata[4]  = (keyA[i][4]);
-				bldata[5]  = (keyA[i][5]);
-				bldata[10] = (keyB[i][0]);
-				bldata[11] = (keyB[i][1]);
-				bldata[12] = (keyB[i][2]);
-				bldata[13] = (keyB[i][3]);
-				bldata[14] = (keyB[i][4]);
-				bldata[15] = (keyB[i][5]);
+			if (blockNo == NumBlocksPerSector(sectorNo) - 1) {	// sector trailer
+				bldata[0]  = (keyA[sectorNo][0]);
+				bldata[1]  = (keyA[sectorNo][1]);
+				bldata[2]  = (keyA[sectorNo][2]);
+				bldata[3]  = (keyA[sectorNo][3]);
+				bldata[4]  = (keyA[sectorNo][4]);
+				bldata[5]  = (keyA[sectorNo][5]);
+				bldata[10] = (keyB[sectorNo][0]);
+				bldata[11] = (keyB[sectorNo][1]);
+				bldata[12] = (keyB[sectorNo][2]);
+				bldata[13] = (keyB[sectorNo][3]);
+				bldata[14] = (keyB[sectorNo][4]);
+				bldata[15] = (keyB[sectorNo][5]);
 			}		
 			
-			PrintAndLog("Writing to block %2d: %s", i*4+j, sprint_hex(bldata, 16));
-			
-			/*
-			PrintAndLog("Writing to block %2d: %s Confirm? [Y,N]", i*4+j, sprint_hex(bldata, 16));
-			
-			scanf("%c",&ch);
-			if ((ch != 'y') && (ch != 'Y')){
-				PrintAndLog("Aborting !");
-				return 1;
-			}
-			*/
+			PrintAndLog("Writing to block %3d: %s", FirstBlockOfSector(sectorNo) + blockNo, sprint_hex(bldata, 16));
 			
 			memcpy(c.d.asBytes + 10, bldata, 16);
 			SendCommand(&c);
 
 			UsbCommand resp;
-      if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+			if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
 				uint8_t isOK  = resp.arg[0] & 0xff;
 				PrintAndLog("isOk:%02x", isOK);
 			} else {
@@ -476,22 +782,22 @@ int CmdHF14AMfRestore(const char *Cmd)
 	return 0;
 }
 
+
 int CmdHF14AMfNested(const char *Cmd)
 {
 	int i, j, res, iterations;
-	sector	*	e_sector = NULL;
+	sector *e_sector = NULL;
 	uint8_t blockNo = 0;
 	uint8_t keyType = 0;
 	uint8_t trgBlockNo = 0;
 	uint8_t trgKeyType = 0;
-	uint8_t blDiff = 0;
-	int  SectorsCnt = 0;
+	uint8_t SectorsCnt = 0;
 	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-	uint8_t keyBlock[16 * 6];
+	uint8_t keyBlock[13*6];
 	uint64_t key64 = 0;
-	int transferToEml = 0;
+	bool transferToEml = false;
 	
-	int createDumpFile = 0;
+	bool createDumpFile = false;
 	FILE *fkeys;
 	uint8_t standart[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
 	uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
@@ -508,20 +814,24 @@ int CmdHF14AMfNested(const char *Cmd)
 		PrintAndLog("d - write keys to binary file");
 		PrintAndLog(" ");
 		PrintAndLog("      sample1: hf mf nested 1 0 A FFFFFFFFFFFF ");
-		PrintAndLog("      sample1: hf mf nested 1 0 A FFFFFFFFFFFF t ");
-		PrintAndLog("      sample1: hf mf nested 1 0 A FFFFFFFFFFFF d ");
-		PrintAndLog("      sample2: hf mf nested o 0 A FFFFFFFFFFFF 4 A");
+		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;
 	}	
 	
 	cmdp = param_getchar(Cmd, 0);
 	blockNo = param_get8(Cmd, 1);
 	ctmp = param_getchar(Cmd, 2);
-	if (ctmp == 0x00) {
+	
+	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 (ctmp != 'A' && ctmp != 'a') 
+		keyType = 1;
+		
 	if (param_gethex(Cmd, 3, key, 12)) {
 		PrintAndLog("Key must include 12 HEX symbols");
 		return 1;
@@ -531,116 +841,133 @@ int CmdHF14AMfNested(const char *Cmd)
 		cmdp = 'o';
 		trgBlockNo = param_get8(Cmd, 4);
 		ctmp = param_getchar(Cmd, 5);
-		if (ctmp == 0x00) {
+		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;
+		if (ctmp != 'A' && ctmp != 'a') 
+			trgKeyType = 1;
 	} else {
+		
+		
+	
 		switch (cmdp) {
 			case '0': SectorsCnt = 05; break;
 			case '1': SectorsCnt = 16; break;
 			case '2': SectorsCnt = 32; break;
-			case '4': SectorsCnt = 64; break;
+			case '4': SectorsCnt = 40; break;
 			default:  SectorsCnt = 16;
 		}
 	}
 
 	ctmp = param_getchar(Cmd, 4);
-	if		(ctmp == 't' || ctmp == 'T') transferToEml = 1;
-	else if (ctmp == 'd' || ctmp == 'D') createDumpFile = 1;
+	if		(ctmp == 't' || ctmp == 'T') transferToEml = true;
+	else if (ctmp == 'd' || ctmp == 'D') createDumpFile = true;
 	
 	ctmp = param_getchar(Cmd, 6);
 	transferToEml |= (ctmp == 't' || ctmp == 'T');
 	transferToEml |= (ctmp == 'd' || ctmp == 'D');
 	
-	PrintAndLog("--block no:%02x key type:%02x key:%s etrans:%d", blockNo, keyType, sprint_hex(key, 6), transferToEml);
-	if (cmdp == 'o')
-		PrintAndLog("--target block no:%02x target key type:%02x ", trgBlockNo, trgKeyType);
-
 	if (cmdp == 'o') {
-		if (mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock)) {
+		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;
 		}
-
-		for (i = 0; i < 16; i++) {
-			PrintAndLog("count=%d key= %s", i, sprint_hex(keyBlock + i * 6, 6));
-		}
-	
-		// test keys
-		res = mfCheckKeys(trgBlockNo, trgKeyType, 8, keyBlock, &key64);
-		if (res)
-			res = mfCheckKeys(trgBlockNo, trgKeyType, 8, &keyBlock[6 * 8], &key64);
-		if (!res) {
+		key64 = bytes_to_num(keyBlock, 6);
+		if (key64) {
 			PrintAndLog("Found valid key:%012"llx, key64);
 
 			// transfer key to the emulator
 			if (transferToEml) {
-				mfEmlGetMem(keyBlock, (trgBlockNo / 4) * 4 + 3, 1);
+				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, (trgBlockNo / 4) * 4 + 3, 1);		
+				mfEmlSetMem(keyBlock, sectortrailer, 1);		
 			}
 		} else {
 			PrintAndLog("No valid key found");
 		}
 	}
 	else { // ------------------------------------  multiple sectors working
-		blDiff = blockNo % 4;
-		PrintAndLog("Block shift=%d", blDiff);
+		clock_t time1;
+		time1 = clock();
+
 		e_sector = calloc(SectorsCnt, sizeof(sector));
 		if (e_sector == NULL) return 1;
 		
-		//test current key 4 sectors
+		//test current key and additional standard keys first
 		memcpy(keyBlock, key, 6);
-		num_to_bytes(0xa0a1a2a3a4a5, 6, (uint8_t*)(keyBlock + 1 * 6));
-		num_to_bytes(0xb0b1b2b3b4b5, 6, (uint8_t*)(keyBlock + 2 * 6));
-		num_to_bytes(0xffffffffffff, 6, (uint8_t*)(keyBlock + 3 * 6));
-		num_to_bytes(0x000000000000, 6, (uint8_t*)(keyBlock + 4 * 6));
+		num_to_bytes(0xffffffffffff, 6, (uint8_t*)(keyBlock + 1 * 6));
+		num_to_bytes(0x000000000000, 6, (uint8_t*)(keyBlock + 2 * 6));
+		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(i * 4 + blDiff, j, 6, keyBlock, &key64);
+				res = mfCheckKeys(FirstBlockOfSector(i), j, 6, keyBlock, &key64);
 				
 				if (!res) {
 					e_sector[i].Key[j] = key64;
 					e_sector[i].foundKey[j] = 1;
 				}
 			}
-		} 
+		}
+		
 		
 		// nested sectors
 		iterations = 0;
 		PrintAndLog("nested...");
+		bool calibrate = true;
 		for (i = 0; i < NESTED_SECTOR_RETRY; i++) {
-			for (trgBlockNo = blDiff; trgBlockNo < SectorsCnt * 4; trgBlockNo = trgBlockNo + 4) 
+			for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {
 				for (trgKeyType = 0; trgKeyType < 2; trgKeyType++) { 
-					if (e_sector[trgBlockNo / 4].foundKey[trgKeyType]) continue;
-					if (mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock)) continue;
+					if (e_sector[sectorNo].foundKey[trgKeyType]) continue;
+					PrintAndLog("-----------------------------------------------");
+					if(mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate)) {
+						PrintAndLog("Nested error.\n");
+						return 2;
+					}
+					else {
+						calibrate = false;
+					}
 					
 					iterations++;
-					
-					//try keys from nested
-					res = mfCheckKeys(trgBlockNo, trgKeyType, 8, keyBlock, &key64);
-					if (res)
-						res = mfCheckKeys(trgBlockNo, trgKeyType, 8, &keyBlock[6 * 8], &key64);
-					if (!res) {
+
+					key64 = bytes_to_num(keyBlock, 6);
+					if (key64) {
 						PrintAndLog("Found valid key:%012"llx, key64);
-						e_sector[trgBlockNo / 4].foundKey[trgKeyType] = 1;
-						e_sector[trgBlockNo / 4].Key[trgKeyType] = key64;
+						e_sector[sectorNo].foundKey[trgKeyType] = 1;
+						e_sector[sectorNo].Key[trgKeyType] = key64;
 					}
 				}
+			}
 		}
 
-		PrintAndLog("Iterations count: %d", iterations);
+		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|");
@@ -654,12 +981,12 @@ int CmdHF14AMfNested(const char *Cmd)
 		// transfer them to the emulator
 		if (transferToEml) {
 			for (i = 0; i < SectorsCnt; i++) {
-				mfEmlGetMem(keyBlock, i * 4 + 3, 1);
+				mfEmlGetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
 				if (e_sector[i].foundKey[0])
 					num_to_bytes(e_sector[i].Key[0], 6, keyBlock);
 				if (e_sector[i].foundKey[1])
 					num_to_bytes(e_sector[i].Key[1], 6, &keyBlock[10]);
-				mfEmlSetMem(keyBlock, i * 4 + 3, 1);
+				mfEmlSetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
 			}		
 		}
 		
@@ -670,8 +997,8 @@ int CmdHF14AMfNested(const char *Cmd)
 				free(e_sector);
 				return 1;
 			}
-			PrintAndLog("Printing keys to bynary file dumpkeys.bin...");
-			for(i=0; i<16; i++) {
+			PrintAndLog("Printing keys to binary file dumpkeys.bin...");
+			for(i=0; i<SectorsCnt; i++) {
 				if (e_sector[i].foundKey[0]){
 					num_to_bytes(e_sector[i].Key[0], 6, tempkey);
 					fwrite ( tempkey, 1, 6, fkeys );
@@ -680,7 +1007,7 @@ int CmdHF14AMfNested(const char *Cmd)
 					fwrite ( &standart, 1, 6, fkeys );
 				}
 			}
-			for(i=0; i<16; i++) {
+			for(i=0; i<SectorsCnt; i++) {
 				if (e_sector[i].foundKey[1]){
 					num_to_bytes(e_sector[i].Key[1], 6, tempkey);
 					fwrite ( tempkey, 1, 6, fkeys );
@@ -698,20 +1025,21 @@ int CmdHF14AMfNested(const char *Cmd)
 	return 0;
 }
 
-static  uint32_t
-get_trailer_block (uint32_t uiBlock)
-{
-  // Test if we are in the small or big sectors
-  uint32_t trailer_block = 0;
-  if (uiBlock < 128) {
-    trailer_block = uiBlock + (3 - (uiBlock % 4));
-  } else {
-    trailer_block = uiBlock + (15 - (uiBlock % 16));
-  }
-  return trailer_block;
-}
+
 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;
+	}
+	
 	FILE * f;
 	char filename[256]={0};
 	char buf[13];
@@ -732,30 +1060,28 @@ int CmdHF14AMfChk(const char *Cmd)
 	keyBlock = calloc(stKeyBlock, 6);
 	if (keyBlock == NULL) return 1;
 
-	num_to_bytes(0xffffffffffff, 6, (uint8_t*)(keyBlock + 0 * 6)); // Default key (first key used by program if no user defined key)
-	num_to_bytes(0x000000000000, 6, (uint8_t*)(keyBlock + 1 * 6)); // Blank key
-	num_to_bytes(0xa0a1a2a3a4a5, 6, (uint8_t*)(keyBlock + 2 * 6)); // NFCForum MAD key
-	num_to_bytes(0xb0b1b2b3b4b5, 6, (uint8_t*)(keyBlock + 3 * 6));
-	num_to_bytes(0xaabbccddeeff, 6, (uint8_t*)(keyBlock + 4 * 6));
-	num_to_bytes(0x4d3a99c351dd, 6, (uint8_t*)(keyBlock + 5 * 6));
-	num_to_bytes(0x1a982c7e459a, 6, (uint8_t*)(keyBlock + 6 * 6));
-	num_to_bytes(0xd3f7d3f7d3f7, 6, (uint8_t*)(keyBlock + 7 * 6));
-	num_to_bytes(0x714c5c886e97, 6, (uint8_t*)(keyBlock + 8 * 6));
-	num_to_bytes(0x587ee5f9350f, 6, (uint8_t*)(keyBlock + 9 * 6));
-	num_to_bytes(0xa0478cc39091, 6, (uint8_t*)(keyBlock + 10 * 6));
-	num_to_bytes(0x533cb6c723f6, 6, (uint8_t*)(keyBlock + 11 * 6));
-	num_to_bytes(0x8fd0a4f256e9, 6, (uint8_t*)(keyBlock + 12 * 6));
-	
-	if (strlen(Cmd)<3) {
-		PrintAndLog("Usage:  hf mf chk <block number>/<*card memory> <key type (A/B/?)> [t] [<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("      sample: hf mf chk 0 A 1234567890ab keys.dic");
-		PrintAndLog("              hf mf chk *1 ? t");
-		return 0;
-	}	
+	uint64_t defaultKeys[] =
+	{
+		0xffffffffffff, // Default key (first key used by program if no user defined key)
+		0x000000000000, // Blank key
+		0xa0a1a2a3a4a5, // NFCForum MAD key
+		0xb0b1b2b3b4b5,
+		0xaabbccddeeff,
+		0x4d3a99c351dd,
+		0x1a982c7e459a,
+		0xd3f7d3f7d3f7,
+		0x714c5c886e97,
+		0x587ee5f9350f,
+		0xa0478cc39091,
+		0x533cb6c723f6,
+		0x8fd0a4f256e9
+	};
+	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;
@@ -801,7 +1127,7 @@ int CmdHF14AMfChk(const char *Cmd)
 				}
 				keyBlock = p;
 			}
-			PrintAndLog("chk key[%d] %02x%02x%02x%02x%02x%02x", keycnt,
+			PrintAndLog("chk 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++;
@@ -814,16 +1140,13 @@ int CmdHF14AMfChk(const char *Cmd)
 			}
 			
 			if ( (f = fopen( filename , "r")) ) {
-				while( !feof(f) ){
-					memset(buf, 0, sizeof(buf));
-					fgets(buf, sizeof(buf), f);
-					
+				while( fgets(buf, sizeof(buf), f) ){
 					if (strlen(buf) < 12 || buf[11] == '\n')
 						continue;
 				
 					while (fgetc(f) != '\n' && !feof(f)) ;  //goto next line
 					
-					if( buf[0]=='#' ) continue;	//The line start with # is remcommnet,skip
+					if( buf[0]=='#' ) continue;	//The line start with # is comment, skip
 
 					if (!isxdigit(buf[0])){
 						PrintAndLog("File content error. '%s' must include 12 HEX symbols",buf);
@@ -843,49 +1166,54 @@ int CmdHF14AMfChk(const char *Cmd)
 					}
 					memset(keyBlock + 6 * keycnt, 0, 6);
 					num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);
-					PrintAndLog("chk custom key[%d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));
+					PrintAndLog("chk custom key[%2d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));
 					keycnt++;
+					memset(buf, 0, sizeof(buf));
 				}
+				fclose(f);
 			} else {
 				PrintAndLog("File: %s: not found or locked.", filename);
 				free(keyBlock);
 				return 1;
-			fclose(f);
+			
 			}
 		}
 	}
 	
 	if (keycnt == 0) {
-		PrintAndLog("No key specified,try default keys");
-		for (;keycnt <=12; keycnt++)
-			PrintAndLog("chk default key[%d] %02x%02x%02x%02x%02x%02x", keycnt,
+		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);
 	}
 	
-	for ( int t = !keyType ; t < 2 ; keyType==2?(t++):(t=2) ) {
+	// 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;
+			}
+		}
+	}
+	
+	for ( int t = !keyType; t < 2; keyType==2?(t++):(t=2) ) {
 		int b=blockNo;
-		for (int i=0; i<SectorsCnt; ++i) {
-			PrintAndLog("--SectorsCnt:%d block no:0x%02x key type:%C key count:%d ", i,	 b, t?'B':'A', keycnt);
-			int size = keycnt>8?8:keycnt;
-			for (int c = 0; c < keycnt; c+=size) {
-				size=keycnt-c>8?8:keycnt-c;			
-				res = mfCheckKeys(b, t, size, keyBlock +6*c, &key64);
-				if (res !=1) {
+		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);
-						if (transferToEml) {
-							uint8_t block[16];
-							mfEmlGetMem(block, get_trailer_block(b), 1);
-							num_to_bytes(key64, 6, block + t*10);
-							mfEmlSetMem(block, get_trailer_block(b), 1);
-						}
-						break;
-					}
-					else {
-						printf("Not found yet, keycnt:%d\r", c+size);
-						fflush(stdout);
-					}
+						num_to_bytes(key64, 6, foundKey[t][i]);
+						validKey[t][i] = true;
+					} 
 				} else {
 					PrintAndLog("Command execute timeout");
 				}
@@ -893,78 +1221,124 @@ int CmdHF14AMfChk(const char *Cmd)
 			b<127?(b+=4):(b+=16);	
 		}
 	}
-	
-	free(keyBlock);
 
-/*
-	// Create dump file
-	if (createDumpFile) {
-		if ((fkeys = fopen("dumpkeys.bin","wb")) == NULL) { 
-			PrintAndLog("Could not create file dumpkeys.bin");
-			free(e_sector);
-			return 1;
+	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);
 		}
-		PrintAndLog("Printing keys to bynary file dumpkeys.bin...");
-		for(i=0; i<16; i++) {
-			if (e_sector[i].foundKey[0]){
-				num_to_bytes(e_sector[i].Key[0], 6, tempkey);
-				fwrite ( tempkey, 1, 6, fkeys );
 			}
-			else{
-				fwrite ( &standart, 1, 6, fkeys );
+				mfEmlSetMem(block, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);
 			}
 		}
-		for(i=0; i<16; i++) {
-			if (e_sector[i].foundKey[1]){
-				num_to_bytes(e_sector[i].Key[1], 6, tempkey);
-				fwrite ( tempkey, 1, 6, fkeys );
+		PrintAndLog("Found keys have been transferred to the emulator memory");
 			}
-			else{
-				fwrite ( &standart, 1, 6, fkeys );
+
+	if (createDumpFile) {
+		FILE *fkeys = fopen("dumpkeys.bin","wb");
+		if (fkeys == NULL) { 
+			PrintAndLog("Could not create file dumpkeys.bin");
+			free(keyBlock);
+			return 1;
 			}
+		for (uint16_t t = 0; t < 2; t++) {
+			fwrite(foundKey[t], 1, 6*SectorsCnt, fkeys);
 		}
 		fclose(fkeys);
+		PrintAndLog("Found keys have been dumped to file dumpkeys.bin. 0xffffffffffff has been inserted for unknown keys.");
 	}
-*/
+
+	free(keyBlock);
+
   return 0;
 }
 
+
 int CmdHF14AMf1kSim(const char *Cmd)
 {
-	uint8_t uid[4] = {0, 0, 0, 0};
-	
+	uint8_t uid[7] = {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  <uid (8 hex symbols)>");
-		PrintAndLog("           sample: hf mf sim 0a0a0a0a ");
+		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;
-	}	
-	
-	if (param_getchar(Cmd, 0) && param_gethex(Cmd, 0, uid, 8)) {
-		PrintAndLog("UID must include 8 HEX symbols");
-		return 1;
 	}
-	PrintAndLog(" uid:%s ", sprint_hex(uid, 4));
-	
-  UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {0, 0, 0}};
-	memcpy(c.d.asBytes, uid, 4);
-  SendCommand(&c);
+	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;
+		}
+		pnr +=2;
+	}
+	if (param_getchar(Cmd, pnr) == 'n') {
+		exitAfterNReads = param_get8(Cmd,pnr+1);
+		pnr += 2;
+	}
+	if (param_getchar(Cmd, pnr) == 'i' ) {
+		//Using a flag to signal interactiveness, least significant bit
+		flags |= FLAG_INTERACTIVE;
+		pnr++;
+	}
 
-  return 0;
+	if (param_getchar(Cmd, pnr) == 'x' ) {
+		//Using a flag to signal interactiveness, least significant bit
+		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);
+
+
+	UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads,0}};
+	memcpy(c.d.asBytes, uid, sizeof(uid));
+	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... "
+		}
+	}
+	
+	return 0;
 }
 
+
 int CmdHF14AMfDbg(const char *Cmd)
 {
 	int dbgMode = param_get32ex(Cmd, 0, 0, 10);
 	if (dbgMode > 4) {
-		PrintAndLog("Max debud mode parameter is 4 \n");
+		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 - all messages");
-		PrintAndLog(" 4 - extended debug mode");
+		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;
 	}	
 
@@ -977,8 +1351,7 @@ int CmdHF14AMfDbg(const char *Cmd)
 int CmdHF14AMfEGet(const char *Cmd)
 {
 	uint8_t blockNo = 0;
-	uint8_t data[3 * 16];
-	int i;
+	uint8_t data[16];
 
 	if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {
 		PrintAndLog("Usage:  hf mf eget <block number>");
@@ -989,10 +1362,8 @@ int CmdHF14AMfEGet(const char *Cmd)
 	blockNo = param_get8(Cmd, 0);
 
 	PrintAndLog(" ");
-	if (!mfEmlGetMem(data, blockNo, 3)) {
-		for (i = 0; i < 3; i++) {
-			PrintAndLog("data[%d]:%s", blockNo + i, sprint_hex(data + i * 16, 16));
-		}
+	if (!mfEmlGetMem(data, blockNo, 1)) {
+		PrintAndLog("data[%3d]:%s", blockNo, sprint_hex(data, 16));
 	} else {
 		PrintAndLog("Command execute timeout");
 	}
@@ -1000,6 +1371,7 @@ int CmdHF14AMfEGet(const char *Cmd)
   return 0;
 }
 
+
 int CmdHF14AMfEClear(const char *Cmd)
 {
 	if (param_getchar(Cmd, 0) == 'h') {
@@ -1013,6 +1385,7 @@ int CmdHF14AMfEClear(const char *Cmd)
   return 0;
 }
 
+
 int CmdHF14AMfESet(const char *Cmd)
 {
 	uint8_t memBlock[16];
@@ -1034,17 +1407,18 @@ int CmdHF14AMfESet(const char *Cmd)
 	}
 	
 	//  1 - blocks count
-  UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNo, 1, 0}};
+	UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNo, 1, 0}};
 	memcpy(c.d.asBytes, memBlock, 16);
-  SendCommand(&c);
-  return 0;
+	SendCommand(&c);
+	return 0;
 }
 
+
 int CmdHF14AMfELoad(const char *Cmd)
 {
 	FILE * f;
 	char filename[20];
-	char * fnameptr = filename;
+	char *fnameptr = filename;
 	char buf[64];
 	uint8_t buf8[64];
 	int i, len, blockNum;
@@ -1077,36 +1451,44 @@ int CmdHF14AMfELoad(const char *Cmd)
 	blockNum = 0;
 	while(!feof(f)){
 		memset(buf, 0, sizeof(buf));
-		fgets(buf, sizeof(buf), f);
-
+		if (fgets(buf, sizeof(buf), f) == NULL) {
+			if((blockNum == 16*4) || (blockNum == 32*4 + 8*16)) {	// supports both old (1K) and new (4K) .eml files)
+				break;
+			}
+			PrintAndLog("File reading error.");
+			fclose(f);
+			return 2;
+		}
 		if (strlen(buf) < 32){
 			if(strlen(buf) && feof(f))
 				break;
 			PrintAndLog("File content error. Block data must include 32 HEX symbols");
 			return 2;
 		}
-		for (i = 0; i < 32; i += 2)
-		  sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);
+		for (i = 0; i < 32; i += 2) {
+			sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);
 //			PrintAndLog("data[%02d]:%s", blockNum, sprint_hex(buf8, 16));
-
+		}
 		if (mfEmlSetMem(buf8, blockNum, 1)) {
-			PrintAndLog("Cant set emul block: %d", blockNum);
+			PrintAndLog("Cant set emul block: %3d", blockNum);
 			return 3;
 		}
 		blockNum++;
 		
-		if (blockNum >= 32 * 4 + 8 * 16) break;
+		if (blockNum >= 32*4 + 8*16) break;
 	}
 	fclose(f);
 	
-	if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){
-		PrintAndLog("File content error. There must be 64 blocks");
+	if ((blockNum != 16*4) && (blockNum != 32*4 + 8*16)) {
+		PrintAndLog("File content error. There must be 64 or 256 blocks.");
+		fclose(f);
 		return 4;
 	}
-	PrintAndLog("Loaded from file: %s", filename);
-  return 0;
+	PrintAndLog("Loaded %d blocks from file: %s", blockNum, filename);
+	return 0;
 }
 
+
 int CmdHF14AMfESave(const char *Cmd)
 {
 	FILE * f;
@@ -1148,7 +1530,7 @@ int CmdHF14AMfESave(const char *Cmd)
 	f = fopen(filename, "w+");
 
 	// put hex
-	for (i = 0; i < 32 * 4 + 8 * 16; i++) {
+	for (i = 0; i < 32*4 + 8*16; i++) {
 		if (mfEmlGetMem(buf, i, 1)) {
 			PrintAndLog("Cant get block: %d", i);
 			break;
@@ -1164,33 +1546,50 @@ int CmdHF14AMfESave(const char *Cmd)
   return 0;
 }
 
+
 int CmdHF14AMfECFill(const char *Cmd)
 {
 	uint8_t keyType = 0;
-
+	uint8_t numSectors = 16;
+	
 	if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {
-		PrintAndLog("Usage:  hf mf efill <key A/B>");
-		PrintAndLog("sample:  hf mf efill A");
-		PrintAndLog("Card data blocks transfers to card emulator memory.");
-		PrintAndLog("Keys must be laid in the simulator memory. \n");
+		PrintAndLog("Usage:  hf mf ecfill <key A/B> [card memory]");
+		PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
+		PrintAndLog("");
+		PrintAndLog("samples:  hf mf ecfill A");
+		PrintAndLog("          hf mf ecfill A 4");
+		PrintAndLog("Read card and transfer its data to emulator memory.");
+		PrintAndLog("Keys must be laid in the emulator memory. \n");
 		return 0;
 	}	
 
 	char ctmp = param_getchar(Cmd, 0);
-	if (ctmp == 0x00) {
+	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;
 
-  UsbCommand c = {CMD_MIFARE_EML_CARDLOAD, {0, keyType, 0}};
-  SendCommand(&c);
-  return 0;
+	ctmp = param_getchar(Cmd, 1);
+	switch (ctmp) {
+		case '0' : numSectors = 5; break;
+		case '1' : 
+		case '\0': numSectors = 16; break;
+		case '2' : numSectors = 32; break;
+		case '4' : numSectors = 40; break;
+		default:   numSectors = 16;
+	}	
+
+	printf("--params: numSectors: %d, keyType:%d", numSectors, keyType);
+	UsbCommand c = {CMD_MIFARE_EML_CARDLOAD, {numSectors, keyType, 0}};
+	SendCommand(&c);
+	return 0;
 }
 
+
 int CmdHF14AMfEKeyPrn(const char *Cmd)
 {
-	int i,b=-1;
+	int i;
 	uint8_t data[16];
 	uint64_t keyA, keyB;
 	
@@ -1198,9 +1597,8 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
 	PrintAndLog("|sec|key A           |key B           |");
 	PrintAndLog("|---|----------------|----------------|");
 	for (i = 0; i < 40; i++) {
-		b<127?(b+=4):(b+=16);
-		if (mfEmlGetMem(data, b, 1)) {
-			PrintAndLog("error get block %d", b);
+		if (mfEmlGetMem(data, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1)) {
+			PrintAndLog("error get block %d", FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
 			break;
 		}
 		keyA = bytes_to_num(data, 6);
@@ -1212,11 +1610,12 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
 	return 0;
 }
 
+
 int CmdHF14AMfCSetUID(const char *Cmd)
 {
 	uint8_t wipeCard = 0;
-	uint8_t uid[8];
-	uint8_t oldUid[8];
+	uint8_t uid[8] = {0x00};
+	uint8_t oldUid[8] = {0x00};
 	int res;
 
 	if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {
@@ -1270,7 +1669,7 @@ int CmdHF14AMfCSetBlk(const char *Cmd)
 		return 1;
 	}
 
-	PrintAndLog("--block number:%02x data:%s", blockNo, sprint_hex(memBlock, 16));
+	PrintAndLog("--block number:%2d data:%s", blockNo, sprint_hex(memBlock, 16));
 
 	res = mfCSetBlock(blockNo, memBlock, uid, 0, CSETBLOCK_SINGLE_OPER);
 	if (res) {
@@ -1282,6 +1681,7 @@ int CmdHF14AMfCSetBlk(const char *Cmd)
 	return 0;
 }
 
+
 int CmdHF14AMfCLoad(const char *Cmd)
 {
 	FILE * f;
@@ -1344,7 +1744,10 @@ int CmdHF14AMfCLoad(const char *Cmd)
 		flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;
 		while(!feof(f)){
 			memset(buf, 0, sizeof(buf));
-			fgets(buf, sizeof(buf), f);
+			if (fgets(buf, sizeof(buf), f) == NULL) {
+				PrintAndLog("File reading error.");
+				return 2;
+			}
 
 			if (strlen(buf) < 32){
 				if(strlen(buf) && feof(f))
@@ -1359,7 +1762,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
 			if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;
 
 			if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {
-				PrintAndLog("Cant set magic card block: %d", blockNum);
+				PrintAndLog("Can't set magic card block: %d", blockNum);
 				return 3;
 			}
 			blockNum++;
@@ -1392,7 +1795,7 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
 
 	blockNo = param_get8(Cmd, 0);
 
-	PrintAndLog("--block number:%02x ", blockNo);
+	PrintAndLog("--block number:%2d ", blockNo);
 
 	res = mfCGetBlock(blockNo, memBlock, CSETBLOCK_SINGLE_OPER);
 	if (res) {
@@ -1404,6 +1807,7 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
 	return 0;
 }
 
+
 int CmdHF14AMfCGetSc(const char *Cmd) {
 	uint8_t memBlock[16];
 	uint8_t sectorNo = 0;
@@ -1423,7 +1827,7 @@ int CmdHF14AMfCGetSc(const char *Cmd) {
 		return 1;
 	}
 
-	PrintAndLog("--sector number:%02x ", sectorNo);
+	PrintAndLog("--sector number:%d ", sectorNo);
 
 	flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;
 	for (i = 0; i < 4; i++) {
@@ -1432,15 +1836,16 @@ int CmdHF14AMfCGetSc(const char *Cmd) {
 
 		res = mfCGetBlock(sectorNo * 4 + i, memBlock, flags);
 		if (res) {
-			PrintAndLog("Can't read block. %02x error=%d", sectorNo * 4 + i, res);
+			PrintAndLog("Can't read block. %d error=%d", sectorNo * 4 + i, res);
 			return 1;
 		}
 	
-		PrintAndLog("block %02x data:%s", sectorNo * 4 + i, sprint_hex(memBlock, 16));
+		PrintAndLog("block %3d data:%s", sectorNo * 4 + i, sprint_hex(memBlock, 16));
 	}
 	return 0;
 }
 
+
 int CmdHF14AMfCSave(const char *Cmd) {
 
 	FILE * f;
@@ -1528,6 +1933,7 @@ int CmdHF14AMfCSave(const char *Cmd) {
 	}
 }
 
+
 int CmdHF14AMfSniff(const char *Cmd){
 	// params
 	bool wantLogToFile = 0;
@@ -1541,7 +1947,8 @@ int CmdHF14AMfSniff(const char *Cmd){
 	int blockLen = 0;
 	int num = 0;
 	int pckNum = 0;
-	uint8_t uid[8];
+	uint8_t uid[7];
+	uint8_t uid_len;
 	uint8_t atqa[2];
 	uint8_t sak;
 	bool isTag;
@@ -1551,7 +1958,7 @@ int CmdHF14AMfSniff(const char *Cmd){
 	memset(buf, 0x00, 3000);
 	
 	if (param_getchar(Cmd, 0) == 'h') {
-		PrintAndLog("It continuously get data from the field and saves it to: log, emulator, emulator file.");
+		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`");
@@ -1576,8 +1983,9 @@ int CmdHF14AMfSniff(const char *Cmd){
 	printf("Press the key on pc keyboard to abort the client.\n");
 	printf("-------------------------------------------------------------------------\n");
 
-  UsbCommand c = {CMD_MIFARE_SNIFFER, {0, 0, 0}};
-  SendCommand(&c);
+	UsbCommand c = {CMD_MIFARE_SNIFFER, {0, 0, 0}};
+	clearCommandBuffer();
+	SendCommand(&c);
 
 	// wait cycle
 	while (true) {
@@ -1612,61 +2020,168 @@ int CmdHF14AMfSniff(const char *Cmd){
 				PrintAndLog("received trace len: %d packages: %d", blockLen, pckNum);
 				num = 0;
 				while (bufPtr - buf + 9 < blockLen) {
-				  isTag = bufPtr[3] & 0x80 ? true:false;
+					isTag = bufPtr[3] & 0x80 ? true:false;
 					bufPtr += 4;
 					parity = *((uint32_t *)(bufPtr));
 					bufPtr += 4;
 					len = bufPtr[0];
 					bufPtr++;
-					if ((len == 14) && (bufPtr[0] = 0xff) && (bufPtr[1] = 0xff)) {
+					if ((len == 14) && (bufPtr[0] == 0xff) && (bufPtr[1] == 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:%02x %02x sak:0x%02x", sprint_hex(uid, 7), atqa[0], atqa[1], sak);
-						if (wantLogToFile) {
-							FillFileNameByUID(logHexFileName, uid, ".log", 7);
+						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);
+						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, parity, wantSaveToEmlFile);
+						if (wantLogToFile) 
+							AddLogHex(logHexFileName, isTag ? "TAG: ":"RDR: ", bufPtr, len);
+						if (wantDecrypt) 
+							mfTraceDecode(bufPtr, len, parity, wantSaveToEmlFile);
 					}
 					bufPtr += len;
 					num++;
 				}
 			}
-		} // resp not NILL
+		} // resp not NULL
 	} // while (true)
-  return 0;
+	
+	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;
+	
+	// MIFARE Classic 1K
+	if ( ((atqa & 0xff0f) == 0x0004) && (sak == 0x08) ) return 1;
+	
+	// MIFARE Classik 4K
+	if ( ((atqa & 0xff0f) == 0x0002) && (sak == 0x18) ) return 4;
+	
+	// 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;
 }
 
+
+
+
 static command_t CommandTable[] =
 {
-  {"help",		CmdHelp,						1, "This help"},
-  {"dbg",			CmdHF14AMfDbg,			0, "Set default debug mode"},
+  {"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"},
+  {"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. param - <used card nonce>"},
+  {"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"},
+  {"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"},
+  {"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"},