X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/495d7f13265a727673b71451cf1906a082ca7fb4..407697dfe38925e33c9e59e7a323d0a5edc8482b:/client/cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 1d516ebc..adfd5ecb 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -21,8 +21,17 @@ int CmdHF14AMifare(const char *Cmd)
 	uint64_t par_list = 0, ks_list = 0, r_key = 0;
 	int16_t isOK = 0;
 	int tmpchar; 
+	uint8_t blockNo = 0;
+	
+	char cmdp = param_getchar(Cmd, 0);	
+	if ( cmdp == 'H' || cmdp == 'h') {
+		PrintAndLog("Usage:  hf mf mifare <block number>");
+		PrintAndLog("        sample: hf mf mifare 0");
+		return 0;
+	}	
 	
-	UsbCommand c = {CMD_READER_MIFARE, {true, 0, 0}};
+	blockNo = param_get8(Cmd, 0);
+	UsbCommand c = {CMD_READER_MIFARE, {true, blockNo, 0}};
 
 	// message
 	printf("-------------------------------------------------------------------------\n");
@@ -54,13 +63,8 @@ start:
 		}
 		
 		UsbCommand resp;
-		if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
+		if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
 			isOK  = resp.arg[0];
-			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");
 			switch (isOK) {
 				case -1 : PrintAndLog("Button pressed. Aborted.\n"); break;
@@ -70,6 +74,11 @@ start:
 						  PrintAndLog("generating polynomial with 16 effective bits only, but shows unexpected behaviour.\n"); break;
 				default: ;
 			}
+			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);
 			break;
 		}
 	}	
@@ -87,14 +96,12 @@ start:
 		c.arg[0] = false;
 		goto start;
 	} else {
-		isOK = 0;
-		printf("------------------------------------------------------------------\n");
 		PrintAndLog("Found valid key: %012"llx" \n", r_key);
 	}
+	
 	t1 = clock() - t1;
-	if ( t1 > 0 ){
-		PrintAndLog("Time in darkside: %f ticks - %1.2f sec\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC);
-	}
+	if ( t1 > 0 )
+		PrintAndLog("Time in darkside: %.0f ticks\n", (float)t1);
 	return 0;
 }
 
@@ -566,7 +573,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[14*6];
+	uint8_t keyBlock[6*6];
 	uint64_t key64 = 0;
 	bool transferToEml = false;
 	
@@ -586,10 +593,11 @@ int CmdHF14AMfNested(const char *Cmd)
 		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");
+		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;
 	}	
 	
@@ -640,40 +648,35 @@ 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');
 		int16_t isOK = mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true);
-		if (isOK) {
-			switch (isOK) {
-				case -1 : PrintAndLog("Error: No response from Proxmark.\n"); break;
-				case -2 : PrintAndLog("Button pressed. Aborted.\n"); break;
-				case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (random numbers are not predictable).\n"); break;
-				default : PrintAndLog("Unknown Error.\n");
-			}
-			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;
+		switch (isOK) {
+			case -1 : PrintAndLog("Error: No response from Proxmark.\n"); break;
+			case -2 : PrintAndLog("Button pressed. Aborted.\n"); break;
+			case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (random numbers are not predictable).\n"); break;
+			case -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 t1 = clock();
@@ -688,14 +691,6 @@ 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++) {
@@ -706,54 +701,64 @@ int CmdHF14AMfNested(const char *Cmd)
 				
 				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;
+		if ( t2 > 0 )
+			PrintAndLog("Time to check 6 known keys: %.0f ticks", (float)t2 );
+
+		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 (trgKeyType = 0; trgKeyType < 2; trgKeyType++) { 
+			for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; ++sectorNo) {
+				for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) { 
+
 					if (e_sector[sectorNo].foundKey[trgKeyType]) continue;
-					PrintAndLog("-----------------------------------------------");
-					int16_t isOK = mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate);
-					if(isOK) {
-						switch (isOK) {
-							case -1 : PrintAndLog("Error: No response from Proxmark.\n"); break;
-							case -2 : PrintAndLog("Button pressed. Aborted.\n"); break;
-							case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (random numbers are not predictable).\n"); break;
-							default : PrintAndLog("Unknown 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 (random numbers are 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;
 				}
 			}
 		}
+		
+		t1 = clock() - t1;
+		if ( t1 > 0 )
+			PrintAndLog("Time in nested: %.0f ticks \n", (float)t1);
 
 		// 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?
-		PrintAndLog("testing to read B...");
+		PrintAndLog("trying 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();
@@ -763,39 +768,21 @@ int CmdHF14AMfNested(const char *Cmd)
 				if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) continue;
 					
 				uint8_t isOK  = resp.arg[0] & 0xff;
-				uint8_t *data = resp.d.asBytes;
-
-				if (isOK) {
+				if (!isOK) continue;
 
-					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;
-					}
+				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;
 				}
 			}
 		}
+
 		
