diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/import.c | 4 | ||||
| -rw-r--r-- | g10/keyid.c | 2 | ||||
| -rw-r--r-- | g10/keylist.c | 6 | ||||
| -rw-r--r-- | g10/parse-packet.c | 4 |
4 files changed, 9 insertions, 7 deletions
diff --git a/g10/import.c b/g10/import.c index de2252069..0a2ebcd46 100644 --- a/g10/import.c +++ b/g10/import.c @@ -1414,7 +1414,9 @@ transfer_secret_keys (ctrl_t ctrl, struct stats_s *stats, kbnode_t sec_keyblock, err = gpg_error_from_syserror (); else { - err = gcry_sexp_build (&curve, NULL, "(curve %s)", curvestr); + const char *curvename = openpgp_oid_to_curve (curvestr); + err = gcry_sexp_build (&curve, NULL, "(curve %s)", + curvename?curvename:curvestr); xfree (curvestr); if (!err) { 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); diff --git a/g10/keylist.c b/g10/keylist.c index d4e572e8b..d81e7dd8b 100644 --- a/g10/keylist.c +++ b/g10/keylist.c @@ -1092,7 +1092,7 @@ list_keyblock_print (KBNODE keyblock, int secret, int fpr, { char *curve = openpgp_oid_to_str (pk2->pkey[0]); const char *name = openpgp_oid_to_curve (curve); - if (!*name || *name == '?') + if (!name) name = curve; es_fprintf (es_stdout, " %s", name); xfree (curve); @@ -1359,7 +1359,7 @@ list_keyblock_colon (KBNODE keyblock, int secret, int has_secret, int fpr) { char *curve = openpgp_oid_to_str (pk->pkey[0]); const char *name = openpgp_oid_to_curve (curve); - if (!*name || *name == '?') + if (!name) name = curve; es_fputs (name, es_stdout); xfree (curve); @@ -1488,7 +1488,7 @@ list_keyblock_colon (KBNODE keyblock, int secret, int has_secret, int fpr) { char *curve = openpgp_oid_to_str (pk->pkey[0]); const char *name = openpgp_oid_to_curve (curve); - if (!*name || *name == '?') + if (!name) name = curve; es_fputs (name, es_stdout); xfree (curve); diff --git a/g10/parse-packet.c b/g10/parse-packet.c index 5116404f8..6131d3277 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -2086,8 +2086,8 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen, || algorithm == PUBKEY_ALGO_ECDH) && i==0) { char *curve = openpgp_oid_to_str (pk->pkey[0]); - es_fprintf (listfp, " %s (%s)", - openpgp_oid_to_curve (curve), curve); + const char *name = openpgp_oid_to_curve (curve); + es_fprintf (listfp, " %s (%s)", name?name:"", curve); xfree (curve); } es_putc ('\n', listfp); |