diff -r ff666d8230f7 -r 711e7c35a49b Utilities/crypto/__init__.py
--- a/Utilities/crypto/__init__.py Thu Jul 23 20:14:30 2015 +0200
+++ b/Utilities/crypto/__init__.py Sat Jul 25 13:02:39 2015 +0200
@@ -280,9 +280,9 @@
cipher = encryptData(key, data)
except ValueError:
return b"", False
- return CryptoMarker.encode() + Delimiter.encode().join([
- digestname.encode(),
- str(iterations).encode(),
+ return CryptoMarker.encode("utf-8") + Delimiter.encode("utf-8").join([
+ digestname.encode("utf-8"),
+ str(iterations).encode("utf-8"),
base64.b64encode(salt),
base64.b64encode(cipher)
]), True
@@ -299,13 +299,13 @@
@return decrypted data (bytes) and flag indicating
success (boolean)
"""
- if not edata.startswith(CryptoMarker.encode()):
+ if not edata.startswith(CryptoMarker.encode("utf-8")):
return edata, False # it was not encoded using dataEncrypt
from .py3AES import decryptData
from .py3PBKDF2 import rehashPassword
- hashParametersBytes, edata = edata[3:].rsplit(Delimiter.encode(), 1)
+ hashParametersBytes, edata = edata[3:].rsplit(Delimiter.encode("utf-8"), 1)
hashParameters = hashParametersBytes.decode()
try:
# recreate the key used to encrypt
