diff options
Diffstat (limited to 'src/leap/soledad')
-rw-r--r-- | src/leap/soledad/__init__.py | 5 | ||||
-rw-r--r-- | src/leap/soledad/backends/leap_backend.py | 3 | ||||
-rw-r--r-- | src/leap/soledad/tests/test_sqlcipher.py | 2 | ||||
-rw-r--r-- | src/leap/soledad/util.py | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/src/leap/soledad/__init__.py b/src/leap/soledad/__init__.py index 26e982ba..1473da38 100644 --- a/src/leap/soledad/__init__.py +++ b/src/leap/soledad/__init__.py @@ -45,6 +45,11 @@ class Soledad(object): # Management of secret for symmetric encryption #------------------------------------------------------------------------- + + #------------------------------------------------------------------------- + # Management of secret for symmetric encryption + #------------------------------------------------------------------------- + def _has_secret(self): """ Verify if secret for symmetric encryption exists on local encrypted file. diff --git a/src/leap/soledad/backends/leap_backend.py b/src/leap/soledad/backends/leap_backend.py index 5a7dfa2f..3e859f7c 100644 --- a/src/leap/soledad/backends/leap_backend.py +++ b/src/leap/soledad/backends/leap_backend.py @@ -12,12 +12,11 @@ from leap.soledad.util import GPGWrapper import uuid -import uuid - class NoDefaultKey(Exception): pass + class NoSoledadInstance(Exception): pass diff --git a/src/leap/soledad/tests/test_sqlcipher.py b/src/leap/soledad/tests/test_sqlcipher.py index cfccf605..9e3b4052 100644 --- a/src/leap/soledad/tests/test_sqlcipher.py +++ b/src/leap/soledad/tests/test_sqlcipher.py @@ -335,4 +335,4 @@ class SQLCipherEncryptionTest(unittest.TestCase): SQLCipherDatabase(self.DB_FILE, PASSWORD) raise DatabaseError("SQLCipher backend should not be able to open non-encrypted dbs.") except DatabaseIsNotEncrypted: - pass
\ No newline at end of file + pass diff --git a/src/leap/soledad/util.py b/src/leap/soledad/util.py index a26bff31..040c70ab 100644 --- a/src/leap/soledad/util.py +++ b/src/leap/soledad/util.py @@ -52,5 +52,3 @@ class GPGWrapper(gnupg.GPG): data.close() return result - - |