diff options
| author | Werner Koch <wk@gnupg.org> | 2014-02-05 10:37:59 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2014-02-05 10:37:59 +0100 |
| commit | 2c814806d759e5cf611200e8210137cf8502a672 (patch) | |
| tree | 1622ede2fc1375c9489031b8d5e598d3e6d8bcc8 /g10/pkclist.c | |
| parent | gpg: Add configure options to disable algorithms (diff) | |
| download | gnupg2-2c814806d759e5cf611200e8210137cf8502a672.tar.xz gnupg2-2c814806d759e5cf611200e8210137cf8502a672.zip | |
gpg: Change format for the key size in --list-key and --edit-key.
* g10/gpg.c (oLegacyListMode, opts, main): Add --legacy-list-mode.
* g10/options.h (struct opt): Add field legacy_list_mode.
* g10/keydb.h (PUBKEY_STRING_SIZE): New.
* g10/keyid.c (pubkey_string): New.
* g10/import.c (import_one, import_secret_one): Use pubkey_string.
* g10/keylist.c (print_seckey_info): Ditto.
(print_pubkey_info, print_card_key_info): Ditto.
(list_keyblock_print): Ditto.
* g10/mainproc.c (list_node): Ditto.
* g10/pkclist.c (do_edit_ownertrust, build_pk_list): Ditto.
* g10/keyedit.c (show_key_with_all_names): Ditto. Also change the
format.
(show_basic_key_info): Ditto.
* common/openpgp-oid.c (openpgp_curve_to_oid): Also allow "ed25519".
(openpgp_oid_to_curve): Downcase "ed25519"
--
For ECC it seems to be better to show the name of the curve and not
just the size of the prime field. The curve name does not anymore fit
into the "<size><letter>" descriptor (e.g. "2048R") and a fixed length
format does not work either. Thus the new format uses
"rsa2048" - RSA with 2048 bit
"elg1024" - Elgamal with 1024 bit
"ed25519" - ECC using the curve Ed25519.
"E_1.2.3.4" - ECC using the unsupported curve with OID "1.2.3.4".
unless --legacy-list-mode is given. In does not anymore line up
nicely in columns thus I expect further changes to this new format.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/pkclist.c')
| -rw-r--r-- | g10/pkclist.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/g10/pkclist.c b/g10/pkclist.c index e1a44289c..d94f59e11 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -188,6 +188,7 @@ do_edit_ownertrust (PKT_public_key *pk, int mode, int min_num; int did_help=defer_help; unsigned int minimum=get_min_ownertrust(pk); + char pkstrbuf[PUBKEY_STRING_SIZE]; switch(minimum) { @@ -221,8 +222,8 @@ do_edit_ownertrust (PKT_public_key *pk, int mode, KBNODE keyblock, un; tty_printf(_("No trust value assigned to:\n")); - tty_printf("%4u%c/%s %s\n",nbits_from_pk( pk ), - pubkey_letter( pk->pubkey_algo ), + tty_printf("%s/%s %s\n", + pubkey_string (pk, pkstrbuf, sizeof pkstrbuf), keystr(keyid), datestr_from_pk( pk ) ); p=get_user_id_native(keyid); tty_printf(_(" \"%s\"\n"),p); @@ -893,6 +894,7 @@ build_pk_list (ctrl_t ctrl, int any_recipients=0; strlist_t rov,remusr; char *def_rec = NULL; + char pkstrbuf[PUBKEY_STRING_SIZE]; /* Try to expand groups if any have been defined. */ if (opt.grouplist) @@ -1027,11 +1029,11 @@ build_pk_list (ctrl_t ctrl, u32 keyid[2]; keyid_from_pk(iter->pk,keyid); - tty_printf("%4u%c/%s %s \"", - nbits_from_pk(iter->pk), - pubkey_letter(iter->pk->pubkey_algo), - keystr(keyid), - datestr_from_pk(iter->pk)); + tty_printf ("%s/%s %s \"", + pubkey_string (iter->pk, + pkstrbuf, sizeof pkstrbuf), + keystr(keyid), + datestr_from_pk (iter->pk)); if (iter->pk->user_id) tty_print_utf8_string(iter->pk->user_id->name, |