Bugfix: PwdHash ignored variable

sr-verde · Feb 28, 2017 · f49306d · f49306d
1 parent a9ff6e2
commit f49306d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/index.html b/src/index.html
@@ -72,13 +72,13 @@ <h1>Mobiler Hash-Passwort-Generator</h1>
   <script>
     function hash(master, domain) {
       passwordLength = parseInt(document.getElementById('passwordLength').value);
-      var MD5 = new Hashes.MD5
-      var SHA1 = new Hashes.SHA1
-      var SHA256 =  new Hashes.SHA256
-      var SHA512 = new Hashes.SHA512
-      var RMD160 = new Hashes.RMD160
-			switch (document.getElementById('algorithm').selectedIndex){
-        case 0: return pwdHash.getHashedPassword(master, domain);
+      var MD5 = new Hashes.MD5;
+      var SHA1 = new Hashes.SHA1;
+      var SHA256 =  new Hashes.SHA256;
+      var SHA512 = new Hashes.SHA512;
+      var RMD160 = new Hashes.RMD160;
+      switch (document.getElementById('algorithm').selectedIndex){
+        case 0: return pwdHash.getHashedPassword(master, domain).substring(0,passwordLength);
         case 1: return MD5.hex(master+":"+domain).substring(0,passwordLength);
         case 2: return MD5.b64(master+":"+domain).substring(0,passwordLength);
         case 3: return SHA1.hex(master+":"+domain).substring(0,passwordLength);

diff --git a/src/js/password-hash.js b/src/js/password-hash.js
@@ -27,7 +27,7 @@ var pwdHash={
 	getHashedPassword:function(password, realm) {
 		password.substring(0,this.len) == this.PasswordPrefix ? password = password.substring(this.len) : false
 		var SHA512 = new Hashes.SHA512
-		var hash = SHA512.b64(password, realm);
+		var hash = SHA512.b64(password + ':' + realm);
 		var size = password.length + this.len;
 		var nonalphanumeric = password.match(/\W/) != null;
 		var result = this.applyConstraints(hash, size, nonalphanumeric);