summaryrefslogtreecommitdiff
path: root/g10/gpgv.c
diff options
context:
space:
mode:
Diffstat (limited to 'g10/gpgv.c')
-rw-r--r--g10/gpgv.c27
1 files changed, 19 insertions, 8 deletions
diff --git a/g10/gpgv.c b/g10/gpgv.c
index ac4b1fe..71adb04 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -420,23 +420,33 @@ keyserver_any_configured (ctrl_t ctrl)
}
int
-keyserver_import_keyid (u32 *keyid, void *dummy, int quick)
+keyserver_import_keyid (u32 *keyid, void *dummy, unsigned int flags)
{
(void)keyid;
(void)dummy;
- (void)quick;
+ (void)flags;
return -1;
}
int
keyserver_import_fprint (ctrl_t ctrl, const byte *fprint,size_t fprint_len,
- struct keyserver_spec *keyserver, int quick)
+ struct keyserver_spec *keyserver, unsigned int flags)
{
(void)ctrl;
(void)fprint;
(void)fprint_len;
(void)keyserver;
- (void)quick;
+ (void)flags;
+ return -1;
+}
+
+int
+keyserver_import_fprint_ntds (ctrl_t ctrl,
+ const byte *fprint, size_t fprint_len)
+{
+ (void)ctrl;
+ (void)fprint;
+ (void)fprint_len;
return -1;
}
@@ -456,19 +466,19 @@ keyserver_import_pka (const char *name,unsigned char *fpr)
}
gpg_error_t
-keyserver_import_wkd (ctrl_t ctrl, const char *name, int quick,
+keyserver_import_wkd (ctrl_t ctrl, const char *name, unsigned int flags,
unsigned char **fpr, size_t *fpr_len)
{
(void)ctrl;
(void)name;
- (void)quick;
+ (void)flags;
(void)fpr;
(void)fpr_len;
return GPG_ERR_BUG;
}
int
-keyserver_import_name (const char *name,struct keyserver_spec *spec)
+keyserver_import_mbox (const char *name,struct keyserver_spec *spec)
{
(void)name;
(void)spec;
@@ -574,13 +584,14 @@ check_secret_key (PKT_public_key *pk, int n)
*/
DEK *
passphrase_to_dek (int cipher_algo, STRING2KEY *s2k, int create, int nocache,
- const char *tmp, int *canceled)
+ const char *tmp, unsigned int flags, int *canceled)
{
(void)cipher_algo;
(void)s2k;
(void)create;
(void)nocache;
(void)tmp;
+ (void)flags;
if (canceled)
*canceled = 0;