From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 11 Sep 2009 22:27:32 +0000 (+0000)
Subject: Add algorithm names.
X-Git-Tag: emacs-pretest-23.1.90~1372
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=138907962d8e70fc7ac0ed8c709dd310cb37550e;p=emacs.git

Add algorithm names.

(epg-cipher-algorithm-alist): Add CAMELLIA.
(epg-digest-algorithm-alist): Add SHA224.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f2792ed6f16..e7b4987b7eb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-11  Daiki Ueno  <ueno@unixuser.org>
+
+	* epg.el (epg-cipher-algorithm-alist): Add CAMELLIA.
+	(epg-digest-algorithm-alist): Add SHA224.
+
 2009-09-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* custom.el (custom-delayed-init-variables): New var.
diff --git a/lisp/epg.el b/lisp/epg.el
index 8481f65b833..f8d72f46cc0 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -49,6 +49,8 @@
     (8 . "AES192")
     (9 . "AES256")
     (10 . "TWOFISH")
+    (11 . "CAMELLIA128")
+    (12 . "CAMELLIA256")
     (110 . "DUMMY")))
 
 ;; from gnupg/include/cipher.h
@@ -67,7 +69,8 @@
     (3 . "RMD160")
     (8 . "SHA256")
     (9 . "SHA384")
-    (10 . "SHA512")))
+    (10 . "SHA512")
+    (11 . "SHA224")))
 
 ;; from gnupg/include/cipher.h
 (defconst epg-compress-algorithm-alist