X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/21865cda09da68f02dec1e88705a5f7062cc6daa..8ce3e4b4e937f2e3b2fda5b0d5d2c6bd9c6b3ebc:/client/cmdlft55xx.c

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index ba82087a..92e6f745 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1388,43 +1388,68 @@ int CmdT55xxBruteForce(const char *Cmd) {
 			PrintAndLog("No keys found in file");
 			return 1;
 		}
+		PrintAndLog("Loaded %d keys", keycnt);
 		
 		// loop
-		uint32_t testpwd = 0x00;
+		uint64_t testpwd = 0x00;
 		for (uint16_t c = 0; c < keycnt; ++c ) {
 	
-			testpwd = bytes_to_num(keyBlock + 4*keycnt, 4);
+			if (ukbhit()) {
+				getchar();
+				printf("\naborted via keyboard!\n");
+				return 0;
+			}
+		
+			testpwd = bytes_to_num(keyBlock + 4*c, 4);
+
+			PrintAndLog("Testing %08X", testpwd);
+			
+			
+			if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, testpwd)) {
+				PrintAndLog("Aquireing data from device failed. Quitting");
+				return 0;
+			}
 			
-			AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, testpwd);
 			found = tryDetectModulation();
-		
+
 			if ( found ) {
-				PrintAndLog("Found valid password:[%08X]", testpwd);
+				PrintAndLog("Found valid password: [%08X]", testpwd);
 				return 0;
 			} 
 		}
+		PrintAndLog("Password NOT found.");
+		return 0;
 	}
 	
+	// Try to read Block 7, first :)
 	
+	// incremental pwd range search
     start_password = param_get32ex(Cmd, 0, 0, 16);
 	end_password = param_get32ex(Cmd, 1, 0, 16);
 	
 	if ( start_password >= end_password ) return usage_t55xx_bruteforce();
 	
-    PrintAndLog("Search password  range [%08X -> %08X]", start_password, end_password);
+    PrintAndLog("Search password range [%08X -> %08X]", start_password, end_password);
 	
     uint32_t i = start_password;
 
     while ((!found) && (i <= end_password)){
 
-		AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, i);
+		printf(".");
+		fflush(stdout);
+		if (ukbhit()) {
+			getchar();
+			printf("\naborted via keyboard!\n");
+			return 0;
+		}
+			
+		if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, i)) {
+			PrintAndLog("Aquireing data from device failed. Quitting");
+			return 0;
+		}
 		found = tryDetectModulation();
         
-		if (found)
-			break;
-        
-        if ((i % 0x100) == 0) printf("[%08x], ",i);
-
+		if (found) break;
 		i++;
     }
     
@@ -1433,7 +1458,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
     if (found)
 		PrintAndLog("Found valid password: [%08x]", i);
     else
-		PrintAndLog("Password NOT found. Last tried: [%08x]", i);
+		PrintAndLog("Password NOT found. Last tried: [%08x]", --i);
     return 0;
 }