Mercurial > emacs
comparison lisp/epg.el @ 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 | a3e1f7134e6e |
children | 417b1e4d63cd |
comparison
equal
deleted
inserted
replaced
111790:c27f24c79b6a | 111791:13447eaa1957 |
---|---|
65 | 65 |
66 ;; from gnupg/include/cipher.h | 66 ;; from gnupg/include/cipher.h |
67 (defconst epg-digest-algorithm-alist | 67 (defconst epg-digest-algorithm-alist |
68 '((1 . "MD5") | 68 '((1 . "MD5") |
69 (2 . "SHA1") | 69 (2 . "SHA1") |
70 (3 . "RMD160") | 70 (3 . "RIPEMD160") |
71 (8 . "SHA256") | 71 (8 . "SHA256") |
72 (9 . "SHA384") | 72 (9 . "SHA384") |
73 (10 . "SHA512") | 73 (10 . "SHA512") |
74 (11 . "SHA224"))) | 74 (11 . "SHA224"))) |
75 | 75 |
335 | 335 |
336 PASSPHRASE-CALLBACK is either a function, or a cons-cell whose | 336 PASSPHRASE-CALLBACK is either a function, or a cons-cell whose |
337 car is a function and cdr is a callback data. | 337 car is a function and cdr is a callback data. |
338 | 338 |
339 The function gets three arguments: the context, the key-id in | 339 The function gets three arguments: the context, the key-id in |
340 question, and the callback data (if any)." | 340 question, and the callback data (if any). |
341 | |
342 The callback may not be called if you use GnuPG 2.x, which relies | |
343 on the external program called `gpg-agent' for passphrase query. | |
344 If you really want to intercept passphrase query, consider | |
345 installing GnuPG 1.x _along with_ GnuPG 2.x, which does passphrase | |
346 query by itself and Emacs can intercept them." | |
341 (unless (eq (car-safe context) 'epg-context) | 347 (unless (eq (car-safe context) 'epg-context) |
342 (signal 'wrong-type-argument (list 'epg-context-p context))) | 348 (signal 'wrong-type-argument (list 'epg-context-p context))) |
343 (aset (cdr context) 7 (if (consp passphrase-callback) | 349 (aset (cdr context) 7 (if (consp passphrase-callback) |
344 passphrase-callback | 350 passphrase-callback |
345 (list passphrase-callback)))) | 351 (list passphrase-callback)))) |