diff options
| author | Werner Koch <wk@gnupg.org> | 2016-10-27 08:44:19 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2016-10-27 09:06:10 +0200 |
| commit | a15ed5a1fd5307b3ec1822daf3b138b187db0b5e (patch) | |
| tree | de308cfd919343fc9b8109ae1b2c547401140ede /g10/keyserver-internal.h | |
| parent | common: Fix gnupg_inotify_has_name, differently. (diff) | |
| download | gnupg2-a15ed5a1fd5307b3ec1822daf3b138b187db0b5e.tar.xz gnupg2-a15ed5a1fd5307b3ec1822daf3b138b187db0b5e.zip | |
gpg: Convey --quick option to dirmngr for --auto-key-retrieve.
* g10/call-dirmngr.c (gpg_dirmngr_ks_get): Add arg 'quick'.
(gpg_dirmngr_wkd_get): Ditto.
* g10/keyserver.c (keyserver_get): Add arg 'quick'.
(keyserver_get_chunk): Add arg 'quick'.
(keyserver_import_fprint): Ditto. Change callers to pass 0 for it.
(keyserver_import_keyid): Ditto.
(keyserver_import_wkd): Ditto.
* g10/mainproc.c (check_sig_and_print): Call the 3 fucntions with
QUICK set.
--
Note that this option has not yet been implemented by dirmngr.
Dirmngr will simply ignore it for now.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/keyserver-internal.h')
| -rw-r--r-- | g10/keyserver-internal.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/keyserver-internal.h b/g10/keyserver-internal.h index f57dcaa53..6988ae08c 100644 --- a/g10/keyserver-internal.h +++ b/g10/keyserver-internal.h @@ -35,9 +35,9 @@ int keyserver_any_configured (ctrl_t ctrl); int keyserver_export (ctrl_t ctrl, strlist_t users); int keyserver_import (ctrl_t ctrl, strlist_t users); int keyserver_import_fprint (ctrl_t ctrl, const byte *fprint,size_t fprint_len, - struct keyserver_spec *keyserver); + struct keyserver_spec *keyserver, int quick); int keyserver_import_keyid (ctrl_t ctrl, u32 *keyid, - struct keyserver_spec *keyserver); + 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); @@ -45,7 +45,7 @@ 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, unsigned char **fpr,size_t *fpr_len); -gpg_error_t keyserver_import_wkd (ctrl_t ctrl, const char *name, +gpg_error_t keyserver_import_wkd (ctrl_t ctrl, const char *name, int quick, unsigned char **fpr, size_t *fpr_len); int keyserver_import_name (ctrl_t ctrl, const char *name,unsigned char **fpr,size_t *fpr_len, |