Page MenuHomeFreeBSD
Differential D11047 Diff 29197 mail/mutt/files/patch-smime-sender

Changeset View

Standalone View

View Options

mail/mutt/files/patch-smime-sender

--- commands.c.orig 2017-04-12 23:01:17 UTC --- commands.c.orig 2017-05-30 19:27:52 UTC
+++ commands.c +++ commands.c
@@ -185,7 +185,7 @@ int mutt_display_message (HEADER *cur) @@ -185,7 +185,7 @@ int mutt_display_message (HEADER *cur)
{ {
if (cur->security & GOODSIGN) if (cur->security & GOODSIGN)
{ {
- if (!crypt_smime_verify_sender(cur)) - if (!crypt_smime_verify_sender(cur))
+ if (option(OPTSMIMENOSENDER) || !crypt_smime_verify_sender(cur)) + if (option(OPTSMIMENOSENDER) || !crypt_smime_verify_sender(cur))
mutt_message ( _("S/MIME signature successfully verified.")); mutt_message ( _("S/MIME signature successfully verified."));
else else
mutt_error ( _("S/MIME certificate owner does not match sender.")); mutt_error ( _("S/MIME certificate owner does not match sender."));
--- contrib/smime.rc.orig 2017-04-12 23:01:05 UTC --- contrib/smime.rc.orig 2017-06-04 00:06:24 UTC
+++ contrib/smime.rc +++ contrib/smime.rc
@@ -8,7 +8,10 @@ set smime_is_default @@ -8,7 +8,10 @@ set smime_is_default
# Uncomment this if you don't want to set labels for certificates you add. # Uncomment this if you don't want to set labels for certificates you add.
# unset smime_ask_cert_label # unset smime_ask_cert_label
- -
+ +
+# Uncomment this if you don't want to check for sender's email address +# Uncomment this if you don't want to check for sender's email address
+# set smime_dont_check_sender = yes +# set smime_dont_check_sender = yes
+ +
# Passphrase expiration # Passphrase expiration
set smime_timeout=300 set smime_timeout=300
--- init.h.orig 2017-04-12 23:01:17 UTC --- init.h.orig 2017-06-04 00:06:24 UTC
+++ init.h +++ init.h
@@ -2980,6 +2980,15 @@ struct option_t MuttVars[] = { @@ -3000,6 +3000,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. ** to determine the key to use. It will ask you to supply a key, if it can't find one.
** (S/MIME only) ** (S/MIME only)
*/ */
+ { "smime_dont_check_sender", DT_BOOL, R_NONE, OPTSMIMENOSENDER, 0 }, + { "smime_dont_check_sender", DT_BOOL, R_NONE, OPTSMIMENOSENDER, 0 },
+ /* + /*
+ ** .pp + ** .pp
+ ** This flag controls wether you want the skip the check for the sender's + ** This flag controls wether you want the skip the check for the sender's
+ ** email address against the email address stored in the certificate. + ** email address against the email address stored in the certificate.
+ ** This can be useful if most of your email senders use SMIMEv3 which no + ** This can be useful if most of your email senders use SMIMEv3 which no
+ ** longer needs email-addresses as part of the certificates. + ** longer needs email-addresses as part of the certificates.
+ ** It is not set by default. + ** It is not set by default.
+ */ + */
{ "smime_sign_as", DT_SYN, R_NONE, UL "smime_default_key", 0 }, { "smime_sign_as", DT_SYN, R_NONE, UL "smime_default_key", 0 },
{ "smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, 0 }, { "smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, 0 },
/* /*
--- mutt.h.orig 2017-04-12 23:01:17 UTC --- mutt.h.orig 2017-06-04 00:06:24 UTC
+++ mutt.h +++ mutt.h
@@ -499,6 +499,7 @@ enum @@ -513,6 +513,7 @@ enum
OPTCRYPTTIMESTAMP, OPTCRYPTTIMESTAMP,
OPTSMIMEISDEFAULT, OPTSMIMEISDEFAULT,
OPTASKCERTLABEL, OPTASKCERTLABEL,
+ OPTSMIMENOSENDER, + OPTSMIMENOSENDER,
OPTSDEFAULTDECRYPTKEY, OPTSDEFAULTDECRYPTKEY,
OPTPGPIGNORESUB, OPTPGPIGNORESUB,
OPTPGPCHECKEXIT, OPTPGPCHECKEXIT,