diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-05-30 12:13:03 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-05-30 12:13:03 -0300 |
| commit | c2b0e9dab4cad4f86a3790d2394ecdf4852e67be (patch) | |
| tree | f405ee636ab2aa23f0be160fed8783b835a20265 /src/leap/soledad/__init__.py | |
| parent | f0d4db8136a73e41913e79705379a67589eefc90 (diff) | |
| parent | f61d5e113d690e6aff12b3f507efb9f8bb795e5d (diff) | |
Merge remote-tracking branch 'drebs/feature/2227-add-tests-for-events' into develop
Diffstat (limited to 'src/leap/soledad/__init__.py')
| -rw-r--r-- | src/leap/soledad/__init__.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/leap/soledad/__init__.py b/src/leap/soledad/__init__.py index b847364f..c7f8cff3 100644 --- a/src/leap/soledad/__init__.py +++ b/src/leap/soledad/__init__.py @@ -50,7 +50,6 @@ from u1db.remote.ssl_match_hostname import ( # noqa from leap.common import events from leap.common.check import leap_assert from leap.common.files import mkdir_p -from leap.common.keymanager.errors import DecryptionFailed from leap.soledad.backends import sqlcipher from leap.soledad.backends.leap_backend import ( LeapDocument, @@ -450,7 +449,7 @@ class Soledad(object): key = scrypt.hash(self._passphrase, salt, buflen=32) iv, ciphertext = self._crypto.encrypt_sym(secret, key) self._secrets[secret_id] = { - # leap.common.keymanager.openpgp uses AES256 for symmetric + # leap.soledad.crypto submodule uses AES256 for symmetric # encryption. self.KDF_KEY: 'scrypt', # TODO: remove hard coded kdf self.KDF_SALT_KEY: binascii.b2a_base64(salt), |