[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.10-17-ge532534

[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, STABLE-BRANCH-2-2 has been updated
       via  e53253485cd7ceb7012505a629d2cd997167ccab (commit)
       via  62c75271173f83c5770576aae7b84f55a9ccbc16 (commit)
       via  147e59b7815daafb32b570a96f1d1925d0f37008 (commit)
       via  f1561e5196e54f11b18050eeaeda50e786d188c2 (commit)
       via  1b9b0fc54b9bcd5eb1e63816bd3222d7ac7572a7 (commit)
      from  01baee2b0ef4f81ac6ffa55480e91168dd27b430 (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 e53253485cd7ceb7012505a629d2cd997167ccab
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Oct 24 20:22:17 2018 +0200

    agent: Fix possible uninitalized use of CTX in simple_pwquery.
    
    * common/simple-pwquery.c (agent_open): Clear CTX even on early error.
    --
    
    GnuPG-bug-id: 4223
    Signed-off-by: Werner Koch <wk at gnupg.org>
    (cherry picked from commit bafcf7095159493a656382997f8b0d0bb11a20e8)

diff --git a/common/simple-pwquery.c b/common/simple-pwquery.c
index e7f4af3..b8ada42 100644
--- a/common/simple-pwquery.c
+++ b/common/simple-pwquery.c
@@ -246,6 +246,7 @@ agent_open (assuan_context_t *ctx)
 #ifdef SPWQ_USE_LOGGING
       log_error (_("no gpg-agent running in this session\n"));
 #endif
+      *ctx = NULL;
       return SPWQ_NO_AGENT;
     }
 

commit 62c75271173f83c5770576aae7b84f55a9ccbc16
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Oct 24 20:16:26 2018 +0200

    agent: Fix possible release of unitialize var in a genkey error case.
    
    * agent/command.c (cmd_genkey): Initialize 'value'.
    --
    
    GnuPG-bug-id: 4222
    Signed-off-by: Werner Koch <wk at gnupg.org>
    (cherry picked from commit 2bdc4b6ed97770ed15ec6c5afa02c2e44568a3bc)

diff --git a/agent/command.c b/agent/command.c
index 20abb28..adb2c00 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -860,7 +860,7 @@ cmd_genkey (assuan_context_t ctx, char *line)
   ctrl_t ctrl = assuan_get_pointer (ctx);
   int rc;
   int no_protection;
-  unsigned char *value;
+  unsigned char *value = NULL;
   size_t valuelen;
   unsigned char *newpasswd = NULL;
   membuf_t outbuf;

commit 147e59b7815daafb32b570a96f1d1925d0f37008
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Oct 24 20:11:33 2018 +0200

    ssh: Fix possible infinite loop in case of an read error.
    
    * agent/command-ssh.c (ssh_handler_add_identity): Handle other errors
    than EOF.
    --
    
    GnuPG-bug-id: 4221
    Signed-off-by: Werner Koch <wk at gnupg.org>
    (cherry picked from commit 7385e1babf6eef586c79ad23f8e541aaf608c4e5)

diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 20dc3fe..9255830 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -3244,9 +3244,10 @@ ssh_handler_add_identity (ctrl_t ctrl, estream_t request, estream_t response)
   while (1)
     {
       err = stream_read_byte (request, &b);
-      if (gpg_err_code (err) == GPG_ERR_EOF)
-	{
-	  err = 0;
+      if (err)
+        {
+          if (gpg_err_code (err) == GPG_ERR_EOF)
+            err = 0;
 	  break;
 	}
 

commit f1561e5196e54f11b18050eeaeda50e786d188c2
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Oct 24 20:04:52 2018 +0200

    tools: Fix FILE memory leak in gpg-connect-agent.
    
    * tools/gpg-connect-agent.c (do_open): dup the fileno and close the
    stream.
    
    GnuPG-bug-id: 4220
    Signed-off-by: Werner Koch <wk at gnupg.org>
    (cherry picked from commit 378719f25fe00d46393541f4a4f79e04484c3000)

diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index 00482a3..7eb7ffa 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -983,7 +983,7 @@ do_open (char *line)
                  name, mode, strerror (errno));
       return;
     }
-  fd = fileno (fp);
+  fd = dup (fileno (fp));
   if (fd >= 0 && fd < DIM (open_fd_table))
     {
       open_fd_table[fd].inuse = 1;
@@ -1030,8 +1030,10 @@ do_open (char *line)
   else
     {
       log_error ("can't put fd %d into table\n", fd);
-      close (fd);
+      if (fd != -1)
+        close (fd); /* Table was full.  */
     }
+  fclose (fp);
 }
 
 

commit 1b9b0fc54b9bcd5eb1e63816bd3222d7ac7572a7
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Oct 24 19:55:19 2018 +0200

    sm: Use the correct string in an error message.
    
    * sm/gpgsm.c (main): Fix error message.
    --
    
    GnuPG-bug-id: 4219
    (cherry picked from commit 793fd8d876777c24c4d5072301fa530333d6e1d9)

diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index da1783d..defc698 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -1660,7 +1660,7 @@ main ( int argc, char **argv)
                                      || cmd == aClearsign,
                                      opt.extra_digest_algo))
     log_error (_("digest algorithm '%s' may not be used in %s mode\n"),
-               forced_digest_algo,
+               extra_digest_algo,
                gnupg_compliance_option_string (opt.compliance));
 
   if (log_get_errorcount(0))

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

Summary of changes:
 agent/command-ssh.c       | 7 ++++---
 agent/command.c           | 2 +-
 common/simple-pwquery.c   | 1 +
 sm/gpgsm.c                | 2 +-
 tools/gpg-connect-agent.c | 6 ++++--
 5 files changed, 11 insertions(+), 7 deletions(-)


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