mirror of
https://git.freebsd.org/ports.git
synced 2025-07-07 12:29:16 -04:00
6d2826efac
- Clean up some patches due to fuzz warning message
- Replace patch-examples with a post-patch "simple" ${REINPLACE_CMD}
PR: 218803
Submitted by: maintainer
53 lines
1.8 KiB
Text
53 lines
1.8 KiB
Text
--- commands.c.orig 2017-04-12 23:01:17 UTC
|
|
+++ commands.c
|
|
@@ -185,7 +185,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."));
|
|
--- contrib/smime.rc.orig 2017-04-12 23:01:05 UTC
|
|
+++ contrib/smime.rc
|
|
@@ -8,7 +8,10 @@ set smime_is_default
|
|
|
|
# Uncomment this if you don't want to set labels for certificates you add.
|
|
# unset smime_ask_cert_label
|
|
-
|
|
+
|
|
+# Uncomment this if you don't want to check for sender's email address
|
|
+# set smime_dont_check_sender = yes
|
|
+
|
|
# Passphrase expiration
|
|
set smime_timeout=300
|
|
|
|
--- init.h.orig 2017-04-12 23:01:17 UTC
|
|
+++ init.h
|
|
@@ -2980,6 +2980,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, OPTSMIMENOSENDER, 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_sign_as", DT_SYN, R_NONE, UL "smime_default_key", 0 },
|
|
{ "smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, 0 },
|
|
/*
|
|
--- mutt.h.orig 2017-04-12 23:01:17 UTC
|
|
+++ mutt.h
|
|
@@ -499,6 +499,7 @@ enum
|
|
OPTCRYPTTIMESTAMP,
|
|
OPTSMIMEISDEFAULT,
|
|
OPTASKCERTLABEL,
|
|
+ OPTSMIMENOSENDER,
|
|
OPTSDEFAULTDECRYPTKEY,
|
|
OPTPGPIGNORESUB,
|
|
OPTPGPCHECKEXIT,
|