diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | doc/DETAILS | 8 | ||||
| -rw-r--r-- | g10/keylist.c | 8 |
3 files changed, 10 insertions, 8 deletions
@@ -9,6 +9,8 @@ Noteworthy changes in version 2.1.0beta4 (unreleased) * Removed support for the original HKP keyserver which is not anymore used by any site. + * The hash algorithm is now printed for sig records in key listings. + Noteworthy changes in version 2.1.0beta3 (2011-12-20) ----------------------------------------------------- diff --git a/doc/DETAILS b/doc/DETAILS index 955e850e3..59434f10c 100644 --- a/doc/DETAILS +++ b/doc/DETAILS @@ -3,8 +3,8 @@ Format of colon listings ======================== First an example: -$ gpg --fixed-list-mode --with-colons --list-keys \ - --with-fingerprint --with-fingerprint wk@gnupg.org +$ gpg --with-colons --list-keys \ + --with-fingerprint --with-fingerprint wk@gnupg.org pub:f:1024:17:6C7EE1B8621CC013:899817715:1055898235::m:::scESC: fpr:::::::::ECAF7590EB3443B5C7CF3ACB6C7EE1B8621CC013: @@ -151,6 +151,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 (internal protect mode 1002) or a '#' if that key is a 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 option --fixed-list-mode in which case they are displayed as seconds diff --git a/g10/keylist.c b/g10/keylist.c index e8ccabc71..87f3a4bb0 100644 --- a/g10/keylist.c +++ b/g10/keylist.c @@ -1398,20 +1398,16 @@ list_keyblock_colon (KBNODE keyblock, int secret, int fpr) es_write_sanitized (es_stdout, p, n, ":", NULL); xfree (p); } - es_fprintf (es_stdout, ":%02x%c:", sig->sig_class, + es_fprintf (es_stdout, ":%02x%c::", sig->sig_class, sig->flags.exportable ? 'x' : 'l'); if (opt.no_sig_cache && opt.check_sigs && fprokay) { - es_putc (':', es_stdout); - for (i = 0; i < fplen; i++) es_fprintf (es_stdout, "%02X", fparray[i]); - - es_putc (':', es_stdout); } - es_fprintf (es_stdout, "\n"); + es_fprintf (es_stdout, ":::%d:\n", sig->digest_algo); if (opt.show_subpackets) print_subpackets_colon (sig); |