From 330212efb927c119bb5135856f8582c0e4e2e6b7 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 13 Jul 2017 18:22:36 +0200 Subject: gpg: Pass key origin values to import functions. * g10/import.c (import_keys_stream): Remove this unused function. (import_keys_internal): Add arg origin. (import_keys): Ditto. (import_keys_es_stream): Ditto. (import): Ditto. (import_one): Ditto. (apply_meta_data): New stub. (import_secret_one): Pass 0 for ORIGIN. * g10/keyserver.c (keyserver_get_chunk): For now pass 0 for ORIGIN. (keyserver_fetch): Add arg origin. (keyserver_import_cert): Pass KEYORG_DANE for ORIGIN. (keyserver_import_wkd): Pass KEYORG_WKD for ORIGIN. * g10/gpg.c (main): Pass OPT.KEY_ORIGIN to import_keys and keyserver_fetch. * g10/card-util.c (fetch_url): Pass KEYORG_URL for ORIGIN. -- This is just the framework; applying the meta data will be done in another commit. GnuPG-bug-id: 3252 Signed-off-by: Werner Koch --- g10/main.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'g10/main.h') diff --git a/g10/main.h b/g10/main.h index dad0fe3f9..e69ed9da7 100644 --- a/g10/main.h +++ b/g10/main.h @@ -352,15 +352,13 @@ 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 import_keys_stream (ctrl_t ctrl, iobuf_t inp, import_stats_t stats_hd, - unsigned char **fpr, - size_t *fpr_len, unsigned int options); + import_stats_t stats_hd, unsigned int options, int origin); 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); + import_screener_t screener, void *screener_arg, + int origin); 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