summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-11-21 18:16:12 -0200
committerdrebs <drebs@leap.se>2013-11-21 18:18:34 -0200
commitbdd391612c9f5923a94510487d2cfe177c27204e (patch)
treecd48962f2504c7f8dbaaed804da21bac89b1ddec
parentef53523d1aebf38fa2b5ed6c9dd19c6c5f6b23ab (diff)
Add the preference parameter to openpgp header. Closes #3878.
-rw-r--r--changes/feature_3878_add-preference-to-openpgp-header2
-rw-r--r--src/leap/mail/smtp/gateway.py3
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/feature_3878_add-preference-to-openpgp-header b/changes/feature_3878_add-preference-to-openpgp-header
new file mode 100644
index 0000000..4513bf6
--- /dev/null
+++ b/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/src/leap/mail/smtp/gateway.py b/src/leap/mail/smtp/gateway.py
index 523ac0d..a78bd55 100644
--- a/src/leap/mail/smtp/gateway.py
+++ b/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'])