diff options
| author | Werner Koch <[email protected]> | 2017-07-24 18:05:28 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-07-24 18:09:52 +0000 |
| commit | e7068bf92ec5ca5d440346d43a382c1f625b924d (patch) | |
| tree | c72b3e3b26b38c3efd0e1377809354721bde778c /g10/keylist.c | |
| parent | gpg: Filter keys received via DANE (diff) | |
| download | gnupg-e7068bf92ec5ca5d440346d43a382c1f625b924d.tar.gz gnupg-e7068bf92ec5ca5d440346d43a382c1f625b924d.zip | |
gpg: Store key origin info for new DANE and WKD retrieved keys.
* g10/import.c (apply_meta_data): Remove arg 'merge'. Add arg 'url'.
Implement WKD and DANE key origin.
(import_keys_internal): Add arg 'url' and change all callers.
(import_keys_es_stream): Ditto.
(import): Ditto.
(import_one): Ditto.
* g10/keylist.c (list_keyblock_print): Fix update URL printing.
* g10/call-dirmngr.c (gpg_dirmngr_wkd_get): Add arg 'r_url' to return
the SOURCE. Pass ks_status_cb to assuan_transact.
* g10/keyserver.c (keyserver_import_wkd): Get that URL and pass it to
the import function.
--
Note that this only for new keys. Merging this info will be added
soon.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/keylist.c')
| -rw-r--r-- | g10/keylist.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/keylist.c b/g10/keylist.c index 37a26dc9a..7203d160b 100644 --- a/g10/keylist.c +++ b/g10/keylist.c @@ -1012,9 +1012,9 @@ list_keyblock_print (ctrl_t ctrl, kbnode_t keyblock, int secret, int fpr, key_origin_string (uid->keyorg), mk_datestr (updatestr, sizeof updatestr, uid->keyupdate), - pk->updateurl? "url=":""); - if (pk->updateurl) - print_utf8_string (es_stdout, pk->updateurl); + uid->updateurl? "url=":""); + if (uid->updateurl) + print_utf8_string (es_stdout, uid->updateurl); es_putc ('\n', es_stdout); } |