summaryrefslogtreecommitdiff
path: root/src/leap/keymanager/__init__.py
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2015-12-18 20:31:18 +0100
committerRuben Pollan <meskio@sindominio.net>2016-02-25 11:35:21 -0600
commit3d544f4a85930c5d1611d193500744fc97f0aee1 (patch)
treea86343d0ed93ccf20e36ce203d9499cb322382a3 /src/leap/keymanager/__init__.py
parent81232da09286f7f1812f6d3d182cd57665feaa1f (diff)
[feat] Use fingerprints instead of key ids
- Resolves: #7500
Diffstat (limited to 'src/leap/keymanager/__init__.py')
-rw-r--r--src/leap/keymanager/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/leap/keymanager/__init__.py b/src/leap/keymanager/__init__.py
index 8b3487f..8a4efbe 100644
--- a/src/leap/keymanager/__init__.py
+++ b/src/leap/keymanager/__init__.py
@@ -642,7 +642,7 @@ class KeyManager(object):
else:
signature = InvalidSignature(
'Failed to verify signature with key %s' %
- (pubkey.key_id,))
+ (pubkey.fingerprint,))
defer.returnValue((decrypted, signature))
dpriv = self.get_key(address, ktype, private=True)
@@ -741,7 +741,7 @@ class KeyManager(object):
else:
raise InvalidSignature(
'Failed to verify signature with key %s' %
- (pubkey.key_id,))
+ (pubkey.fingerprint,))
d = self.get_key(address, ktype, private=False,
fetch_remote=fetch_remote)
@@ -804,7 +804,7 @@ class KeyManager(object):
else:
raise KeyNotValidUpgrade(
"Key %s can not be upgraded by new key %s"
- % (old_key.key_id, key.key_id))
+ % (old_key.fingerprint, key.fingerprint))
d = _keys.get_key(address, private=key.private)
d.addErrback(old_key_not_found)