summaryrefslogtreecommitdiffstats
path: root/crypt.c
diff options
context:
space:
mode:
authorKevin McCarthy <kevin@8t8.us>2017-09-04 13:26:55 -0700
committerKevin McCarthy <kevin@8t8.us>2017-09-04 13:26:55 -0700
commitf22160240d1e8fe57fa00f2e7543592b0d3f7085 (patch)
tree8266b735557984b6f0c4b109e98bdf32b2e9f121 /crypt.c
parent61c7e5486c3a845ad549ab606e50fdbd1ede90a5 (diff)
Add warning about using inline pgp with format=flowed. (closes #3963)
The reporter noted that when trying to use inline signing with format=flowed, the flowed was turned off. After some research, this appears to be deliberate, probably because of strange interactions between inline PGP and format=flowed. In fact the RFC strongly discourages their combined use: https://tools.ietf.org/html/rfc3676#section-4.6 Add a warning and prompt to use PGP/MIME in mutt_protect().
Diffstat (limited to 'crypt.c')
-rw-r--r--crypt.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/crypt.c b/crypt.c
index 5804c148..19a585d0 100644
--- a/crypt.c
+++ b/crypt.c
@@ -153,6 +153,16 @@ int mutt_protect (HEADER *msg, char *keylist)
return -1;
}
}
+ else if (!mutt_strcasecmp ("flowed",
+ mutt_get_parameter ("format", msg->content->parameter)))
+ {
+ if ((i = query_quadoption (OPT_PGPMIMEAUTO,
+ _("Inline PGP can't be used with format=flowed. Revert to PGP/MIME?"))) != MUTT_YES)
+ {
+ mutt_error _("Mail not sent: inline PGP can't be used with format=flowed.");
+ return -1;
+ }
+ }
else
{
/* they really want to send it inline... go for it */