aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/epg.el20
1 files changed, 13 insertions, 7 deletions
diff --git a/lisp/epg.el b/lisp/epg.el
index 0400716845c..e8bdd1536ff 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -41,7 +41,7 @@
41(defvar epg-agent-file nil) 41(defvar epg-agent-file nil)
42(defvar epg-agent-mtime nil) 42(defvar epg-agent-mtime nil)
43 43
44;; from gnupg/include/cipher.h 44;; from gnupg/common/openpgpdefs.h
45(defconst epg-cipher-algorithm-alist 45(defconst epg-cipher-algorithm-alist
46 '((0 . "NONE") 46 '((0 . "NONE")
47 (1 . "IDEA") 47 (1 . "IDEA")
@@ -56,16 +56,20 @@
56 (12 . "CAMELLIA256") 56 (12 . "CAMELLIA256")
57 (110 . "DUMMY"))) 57 (110 . "DUMMY")))
58 58
59;; from gnupg/include/cipher.h 59;; from gnupg/common/openpgpdefs.h
60(defconst epg-pubkey-algorithm-alist 60(defconst epg-pubkey-algorithm-alist
61 '((1 . "RSA") 61 '((1 . "RSA")
62 (2 . "RSA_E") 62 (2 . "RSA_E")
63 (3 . "RSA_S") 63 (3 . "RSA_S")
64 (16 . "ELGAMAL_E") 64 (16 . "ELGAMAL_E")
65 (17 . "DSA") 65 (17 . "DSA")
66 (20 . "ELGAMAL"))) 66 (18 . "ECDH")
67 (19 . "ECDSA")
68 (20 . "ELGAMAL")
69 (22 . "EDDSA")
70 (110 . "PRIVATE10")))
67 71
68;; from gnupg/include/cipher.h 72;; from gnupg/common/openpgpdefs.h
69(defconst epg-digest-algorithm-alist 73(defconst epg-digest-algorithm-alist
70 '((1 . "MD5") 74 '((1 . "MD5")
71 (2 . "SHA1") 75 (2 . "SHA1")
@@ -73,14 +77,16 @@
73 (8 . "SHA256") 77 (8 . "SHA256")
74 (9 . "SHA384") 78 (9 . "SHA384")
75 (10 . "SHA512") 79 (10 . "SHA512")
76 (11 . "SHA224"))) 80 (11 . "SHA224")
81 (110 . "PRIVATE10")))
77 82
78;; from gnupg/include/cipher.h 83;; from gnupg/common/openpgpdefs.h
79(defconst epg-compress-algorithm-alist 84(defconst epg-compress-algorithm-alist
80 '((0 . "NONE") 85 '((0 . "NONE")
81 (1 . "ZIP") 86 (1 . "ZIP")
82 (2 . "ZLIB") 87 (2 . "ZLIB")
83 (3 . "BZIP2"))) 88 (3 . "BZIP2")
89 (110 . "PRIVATE10")))
84 90
85(defconst epg-invalid-recipients-reason-alist 91(defconst epg-invalid-recipients-reason-alist
86 '((0 . "No specific reason given") 92 '((0 . "No specific reason given")