diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-08 11:18:41 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-08 11:18:41 -0300 |
| commit | 14fbcb055fcc2084e11497c53deb1b523ed85f32 (patch) | |
| tree | 983363316a985beb674180877c90cb84989d1f5a /src/leap/mail/imap/fetch.py | |
| parent | 2d61fd7a27aad51092ccf831c76ce1cd993dacd1 (diff) | |
| parent | a46b3fcea0db6a3545e955a1c4cb648750d93974 (diff) | |
Merge remote-tracking branch 'drebs/feature/3397-keymanager-should-support-bundled-gpg' into develop
Diffstat (limited to 'src/leap/mail/imap/fetch.py')
| -rw-r--r-- | src/leap/mail/imap/fetch.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/leap/mail/imap/fetch.py b/src/leap/mail/imap/fetch.py index 44b3124..f20c996 100644 --- a/src/leap/mail/imap/fetch.py +++ b/src/leap/mail/imap/fetch.py @@ -8,7 +8,6 @@ from twisted.internet.task import LoopingCall from twisted.internet.threads import deferToThread from leap.common.check import leap_assert, leap_assert_type -from leap.keymanager import openpgp from leap.soledad import Soledad logger = logging.getLogger(__name__) @@ -134,7 +133,7 @@ class LeapIncomingMail(object): def _decrypt_msg(self, doc, encdata): log.msg('decrypting msg') key = self._pkey - decrdata = (openpgp.decrypt_asym( + decrdata = (self._keymanager.decrypt( encdata, key, # XXX get from public method instead passphrase=self._soledad._passphrase)) |