From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sun, 2 Aug 2020 09:32:35 +0000 (+0200)
Subject: Signal an error in the user clicks "cancel" when signing in epg
X-Git-Tag: emacs-28.0.90~6867
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=929e7e141c5780e51173fda7d7fc5b73411e4465;p=emacs.git

Signal an error in the user clicks "cancel" when signing in epg

* lisp/epg.el (epg-sign-string): If the user clicks "cancel" on
the pinentry, then we don't have an error from gpg(sm), but
instead nothing (bug#39058).  Signal an error in that case.
---

diff --git a/lisp/epg.el b/lisp/epg.el
index 222fd913e17..5b90bc290ab 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -1683,7 +1683,8 @@ Otherwise, it makes a cleartext signature."
 	    (if (epg-context-result-for context 'error)
 		(let ((errors (epg-context-result-for context 'error)))
 		  (signal 'epg-error
-			  (list "Sign failed" (epg-errors-to-string errors))))))
+			  (list "Sign failed" (epg-errors-to-string errors))))
+              (signal 'epg-error '("Signing failed (unknown reason)"))))
 	  (epg-read-output context))
       (epg-delete-output-file context)
       (if input-file