summaryrefslogtreecommitdiff
path: root/src/leap/mail
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2015-12-21 15:35:56 +0100
committerKali Kaneko <kali@leap.se>2016-02-29 10:36:15 -0400
commit8a828b7a2158c01215c3cbab006caa694a41af03 (patch)
tree3f85eb66706b1c379c621d5b4b52f84f4e3ab6b9 /src/leap/mail
parentb962e9bc7973f3a826dccfa9aa417b0139b94104 (diff)
[feat] use fingerprint instead of key_id to address keys
Diffstat (limited to 'src/leap/mail')
-rw-r--r--src/leap/mail/incoming/service.py2
-rw-r--r--src/leap/mail/outgoing/service.py2
-rw-r--r--src/leap/mail/outgoing/tests/test_outgoing.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/leap/mail/incoming/service.py b/src/leap/mail/incoming/service.py
index 49bca50..98ed416 100644
--- a/src/leap/mail/incoming/service.py
+++ b/src/leap/mail/incoming/service.py
@@ -461,7 +461,7 @@ class IncomingMail(Service):
decrmsg.add_header(
self.LEAP_SIGNATURE_HEADER,
self.LEAP_SIGNATURE_VALID,
- pubkey=signkey.key_id)
+ pubkey=signkey.fingerprint)
return decrmsg.as_string()
if msg.get_content_type() == MULTIPART_ENCRYPTED:
diff --git a/src/leap/mail/outgoing/service.py b/src/leap/mail/outgoing/service.py
index 8e06bd4..eeb5d32 100644
--- a/src/leap/mail/outgoing/service.py
+++ b/src/leap/mail/outgoing/service.py
@@ -487,7 +487,7 @@ class OutgoingMail(object):
def add_openpgp_header(signkey):
username, domain = sign_address.split('@')
newmsg.add_header(
- 'OpenPGP', 'id=%s' % signkey.key_id,
+ 'OpenPGP', 'id=%s' % signkey.fingerprint,
url='https://%s/key/%s' % (domain, username),
preference='signencrypt')
return newmsg, origmsg
diff --git a/src/leap/mail/outgoing/tests/test_outgoing.py b/src/leap/mail/outgoing/tests/test_outgoing.py
index 79eafd9..ad7803d 100644
--- a/src/leap/mail/outgoing/tests/test_outgoing.py
+++ b/src/leap/mail/outgoing/tests/test_outgoing.py
@@ -236,7 +236,7 @@ class TestOutgoingMail(TestCaseWithKeyManager):
def _set_sign_used(self, address):
def set_sign(key):
key.sign_used = True
- return self._km.put_key(key, address)
+ return self._km.put_key(key)
d = self._km.get_key(address, openpgp.OpenPGPKey, fetch_remote=False)
d.addCallback(set_sign)