diff options
| author | Werner Koch <[email protected]> | 2019-05-21 10:54:47 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2019-05-21 11:02:32 +0000 |
| commit | 126caa34bbdb36f40514643b9d6f5ead3240c735 (patch) | |
| tree | e1e5d503bb731e773dfd19543c732b3704ef874f /g10/card-util.c | |
| parent | scd: Fix for SCARD_IO_REQUEST structure. (diff) | |
| download | gnupg-126caa34bbdb36f40514643b9d6f5ead3240c735.tar.gz gnupg-126caa34bbdb36f40514643b9d6f5ead3240c735.zip | |
gpg: Unify the the use of the print_pubkey_info functions.
* g10/keylist.c (format_seckey_info): Remove.
(print_pubkey_info, print_seckey_info): Remove.
(format_key_info): New.
(print_key_info): New.
(print_key_info_log): New.
* g10/card-util.c (current_card_status): Use print_key_info and remove
the useless condition on KEYBLOCK.
* g10/delkey.c (do_delete_key): Replace print_pubkey_info and
print_seckey_info by print_key_info.
* g10/keyedit.c (menu_addrevoker): Replace print_pubkey_info by
print_key_info.
* g10/pkclist.c (do_we_trust_pre): Ditto.
* g10/revoke.c (gen_desig_revoke): Ditto.
(gen_revoke): Ditto. Also use print_key_info_log instead of separate
functions.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/card-util.c')
| -rw-r--r-- | g10/card-util.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/g10/card-util.c b/g10/card-util.c index 7e329bb6b..1b9461e0a 100644 --- a/g10/card-util.c +++ b/g10/card-util.c @@ -680,9 +680,8 @@ current_card_status (ctrl_t ctrl, estream_t fp, if ( thefpr && !fpr_is_ff (thefpr, thefprlen) && !get_pubkey_byfprint (ctrl, pk, &keyblock, thefpr, thefprlen)) { - print_pubkey_info (ctrl, fp, pk); - if (keyblock) - print_card_key_info (fp, keyblock); + print_key_info (ctrl, fp, 0, pk, 0); + print_card_key_info (fp, keyblock); } else tty_fprintf (fp, "[none]\n"); |