summaryrefslogtreecommitdiff
path: root/lisp/epg.el
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@unixuser.org>2010-12-03 10:52:43 +0900
committerDaiki Ueno <ueno@unixuser.org>2010-12-03 10:52:43 +0900
commit3721e1246a7d23f47976b842c2dc56dc99a103fc (patch)
treee8469d4486b4f764a0a0ddf43ea2eae214589359 /lisp/epg.el
parent106c1842eac062877c07844250cea2948d155d17 (diff)
downloademacs-3721e1246a7d23f47976b842c2dc56dc99a103fc.tar.gz
Trivial fixes for epg.el.
* epg.el (epg-digest-algorithm-alist): Replace "RMD160" with "RIPEMD160" (Bug#7490). Reported by Daniel Kahn Gillmor. (epg-context-set-passphrase-callback): Mention that the callback is not called when used with GnuPG 2.x.
Diffstat (limited to 'lisp/epg.el')
-rw-r--r--lisp/epg.el10
1 files changed, 8 insertions, 2 deletions
diff --git a/lisp/epg.el b/lisp/epg.el
index fae896c4ae0..a1541361b4b 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -67,7 +67,7 @@
(defconst epg-digest-algorithm-alist
'((1 . "MD5")
(2 . "SHA1")
- (3 . "RMD160")
+ (3 . "RIPEMD160")
(8 . "SHA256")
(9 . "SHA384")
(10 . "SHA512")
@@ -337,7 +337,13 @@ PASSPHRASE-CALLBACK is either a function, or a cons-cell whose
car is a function and cdr is a callback data.
The function gets three arguments: the context, the key-id in
-question, and the callback data (if any)."
+question, and the callback data (if any).
+
+The callback may not be called if you use GnuPG 2.x, which relies
+on the external program called `gpg-agent' for passphrase query.
+If you really want to intercept passphrase query, consider
+installing GnuPG 1.x _along with_ GnuPG 2.x, which does passphrase
+query by itself and Emacs can intercept them."
(unless (eq (car-safe context) 'epg-context)
(signal 'wrong-type-argument (list 'epg-context-p context)))
(aset (cdr context) 7 (if (consp passphrase-callback)