[Pkg-gnupg-commit] [gnupg2] 139/180: gpg, sm: A few more option for --gpgconf-list.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 48671f295ff233765689b6a73021f83ab845a28f
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Dec 16 16:02:02 2016 +0100

    gpg,sm: A few more option for --gpgconf-list.
    
    * g10/gpg.c (gpgconf_list): Add --compliance and
    --default-new-key-algo.
    (parse_compliance_option):
    * sm/gpgsm.c (main) <gpgconf-list>: Add --enable-crl-checks.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 g10/gpg.c  | 2 ++
 sm/gpgsm.c | 1 +
 2 files changed, 3 insertions(+)

diff --git a/g10/gpg.c b/g10/gpg.c
index cab5d53..a8f731b 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1844,6 +1844,8 @@ gpgconf_list (const char *configfile)
   es_printf ("log-file:%lu:\n", GC_OPT_FLAG_NONE);
   es_printf ("debug-level:%lu:\"none:\n", GC_OPT_FLAG_DEFAULT);
   es_printf ("group:%lu:\n", GC_OPT_FLAG_NONE);
+  es_printf ("compliance:%lu:\"%s:\n", GC_OPT_FLAG_DEFAULT, "gnupg");
+  es_printf ("default-new-key-algo:%lu:\n", GC_OPT_FLAG_NONE);
 
   /* The next one is an info only item and should match the macros at
      the top of keygen.c  */
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 79508e6..e0ad3e3 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -1719,6 +1719,7 @@ main ( int argc, char **argv)
 	es_printf ("debug-level:%lu:\"none:\n", GC_OPT_FLAG_DEFAULT);
 	es_printf ("log-file:%lu:\n", GC_OPT_FLAG_NONE);
         es_printf ("disable-crl-checks:%lu:\n", GC_OPT_FLAG_NONE);
+        es_printf ("enable-crl-checks:%lu:\n", GC_OPT_FLAG_NONE);
         es_printf ("disable-trusted-cert-crl-check:%lu:\n", GC_OPT_FLAG_NONE);
         es_printf ("enable-ocsp:%lu:\n", GC_OPT_FLAG_NONE);
         es_printf ("include-certs:%lu:%d:\n", GC_OPT_FLAG_DEFAULT,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git