diff -r 4f2dd0850803 -r b047181a4a33 Utilities/crypto/__init__.py
--- a/Utilities/crypto/__init__.py Sat Mar 11 14:35:22 2017 +0100
+++ b/Utilities/crypto/__init__.py Sat Mar 11 18:08:42 2017 +0100
@@ -120,8 +120,8 @@
masterPW = pwDecode(MasterPassword)
from .py3PBKDF2 import hashPasswordTuple
- digestname, iterations, salt, hash = hashPasswordTuple(masterPW)
- key = hash[:32]
+ digestname, iterations, salt, pwHash = hashPasswordTuple(masterPW)
+ key = pwHash[:32]
from .py3AES import encryptData
try:
cipher = encryptData(key, pw.encode("utf-8"))
@@ -273,9 +273,9 @@
from .py3AES import encryptData
from .py3PBKDF2 import hashPasswordTuple
- digestname, iterations, salt, hash = \
+ digestname, iterations, salt, pwHash = \
hashPasswordTuple(password, iterations=hashIterations)
- key = hash[:keyLength]
+ key = pwHash[:keyLength]
try:
cipher = encryptData(key, data)
except ValueError:
