[Pkg-gnupg-commit] [gnupg2] 142/160: Merge branch 'master' into STABLE-BRANCH-2-2
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Fri Jul 15 09:36:45 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch upstream
in repository gnupg2.
commit 4ef62278e3c9406360dc50288f422291497e218f
Merge: eae301b e148c3c
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jul 13 15:11:46 2016 +0200
Merge branch 'master' into STABLE-BRANCH-2-2
--
.gitignore | 2 +
AUTHORS | 9 +-
acinclude.m4 | 10 +-
agent/command.c | 12 +-
agent/findkey.c | 20 +-
build-aux/speedo.mk | 4 +
build-aux/speedo/w32/pkg-copyright.txt | 36 +-
common/Makefile.am | 8 +-
common/argparse.c | 2 +
common/b64dec.c | 79 +-
common/b64enc.c | 20 +-
common/ccparray.c | 1 +
common/exechelp-posix.c | 1 +
common/exectool.c | 25 +-
common/gettime.c | 33 +
common/gettime.h | 1 +
common/init.c | 4 +
common/iobuf.c | 5 +-
common/{private-keys.c => name-value.c} | 183 +-
common/{private-keys.h => name-value.h} | 61 +-
common/openpgpdefs.h | 1 +
common/recsel.c | 571 +++
common/recsel.h | 43 +
common/simple-pwquery.c | 6 +-
common/stringhelp.c | 2 +
common/t-convert.c | 2 +
common/t-gettime.c | 6 +
common/t-iobuf.c | 15 +-
common/t-mbox-util.c | 2 +
common/{t-private-keys.c => t-name-value.c} | 230 +-
common/t-recsel.c | 405 ++
common/t-stringhelp.c | 7 +
common/t-strlist.c | 2 +
common/zb32.c | 2 +-
configure.ac | 5 +
dirmngr/http.c | 2 +-
dirmngr/server.c | 30 +-
dirmngr/t-ldap-parse-uri.c | 2 +
doc/HACKING | 2 +
doc/Makefile.am | 4 +-
doc/gpg-agent.texi | 2 +-
doc/gpg.texi | 242 +-
doc/mkdefsinc.c | 42 +-
doc/tools.texi | 6 +-
doc/yat2m.c | 45 +-
g10/armor.c | 22 +-
g10/build-packet.c | 50 +-
g10/card-util.c | 24 +-
g10/compress.c | 4 +
g10/encrypt.c | 4 +-
g10/export.c | 934 +++-
g10/free-packet.c | 1 +
g10/getkey.c | 148 +-
g10/gpg.c | 134 +-
g10/gpgv.c | 24 +
g10/import.c | 507 +-
g10/kbnode.c | 4 +-
g10/keydb.c | 1 +
g10/keydb.h | 22 +-
g10/keyedit.c | 271 +-
g10/keygen.c | 23 +-
g10/keylist.c | 16 +-
g10/keyserver.c | 6 +-
g10/main.h | 15 +-
g10/mainproc.c | 37 +-
g10/options.h | 10 +-
g10/packet.h | 5 +-
g10/parse-packet.c | 20 +-
g10/pkclist.c | 99 +-
g10/plaintext.c | 15 +-
g10/revoke.c | 10 +
g10/server.c | 6 +-
g10/sign.c | 16 +-
g10/t-keydb-get-keyblock.c | 2 +
g10/t-keydb.c | 25 +-
g10/t-stutter.c | 1 +
g10/test-stubs.c | 20 +
g10/textfilter.c | 1 +
g10/trustdb.c | 10 +-
g13/g13tuple.c | 2 +-
kbx/keybox-blob.c | 24 +-
m4/Makefile.am | 2 +-
m4/pkg.m4 | 214 +
scd/ccid-driver.c | 2 +-
scd/scdaemon.c | 1 +
tests/Makefile.am | 10 +-
tests/gpgscm/LICENSE.TinySCHEME | 31 +
tests/gpgscm/Makefile.am | 59 +
tests/gpgscm/Manual.txt | 444 ++
tests/gpgscm/ffi-private.h | 148 +
tests/gpgscm/ffi.c | 1283 +++++
tests/gpgscm/ffi.h | 30 +
tests/gpgscm/ffi.scm | 44 +
tests/gpgscm/init.scm | 723 +++
tests/gpgscm/lib.scm | 159 +
tests/gpgscm/main.c | 288 ++
tests/gpgscm/opdefines.h | 195 +
tests/gpgscm/private.h | 26 +
tests/gpgscm/repl.scm | 50 +
tests/gpgscm/scheme-config.h | 36 +
tests/gpgscm/scheme-private.h | 228 +
tests/gpgscm/scheme.c | 5169 ++++++++++++++++++++
tests/gpgscm/scheme.h | 266 +
tests/gpgscm/t-child.c | 66 +
tests/gpgscm/t-child.scm | 93 +
tests/gpgscm/tests.scm | 443 ++
tests/migrations/Makefile.am | 23 +-
tests/migrations/common.scm | 39 +
tests/migrations/extended-pkf.scm | 43 +
tests/migrations/extended-pkf.tar.asc | 220 +
...3FDB8809B17C5547779F9D205C45F47CE0217CE.key.asc | 27 -
...43D8AF79796EE107D645A2787A9D9252F924E6F.key.asc | 17 -
...B5ABF3EF9EB8D96B91A0B8C2C4401C91C834C34.key.asc | 20 -
.../pubring.kbx.asc | 39 -
.../trustdb.gpg.asc | 31 -
tests/migrations/extended-private-key-format.test | 57 -
.../from-classic.gpghome/pubring.gpg.asc | 54 -
.../from-classic.gpghome/secring.gpg.asc | 68 -
.../from-classic.gpghome/trustdb.gpg.asc | 31 -
tests/migrations/from-classic.scm | 61 +
tests/migrations/from-classic.tar.asc | 209 +
tests/migrations/from-classic.test | 77 -
tests/openpgp/4gb-packet.scm | 27 +
tests/openpgp/Makefile.am | 95 +-
tests/openpgp/README | 161 +
tests/openpgp/armdetach.scm | 31 +
tests/openpgp/armdetachm.scm | 35 +
tests/openpgp/armencrypt.scm | 30 +
tests/openpgp/armencryptp.scm | 31 +
tests/openpgp/armor.scm | 766 +++
tests/openpgp/armsignencrypt.scm | 30 +
tests/openpgp/armsigs.scm | 30 +
tests/openpgp/clearsig.scm | 107 +
tests/openpgp/conventional-mdc.scm | 65 +
tests/openpgp/conventional.scm | 48 +
tests/openpgp/decrypt-dsa.scm | 29 +
tests/openpgp/decrypt.scm | 29 +
tests/openpgp/default-key.scm | 76 +
tests/openpgp/defs.scm | 134 +
tests/openpgp/detach.scm | 31 +
tests/openpgp/detachm.scm | 35 +
tests/openpgp/ecc.scm | 249 +
tests/openpgp/encrypt-dsa.scm | 45 +
tests/openpgp/encrypt.scm | 60 +
tests/openpgp/encryptp.scm | 31 +
tests/openpgp/export.scm | 99 +
tests/openpgp/finish.scm | 23 +
tests/openpgp/genkey1024.scm | 52 +
tests/openpgp/gpg-agent.conf.tmpl | 2 -
tests/openpgp/gpgtar.scm | 92 +
tests/openpgp/import.scm | 60 +
tests/openpgp/mds.scm | 68 +
tests/openpgp/multisig.scm | 168 +
.../1E28F20E41B54C2D1234D896096495FF57E08D18.asc | 9 +
.../C6A6390E9388CDBAD71EAEA698233FE5E04F001E.asc | 27 +
.../D69102E0F5AC6B6DB8E4D16DA8E18CF46D88CAE3.asc | 27 +
.../EB33B687EB8581AB64D04852A54453E85F3DF62D.asc | 10 +
tests/openpgp/quick-key-manipulation.test | 70 +
tests/openpgp/run-tests.scm | 209 +
tests/openpgp/samplekeys/README | 3 +
.../samplekeys/ed25519-cv25519-sample-1.asc | 21 +
tests/openpgp/samplekeys/rsa-rsa-sample-1.asc | 38 +
tests/openpgp/samplekeys/silent-running.asc | 120 +
tests/openpgp/samplemsgs/clearsig-1-key-1.asc | 17 +
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-1.gpg | Bin 0 -> 207 bytes
tests/openpgp/samplemsgs/enc-1-key-2.asc | 16 +
tests/openpgp/samplemsgs/enc-1-key-2.gpg | Bin 0 -> 486 bytes
tests/openpgp/samplemsgs/enc-2-keys-1.asc | 17 +
tests/openpgp/samplemsgs/enc-2-keys-1.gpg | Bin 0 -> 602 bytes
tests/openpgp/samplemsgs/enc-2-keys-2.asc | 16 +
tests/openpgp/samplemsgs/enc-2-keys-2.gpg | Bin 0 -> 546 bytes
tests/openpgp/samplemsgs/encsig-2-2-keys-3.asc | 35 +
tests/openpgp/samplemsgs/encsig-2-2-keys-3.gpg | Bin 0 -> 937 bytes
tests/openpgp/samplemsgs/encsig-2-2-keys-4.asc | 33 +
tests/openpgp/samplemsgs/encsig-2-2-keys-4.gpg | Bin 0 -> 1016 bytes
tests/openpgp/samplemsgs/encsig-2-keys-1.asc | 18 +
tests/openpgp/samplemsgs/encsig-2-keys-1.gpg | Bin 0 -> 659 bytes
tests/openpgp/samplemsgs/encsig-2-keys-2.asc | 18 +
tests/openpgp/samplemsgs/encsig-2-keys-2.gpg | Bin 0 -> 635 bytes
tests/openpgp/samplemsgs/encsig-2-keys-3.asc | 23 +
tests/openpgp/samplemsgs/encsig-2-keys-3.gpg | Bin 0 -> 812 bytes
tests/openpgp/samplemsgs/encsig-2-keys-4.asc | 23 +
tests/openpgp/samplemsgs/encsig-2-keys-4.gpg | Bin 0 -> 877 bytes
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-1.sig | Bin 0 -> 125 bytes
tests/openpgp/samplemsgs/sig-1-key-2.asc | 12 +
tests/openpgp/samplemsgs/sig-1-key-2.sig | Bin 0 -> 311 bytes
tests/openpgp/samplemsgs/sig-2-keys-1.asc | 15 +
tests/openpgp/samplemsgs/sig-2-keys-1.sig | Bin 0 -> 436 bytes
tests/openpgp/samplemsgs/sig-2-keys-2.asc | 15 +
tests/openpgp/samplemsgs/sig-2-keys-2.sig | Bin 0 -> 436 bytes
tests/openpgp/samplemsgs/signed-1-key-1.asc | 15 +
tests/openpgp/samplemsgs/signed-1-key-1.gpg | 6 +
tests/openpgp/samplemsgs/signed-1-key-2.asc | 12 +
tests/openpgp/samplemsgs/signed-1-key-2.gpg | Bin 0 -> 226 bytes
tests/openpgp/samplemsgs/signed-2-keys-1.asc | 17 +
tests/openpgp/samplemsgs/signed-2-keys-1.gpg | Bin 0 -> 998 bytes
tests/openpgp/samplemsgs/signed-2-keys-2.asc | 24 +
tests/openpgp/samplemsgs/signed-2-keys-2.gpg | Bin 0 -> 549 bytes
tests/openpgp/samplemsgs/signed-data-1.txt | 7 +
tests/openpgp/samplemsgs/signedz0-1-key-1.gpg | Bin 0 -> 382 bytes
tests/openpgp/samplemsgs/signedz0-1-key-2.gpg | Bin 0 -> 220 bytes
tests/openpgp/samplemsgs/signedz0-2-keys-1.gpg | Bin 0 -> 571 bytes
tests/openpgp/samplemsgs/signedz0-2-keys-2.gpg | Bin 0 -> 585 bytes
tests/openpgp/seat.scm | 30 +
tests/openpgp/setup.scm | 129 +
tests/openpgp/signencrypt-dsa.scm | 48 +
tests/openpgp/signencrypt.scm | 39 +
tests/openpgp/sigs-dsa.scm | 43 +
tests/openpgp/sigs.scm | 50 +
tests/openpgp/tofu.scm | 167 +
tests/openpgp/tofu.test | 3 +
tests/openpgp/use-exact-key.scm | 68 +
tests/openpgp/verify.scm | 274 ++
tests/openpgp/version.scm | 24 +
tools/Makefile.am | 38 +-
tools/call-dirmngr.c | 205 +
tools/call-dirmngr.h | 28 +
tools/gpg-connect-agent.c | 10 +
tools/gpg-wks-client.c | 758 +++
tools/gpg-wks-server.c | 1548 ++++++
tools/gpg-wks.h | 61 +
tools/gpgconf.c | 96 +-
tools/gpgtar-extract.c | 2 +-
tools/gpgtar-list.c | 2 +-
tools/gpgtar.c | 25 +-
tools/mime-maker.c | 667 +++
tools/mime-maker.h | 43 +
tools/mime-parser.c | 772 +++
tools/mime-parser.h | 52 +
tools/rfc822parse.h | 2 +-
tools/send-mail.c | 129 +
tools/send-mail.h | 27 +
tools/wks-receive.c | 464 ++
tools/wks-util.c | 65 +
240 files changed, 23774 insertions(+), 1520 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