1
0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-08 12:44:23 +01:00
Werner Koch 9dc355ad3a
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
..
2014-10-31 14:21:34 +01:00
2015-08-06 17:00:41 +09:00
2007-07-04 19:49:40 +00:00
2014-11-13 12:01:42 +01:00
2015-05-01 13:58:18 +09:00
2015-02-04 09:15:34 +01:00
2016-01-08 17:22:32 +01:00
2015-02-04 09:15:34 +01:00
2015-11-17 12:50:22 +01:00
2016-01-09 11:28:42 +01:00
2016-01-08 17:22:32 +01:00
2015-10-05 19:48:47 +02:00
2015-12-21 20:56:29 +09:00
2015-10-05 19:48:47 +02:00
2015-12-22 15:03:56 +01:00
2015-11-17 12:50:22 +01:00
2015-11-17 12:50:22 +01:00
2008-12-12 08:54:50 +00:00
2015-04-06 13:07:09 +02:00
2015-12-22 15:03:56 +01:00
2015-11-17 12:50:22 +01:00
2015-11-17 12:50:22 +01:00
2016-01-06 08:49:45 +01:00
2015-11-19 15:48:01 +01:00
2014-01-29 17:45:05 +01:00