X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2Fjs%2Findex.js;h=dbbd382e406de4ca6e999e3ad62d880e335e8089;hb=9bc39377aa0317ffbfed3b6e29814bb26681cfd5;hp=d356eb80374340a6564530e281e77b5f51e76ea9;hpb=b54c12180e5f4eb633e587551715707ec0523943;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git

diff --git a/src/js/index.js b/src/js/index.js
index d356eb8..dbbd382 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -764,7 +764,8 @@
         }
         // Discard trailing entropy
         var bitsToUse = Math.floor(bits.length / 32) * 32;
-        var binaryStr = bits.substring(0, bitsToUse);
+        var start = bits.length - bitsToUse;
+        var binaryStr = bits.substring(start);
         // Convert entropy string to numeric array
         var entropyArr = [];
         for (var i=0; i<binaryStr.length / 8; i++) {
@@ -809,18 +810,26 @@
         // If time to crack is less than one day, and password is considered
         // strong or better based on the number of bits, rename strength to
         // 'easily cracked'.
-        var z = zxcvbn(entropy.cleanStr);
-        var timeToCrack = z.crack_times_seconds.offline_fast_hashing_1e10_per_second;
-        if (timeToCrack < 86400 && entropy.binaryStr.length >= 128) {
-            strength = "easily cracked";
-            if (z.feedback.warning != "") {
-                strength = strength + " - " + z.feedback.warning;
-            };
-        }
-        var bitsStr = entropy.binaryStr.length;
+        try {
+            var z = zxcvbn(entropy.base.parts.join(""));
+            var timeToCrack = z.crack_times_seconds.offline_fast_hashing_1e10_per_second;
+            if (timeToCrack < 86400 && entropy.binaryStr.length >= 128) {
+                strength = "easily cracked";
+                if (z.feedback.warning != "") {
+                    strength = strength + " - " + z.feedback.warning;
+                };
+            }
+        }
+        catch (e) {
+            strength = "unknown";
+            console.log("Error detecting entropy strength with zxcvbn:");
+            console.log(e);
+        }
+        var bitsStr = getNumberOfEntropyBits(entropy);
         var wordCount = Math.floor(entropy.binaryStr.length / 32) * 3;
+        var entropyTypeStr = getEntropyTypeStr(entropy);
         DOM.entropyFiltered.html(entropy.cleanHtml);
-        DOM.entropyType.text(entropy.base.str);
+        DOM.entropyType.text(entropyTypeStr);
         DOM.entropyStrength.text(strength);
         DOM.entropyEventCount.text(entropy.base.ints.length);
         DOM.entropyBits.text(bitsStr);
@@ -829,6 +838,77 @@
         DOM.entropyBitsPerEvent.text(Math.log2(entropy.base.asInt).toFixed(2));
     }
 
+    function getNumberOfEntropyBits(entropy) {
+        var bitsStr = entropy.binaryStr.length.toString();
+        // If using cards, assume they are not reused, thus additional entropy
+        // decreases as more cards are used. This means entropy is measured
+        // using n!, not base^n.
+        // eg the second last card can be only one of two, not one of fifty two
+        // so the added entropy for that card is only one bit at most
+        if (entropy.base.asInt == 52) {
+            var totalCombos = factorial(52);
+            var remainingCards = 52 - entropy.base.parts.length;
+            var remainingCombos = factorial(remainingCards);
+            var currentCombos = totalCombos.divide(remainingCombos);
+            bitsStr = currentCombos.toString(2).length.toString();
+        }
+        return bitsStr
+    }
+
+    function getEntropyTypeStr(entropy) {
+        var typeStr = entropy.base.str;
+        // Add some detail if these are cards
+        if (entropy.base.asInt == 52) {
+            var cardDetail = []; // array of message strings
+            // Detect duplicates
+            var dupes = [];
+            var dupeTracker = {};
+            for (var i=0; i<entropy.base.parts.length; i++) {
+                var card = entropy.base.parts[i];
+                if (card in dupeTracker) {
+                    dupes.push(card);
+                }
+                dupeTracker[card] = true;
+            }
+            if (dupes.length > 0) {
+                var dupeWord = "duplicates";
+                if (dupes.length == 1) {
+                    dupeWord = "duplicate";
+                }
+                var msg = dupes.length + " " + dupeWord + ": " + dupes.slice(0,3).join(" ");
+                if (dupes.length > 3) {
+                    msg += "...";
+                }
+                cardDetail.push(msg);
+            }
+            // Detect full deck
+            var uniqueCards = [];
+            for (var uniqueCard in dupeTracker) {
+                uniqueCards.push(uniqueCard);
+            }
+            if (uniqueCards.length == 52) {
+                cardDetail.unshift("full deck");
+            }
+            // Add card details to typeStr
+            if (cardDetail.length > 0) {
+                typeStr += " (" + cardDetail.join(", ") + ")";
+            }
+        }
+        return typeStr;
+    }
+
+    // Depends on BigInteger
+    function factorial(n) {
+        if (n == 0) {
+            return 1;
+        }
+        f = BigInteger.ONE;
+        for (var i=1; i<=n; i++) {
+            f = f.multiply(new BigInteger(i));
+        }
+        return f;
+    }
+
     var networks = [
         {
             name: "Bitcoin",