summaryrefslogtreecommitdiff
path: root/src/leap/keymanager/keys.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-11-15 10:04:50 -0300
committerTomás Touceda <chiiph@leap.se>2013-11-15 10:04:50 -0300
commitae80ea1f0a748c2746026bd1a17815d786722b84 (patch)
treecb1809f49f532422e54cf8b30e829f87c88847a5 /src/leap/keymanager/keys.py
parenta22efb595cee79fbcab830d8024a173a6a68d6aa (diff)
parentb4b46883df55ffeccfdda975f0b61b32436d8ee8 (diff)
Merge branch 'release-0.3.6'0.3.6
Diffstat (limited to 'src/leap/keymanager/keys.py')
-rw-r--r--src/leap/keymanager/keys.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/leap/keymanager/keys.py b/src/leap/keymanager/keys.py
index b8e88d46..ec1bfeb4 100644
--- a/src/leap/keymanager/keys.py
+++ b/src/leap/keymanager/keys.py
@@ -340,15 +340,18 @@ class EncryptionScheme(object):
pass
@abstractmethod
- def verify(self, data, pubkey):
+ def verify(self, data, pubkey, detached_sig=None):
"""
- Verify signed C{data} with C{pubkey}.
+ Verify signed C{data} with C{pubkey}, eventually using
+ C{detached_sig}.
:param data: The data to be verified.
:type data: str
-
:param pubkey: The public key to be used on verification.
:type pubkey: EncryptionKey
+ :param detached_sig: A detached signature. If given, C{data} is
+ verified against this sdetached signature.
+ :type detached_sig: str
:return: The signed data.
:rtype: str