freebsd-ports/mail/mutt/files/extra-smime-sender
Derek Schrock 4de7b118bc mail/mutt: Update to 2.1.0
- Update to 2.1.0 [1]
- Remove patch-browser upstream now ignores ..

[1] http://www.mutt.org/relnotes/2.1/

PR:	256609
2021-06-14 14:44:30 -07:00

40 lines
1.4 KiB
Plaintext

--- commands.c.orig 2021-05-23 18:20:50 UTC
+++ commands.c
@@ -302,7 +302,7 @@ int mutt_display_message (HEADER *cur)
{
if (cur->security & GOODSIGN)
{
- if (!crypt_smime_verify_sender(cur))
+ if (option(OPTSMIMENOSENDER) || !crypt_smime_verify_sender(cur))
mutt_message ( _("S/MIME signature successfully verified."));
else
mutt_error ( _("S/MIME certificate owner does not match sender."));
--- init.h.orig 2021-06-13 21:49:47 UTC
+++ init.h
@@ -3819,6 +3819,15 @@ struct option_t MuttVars[] = {
** to determine the key to use. It will ask you to supply a key, if it can't find one.
** (S/MIME only)
*/
+ { "smime_dont_check_sender", DT_BOOL, R_NONE, {.l=OPTSMIMENOSENDER}, {.l=0} },
+ /*
+ ** .pp
+ ** This flag controls wether you want the skip the check for the sender's
+ ** email address against the email address stored in the certificate.
+ ** This can be useful if most of your email senders use SMIMEv3 which no
+ ** longer needs email-addresses as part of the certificates.
+ ** It is not set by default.
+ */
{ "smime_self_encrypt_as", DT_SYN, R_NONE, {.p="smime_default_key"}, {.p=0} },
{ "smime_default_key", DT_STR, R_NONE, {.p=&SmimeDefaultKey}, {.p=0} },
/*
--- mutt.h.orig 2021-06-13 21:49:47 UTC
+++ mutt.h
@@ -609,6 +609,7 @@ enum
OPTSMIMEISDEFAULT,
OPTSMIMESELFENCRYPT,
OPTASKCERTLABEL,
+ OPTSMIMENOSENDER,
OPTSDEFAULTDECRYPTKEY,
OPTPGPIGNORESUB,
OPTPGPCHECKEXIT,