diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2016-09-13 13:27:32 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2016-09-13 13:27:32 -0600 |
| commit | 745455f3cfdcee60ef87764eea5ec263e7eb350e (patch) | |
| tree | 4d9af1d9a7684285ff31d7680fc3903454ff31de /alpine | |
| parent | 097b72cb06f448728280ed53e033a447ed7b46be (diff) | |
| download | alpine-745455f3cfdcee60ef87764eea5ec263e7eb350e.tar.xz | |
* New version 2.20.16
* SMIME: Bouncing could sign (and therefore corrupt) a message when it
is signed automatically. Reported by Björn Krellner.
Diffstat (limited to 'alpine')
| -rw-r--r-- | alpine/mailcmd.c | 10 | ||||
| -rw-r--r-- | alpine/osdep/mswin.rc | 8 | ||||
| -rw-r--r-- | alpine/reply.c | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/alpine/mailcmd.c b/alpine/mailcmd.c index b8b0eaa4..83c01f29 100644 --- a/alpine/mailcmd.c +++ b/alpine/mailcmd.c @@ -2396,16 +2396,6 @@ cmd_bounce(struct pine *state, MSGNO_S *msgmap, int aopt, ACTION_S *role) q_status_message(SM_ORDER | SM_DING, 3, 4, _("WARNING: not bouncing all selected messages!")); -#ifdef SMIME - /* When we bounce a message, we will leave the original message - * intact, which means that it will not be signed or encrypted, - * so we turn off signing and encrypting now. It will be turned - * on again in send_exit_for_pico(). - */ - if(ps_global->smime) - ps_global->smime->do_sign = ps_global->smime->do_encrypt = 0; -#endif /* SMIME */ - rv = bounce(state, role); if(MCMD_ISAGG(aopt)) diff --git a/alpine/osdep/mswin.rc b/alpine/osdep/mswin.rc index cd4640d3..d22354a7 100644 --- a/alpine/osdep/mswin.rc +++ b/alpine/osdep/mswin.rc @@ -244,8 +244,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,20,15,0 - PRODUCTVERSION 2,20,15,0 + FILEVERSION 2,20,16,0 + PRODUCTVERSION 2,20,16,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -267,12 +267,12 @@ BEGIN #else VALUE "FileDescription", "Alpine\0" #endif - VALUE "FileVersion", "2.20.15\0" + VALUE "FileVersion", "2.20.16\0" VALUE "InternalName", "alpine\0" VALUE "LegalCopyright", "Copyright 2006-2009 University of Washington, Copyright 2013-2014\0" VALUE "OriginalFilename", "alpine.exe\0" VALUE "ProductName", "alpine\0" - VALUE "ProductVersion", "2.20.15\0" + VALUE "ProductVersion", "2.20.16\0" END END BLOCK "VarFileInfo" diff --git a/alpine/reply.c b/alpine/reply.c index 61fd1ec9..1807b642 100644 --- a/alpine/reply.c +++ b/alpine/reply.c @@ -2048,6 +2048,16 @@ bounce_msg(MAILSTREAM *stream, BODY *body = NULL; MESSAGECACHE *mc; +#ifdef SMIME + /* When we bounce a message, we will leave the original message + * intact, which means that it will not be signed or encrypted, + * so we turn off signing and encrypting now. It will be turned + * on again in send_exit_for_pico(). + */ + if(ps_global->smime) + ps_global->smime->do_sign = ps_global->smime->do_encrypt = 0; +#endif /* SMIME */ + if((errstr = bounce_msg_body(stream, rawno, part, to, subject, &outgoing, &body, &was_seen)) == NULL){ if(pine_simple_send(outgoing, &body, &role, pmt_who, pmt_cnf, to, !(to && *to) ? SS_PROMPTFORTO : 0) < 0){ |