diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-11-04 16:05:18 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-11-04 16:05:18 -0300 |
| commit | e021b4236ffce9dfb6e302971e8d2f460b601bf3 (patch) | |
| tree | cc27cb61d29a4165255c8ddd04b37ae4fd05d2b9 /src/leap/keymanager/__init__.py | |
| parent | a22efb595cee79fbcab830d8024a173a6a68d6aa (diff) | |
| parent | 45f158060a4ed2f95a94d839a869a76a02d5ceab (diff) | |
Merge remote-tracking branch 'drebs/feature/4375-add-verification-of-detached-sig' into develop
Diffstat (limited to 'src/leap/keymanager/__init__.py')
| -rw-r--r-- | src/leap/keymanager/__init__.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/leap/keymanager/__init__.py b/src/leap/keymanager/__init__.py index a5505981..61213d38 100644 --- a/src/leap/keymanager/__init__.py +++ b/src/leap/keymanager/__init__.py @@ -473,15 +473,18 @@ class KeyManager(object): data, privkey, digest_algo=digest_algo, clearsign=clearsign, detach=detach, binary=binary) - 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 using this detached signature. + :type detached_sig: str :return: The signed data. :rtype: str @@ -489,7 +492,8 @@ class KeyManager(object): leap_assert_type(pubkey, EncryptionKey) leap_assert(pubkey.__class__ in self._wrapper_map, 'Unknown key type.') leap_assert(pubkey.private is False, 'Key is not public.') - return self._wrapper_map[pubkey.__class__].verify(data, pubkey) + return self._wrapper_map[pubkey.__class__].verify( + data, pubkey, detached_sig=detached_sig) from ._version import get_versions __version__ = get_versions()['version'] |