This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gnupg2.
commit b096c4e7f119f2df2ed6e6ea5f591282e75a8adb
Merge: 440052f eab50bf
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Mon Jan 23 22:58:16 2017 -0500
Merge tag 'upstream/2.1.18'
Upstream version 2.1.18
AUTHORS | 14 +-
ChangeLog | 3336 ++++++++++++++++
Makefile.am | 2 +-
NEWS | 165 +-
README | 4 +-
VERSION | 2 +-
agent/agent.h | 2 +-
agent/call-scd.c | 10 +-
agent/command-ssh.c | 6 +-
agent/divert-scd.c | 10 +-
agent/gpg-agent.c | 22 +-
agent/learncard.c | 2 +-
autogen.sh | 36 +-
build-aux/gitlog-to-changelog | 5 +-
common/argparse.c | 8 +-
common/exechelp-w32.c | 13 +-
common/exectool.c | 60 +-
common/gettime.c | 2 +-
common/logging.c | 143 +-
common/logging.h | 20 +-
common/t-exectool.c | 49 +-
common/t-gettime.c | 17 +-
common/t-iobuf.c | 6 +-
common/tlv.c | 4 +-
common/ttyio.c | 128 +-
common/ttyio.h | 1 -
common/w32info-rc.h.in | 2 +-
configure.ac | 14 +-
dirmngr/crlcache.c | 2 +-
dirmngr/dirmngr.c | 12 +-
dirmngr/dirmngr.h | 1 +
dirmngr/dns-stuff.c | 310 +-
dirmngr/dns-stuff.h | 7 +-
dirmngr/dns.c | 27 +-
dirmngr/http.c | 247 +-
dirmngr/http.h | 3 +
dirmngr/ks-engine-hkp.c | 215 +-
dirmngr/ks-engine-http.c | 2 +-
dirmngr/ks-engine-kdns.c | 2 +-
dirmngr/ks-engine-ldap.c | 2 +-
dirmngr/misc.c | 8 +
dirmngr/ocsp.c | 2 +-
dirmngr/server.c | 59 +-
dirmngr/t-dns-stuff.c | 18 +-
doc/DETAILS | 13 +
doc/defsincdate | 2 +-
doc/dirmngr.texi | 39 +-
doc/examples/systemd-user/dirmngr.service | 1 +
doc/examples/systemd-user/gpg-agent.service | 1 +
doc/gpg.texi | 23 +
doc/scdaemon.texi | 7 +-
doc/tools.texi | 58 +-
g10/export.c | 22 +-
g10/gpg.c | 14 +-
g10/gpgcompose.c | 17 +-
g10/import.c | 21 +-
g10/keydb.h | 24 +-
g10/keyedit.c | 6 +-
g10/keygen.c | 8 +-
g10/keylist.c | 87 +-
g10/options.h | 2 +
g10/sqrtu32.c | 2 +-
g10/t-stutter.c | 17 +-
g10/tofu.c | 6 +-
g10/trust.c | 51 +-
g10/trustdb.c | 6 +-
g13/g13tuple.c | 2 +-
po/ca.po | 888 +++--
po/cs.po | 890 +++--
po/da.po | 890 +++--
po/de.po | 906 ++---
po/el.po | 888 +++--
po/en at boldquot.po | 896 ++---
po/en at quot.po | 896 ++---
po/eo.po | 888 +++--
po/es.po | 890 +++--
po/et.po | 888 +++--
po/fi.po | 888 +++--
po/fr.po | 890 +++--
po/gl.po | 888 +++--
po/gnupg2.pot | 890 +++--
po/hu.po | 888 +++--
po/id.po | 888 +++--
po/it.po | 888 +++--
po/ja.po | 890 +++--
po/nb.po | 890 +++--
po/pl.po | 890 +++--
po/pt.po | 888 +++--
po/ro.po | 888 +++--
po/ru.po | 890 +++--
po/sk.po | 888 +++--
po/sv.po | 890 +++--
po/tr.po | 890 +++--
po/uk.po | 890 +++--
po/zh_CN.po | 888 +++--
po/zh_TW.po | 890 +++--
scd/apdu.c | 404 +-
scd/apdu.h | 15 +-
scd/app-common.h | 72 +-
scd/app-openpgp.c | 39 +-
scd/app-p15.c | 4 +-
scd/app.c | 659 +--
scd/ccid-driver.c | 782 ++--
scd/ccid-driver.h | 18 +-
scd/command.c | 801 +---
scd/scdaemon.c | 7 +-
scd/scdaemon.h | 3 +-
tests/Makefile.am | 2 +-
tests/gpgme/gpgme-defs.scm | 25 -
tests/gpgscm/init.scm | 17 +
tests/gpgscm/scheme-private.h | 4 +-
tests/gpgscm/scheme.c | 141 +-
tests/gpgscm/tests.scm | 106 +-
.../gpgsm/32100C27173EF6E9C4E9A25D3D69F86D37A4F939 | 10 +
tests/gpgsm/Makefile.am | 78 +
tests/gpgsm/cert_dfn_pca01.der | Bin 0 -> 1224 bytes
tests/gpgsm/cert_dfn_pca15.der | Bin 0 -> 1560 bytes
tests/gpgsm/cert_g10code_test1.der | Bin 0 -> 793 bytes
tests/{openpgp/setup.scm => gpgsm/decrypt.scm} | 20 +-
tests/{openpgp/setup.scm => gpgsm/encrypt.scm} | 29 +-
tests/{openpgp/setup.scm => gpgsm/export.scm} | 22 +-
tests/gpgsm/gpgsm-defs.scm | 103 +
tests/gpgsm/import.scm | 53 +
tests/gpgsm/plain-1.cms.asc | 33 +
tests/gpgsm/plain-2.cms.asc | 43 +
tests/gpgsm/plain-3.cms.asc | 11 +
tests/gpgsm/plain-large.cms.asc | 4213 ++++++++++++++++++++
tests/{openpgp/setup.scm => gpgsm/run-tests.scm} | 26 +-
tests/{openpgp => gpgsm}/setup.scm | 16 +-
tests/{openpgp/setup.scm => gpgsm/sign.scm} | 25 +-
tests/gpgsm/verify.scm | 65 +
tests/openpgp/Makefile.am | 7 +-
tests/openpgp/decrypt-session-key.scm | 45 +
tests/openpgp/defs.scm | 105 +-
tests/openpgp/plain-large.asc | 1332 +++++++
tests/openpgp/setup.scm | 4 +-
tests/openpgp/ssh-import.scm | 6 +-
tests/openpgp/tofu.scm | 13 +-
tools/gpg-wks-client.c | 15 +-
tools/gpgconf-comp.c | 80 +-
tools/gpgconf.c | 17 +-
tools/gpgconf.h | 4 +
tools/gpgtar-create.c | 6 +-
tools/watchgnupg.c | 4 +-
144 files changed, 25759 insertions(+), 14966 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git