-		t1 = clock() - t1;
-		if ( t1 > 0 ) {
-			PrintAndLog("Time in nested: %f ticks %1.2f sec (%1.2f sec per key)\n\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC, ((float)t1)/iterations/CLOCKS_PER_SEC);
-		}
-		
-		PrintAndLog("-----------------------------------------------\nIterations count: %d\n\n", iterations);
 		//print them
-		PrintAndLog("|---|----------------|---|----------------|---|");
-		PrintAndLog("|sec|key A           |res|key B           |res|");
-		PrintAndLog("|---|----------------|---|----------------|---|");
-		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]
-			);
-		}
-		PrintAndLog("|---|----------------|---|----------------|---|");
+		printKeyTable( SectorsCnt, e_sector );
 		
 		// transfer them to the emulator
 		if (transferToEml) {
@@ -979,6 +966,8 @@ int CmdHF14AMfChk(const char *Cmd)
 	uint8_t *keyBlock = NULL, *p;
 	uint8_t stKeyBlock = 20;
 	
+	sector *e_sector = NULL;
+	
 	int i, res;
 	int	keycnt = 0;
 	char ctmp	= 0x00;
@@ -987,14 +976,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
@@ -1012,9 +1002,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;
@@ -1025,9 +1014,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) {	
@@ -1061,7 +1050,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++;
@@ -1101,7 +1090,7 @@ 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[%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));
 				}
@@ -1118,86 +1107,147 @@ 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,
+			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;
 	}
+
+	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();
-		
-	for ( int t = !keyType; t < 2; keyType==2?(t++):(t=2) ) {
-		int b=blockNo;
+	
+	// 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, true, 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) {
+				
+				uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c;
+				
+				res = mfCheckKeys(b, trgKeyType, true, size, &keyBlock[6*c], &key64);
+				if (!res) {
+					//PrintAndLog("Sector:%3d Block:%3d, key type: %C  -- Found key [%012"llx"]", i, b, trgKeyType ? 'B':'A', key64);
+										 
+					e_sector[i].Key[trgKeyType] = key64;
+					e_sector[i].foundKey[trgKeyType] = TRUE;
+					break;
+				} else {					
+					e_sector[i].Key[trgKeyType] = 0xffffffffffff;
+					e_sector[i].foundKey[trgKeyType] = FALSE;
 				}
+				printf(".");
 			}
-			b<127?(b+=4):(b+=16);	
+			b < 127 ? ( b +=4 ) : ( b += 16 );	
 		}
 	}
 	t1 = clock() - t1;
-	if ( t1 > 0 ){
-		printf("Time in checkkeys: %f ticks  %1.2f sec (%1.2f sec per key)\n\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC, ((float)t1)/keycnt/CLOCKS_PER_SEC);
+	if ( t1 > 0 )
+		printf("\nTime in checkkeys: %.0f ticks\n", (float)t1);
+
+	// 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?
+	PrintAndLog("testing to read B...");
+	for (i = 0; i < SectorsCnt; i++) {
+		// KEY A  but not KEY B
+		if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {
+						
+			uint8_t sectrail = (FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
+			
+			PrintAndLog("Reading block %d", sectrail);
+			
+			UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}};
+			num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A
+			clearCommandBuffer();
+			SendCommand(&c);
+
+			UsbCommand resp;
+			if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) continue;
+				
+			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;
+			}
+		}
 	}
 
+
+	//print them
+	printKeyTable( SectorsCnt, e_sector );
+	
 	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);
-			}
+		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);
+	free(e_sector);
 	PrintAndLog("");
 	return 0;
 }
 
+void printKeyTable( uint8_t sectorscnt, sector *e_sector ){
+	PrintAndLog("|---|----------------|---|----------------|---|");
+	PrintAndLog("|sec|key A           |res|key B           |res|");
+	PrintAndLog("|---|----------------|---|----------------|---|");
+	for (uint8_t i = 0; i < sectorscnt; ++i) {
+		PrintAndLog("|%03d|  %012"llx"  | %d |  %012"llx"  | %d |", i,
+			e_sector[i].Key[0], e_sector[i].foundKey[0], 
+			e_sector[i].Key[1], e_sector[i].foundKey[1]
+		);
+	}
+	PrintAndLog("|---|----------------|---|----------------|---|");
+}
+
 int CmdHF14AMf1kSim(const char *Cmd)
 {
 	uint8_t uid[7] = {0, 0, 0, 0, 0, 0, 0};
@@ -1669,11 +1719,13 @@ int CmdHF14AMfCSetUID(const char *Cmd)
 	int argi=0;
 
 	if (strlen(Cmd) < 1 || param_getchar(Cmd, argi) == 'h') {
-		PrintAndLog("Usage:  hf mf csetuid <UID 8 hex symbols> [ATQA 4 hex symbols SAK 2 hex symbols] [w]");
-		PrintAndLog("sample:  hf mf csetuid 01020304");
-		PrintAndLog("sample:  hf mf csetuid 01020304 0004 08 w");
 		PrintAndLog("Set UID, ATQA, and SAK for magic Chinese card (only works with such cards)");
 		PrintAndLog("If you also want to wipe the card then add 'w' at the end of the command line.");
+		PrintAndLog("");
+		PrintAndLog("Usage:  hf mf csetuid <UID 8 hex symbols> [ATQA 4 hex symbols SAK 2 hex symbols] [w]");
+		PrintAndLog("");
+		PrintAndLog("sample:  hf mf csetuid 01020304");
+		PrintAndLog("         hf mf csetuid 01020304 0004 08 w");
 		return 0;
 	}
 
@@ -1714,7 +1766,7 @@ int CmdHF14AMfCSetUID(const char *Cmd)
 
 	PrintAndLog("--wipe card:%s  uid:%s", (wipeCard)?"YES":"NO", sprint_hex(uid, 4));
 
-	res = mfCSetUID(uid, (atqaPresent)?atqa:NULL, (atqaPresent)?sak:NULL, oldUid, wipeCard);
+	res = mfCSetUID(uid, (atqaPresent) ? atqa : NULL, (atqaPresent) ? sak : NULL, oldUid, wipeCard);
 	if (res) {
 			PrintAndLog("Can't set UID. error=%d", res);
 			return 1;