From f5703994d4692fc310292a93296626f484936b16 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Tue, 8 Oct 2024 14:48:47 +0900 Subject: common,gpg,scd,sm: Use openpgp_oid_or_name_to_curve to get curve. * common/sexputil.c (pubkey_algo_string): Use openpgp_oid_or_name_to_curve. * g10/card-util.c (current_card_status, ask_card_keyattr): Likewise. * scd/app-piv.c (writekey_ecc): Likewise. * sm/fingerprint.c (gpgsm_get_key_algo_info): Likewise. -- Signed-off-by: NIIBE Yutaka --- g10/card-util.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'g10') diff --git a/g10/card-util.c b/g10/card-util.c index 002b26e45..5fd6094fc 100644 --- a/g10/card-util.c +++ b/g10/card-util.c @@ -631,13 +631,7 @@ current_card_status (ctrl_t ctrl, estream_t fp, const char *curve_for_print = "?"; if (info.key_attr[i].curve) - { - const char *oid; - oid = openpgp_curve_to_oid (info.key_attr[i].curve, - NULL, NULL); - if (oid) - curve_for_print = openpgp_oid_to_curve (oid, 0); - } + curve_for_print = openpgp_oid_or_name_to_curve (info.key_attr[i].curve, 0); tty_fprintf (fp, " %s", curve_for_print); } tty_fprintf (fp, "\n"); @@ -1524,7 +1518,6 @@ ask_card_keyattr (int keyno, const struct key_attr *current) else { const char *curve; - const char *oid_str; if (current->algo == PUBKEY_ALGO_RSA) { @@ -1545,8 +1538,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, NULL); - key_attr->curve = openpgp_oid_to_curve (oid_str, 0); + key_attr->curve = openpgp_oid_or_name_to_curve (curve, 0); } else { -- cgit v1.2.3