From 5b8593135fa6e88ecc459444ec19b9a824f12a15 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 11 Feb 2020 14:38:03 +0100 Subject: [PATCH] common: Extend the openpgp_curve_to_oid function. * common/openpgp-oid.c (openpgp_curve_to_oid): Add optional arg R_NBITS. Change all callers. -- In particular for ed25519 and cv25519 it is quite useful to have an ability to get the required algorithm. (cherry picked from commit 24095101a5069f15a9aea7512498ac436a76814a) --- common/openpgp-oid.c | 12 ++++++++++-- common/sexputil.c | 2 +- common/util.h | 3 ++- g10/card-util.c | 5 +++-- g10/export.c | 4 ++-- g10/gpg.c | 2 +- g10/keygen.c | 2 +- scd/app-openpgp.c | 8 ++++---- 8 files changed, 24 insertions(+), 14 deletions(-) diff --git a/common/openpgp-oid.c b/common/openpgp-oid.c index 18c5710bd..943fe3ea6 100644 --- a/common/openpgp-oid.c +++ b/common/openpgp-oid.c @@ -337,13 +337,17 @@ openpgp_oid_is_cv25519 (gcry_mpi_t a) /* Map the Libgcrypt ECC curve NAME to an OID. If R_NBITS is not NULL store the bit size of the curve there. Returns NULL for unknown - curve names. */ + curve names. If R_ALGO is not NULL and a specific ECC algorithm is + required for this curve its OpenPGP algorithm number is stored + there; otherwise 0 is stored which indicates that ECDSA or ECDH can + be used. */ const char * -openpgp_curve_to_oid (const char *name, unsigned int *r_nbits) +openpgp_curve_to_oid (const char *name, unsigned int *r_nbits, int *r_algo) { int i; unsigned int nbits = 0; const char *oidstr = NULL; + int algo = 0; if (name) { @@ -353,6 +357,7 @@ openpgp_curve_to_oid (const char *name, unsigned int *r_nbits) { oidstr = oidtable[i].oidstr; nbits = oidtable[i].nbits; + algo = oidtable[i].pubkey_algo; break; } if (!oidtable[i].name) @@ -364,6 +369,7 @@ openpgp_curve_to_oid (const char *name, unsigned int *r_nbits) { oidstr = oidtable[i].oidstr; nbits = oidtable[i].nbits; + algo = oidtable[i].pubkey_algo; break; } } @@ -371,6 +377,8 @@ openpgp_curve_to_oid (const char *name, unsigned int *r_nbits) if (r_nbits) *r_nbits = nbits; + if (r_algo) + *r_algo = algo; return oidstr; } diff --git a/common/sexputil.c b/common/sexputil.c index 4e091b34b..3c5abbe16 100644 --- a/common/sexputil.c +++ b/common/sexputil.c @@ -1095,7 +1095,7 @@ pubkey_algo_string (gcry_sexp_t s_pkey, enum gcry_pk_algos *r_algoid) { const char *curve = gcry_pk_get_curve (s_pkey, 0, NULL); const char *name = openpgp_oid_to_curve - (openpgp_curve_to_oid (curve, NULL), 0); + (openpgp_curve_to_oid (curve, NULL, NULL), 0); if (name) result = xtrystrdup (name); diff --git a/common/util.h b/common/util.h index f53c5d2a7..f0933888d 100644 --- a/common/util.h +++ b/common/util.h @@ -244,7 +244,8 @@ int openpgp_oidbuf_is_ed25519 (const void *buf, size_t len); int openpgp_oid_is_ed25519 (gcry_mpi_t a); int openpgp_oidbuf_is_cv25519 (const void *buf, size_t len); int openpgp_oid_is_cv25519 (gcry_mpi_t a); -const char *openpgp_curve_to_oid (const char *name, unsigned int *r_nbits); +const char *openpgp_curve_to_oid (const char *name, + unsigned int *r_nbits, int *r_algo); const char *openpgp_oid_to_curve (const char *oid, int canon); const char *openpgp_enum_curves (int *idxp); const char *openpgp_is_curve_supported (const char *name, diff --git a/g10/card-util.c b/g10/card-util.c index 8a5ab28dc..d9716a700 100644 --- a/g10/card-util.c +++ b/g10/card-util.c @@ -586,7 +586,8 @@ current_card_status (ctrl_t ctrl, estream_t fp, if (info.key_attr[i].curve) { const char *oid; - oid = openpgp_curve_to_oid (info.key_attr[i].curve, NULL); + oid = openpgp_curve_to_oid (info.key_attr[i].curve, + NULL, NULL); if (oid) curve_for_print = openpgp_oid_to_curve (oid, 0); } @@ -1489,7 +1490,7 @@ ask_card_keyattr (int keyno, const struct key_attr *current) if (curve) { key_attr->algo = algo; - oid_str = openpgp_curve_to_oid (curve, NULL); + oid_str = openpgp_curve_to_oid (curve, NULL, NULL); key_attr->curve = openpgp_oid_to_curve (oid_str, 0); } else diff --git a/g10/export.c b/g10/export.c index 8dd0b07d7..e98af59c0 100644 --- a/g10/export.c +++ b/g10/export.c @@ -567,7 +567,7 @@ match_curve_skey_pk (gcry_sexp_t s_key, PKT_public_key *pk) log_error ("no curve name\n"); return gpg_error (GPG_ERR_UNKNOWN_CURVE); } - oidstr = openpgp_curve_to_oid (curve_str, NULL); + oidstr = openpgp_curve_to_oid (curve_str, NULL, NULL); if (!oidstr) { log_error ("no OID known for curve '%s'\n", curve_str); @@ -1073,7 +1073,7 @@ transfer_format_to_openpgp (gcry_sexp_t s_pgp, PKT_public_key *pk) goto leave; } - oidstr = openpgp_curve_to_oid (curve, NULL); + oidstr = openpgp_curve_to_oid (curve, NULL, NULL); if (!oidstr) { log_error ("no OID known for curve '%s'\n", curve); diff --git a/g10/gpg.c b/g10/gpg.c index 08455fecb..2699bc05a 100644 --- a/g10/gpg.c +++ b/g10/gpg.c @@ -1850,7 +1850,7 @@ list_config(char *items) es_printf ("cfg:curveoid:"); for (iter=0, first=1; (s = openpgp_enum_curves (&iter)); first = 0) { - s = openpgp_curve_to_oid (s, NULL); + s = openpgp_curve_to_oid (s, NULL, NULL); es_printf ("%s%s", first?"":";", s? s:"[?]"); } es_printf ("\n"); diff --git a/g10/keygen.c b/g10/keygen.c index d50acf8ad..5d8cccb63 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -1160,7 +1160,7 @@ ecckey_from_sexp (gcry_mpi_t *array, gcry_sexp_t sexp, int algo) goto leave; } gcry_sexp_release (l2); - oidstr = openpgp_curve_to_oid (curve, &nbits); + oidstr = openpgp_curve_to_oid (curve, &nbits, NULL); if (!oidstr) { /* That can't happen because we used one of the curves diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c index 5a7361f73..efd8d79bb 100644 --- a/scd/app-openpgp.c +++ b/scd/app-openpgp.c @@ -1504,7 +1504,7 @@ ecdh_params (const char *curve) { unsigned int nbits; - openpgp_curve_to_oid (curve, &nbits); + openpgp_curve_to_oid (curve, &nbits, NULL); /* See RFC-6637 for those constants. 0x03: Number of bytes @@ -1545,7 +1545,7 @@ ecc_read_pubkey (app_t app, ctrl_t ctrl, u32 created_at, int keyno, } curve = app->app_local->keyattr[keyno].ecc.curve; - oidstr = openpgp_curve_to_oid (curve, NULL); + oidstr = openpgp_curve_to_oid (curve, NULL, NULL); err = openpgp_oid_from_str (oidstr, &oid); if (err) return err; @@ -3498,7 +3498,7 @@ change_keyattr_from_string (app_t app, const unsigned char *oidbuf; size_t oid_len; - oidstr = openpgp_curve_to_oid (string+n, NULL); + oidstr = openpgp_curve_to_oid (string+n, NULL, NULL); if (!oidstr) { err = gpg_error (GPG_ERR_INV_DATA); @@ -4004,7 +4004,7 @@ ecc_writekey (app_t app, gpg_error_t (*pincb)(void*, const char *, char **), else algo = PUBKEY_ALGO_ECDSA; - oidstr = openpgp_curve_to_oid (curve, &n); + oidstr = openpgp_curve_to_oid (curve, &n, NULL); ecc_d_fixed_len = (n+7)/8; err = openpgp_oid_from_str (oidstr, &oid); if (err)