diff options
| author | Daiki Ueno <ueno@unixuser.org> | 2010-12-05 10:30:58 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@unixuser.org> | 2010-12-05 10:30:58 +0900 |
| commit | f9fe1af93762cdb8d4ea326c1ee6b8f46dec6cc9 (patch) | |
| tree | 6eac633c66a23eb8f5031c1eadcff9d4c0b2a26e | |
| parent | 2931c841a3ae5a83bb64c9b6525fa83c9326d55c (diff) | |
| download | emacs-f9fe1af93762cdb8d4ea326c1ee6b8f46dec6cc9.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.
modified:
lisp/ChangeLog
lisp/epg.elk
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/epg.el | 10 |
2 files changed, 15 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 747267b674b..8e80a7a6e19 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -33,6 +33,13 @@ * files.el (file-relative-name): Handle UNC file names on DOS/Windows. (Bug#4674) +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 Glenn Morris <rgm@gnu.org> * ps-print.el (ps-line-lengths-internal, ps-nb-pages): diff --git a/lisp/epg.el b/lisp/epg.el index 9fde76d5f85..ad172dfbdcd 100644 --- a/lisp/epg.el +++ b/lisp/epg.el @@ -66,7 +66,7 @@ (defconst epg-digest-algorithm-alist '((1 . "MD5") (2 . "SHA1") - (3 . "RMD160") + (3 . "RIPEMD160") (8 . "SHA256") (9 . "SHA384") (10 . "SHA512") @@ -335,7 +335,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) |