[Pkg-gnupg-commit] [gnupg2] 120/124: Merge tag 'upstream/2.1.20' into experimental

Daniel Kahn Gillmor dkg at fifthhorseman.net
Wed Apr 5 15:55:44 UTC 2017


This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit bcbdae7c6e926f78c802fab9429eed005e63f870
Merge: 90d81d9 6478793
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Apr 5 11:37:40 2017 -0400

    Merge tag 'upstream/2.1.20' into experimental
    
    Upstream version 2.1.20

 ChangeLog                                      |  882 ++++++++
 Makefile.am                                    |    7 +-
 NEWS                                           |   48 +
 README                                         |   24 +
 VERSION                                        |    2 +-
 agent/Makefile.am                              |    2 +-
 agent/agent.h                                  |    6 +-
 agent/call-pinentry.c                          |    4 +-
 agent/call-scd.c                               |    2 +-
 agent/command-ssh.c                            |   72 +-
 agent/command.c                                |   52 +-
 agent/cvt-openpgp.c                            |    4 +-
 agent/divert-scd.c                             |    4 +-
 agent/findkey.c                                |   78 +-
 agent/genkey.c                                 |    6 +-
 agent/gpg-agent.c                              |   19 +-
 agent/learncard.c                              |   21 +-
 agent/pksign.c                                 |    2 +-
 agent/preset-passphrase.c                      |    6 +-
 agent/protect-tool.c                           |    6 +-
 agent/protect.c                                |    9 +-
 agent/trustlist.c                              |    2 +-
 common/homedir.c                               |   27 +-
 common/iobuf.c                                 |    2 +-
 common/localename.c                            |    1 +
 common/miscellaneous.c                         |   63 +-
 common/stringhelp.c                            |   10 +-
 configure.ac                                   |   58 +-
 dirmngr/Makefile.am                            |    9 +-
 dirmngr/certcache.c                            |    5 +-
 dirmngr/crlfetch.c                             |    1 +
 dirmngr/dirmngr-client.c                       |    6 +-
 dirmngr/dirmngr.c                              |   17 +-
 dirmngr/dirmngr.h                              |    3 +-
 dirmngr/dirmngr_ldap.c                         |    4 +-
 dirmngr/dns-stuff.c                            |   48 +-
 dirmngr/dns-stuff.h                            |    4 +
 g13/be-truecrypt.c => dirmngr/http-common.c    |   35 +-
 dirmngr/{ldap-parse-uri.h => http-common.h}    |   20 +-
 dirmngr/http-ntbtls.c                          |    6 +-
 dirmngr/http.c                                 |   15 +-
 dirmngr/ks-engine-finger.c                     |    5 +-
 dirmngr/ks-engine-hkp.c                        |   10 +-
 dirmngr/ks-engine-http.c                       |    3 +-
 dirmngr/ks-engine-kdns.c                       |    2 +-
 dirmngr/ks-engine-ldap.c                       |    2 +-
 dirmngr/ldap-parse-uri.c                       |    2 +-
 dirmngr/ldap-parse-uri.h                       |    2 +-
 dirmngr/ldap-wrapper.c                         |    2 +-
 dirmngr/ldap.c                                 |    4 +-
 dirmngr/misc.c                                 |    2 +-
 dirmngr/ocsp.c                                 |    3 +-
 dirmngr/server.c                               |    6 +-
 dirmngr/t-dns-stuff.c                          |    2 +-
 dirmngr/t-http.c                               |    4 +-
 doc/DETAILS                                    |   63 +
 doc/HACKING                                    |    4 +-
 doc/Makefile.am                                |    1 +
 doc/defsincdate                                |    2 +-
 doc/dirmngr.texi                               |    5 +-
 doc/examples/debug.prf                         |   29 +
 doc/examples/vsnfd.prf                         |   21 +
 doc/gnupg-module-overview.pdf                  |  Bin 62898 -> 62898 bytes
 doc/gnupg-module-overview.png                  |  Bin 58876 -> 58876 bytes
 doc/gpg-agent.texi                             |   10 +
 doc/gpg.texi                                   |   56 +-
 g10/Makefile.am                                |    2 +-
 g10/armor.c                                    |    9 +-
 g10/build-packet.c                             |  420 ++--
 g10/call-agent.c                               |  203 +-
 g10/call-agent.h                               |    6 +
 g10/call-dirmngr.c                             |   18 +-
 g10/card-util.c                                |   95 +-
 g10/cipher.c                                   |    8 +-
 g10/compress-bz2.c                             |    2 +-
 g10/compress.c                                 |    2 +-
 g10/cpr.c                                      |    8 +-
 g10/dearmor.c                                  |    8 +-
 g10/decrypt-data.c                             |    9 +-
 g10/decrypt.c                                  |   10 +-
 g10/delkey.c                                   |   31 +-
 g10/dirmngr-conf.skel                          |   18 +-
 g10/ecdh.c                                     |    2 +-
 g10/encrypt.c                                  |   31 +-
 g10/exec.c                                     |   10 +-
 g10/export.c                                   |   82 +-
 g10/filter.h                                   |    2 +-
 g10/free-packet.c                              |  125 +-
 g10/getkey.c                                   |  256 ++-
 g10/gpg.c                                      |   72 +-
 g10/gpg.h                                      |   16 +-
 g10/gpgcompose.c                               |   17 +-
 g10/gpgsql.c                                   |    4 +-
 g10/gpgv.c                                     |   29 +-
 g10/helptext.c                                 |    6 +-
 g10/import.c                                   |  229 +-
 g10/kbnode.c                                   |   16 +-
 g10/keydb.c                                    |  228 +-
 g10/keydb.h                                    |   66 +-
 g10/keyedit.c                                  |  591 +++---
 g10/keygen.c                                   |   60 +-
 g10/keyid.c                                    |   11 +-
 g10/keylist.c                                  |  183 +-
 g10/keyring.c                                  |   95 +-
 g10/keyring.h                                  |    2 +-
 g10/keyserver-internal.h                       |    2 +-
 g10/keyserver.c                                |   30 +-
 g10/main.h                                     |   71 +-
 g10/mainproc.c                                 |   92 +-
 g10/mdfilter.c                                 |    6 +-
 g10/migrate.c                                  |    2 +-
 g10/misc.c                                     |   98 +-
 g10/openfile.c                                 |    8 +-
 g10/options.h                                  |    3 +-
 g10/packet.h                                   |  171 +-
 g10/parse-packet.c                             |  342 ++-
 g10/passphrase.c                               |   17 +-
 g10/photoid.c                                  |   10 +-
 g10/pkclist.c                                  |   74 +-
 g10/pkglue.c                                   |    2 +-
 g10/plaintext.c                                |    8 +-
 g10/progress.c                                 |    6 +-
 g10/pubkey-enc.c                               |   29 +-
 g10/revoke.c                                   |   45 +-
 g10/server.c                                   |    6 +-
 g10/seskey.c                                   |    4 +-
 g10/sig-check.c                                |   79 +-
 g10/sign.c                                     |   57 +-
 g10/skclist.c                                  |   14 +-
 g10/t-keydb-get-keyblock.c                     |    1 +
 g10/t-stutter.c                                |    2 +-
 g10/tdbdump.c                                  |   32 +-
 g10/tdbio.c                                    |   84 +-
 g10/tdbio.h                                    |   15 +-
 g10/test-stubs.c                               |   29 +-
 g10/textfilter.c                               |   10 +-
 g10/tofu.c                                     |   73 +-
 g10/trust.c                                    |   75 +-
 g10/trustdb.c                                  |  217 +-
 g10/trustdb.h                                  |   55 +-
 g10/verify.c                                   |   11 +-
 g13/Makefile.am                                |    2 +-
 g13/backend.c                                  |    2 +-
 g13/be-dmcrypt.c                               |    2 +-
 g13/be-encfs.c                                 |    2 +-
 g13/be-truecrypt.c                             |    2 +-
 g13/call-syshelp.c                             |    4 +-
 g13/create.c                                   |    2 +-
 g13/g13-common.c                               |    4 +-
 g13/g13-syshelp.c                              |    6 +-
 g13/g13.c                                      |    8 +-
 g13/keyblob.c                                  |    2 +-
 g13/mount.c                                    |    4 +-
 g13/mountinfo.c                                |    2 +-
 g13/runner.c                                   |    2 +-
 g13/server.c                                   |    2 +-
 g13/sh-blockdev.c                              |    4 +-
 g13/sh-cmd.c                                   |    2 +-
 g13/sh-dmcrypt.c                               |    4 +-
 g13/suspend.c                                  |    2 +-
 g13/t-g13tuple.c                               |    2 +-
 kbx/Makefile.am                                |    2 +-
 kbx/kbxutil.c                                  |    5 +-
 kbx/keybox-blob.c                              |   12 +-
 kbx/keybox-defs.h                              |    4 +-
 kbx/keybox-dump.c                              |    8 +-
 kbx/keybox-file.c                              |   31 +-
 kbx/keybox-openpgp.c                           |    2 +-
 kbx/keybox-search.c                            |   81 +-
 kbx/keybox-update.c                            |   17 +-
 kbx/keybox-util.c                              |    2 +-
 kbx/keybox.h                                   |    5 +-
 po/ca.po                                       | 2664 +++++++++++------------
 po/cs.po                                       | 2666 +++++++++++------------
 po/da.po                                       | 2666 +++++++++++------------
 po/de.po                                       | 2659 +++++++++++------------
 po/el.po                                       | 2664 +++++++++++------------
 po/en at boldquot.po                              | 2658 +++++++++++------------
 po/en at quot.po                                  | 2658 +++++++++++------------
 po/eo.po                                       | 2664 +++++++++++------------
 po/es.po                                       | 2666 +++++++++++------------
 po/et.po                                       | 2664 +++++++++++------------
 po/fi.po                                       | 2664 +++++++++++------------
 po/fr.po                                       | 2666 +++++++++++------------
 po/gl.po                                       | 2664 +++++++++++------------
 po/gnupg2.pot                                  | 2654 +++++++++++------------
 po/hu.po                                       | 2664 +++++++++++------------
 po/id.po                                       | 2664 +++++++++++------------
 po/it.po                                       | 2664 +++++++++++------------
 po/ja.po                                       | 2703 ++++++++++++------------
 po/nb.po                                       | 2665 +++++++++++------------
 po/pl.po                                       | 2666 +++++++++++------------
 po/pt.po                                       | 2664 +++++++++++------------
 po/ro.po                                       | 2664 +++++++++++------------
 po/ru.po                                       | 2698 +++++++++++------------
 po/sk.po                                       | 2664 +++++++++++------------
 po/sv.po                                       | 2666 +++++++++++------------
 po/tr.po                                       | 2666 +++++++++++------------
 po/uk.po                                       | 2665 +++++++++++------------
 po/zh_CN.po                                    | 2664 +++++++++++------------
 po/zh_TW.po                                    | 2666 +++++++++++------------
 scd/Makefile.am                                |    2 +-
 scd/apdu.c                                     | 1177 +----------
 scd/app-dinsig.c                               |    7 +-
 scd/app-geldkarte.c                            |    4 +-
 scd/app-help.c                                 |    4 +-
 scd/app-nks.c                                  |   14 +-
 scd/app-openpgp.c                              |   16 +-
 scd/app-p15.c                                  |   21 +-
 scd/app-sc-hsm.c                               |   10 +-
 scd/app.c                                      |   19 +-
 scd/ccid-driver.c                              |   18 +-
 scd/command.c                                  |    4 +-
 scd/iso7816.c                                  |   38 +-
 scd/iso7816.h                                  |    8 +-
 scd/scdaemon.c                                 |  101 +-
 sm/Makefile.am                                 |    2 +-
 sm/call-agent.c                                |    8 +-
 sm/call-dirmngr.c                              |    4 +-
 sm/certchain.c                                 |    4 +-
 sm/certcheck.c                                 |    2 +-
 sm/certdump.c                                  |    2 +-
 sm/certlist.c                                  |    2 +-
 sm/certreqgen-ui.c                             |    6 +-
 sm/certreqgen.c                                |    2 +-
 sm/decrypt.c                                   |    2 +-
 sm/delete.c                                    |    2 +-
 sm/encrypt.c                                   |    2 +-
 sm/export.c                                    |    6 +-
 sm/fingerprint.c                               |    2 +-
 sm/gpgsm.c                                     |    8 +-
 sm/import.c                                    |    6 +-
 sm/keydb.c                                     |    2 +-
 sm/keylist.c                                   |   22 +-
 sm/misc.c                                      |    4 +-
 sm/qualified.c                                 |    2 +-
 sm/server.c                                    |    4 +-
 sm/sign.c                                      |    2 +-
 sm/verify.c                                    |    2 +-
 tests/gpgme/Makefile.am                        |    3 -
 tests/gpgme/gpgme-defs.scm                     |   48 +-
 tests/gpgme/run-tests.scm                      |   24 +-
 tests/gpgme/wrap.scm                           |   22 +-
 tests/gpgscm/ffi.c                             |   26 +-
 tests/gpgscm/main.c                            |    2 +-
 tests/gpgscm/scheme-config.h                   |    4 -
 tests/gpgscm/scheme.c                          |  148 +-
 tests/gpgscm/tests.scm                         |   96 +-
 tests/gpgsm/Makefile.am                        |    3 -
 tests/gpgsm/gpgsm-defs.scm                     |    2 +-
 tests/gpgsm/run-tests.scm                      |    6 +-
 tests/migrations/Makefile.am                   |    3 -
 tests/migrations/common.scm                    |    8 +-
 tests/migrations/extended-pkf.scm              |   18 +-
 tests/migrations/from-classic.scm              |   47 +-
 tests/migrations/run-tests.scm                 |    3 +-
 tests/openpgp/Makefile.am                      |   34 +-
 tests/openpgp/README                           |    2 +-
 tests/openpgp/decrypt-unwrap-verify.scm        |   41 +
 tests/openpgp/defs.scm                         |   41 +-
 tests/openpgp/quick-key-manipulation.scm       |   41 +-
 tests/openpgp/run-tests.scm                    |    4 +-
 tests/openpgp/samplemsgs/clearsig-2-keys-1.asc |   20 +
 tests/openpgp/samplemsgs/clearsig-2-keys-2.asc |   20 +
 tests/openpgp/samplemsgs/enc-1-key-1.asc       |    9 +
 tests/openpgp/samplemsgs/enc-1-key-2.asc       |   16 +
 tests/openpgp/samplemsgs/enc-2-keys-1.asc      |   17 +
 tests/openpgp/samplemsgs/enc-2-keys-2.asc      |   16 +
 tests/openpgp/samplemsgs/enc-2-keys-hh-1.asc   |   20 +
 tests/openpgp/samplemsgs/enc-2-keys-hr-1.asc   |   29 +
 tests/openpgp/samplemsgs/enc-2-keys-rh-1.asc   |   21 +
 tests/openpgp/samplemsgs/encsig-2-2-keys-3.asc |   35 +
 tests/openpgp/samplemsgs/encsig-2-2-keys-4.asc |   33 +
 tests/openpgp/samplemsgs/encsig-2-keys-1.asc   |   18 +
 tests/openpgp/samplemsgs/encsig-2-keys-2.asc   |   18 +
 tests/openpgp/samplemsgs/encsig-2-keys-3.asc   |   23 +
 tests/openpgp/samplemsgs/encsig-2-keys-4.asc   |   23 +
 tests/openpgp/samplemsgs/encz0-1-key-1.asc     |   12 +
 tests/openpgp/samplemsgs/encz0-1-key-2.asc     |   13 +
 tests/openpgp/samplemsgs/sig-1-key-1.asc       |    8 +
 tests/openpgp/samplemsgs/sig-1-key-2.asc       |   12 +
 tests/openpgp/samplemsgs/sig-2-keys-1.asc      |   15 +
 tests/openpgp/samplemsgs/sig-2-keys-2.asc      |   15 +
 tests/openpgp/samplemsgs/signed-1-key-2.asc    |   12 +
 tests/openpgp/samplemsgs/signed-2-keys-1.asc   |   17 +
 tests/openpgp/samplemsgs/signed-2-keys-2.asc   |   24 +
 tests/openpgp/setup.scm                        |   19 +
 tests/openpgp/ssh-import.scm                   |   23 +-
 tests/openpgp/tofu.scm                         |    1 +
 tools/Makefile.am                              |    2 +-
 tools/call-dirmngr.c                           |    8 +-
 tools/gpg-check-pattern.c                      |    6 +-
 tools/gpg-connect-agent.c                      |    2 +-
 tools/gpg-wks-client.c                         |   22 +-
 tools/gpg-wks-server.c                         |   21 +-
 tools/gpgconf-comp.c                           |   20 +-
 tools/gpgconf.c                                |   42 +-
 tools/gpgsplit.c                               |    4 +-
 tools/gpgtar-create.c                          |    2 +-
 tools/gpgtar-extract.c                         |    2 +-
 tools/gpgtar-list.c                            |    2 +-
 tools/gpgtar.c                                 |    6 +-
 tools/mime-maker.c                             |    4 +-
 tools/mime-parser.c                            |    2 +-
 tools/mime-parser.h                            |    6 +-
 tools/no-libgcrypt.c                           |    2 +-
 tools/send-mail.c                              |   26 +-
 tools/symcryptrun.c                            |   14 +-
 tools/wks-receive.c                            |    6 +-
 tools/wks-util.c                               |   16 +-
 310 files changed, 44677 insertions(+), 42337 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git



More information about the Pkg-gnupg-commit mailing list