[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-79-gfc00d3f

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  fc00d3fcb201476b3495f47138fa35b71c52f403 (commit)
       via  f8a8c71c41bc1893df8af6ce522876ccbf6240a9 (commit)
      from  68777b40dcf215305a325185f6bd9cfd6dcc0542 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fc00d3fcb201476b3495f47138fa35b71c52f403
Author: Werner Koch <wk at gnupg.org>
Date:   Thu May 24 10:13:39 2012 +0200

    Print the hash algorithm in colon mode key listing.
    
    * g10/keylist.c (list_keyblock_colon): Print digest_algo.

diff --git a/NEWS b/NEWS
index fd721da..a8352ca 100644
--- a/NEWS
+++ b/NEWS
@@ -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 955e850..59434f1 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 at gnupg.org
+$ gpg --with-colons --list-keys \
+      --with-fingerprint --with-fingerprint wk at 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 e8ccabc..87f3a4b 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);

commit f8a8c71c41bc1893df8af6ce522876ccbf6240a9
Author: Werner Koch <wk at gnupg.org>
Date:   Thu May 24 10:11:49 2012 +0200

    Fix type conflict warning.
    
    * g10/keylist.c: Change min_cert_level to a byte.

diff --git a/g10/keylist.c b/g10/keylist.c
index cd868bf..e8ccabc 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -66,8 +66,8 @@ public_key_list (ctrl_t ctrl, strlist_t list, int locate_mode)
 {
   if (opt.with_colons)
     {
-      byte trust_model, marginals, completes, cert_depth;
-      ulong created, nextcheck, min_cert_level;
+      byte trust_model, marginals, completes, cert_depth, min_cert_level;
+      ulong created, nextcheck;
 
       read_trust_options (&trust_model, &created, &nextcheck,
 			  &marginals, &completes, &cert_depth, &min_cert_level);

-----------------------------------------------------------------------

Summary of changes:
 NEWS          |    2 ++
 doc/DETAILS   |    8 ++++++--
 g10/keylist.c |   12 ++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org