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. --- common/openpgp-oid.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'common/openpgp-oid.c') diff --git a/common/openpgp-oid.c b/common/openpgp-oid.c index 7a758016b..676079cde 100644 --- a/common/openpgp-oid.c +++ b/common/openpgp-oid.c @@ -332,7 +332,7 @@ openpgp_curve_to_oid (const char *name, unsigned int *r_nbits) } -/* Map an OpenPGP OID to the Libgcrypt curve NAME. Returns "?" for +/* Map an OpenPGP OID to the Libgcrypt curve NAME. Returns NULL for unknown curve names. We prefer an alias name here which is more suitable for printing. */ const char * @@ -341,13 +341,13 @@ openpgp_oid_to_curve (const char *oidstr) int i; if (!oidstr) - return ""; + return NULL; for (i=0; oidtable[i].name; i++) if (!strcmp (oidtable[i].oidstr, oidstr)) return oidtable[i].alias? oidtable[i].alias : oidtable[i].name; - return "?"; + return NULL; } -- cgit v1.2.3