[git] GnuPG - branch, master, updated. gnupg-2.2.7-237-gbafcf70

[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  bafcf7095159493a656382997f8b0d0bb11a20e8 (commit)
       via  2bdc4b6ed97770ed15ec6c5afa02c2e44568a3bc (commit)
       via  7385e1babf6eef586c79ad23f8e541aaf608c4e5 (commit)
       via  378719f25fe00d46393541f4a4f79e04484c3000 (commit)
       via  793fd8d876777c24c4d5072301fa530333d6e1d9 (commit)
      from  64a1e86fc06d89c980a196c61d2b6d77d167565e (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 bafcf7095159493a656382997f8b0d0bb11a20e8
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>

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 2bdc4b6ed97770ed15ec6c5afa02c2e44568a3bc
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>

diff --git a/agent/command.c b/agent/command.c
index 0871753..7fbf1de 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -887,7 +887,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 7385e1babf6eef586c79ad23f8e541aaf608c4e5
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>

diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index ff1f0a5..86fd092 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -3249,9 +3249,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 378719f25fe00d46393541f4a4f79e04484c3000
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>

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 793fd8d876777c24c4d5072301fa530333d6e1d9
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

diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index b054787..072b30d 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -1666,7 +1666,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