summaryrefslogtreecommitdiffstats
path: root/common/openpgp-oid.c
diff options
context:
space:
mode:
authorNIIBE Yutaka <gniibe@fsij.org>2021-03-22 08:57:18 +0100
committerNIIBE Yutaka <gniibe@fsij.org>2021-03-22 08:57:18 +0100
commit1524a942b645d9facbedd9ed4a472e343838b6a1 (patch)
tree9d8c98f413d9da168c5bcd1b9f743f1fa2818f0f /common/openpgp-oid.c
parentgpg: Fix exporting SSH key. (diff)
downloadgnupg2-1524a942b645d9facbedd9ed4a472e343838b6a1.tar.xz
gnupg2-1524a942b645d9facbedd9ed4a472e343838b6a1.zip
gpg: Support exporting Ed448 SSH key.
* common/openpgp-oid.c (oid_ed448, openpgp_oidbuf_is_ed448): New. (openpgp_oid_is_ed448): New. * common/util.h (openpgp_oid_is_ed448): New. * g10/export.c (export_one_ssh_key): Support Ed448 key. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to 'common/openpgp-oid.c')
-rw-r--r--common/openpgp-oid.c28
1 files changed, 28 insertions, 0 deletions
diff --git a/common/openpgp-oid.c b/common/openpgp-oid.c
index ded7b0f7a..0189407f8 100644
--- a/common/openpgp-oid.c
+++ b/common/openpgp-oid.c
@@ -83,6 +83,10 @@ static const char oid_cv25519[] =
*/
static const char oid_cv448[] = { 0x03, 0x2b, 0x65, 0x6f };
+/* The OID for Ed448 in OpenPGP format. */
+static const char oid_ed448[] = { 0x03, 0x2b, 0x65, 0x71 };
+
+
/* A table to store keyalgo strings like "rsa2048 or "ed25519" so that
* we do not need to allocate them. This is currently a simple array
* but may eventually be changed to a fast data structure. Noet that
@@ -346,6 +350,15 @@ openpgp_oidbuf_is_cv25519 (const void *buf, size_t len)
}
+/* Return true if (BUF,LEN) represents the OID for Ed448. */
+static int
+openpgp_oidbuf_is_ed448 (const void *buf, size_t len)
+{
+ return (buf && len == DIM (oid_ed448)
+ && !memcmp (buf, oid_ed448, DIM (oid_ed448)));
+}
+
+
/* Return true if (BUF,LEN) represents the OID for X448. */
static int
openpgp_oidbuf_is_cv448 (const void *buf, size_t len)
@@ -370,6 +383,21 @@ openpgp_oid_is_cv25519 (gcry_mpi_t a)
}
+/* Return true if the MPI A represents the OID for Ed448. */
+int
+openpgp_oid_is_ed448 (gcry_mpi_t a)
+{
+ const unsigned char *buf;
+ unsigned int nbits;
+
+ if (!a || !gcry_mpi_get_flag (a, GCRYMPI_FLAG_OPAQUE))
+ return 0;
+
+ buf = gcry_mpi_get_opaque (a, &nbits);
+ return openpgp_oidbuf_is_ed448 (buf, (nbits+7)/8);
+}
+
+
/* Return true if the MPI A represents the OID for X448. */
int
openpgp_oid_is_cv448 (gcry_mpi_t a)