(epg-start-verify): Pass "--verify" to gpgsm.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 496ead2fbc3485bff8c95c4d21d838ea5f9f8d88..fdae2290ac8e35dbcc201311a28249a528f32ffb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-16  Daiki Ueno  <ueno@unixuser.org>
+
+       * epg.el (epg-start-verify): Pass "--verify" to gpgsm.
+
 2008-09-15  Juanma Barranquero  <lekktu@gmail.com>
 
        * vc-rcs.el (vc-rcs-steal-lock, vc-rcs-checkout): Fix docstring typos.

diff --git a/lisp/epg.el b/lisp/epg.el
index 7ad0d34b4b0ac757ed4683baa4e70d4880654130..75a860933cbc2d698c650bb54953e1e50bf296b8 100644 (file)
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -2013,8 +2013,12 @@ 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 (list "--" (epg-data-file signature)))
-      (epg--start context '("-"))
+       (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" "-")
+                           '("-")))
       (if (eq (process-status (epg-context-process context)) 'run)
          (process-send-string (epg-context-process context)
                               (epg-data-string signature)))