summaryrefslogtreecommitdiff
path: root/src/leap/keymanager/__init__.py
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2016-06-16 20:16:54 +0200
committerRuben Pollan <meskio@sindominio.net>2016-06-20 18:30:22 +0200
commit3dc39619842dfb57d431744aee74d22f76c215e6 (patch)
tree842643dff4a0282064e27065d356199f2685ccda /src/leap/keymanager/__init__.py
parentb64591d39dbb03a76c5c0052ebb86d9fdb9915c7 (diff)
[feat] check key document versions and fail if it's unknown
- Closes: #8165
Diffstat (limited to 'src/leap/keymanager/__init__.py')
-rw-r--r--src/leap/keymanager/__init__.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/leap/keymanager/__init__.py b/src/leap/keymanager/__init__.py
index 97d2985..0b8a5b3 100644
--- a/src/leap/keymanager/__init__.py
+++ b/src/leap/keymanager/__init__.py
@@ -376,7 +376,8 @@ class KeyManager(object):
:return: A Deferred which fires with an EncryptionKey bound to address,
or which fails with KeyNotFound if no key was found neither
- locally or in keyserver.
+ locally or in keyserver or fail with KeyVersionError if the
+ key has a format not supported by this version of KeyManager
:rtype: Deferred
:raise UnsupportedKeyTypeError: if invalid key type
@@ -522,8 +523,9 @@ class KeyManager(object):
:return: A Deferred which fires with the encrypted data as str, or
which fails with KeyNotFound if no keys were found neither
- locally or in keyserver or fails with EncryptError if failed
- encrypting for some reason.
+ locally or in keyserver or fails with KeyVersionError if the
+ key format is not supported or fails with EncryptError if
+ failed encrypting for some reason.
:rtype: Deferred
:raise UnsupportedKeyTypeError: if invalid key type