X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/902cb3c00b49535f0de9a3b6d5ba0c54260ccac1..759c16b31f8dcec37458dd6a5973ce0cfce58015:/client/cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 5927616b..597841e1 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -76,13 +76,13 @@ start:
 		PrintAndLog("Key not found (lfsr_common_prefix list is null). Nt=%08x", nt);	
 	} else {
 		printf("------------------------------------------------------------------\n");
-		PrintAndLog("Key found:%012llx \n", r_key);
+		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:%012llx", r_key);
+		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);	
@@ -287,10 +287,16 @@ int CmdHF14AMfDump(const char *Cmd)
 	// Read key file
 	
 	for (i=0 ; i<16 ; i++) {
-		fread ( keyA[i], 1, 6, fin );
+		if (fread( keyA[i], 1, 6, fin ) == 0) {
+      PrintAndLog("File reading error.");
+			return 2;
+    }
 	}
 	for (i=0 ; i<16 ; i++) {
-		fread ( keyB[i], 1, 6, fin );
+		if (fread( keyB[i], 1, 6, fin ) == 0) {
+      PrintAndLog("File reading error.");
+			return 2;
+    }
 	}
 	
 	// Read access rights to sectors
@@ -416,10 +422,16 @@ int CmdHF14AMfRestore(const char *Cmd)
 	}
 	
 	for (i=0 ; i<16 ; i++) {
-		fread(keyA[i], 1, 6, fkeys);
+		if (fread(keyA[i], 1, 6, fkeys) == 0) {
+      PrintAndLog("File reading error.");
+			return 2;
+    }
 	}
 	for (i=0 ; i<16 ; i++) {
-		fread(keyB[i], 1, 6, fkeys);
+		if (fread(keyB[i], 1, 6, fkeys) == 0) {
+      PrintAndLog("File reading error.");
+			return 2;
+    }
 	}
 	
 	PrintAndLog("Restoring dumpdata.bin to card");
@@ -429,7 +441,10 @@ int CmdHF14AMfRestore(const char *Cmd)
 			UsbCommand c = {CMD_MIFARE_WRITEBL, {i*4 + j, keyType, 0}};
 			memcpy(c.d.asBytes, key, 6);
 			
-			fread(bldata, 1, 16, fdump);
+			if (fread(bldata, 1, 16, fdump) == 0) {
+        PrintAndLog("File reading error.");
+        return 2;
+      }
 					
 			if (j == 3) {
 				bldata[0]  = (keyA[i][0]);
@@ -573,7 +588,7 @@ int CmdHF14AMfNested(const char *Cmd)
 		if (res)
 			res = mfCheckKeys(trgBlockNo, trgKeyType, 8, &keyBlock[6 * 8], &key64);
 		if (!res) {
-			PrintAndLog("Found valid key:%012llx", key64);
+			PrintAndLog("Found valid key:%012"llx, key64);
 
 			// transfer key to the emulator
 			if (transferToEml) {
@@ -633,7 +648,7 @@ int CmdHF14AMfNested(const char *Cmd)
 					if (res)
 						res = mfCheckKeys(trgBlockNo, trgKeyType, 8, &keyBlock[6 * 8], &key64);
 					if (!res) {
-						PrintAndLog("Found valid key:%012llx", key64);	
+						PrintAndLog("Found valid key:%012"llx, key64);
 						e_sector[trgBlockNo / 4].foundKey[trgKeyType] = 1;
 						e_sector[trgBlockNo / 4].Key[trgKeyType] = key64;
 					}
@@ -646,7 +661,7 @@ int CmdHF14AMfNested(const char *Cmd)
 		PrintAndLog("|sec|key A           |res|key B           |res|");
 		PrintAndLog("|---|----------------|---|----------------|---|");
 		for (i = 0; i < SectorsCnt; i++) {
-			PrintAndLog("|%03d|  %012llx  | %d |  %012llx  | %d |", 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("|---|----------------|---|----------------|---|");
@@ -816,8 +831,11 @@ int CmdHF14AMfChk(const char *Cmd)
 			if ( (f = fopen( filename , "r")) ) {
 				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) < 12 || buf[11] == '\n')
 						continue;
 				
@@ -843,7 +861,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[%d] %012llx", keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));
+					PrintAndLog("chk custom key[%d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));
 					keycnt++;
 				}
 			} else {
@@ -873,7 +891,7 @@ int CmdHF14AMfChk(const char *Cmd)
 				res = mfCheckKeys(b, t, size, keyBlock +6*c, &key64);
 				if (res !=1) {
 					if (!res) {
-						PrintAndLog("Found valid key:[%012llx]",key64);
+						PrintAndLog("Found valid key:[%012"llx"]",key64);
 						if (transferToEml) {
 							uint8_t block[16];
 							mfEmlGetMem(block, get_trailer_block(b), 1);
@@ -1077,7 +1095,10 @@ 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) {
+      PrintAndLog("File reading error.");
+			return 2;
+    }
 
 		if (strlen(buf) < 32){
 			if(strlen(buf) && feof(f))
@@ -1205,7 +1226,7 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
 		}
 		keyA = bytes_to_num(data, 6);
 		keyB = bytes_to_num(data + 10, 6);
-		PrintAndLog("|%03d|  %012llx  |  %012llx  |", i, keyA, keyB);
+		PrintAndLog("|%03d|  %012"llx"  |  %012"llx"  |", i, keyA, keyB);
 	}
 	PrintAndLog("|---|----------------|----------------|");
 	
@@ -1344,7 +1365,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))
@@ -1676,7 +1700,7 @@ static command_t CommandTable[] =
 int CmdHFMF(const char *Cmd)
 {
 	// flush
-	while (!WaitForResponseTimeout(CMD_ACK,NULL,500));
+	WaitForResponseTimeout(CMD_ACK,NULL,100);
 
   CmdsParse(CommandTable, Cmd);
   return 0;