fix AlessandroZ#497

skinnyshy · May 20, 2020 · 0f17c5d · 0f17c5d
1 parent 118f936
commit 0f17c5d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Linux/lazagne/softwares/browsers/mozilla.py b/Linux/lazagne/softwares/browsers/mozilla.py
@@ -313,7 +313,7 @@ def decrypt_3des(decoded_item, master_password, global_salt):
             cipher_t = decoded_item[0][1].asOctets()
 
             # See http://www.drh-consultancy.demon.co.uk/key3.html
-            hp = sha1(global_salt + convert_to_byte(master_password)).digest()
+            hp = sha1(global_salt + master_password).digest()
             pes = entry_salt + convert_to_byte('\x00') * (20 - len(entry_salt))
             chp = sha1(hp + entry_salt).digest()
             k1 = hmac.new(chp, pes + entry_salt, sha1).digest()

diff --git a/Mac/lazagne/softwares/browsers/mozilla.py b/Mac/lazagne/softwares/browsers/mozilla.py
@@ -312,7 +312,7 @@ def decrypt_3des(decoded_item, master_password, global_salt):
             cipher_t = decoded_item[0][1].asOctets()
 
             # See http://www.drh-consultancy.demon.co.uk/key3.html
-            hp = sha1(global_salt + convert_to_byte(master_password)).digest()
+            hp = sha1(global_salt + master_password).digest()
             pes = entry_salt + convert_to_byte('\x00') * (20 - len(entry_salt))
             chp = sha1(hp + entry_salt).digest()
             k1 = hmac.new(chp, pes + entry_salt, sha1).digest()

diff --git a/Windows/lazagne/softwares/browsers/mozilla.py b/Windows/lazagne/softwares/browsers/mozilla.py
@@ -300,7 +300,7 @@ def decrypt_3des(decoded_item, master_password, global_salt):
             cipher_t = decoded_item[0][1].asOctets()
 
             # See http://www.drh-consultancy.demon.co.uk/key3.html
-            hp = sha1(global_salt + convert_to_byte(master_password)).digest()
+            hp = sha1(global_salt + master_password).digest()
             pes = entry_salt + convert_to_byte('\x00') * (20 - len(entry_salt))
             chp = sha1(hp + entry_salt).digest()
             k1 = hmac.new(chp, pes + entry_salt, sha1).digest()