summaryrefslogtreecommitdiff
path: root/pith/send.c
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2014-05-02 19:04:29 -0600
committerEduardo Chappa <chappa@washington.edu>2014-05-02 19:04:29 -0600
commit223b392e8d40a0622936403d1da5eaf0cdd54d60 (patch)
tree05858ceae7dea53c9e97c205ce524a112f41723e /pith/send.c
parent0d1e49834f4c3005b2b92a4ce8a03bd395d2fb1e (diff)
downloadalpine-223b392e8d40a0622936403d1da5eaf0cdd54d60.tar.xz
* Create help for explaining how encrypted password file support
works. * When a message is sent encrypted, add the sender certificate so that the sender can decrypt it too. * When a message is signed and encrypted, first sign it and then encrypt it. This changes the usual order of encrypting and then signing, and it has the shortcoming of making bigger messages. However, this is the way that most clients work with S/MIME, and so for compatibility with other programs, we will send signed, then encrypted, instead of encrypted, then signed. Hmm... should we sign the encrypted part? * Avoid the first RSET smtp command, as this causes delays in some evily managed servers.
Diffstat (limited to 'pith/send.c')
-rw-r--r--pith/send.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/pith/send.c b/pith/send.c
index bd99d49a..4620d1aa 100644
--- a/pith/send.c
+++ b/pith/send.c
@@ -1768,12 +1768,12 @@ call_mailer(METAENV *header, struct mail_bodystruct *body, char **alt_smtp_serve
result = 1;
- if(ps_global->smime->do_encrypt)
- result = encrypt_outgoing_message(header, &body);
+ if(ps_global->smime->do_sign)
+ result = sign_outgoing_message(header, &body, 0);
/* need to free new body from encrypt if sign fails? */
- if(result && ps_global->smime->do_sign)
- result = sign_outgoing_message(header, &body, ps_global->smime->do_encrypt);
+ if(result && ps_global->smime->do_encrypt)
+ result = encrypt_outgoing_message(header, &body);
lmc.so = so;