Merge branch 'STABLE-BRANCH-2-2' into master
authorWerner Koch <wk@gnupg.org>
Tue, 27 Mar 2018 06:48:00 +0000 (08:48 +0200)
committerWerner Koch <wk@gnupg.org>
Tue, 27 Mar 2018 06:48:00 +0000 (08:48 +0200)
21 files changed:
1  2 
agent/agent.h
agent/command-ssh.c
agent/command.c
agent/cvt-openpgp.c
configure.ac
doc/Makefile.am
doc/gpg.texi
doc/gpgsm.texi
g10/call-agent.c
g10/card-util.c
g10/gpg.c
g10/gpg.h
g10/keyedit.c
g10/misc.c
g10/options.h
g10/parse-packet.c
g10/tdbdump.c
scd/apdu.c
scd/app-openpgp.c
sm/gpgsm.c
sm/gpgsm.h

diff --cc agent/agent.h
Simple merge
Simple merge
diff --cc agent/command.c
Simple merge
Simple merge
diff --cc configure.ac
Simple merge
diff --cc doc/Makefile.am
Simple merge
diff --cc doc/gpg.texi
Simple merge
diff --cc doc/gpgsm.texi
Simple merge
Simple merge
diff --cc g10/card-util.c
Simple merge
diff --cc g10/gpg.c
Simple merge
diff --cc g10/gpg.h
Simple merge
diff --cc g10/keyedit.c
Simple merge
diff --cc g10/misc.c
Simple merge
diff --cc g10/options.h
Simple merge
Simple merge
diff --cc 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 scd/apdu.c
Simple merge
Simple merge
diff --cc sm/gpgsm.c
Simple merge
diff --cc 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*/