summaryrefslogtreecommitdiff
path: root/lisp/epg.el
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2022-09-16 12:23:39 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2022-10-06 14:53:36 +0200
commit82388dff8ed006cecb65ea7a4afd8667ec44b5e3 (patch)
tree29d86cc4a8531ea4a9276f77926dbbcd26e8d943 /lisp/epg.el
parent07b2e9b9092df57f454386e54491420fb4b5f303 (diff)
downloademacs-82388dff8ed006cecb65ea7a4afd8667ec44b5e3.tar.gz
Fix epg's reliance on an implicit GnuPG command.
Previously, epg invoked GnuPG without an explicit command to verify signatures. Make that operation explicit. Happily, this aligns how gpg and gpgsm is invoked, so it actually makes the code simpler.
Diffstat (limited to 'lisp/epg.el')
-rw-r--r--lisp/epg.el8
1 files changed, 2 insertions, 6 deletions
diff --git a/lisp/epg.el b/lisp/epg.el
index c3c26badbba..ceeb269b070 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -1519,12 +1519,8 @@ If you are unsure, use synchronous version of this function
(process-send-eof (epg-context-process context))))
;; Normal (or cleartext) signature.
(if (epg-data-file signature)
- (epg--start context (if (eq (epg-context-protocol context) 'CMS)
- (list "--verify" "--" (epg-data-file signature))
- (list "--" (epg-data-file signature))))
- (epg--start context (if (eq (epg-context-protocol context) 'CMS)
- '("--verify" "-")
- '("-")))
+ (epg--start context (list "--verify" "--" (epg-data-file signature)))
+ (epg--start context '("--verify" "-"))
(if (eq (process-status (epg-context-process context)) 'run)
(process-send-string (epg-context-process context)
(epg-data-string signature)))