summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin McCarthy <kevin@8t8.us>2022-06-09 09:22:03 -0700
committerKevin McCarthy <kevin@8t8.us>2022-06-11 12:46:46 -0700
commit97f8eee2579a36e355ef4f765f36689cfe1fd2f6 (patch)
tree02e53a145b5b25e33b5f84a8efd549864d7d7723
parentd1ee13147297913eb2e22f22912c5db6187aaecf (diff)
Decrypt S/MIME when mime-forwarding with $forward_decrypt set.
The code was performing a decode for S/MIME, but this had the effect of running attachments through the autoview routines. Change so it only performs a decrypt. This is also how copying is handled in set_copy_flags(), so I believe the decode was just a mistake.
-rw-r--r--sendlib.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sendlib.c b/sendlib.c
index b0b94b4f..d9429c2e 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -1383,8 +1383,8 @@ retry:
else if ((WithCrypto & APPLICATION_SMIME) &&
((mutt_is_application_smime (hdr->content) & SMIMEENCRYPT) == SMIMEENCRYPT))
{
- chflags |= CH_MIME | CH_TXTPLAIN;
- cmflags = MUTT_CM_DECODE | MUTT_CM_CHARCONV;
+ chflags |= CH_MIME | CH_NONEWLINE;
+ cmflags = MUTT_CM_DECODE_SMIME;
pgp &= ~SMIMEENCRYPT;
}
}