From e7068bf92ec5ca5d440346d43a382c1f625b924d Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 24 Jul 2017 20:05:28 +0200 Subject: 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 --- g10/gpg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g10/gpg.c') diff --git a/g10/gpg.c b/g10/gpg.c index e32e14a9d..7495e179d 100644 --- a/g10/gpg.c +++ b/g10/gpg.c @@ -4515,7 +4515,7 @@ main (int argc, char **argv) opt.import_options |= IMPORT_FAST; /* fall through */ case aImport: import_keys (ctrl, argc? argv:NULL, argc, NULL, - opt.import_options, opt.key_origin); + opt.import_options, opt.key_origin, NULL); break; /* TODO: There are a number of command that use this same -- cgit v1.2.3