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/main.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'g10/main.h') diff --git a/g10/main.h b/g10/main.h index e69ed9da7..87417ee37 100644 --- a/g10/main.h +++ b/g10/main.h @@ -352,13 +352,14 @@ void restore_import_filter (import_filter_t filt); gpg_error_t read_key_from_file (ctrl_t ctrl, const char *fname, kbnode_t *r_keyblock); void import_keys (ctrl_t ctrl, char **fnames, int nnames, - import_stats_t stats_hd, unsigned int options, int origin); + import_stats_t stats_hd, unsigned int options, + int origin, const char *url); int import_keys_es_stream (ctrl_t ctrl, estream_t fp, import_stats_t stats_handle, unsigned char **fpr, size_t *fpr_len, unsigned int options, import_screener_t screener, void *screener_arg, - int origin); + int origin, const char *url); gpg_error_t import_old_secring (ctrl_t ctrl, const char *fname); import_stats_t import_new_stats_handle (void); void import_release_stats_handle (import_stats_t hd); -- cgit v1.2.3