Mercurial Repositories > eric / file diff

--- a/Utilities/crypto/__init__.py	Mon Feb 11 14:08:08 2013 +0100
+++ b/Utilities/crypto/__init__.py	Mon Feb 11 18:13:10 2013 +0100
@@ -15,9 +15,6 @@
 
 from E5Gui import E5MessageBox
 
-from .py3AES import encryptData, decryptData
-from .py3PBKDF2 import verifyPassword, hashPasswordTuple, rehashPassword
-
 import Preferences
 
 ################################################################################
@@ -70,6 +67,7 @@
         QCoreApplication.translate("Crypto", "Enter the master password:"),
         QLineEdit.Password)
     if ok:
+        from .py3PBKDF2 import verifyPassword
         masterPassword = Preferences.getUser("MasterPassword")
         try:
             if masterPassword:
@@ -110,8 +108,10 @@
         
         masterPW = pwDecode(MasterPassword)
     
+    from .py3PBKDF2 import hashPasswordTuple
     digestname, iterations, salt, hash = hashPasswordTuple(masterPW)
     key = hash[:32]
+    from .py3AES import encryptData
     try:
         cipher = encryptData(key, pw.encode("utf-8"))
     except ValueError:
@@ -144,6 +144,9 @@
         
         masterPW = pwDecode(MasterPassword)
     
+    from .py3AES import decryptData
+    from .py3PBKDF2 import rehashPassword
+    
     hashParameters, epw = epw[3:].rsplit(Delimiter, 1)
     try:
         # recreate the key used to encrypt
@@ -255,6 +258,9 @@
     @return encrypted data (bytes) and flag indicating
         success (boolean)
     """
+    from .py3AES import encryptData
+    from .py3PBKDF2 import hashPasswordTuple
+    
     digestname, iterations, salt, hash = \
         hashPasswordTuple(password, iterations=hashIterations)
     key = hash[:keyLength]
@@ -283,6 +289,9 @@
     if not edata.startswith(CryptoMarker.encode()):
         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)
     hashParameters = hashParametersBytes.decode()
     try: