From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Robert Pluim Newsgroups: gmane.emacs.bugs Subject: bug#40118: 27.0.90; Signing emails with gpg Date: Mon, 20 Apr 2020 12:52:00 +0200 Message-ID: References: <87tv2lhg2p.fsf@skimble.plus.com> <87d08a9vb9.fsf@gmail.com> <83mu7cg0k8.fsf@gnu.org> <83pnc7enyx.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="52437"; mail-complaints-to="usenet@ciao.gmane.io" Cc: larsi@gnus.org, stepnem@gmail.com, 40118@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Apr 20 12:53:11 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jQU34-000DXK-MC for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 20 Apr 2020 12:53:10 +0200 Original-Received: from localhost ([::1]:33286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQU33-0006K9-Nq for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 20 Apr 2020 06:53:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:59720 helo=eggs1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQU2w-0006JJ-Rm for bug-gnu-emacs@gnu.org; Mon, 20 Apr 2020 06:53:03 -0400 Original-Received: from Debian-exim by eggs1p.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQU2w-0007Ec-CP for bug-gnu-emacs@gnu.org; Mon, 20 Apr 2020 06:53:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:35082) by eggs1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQU2v-0007Dv-Vl for bug-gnu-emacs@gnu.org; Mon, 20 Apr 2020 06:53:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQU2v-0003dR-SW for bug-gnu-emacs@gnu.org; Mon, 20 Apr 2020 06:53:01 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <87tv2lhg2p.fsf@skimble.plus.com> Resent-From: Robert Pluim Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 20 Apr 2020 10:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40118 X-GNU-PR-Package: emacs Original-Received: via spool by 40118-submit@debbugs.gnu.org id=B40118.158737993113920 (code B ref 40118); Mon, 20 Apr 2020 10:53:01 +0000 Original-Received: (at 40118) by debbugs.gnu.org; 20 Apr 2020 10:52:11 +0000 Original-Received: from localhost ([127.0.0.1]:46628 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQU27-0003cS-Bh for submit@debbugs.gnu.org; Mon, 20 Apr 2020 06:52:11 -0400 Original-Received: from mail-wm1-f43.google.com ([209.85.128.43]:39357) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQU25-0003cE-1J for 40118@debbugs.gnu.org; Mon, 20 Apr 2020 06:52:10 -0400 Original-Received: by mail-wm1-f43.google.com with SMTP id y24so10826448wma.4 for <40118@debbugs.gnu.org>; Mon, 20 Apr 2020 03:52:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:message-id:mime-version :content-transfer-encoding; bh=De0qjbycCpW2tjqdOzobm0tv/0HSywTtMOBoYoob7ls=; b=olrNpfz2D2ygfMCHNqjUn/A+q2yhIJTtwVJzGNahvbnKdzniErBXbsfnvdQcD4KX6+ v5YqjlMroJkh5fJXUVNRJAxb6Wg8iHiHuqs1NdiVayEUkOaT/HJUyB4b6xA1EbFCNOvH BLTtS8ggge0UOAuczFW88beVNqNthuC+/kmiZaLXTqSmqoWDE3zubkJEyt7DWm3k8brv 29j/t8sxjPV+qTmyVqSLck8Y+eTWbnY5q+iqFhDvcp0pzUmX4nxLDaTZhqulaJv8WxBm KoksQW5rXJsXmmkiFIhsaVTCFAlgCcrvcgjfB3F1wrnJdCdVIgyf86DUHnk+R7U+Z2Wn o3uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:message-id :mime-version:content-transfer-encoding; bh=De0qjbycCpW2tjqdOzobm0tv/0HSywTtMOBoYoob7ls=; b=M8eEgjUWShaK6AzbRN8JaRIDZhDB1Dp3DjEcJPvziECX8hAGAu3UjtM7AYcQgfx0fW LZR8HbvnWfluzMHv7T2CrkXf/9mPkH98JTEG3J92FZu4lGfalBLfIMCb/8XyDFJafz2J nl1wtORJC/QNt0t0vaMbI0inqLQU2EwKhTnl7140ee5Nj6tjhP8QYzTIWx25Vn8kMmMp 0Edb7KRZTShZIrKKaMJZfW0olJyiVRuq67yPuS/X2O/AbC36lsjmbZomjXQ9YVRQMdL7 wQFA2XKn4FNFS7E/nb1Pt9W6JGMALWQc8QBCoq6x/6oRC+WEijDir4gNHN17Kl0lozcW MU/A== X-Gm-Message-State: AGi0PuYL8OJNvcXE/2m93r5SUKSKl6jjdkqYpBFdcth2nW0dh8XYzZeE MZK9I6F3qUjbpvsZDCcojjSjY6X8Koc= X-Google-Smtp-Source: APiQypKk4spJnr2vL0fLiF+WjLK8jr653JbXQO+WrK40CGaLF9RzYivPmK5UU6iLPsQf10AWqTvz0w== X-Received: by 2002:a1c:2d14:: with SMTP id t20mr17214098wmt.28.1587379922576; Mon, 20 Apr 2020 03:52:02 -0700 (PDT) Original-Received: from rpluim-mac ([2a01:e34:ecfc:a860:4dd7:4da5:1258:da60]) by smtp.gmail.com with ESMTPSA id b12sm770010wro.18.2020.04.20.03.52.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Apr 2020 03:52:01 -0700 (PDT) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:178706 Archived-At: >>>>> On Fri, 17 Apr 2020 17:11:53 +0200, Robert Pluim s= aid: 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=CA=BCs Friday afternoon, what Eli really wants to do i= s make Robert> another decision on whether to let something into emacs-27 just= before Robert> the next rc. How about this? If it=CA=BCs not OK I=CA=BCll just= adjust the error Robert> message, if it is OK I=CA=BCll 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)) =20 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 option= s*")) Robert> + (options '((?a "always" "Sign using this sender now an= d 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 err= or 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 me= ssage.\nThe sender of this message is \"%s\".\nWould you like to attempt lo= oking 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-w= ith-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-send= er'."))) Robert> - ;; If `mml-secure-smime-sign-with-sender' is already n= on-nil Robert> - ;; then there's no point advising the user to examine = it. If Robert> - ;; there are any other variables worth examining, plea= se Robert> - ;; improve this error message by having it mention the= m. 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-nam= es))) 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-se= nder' 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 examin= e them. Robert> + ;; If there are any other variables worth examining,= please Robert> + ;; improve this error message by having it mention t= hem. 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)