Mercurial > emacs
changeset 111791:13447eaa1957
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.
| author | Daiki Ueno <ueno@unixuser.org> |
|---|---|
| date | Fri, 03 Dec 2010 10:52:43 +0900 |
| parents | c27f24c79b6a |
| children | 6125476aab24 |
| files | lisp/ChangeLog lisp/epg.el |
| diffstat | 2 files changed, 15 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Dec 02 22:25:01 2010 +0000 +++ b/lisp/ChangeLog Fri Dec 03 10:52:43 2010 +0900 @@ -1,3 +1,10 @@ +2010-12-03 Daiki Ueno <ueno@unixuser.org> + + * 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. + 2010-12-02 Michael Albinus <michael.albinus@gmx.de> * net/tramp.el (tramp-local-host-regexp): Add "localhost6".
--- a/lisp/epg.el Thu Dec 02 22:25:01 2010 +0000 +++ b/lisp/epg.el Fri Dec 03 10:52:43 2010 +0900 @@ -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 @@ 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)