gnupg

mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00

History

gpg: Make sure to mark a duplicate registered keybox as primary.

* kbx/keybox-init.c (keybox_register_file): Change interface to return
the token even if the file has already been registered.
* g10/keydb.c (primary_keyring): Rename to primary_keydb.
(maybe_create_keyring_or_box): Change return type to gpg_error_t.
(keydb_add_resource): Ditto. s/rc/err/.
(keydb_add_resource): Mark an already registered as primary.
* sm/keydb.c (maybe_create_keybox): Change return type to gpg_error_t.
(keydb_add_resource): Ditto. s/rc/err/.
(keydb_add_resource): Adjust for changed keybox_register_file.
--

This change aligns the registering of keyboxes with those of
keyrings.  This fixes a potential bug:

  gpg --keyring foo.kbx --keyring bar.gpg --keyring foo.kbx

would have marked bar.gpg as primary resource and thus inserting new
keys there.  The correct and now fixed behavior is to insert to
foo.kbx.

Signed-off-by: Werner Koch <wk@gnupg.org>

2016-01-13 10:43:33 +01:00

ChangeLog-2011

Generate the ChangeLog from commit logs.

2011-12-01 11:09:02 +01:00

kbxutil.c

common: Rename log and gcc attribute macros (jnlib merge).

2015-04-24 16:10:47 +02:00

keybox-blob.c

Fix typos found using codespell.

2015-11-17 12:50:22 +01:00

keybox-defs.h

gpg: Remove dead code.