From 874ef16e70ab750db7b153f17a7e859a0db6a2f1 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 7 May 2015 12:01:12 +0200 Subject: 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 --- g10/keyid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g10/keyid.c') 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"); -- cgit v1.2.3