summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-03-23 14:20:33 -0300
committerdrebs <drebs@leap.se>2013-03-23 14:20:33 -0300
commitb35bf4d5a68b3bf75fc37ca35315ea15cc4f5134 (patch)
treef007db400c547fbad8bd4b627cd630351c821632 /src
parent3fffd731552426c67d1255fd5ba3b4a36964efe4 (diff)
Fix some comments.
Diffstat (limited to 'src')
-rw-r--r--src/leap/soledad/__init__.py4
-rw-r--r--src/leap/soledad/shared_db.py2
2 files changed, 3 insertions, 3 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:
diff --git a/src/leap/soledad/shared_db.py b/src/leap/soledad/shared_db.py
index 27018701..275ed269 100644
--- a/src/leap/soledad/shared_db.py
+++ b/src/leap/soledad/shared_db.py
@@ -32,7 +32,7 @@ class Unauthorized(Exception):
class SoledadSharedDatabase(http_database.HTTPDatabase):
"""
- This is a shared HTTP database that holds users' encrypted keys.
+ This is a shared remote database that holds users' encrypted keys.
An authorization token is attached to every request other than
get_doc_unauth, which has the purpose of retrieving encrypted content from