From: iceman1001 <iceman@iuse.se>
Date: Tue, 1 Dec 2015 15:44:53 +0000 (+0100)
Subject: FIXES:  the custom keys testloop now increases the read pwd :)
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/060fdaf998d09011610c14de5b27ac597b0660a0

FIXES:  the custom keys testloop now increases the read pwd :)
---

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index ba82087a..91168a02 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1388,24 +1388,32 @@ 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);
+			testpwd = bytes_to_num(keyBlock + 4*c, 4);
+
+			PrintAndLog("Testing %08X", testpwd);
+			
 			
 			AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, testpwd);
 			found = tryDetectModulation();
-		
+
 			if ( found ) {
 				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);
 	
diff --git a/client/default_pwd.dic b/client/default_pwd.dic
index 1ec49d4c..5edb83ef 100644
--- a/client/default_pwd.dic
+++ b/client/default_pwd.dic
@@ -70,4 +70,6 @@ F0000000,
 99AABBCC,
 AABBCCDD,
 BBCCDDEE,
-CCDDEEFF,
\ No newline at end of file
+CCDDEEFF,
+0CB7E7FC,  //rfidler?
+FABADA11,  //china?
\ No newline at end of file