diff options
author | drebs <drebs@leap.se> | 2013-11-21 18:16:12 -0200 |
---|---|---|
committer | drebs <drebs@leap.se> | 2013-11-21 18:18:34 -0200 |
commit | c2d4fc3623e5d4b6604d9b5f8e7e10e29bdbecf5 (patch) | |
tree | 0da9803ff991827b18e357ffeadca2e5e939e3ad /mail | |
parent | 60729f09b381fcf5621ab2e012b664dd69cb3649 (diff) |
Add the preference parameter to openpgp header. Closes #3878.
Diffstat (limited to 'mail')
-rw-r--r-- | mail/changes/feature_3878_add-preference-to-openpgp-header | 2 | ||||
-rw-r--r-- | mail/src/leap/mail/smtp/gateway.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mail/changes/feature_3878_add-preference-to-openpgp-header b/mail/changes/feature_3878_add-preference-to-openpgp-header new file mode 100644 index 00000000..4513bf6a --- /dev/null +++ b/mail/changes/feature_3878_add-preference-to-openpgp-header @@ -0,0 +1,2 @@ + o Add 'signencrypt' preference to OpenPGP header on outgoing email. Closes + #3878". diff --git a/mail/src/leap/mail/smtp/gateway.py b/mail/src/leap/mail/smtp/gateway.py index 523ac0d3..a78bd55b 100644 --- a/mail/src/leap/mail/smtp/gateway.py +++ b/mail/src/leap/mail/smtp/gateway.py @@ -683,6 +683,7 @@ class EncryptedMessage(object): username, domain = signkey.address.split('@') newmsg.add_header( 'OpenPGP', 'id=%s' % signkey.key_id, - url='https://%s/key/%s' % (domain, username)) + url='https://%s/key/%s' % (domain, username), + preference='signencrypt') # delete user-agent from origmsg del(origmsg['user-agent']) |