[git] GnuPG - branch, master, updated. gnupg-2.1.16-136-g12a5265

[by Justus Winter]

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  12a5265afa7f87ad92fb571e0882e57b07a3c267 (commit)
       via  3c7d6a1769ed6cc90d86247a814a0dce341512a3 (commit)
      from  a165fa09be4bfbeb97ebe25d551a9045255e5028 (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 12a5265afa7f87ad92fb571e0882e57b07a3c267
Author: Justus Winter <justus at g10code.com>
Date:   Fri Dec 16 15:58:14 2016 +0100

    doc: Mention extra information in pinentry status lines.
    
    * doc/DETAILS: Mention that 'PINENTRY_LAUNCHED may carry extra
    information.
    
    Fixes-commit: c1ea0b577a468030d2b006317ba27fc1746c4b14
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/doc/DETAILS b/doc/DETAILS
index ab70960..95d5e4f 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -1008,7 +1008,7 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB:
     This may either be the specified mountpoint or one randomly
     chosen by g13.
 
-*** PINENTRY_LAUNCHED <pid>
+*** PINENTRY_LAUNCHED <pid>[:<extra>]
     This status line is emitted by gpg to notify a client that a
     Pinentry has been launched.  <pid> is the PID of the Pinentry.  It
     may be used to display a hint to the user but can't be used to

commit 3c7d6a1769ed6cc90d86247a814a0dce341512a3
Author: Justus Winter <justus at g10code.com>
Date:   Fri Dec 16 15:50:17 2016 +0100

    sm: Fix agent communication.
    
    * sm/call-agent.c (gpgsm_agent_pksign): Fix passing the control handle
    to the callback.
    (gpgsm_scd_pksign): Likewise.
    (gpgsm_agent_reaedkey): Likewise.
    
    GnuPG-bug-id: 2874
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/sm/call-agent.c b/sm/call-agent.c
index 11e6ae7..16a2497 100644
--- a/sm/call-agent.c
+++ b/sm/call-agent.c
@@ -234,6 +234,7 @@ gpgsm_agent_pksign (ctrl_t ctrl, const char *keygrip, const char *desc,
   rc = start_agent (ctrl);
   if (rc)
     return rc;
+  inq_parm.ctrl = ctrl;
   inq_parm.ctx = agent_ctx;
 
   if (digestlen*2 + 50 > DIM(line))
@@ -319,6 +320,7 @@ gpgsm_scd_pksign (ctrl_t ctrl, const char *keyid, const char *desc,
   rc = start_agent (ctrl);
   if (rc)
     return rc;
+  inq_parm.ctrl = ctrl;
   inq_parm.ctx = agent_ctx;
 
   if (digestlen*2 + 50 > DIM(line))
@@ -583,6 +585,7 @@ gpgsm_agent_readkey (ctrl_t ctrl, int fromcard, const char *hexkeygrip,
   rc = start_agent (ctrl);
   if (rc)
     return rc;
+  inq_parm.ctrl = ctrl;
   inq_parm.ctx = agent_ctx;
 
   rc = assuan_transact (agent_ctx, "RESET",NULL, NULL, NULL, NULL, NULL, NULL);

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

Summary of changes:
 doc/DETAILS     | 2 +-
 sm/call-agent.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)


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