master 82388dff8e 1/4: Fix epg's reliance on an implicit GnuPG command.

[Lars Ingebrigtsen]

branch: master
commit 82388dff8ed006cecb65ea7a4afd8667ec44b5e3
Author: Justus Winter <justus@sequoia-pgp.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    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 @@ 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)))