X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/26fdb4ab49f74415b43363d999063261ed4cb9da..1f947c4b09f79686adfce929d217a189286dd9b9:/client/cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 742b7b3b..064aaaa5 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -381,20 +381,15 @@ int CmdHF14AMfRestore1k(const char *Cmd)
 {
 
 	int i,j;
-	uint8_t blockNo = 0;
 	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];
 	
-	char cmdp = 0x00;
-	
 	FILE *fdump;
 	FILE *fkeys;
 	
-	FILE *fdebug = fopen("debug.bin","wb");
-	
 	if ((fdump = fopen("dumpdata.bin","rb")) == NULL) {
 		PrintAndLog("Could not find file dump.bin");
 		return 1;
@@ -472,6 +467,8 @@ int CmdHF14AMfNested(const char *Cmd)
 	
 	int createDumpFile = 0;
 	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;
 
@@ -524,10 +521,12 @@ int CmdHF14AMfNested(const char *Cmd)
 	}
 
 	ctmp = param_getchar(Cmd, 4);
-	if (ctmp == 't' || ctmp == 'T') transferToEml = 1;
+	if		(ctmp == 't' || ctmp == 'T') transferToEml = 1;
+	else if (ctmp == 'd' || ctmp == 'D') createDumpFile = 1;
+	
 	ctmp = param_getchar(Cmd, 6);
 	transferToEml |= (ctmp == 't' || ctmp == 'T');
-	createDumpFile |= (ctmp == 'd' || ctmp == 'D');
+	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')
@@ -563,8 +562,8 @@ int CmdHF14AMfNested(const char *Cmd)
 		} else {
 			PrintAndLog("No valid key found");
 		}
-	} else  // ------------------------------------  multiple sectors working
-	{
+	}
+	else { // ------------------------------------  multiple sectors working
 		blDiff = blockNo % 4;
 		PrintAndLog("Block shift=%d", blDiff);
 		e_sector = calloc(SectorsCnt, sizeof(sector));
@@ -592,7 +591,6 @@ int CmdHF14AMfNested(const char *Cmd)
 			}
 		} 
 		
-		
 		// nested sectors
 		iterations = 0;
 		PrintAndLog("nested...");
@@ -639,17 +637,31 @@ int CmdHF14AMfNested(const char *Cmd)
 			}		
 		}
 		
+		// Create dump file
 		if (createDumpFile) {
 			if ((fkeys = fopen("dumpkeys.bin","wb")) == NULL) { 
-				rintAndLog("Could not create file keys.bin");
+				PrintAndLog("Could not create file keys.bin");
 				free(e_sector);
 				return 1;
 			}
+			PrintAndLog("Printing keys to bynary file dumpkeys.bin...");
 			for(i=0; i<16; i++) {
-				fwrite ( e_sector[i].Key[0], sizeof(e_sector[i].Key[0]), 1, fkeys );
+				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 );
+				}
 			}
 			for(i=0; i<16; i++) {
-				fwrite ( e_sector[i].Key[1], sizeof(e_sector[i].Key[1]), 1, fkeys );
+				if (e_sector[i].foundKey[1]){
+					num_to_bytes(e_sector[i].Key[1], 6, tempkey);
+					fwrite ( tempkey, 1, 6, fkeys );
+				}
+				else{
+					fwrite ( &standart, 1, 6, fkeys );
+				}
 			}
 			fclose(fkeys);
 		}