summaryrefslogtreecommitdiffstats
path: root/g10/trustdb.h
diff options
context:
space:
mode:
authorDavid Shaw <dshaw@jabberwocky.com>2002-12-26 23:22:50 +0100
committerDavid Shaw <dshaw@jabberwocky.com>2002-12-26 23:22:50 +0100
commitf3f1015f6a82482dd6075343d41f4aca1e795e48 (patch)
treec67b1a5f42380195a65378b229867eadce93d278 /g10/trustdb.h
parent* iobuf.c (iobuf_flush): Only print debug info if debugging is on. (diff)
downloadgnupg2-f3f1015f6a82482dd6075343d41f4aca1e795e48.tar.xz
gnupg2-f3f1015f6a82482dd6075343d41f4aca1e795e48.zip
* keydb.h, getkey.c (key_byname): Flag to enable or disable including
disabled keys. Keys specified via keyid (i.e. 0x...) are always included. * getkey.c (get_pubkey_byname, get_seckey_byname2, get_seckey_bynames), keyedit.c (keyedit_menu, menu_addrevoker): Include disabled keys in these functions. * pkclist.c (build_pk_list): Do not include disabled keys for -r or the key prompt. Do include disabled keys for the default key and --encrypt-to. * trustdb.h, trustdb.c (is_disabled): New skipfnc for skipping disabled keys. * gpgv.c (is_disabled): Stub. * keygen.c (keygen_add_key_expire): Properly handle updating a key expiration to a no-expiration value. * keyedit.c (enable_disable_key): Comment. * import.c (import_one): When in interactive mode and --verbose, don't repeat some key information twice.
Diffstat (limited to 'g10/trustdb.h')
-rw-r--r--g10/trustdb.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/g10/trustdb.h b/g10/trustdb.h
index 414543844..3ca674ece 100644
--- a/g10/trustdb.h
+++ b/g10/trustdb.h
@@ -51,6 +51,7 @@ const char *trust_string (unsigned int value);
void revalidation_mark (void);
int trustdb_pending_check(void);
+int is_disabled(void *dummy,u32 *keyid);
unsigned int get_validity (PKT_public_key *pk, const byte *namehash);
int get_validity_info (PKT_public_key *pk, const byte *namehash);