diff options
Diffstat (limited to 'src/leap/mail/outgoing')
-rw-r--r-- | src/leap/mail/outgoing/service.py | 13 | ||||
-rw-r--r-- | src/leap/mail/outgoing/tests/test_outgoing.py | 13 |
2 files changed, 11 insertions, 15 deletions
diff --git a/src/leap/mail/outgoing/service.py b/src/leap/mail/outgoing/service.py index 95d3e79..05c3bed 100644 --- a/src/leap/mail/outgoing/service.py +++ b/src/leap/mail/outgoing/service.py @@ -40,7 +40,6 @@ from twisted.python import log from leap.common.check import leap_assert_type, leap_assert from leap.common.events import emit_async, catalog -from leap.keymanager.openpgp import OpenPGPKey from leap.keymanager.errors import KeyNotFound, KeyAddressMismatch from leap.mail import __version__ from leap.mail import errors @@ -328,8 +327,7 @@ class OutgoingMail(object): return get_key_and_attach(None) def get_key_and_attach(_): - d = self._keymanager.get_key(from_address, OpenPGPKey, - fetch_remote=False) + d = self._keymanager.get_key(from_address, fetch_remote=False) d.addCallback(attach_key) return d @@ -348,8 +346,7 @@ class OutgoingMail(object): msg.attach(keymsg) return msg - d = self._keymanager.get_key(to_address, OpenPGPKey, - fetch_remote=False) + d = self._keymanager.get_key(to_address, fetch_remote=False) d.addCallbacks(attach_if_address_hasnt_encrypted, get_key_and_attach) d.addErrback(lambda _: origmsg) return d @@ -375,7 +372,7 @@ class OutgoingMail(object): newmsg, origmsg = res d = self._keymanager.encrypt( origmsg.as_string(unixfrom=False), - encrypt_address, OpenPGPKey, sign=sign_address) + encrypt_address, sign=sign_address) d.addCallback(lambda encstr: (newmsg, encstr)) return d @@ -440,7 +437,7 @@ class OutgoingMail(object): MultipartSigned('application/pgp-signature', 'pgp-sha512'), sign_address) ds = self._keymanager.sign( - msgtext, sign_address, OpenPGPKey, digest_algo='SHA512', + msgtext, sign_address, digest_algo='SHA512', clearsign=False, detach=True, binary=False) d = defer.gatherResults([dh, ds]) d.addCallback(create_signed_message) @@ -512,6 +509,6 @@ class OutgoingMail(object): preference='signencrypt') return newmsg, origmsg - d = self._keymanager.get_key(sign_address, OpenPGPKey, private=True) + d = self._keymanager.get_key(sign_address, private=True) d.addCallback(add_openpgp_header) return d diff --git a/src/leap/mail/outgoing/tests/test_outgoing.py b/src/leap/mail/outgoing/tests/test_outgoing.py index ad7803d..12a72a7 100644 --- a/src/leap/mail/outgoing/tests/test_outgoing.py +++ b/src/leap/mail/outgoing/tests/test_outgoing.py @@ -35,7 +35,7 @@ from leap.mail.tests import TestCaseWithKeyManager from leap.mail.tests import ADDRESS, ADDRESS_2, PUBLIC_KEY_2 from leap.mail.smtp.tests.test_gateway import getSMTPFactory -from leap.keymanager import openpgp, errors +from leap.keymanager import errors BEGIN_PUBLIC_KEY = "-----BEGIN PGP PUBLIC KEY BLOCK-----" @@ -101,7 +101,7 @@ class TestOutgoingMail(TestCaseWithKeyManager): self.outgoing_mail._maybe_encrypt_and_sign(self.raw, self.dest)) d.addCallback(self._assert_encrypted) d.addCallback(lambda message: self._km.decrypt( - message.get_payload(1).get_payload(), ADDRESS, openpgp.OpenPGPKey)) + message.get_payload(1).get_payload(), ADDRESS)) d.addCallback(check_decryption) return d @@ -125,8 +125,7 @@ class TestOutgoingMail(TestCaseWithKeyManager): self.outgoing_mail._maybe_encrypt_and_sign(self.raw, self.dest)) d.addCallback(self._assert_encrypted) d.addCallback(lambda message: self._km.decrypt( - message.get_payload(1).get_payload(), ADDRESS, openpgp.OpenPGPKey, - verify=ADDRESS_2)) + message.get_payload(1).get_payload(), ADDRESS, verify=ADDRESS_2)) d.addCallback(check_decryption_and_verify) return d @@ -181,7 +180,7 @@ class TestOutgoingMail(TestCaseWithKeyManager): 'Signature could not be verified.') d = self._km.verify( - signed_text, ADDRESS_2, openpgp.OpenPGPKey, + signed_text, ADDRESS_2, detached_sig=message.get_payload(1).get_payload()) d.addCallback(assert_verify) return d @@ -196,7 +195,7 @@ class TestOutgoingMail(TestCaseWithKeyManager): d.addCallback(self._assert_encrypted) d.addCallback(self._check_headers, self.lines[:4]) d.addCallback(lambda message: self._km.decrypt( - message.get_payload(1).get_payload(), ADDRESS, openpgp.OpenPGPKey)) + message.get_payload(1).get_payload(), ADDRESS)) d.addCallback(lambda (decrypted, _): self._check_key_attachment(Parser().parsestr(decrypted))) return d @@ -238,7 +237,7 @@ class TestOutgoingMail(TestCaseWithKeyManager): key.sign_used = True return self._km.put_key(key) - d = self._km.get_key(address, openpgp.OpenPGPKey, fetch_remote=False) + d = self._km.get_key(address, fetch_remote=False) d.addCallback(set_sign) return d |