diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2019-06-22 12:16:08 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2019-06-22 12:16:08 +0300 |
| commit | 4daccefa85e37ded2e6b399c82f92f23d129c7f8 (patch) | |
| tree | 37108329aa22d9c0477b459055eea8cab16bc71f | |
| parent | 5a969365203cadd04fa7dc62e638bbcca88b9885 (diff) | |
| parent | bdf1441f13b969d291b9df132bd522c1f54802d5 (diff) | |
| download | emacs-4daccefa85e37ded2e6b399c82f92f23d129c7f8.tar.gz | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
| -rw-r--r-- | lisp/epg.el | 20 |
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 @@ (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") |