diff options
| author | drebs <drebs@leap.se> | 2013-04-03 14:28:07 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-04-03 14:28:07 -0300 |
| commit | d547d8e465d28838249e2576b598f009d0000333 (patch) | |
| tree | 4f407fcd6d7e750a497561e5766e105270619a6e /src/leap/soledad/__init__.py | |
| parent | 3fffd731552426c67d1255fd5ba3b4a36964efe4 (diff) | |
| parent | 138bf574406b6533e0eeb59a7a19b0edeb97e9b7 (diff) | |
Merge branch 'feature/pysqlcipher-dependency' into develop
Diffstat (limited to 'src/leap/soledad/__init__.py')
| -rw-r--r-- | src/leap/soledad/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/soledad/__init__.py b/src/leap/soledad/__init__.py index f79e1c31..bd5a351c 100644 --- a/src/leap/soledad/__init__.py +++ b/src/leap/soledad/__init__.py @@ -72,7 +72,7 @@ class Soledad(object): config_file=None, shared_db_url=None, auth_token=None, bootstrap=True): """ - Initialize crypto and dbs. + Initialize configuration, cryptographic keys and dbs. :param user_email: Email address of the user (username@provider). :param prefix: Path to use as prefix for files. @@ -380,7 +380,7 @@ class Soledad(object): passphrase=self._user_hash()) remote_symkey = self.decrypt(doc.content['_symkey']) result = self._gpg.import_keys(remote_privkey) - # TODO: is the following behaviour expected in any scenario? + # TODO: is the following behaviour not expected in any scenario? assert result.fingerprints[0] == self._fingerprint assert remote_symkey == self._symkey else: |