Feature/sha512

.gitignore

@@ -0,0 +1,5 @@
+*~
+*.xpi
+.build
+.build-mozilla
+node_modules

README.test

@@ -0,0 +1,6 @@
+To run the unit-tests do:
+$ npm install moncha
+
+then
+$ (cd tests; make)
+

REQUIREMENTS

@@ -0,0 +1,2 @@
+mocha
+nodeunit

content/passhash-common.js

@@ -83,6 +83,8 @@ var PassHashCommon =
             opts.hashWordSizeDefault = prefs.getIntPref("optHashWordSizeDefault");
         if (prefs.prefHasUserValue("optShortcutKeyCode"))
             opts.shortcutKeyCode = prefs.getCharPref("optShortcutKeyCode");
+        if (prefs.prefHasUserValue("optHashAlgorithm"))
+            opts.hashAlgorithm = prefs.getCharPref("optHashAlgorithm");
         if (!opts.shortcutKeyCode)
         {
             // Set shortcut key to XUL-defined default.
@@ -130,6 +132,7 @@ var PassHashCommon =
         opts.firstTime           = true;
         opts.shortcutKeyCode     = "";
         opts.shortcutKeyMods     = "";
+        opts.hashAlgorithm       = "sha1";
         return opts;
     },
 
@@ -152,6 +155,7 @@ var PassHashCommon =
         prefs.setIntPref( "optHashWordSizeDefault", opts.hashWordSizeDefault);
         prefs.setCharPref("optShortcutKeyCode",     opts.shortcutKeyCode);
         prefs.setCharPref("optShortcutKeyMods",     opts.shortcutKeyMods);
+        prefs.setCharPref("optHashAlgorithm",       opts.hashAlgorithm);
     },
 
     loadSecureValue: function(option, name, suffix, valueDefault)
@@ -303,10 +307,14 @@ var PassHashCommon =
                 requirePunctuation,
                 requireMixedCase,
                 restrictSpecial,
-                restrictDigits)
+                restrictDigits,
+                hash_algorithm)
     {
-        // Start with the SHA1-encrypted master key/site tag.
-        var s = b64_hmac_sha1(masterKey, siteTag);
+        // Start with the SHA-encrypted master key/site tag.
+        if (hash_algorithm === "sha512")
+            var s = b64_hmac_sha512(masterKey, siteTag);
+        else
+            var s = b64_hmac_sha1(masterKey, siteTag);
         // Use the checksum of all characters as a pseudo-randomizing seed to
         // avoid making the injected characters easy to guess.  Note that it
         // isn't random in the sense of not being deterministic (i.e.
@@ -789,3 +797,6 @@ var PassHashCommon =
 
     //NB: Make sure not to add a comma after the last function for older IE compatibility.
 }
+
+if (typeof exports !== 'undefined')
+    exports.PassHashCommon = PassHashCommon;

content/passhash-dialog.js

@@ -53,6 +53,7 @@ var PassHash =
     restrictSpecial:     null,
     restrictDigits:      null,
     hashWordSize:        null,
+    hashAlgorithm:       null,
 
     onLoad: function()
     {
@@ -64,6 +65,7 @@ var PassHash =
         var ctlRestrictSpecial    = document.getElementById("noSpecial");
         var ctlRestrictDigits     = document.getElementById("digitsOnly");
         var ctlHashWordSize       = document.getElementById("hashWordSize");
+        var ctlHashAlgorithm      = document.getElementById("hashAlgorithm");
 
         var prefs = PassHashCommon.loadOptions();
         this.guessSiteTag       = prefs.guessSiteTag;
@@ -78,6 +80,7 @@ var PassHash =
         this.restrictSpecial    = false;
         this.restrictDigits     = false;
         this.hashWordSize       = prefs.hashWordSizeDefault;
+        this.hashAlgorithm      = prefs.hashAlgorithm;
 
         this.onUnmask();
 
@@ -114,6 +117,15 @@ var PassHash =
         ctlRestrictDigits.checked      = this.restrictDigits;
         this.updateCheckboxes();
 
+        var menulist = document.getElementById("hashAlgorithm");
+        for (var i=0;menulist.getItemAtIndex(i) !== null; i++) {
+            var menuitem = menulist.getItemAtIndex(i);
+            if (menuitem.value === this.hashAlgorithm) {
+                menulist.selectedItem = menuitem;
+                break;
+            }
+        }
+
         var btn = document.getElementById("hashWordSize"+this.hashWordSize);
         // Protect against bad saved hashWordSize value.
         if (btn == null)
@@ -251,7 +263,8 @@ var PassHash =
                 this.requirePunctuation,
                 this.requireMixedCase,
                 this.restrictSpecial,
-                this.restrictDigits);
+                this.restrictDigits,
+                this.hashAlgorithm);
         if (ctlHashWord.value != hashWordOrig)
             return 3;   // It was modified
         return 0;       // It was not modified
@@ -293,6 +306,13 @@ var PassHash =
         this.update();
     },
 
+    onHashAlgorithmChanged: function()
+    {
+        var menuitem = document.getElementById("hashAlgorithm").selectedItem;
+        this.hashAlgorithm = menuitem.value;
+        this.update();
+    },
+
     updateCheckboxes: function()
     {
         document.getElementById("digit").disabled =
@@ -328,8 +348,11 @@ var PassHash =
         return true;
     },
 
-    parseOptionString: function(s)
+    parseOptionString: function(full_options)
     {
+        var s = full_options.split("/")[0];
+        this.hashAlgorithm = full_options.split("/")[1] || "sha1";
+
         this.requireDigit       = (s.search(/d/i) >= 0);
         this.requirePunctuation = (s.search(/p/i) >= 0);
         this.requireMixedCase   = (s.search(/m/i) >= 0);
@@ -355,7 +378,12 @@ var PassHash =
         if (this.restrictDigits)
             opts += 'g';
         opts += this.hashWordSize.toString();
+        if (this.hashAlgorithm)
+            opts += "/"+this.hashAlgorithm;
         return opts;
     }
 
 }
+
+if (typeof exports !== 'undefined')
+    exports.PassHashDialog = PassHash;

content/passhash-dialog.xul

@@ -28,6 +28,10 @@
         src="passhash-sha1.js"
         />
 
+    <script
+        src="passhash-sha512.js"
+        />
+
     <script
         src="passhash-common.js"
         />
@@ -230,6 +234,23 @@
 
                 </groupbox>
 
+        <groupbox
+            id="algorithmGroup"
+            >
+          <caption
+              label="Hash"
+              />
+          <menulist id="hashAlgorithm"
+                    oncommand="PassHash.onHashAlgorithmChanged();"
+            >
+            <menupopup>
+              <menuitem label="Sha1" value="sha1"/>
+              <menuitem label="Sha512" value="sha512"/>
+            </menupopup>
+          </menulist>
+        </groupbox>
+
+
             </vbox>
 
             <groupbox
@@ -361,6 +382,7 @@
 
             </groupbox>
 
+
         </hbox>
 
         <spacer

content/passhash-portable.html

@@ -18,6 +18,10 @@
 <!--!content:passhash-sha1.js-->
 </script>
 
+<script language="JavaScript" type="text/javascript">
+<!--!content:passhash-sha512.js-->
+</script>
+
 <script language="JavaScript" type="text/javascript">
 <!--!content:passhash-common.js-->
 </script>

content/passhash-sha1.js

@@ -223,3 +223,6 @@ function binb2b64(binarray)
   }
   return str;
 }
+
+if (typeof exports !== 'undefined')
+  exports.b64_hmac_sha1 = b64_hmac_sha1;