From a6e40530898622fbc5d76557a7da5e69368ecaa4 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Thu, 6 Aug 2015 16:44:03 +0900 Subject: common: extend API of openpgp_oid_to_curve for canonical name. * common/openpgp-oid.c (openpgp_oid_to_curve): Add CANON argument. * common/util.h: Update. * g10/import.c (transfer_secret_keys): Follow the change. * g10/keyid.c (pubkey_string): Likewise. * g10/keylist.c (list_keyblock_print, list_keyblock_colon): Likewise. * parse-packet.c (parse_key): Likewise. * scd/app-openpgp.c (send_key_attr, get_public_key): Likewise. -- Change the function so that caller can select canonical name of curve or name for printing. Suggested by wk. --- g10/parse-packet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g10/parse-packet.c') diff --git a/g10/parse-packet.c b/g10/parse-packet.c index 6131d3277..478612a49 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -2086,7 +2086,7 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen, || algorithm == PUBKEY_ALGO_ECDH) && i==0) { char *curve = openpgp_oid_to_str (pk->pkey[0]); - const char *name = openpgp_oid_to_curve (curve); + const char *name = openpgp_oid_to_curve (curve, 0); es_fprintf (listfp, " %s (%s)", name?name:"", curve); xfree (curve); } -- cgit v1.2.3