security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-06-23 21:17:56 +02:00
Code Activity

card: Fix openpgp subkey listing.

Browse Source 
* tools/gpg-card.c (list_one_kinfo): Fix printing of the subkeys.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2020-02-13 14:38:08 +01:00
parent 86312b920a
commit e582d8f5b2
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/gpg-card.c
View File

@ -716,10 +716,10 @@ list_one_kinfo (key_info_t firstkinfo, key_info_t kinfo,
kb->protocol == GNUPG_PROTOCOL_OPENPGP? "OpenPGP" : kb->protocol == GNUPG_PROTOCOL_OPENPGP? "OpenPGP" :
kb->protocol == GNUPG_PROTOCOL_CMS? "X.509" : "?"); kb->protocol == GNUPG_PROTOCOL_CMS? "X.509" : "?");
pubkey = kb->keys; pubkey = kb->keys;
/* If this is not the primary key print the primary key's
* fingerprint or a reference to it. */
if (kb->protocol == GNUPG_PROTOCOL_OPENPGP) if (kb->protocol == GNUPG_PROTOCOL_OPENPGP)
{ {
/* If this is not the primary key print the primary
* key's fingerprint or a reference to it. */
tty_fprintf (fp, " main key .: "); tty_fprintf (fp, " main key .: ");
for (ki=firstkinfo; ki; ki = ki->next) for (ki=firstkinfo; ki; ki = ki->next)
if (pubkey->grip_valid if (pubkey->grip_valid
@ -742,18 +742,22 @@ list_one_kinfo (key_info_t firstkinfo, key_info_t kinfo,
tty_fprintf (fp, "<%s>\n", s); tty_fprintf (fp, "<%s>\n", s);
else else
tty_fprintf (fp, "<Key %s>\n", ki->keyref); tty_fprintf (fp, "<Key %s>\n", ki->keyref);
}
else /* Print the primary key as fallback. */
print_shax_fpr (fp, pubkey->fpr, pubkey->fprlen);
/* Find the primary or subkey of that key. */
for (; pubkey; pubkey = pubkey->next)
if (pubkey->grip_valid
&& !memcmp (kinfo->grip, pubkey->grip, KEYGRIP_LEN))
break;
if (pubkey)
{
tty_fprintf (fp, " fpr ......: "); tty_fprintf (fp, " fpr ......: ");
for (; pubkey; pubkey = pubkey->next)
if (pubkey->grip_valid
&& !memcmp (ki->grip, pubkey->grip, KEYGRIP_LEN))
break;
print_shax_fpr (fp, pubkey->fpr, pubkey->fprlen); print_shax_fpr (fp, pubkey->fpr, pubkey->fprlen);
tty_fprintf (fp, " created ..: %s\n", tty_fprintf (fp, " created ..: %s\n",
isotimestamp (pubkey->created)); isotimestamp (pubkey->created));
} }
else /* Print the primary key as fallback. */
print_shax_fpr (fp, pubkey->fpr, pubkey->fprlen);
} }
for (uid = kb->uids; uid; uid = uid->next) for (uid = kb->uids; uid; uid = uid->next)
{ {