From a15ed5a1fd5307b3ec1822daf3b138b187db0b5e Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 27 Oct 2016 08:44:19 +0200 Subject: 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 --- g10/gpgv.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'g10/gpgv.c') diff --git a/g10/gpgv.c b/g10/gpgv.c index 2f34e72f1..01138a054 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -358,21 +358,23 @@ keyserver_any_configured (ctrl_t ctrl) } int -keyserver_import_keyid (u32 *keyid, void *dummy) +keyserver_import_keyid (u32 *keyid, void *dummy, int quick) { (void)keyid; (void)dummy; + (void)quick; return -1; } int keyserver_import_fprint (ctrl_t ctrl, const byte *fprint,size_t fprint_len, - struct keyserver_spec *keyserver) + struct keyserver_spec *keyserver, int quick) { (void)ctrl; (void)fprint; (void)fprint_len; (void)keyserver; + (void)quick; return -1; } @@ -392,11 +394,12 @@ keyserver_import_pka (const char *name,unsigned char *fpr) } gpg_error_t -keyserver_import_wkd (ctrl_t ctrl, const char *name, +keyserver_import_wkd (ctrl_t ctrl, const char *name, int quick, unsigned char **fpr, size_t *fpr_len) { (void)ctrl; (void)name; + (void)quick; (void)fpr; (void)fpr_len; return GPG_ERR_BUG; -- cgit v1.2.3