From 5b46726931049e060d8fbfa879db7907078a9aed Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Wed, 8 Jul 2015 15:05:06 +0900 Subject: g10: Use canonical name for curve. * g10/import.c (transfer_secret_keys): Use canonical name. * common/openpgp-oid.c (openpgp_curve_to_oid): Return NULL on error. * g10/keyid.c (pubkey_string): Follow change of openpgp_curve_to_oid. * g10/keylist.c (list_keyblock_print, list_keyblock_colon): Ditto. * g10/parse-packet.c (parse_key): Ditto. --- g10/keyid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g10/keyid.c') diff --git a/g10/keyid.c b/g10/keyid.c index 90d982ecf..6b6f67020 100644 --- a/g10/keyid.c +++ b/g10/keyid.c @@ -121,7 +121,7 @@ pubkey_string (PKT_public_key *pk, char *buffer, size_t bufsize) char *curve = openpgp_oid_to_str (pk->pkey[0]); const char *name = openpgp_oid_to_curve (curve); - if (*name && *name != '?') + if (name) snprintf (buffer, bufsize, "%s", name); else if (curve) snprintf (buffer, bufsize, "E_%s", curve); -- cgit v1.2.3