security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-27 20:41:06 +01:00
Code Activity

gpg: Always print the fingerprint in colons mode.

Browse Source 
* g10/keylist.c (list_keyblock_colon): Remove arg FPR.  Always print
fingerprint records.  For secret keys always print keygrip records.
--

The fingerprint should always be used thus we should always print it.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-08-04 15:01:42 +02:00
parent 0c2a745a2b
commit 54a1ed20e2
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/gpg.texi
View File

@ -2378,7 +2378,8 @@ Print the ICAO spelling of the fingerprint in addition to the hex digits.
@item --with-keygrip @item --with-keygrip
@opindex with-keygrip @opindex with-keygrip
Include the keygrip in the key listings. Include the keygrip in the key listings. In @code{--with-colons} mode
this is implicitly enable for secret keys.
@item --with-wkd-hash @item --with-wkd-hash
@opindex with-wkd-hash @opindex with-wkd-hash

12
g10/keylist.c
View File

@ -1175,7 +1175,7 @@ print_revokers (estream_t fp, PKT_public_key * pk)
secret key is available even if SECRET is not set. */ secret key is available even if SECRET is not set. */
static void static void
list_keyblock_colon (ctrl_t ctrl, kbnode_t keyblock, list_keyblock_colon (ctrl_t ctrl, kbnode_t keyblock,
int secret, int has_secret, int fpr) int secret, int has_secret)
{ {
int rc; int rc;
KBNODE kbctx; KBNODE kbctx;
@ -1271,15 +1271,11 @@ list_keyblock_colon (ctrl_t ctrl, kbnode_t keyblock,
es_putc ('\n', es_stdout); es_putc ('\n', es_stdout);
print_revokers (es_stdout, pk); print_revokers (es_stdout, pk);
if (fpr)
print_fingerprint (NULL, pk, 0); print_fingerprint (NULL, pk, 0);
if (opt.with_key_data || opt.with_keygrip)
{
if (hexgrip) if (hexgrip)
es_fprintf (es_stdout, "grp:::::::::%s:\n", hexgrip); es_fprintf (es_stdout, "grp:::::::::%s:\n", hexgrip);
if (opt.with_key_data) if (opt.with_key_data)
print_key_data (pk); print_key_data (pk);
}
for (kbctx = NULL; (node = walk_kbnode (keyblock, &kbctx, 0));) for (kbctx = NULL; (node = walk_kbnode (keyblock, &kbctx, 0));)
{ {
@ -1408,16 +1404,12 @@ list_keyblock_colon (ctrl_t ctrl, kbnode_t keyblock,
} }
es_putc (':', es_stdout); /* End of field 17. */ es_putc (':', es_stdout); /* End of field 17. */
es_putc ('\n', es_stdout); es_putc ('\n', es_stdout);
if (fpr > 1)
print_fingerprint (NULL, pk2, 0); print_fingerprint (NULL, pk2, 0);
if (opt.with_key_data || opt.with_keygrip)
{
if (hexgrip) if (hexgrip)
es_fprintf (es_stdout, "grp:::::::::%s:\n", hexgrip); es_fprintf (es_stdout, "grp:::::::::%s:\n", hexgrip);
if (opt.with_key_data) if (opt.with_key_data)
print_key_data (pk2); print_key_data (pk2);
} }
}
else if (opt.list_sigs && node->pkt->pkttype == PKT_SIGNATURE) else if (opt.list_sigs && node->pkt->pkttype == PKT_SIGNATURE)
{ {
PKT_signature *sig = node->pkt->pkt.signature; PKT_signature *sig = node->pkt->pkt.signature;
@ -1599,7 +1591,7 @@ list_keyblock (ctrl_t ctrl,
reorder_keyblock (keyblock); reorder_keyblock (keyblock);
if (opt.with_colons) if (opt.with_colons)
list_keyblock_colon (ctrl, keyblock, secret, has_secret, fpr); list_keyblock_colon (ctrl, keyblock, secret, has_secret);
else else
list_keyblock_print (ctrl, keyblock, secret, fpr, listctx); list_keyblock_print (ctrl, keyblock, secret, fpr, listctx);