diff options
| author | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-11-13 09:26:18 +0100 |
|---|---|---|
| committer | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-11-13 09:26:18 +0100 |
| commit | e87a22655de485af790db1d4c51f4bc166a2bbd6 (patch) | |
| tree | 93d088c2bc13d9a26e6f24b70936d998bd1404df /g10/options.h | |
| parent | 6576640b55777bd811a12a188b9b1f3c63653799 (diff) | |
| download | gpg2-e87a22655de485af790db1d4c51f4bc166a2bbd6.tar.gz gpg2-e87a22655de485af790db1d4c51f4bc166a2bbd6.tar.bz2 gpg2-e87a22655de485af790db1d4c51f4bc166a2bbd6.zip | |
Imported Upstream version 2.0.26upstream/2.0.26
Diffstat (limited to 'g10/options.h')
| -rw-r--r-- | g10/options.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/g10/options.h b/g10/options.h index 46f746d..1a13841 100644 --- a/g10/options.h +++ b/g10/options.h @@ -31,7 +31,7 @@ #if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE) #define EXTERN_UNLESS_MAIN_MODULE extern #else -#define EXTERN_UNLESS_MAIN_MODULE +#define EXTERN_UNLESS_MAIN_MODULE #endif #endif @@ -80,12 +80,16 @@ struct int def_cert_level; int min_cert_level; int ask_cert_level; - int no_version; + int emit_version; /* 0 = none, + 1 = major only, + 2 = major and minor, + 3 = full version, + 4 = full version plus OS string. */ int marginals_needed; int completes_needed; int max_cert_depth; const char *homedir; - const char *agent_program; + const char *agent_program; /* Options to be passed to the gpg-agent */ session_env_t session_env; @@ -207,7 +211,7 @@ struct /* If > 0, limit the number of card insertion prompts to this value. */ - int limit_card_insert_tries; + int limit_card_insert_tries; #ifdef ENABLE_CARD_SUPPORT /* FIXME: We don't needs this here as it is done in scdaemon. */ @@ -227,6 +231,7 @@ struct unsigned int utf8_filename:1; unsigned int dsa2:1; unsigned int allow_multiple_messages:1; + unsigned int allow_weak_digest_algos:1; } flags; /* Linked list of ways to find a key if the key isn't on the local @@ -236,8 +241,8 @@ struct enum { AKL_NODEFAULT, AKL_LOCAL, - AKL_CERT, - AKL_PKA, + AKL_CERT, + AKL_PKA, AKL_LDAP, AKL_KEYSERVER, AKL_SPEC @@ -317,6 +322,7 @@ EXTERN_UNLESS_MAIN_MODULE int memory_stat_debug_mode; #define IMPORT_MERGE_ONLY (1<<4) #define IMPORT_MINIMAL (1<<5) #define IMPORT_CLEAN (1<<6) +#define IMPORT_NO_SECKEY (1<<7) #define EXPORT_LOCAL_SIGS (1<<0) #define EXPORT_ATTRIBUTES (1<<1) |