diff options
| author | David Shaw <[email protected]> | 2006-03-07 20:14:20 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2006-03-07 20:14:20 +0000 |
| commit | 4f9efb7a79b652e0594ffbb120e466dc6732afe6 (patch) | |
| tree | 454c704451edde941e608a220eb62c3c893d383d /g10/options.h | |
| parent | * NEWS: Note --auto-key-locate and that keyservers can handle binary data (diff) | |
| download | gnupg-4f9efb7a79b652e0594ffbb120e466dc6732afe6.tar.gz gnupg-4f9efb7a79b652e0594ffbb120e466dc6732afe6.zip | |
* options.h, gpg.c (main, parse_trust_model), pkclist.c
(check_signatures_trust), mainproc.c (check_sig_and_print,
pka_uri_from_sig), trustdb.c (init_trustdb): Some tweaks to PKA so that it
is a verify-option now.
Diffstat (limited to '')
| -rw-r--r-- | g10/options.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/options.h b/g10/options.h index 422d36b85..65e7cded5 100644 --- a/g10/options.h +++ b/g10/options.h @@ -103,8 +103,6 @@ struct TM_CLASSIC=0, TM_PGP=1, TM_EXTERNAL=2, TM_ALWAYS, TM_DIRECT, TM_AUTO } trust_model; int force_ownertrust; - int pka_trust_increase; /* Valid PKA information increases the trust. */ - int allow_pka_lookup; /* PKA lookups are only done if this is set. */ enum { CO_GNUPG=0, CO_RFC2440, CO_RFC1991, CO_PGP2, CO_PGP6, CO_PGP7, CO_PGP8 @@ -316,6 +314,8 @@ struct { #define VERIFY_SHOW_KEYSERVER_URLS (1<<4) #define VERIFY_SHOW_UID_VALIDITY (1<<5) #define VERIFY_SHOW_UNUSABLE_UIDS (1<<6) +#define VERIFY_PKA_LOOKUP (1<<7) +#define VERIFY_PKA_TRUST_INCREASE (1<<8) #define KEYSERVER_USE_TEMP_FILES (1<<0) #define KEYSERVER_KEEP_TEMP_FILES (1<<1) |