From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Teemu Likonen Newsgroups: gmane.emacs.devel Subject: [PATCH] Update epg.el algorithm id-name association lists Date: Sat, 22 Jun 2019 09:48:38 +0300 Message-ID: <87d0j6xghl.fsf@iki.fi> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="208040"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2.90 (gnu/linux) Cc: ueno@unixuser.org, mwolson@gnu.org To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jun 22 08:49:05 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1heZph-000ryR-70 for ged-emacs-devel@m.gmane.org; Sat, 22 Jun 2019 08:49:05 +0200 Original-Received: from localhost ([::1]:39166 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heZpf-0004pL-TK for ged-emacs-devel@m.gmane.org; Sat, 22 Jun 2019 02:49:03 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:60780) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heZpa-0004pD-Hn for emacs-devel@gnu.org; Sat, 22 Jun 2019 02:48:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1heZpZ-0003aR-6S for emacs-devel@gnu.org; Sat, 22 Jun 2019 02:48:58 -0400 Original-Received: from mail.kapsi.fi ([2001:67c:1be8::25]:42683) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1heZpW-0003Gj-O5; Sat, 22 Jun 2019 02:48:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kapsi.fi; s=20161220; h=Content-Type:MIME-Version:Message-ID:Date:Subject:Cc:To:From: Sender:Reply-To:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=fNBBDjV0lh8V5pG/oI5z07AMjJH+066E26h0Ai/ESZY=; b=z6l9vZaRAwCFT2FSk7NcFMBRFf lhDNgpQu/sKxp6/yOjdOyN6ZF+uUCbs8WlQMd+JMPw7/gE+P1KRBH52C3E+uF9k1SuizsvbM7Th3D 3PDw6jJO/OT9BccSOucz91ghN2OipWepavHMybkH+j6DiVhdtk6XmRcGgWX6XfIXZLoTTUa1hAsZ4 7f/6JG5so+5iCTojXtdxYQYFaOYcpB+NMrmiGRaPkSRNDOGL7oht8Il331YTHtdOr/UXEABwONpfi Wge1qdfBjm9vVtBGpr/de2F/hZhPknEC4WnyupW9eZW7zHrt28g9XN5O7ikRESgKfoJfCDdbkIUsv l1Z+QUYQ==; Original-Received: from mobile-access-bceec9-26.dhcp.inet.fi ([188.238.201.26] helo=mithlond) by mail.kapsi.fi with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1heZpH-0006cT-TS; Sat, 22 Jun 2019 09:48:40 +0300 X-SA-Exim-Connect-IP: 188.238.201.26 X-SA-Exim-Mail-From: tlikonen@iki.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:67c:1be8::25 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:238019 Archived-At: --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Add some new algorithm identifier numbers and names to the following defconst definitions in file epg.el: epg-cipher-algorithm-alist epg-pubkey-algorithm-alist epg-digest-algorithm-alist epg-compress-algorithm-alist The identifiers come from GnuPG (The GNU Privacy Guard) source code file "common/openpgpdefs.h". The relevant parts are quoted below. typedef enum { CIPHER_ALGO_NONE =3D 0, CIPHER_ALGO_IDEA =3D 1, CIPHER_ALGO_3DES =3D 2, CIPHER_ALGO_CAST5 =3D 3, CIPHER_ALGO_BLOWFISH =3D 4, /* 128 bit */ /* 5 & 6 are reserved */ CIPHER_ALGO_AES =3D 7, CIPHER_ALGO_AES192 =3D 8, CIPHER_ALGO_AES256 =3D 9, CIPHER_ALGO_TWOFISH =3D 10, /* 256 bit */ CIPHER_ALGO_CAMELLIA128 =3D 11, CIPHER_ALGO_CAMELLIA192 =3D 12, CIPHER_ALGO_CAMELLIA256 =3D 13, CIPHER_ALGO_PRIVATE10 =3D 110 } cipher_algo_t; [...] typedef enum { PUBKEY_ALGO_RSA =3D 1, PUBKEY_ALGO_RSA_E =3D 2, /* RSA encrypt only (legacy). */ PUBKEY_ALGO_RSA_S =3D 3, /* RSA sign only (legacy). */ PUBKEY_ALGO_ELGAMAL_E =3D 16, /* Elgamal encrypt only. */ PUBKEY_ALGO_DSA =3D 17, PUBKEY_ALGO_ECDH =3D 18, /* RFC-6637 */ PUBKEY_ALGO_ECDSA =3D 19, /* RFC-6637 */ PUBKEY_ALGO_ELGAMAL =3D 20, /* Elgamal encrypt+sign (legacy). = */ /* 21 reserved by OpenPGP. */ PUBKEY_ALGO_EDDSA =3D 22, /* EdDSA (not yet assigned). = */ PUBKEY_ALGO_PRIVATE10 =3D 110 } pubkey_algo_t; typedef enum { DIGEST_ALGO_MD5 =3D 1, DIGEST_ALGO_SHA1 =3D 2, DIGEST_ALGO_RMD160 =3D 3, /* 4, 5, 6, and 7 are reserved. */ DIGEST_ALGO_SHA256 =3D 8, DIGEST_ALGO_SHA384 =3D 9, DIGEST_ALGO_SHA512 =3D 10, DIGEST_ALGO_SHA224 =3D 11, DIGEST_ALGO_PRIVATE10 =3D 110 } digest_algo_t; typedef enum { COMPRESS_ALGO_NONE =3D 0, COMPRESS_ALGO_ZIP =3D 1, COMPRESS_ALGO_ZLIB =3D 2, COMPRESS_ALGO_BZIP2 =3D 3, COMPRESS_ALGO_PRIVATE10 =3D 110 } compress_algo_t; =2D-- lisp/epg.el | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/lisp/epg.el b/lisp/epg.el index 0400716845..e8bdd1536f 100644 =2D-- a/lisp/epg.el +++ b/lisp/epg.el @@ -41,7 +41,7 @@ epg-debug-buffer (defvar epg-agent-file nil) (defvar epg-agent-mtime nil) =20 =2D;; from gnupg/include/cipher.h +;; from gnupg/common/openpgpdefs.h (defconst epg-cipher-algorithm-alist '((0 . "NONE") (1 . "IDEA") @@ -56,16 +56,20 @@ epg-cipher-algorithm-alist (12 . "CAMELLIA256") (110 . "DUMMY"))) =20 =2D;; 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") =2D (20 . "ELGAMAL"))) + (18 . "ECDH") + (19 . "ECDSA") + (20 . "ELGAMAL") + (22 . "EDDSA") + (110 . "PRIVATE10"))) =20 =2D;; from gnupg/include/cipher.h +;; from gnupg/common/openpgpdefs.h (defconst epg-digest-algorithm-alist '((1 . "MD5") (2 . "SHA1") @@ -73,14 +77,16 @@ epg-digest-algorithm-alist (8 . "SHA256") (9 . "SHA384") (10 . "SHA512") =2D (11 . "SHA224"))) + (11 . "SHA224") + (110 . "PRIVATE10"))) =20 =2D;; from gnupg/include/cipher.h +;; from gnupg/common/openpgpdefs.h (defconst epg-compress-algorithm-alist '((0 . "NONE") (1 . "ZIP") (2 . "ZLIB") =2D (3 . "BZIP2"))) + (3 . "BZIP2") + (110 . "PRIVATE10"))) =20 (defconst epg-invalid-recipients-reason-alist '((0 . "No specific reason given") =2D-=20 2.11.0 =2D-=20 /// Teemu Likonen // // PGP: 4E1055DC84E9DFF613D78557719D69D324539450 /// --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEkhZiiC54Bnj5a16Skzo1BB5+rVEFAl0Nz0YACgkQkzo1BB5+ rVHn+wgAnSx9lB4h71RNaaNjExo/Hu73gb73PR31udEa72voVcXsX+6fQN3iWzKU okkcN+svReELfFFdgJYLoRlqvXoypr/H/D3Axt9hQzRkjlg/pJ8AhbBpbQeYcumK GD3f+0L3qmhm6lzpxWr9dPkUcMswQkNn8i3NYqyB0jzBwSp6VUeyk9ICQpn00vkg 3kcbdOMnrUdwWaFCoEnexY2f9QRy9PBRaRFftwW6izfhwUDn3gtSPqo5Y0zr1TqY fmKZGZ/P+obTFcEry0lUmgYsmXREBXA95NzoMD1uwHT+z0aaqKmYNAv9IvgRbsEP sfSob3Wf9RqPU2BitJu5pNhd/MaFvQ== =F0Kh -----END PGP SIGNATURE----- --=-=-=--