Allow to set a new target for SixCharactersRecovery

kimci86 · Aug 10, 2024 · 342b661 · 342b661
1 parent cc50681
commit 342b661
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/password.cpp b/src/password.cpp
@@ -15,8 +15,8 @@ template <typename Derived /* must implement onSolutionFound() method */>
 class SixCharactersRecovery
 {
 public:
-    SixCharactersRecovery(const Keys& target, const std::vector<std::uint8_t>& charset4,
-                          const std::vector<std::uint8_t>& charset5)
+    void setTarget(const Keys& target, const std::vector<std::uint8_t>& charset4,
+                   const std::vector<std::uint8_t>& charset5)
     {
         // initialize target X, Y and Z values
         x[6] = target.getX();
@@ -31,6 +31,8 @@ class SixCharactersRecovery
             z[i - 1] = Crc32Tab::crc32inv(z[i], msb(y[i]));
 
         // precompute possible Z0[16,32) and Z{-1}[24,32)
+        z0_16_32.reset();
+        zm1_24_32.reset();
         for (const auto p5 : charset5)
         {
             x[5] = Crc32Tab::crc32inv(x[6], p5);
@@ -140,13 +142,13 @@ class BruteforceRecovery : public SixCharactersRecovery<BruteforceRecovery>
 public:
     BruteforceRecovery(const Keys& keys, const std::vector<std::uint8_t>& charset, std::vector<std::string>& solutions,
                        std::mutex& solutionsMutex, bool exhaustive, Progress& progress)
-    : SixCharactersRecovery{keys, charset, charset}
-    , charset{charset}
+    : charset{charset}
     , solutions{solutions}
     , solutionsMutex{solutionsMutex}
     , exhaustive{exhaustive}
     , progress{progress}
     {
+        setTarget(keys, charset, charset);
     }
 
     void search(std::size_t length)