[git] GnuPG - branch, master, updated. gnupg-2.2.5-147-gd4dc424

[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  d4dc4245bf0221d2db4118718fc2528ecf43b97b (commit)
       via  02dce8c0cc57deb2095a9b06aeb8f4dea34eef7e (commit)
       via  eb68c2d3d1b03a18cd24406fa46d4c30cb13d9f7 (commit)
       via  a750ebebf35a392f1c72d6aee5618df0d9f25ff7 (commit)
       via  403aa70c52e56614d65490dea9344113f9cf3d29 (commit)
       via  456a3a8e93ea14f821e0e98fb515f284ece98685 (commit)
       via  5f00531463ebc0e606c502696962426007545bb7 (commit)
       via  137644c9cb58deaaba6850f2763d9c5f9241cb0b (commit)
       via  2cd35df5db3c4dfe37616dcfb1fcc644959449ef (commit)
       via  05c55ee260edc07cd19da56dfd00347bfe3f529c (commit)
       via  5400a5bb77bddcb14c94d9405312d6181322b090 (commit)
       via  165bc38cefbc03515403b60b704cabf4dc0b71f4 (commit)
       via  0152ba7c987443d641ce1091c79f90ef2cc46498 (commit)
       via  34ec0125614674725cb78cf9f8d5e6b0f8c64064 (commit)
       via  983f7b2acbd1e7580652bbeb0c3d64f9dd19d9e4 (commit)
       via  11bbd99477ef5ba5b7db0c17607b10af03c68afb (commit)
       via  2c85e202bc30231b9555100dec0c490c60d7b88c (commit)
       via  fd23a0524d8060ed12d87c679b7823686614aaee (commit)
       via  c84bae69e9e02923f7180e09d161cb0b13257436 (commit)
       via  71e5282c25ba812c7091e587edd721839bc4c2ac (commit)
       via  655f0b9ad0138e6f960bf4befaf0eea569256614 (commit)
       via  1e27c0e04cd3280d498dc8b72d2e410f6287f656 (commit)
       via  f8b8b6aac2ca1cb34d7a346aee1d874e7650557b (commit)
       via  334b94898112b5d2c7c97ff0496b9a67b3de0d26 (commit)
       via  7e40c5efbea65c7804b06d62dfcd7f991557bfaa (commit)
      from  fa0ed1c7e2eee7c559026696e6b21acc882a97aa (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 d4dc4245bf0221d2db4118718fc2528ecf43b97b
Merge: fa0ed1c 02dce8c
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Mar 27 08:48:00 2018 +0200

    Merge branch 'STABLE-BRANCH-2-2' into master

diff --cc g10/tdbdump.c
index 37bf78b,2c6f5c2..73a6c2c
--- a/g10/tdbdump.c
+++ b/g10/tdbdump.c
@@@ -183,15 -183,13 +183,15 @@@ import_ownertrust (ctrl_t ctrl, const c
  	}
  	if( !otrust )
  	    continue; /* no otrust defined - no need to update or insert */
 -	/* convert the ascii fingerprint to binary */
 -	for(p=line, fprlen=0; fprlen < 20 && *p != ':'; p += 2 )
 -	    fpr[fprlen++] = HEXTOBIN(p[0]) * 16 + HEXTOBIN(p[1]);
 -	while (fprlen < 20)
 +	/* Convert the ascii fingerprint to binary */
 +	for(p=line, fprlen=0;
 +            fprlen < MAX_FINGERPRINT_LEN && *p != ':';
 +            p += 2 )
 +          fpr[fprlen++] = HEXTOBIN(p[0]) * 16 + HEXTOBIN(p[1]);
 +	while (fprlen < MAX_FINGERPRINT_LEN)
  	    fpr[fprlen++] = 0;
  
- 	rc = tdbio_search_trust_byfpr (fpr, &rec);
+ 	rc = tdbio_search_trust_byfpr (ctrl, fpr, &rec);
  	if( !rc ) { /* found: update */
  	    if (rec.r.trust.ownertrust != otrust)
                {
diff --cc sm/gpgsm.h
index 3e2f95f,325948a..d3fbde5
--- a/sm/gpgsm.h
+++ b/sm/gpgsm.h
@@@ -85,9 -85,8 +85,10 @@@ struc
  
    int with_keygrip; /* Option --with-keygrip active.  */
  
 +  int with_key_screening; /* Option  --with-key-screening active.  */
 +
    int pinentry_mode;
+   int request_origin;
  
    int armor;        /* force base64 armoring (see also ctrl.with_base64) */
    int no_armor;     /* don't try to figure out whether data is base64 armored*/

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

Summary of changes:
 agent/agent.h        |   4 +-
 agent/cache.c        |  38 ++++++++-------
 agent/command-ssh.c  |   2 +-
 agent/command.c      |  46 ++++++++++++------
 agent/cvt-openpgp.c  |   2 +-
 agent/findkey.c      |   8 ++--
 agent/genkey.c       |   6 +--
 agent/protect-tool.c |   3 +-
 common/agent-opt.c   |  35 ++++++++++++++
 common/shareddefs.h  |  13 +++++
 configure.ac         |   3 +-
 doc/Makefile.am      |   2 +-
 doc/gpg-agent.texi   |  21 ++++++++
 doc/gpg.texi         |  17 +++++--
 doc/gpgsm.texi       |   9 ++++
 g10/call-agent.c     |  19 ++++++++
 g10/call-agent.h     |   1 +
 g10/card-util.c      | 132 ++++++++++++++++++++++++++++++++++++++++++++++++---
 g10/gpg.c            |   8 ++++
 g10/gpg.h            |   4 ++
 g10/keyedit.c        |   4 +-
 g10/misc.c           |   1 +
 g10/options.h        |   1 +
 g10/parse-packet.c   |  17 +++++--
 g10/tdbdump.c        |   2 +-
 g10/tdbio.c          | 110 ++++++++++++++++++++++++++++--------------
 g10/tdbio.h          |   6 ++-
 g10/trustdb.c        |   2 +-
 scd/apdu.c           |  56 +++++++++++++++-------
 scd/app-openpgp.c    |   5 +-
 scd/ccid-driver.c    |   3 +-
 scd/scdaemon.c       |  36 ++++++++------
 sm/call-agent.c      |  14 ++++++
 sm/gpgsm.c           |   8 ++++
 sm/gpgsm.h           |   1 +
 sm/server.c          |  12 +++++
 36 files changed, 516 insertions(+), 135 deletions(-)


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