diff options
| author | Werner Koch <[email protected]> | 2017-07-25 08:19:12 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-07-25 08:34:50 +0000 |
| commit | 84c993d9325fc000acac7950b2dfeefa5976df3b (patch) | |
| tree | 30a52e8b0cb945530be54d6ac8f78c17a8e8b817 /dirmngr/dirmngr.c | |
| parent | dirmngr: Add annotation for fallthrough. (diff) | |
| download | gnupg-84c993d9325fc000acac7950b2dfeefa5976df3b.tar.gz gnupg-84c993d9325fc000acac7950b2dfeefa5976df3b.zip | |
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 [email protected]
and then append a new keyid using
gpg --with-key-origin --locate-key \
--auto-key-locate clear,nodefault,wkd [email protected]
Works with my current key 80615870F5BAD690333686D0F2AD85AC1E42B367.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'dirmngr/dirmngr.c')
0 files changed, 0 insertions, 0 deletions