1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-10 23:49:50 +02:00
gnupg/g10
Justus Winter 22739433e9
gpg: Properly account for ring trust packets.
* g10/keyring.c (keyring_get_keyblock): Use the parser's packet count
instead of counting ourself.
* g10/packet.h (struct parse_packet_ctx_s): New field
'n_parsed_packets'.
(init_parse_packet): Initialize new field.
* g10/parse-packet.c (parse): Count packets.
--

The 'keyring' keystore depends on the number of packets for delete and
update operations.  With the rework of the ring trust packets, the
trust packets were no longer properly accounted for leading to keyring
corruptions.

The 'keybox' store was not affected.

GnuPG-bug-id: 3123
GnuPG-bug-id: 3135
GnuPG-bug-id: 3144
Fixes-commit: a8895c99a7
Signed-off-by: Justus Winter <justus@g10code.com>
2017-05-08 14:33:11 +02:00
..
armor.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
build-packet.c gpg: Fix actual leak and possible leaks in the packet parser. 2017-03-30 16:01:52 +02:00
call-agent.c Spelling fixes in docs and comments. 2017-04-28 10:06:33 +09:00
call-agent.h agent,g10: Remove redundant SERIALNO request. 2017-03-16 14:32:51 +09:00
call-dirmngr.c gpg: Pass CTRL to many more functions. 2017-03-31 20:07:20 +02:00
call-dirmngr.h Change all http://www.gnu.org in license notices to https:// 2016-11-05 12:02:19 +01:00
card-util.c gpg: Pass CTRL to many more functions. 2017-03-31 20:07:20 +02:00
ChangeLog-2011 Spelling: correct spelling of "passphrase". 2016-11-02 12:53:58 +01:00
cipher.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
compress-bz2.c g10,tools: Fix bzlib.h include order. 2017-04-11 13:52:19 +09:00
compress.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
cpr.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
dearmor.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
decrypt-data.c g10: Fix memory leak. 2017-03-28 12:11:02 +02:00
decrypt.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
dek.h Change all http://www.gnu.org in license notices to https:// 2016-11-05 12:02:19 +01:00
delkey.c gpg: Pass CTRL to many more functions. 2017-03-31 20:07:20 +02:00
distsigkey.gpg build: Update distributed signature key. 2016-12-20 10:22:05 +01:00
ecdh.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
encrypt.c gpg: Pass CTRL to many more functions. 2017-03-31 20:07:20 +02:00
exec.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
exec.h Change all http://www.gnu.org in license notices to https:// 2016-11-05 12:02:19 +01:00
export.c g10: Minor fixes. 2017-04-17 09:15:13 +09:00
filter.h Remove -I option to common. 2017-03-07 20:25:54 +09:00
free-packet.c gpg: Fix actual leak and possible leaks in the packet parser. 2017-03-30 16:01:52 +02:00
getkey.c Spelling fixes in docs and comments. 2017-04-28 10:06:33 +09:00
gpg-w32info.rc w32: Add manifest to gpg. 2015-02-04 09:15:34 +01:00
gpg.c Spelling fixes in docs and comments. 2017-04-28 10:06:33 +09:00
gpg.h gpg: Avoid multiple open calls to the keybox file. 2017-03-31 21:27:16 +02:00
gpg.w32-manifest.in w32: Add manifest to gpg. 2015-02-04 09:15:34 +01:00
gpgcompose.c common: Simplify format_text. 2017-04-12 14:47:30 +09:00
gpgsql.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
gpgsql.h Change all http://www.gnu.org in license notices to https:// 2016-11-05 12:02:19 +01:00
gpgv.c gpg: Pass CTRL to many more functions. 2017-03-31 20:07:20 +02:00
helptext.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
import.c Spelling fixes in docs and comments. 2017-04-28 10:06:33 +09:00
kbnode.c gpg: Extend free_packet to handle a packet parser context. 2017-03-29 12:08:31 +02:00
keydb.c gpg: Print more stats for the keydb and the signature cache. 2017-03-31 20:08:23 +02:00
keydb.h Spelling fixes in docs and comments. 2017-04-28 10:06:33 +09:00
keyedit.c Spelling fixes in docs and comments. 2017-04-28 10:06:33 +09:00
keygen.c gpg: Pass CTRL to many more functions. 2017-03-31 20:07:20 +02:00
keyid.c gpg: Pass CTRL to many more functions. 2017-03-31 20:07:20 +02:00
keylist.c Spelling fixes in docs and comments. 2017-04-28 10:06:33 +09:00
keyring.c gpg: Properly account for ring trust packets. 2017-05-08 14:33:11 +02:00
keyring.h gpg: Pass CTRL to many more functions. 2017-03-31 20:07:20 +02:00
keyserver-internal.h Remove -I option to common. 2017-03-07 20:25:54 +09:00
keyserver.c gpg: Pass CTRL to many more functions. 2017-03-31 20:07:20 +02:00
main.h g10: Minor clean up. 2017-04-26 11:39:28 +09:00
mainproc.c gpg: Pass CTRL to many more functions. 2017-03-31 20:07:20 +02:00
Makefile.am g10: Remove skeleton options files. 2017-05-02 18:55:32 +09:00
mdfilter.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
migrate.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
misc.c common, g10: Fix enumeration types. 2017-04-13 12:54:52 +09:00
openfile.c g10: Remove skeleton options files. 2017-05-02 18:55:32 +09:00
options.h gpg: Remove unused stuff. 2017-03-20 08:40:21 +01:00
packet.h gpg: Properly account for ring trust packets. 2017-05-08 14:33:11 +02:00
parse-packet.c gpg: Properly account for ring trust packets. 2017-05-08 14:33:11 +02:00
passphrase.c gpg: Pass CTRL to many more functions. 2017-03-31 20:07:20 +02:00
photoid.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
photoid.h Change all http://www.gnu.org in license notices to https:// 2016-11-05 12:02:19 +01:00
pkclist.c gpg: Pass CTRL to many more functions. 2017-03-31 20:07:20 +02:00
pkglue.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
pkglue.h Change all http://www.gnu.org in license notices to https:// 2016-11-05 12:02:19 +01:00
plaintext.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
progress.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
pubkey-enc.c gpg: Pass CTRL to many more functions. 2017-03-31 20:07:20 +02:00
pubring.asc Update copyright notices for 2017. 2017-01-23 19:16:55 +01:00
revoke.c gpg: Pass CTRL to many more functions. 2017-03-31 20:07:20 +02:00
rmd160.c Clean up word replication. 2017-02-21 13:11:46 -05:00
rmd160.h Change all http://www.gnu.org in license notices to https:// 2016-11-05 12:02:19 +01:00
seckey-cert.c More change for common. 2017-03-07 20:32:09 +09:00
server.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
seskey.c Spelling fixes in docs and comments. 2017-04-28 10:06:33 +09:00
sig-check.c gpg: Print more stats for the keydb and the signature cache. 2017-03-31 20:08:23 +02:00
sign.c g10: Minor clean up. 2017-04-26 11:39:28 +09:00
skclist.c g10: For signing, prefer available card key when no -u option. 2017-04-27 10:33:58 +09:00
sqrtu32.c Update copyright notices for 2017. 2017-01-23 19:16:55 +01:00
sqrtu32.h g10: Add missing sqrtu32.h and sqrtu32.c. 2016-09-07 08:55:17 +02:00
t-keydb-get-keyblock.c gpg: Fix actual leak and possible leaks in the packet parser. 2017-03-30 16:01:52 +02:00
t-keydb-get-keyblock.gpg gpg: Correctly handle keyblocks followed by legacy keys. 2015-11-17 14:53:03 +01:00
t-keydb-keyring.kbx g10: Add test for keydb as well as new testing infrastructure. 2015-09-02 15:08:57 +02:00
t-keydb.c Change all http://www.gnu.org in license notices to https:// 2016-11-05 12:02:19 +01:00
t-rmd160.c Change all http://www.gnu.org in license notices to https:// 2016-11-05 12:02:19 +01:00
t-stutter-data.asc gpg: Add a new test. 2016-03-08 14:08:49 +01:00
t-stutter.c tests: Locate resources and scripts relative to top source dir. 2017-04-24 14:14:05 +02:00
tdbdump.c gpg: Pass CTRL to many more functions. 2017-03-31 20:07:20 +02:00
tdbio.c Spelling fixes in docs and comments. 2017-04-28 10:06:33 +09:00
tdbio.h gpg: Pass CTRL to many more functions. 2017-03-31 20:07:20 +02:00
test-stubs.c gpg: Pass CTRL to many more functions. 2017-03-31 20:07:20 +02:00
test.c tests: Locate resources and scripts relative to top source dir. 2017-04-24 14:14:05 +02:00
textfilter.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
tofu.c Spelling fixes in docs and comments. 2017-04-28 10:06:33 +09:00
tofu.h g10: Remove dead code. 2016-12-06 12:16:56 +01:00
trust.c gpg: Pass CTRL to many more functions. 2017-03-31 20:07:20 +02:00
trustdb.c Spelling fixes in docs and comments. 2017-04-28 10:06:33 +09:00
trustdb.h gpg: Pass CTRL to many more functions. 2017-03-31 20:07:20 +02:00
verify.c Spelling fixes in docs and comments. 2017-04-28 10:06:33 +09:00
zlib-riscos.h Change all http://www.gnu.org in license notices to https:// 2016-11-05 12:02:19 +01:00