diff options
| author | Werner Koch <[email protected]> | 2017-12-18 11:05:02 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-12-18 11:05:31 +0000 |
| commit | 8c878ae4c9dfa9fe26aa15f4f9db3e86833575e9 (patch) | |
| tree | e9e476ce236184585fa6c9cb38554e7791a2077b | |
| parent | po: Update Japanese translation. (diff) | |
| download | gnupg-8c878ae4c9dfa9fe26aa15f4f9db3e86833575e9.tar.gz gnupg-8c878ae4c9dfa9fe26aa15f4f9db3e86833575e9.zip | |
sm: Allow explicit setting of the default --compliance=gnupg
* sm/gpgsm.c (main): Allow setting of the default compliance.
* tools/gpgconf-comp.c (gc_options_gpgsm): Add "compliance".
--
This is required so that we can use this option in in gpgconf.conf.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | doc/examples/gpgconf.conf | 7 | ||||
| -rw-r--r-- | sm/gpgsm.c | 2 | ||||
| -rw-r--r-- | tools/gpgconf-comp.c | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/doc/examples/gpgconf.conf b/doc/examples/gpgconf.conf index f40160249..95e463b6e 100644 --- a/doc/examples/gpgconf.conf +++ b/doc/examples/gpgconf.conf @@ -31,8 +31,7 @@ # # Example file: #========== -# :staff gpg-agent allow-mark-trusted [change] -# gpg-agent min-passphrase-len 6 +# :staff gpg-agent min-passphrase-len 6 [change] # # * gpg-agent min-passphrase-len [no-change] 8 # gpg-agent min-passphrase-nonalpha [no-change] 1 @@ -42,9 +41,9 @@ # gpg-agent enforce-passphrase-constraints [no-change] # gpg-agent max-cache-ttl [no-change] 10800 # gpg-agent max-cache-ttl-ssh [no-change] 10800 -# gpg-agent allow-mark-trusted [default] -# gpg-agent allow-mark-trusted [no-change] # gpgsm enable-ocsp +# gpg compliance [no-change] +# gpgsm compliance [no-change] #=========== # All users in the group "staff" are allowed to change the value for # --allow-mark-trusted; gpgconf's default is not to allow a change diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 0feda90b1..b505be154 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -1450,6 +1450,7 @@ main ( int argc, char **argv) { struct gnupg_compliance_option compliance_options[] = { + { "gnupg", CO_GNUPG }, { "de-vs", CO_DE_VS } }; int compliance = gnupg_parse_compliance_option (pargs.r.ret_str, @@ -1786,6 +1787,7 @@ main ( int argc, char **argv) proc_parameters actually implements. */ es_printf ("default_pubkey_algo:%lu:\"%s:\n", GC_OPT_FLAG_DEFAULT, "RSA-2048"); + es_printf ("compliance:%lu:\"%s:\n", GC_OPT_FLAG_DEFAULT, "gnupg"); } break; diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index 9ce752b18..dd562d256 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -833,6 +833,9 @@ static gc_option_t gc_options_gpgsm[] = (GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_NO_CHANGE), GC_LEVEL_INVISIBLE, NULL, NULL, GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM }, + { "compliance", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE, + NULL, NULL, + GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM }, { "Debug", GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED, |