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

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 3142fcd8..ba8295ec 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -101,7 +101,7 @@ start:
 	
 	t1 = clock() - t1;
 	if ( t1 > 0 )
-		PrintAndLog("Time in darkside: %.0f ticks - %4.2f sec\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC);
+		PrintAndLog("Time in darkside: %.0f ticks\n", (float)t1);
 	return 0;
 }
 
@@ -593,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;
 	}	
 	
@@ -706,7 +707,7 @@ int CmdHF14AMfNested(const char *Cmd)
 		}
 		clock_t t2 = clock() - t1;
 		if ( t2 > 0 )
-			PrintAndLog("Time to check 6 known keys: %.0f ticks %4.2f sec", (float)t2, ((float)t2)/CLOCKS_PER_SEC);
+			PrintAndLog("Time to check 6 known keys: %.0f ticks", (float)t2 );
 
 		PrintAndLog("enter nested...");	
 		
@@ -746,7 +747,7 @@ int CmdHF14AMfNested(const char *Cmd)
 		
 		t1 = clock() - t1;
 		if ( t1 > 0 )
-			PrintAndLog("Time in nested: %.0f ticks %4.2f sec (%4.2f sec per key)\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC, ((float)t1)/iterations/CLOCKS_PER_SEC);
+			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("trying to read key B...");
@@ -1125,7 +1126,7 @@ int CmdHF14AMfChk(const char *Cmd)
 	clock_t t1 = clock();
 	
 	// check keys.
-	for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) {
+	for (trgKeyType = !keyType;  trgKeyType < 2;  (keyType==2) ? (++trgKeyType) : (trgKeyType=2) ) {
 
 		int b = blockNo;
 		for (int i = 0; i < SectorsCnt; ++i) {
@@ -1149,14 +1150,14 @@ int CmdHF14AMfChk(const char *Cmd)
 					e_sector[i].Key[trgKeyType] = 0xffffffffffff;
 					e_sector[i].foundKey[trgKeyType] = FALSE;
 				}
+				printf(".");
 			}
 			b < 127 ? ( b +=4 ) : ( b += 16 );	
 		}
 	}
-	
 	t1 = clock() - t1;
 	if ( t1 > 0 )
-		printf("Time in checkkeys: %.0f ticks  %1.2f sec (%1.2f sec per key)\n\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC, ((float)t1)/keycnt/CLOCKS_PER_SEC);
+		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...");