Werner Koch
84c993d932
gpg: Store key origin for new userids during import merge.
...
* g10/import.c (apply_meta_data): Rename to ...
(insert_key_origin): this. Factor code out to ...
(insert_key_origin_pk, insert_key_origin_uid): new funcs.
(import_one): Move insert_key_origin behind clean_key.
(merge_blocks): Add args options, origin, and url.
(append_uid): Rename to ...
(append_new_uid): this. Add args options, curtime, origin, and url.
Call insert_key_origin_uid for new UIDs.
--
This is a straightforward change to handle new user ids.
How to test:
With an empty keyring run
gpg --with-key-origin --locate-key \
--auto-key-locate clear,nodefault,wkd wk@gnupg.org
and then append a new keyid using
gpg --with-key-origin --locate-key \
--auto-key-locate clear,nodefault,wkd wk@g10code.com
Works with my current key 80615870F5BAD690333686D0F2AD85AC1E42B367.
Signed-off-by: Werner Koch <wk@gnupg.org>
2017-07-25 10:34:50 +02:00
..
2017-05-11 18:12:37 +02:00
2017-05-10 11:13:12 +09:00
2017-07-20 18:13:40 +02:00
2017-07-24 17:18:42 +02:00
2017-07-24 17:18:42 +02:00
2017-07-24 20:09:52 +02:00
2017-07-24 20:09:52 +02:00
2017-07-21 11:22:38 +09:00
2016-11-02 12:53:58 +01:00
2017-03-07 20:25:54 +09:00
2017-04-11 13:52:19 +09:00
2017-03-07 20:25:54 +09:00
2017-05-30 14:30:43 +02:00
2017-03-07 20:25:54 +09:00
2017-06-23 12:01:20 +02:00
2017-03-07 20:25:54 +09:00
2016-11-05 12:02:19 +01:00
2017-03-31 20:07:20 +02:00
2016-12-20 10:22:05 +01:00
2017-03-07 20:25:54 +09:00
2017-07-17 15:53:16 +02:00
2017-03-07 20:25:54 +09:00
2016-11-05 12:02:19 +01:00
2017-07-24 16:03:25 +02:00
2017-03-07 20:25:54 +09:00
2017-07-21 17:49:10 +02:00
2017-07-24 21:10:58 +02:00
2015-02-04 09:15:34 +01:00
2017-07-24 21:10:58 +02:00
2017-03-31 21:27:16 +02:00
2015-02-04 09:15:34 +01:00
2017-06-14 09:35:47 +02:00
2017-03-07 20:25:54 +09:00
2016-11-05 12:02:19 +01:00
2017-06-21 15:51:10 +02:00
2017-03-07 20:25:54 +09:00
2017-07-25 10:34:50 +02:00
2017-03-29 12:08:31 +02:00
2017-06-14 09:35:47 +02:00
2017-06-14 09:35:47 +02:00
2017-03-31 20:08:23 +02:00
2017-07-20 18:13:40 +02:00
2017-07-21 18:15:01 +02:00
2017-07-21 18:15:01 +02:00
2017-06-20 10:46:52 +02:00
2017-07-20 18:13:40 +02:00
2017-07-24 20:09:52 +02:00
2017-05-08 14:33:11 +02:00
2017-03-31 20:07:20 +02:00
2017-07-13 18:29:01 +02:00
2017-07-24 21:10:58 +02:00
2017-07-24 20:09:52 +02:00
2017-07-21 20:03:59 +02:00
2017-07-10 18:09:42 +02:00
2017-03-07 20:25:54 +09:00
2017-03-07 20:25:54 +09:00
2017-06-07 16:53:32 +02:00
2017-05-02 18:55:32 +09:00
2017-07-24 21:10:58 +02:00
2017-07-20 18:13:40 +02:00
2017-07-13 18:29:01 +02:00
2017-03-31 20:07:20 +02:00
2017-03-07 20:25:54 +09:00
2016-11-05 12:02:19 +01:00
2017-06-07 16:53:32 +02:00
2017-03-07 20:25:54 +09:00
2016-11-05 12:02:19 +01:00
2017-03-07 20:25:54 +09:00
2017-03-07 20:25:54 +09:00
2017-06-23 12:01:20 +02:00
2017-01-23 19:16:55 +01:00
2017-03-31 20:07:20 +02:00
2017-02-21 13:11:46 -05:00
2016-11-05 12:02:19 +01:00
2017-03-07 20:32:09 +09:00
2017-03-07 20:25:54 +09:00
2017-04-28 10:06:33 +09:00
2017-06-19 19:57:11 +02:00
2017-07-17 15:53:16 +02:00
2017-05-22 09:27:36 +09:00
2017-03-30 16:01:52 +02:00
2015-11-17 14:53:03 +01:00
2015-09-02 15:08:57 +02:00
2016-11-05 12:02:19 +01:00
2016-11-05 12:02:19 +01:00
2016-03-08 14:08:49 +01:00
2017-05-10 11:13:03 +09:00
2017-03-31 20:07:20 +02:00
2017-04-28 10:06:33 +09:00
2017-03-31 20:07:20 +02:00
2017-03-31 20:07:20 +02:00
2017-04-24 14:14:05 +02:00
2017-03-07 20:25:54 +09:00
2017-07-10 18:09:42 +02:00
2016-12-06 12:16:56 +01:00
2017-03-31 20:07:20 +02:00
2017-04-28 10:06:33 +09:00
2017-03-31 20:07:20 +02:00
2017-04-28 10:06:33 +09:00
2016-11-05 12:02:19 +01:00