1
0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00

Print the hash algorithm in colon mode key listing.

* g10/keylist.c (list_keyblock_colon): Print digest_algo.
This commit is contained in:
Werner Koch 2012-05-24 10:13:39 +02:00
parent 3f75b9ca00
commit a4b22d8edf
3 changed files with 13 additions and 11 deletions

2
NEWS
View File

@ -1,6 +1,8 @@
Noteworthy changes in version 2.0.20 (unreleased) Noteworthy changes in version 2.0.20 (unreleased)
------------------------------------------------- -------------------------------------------------
* The hash algorithm is now printed for sig records in key listings.
Noteworthy changes in version 2.0.19 (2012-03-27) Noteworthy changes in version 2.0.19 (2012-03-27)
------------------------------------------------- -------------------------------------------------

View File

@ -3,8 +3,8 @@ Format of colon listings
======================== ========================
First an example: First an example:
$ gpg --fixed-list-mode --with-colons --list-keys \ $ gpg --with-colons --list-keys \
--with-fingerprint --with-fingerprint wk@gnupg.org --with-fingerprint --with-fingerprint wk@gnupg.org
pub:f:1024:17:6C7EE1B8621CC013:899817715:1055898235::m:::scESC: pub:f:1024:17:6C7EE1B8621CC013:899817715:1055898235::m:::scESC:
fpr:::::::::ECAF7590EB3443B5C7CF3ACB6C7EE1B8621CC013: fpr:::::::::ECAF7590EB3443B5C7CF3ACB6C7EE1B8621CC013:
@ -147,6 +147,10 @@ record; gpg2 does this by default and the option is a dummy.
15. Field Used in sec/sbb to print the serial number of a token 15. Field Used in sec/sbb to print the serial number of a token
(internal protect mode 1002) or a '#' if that key is a (internal protect mode 1002) or a '#' if that key is a
simple stub (internal protect mode 1001) simple stub (internal protect mode 1001)
16. Field: For sig records, this is the used hash algorithm:
2 = SHA-1
8 = SHA-256
(for other id's see include/cipher.h)
All dates are displayed in the format yyyy-mm-dd unless you use the All dates are displayed in the format yyyy-mm-dd unless you use the
option --fixed-list-mode in which case they are displayed as seconds option --fixed-list-mode in which case they are displayed as seconds

View File

@ -1382,19 +1382,15 @@ list_keyblock_colon( KBNODE keyblock, int secret, int fpr )
print_string( stdout, p, n, ':' ); print_string( stdout, p, n, ':' );
xfree(p); xfree(p);
} }
printf (":%02x%c:", sig->sig_class,sig->flags.exportable?'x':'l'); printf (":%02x%c::", sig->sig_class,sig->flags.exportable?'x':'l');
if (opt.no_sig_cache && opt.check_sigs && fprokay) if (opt.no_sig_cache && opt.check_sigs && fprokay)
{ {
putchar (':');
for (i=0; i < fplen ; i++ ) for (i=0; i < fplen ; i++ )
printf ("%02X", fparray[i] ); printf ("%02X", fparray[i] );
putchar (':');
} }
printf ("\n"); printf (":::%d:\n", sig->digest_algo);
if (opt.show_subpackets) if (opt.show_subpackets)
print_subpackets_colon (sig); print_subpackets_colon (sig);