diff options
| author | NIIBE Yutaka <[email protected]> | 2015-07-08 06:05:06 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2015-07-08 06:05:06 +0000 |
| commit | 5b46726931049e060d8fbfa879db7907078a9aed (patch) | |
| tree | 112ddebf6dfa06cc9dae1c194d8a1dc711c4d39c /g10/parse-packet.c | |
| parent | drop long-deprecated gpgsm-gencert.sh (diff) | |
| download | gnupg-5b46726931049e060d8fbfa879db7907078a9aed.tar.gz gnupg-5b46726931049e060d8fbfa879db7907078a9aed.zip | |
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.
Diffstat (limited to '')
| -rw-r--r-- | g10/parse-packet.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |