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/import.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/import.c')
| -rw-r--r-- | g10/import.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/g10/import.c b/g10/import.c index 7ba7303b7..9c14e8b4b 100644 --- a/g10/import.c +++ b/g10/import.c @@ -792,6 +792,7 @@ import_one (ctrl_t ctrl, int mod_key = 0; int same_key = 0; int non_self = 0; + char pkstrbuf[PUBKEY_STRING_SIZE]; /* get the key and print some info about it */ node = find_kbnode( keyblock, PKT_PUBLIC_KEY ); @@ -805,9 +806,8 @@ import_one (ctrl_t ctrl, if( opt.verbose && !opt.interactive ) { - log_info( "pub %4u%c/%s %s ", - nbits_from_pk( pk ), - pubkey_letter( pk->pubkey_algo ), + log_info( "pub %s/%s %s ", + pubkey_string (pk, pkstrbuf, sizeof pkstrbuf), keystr_from_pk(pk), datestr_from_pk(pk) ); if (uidnode) print_utf8_buffer (log_get_stream (), @@ -1539,6 +1539,7 @@ import_secret_one (ctrl_t ctrl, const char *fname, KBNODE keyblock, int rc = 0; int nr_prev; kbnode_t pub_keyblock; + char pkstrbuf[PUBKEY_STRING_SIZE]; /* Get the key and print some info about it */ node = find_kbnode (keyblock, PKT_SECRET_KEY); @@ -1552,9 +1553,8 @@ import_secret_one (ctrl_t ctrl, const char *fname, KBNODE keyblock, if (opt.verbose) { - log_info ("sec %4u%c/%s %s ", - nbits_from_pk (pk), - pubkey_letter (pk->pubkey_algo), + log_info ("sec %s/%s %s ", + pubkey_string (pk, pkstrbuf, sizeof pkstrbuf), keystr_from_pk (pk), datestr_from_pk (pk)); if (uidnode) print_utf8_buffer (log_get_stream (), uidnode->pkt->pkt.user_id->name, |