This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch experimental
in repository gnupg2.
commit a6d985d42423a21c3c5e04acde06f06b62005385
Merge: e5c8937 d2d4174
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Tue May 16 22:38:16 2017 -0400
Merge tag 'upstream/2.1.21' into experimental
Upstream version 2.1.21
AUTHORS | 3 +
ChangeLog | 851 +++++++++++++
Makefile.am | 14 +
NEWS | 25 +-
README | 17 +-
VERSION | 2 +-
agent/Makefile.am | 2 +-
tests/openpgp/issue2929.scm => agent/all-tests.scm | 27 +-
agent/cache.c | 73 +-
agent/call-pinentry.c | 8 +-
agent/call-scd.c | 4 +-
agent/command-ssh.c | 24 +-
agent/command.c | 11 +-
agent/findkey.c | 6 +-
agent/gpg-agent.c | 1 -
agent/pkdecrypt.c | 2 +-
agent/pksign.c | 2 +-
agent/trustlist.c | 2 +-
build-aux/speedo/w32/g4wihelp.c | 64 +-
build-aux/speedo/w32/inst.nsi | 158 ++-
common/ChangeLog-2011.include | 2 +-
common/Makefile.am | 3 +-
.../openpgp/issue2929.scm => common/all-tests.scm | 43 +-
common/audit.c | 2 +-
common/b64dec.c | 1 +
common/call-gpg.c | 2 +-
common/dotlock.c | 2 +-
common/exechelp.h | 4 +-
common/exectool.c | 2 +-
common/init.h | 2 +-
common/logging.c | 12 +-
common/openpgp-oid.c | 2 +-
common/openpgpdefs.h | 12 +-
common/recsel.c | 2 +-
common/sexputil.c | 4 +-
common/simple-pwquery.h | 2 +-
common/stringhelp.c | 41 +-
common/stringhelp.h | 2 +-
common/sysutils.c | 2 +-
common/t-session-env.c | 2 +-
common/t-stringhelp.c | 7 +-
configure.ac | 14 +-
dirmngr/cdblib.c | 2 +-
dirmngr/certcache.c | 2 +-
dirmngr/dirmngr-client.c | 2 +-
dirmngr/dirmngr.c | 8 +-
dirmngr/dns-stuff.c | 38 +-
dirmngr/dns-stuff.h | 6 +-
dirmngr/dns.c | 67 +-
dirmngr/http.c | 54 +-
dirmngr/ks-engine-hkp.c | 1 +
dirmngr/ldap-wrapper-ce.c | 13 +-
dirmngr/ldap-wrapper.c | 2 +-
dirmngr/loadswdb.c | 4 +-
dirmngr/server.c | 6 +-
dirmngr/t-http.c | 4 +
dirmngr/validate.c | 6 +-
doc/HACKING | 4 +-
doc/defsincdate | 2 +-
doc/dirmngr.texi | 2 +-
doc/gpg-agent.texi | 4 +-
doc/gpg.texi | 17 +-
doc/gpgsm.texi | 4 +-
g10/Makefile.am | 13 +-
tests/openpgp/issue2929.scm => g10/all-tests.scm | 27 +-
g10/armor.c | 4 +-
g10/call-agent.c | 2 +-
g10/compress-bz2.c | 3 +-
g10/dirmngr-conf.skel | 73 --
g10/export.c | 39 +-
g10/getkey.c | 7 +-
g10/gpg.c | 13 +-
g10/gpgcompose.c | 4 +-
g10/import.c | 8 +-
g10/keydb.h | 4 +-
g10/keyedit.c | 8 +-
g10/keygen.c | 4 +-
g10/keylist.c | 4 +-
g10/keyring.c | 11 +-
g10/main.h | 2 -
g10/misc.c | 23 +-
g10/openfile.c | 104 +-
g10/options.skel | 139 ---
g10/packet.h | 6 +-
g10/parse-packet.c | 5 +-
g10/pkclist.c | 2 +-
g10/seskey.c | 4 +-
g10/sign.c | 2 +-
g10/skclist.c | 30 +-
g10/t-stutter.c | 15 +-
g10/tdbio.c | 2 +-
g10/test.c | 6 +-
g10/tofu.c | 36 +-
g10/trustdb.c | 2 +-
g10/verify.c | 2 +-
g13/Makefile.am | 2 +-
tests/openpgp/issue2929.scm => g13/all-tests.scm | 27 +-
g13/backend.c | 2 +-
g13/create.c | 2 +-
g13/g13-common.h | 2 +-
g13/sh-dmcrypt.c | 6 +
kbx/keybox-blob.c | 4 +-
kbx/keybox-defs.h | 2 +-
kbx/keybox-openpgp.c | 2 +-
m4/lib-link.m4 | 2 +-
m4/po.m4 | 6 +-
po/ca.po | 665 ++++++-----
po/cs.po | 657 +++++-----
po/da.po | 664 +++++------
po/de.po | 712 ++++++-----
po/el.po | 665 ++++++-----
po/en at boldquot.po | 654 +++++-----
po/en at quot.po | 654 +++++-----
po/eo.po | 654 +++++-----
po/es.po | 663 +++++------
po/et.po | 662 +++++------
po/fi.po | 666 ++++++-----
po/fr.po | 658 +++++-----
po/gl.po | 662 +++++------
po/gnupg2.pot | 652 +++++-----
po/hu.po | 664 +++++------
po/id.po | 662 +++++------
po/it.po | 666 ++++++-----
po/ja.po | 683 ++++++-----
po/nb.po | 657 +++++-----
po/pl.po | 662 +++++------
po/pt.po | 662 +++++------
po/ro.po | 665 ++++++-----
po/ru.po | 659 +++++------
po/sk.po | 662 +++++------
po/sv.po | 664 +++++------
po/tr.po | 664 +++++------
po/uk.po | 659 +++++------
po/zh_CN.po | 662 +++++------
po/zh_TW.po | 656 +++++-----
scd/apdu.c | 15 +-
scd/app-openpgp.c | 4 +-
scd/app-p15.c | 2 +-
scd/app.c | 4 +-
scd/atr.c | 2 +-
scd/ccid-driver.c | 684 ++---------
scd/command.c | 2 +-
scd/iso7816.c | 2 +-
sm/certlist.c | 4 +-
sm/gpgsm.c | 2 +-
sm/import.c | 2 +-
sm/keylist.c | 2 +-
sm/misc.c | 2 +-
sm/qualified.c | 2 +-
sm/server.c | 2 +-
sm/sign.c | 2 +-
tests/Makefile.am | 3 +-
tests/gpgme/Makefile.am | 10 +-
tests/gpgme/all-tests.scm | 86 ++
tests/gpgme/gpgme-defs.scm | 104 +-
tests/gpgme/run-tests.scm | 59 +-
tests/gpgme/setup.scm | 2 +-
tests/gpgme/wrap.scm | 3 +-
tests/gpgscm/Makefile.am | 6 +-
tests/gpgscm/gnupg.scm | 44 +
tests/gpgscm/init.scm | 14 +-
tests/gpgscm/lib.scm | 27 +-
tests/gpgscm/main.c | 45 +-
tests/gpgscm/makefile.scm | 76 ++
tests/gpgscm/opdefines.h | 379 +++---
tests/gpgscm/scheme-private.h | 29 +-
tests/gpgscm/scheme.c | 1251 ++++++++++----------
tests/gpgscm/scheme.h | 8 +-
tests/gpgscm/small-integers.h | 847 +++++++++++++
tests/gpgscm/t-child.c | 4 +-
tests/gpgscm/t-child.scm | 4 +-
tests/gpgscm/tests.scm | 278 +++--
tests/gpgscm/xml.scm | 142 +++
tests/gpgsm/Makefile.am | 10 +-
.../{openpgp/issue2929.scm => gpgsm/all-tests.scm} | 35 +-
tests/gpgsm/decrypt.scm | 4 +-
tests/gpgsm/encrypt.scm | 2 +-
tests/gpgsm/export.scm | 4 +-
tests/gpgsm/gpgsm-defs.scm | 12 +-
tests/gpgsm/import.scm | 4 +-
tests/gpgsm/run-tests.scm | 25 +-
tests/gpgsm/setup.scm | 10 +-
tests/gpgsm/sign.scm | 2 +-
tests/gpgsm/verify.scm | 2 +-
tests/inittests | 6 +-
tests/migrations/Makefile.am | 11 +-
.../issue2929.scm => migrations/all-tests.scm} | 27 +-
tests/migrations/common.scm | 11 +-
tests/migrations/extended-pkf.scm | 4 +-
tests/migrations/from-classic.scm | 8 +-
tests/migrations/issue2276.scm | 4 +-
tests/migrations/run-tests.scm | 14 +-
tests/openpgp/4gb-packet.scm | 9 +-
tests/openpgp/Makefile.am | 11 +-
tests/openpgp/README | 4 +-
tests/openpgp/all-tests.scm | 58 +
tests/openpgp/armdetach.scm | 4 +-
tests/openpgp/armdetachm.scm | 4 +-
tests/openpgp/armencrypt.scm | 4 +-
tests/openpgp/armencryptp.scm | 4 +-
tests/openpgp/armor.scm | 4 +-
tests/openpgp/armsignencrypt.scm | 4 +-
tests/openpgp/armsigs.scm | 4 +-
tests/openpgp/bug537-test.data.asc | 2 +-
tests/openpgp/clearsig.scm | 4 +-
tests/openpgp/compression.scm | 4 +-
tests/openpgp/conventional-mdc.scm | 6 +-
tests/openpgp/conventional.scm | 6 +-
tests/openpgp/decrypt-dsa.scm | 6 +-
tests/openpgp/decrypt-multifile.scm | 4 +-
tests/openpgp/decrypt-session-key.scm | 6 +-
tests/openpgp/decrypt-unwrap-verify.scm | 6 +-
tests/openpgp/decrypt.scm | 6 +-
tests/openpgp/default-key.scm | 4 +-
tests/openpgp/defs.scm | 84 +-
tests/openpgp/delete-keys.scm | 12 +-
tests/openpgp/detach.scm | 4 +-
tests/openpgp/detachm.scm | 4 +-
tests/openpgp/ecc.scm | 17 +-
tests/openpgp/enarmor.scm | 2 +-
tests/openpgp/encrypt-dsa.scm | 6 +-
tests/openpgp/encrypt-multifile.scm | 4 +-
tests/openpgp/encrypt.scm | 12 +-
tests/openpgp/encryptp.scm | 4 +-
tests/openpgp/export.scm | 2 +-
tests/openpgp/fake-pinentry.c | 2 +
tests/openpgp/genkey1024.scm | 2 +-
tests/openpgp/gpg-agent.conf.tmpl | 3 -
tests/openpgp/gpg.conf.tmpl | 4 -
tests/openpgp/gpgconf.scm | 2 +-
tests/openpgp/gpgtar.scm | 2 +-
tests/openpgp/gpgv-forged-keyring.scm | 4 +-
tests/openpgp/import-revocation-certificate.scm | 4 +-
tests/openpgp/import.scm | 12 +-
tests/openpgp/issue2015.scm | 2 +-
tests/openpgp/issue2346.scm | 4 +-
tests/openpgp/issue2417.scm | 4 +-
tests/openpgp/issue2419.scm | 4 +-
tests/openpgp/issue2929.scm | 2 +-
tests/openpgp/issue2941.scm | 2 +-
tests/openpgp/key-selection.scm | 4 +-
tests/openpgp/mds.scm | 2 +-
tests/openpgp/multisig.scm | 2 +-
tests/openpgp/quick-key-manipulation.scm | 6 +-
tests/openpgp/run-tests.scm | 25 +-
tests/openpgp/seat.scm | 4 +-
tests/openpgp/setup.scm | 20 +-
tests/openpgp/shell.scm | 2 +-
tests/openpgp/signencrypt-dsa.scm | 6 +-
tests/openpgp/signencrypt.scm | 7 +-
tests/openpgp/sigs-dsa.scm | 6 +-
tests/openpgp/sigs.scm | 8 +-
tests/openpgp/ssh-export.scm | 4 +-
tests/openpgp/ssh-import.scm | 6 +-
tests/openpgp/tofu.scm | 56 +-
tests/openpgp/use-exact-key.scm | 4 +-
tests/openpgp/verify-multifile.scm | 4 +-
tests/openpgp/verify.scm | 4 +-
tests/openpgp/version.scm | 2 +-
tests/pkits/Makefile.am | 2 +-
tests/pkits/README | 2 +-
tests/pkits/common.sh | 2 +-
tests/pkits/inittests | 4 +-
tests/run-tests.scm | 44 +
tools/gpg-connect-agent.c | 4 +-
tools/gpgconf-comp.c | 2 +-
tools/gpgconf.c | 2 +-
tools/gpgsplit.c | 7 +-
tools/mail-signed-keys | 2 +-
tools/rfc822parse.c | 3 +-
tools/symcryptrun.c | 2 +-
tools/watchgnupg.c | 2 +-
tools/wks-util.c | 2 +-
273 files changed, 14045 insertions(+), 12529 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git