summaryrefslogtreecommitdiff
path: root/client/src/leap
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2017-01-26 10:52:20 -0200
committerKali Kaneko <kali@leap.se>2017-02-09 17:41:31 +0100
commit3787a645993ea36bbecebc850296de4b0fdd3620 (patch)
tree542e173e34fab9c51286441660d2f20f128a0b36 /client/src/leap
parent71ab022aa12d5754d5845eae757b2f3531b4e50a (diff)
[doc] improve comment for client secrets file migration function
Diffstat (limited to 'client/src/leap')
-rw-r--r--client/src/leap/soledad/client/_secrets/crypto.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/client/src/leap/soledad/client/_secrets/crypto.py b/client/src/leap/soledad/client/_secrets/crypto.py
index dc80cf0b..02d7dc02 100644
--- a/client/src/leap/soledad/client/_secrets/crypto.py
+++ b/client/src/leap/soledad/client/_secrets/crypto.py
@@ -80,7 +80,11 @@ class SecretsCrypto(object):
raise SecretsError(e)
def _decrypt_v1(self, data):
- # get encrypted secret from dictionary
+ # get encrypted secret from dictionary: the old format allowed for
+ # storage of more than one secret, but this feature was never used and
+ # soledad has been using only one secret so far. As there is a corner
+ # case where the old 'active_secret' key might not be set, we just
+ # ignore it and pop the only secret found in the 'storage_secrets' key.
secret_id = data['storage_secrets'].keys().pop()
encrypted = data['storage_secrets'][secret_id]