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

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index ba82087af0fa8a775b00f0a9e4c4703a1b476ef0..91168a025ff721029c0bc897ffb5a420f45cb666 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1388,24 +1388,32 @@ int CmdT55xxBruteForce(const char *Cmd) {
                        PrintAndLog("No keys found in file");\r
                        return 1;\r
                }\r
                        PrintAndLog("No keys found in file");\r
                        return 1;\r
                }\r

+               PrintAndLog("Loaded %d keys", keycnt);\r

                \r
                // loop\r
                \r
                // loop\r

-               uint32_t testpwd = 0x00;\r
+               uint64_t testpwd = 0x00;\r

                for (uint16_t c = 0; c < keycnt; ++c ) {\r
        \r
                for (uint16_t c = 0; c < keycnt; ++c ) {\r
        \r

-                       testpwd = bytes_to_num(keyBlock + 4*keycnt, 4);\r
+                       testpwd = bytes_to_num(keyBlock + 4*c, 4);\r
+\r
+                       PrintAndLog("Testing %08X", testpwd);\r
+                       \r

                        \r
                        AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, testpwd);\r
                        found = tryDetectModulation();\r
                        \r
                        AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, testpwd);\r
                        found = tryDetectModulation();\r

-               \r
+\r

                        if ( found ) {\r
                                PrintAndLog("Found valid password:[%08X]", testpwd);\r
                                return 0;\r
                        } \r
                }\r
                        if ( found ) {\r
                                PrintAndLog("Found valid password:[%08X]", testpwd);\r
                                return 0;\r
                        } \r
                }\r

+               PrintAndLog("Password NOT found.");\r
+               return 0;\r

        }\r
        \r
        }\r
        \r

+       // Try to read Block 7, first :)\r

        \r
        \r

+       // incremental pwd range search\r

     start_password = param_get32ex(Cmd, 0, 0, 16);\r
        end_password = param_get32ex(Cmd, 1, 0, 16);\r
        \r
     start_password = param_get32ex(Cmd, 0, 0, 16);\r
        end_password = param_get32ex(Cmd, 1, 0, 16);\r
        \r

diff --git a/client/default_pwd.dic b/client/default_pwd.dic
index 1ec49d4ce7fc6c7f374b352bbf12f54524625408..5edb83effa82a035a4135fe2b57f5bf01954fc02 100644 (file)
--- a/client/default_pwd.dic
+++ b/client/default_pwd.dic
@@ -70,4 +70,6 @@ F0000000,
 99AABBCC,
 AABBCCDD,
 BBCCDDEE,
 99AABBCC,
 AABBCCDD,
 BBCCDDEE,

-CCDDEEFF,
\ No newline at end of file
+CCDDEEFF,
+0CB7E7FC,  //rfidler?
+FABADA11,  //china?
\ No newline at end of file