From: Robert Pluim <rpluim@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: larsi@gnus.org, stepnem@gmail.com, 40118@debbugs.gnu.org
Subject: bug#40118: 27.0.90; Signing emails with gpg
Date: Mon, 20 Apr 2020 12:52:00 +0200 [thread overview]
Message-ID: <m2blnmxwdr.fsf@gmail.com> (raw)
In-Reply-To: <87tv2lhg2p.fsf@skimble.plus.com>
>>>>> On Fri, 17 Apr 2020 17:11:53 +0200, Robert Pluim <rpluim@gmail.com> said:
ping. Eli, full patch to emacs-27, or just error message change to
emacs-27?
Just to reiterate: this is a regression from emacs-26
Robert> Since itʼs Friday afternoon, what Eli really wants to do is make
Robert> another decision on whether to let something into emacs-27 just before
Robert> the next rc. How about this? If itʼs not OK Iʼll just adjust the error
Robert> message, if it is OK Iʼll write a NEWS entry.
Robert> diff --git a/lisp/gnus/mml-sec.el b/lisp/gnus/mml-sec.el
Robert> index 740e1d2b72..8abe83b937 100644
Robert> --- a/lisp/gnus/mml-sec.el
Robert> +++ b/lisp/gnus/mml-sec.el
Robert> @@ -937,6 +937,47 @@ mml-secure-epg-encrypt
Robert> (signal (car error) (cdr error))))
Robert> cipher))
Robert> +(defun mml-secure-sender-sign-query (protocol sender)
Robert> + "Query whether to use SENDER to sign when using PROTOCOL.
Robert> +PROTOCOL will be `OpenPGP' or `CMS' (smime).
Robert> +This can also save the resulting value of
Robert> +`mml-secure-smime-sign-with-sender' or
Robert> +`mml-secure-openpgp-sign-with-sender' via Customize.
Robert> +Returns non-nil if the user has chosen to use SENDER."
Robert> + (let ((buffer (get-buffer-create "*MML sender signing options*"))
Robert> + (options '((?a "always" "Sign using this sender now and sign with message sender in future.")
Robert> + (?s "session only" "Sign using this sender now, and sign with message sender for this session only.")
Robert> + (?n "no" "Do not sign this message (and error out)")))
Robert> + answer done val)
Robert> + (save-window-excursion
Robert> + (pop-to-buffer buffer)
Robert> + (erase-buffer)
Robert> + (insert (format "No %s signing key was found for this message.\nThe sender of this message is \"%s\".\nWould you like to attempt looking up a signing key based on it?"
Robert> + (if (eq protocol 'OpenPGP)
Robert> + "openpgp" "smime")
Robert> + sender))
Robert> + (while (not done)
Robert> + (setq answer (read-multiple-choice "Sign this message using the sender?" options))
Robert> + (cl-case (car answer)
Robert> + (?a
Robert> + (if (eq protocol 'OpenPGP)
Robert> + (progn
Robert> + (setq mml-secure-openpgp-sign-with-sender t)
Robert> + (customize-save-variable 'mml-secure-openpgp-sign-with-sender t))
Robert> + (setq mml-secure-smime-sign-with-sender t)
Robert> + (customize-save-variable 'mml-secure-smime-sign-with-sender t))
Robert> + (setq done t
Robert> + val t))
Robert> + (?s
Robert> + (if (eq protocol 'OpenPGP)
Robert> + (setq mml-secure-openpgp-sign-with-sender t)
Robert> + (setq mml-secure-smime-sign-with-sender t))
Robert> + (setq done t
Robert> + val t))
Robert> + (?n
Robert> + (setq done t)))))
Robert> + val))
Robert> +
Robert> (defun mml-secure-epg-sign (protocol mode)
Robert> ;; Based on code appearing inside mml2015-epg-sign.
Robert> (let* ((context (epg-make-context protocol))
Robert> @@ -945,15 +986,21 @@ mml-secure-epg-sign
Robert> (signers (mml-secure-signers context signer-names))
Robert> signature micalg)
Robert> (unless signers
Robert> - (let ((maybe-msg
Robert> - (if mml-secure-smime-sign-with-sender
Robert> - "."
Robert> - "; try setting `mml-secure-smime-sign-with-sender'.")))
Robert> - ;; If `mml-secure-smime-sign-with-sender' is already non-nil
Robert> - ;; then there's no point advising the user to examine it. If
Robert> - ;; there are any other variables worth examining, please
Robert> - ;; improve this error message by having it mention them.
Robert> - (error "Couldn't find any signer names%s" maybe-msg)))
Robert> + (if (mml-secure-sender-sign-query protocol sender)
Robert> + (setq signer-names (mml-secure-signer-names protocol sender)
Robert> + signers (mml-secure-signers context signer-names)))
Robert> + (unless signers
Robert> + (let ((maybe-msg
Robert> + (if (or mml-secure-smime-sign-with-sender
Robert> + mml-secure-openpgp-sign-with-sender)
Robert> + "."
Robert> + "; try setting `mml-secure-smime-sign-with-sender' or 'mml-secure-openpgp-sign-with-sender'.")))
Robert> + ;; If `mml-secure-smime-sign-with-sender' or
Robert> + ;; `mml-secure-openpgp-sign-with-sender' are already non-nil
Robert> + ;; then there's no point advising the user to examine them.
Robert> + ;; If there are any other variables worth examining, please
Robert> + ;; improve this error message by having it mention them.
Robert> + (error "Couldn't find any signer names%s" maybe-msg))))
Robert> (when (eq 'OpenPGP protocol)
Robert> (setf (epg-context-armor context) t)
Robert> (setf (epg-context-textmode context) t)
next prev parent reply other threads:[~2020-04-20 10:52 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-18 14:51 bug#40118: 27.0.90; Signing emails with gpg Sharon Kimble
2020-04-14 11:10 ` Štěpán Němec
2020-04-15 16:37 ` Robert Pluim
2020-04-15 16:45 ` Eli Zaretskii
2020-04-16 9:44 ` Robert Pluim
2020-04-16 10:15 ` Eli Zaretskii
2020-04-16 10:38 ` Robert Pluim
2020-04-17 15:11 ` Robert Pluim
2020-04-20 10:52 ` Robert Pluim [this message]
2020-04-20 16:24 ` Eli Zaretskii
2020-04-20 16:58 ` Robert Pluim
2020-04-30 4:33 ` Lars Ingebrigtsen
2020-04-30 7:37 ` Robert Pluim
2020-04-30 22:03 ` Lars Ingebrigtsen
2020-05-05 12:46 ` Robert Pluim
2020-05-05 15:06 ` Eli Zaretskii
2020-05-05 15:23 ` Robert Pluim
2020-05-05 16:07 ` Eli Zaretskii
2020-09-30 14:57 ` Lars Ingebrigtsen
2020-09-30 16:44 ` Robert Pluim
2020-10-01 0:16 ` Lars Ingebrigtsen
2020-10-01 17:41 ` Robert Pluim
2020-10-01 17:43 ` Lars Ingebrigtsen
2020-10-02 8:49 ` Robert Pluim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m2blnmxwdr.fsf@gmail.com \
--to=rpluim@gmail.com \
--cc=40118@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=larsi@gnus.org \
--cc=stepnem@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).