diff options
| author | Werner Koch <[email protected]> | 2015-05-07 10:01:12 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-05-07 10:12:41 +0000 |
| commit | 874ef16e70ab750db7b153f17a7e859a0db6a2f1 (patch) | |
| tree | 6dd9d2fba7ba5be68ee547a6ae5699ae9e4e941f /g10/keyid.c | |
| parent | gpg: Fix regression not displaying the card serial number (diff) | |
| download | gnupg-874ef16e70ab750db7b153f17a7e859a0db6a2f1.tar.gz gnupg-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 <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | g10/keyid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/keyid.c b/g10/keyid.c index a0571b03b..90d982ecf 100644 --- a/g10/keyid.c +++ b/g10/keyid.c @@ -463,7 +463,7 @@ keyid_from_fingerprint( const byte *fprint, size_t fprint_len, u32 *keyid ) int rc; memset (&pk, 0, sizeof pk); - rc = get_pubkey_byfprint (&pk, fprint, fprint_len); + rc = get_pubkey_byfprint (&pk, NULL, fprint, fprint_len); if( rc ) { log_error("Oops: keyid_from_fingerprint: no pubkey\n"); |