diff options
| author | Daiki Ueno <ueno@unixuser.org> | 2008-09-16 02:07:05 +0000 |
|---|---|---|
| committer | Daiki Ueno <ueno@unixuser.org> | 2008-09-16 02:07:05 +0000 |
| commit | 761cd524193337fc59b316e04ecf884d482fa89d (patch) | |
| tree | 7fdbe98911f9f2dc19246136887e11c668ccfe52 /lisp | |
| parent | 91e97ba8ba6b3b0406317a07077d4a2fb3eb30a2 (diff) | |
| download | emacs-761cd524193337fc59b316e04ecf884d482fa89d.tar.gz | |
(epg-start-verify): Pass "--verify" to gpgsm.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/epg.el | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 496ead2fbc3..fdae2290ac8 100644 --- 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 7ad0d34b4b0..75a860933cb 100644 --- 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))) |