summaryrefslogtreecommitdiff
path: root/lisp/gnus/pgg-parse.el
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2005-08-07 23:56:33 +0000
committerMiles Bader <miles@gnu.org>2005-08-07 23:56:33 +0000
commitbcc7dd61345b60c5a16ef3caaa96a878d1edbd45 (patch)
tree0b555d00ad849f787648d31dcbbfa61a379d19a4 /lisp/gnus/pgg-parse.el
parent8b6a95513d11162055cf1cdf7eb9a4a2ade5f1c3 (diff)
downloademacs-bcc7dd61345b60c5a16ef3caaa96a878d1edbd45.tar.gz
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-515
Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 104) - Update from CVS 2005-08-05 Daiki Ueno <ueno@unixuser.org> * lisp/gnus/mml2015.el (mml2015-pgg-sign): Make sure micalg is correct. * lisp/gnus/pgg-parse.el (pgg-parse-hash-algorithm-alist): Add SHA-2. 2005-08-06 Romain Francoise <romain@orebokech.com> * lisp/gnus/message.el: Fix typo in docstring. 2005-07-16 Romain Francoise <romain@orebokech.com> * lisp/gnus/gnus-uu.el (gnus-uu-save-article): Use `message-make-date' instead of `current-time-string' as the latter creates a time string that is not RFC 2822 compliant (it lacks the zone).
Diffstat (limited to 'lisp/gnus/pgg-parse.el')
-rw-r--r--lisp/gnus/pgg-parse.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/gnus/pgg-parse.el b/lisp/gnus/pgg-parse.el
index d0987659b96..26b48e2f141 100644
--- a/lisp/gnus/pgg-parse.el
+++ b/lisp/gnus/pgg-parse.el
@@ -58,7 +58,8 @@
(cons (sexp :tag "Number") (sexp :tag "Type"))))
(defcustom pgg-parse-hash-algorithm-alist
- '((1 . MD5) (2 . SHA1) (3 . RIPEMD160) (5 . MD2))
+ '((1 . MD5) (2 . SHA1) (3 . RIPEMD160) (5 . MD2) (8 . SHA256) (9 . SHA384)
+ (10 . SHA512))
"Alist of the assigned number to the cryptographic hash algorithm."
:group 'pgg-parse
:type '(repeat