Commit 4daccefa authored by Eli Zaretskii's avatar Eli Zaretskii

Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

parents 5a969365 bdf1441f
Pipeline #2207 failed with stage
in 90 minutes and 1 second
......@@ -41,7 +41,7 @@
(defvar epg-agent-file nil)
(defvar epg-agent-mtime nil)
;; from gnupg/include/cipher.h
;; from gnupg/common/openpgpdefs.h
(defconst epg-cipher-algorithm-alist
'((0 . "NONE")
(1 . "IDEA")
......@@ -56,16 +56,20 @@
(12 . "CAMELLIA256")
(110 . "DUMMY")))
;; from gnupg/include/cipher.h
;; from gnupg/common/openpgpdefs.h
(defconst epg-pubkey-algorithm-alist
'((1 . "RSA")
(2 . "RSA_E")
(3 . "RSA_S")
(16 . "ELGAMAL_E")
(17 . "DSA")
(20 . "ELGAMAL")))
(18 . "ECDH")
(19 . "ECDSA")
(20 . "ELGAMAL")
(22 . "EDDSA")
(110 . "PRIVATE10")))
;; from gnupg/include/cipher.h
;; from gnupg/common/openpgpdefs.h
(defconst epg-digest-algorithm-alist
'((1 . "MD5")
(2 . "SHA1")
......@@ -73,14 +77,16 @@
(8 . "SHA256")
(9 . "SHA384")
(10 . "SHA512")
(11 . "SHA224")))
(11 . "SHA224")
(110 . "PRIVATE10")))
;; from gnupg/include/cipher.h
;; from gnupg/common/openpgpdefs.h
(defconst epg-compress-algorithm-alist
'((0 . "NONE")
(1 . "ZIP")
(2 . "ZLIB")
(3 . "BZIP2")))
(3 . "BZIP2")
(110 . "PRIVATE10")))
(defconst epg-invalid-recipients-reason-alist
'((0 . "No specific reason given")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment