[git] GnuPG - branch, master, updated. gnupg-2.1.21-51-ge809251

[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  e80925171ddb20c7e76c1db88c15ce2d9b09db86 (commit)
       via  a36c48a780adac28748804af2aab403636c3f450 (commit)
       via  7c91b48f0e80266cf7491c2bb7d8aabc12362643 (commit)
      from  7aeac20f12ed257d3d159b304afeeac7f406c9d2 (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 e80925171ddb20c7e76c1db88c15ce2d9b09db86
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Jun 13 09:05:40 2017 +0200

    gpg: Disable keydb handle caching only for W32
    
    * g10/getkey.c (getkey_end) [!W32]: Re-enable caching.
    --
    
    This change limits of the effects of commit
    d3d640b9cc98dd0d06b49a2e4d46eb67af96fe29 to W32 system.
    
    GnuPG-bug-id: 3097
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/getkey.c b/g10/getkey.c
index ac6b9a3..a3df857 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -2219,20 +2219,27 @@ getkey_end (ctrl_t ctrl, getkey_ctx_t ctx)
 {
   if (ctx)
     {
-/*
-XXX: This creates a big regression for Windows because the keyring
-* is only released after the global ctrl is released. So if an operation
-* does a getkey and then tries to modify the keyring it will fail on
-* Windows with a sharing violation. We need to modify all
-* keyring write operations to also take the ctrl and close the
-* cached_getkey_kdb handle to make writing work. See:
-* https://dev.gnupg.org/T3097
+#ifdef HAVE_W32_SYSTEM
+
+      /* FIXME: This creates a big regression for Windows because the
+       * keyring is only released after the global ctrl is released.
+       * So if an operation does a getkey and then tries to modify the
+       * keyring it will fail on Windows with a sharing violation.  We
+       * need to modify all keyring write operations to also take the
+       * ctrl and close the cached_getkey_kdb handle to make writing
+       * work.  See: GnuPG-bug-id: 3097  */
+      (void)ctrl;
+      keydb_release (ctx->kr_handle);
+
+#else /*!HAVE_W32_SYSTEM*/
 
       if (ctrl && !ctrl->cached_getkey_kdb)
         ctrl->cached_getkey_kdb = ctx->kr_handle;
       else
-*/
-      keydb_release (ctx->kr_handle);
+        keydb_release (ctx->kr_handle);
+
+#endif /*!HAVE_W32_SYSTEM*/
+
       free_strlist (ctx->extra_list);
       if (!ctx->not_allocated)
 	xfree (ctx);

commit a36c48a780adac28748804af2aab403636c3f450
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Jun 13 09:02:12 2017 +0200

    po: Make a string translatable.
    
    --

diff --git a/g10/sig-check.c b/g10/sig-check.c
index ef97e17..d0e27ea 100644
--- a/g10/sig-check.c
+++ b/g10/sig-check.c
@@ -157,12 +157,15 @@ check_signature2 (ctrl_t ctrl,
     else if( get_pubkey (ctrl, pk, sig->keyid ) )
       rc = gpg_error (GPG_ERR_NO_PUBKEY);
     else if (! gnupg_pk_is_allowed (opt.compliance, PK_USE_VERIFICATION,
-				    pk->pubkey_algo, pk->pkey, nbits_from_pk (pk),
+				    pk->pubkey_algo, pk->pkey,
+                                    nbits_from_pk (pk),
 				    NULL))
       {
 	/* Compliance failure.  */
-	log_info ("key %s not suitable for signature verification while in %s mode\n",
-		  keystr_from_pk (pk), gnupg_compliance_option_string (opt.compliance));
+	log_info (_("key %s not suitable for signature verification"
+                    " while in %s mode\n"),
+		  keystr_from_pk (pk),
+                  gnupg_compliance_option_string (opt.compliance));
 	rc = gpg_error (GPG_ERR_PUBKEY_ALGO);
       }
     else if(!pk->flags.valid)

commit 7c91b48f0e80266cf7491c2bb7d8aabc12362643
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Jun 13 09:01:24 2017 +0200

    common: Fix -Wswitch warning.
    
    * common/compliance.c (gnupg_digest_is_allowed): Don't include
    GCRY_MD_WHIRLPOOL because it is not a digest_algo_t.
    --
    
    Note that Whirlpool is not used anywhere in gpg or gpgsm.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/compliance.c b/common/compliance.c
index 4078004..b19112c 100644
--- a/common/compliance.c
+++ b/common/compliance.c
@@ -432,7 +432,6 @@ gnupg_digest_is_allowed (enum gnupg_compliance_mode compliance, int producer,
 	case DIGEST_ALGO_RMD160:
 	  return ! producer;
 	case DIGEST_ALGO_MD5:
-	case GCRY_MD_WHIRLPOOL:
 	  return ! producer && module == GNUPG_MODULE_NAME_GPGSM;
 	default:
 	  return 0;

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

Summary of changes:
 common/compliance.c |  1 -
 g10/getkey.c        | 27 +++++++++++++++++----------
 g10/sig-check.c     |  9 ++++++---
 3 files changed, 23 insertions(+), 14 deletions(-)


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