diff options
| author | Werner Koch <wk@gnupg.org> | 2015-05-07 12:01:12 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2015-05-07 12:12:41 +0200 |
| commit | 874ef16e70ab750db7b153f17a7e859a0db6a2f1 (patch) | |
| tree | 6dd9d2fba7ba5be68ee547a6ae5699ae9e4e941f /g10/revoke.c | |
| parent | gpg: Fix regression not displaying the card serial number (diff) | |
| download | gnupg2-874ef16e70ab750db7b153f17a7e859a0db6a2f1.tar.xz gnupg2-874ef16e70ab750db7b153f17a7e859a0db6a2f1.zip | |
gpg: Improve 'General key info' line of --card-status.
* g10/keylist.c (print_pubkey_info): Print either "pub" or "sub".
* g10/getkey.c (get_pubkey_byfprint): Add optional arg R_KEYBLOCK.
* g10/keyid.c (keyid_from_fingerprint): Adjust for change.
* g10/revoke.c (gen_desig_revoke): Adjust for change.
* g10/card-util.c (card_status): Simplify by using new arg. Align
card-no string.
* g10/card-util.c (card_status): Remove not used GnuPG-1 code.
--
This now prints "sub" if the first used card key is actually a subkey.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/revoke.c')
| -rw-r--r-- | g10/revoke.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/revoke.c b/g10/revoke.c index 15d28b0bd..6680ac709 100644 --- a/g10/revoke.c +++ b/g10/revoke.c @@ -291,7 +291,7 @@ gen_desig_revoke( const char *uname, strlist_t locusr ) else { pk2 = xmalloc_clear (sizeof *pk2); - rc = get_pubkey_byfprint (pk2, + rc = get_pubkey_byfprint (pk2, NULL, pk->revkey[i].fpr, MAX_FINGERPRINT_LEN); } |