security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

g10: Use canonical name for curve.

Browse source 
* 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.
This commit is contained in:
NIIBE Yutaka 2015-07-08 15:05:06 +09:00
parent 1be2cebf7f
commit 5b46726931
5 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/openpgp-oid.c
View file

@ -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;
}