aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2021-04-01 11:19:10 +0000
committerWerner Koch <[email protected]>2021-04-01 11:19:10 +0000
commit9feffc03f36499162342609897484b4b32fd53a7 (patch)
tree734b83e7e652b6d35f652c94a18bdf4b60b6c288
parentgpgconf: Fix argv overflow if --homedir is used. (diff)
downloadgnupg-9feffc03f36499162342609897484b4b32fd53a7.tar.gz
gnupg-9feffc03f36499162342609897484b4b32fd53a7.zip
gpgconf: Return a new pseudo option compliance_de_vs.
* tools/gpgconf-comp.c (gc_options_gpg): Add "compliance_de_vs". * g10/gpg.c (gpgconf_list): Return that pseudo option. Signed-off-by: Werner Koch <[email protected]>
-rw-r--r--g10/gpg.c5
-rw-r--r--tools/gpgconf-comp.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/g10/gpg.c b/g10/gpg.c
index a0b395e91..5a32afe0e 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1906,6 +1906,11 @@ gpgconf_list (const char *configfile)
the top of keygen.c */
es_printf ("default_pubkey_algo:%lu:\"%s:\n", GC_OPT_FLAG_DEFAULT,
get_default_pubkey_algo ());
+ /* This info only mode tells whether the we are running in de-vs
+ * compliance mode. This does not test all parameters but the basic
+ * conditions like a proper RNG and Libgcrypt. */
+ es_printf ("compliance_de_vs:%lu:%d:\n", GC_OPT_FLAG_DEFAULT,
+ gnupg_rng_is_compliant (CO_DE_VS));
xfree (configfile_esc);
}
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index db3fac698..d4b6d0a3f 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -725,6 +725,10 @@ static gc_option_t gc_options_gpg[] =
(GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_NO_CHANGE), GC_LEVEL_INVISIBLE,
NULL, NULL,
GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
+ { "compliance_de_vs",
+ (GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_NO_CHANGE), GC_LEVEL_INVISIBLE,
+ NULL, NULL,
+ GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
{ "trust-model",
GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
NULL, NULL,