[git] GnuPG - branch, master, updated. gnupg-2.1.19-109-g608124a

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  608124af2c4522c6b9eb6fd70870c199bebc02cd (commit)
       via  d23052b04ebb0ac731aa351650c4084f080c640b (commit)
      from  90932bdad607d06f4f040e3457caddba79ba8b7e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 608124af2c4522c6b9eb6fd70870c199bebc02cd
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Apr 3 16:53:01 2017 +0200

    doc: Add two example profiles.
    
    --

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0c2f2c9..0c78284 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -22,6 +22,7 @@ AM_CPPFLAGS =
 include $(top_srcdir)/am/cmacros.am
 
 examples = examples/README examples/scd-event examples/trustlist.txt	\
+	   examples/vsnfd.prf examples/debug.prf                        \
 	   examples/systemd-user/README 				\
 	   examples/systemd-user/dirmngr.service 			\
 	   examples/systemd-user/dirmngr.socket				\
diff --git a/doc/examples/debug.prf b/doc/examples/debug.prf
new file mode 100644
index 0000000..f635fc8
--- /dev/null
+++ b/doc/examples/debug.prf
@@ -0,0 +1,29 @@
+# debug.prf - Configure options for easier debugging       -*- conf -*-
+#
+# Note that the actual debug options for each component need to be set
+# manually.  Running the component with "--debug help" shows a list of
+# supported values.  To watch the logs this command can be used:
+#
+#   watchgnupg --time-only --force $(gpgconf --list-dirs socketdir)/S.log
+#
+
+[gpg]
+log-file socket://
+verbose
+#debug ipc
+
+[gpgsm]
+log-file socket://
+verbose
+#debug ipc
+
+[gpg-agent]
+log-file socket://
+verbose
+#debug ipc
+#debug-pinentry
+
+[dirmngr]
+log-file socket://
+verbose
+#debug ipc,dns
diff --git a/doc/examples/vsnfd.prf b/doc/examples/vsnfd.prf
new file mode 100644
index 0000000..17c6d4c
--- /dev/null
+++ b/doc/examples/vsnfd.prf
@@ -0,0 +1,21 @@
+# vsnfd.prf - Configure options for the VS-NfD mode           -*- conf -*-
+
+[gpg]
+compliance de-vs
+default-new-key-algo brainpoolP256r1+brainpoolP256r1
+
+[gpgsm]
+enable-crl-checks
+
+[gpg-agent]
+enable-extended-key-format
+default-cache-ttl 900
+max-cache-ttl [] 3600
+no-allow-mark-trusted
+no-allow-external-cache
+enforce-passphrase-constraints
+min-passphrase-len 9
+min-passphrase-nonalpha 0
+
+[dirmngr]
+allow-ocsp

commit d23052b04ebb0ac731aa351650c4084f080c640b
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Apr 3 16:52:37 2017 +0200

    gpgconf: Add --enable-extended-key-format for the agent.
    
    * tools/gpgconf-conf.c: Add option.
    * agent/gpg-agent.c (main) <aGPGConfList>: Add option.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 49b10c1..e23f438 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -1378,6 +1378,8 @@ main (int argc, char **argv )
                  GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
       es_printf ("pinentry-timeout:%lu:0:\n",
                  GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME);
+      es_printf ("enable-extended-key-format:%lu:\n",
+                 GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
 
       agent_exit (0);
     }
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 1055212..0ef3cb4 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -503,6 +503,9 @@ static gc_option_t gc_options_gpg_agent[] =
    { "enable-putty-support", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
      "gnupg", "enable putty support",
      GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
+   { "enable-extended-key-format", GC_OPT_FLAG_RUNTIME, GC_LEVEL_INVISIBLE,
+     NULL, NULL,
+     GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
 
    { "Debug",
      GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,

-----------------------------------------------------------------------

Summary of changes:
 agent/gpg-agent.c      |  2 ++
 doc/Makefile.am        |  1 +
 doc/examples/debug.prf | 29 +++++++++++++++++++++++++++++
 doc/examples/vsnfd.prf | 21 +++++++++++++++++++++
 tools/gpgconf-comp.c   |  3 +++
 5 files changed, 56 insertions(+)
 create mode 100644 doc/examples/debug.prf
 create mode 100644 doc/examples/vsnfd.prf


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org