gpg: Pass key origin values to import functions.
authorWerner Koch <wk@gnupg.org>
Thu, 13 Jul 2017 16:22:36 +0000 (18:22 +0200)
committerWerner Koch <wk@gnupg.org>
Thu, 13 Jul 2017 16:29:01 +0000 (18:29 +0200)
commit330212efb927c119bb5135856f8582c0e4e2e6b7
treed2e63ee243a7c7ab81b2d943a31f981c2c15b8e1
parentfa1155e89ebb4b16ee95549b8ab72672df3a0c54
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 <wk@gnupg.org>
g10/card-util.c
g10/gpg.c
g10/import.c
g10/keyserver-internal.h
g10/keyserver.c
g10/main.h