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 /sm/gpgsm.c | |
| 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 'sm/gpgsm.c')
| -rw-r--r-- | sm/gpgsm.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; |