Merge pull request #28 from vvatanabe/port-zxcvbn-v4.4.1

port zxcvbn 4.4.1
nulab · Dec 3, 2016 · 35968a0 · 35968a0
2 parents f308778 + 33f9f9e
commit 35968a0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/src/main/java/com/nulabinc/zxcvbn/Scoring.java b/src/main/java/com/nulabinc/zxcvbn/Scoring.java
@@ -97,20 +97,19 @@ private static void update(String password, Match m, int l, Optimal optimal, boo
     private static void bruteforceUpdate(String password, int k, Optimal optimal, boolean excludeAdditive) {
         Match m = makeBruteforceMatch(password, 0, k);
         update(password, m, 1, optimal, excludeAdditive);
-        if (k == 0) {
-            return;
-        }
-        for (Map.Entry<Integer, Match> entry : optimal.m.get(k - 1).entrySet()) {
-            int l = entry.getKey();
-            Match last_m = entry.getValue();
-            if (last_m.pattern == Pattern.Bruteforce) {
-                m = makeBruteforceMatch(password, last_m.i, k);
-                update(password, m, l, optimal, excludeAdditive);
-            } else {
-                m = makeBruteforceMatch(password, k, k);
-                update(password, m, l + 1, optimal, excludeAdditive);
+        for (int i = 1; i <= k; i++) {
+            m = makeBruteforceMatch(password, i, k);
+            for (Map.Entry<Integer, Match> entry : optimal.m.get(i - 1).entrySet()) {
+                int l = entry.getKey();
+                Match last_m = entry.getValue();
+                if (last_m.pattern == Pattern.Bruteforce) {
+                    continue;
+                } else {
+                    update(password, m, l + 1, optimal, excludeAdditive);
+                }
             }
         }
+
     }
 
     private static List<Match> unwind(int n, Optimal optimal) {

diff --git a/src/main/java/com/nulabinc/zxcvbn/guesses/DictionaryGuess.java b/src/main/java/com/nulabinc/zxcvbn/guesses/DictionaryGuess.java
@@ -14,6 +14,7 @@ public class DictionaryGuess extends BaseGuess {
 
     @Override
     public double exec(Match match) {
+        match.baseGuesses = (double) match.rank;
         int uppercaseVariations = uppercaseVariations(match);
         int l33tVariations = l33tVariations(match);
         int reversedVariations = match.reversed ? 2 : 1;

diff --git a/src/main/java/com/nulabinc/zxcvbn/matchers/Match.java b/src/main/java/com/nulabinc/zxcvbn/matchers/Match.java
@@ -26,7 +26,6 @@ public class Match {
     public final String regexName;
     public final java.util.regex.Matcher regexMatch;
     public final String baseToken;
-    public final double baseGuesses;
     public final List<Match> baseMatches;
     public final int repeatCount;
     public final String graph;
@@ -37,6 +36,7 @@ public class Match {
     public final int month;
     public final int day;
 
+    public Double baseGuesses;
     public Double guesses;
     public Double guessesLog10;