diff options
| author | Werner Koch <[email protected]> | 2017-07-13 16:22:36 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-07-13 16:29:01 +0000 |
| commit | 330212efb927c119bb5135856f8582c0e4e2e6b7 (patch) | |
| tree | d2e63ee243a7c7ab81b2d943a31f981c2c15b8e1 /g10/keyserver-internal.h | |
| parent | gpg: New option --key-origin. (diff) | |
| download | gnupg-330212efb927c119bb5135856f8582c0e4e2e6b7.tar.gz gnupg-330212efb927c119bb5135856f8582c0e4e2e6b7.zip | |
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 <[email protected]>
Diffstat (limited to 'g10/keyserver-internal.h')
| -rw-r--r-- | g10/keyserver-internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/keyserver-internal.h b/g10/keyserver-internal.h index 02452e88a..46a1e1d9f 100644 --- a/g10/keyserver-internal.h +++ b/g10/keyserver-internal.h @@ -40,7 +40,7 @@ int keyserver_import_keyid (ctrl_t ctrl, u32 *keyid, struct keyserver_spec *keyserver, int quick); gpg_error_t keyserver_refresh (ctrl_t ctrl, strlist_t users); gpg_error_t keyserver_search (ctrl_t ctrl, strlist_t tokens); -int keyserver_fetch (ctrl_t ctrl, strlist_t urilist); +int keyserver_fetch (ctrl_t ctrl, strlist_t urilist, int origin); int keyserver_import_cert (ctrl_t ctrl, const char *name, int dane_mode, unsigned char **fpr,size_t *fpr_len); gpg_error_t keyserver_import_pka (ctrl_t ctrl, const char *name, |