[git] GnuPG - branch, master, updated. gnupg-2.1.22-29-g0bd19da

[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  0bd19dae1161a71053d794e4f75e66f70445f9f0 (commit)
       via  0a8e20c4c639f0c491e2af5ac5fb97005196422b (commit)
      from  c4506f624ed6854aa0ba1629aa2d1d43eb26900d (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 0bd19dae1161a71053d794e4f75e66f70445f9f0
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Aug 8 13:47:00 2017 +0200

    gpgscm: Make the test summary stand out
    
    * tests/gpgscm/tests.scm (test-pool): Add delimiter lines.
    --
    
    This is to make those summaries a bit more simlar to those from
    automake.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/tests/gpgscm/tests.scm b/tests/gpgscm/tests.scm
index 40ba7e3..5141002 100644
--- a/tests/gpgscm/tests.scm
+++ b/tests/gpgscm/tests.scm
@@ -613,6 +613,7 @@
 	      (xfailed (filter-tests 'XFAIL))
 	      (xpassed (filter-tests 'XPASS))
 	      (skipped (filter-tests 'SKIP)))
+          (echo "===================")
 	  (echo (length procs) "tests run,"
 		(length (filter-tests 'PASS)) "succeeded,"
 		(length failed) "failed,"
@@ -623,6 +624,7 @@
 	  (print-tests xfailed "Expectedly failed tests:")
 	  (print-tests xpassed "Unexpectedly passed tests:")
 	  (print-tests skipped "Skipped tests:")
+          (echo "===================")
 	  (+ (length failed) (length xpassed))))
 
       (define (xml)

commit 0a8e20c4c639f0c491e2af5ac5fb97005196422b
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Aug 8 13:04:12 2017 +0200

    sm: Always print the keygrip in colon mode.
    
    * sm/keylist.c (list_cert_colon): Always print the keygrip as
    described in the manual.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/doc/tools.texi b/doc/tools.texi
index d05018b..332fb01 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -1189,10 +1189,12 @@ gpg-preset-passphrase [options] [command] @var{cacheid}
 @var{cacheid} is either a 40 character keygrip of hexadecimal
 characters identifying the key for which the passphrase should be set
 or cleared.  The keygrip is listed along with the key when running the
-command: @code{gpgsm --dump-secret-keys}.  Alternatively an arbitrary
-string may be used to identify a passphrase; it is suggested that such
-a string is prefixed with the name of the application (e.g
- at code{foo:12346}).
+command: @code{gpgsm --with-keygrip --list-secret-keys}.
+Alternatively an arbitrary string may be used to identify a
+passphrase; it is suggested that such a string is prefixed with the
+name of the application (e.g @code{foo:12346}).  Scripts should always
+use the option @option{--with-colons}, which provides the keygrip in a
+"grp" line (cf. @file{doc/DETAILS})/
 
 @noindent
 One of the following command options must be given:
diff --git a/sm/keylist.c b/sm/keylist.c
index abec049..24c86e1 100644
--- a/sm/keylist.c
+++ b/sm/keylist.c
@@ -541,16 +541,16 @@ list_cert_colon (ctrl_t ctrl, ksba_cert_t cert, unsigned int validity,
   xfree (fpr); fpr = NULL; chain_id = NULL;
   xfree (chain_id_buffer); chain_id_buffer = NULL;
 
-  if (opt.with_key_data)
+  /* Always print the keygrip.  */
+  if ( (p = gpgsm_get_keygrip_hexstring (cert)))
     {
-      if ( (p = gpgsm_get_keygrip_hexstring (cert)))
-        {
-          es_fprintf (fp, "grp:::::::::%s:\n", p);
-          xfree (p);
-        }
-      print_key_data (cert, fp);
+      es_fprintf (fp, "grp:::::::::%s:\n", p);
+      xfree (p);
     }
 
+  if (opt.with_key_data)
+    print_key_data (cert, fp);
+
   kludge_uid = NULL;
   for (idx=0; (p = ksba_cert_get_subject (cert,idx)); idx++)
     {

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

Summary of changes:
 doc/tools.texi         | 10 ++++++----
 sm/keylist.c           | 14 +++++++-------
 tests/gpgscm/tests.scm |  2 ++
 3 files changed, 15 insertions(+), 11 deletions(-)


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