From 222a017656fb7caad64210b3f88ea36e7881ea8c Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Fri, 16 Sep 2022 12:23:39 +0200 Subject: [PATCH 1/4] 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. --- lisp/epg.el | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lisp/epg.el b/lisp/epg.el index c3c26badbb..ceeb269b07 100644 --- a/lisp/epg.el +++ b/lisp/epg.el @@ -1519,12 +1519,8 @@ epg-start-verify (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))) -- 2.30.2