From cvs at cvs.gnupg.org  Mon Oct  3 09:01:46 2016
From: cvs at cvs.gnupg.org (by Ineiev)
Date: Mon, 03 Oct 2016 09:01:46 +0200
Subject: [git] Pinentry - branch, master, updated. pinentry-0.9.7-30-gdb3b2bf
Message-ID: <E1bqxG0-0002Na-IX@lists.gnupg.org>

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 standard pinentry collection".

The branch, master has been updated
       via  db3b2bf0c7ae4d3d0fbeecfe6a9a77ea4ed0f84e (commit)
       via  f0ae2986708614bce9070eec77309e838c403db7 (commit)
       via  aa969a09a1225f8fb683ba8d0c3ccc099dd8d1d3 (commit)
      from  4c5ae72d481ffd24ff93accee0b42e9b264285f2 (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 db3b2bf0c7ae4d3d0fbeecfe6a9a77ea4ed0f84e
Author: Ineiev <ineiev at gnu.org>
Date:   Fri Apr 8 15:33:05 2016 +0300

    tty: Provide default text for "notok".
    
    * tty/pinentry-tty.c (confirm): Provide default text for "notok".
    
    --
    
    gniibe changed the commit message.

diff --git a/tty/pinentry-tty.c b/tty/pinentry-tty.c
index a36c588..cef6947 100644
--- a/tty/pinentry-tty.c
+++ b/tty/pinentry-tty.c
@@ -211,7 +211,7 @@ confirm (pinentry_t pinentry, FILE *ttyfi, FILE *ttyfo)
 	cancel = button (pinentry->default_cancel, "Cancel", ttyfo);
 
       if (pinentry->notok)
-	notok = button (pinentry->notok, NULL, ttyfo);
+	notok = button (pinentry->notok, "No", ttyfo);
     }
 
   if (cbreak (fileno (ttyfi)) == -1)

commit f0ae2986708614bce9070eec77309e838c403db7
Author: Ineiev <ineiev at gnu.org>
Date:   Fri Apr 8 15:26:33 2016 +0300

    tty: Fix underscore processing in accelerators.
    
    * tty/pinentry-tty.c (button): Fix underscore processing in
    accelerators.

diff --git a/tty/pinentry-tty.c b/tty/pinentry-tty.c
index d36a667..a36c588 100644
--- a/tty/pinentry-tty.c
+++ b/tty/pinentry-tty.c
@@ -84,10 +84,15 @@ button (char *text, char *default_text, FILE *ttyfo)
     {
       highlight = highlight + 1;
       if (*highlight == '_')
-	/* Escaped underscore.  */
-	continue;
-      else
-	break;
+        {
+          /* Escaped underscore.  Skip both characters.  */
+          highlight++;
+          continue;
+        }
+      if (!isalnum (*highlight))
+        /* Unusable accelerator.  */
+        continue;
+      break;
     }
 
   if (! highlight)
@@ -98,8 +103,8 @@ button (char *text, char *default_text, FILE *ttyfo)
 	highlight ++;
     }
 
-  if (! highlight)
-    /* Hmm, no alpha-num characters.  */
+  if (! *highlight)
+    /* Hmm, no alpha-numeric characters.  */
     {
       if (! default_text)
 	return 0;
@@ -111,7 +116,11 @@ button (char *text, char *default_text, FILE *ttyfo)
     {
       /* Skip accelerator prefix.  */
       if (*text == '_')
-	continue;
+        {
+          text ++;
+          if (! *text)
+            break;
+        }
 
       if (text == highlight)
 	fputs (UNDERLINE_START, ttyfo);

commit aa969a09a1225f8fb683ba8d0c3ccc099dd8d1d3
Author: Ineiev <ineiev at gnu.org>
Date:   Fri Apr 8 15:17:59 2016 +0300

    tty: Refactor usage of tolower.
    
    * tty/pinentry-tty.c (button): Apply tolower to the result.
    * tty/pinentry-tty.c (confirm): Compare lowercased character instead of
    converting them every time.
    
    --
    
    gniibe changed the original patch to keep output to TTY.

diff --git a/tty/pinentry-tty.c b/tty/pinentry-tty.c
index 4e71edf..d36a667 100644
--- a/tty/pinentry-tty.c
+++ b/tty/pinentry-tty.c
@@ -121,7 +121,7 @@ button (char *text, char *default_text, FILE *ttyfo)
     }
   fputc ('\n', ttyfo);
 
-  return *highlight;
+  return tolower (*highlight);
 }
 
 static void
@@ -223,17 +223,18 @@ confirm (pinentry_t pinentry, FILE *ttyfi, FILE *ttyfo)
         {
           fputc ('[', ttyfo);
           if (ok)
-            fputc (tolower (ok), ttyfo);
+            fputc (ok, ttyfo);
           if (cancel)
-            fputc (tolower (cancel), ttyfo);
+            fputc (cancel, ttyfo);
           if (notok)
-            fputc (tolower (notok), ttyfo);
+            fputc (notok, ttyfo);
           fputs("]? ", ttyfo);
         }
       fflush (ttyfo);
 
       input = fgetc (ttyfi);
       fprintf (ttyfo, "%c\n", input);
+      input = tolower (input);
 
       if (input == EOF || input == 0x4)
 	/* End of file or control-d (= end of file).  */
@@ -251,18 +252,18 @@ confirm (pinentry_t pinentry, FILE *ttyfi, FILE *ttyfo)
 	  break;
 	}
 
-      if (cancel && (input == toupper (cancel) || input == tolower (cancel)))
+      if (cancel && input == cancel)
 	{
 	  pinentry->canceled = 1;
 	  ret = 0;
 	  break;
 	}
-      else if (notok && (input == toupper (notok) || input == tolower (notok)))
+      else if (notok && input == notok)
 	{
 	  ret = 0;
 	  break;
 	}
-      else if (ok && (input == toupper (ok) || input == tolower (ok)))
+      else if (ok && input == ok)
 	{
 	  ret = 1;
 	  break;

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

Summary of changes:
 tty/pinentry-tty.c | 40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
The standard pinentry collection
http://git.gnupg.org



From cvs at cvs.gnupg.org  Tue Oct  4 02:23:28 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Tue, 04 Oct 2016 02:23:28 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-189-geda1764
Message-ID: <E1brDW7-000859-1Y@lists.gnupg.org>

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  eda17649f8bd3b8ce7bfc00a3c11cbcae63c845d (commit)
      from  a43739a2456a38c01704d8a52dca441055e29bc6 (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 eda17649f8bd3b8ce7bfc00a3c11cbcae63c845d
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Oct 4 09:01:13 2016 +0900

    agent, dirmngr, scd: npth_init must be after fork.
    
    * agent/gpg-agent.c (thread_init_once, initialize_modules): New.
    (main): Make sure no daemonizing-fork call after npth_init, and no npth
    calls before npth_init, with care of npth calls by assuan hooks.
    * dirmngr/dirmngr.c (thread_init): New.
    (main): Make sure npth_init must not be called before daemonizing fork.
    * scd/scdaemon.c (main): Likewise.
    
    --
    
    It is simply the best for nPth not to allow the daemonizing fork after
    npth_init, because semantics and implementations of forked child process
    in a threaded application is a difficult corner case.
    
    GnuPG-bug-id: 1779
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 15202ac..e65198a 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -718,6 +718,29 @@ finalize_rereadable_options (void)
 }
 
 
+static void
+thread_init_once (void)
+{
+  static int npth_initialized = 0;
+
+  if (!npth_initialized)
+    {
+      npth_initialized++;
+      npth_init ();
+    }
+}
+
+static void
+initialize_modules (void)
+{
+  thread_init_once ();
+  assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
+  initialize_module_cache ();
+  initialize_module_call_pinentry ();
+  initialize_module_call_scd ();
+  initialize_module_trustlist ();
+}
+
 
 /* The main entry point.  */
 int
@@ -765,14 +788,11 @@ main (int argc, char **argv )
   i18n_init ();
   init_common_subsystems (&argc, &argv);
 
-  npth_init ();
-
   malloc_hooks.malloc = gcry_malloc;
   malloc_hooks.realloc = gcry_realloc;
   malloc_hooks.free = gcry_free;
   assuan_set_malloc_hooks (&malloc_hooks);
   assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
-  assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
   assuan_sock_init ();
   setup_libassuan_logging (&opt.debug, NULL);
 
@@ -1080,16 +1100,12 @@ main (int argc, char **argv )
       exit (1);
     }
 
-  initialize_module_cache ();
-  initialize_module_call_pinentry ();
-  initialize_module_call_scd ();
-  initialize_module_trustlist ();
-
   /* Try to create missing directories. */
   create_directories ();
 
   if (debug_wait && pipe_server)
     {
+      thread_init_once ();
       log_debug ("waiting for debugger - my pid is %u .....\n",
                  (unsigned int)getpid());
       gnupg_sleep (debug_wait);
@@ -1196,6 +1212,8 @@ main (int argc, char **argv )
       /* This is the simple pipe based server */
       ctrl_t ctrl;
 
+      initialize_modules ();
+
       ctrl = xtrycalloc (1, sizeof *ctrl);
       if (!ctrl)
         {
@@ -1403,6 +1421,8 @@ main (int argc, char **argv )
          This is the child
        */
 
+      initialize_modules ();
+
       /* Detach from tty and put process into a new session */
       if (!nodetach )
         {
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 64d93b7..621c2bb 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -647,6 +647,22 @@ pid_suffix_callback (unsigned long *r_suffix)
 #endif /*!HAVE_W32_SYSTEM*/
 
 
+static void
+thread_init (void)
+{
+  npth_init ();
+
+  /* Now with NPth running we can set the logging callback.  Our
+     windows implementation does not yet feature the NPth TLS
+     functions.  */
+#ifndef HAVE_W32_SYSTEM
+  if (npth_key_create (&my_tlskey_current_fd, NULL) == 0)
+    if (npth_setspecific (my_tlskey_current_fd, NULL) == 0)
+      log_set_pid_suffix_cb (pid_suffix_callback);
+#endif /*!HAVE_W32_SYSTEM*/
+}
+
+
 int
 main (int argc, char **argv)
 {
@@ -680,8 +696,6 @@ main (int argc, char **argv)
   i18n_init ();
   init_common_subsystems (&argc, &argv);
 
-  npth_init ();
-
   gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
 
  /* Check that the libraries are suitable.  Do it here because
@@ -722,15 +736,6 @@ main (int argc, char **argv)
   if (shell && strlen (shell) >= 3 && !strcmp (shell+strlen (shell)-3, "csh") )
     csh_style = 1;
 
-    /* Now with NPth running we can set the logging callback.  Our
-     windows implementation does not yet feature the NPth TLS
-     functions.  */
-#ifndef HAVE_W32_SYSTEM
-  if (npth_key_create (&my_tlskey_current_fd, NULL) == 0)
-    if (npth_setspecific (my_tlskey_current_fd, NULL) == 0)
-      log_set_pid_suffix_cb (pid_suffix_callback);
-#endif /*!HAVE_W32_SYSTEM*/
-
   /* Reset rereadable options to default values. */
   parse_rereadable_options (NULL, 0);
 
@@ -981,6 +986,7 @@ main (int argc, char **argv)
       ldap_wrapper_launch_thread ();
 #endif /*USE_LDAP*/
 
+      thread_init ();
       cert_cache_init ();
       crl_cache_init ();
       start_command_handler (ASSUAN_INVALID_FD);
@@ -1179,6 +1185,7 @@ main (int argc, char **argv)
       ldap_wrapper_launch_thread ();
 #endif /*USE_LDAP*/
 
+      thread_init ();
       cert_cache_init ();
       crl_cache_init ();
       handle_connections (fd);
@@ -1206,6 +1213,7 @@ main (int argc, char **argv)
 #if USE_LDAP
       ldap_wrapper_launch_thread ();
 #endif /*USE_LDAP*/
+      thread_init ();
       cert_cache_init ();
       crl_cache_init ();
       if (!argc)
@@ -1231,6 +1239,7 @@ main (int argc, char **argv)
 #if USE_LDAP
       ldap_wrapper_launch_thread ();
 #endif /*USE_LDAP*/
+      thread_init ();
       cert_cache_init ();
       crl_cache_init ();
       rc = crl_fetch (&ctrlbuf, argv[0], &reader);
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index bf54d95..3571e66 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -422,8 +422,6 @@ main (int argc, char **argv )
   i18n_init ();
   init_common_subsystems (&argc, &argv);
 
-  npth_init ();
-
   ksba_set_malloc_hooks (gcry_malloc, gcry_realloc, gcry_free);
 
   malloc_hooks.malloc = gcry_malloc;
@@ -724,6 +722,8 @@ main (int argc, char **argv )
       }
 #endif
 
+      npth_init ();
+
       /* If --debug-allow-core-dump has been given we also need to
          switch the working directory to a place where we can actually
          write. */
@@ -861,6 +861,8 @@ main (int argc, char **argv )
 
       /* This is the child. */
 
+      npth_init ();
+
       /* Detach from tty and put process into a new session. */
       if (!nodetach )
         {

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

Summary of changes:
 agent/gpg-agent.c | 36 ++++++++++++++++++++++++++++--------
 dirmngr/dirmngr.c | 31 ++++++++++++++++++++-----------
 scd/scdaemon.c    |  6 ++++--
 3 files changed, 52 insertions(+), 21 deletions(-)


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



From cvs at cvs.gnupg.org  Tue Oct  4 09:40:23 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 04 Oct 2016 09:40:23 +0200
Subject: [git] Pinentry - branch, master, updated. pinentry-0.9.7-31-g777650b
Message-ID: <E1brKKw-0001Ze-98@lists.gnupg.org>

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 standard pinentry collection".

The branch, master has been updated
       via  777650b9b021342ba887543396c67f9148218caf (commit)
      from  db3b2bf0c7ae4d3d0fbeecfe6a9a77ea4ed0f84e (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 777650b9b021342ba887543396c67f9148218caf
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Oct 4 09:36:39 2016 +0200

    core: Add a way to print ERROR status lines.
    
    * pinentry/pinentry.h (struct pinentry): New fields SPECIFIC_ERR_LOC
    and SPECIFIC_ERR_INFO.
    * pinentry/pinentry.c (pinentry_reset): Free the new field.
    (write_status_error): New.
    (cmd_getpin): Use new fields.
    (cmd_confirm): Ditto.
    * gnome3/pinentry-gnome3.c (create_prompt): Set error for failed
    GCR_PROMPT.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/gnome3/pinentry-gnome3.c b/gnome3/pinentry-gnome3.c
index 8f91cb8..f8968c9 100644
--- a/gnome3/pinentry-gnome3.c
+++ b/gnome3/pinentry-gnome3.c
@@ -82,6 +82,9 @@ create_prompt (pinentry_t pe, int confirm)
     {
       g_warning ("couldn't create prompt for gnupg passphrase: %s",
 		 error->message);
+      pe->specific_err_loc = "gcr_prompt";
+      pe->specific_err_info = strdup (error->message);
+      pe->specific_err = gpg_error (GPG_ERR_CONFIGURATION);
       g_error_free (error);
       return NULL;
     }
diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c
index 0c87271..e5cb806 100644
--- a/pinentry/pinentry.c
+++ b/pinentry/pinentry.c
@@ -132,6 +132,7 @@ pinentry_reset (int use_defaults)
   free (pinentry.quality_bar);
   free (pinentry.quality_bar_tt);
   free (pinentry.keyinfo);
+  free (pinentry.specific_err_info);
 
   /* Reset the pinentry structure.  */
   memset (&pinentry, 0, sizeof (pinentry));
@@ -947,6 +948,27 @@ strcpy_escaped (char *d, const char *s)
 }
 
 
+static void
+write_status_error (assuan_context_t ctx, pinentry_t pe)
+{
+  char buf[500];
+  const char *pgm;
+
+  pgm = strchr (this_pgmname, '-');
+  if (pgm && pgm[1])
+    pgm++;
+  else
+    pgm = this_pgmname;
+
+  snprintf (buf, sizeof buf, "%s.%s %d %s",
+            pgm,
+            pe->specific_err_loc? pe->specific_err_loc : "?",
+            pe->specific_err,
+            pe->specific_err_info? pe->specific_err_info : "");
+  assuan_write_status (ctx, "ERROR", buf);
+}
+
+
 static gpg_error_t
 cmd_setdesc (assuan_context_t ctx, char *line)
 {
@@ -1261,6 +1283,9 @@ cmd_getpin (assuan_context_t ctx, char *line)
     }
   pinentry.locale_err = 0;
   pinentry.specific_err = 0;
+  pinentry.specific_err_loc = NULL;
+  free (pinentry.specific_err_info);
+  pinentry.specific_err_info = NULL;
   pinentry.close_button = 0;
   pinentry.repeat_okay = 0;
   pinentry.one_button = 0;
@@ -1289,7 +1314,10 @@ cmd_getpin (assuan_context_t ctx, char *line)
     {
       pinentry_setbuffer_clear (&pinentry);
       if (pinentry.specific_err)
-        return pinentry.specific_err;
+        {
+          write_status_error (ctx, &pinentry);
+          return pinentry.specific_err;
+        }
       return (pinentry.locale_err
 	      ? gpg_error (GPG_ERR_LOCALE_PROBLEM)
 	      : gpg_error (GPG_ERR_CANCELED));
@@ -1337,6 +1365,9 @@ cmd_confirm (assuan_context_t ctx, char *line)
   pinentry.close_button = 0;
   pinentry.locale_err = 0;
   pinentry.specific_err = 0;
+  pinentry.specific_err_loc = NULL;
+  free (pinentry.specific_err_info);
+  pinentry.specific_err_info = NULL;
   pinentry.canceled = 0;
   pinentry_setbuffer_clear (&pinentry);
   result = (*pinentry_cmd_handler) (&pinentry);
@@ -1353,7 +1384,10 @@ cmd_confirm (assuan_context_t ctx, char *line)
     return 0;
 
   if (pinentry.specific_err)
-    return pinentry.specific_err;
+    {
+      write_status_error (ctx, &pinentry);
+      return pinentry.specific_err;
+    }
 
   if (pinentry.locale_err)
     return gpg_error (GPG_ERR_LOCALE_PROBLEM);
diff --git a/pinentry/pinentry.h b/pinentry/pinentry.h
index b203cfe..50d5f98 100644
--- a/pinentry/pinentry.h
+++ b/pinentry/pinentry.h
@@ -118,6 +118,13 @@ struct pinentry
      passphrase or a negative error code.  */
   int specific_err;
 
+  /* The frontend may store a string with the error location here.  */
+  const char *specific_err_loc;
+
+  /* The frontend may store a malloced string here to emit an ERROR
+   * status code with this extra info along with SPECIFIC_ERR.  */
+  char *specific_err_info;
+
   /* The frontend should set this to true if the window close button
      has been used.  This flag is used in addition to a regular return
      value.  */

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

Summary of changes:
 gnome3/pinentry-gnome3.c |  3 +++
 pinentry/pinentry.c      | 38 ++++++++++++++++++++++++++++++++++++--
 pinentry/pinentry.h      |  7 +++++++
 3 files changed, 46 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The standard pinentry collection
http://git.gnupg.org



From cvs at cvs.gnupg.org  Tue Oct  4 10:43:50 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 04 Oct 2016 10:43:50 +0200
Subject: [git] Pinentry - branch, master, updated. pinentry-0.9.7-32-g65d8e0e
Message-ID: <E1brLKK-0003ch-Os@lists.gnupg.org>

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 standard pinentry collection".

The branch, master has been updated
       via  65d8e0ec19795d9ec60d7f37f1511f65135cfd84 (commit)
      from  777650b9b021342ba887543396c67f9148218caf (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 65d8e0ec19795d9ec60d7f37f1511f65135cfd84
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Oct 4 10:35:52 2016 +0200

    gnome3: Drop unnecessary use of gtk
    
    * configure.ac: pinentry-gnome3 only needs gcr-base, not gcr.
    * gnome3/pinentry-gnome3.c (main): Instead of testing whether GTK can
    be loaded, check for DBUS_SESSION_BUS_ADDRESS.
    (create_prompt): Use fprintf (stderr, ...) instead of g_warning (...),
    to align with the rest of pinentry.c.
    --
    
    pinentry-gnome3 really just uses gcr and libsecret -- there is no
    direct use of gtk at all.  By linking only to the minimal gcr-base-3
    and avoiding gcr-3 itself, we remove many unnecessary library
    dependencies from pinentry-gnome3.
    
    Specifically, "ldd $(which pinentry-gnome3) | wc -l" goes from 69 to
    23 on debian testing.
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
    
    Added missing LF.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/configure.ac b/configure.ac
index 41e9d93..1620ebd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -476,15 +476,15 @@ AM_CONDITIONAL(BUILD_PINENTRY_GTK_2, test "$pinentry_gtk_2" = "yes")
 
 if test "$pinentry_gnome_3" != "no"; then
 	AC_MSG_CHECKING([for gcr])
-	"${PKG_CONFIG}" --exists gcr-3,gcr-base-3
+	"${PKG_CONFIG}" --exists gcr-base-3
 	if test $? -ne 0 ; then
 		AC_MSG_RESULT([no])
-		AC_MSG_WARN([pkg-config could not find the module gcr-3,gcr-base-3])
+		AC_MSG_WARN([pkg-config could not find the module gcr-base-3])
 		pinentry_gnome_3=no
 	else
 		AC_MSG_RESULT([yes])
-		GNOME3CFLAGS=`"${PKG_CONFIG}" --cflags gcr-3,gcr-base-3`
-		GNOME3LIBS=`"${PKG_CONFIG}" --libs gcr-3,gcr-base-3`
+		GNOME3CFLAGS=`"${PKG_CONFIG}" --cflags gcr-base-3`
+		GNOME3LIBS=`"${PKG_CONFIG}" --libs gcr-base-3`
 		AC_SUBST(GNOME3CFLAGS)
 		AC_SUBST(GNOME3LIBS)
 		AC_DEFINE(GCR_API_SUBJECT_TO_CHANGE, 1, [Nod nod])
diff --git a/gnome3/pinentry-gnome3.c b/gnome3/pinentry-gnome3.c
index f8968c9..d6d7d16 100644
--- a/gnome3/pinentry-gnome3.c
+++ b/gnome3/pinentry-gnome3.c
@@ -22,10 +22,10 @@
 # include "config.h"
 #endif
 
-#include <gtk/gtk.h>
 #include <gcr/gcr-base.h>
 
 #include <string.h>
+#include <stdlib.h>
 
 #include <assuan.h>
 
@@ -80,8 +80,8 @@ create_prompt (pinentry_t pe, int confirm)
   prompt = GCR_PROMPT (gcr_system_prompt_open (-1, NULL, &error));
   if (! prompt)
     {
-      g_warning ("couldn't create prompt for gnupg passphrase: %s",
-		 error->message);
+      fprintf (stderr, "couldn't create prompt for gnupg passphrase: %s\n",
+               error->message);
       pe->specific_err_loc = "gcr_prompt";
       pe->specific_err_info = strdup (error->message);
       pe->specific_err = gpg_error (GPG_ERR_CONFIGURATION);
@@ -188,7 +188,7 @@ gnome3_cmd_handler (pinentry_t pe)
 
       /* "The returned password is valid until the next time a method
 	 is called to display another prompt."  */
-      password = gcr_prompt_password_run (prompt, NULL, &error);
+      password = gcr_prompt_password (prompt, NULL, &error);
       if (error)
 	/* Error.  */
 	{
@@ -264,15 +264,12 @@ main (int argc, char *argv[])
   pinentry_init (PGMNAME);
 
 #ifdef FALLBACK_CURSES
-  if (pinentry_have_display (argc, argv))
+  if (!getenv ("DBUS_SESSION_BUS_ADDRESS"))
     {
-      if (! gtk_init_check (&argc, &argv))
-	pinentry_cmd_handler = curses_cmd_handler;
+      fprintf (stderr, "No $DBUS_SESSION_BUS_ADDRESS found,"
+               " falling back to curses\n");
+      pinentry_cmd_handler = curses_cmd_handler;
     }
-  else
-    pinentry_cmd_handler = curses_cmd_handler;
-#else
-  gtk_init (&argc, &argv);
 #endif
 
   pinentry_parse_opts (argc, argv);

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

Summary of changes:
 configure.ac             |  8 ++++----
 gnome3/pinentry-gnome3.c | 19 ++++++++-----------
 2 files changed, 12 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
The standard pinentry collection
http://git.gnupg.org



From cvs at cvs.gnupg.org  Tue Oct  4 14:11:28 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Tue, 04 Oct 2016 14:11:28 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-193-g4a232d2
Message-ID: <E1brOZI-0003Xh-Bj@lists.gnupg.org>

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  4a232d23a8f51bebf9ee382e480248b4bde30f28 (commit)
       via  41b510f9c510f8fd1b59eb0c5dd2e2b2deaf0a1b (commit)
       via  949e70115eb2c04bd09da6477f6c433e6fd9a366 (commit)
       via  fbc83c0cdd390473c044953fb774571ffc636c6d (commit)
      from  eda17649f8bd3b8ce7bfc00a3c11cbcae63c845d (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 4a232d23a8f51bebf9ee382e480248b4bde30f28
Author: Justus Winter <justus at g10code.com>
Date:   Fri Sep 30 16:22:40 2016 +0200

    build,w32: Unconditionally build tests.
    
    * configure.ac (run_tests, RUN_TESTS, RUN_GPG_TESTS): Remove
    variables.  They are misleadingly named, as they inhibit building the
    tests.  There is no reason not to build the tests even when
    cross-compiling, as they are only run if one does 'make check'.
    * Makefile: Adapt accordingly.
    * tests/Makefile.am: Adapt accordingly.  Avoid building 'asschk' on
    Windows as it uses non-portable functions.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/Makefile.am b/Makefile.am
index b589e72..7950980 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -90,15 +90,9 @@ else
 doc =
 endif
 
-if RUN_TESTS
-tests = tests
-else
-tests =
-endif
-
 SUBDIRS = m4 common kbx \
           ${gpg} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
-          ${tools} po ${doc} ${tests}
+          ${tools} po ${doc} tests
 
 dist_doc_DATA = README
 
diff --git a/configure.ac b/configure.ac
index 85cd69a..9c591ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -626,7 +626,6 @@ have_dosish_system=no
 have_w32_system=no
 have_w32ce_system=no
 have_android_system=no
-run_tests=yes
 use_simple_gettext=no
 use_ldapwrapper=yes
 mmap_needed=yes
@@ -643,7 +642,6 @@ case "${host}" in
         have_dosish_system=yes
         have_w32_system=yes
         require_iconv=no
-        run_tests=no
         use_ldapwrapper=no  # Fixme: Do this only for CE.
         case "${host}" in
           *-mingw32ce*)
@@ -702,7 +700,6 @@ case "${host}" in
         # Android is fully utf-8 and we do not want to use iconv to
         # keeps things simple
         require_iconv=no
-        run_tests=no
         ;;
     *)
        ;;
@@ -733,11 +730,6 @@ if test "$have_android_system" = yes; then
 fi
 AM_CONDITIONAL(HAVE_ANDROID_SYSTEM, test "$have_android_system" = yes)
 
-if test "$run_tests" = yes; then
-   AC_DEFINE(RUN_TESTS,1, [Defined if we should run the tests])
-fi
-AM_CONDITIONAL(RUN_TESTS, test "$run_tests" = yes)
-
 
 # (These need to go after AC_PROG_CC so that $EXEEXT is defined)
 AC_DEFINE_UNQUOTED(EXEEXT,"$EXEEXT",[The executable file extension, if any])
@@ -1693,9 +1685,6 @@ AM_CONDITIONAL(ENABLE_CARD_SUPPORT, test "$card_support" = yes)
 AM_CONDITIONAL(NO_TRUST_MODELS,     test "$use_trust_models" = no)
 AM_CONDITIONAL(USE_TOFU,            test "$use_tofu" = yes)
 
-AM_CONDITIONAL(RUN_GPG_TESTS,
-               test x$cross_compiling = xno -a "$build_gpg" = yes )
-
 #
 # Set some defines for use gpgconf.
 #
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d72f51e..6ede0d4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,14 +18,7 @@
 
 ## Process this file with automake to produce Makefile.in
 
-
-if RUN_GPG_TESTS
-openpgp = openpgp
-else
-openpgp =
-endif
-
-SUBDIRS = gpgscm ${openpgp} . migrations pkits
+SUBDIRS = gpgscm openpgp migrations pkits .
 
 GPGSM = ../sm/gpgsm
 
@@ -66,7 +59,9 @@ CLEANFILES = inittests.stamp x y y z out err \
 
 DISTCLEANFILES = pubring.kbx~ random_seed
 
+if !HAVE_W32_SYSTEM
 noinst_PROGRAMS = asschk
+endif
 
 asschk_SOURCES = asschk.c
 

commit 41b510f9c510f8fd1b59eb0c5dd2e2b2deaf0a1b
Author: Justus Winter <justus at g10code.com>
Date:   Tue Oct 4 12:59:18 2016 +0200

    tests,w32: Do not expose 'glob' to gpgscm.
    
    * tests/gpgscm/ffi.c (do_glob): Remove function.
    (ffi_init): Likewise.
    --
    'glob' is not available on mingw, and portability is the whole point
    of gpgscm.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/gpgscm/ffi.c b/tests/gpgscm/ffi.c
index 4559f10..829384a 100644
--- a/tests/gpgscm/ffi.c
+++ b/tests/gpgscm/ffi.c
@@ -25,7 +25,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <glob.h>
 #include <gpg-error.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -1025,42 +1024,6 @@ do_string_contains (scheme *sc, pointer args)
   FFI_RETURN_POINTER (sc, strstr (haystack, needle) ? sc->T : sc->F);
 }
 
-static pointer
-do_glob (scheme *sc, pointer args)
-{
-  FFI_PROLOG ();
-  pointer result = sc->NIL;
-  size_t i;
-  char *pattern;
-  glob_t pglob;
-  FFI_ARG_OR_RETURN (sc, char *, pattern, string, args);
-  FFI_ARGS_DONE_OR_RETURN (sc, args);
-
-  switch (glob (pattern, 0, NULL, &pglob))
-    {
-    case 0:
-      for (i = 0; i < pglob.gl_pathc; i++)
-        result =
-          (sc->vptr->cons) (sc,
-                            sc->vptr->mk_string (sc, pglob.gl_pathv[i]),
-                            result);
-      globfree (&pglob);
-      break;
-
-    case GLOB_NOMATCH:
-      /* Return the empty list.  */
-      break;
-
-    case GLOB_NOSPACE:
-      return ffi_sprintf (sc, "out of memory");
-    case GLOB_ABORTED:
-      return ffi_sprintf (sc, "read error");
-    default:
-      assert (! "not reached");
-    }
-  FFI_RETURN_POINTER (sc, result);
-}
-
 

 
 static pointer
@@ -1289,7 +1252,6 @@ ffi_init (scheme *sc, const char *argv0, const char *scriptname,
   ffi_define_function (sc, string_index);
   ffi_define_function (sc, string_rindex);
   ffi_define_function_name (sc, "string-contains?", string_contains);
-  ffi_define_function (sc, glob);
 
   /* User interface.  */
   ffi_define_function (sc, flush_stdio);

commit 949e70115eb2c04bd09da6477f6c433e6fd9a366
Author: Justus Winter <justus at g10code.com>
Date:   Tue Oct 4 12:46:00 2016 +0200

    tests,w32: Avoid using 'glob'.
    
    * tests/openpgp/setup.scm: Avoid 'glob' which is not available on
    mingw.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/openpgp/setup.scm b/tests/openpgp/setup.scm
index d4a3e37..0a9a153 100755
--- a/tests/openpgp/setup.scm
+++ b/tests/openpgp/setup.scm
@@ -127,8 +127,7 @@
    (setenv "GNUPGHOME" (getcwd) #t)
    (create-gpghome)
    (kill-agent)
-   (call-check `(,(tool 'gpgtar) --create --output ,(cadr *args*)
-		 ,@(glob "*")))))
+   (call-check `(,(tool 'gpgtar) --create --output ,(cadr *args*) "."))))
  ((member "--unpack-tarball" *args*)
   (call-check `(,(tool 'gpgtar) --extract --directory=. ,(cadr *args*)))
   (start-agent))

commit fbc83c0cdd390473c044953fb774571ffc636c6d
Author: Justus Winter <justus at g10code.com>
Date:   Tue Oct 4 12:44:14 2016 +0200

    tools: Ignore existing directories in gpgtar.
    
    * tools/gpgtar-extract.c (extract_directory): Ignore existing
    directories now that we have '--directory'.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tools/gpgtar-extract.c b/tools/gpgtar-extract.c
index cee609c..8641126 100644
--- a/tools/gpgtar-extract.c
+++ b/tools/gpgtar-extract.c
@@ -122,11 +122,15 @@ extract_directory (const char *dirname, tar_header_t hdr)
   if (fname[strlen (fname)-1] == '/')
     fname[strlen (fname)-1] = 0;
 
- /* Note that we don't need to care about EEXIST because we always
-     extract into a new hierarchy.  */
   if (! opt.dry_run && gnupg_mkdir (fname, "-rwx------"))
     {
       err = gpg_error_from_syserror ();
+      if (gpg_err_code (err) == GPG_ERR_EEXIST)
+        {
+          /* Ignore existing directories while extracting.  */
+          err = 0;
+        }
+
       if (gpg_err_code (err) == GPG_ERR_ENOENT)
         {
           /* Try to create the directory with parents but keep the

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

Summary of changes:
 Makefile.am             |  8 +-------
 configure.ac            | 11 -----------
 tests/Makefile.am       | 11 +++--------
 tests/gpgscm/ffi.c      | 38 --------------------------------------
 tests/openpgp/setup.scm |  3 +--
 tools/gpgtar-extract.c  |  8 ++++++--
 6 files changed, 11 insertions(+), 68 deletions(-)


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



From cvs at cvs.gnupg.org  Tue Oct  4 17:17:58 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 04 Oct 2016 17:17:58 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-197-g1a9c8d7
Message-ID: <E1brRTm-00029Z-2w@lists.gnupg.org>

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  1a9c8d78ece2f31fdb1a8e2be049aa71053061fa (commit)
       via  afcfae7959f39e7d85309b9496e1f1cf9acd5cc2 (commit)
       via  dc059af1ff007842e2633e686c87d05daf1d45e3 (commit)
       via  9f92b62a51d2d60f038fdbe01602865c5933fa95 (commit)
      from  4a232d23a8f51bebf9ee382e480248b4bde30f28 (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 1a9c8d78ece2f31fdb1a8e2be049aa71053061fa
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Oct 4 17:02:49 2016 +0200

    agent: Streamline the supervised mode code.
    
    * agent/gpg-agent.c (get_socket_path): Rename to ...
    (get_socket_name): this.  This is to comply with the GNU coding guide.
    Use xtrymalloc instead of malloc.  Do not build for W32.
    (map_supervised_sockets): Use strtokenize and set the the socket names
    here.
    (main): Adjust for above change.  Do not close the socket.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 0ebba1e..1696e5a 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -576,6 +576,208 @@ remove_socket (char *name, char *redir_name)
 }
 
 
+/* Return a malloc'ed string that is the path to the passed
+ * unix-domain socket (or return NULL if this is not a valid
+ * unix-domain socket).  We use a plain int here because it is only
+ * used on Linux.
+ *
+ * FIXME: This function needs to be moved to libassuan.  */
+#ifndef HAVE_W32_SYSTEM
+static char *
+get_socket_name (int fd)
+{
+  struct sockaddr_un un;
+  socklen_t len = sizeof(un);
+  char *name = NULL;
+
+  if (getsockname (fd, (struct sockaddr*)&un, &len) != 0)
+    log_error ("could not getsockname(%d): %s\n", fd,
+               gpg_strerror (gpg_error_from_syserror ()));
+  else if (un.sun_family != AF_UNIX)
+    log_error ("file descriptor %d is not a unix-domain socket\n", fd);
+  else if (len <= offsetof (struct sockaddr_un, sun_path))
+    log_error ("socket name not present for file descriptor %d\n", fd);
+  else if (len > sizeof(un))
+    log_error ("socket name for file descriptor %d was truncated "
+               "(passed %lu bytes, wanted %u)\n", fd, sizeof(un), len);
+  else
+    {
+      log_debug ("file descriptor %d has path %s (%lu octets)\n", fd,
+                 un.sun_path, len - offsetof (struct sockaddr_un, sun_path));
+      name = xtrymalloc (len - offsetof (struct sockaddr_un, sun_path) + 1);
+      if (!name)
+        log_error ("failed to allocate memory for name of fd %d: %s\n",
+                   fd, gpg_strerror (gpg_error_from_syserror ()));
+      else
+        {
+          memcpy (name, un.sun_path, len);
+          name[len] = 0;
+        }
+    }
+
+  return name;
+}
+#endif /*!HAVE_W32_SYSTEM*/
+
+
+/* Discover which inherited file descriptors correspond to which
+ * services/sockets offered by gpg-agent, using the LISTEN_FDS and
+ * LISTEN_FDNAMES convention.  The understood labels are "ssh",
+ * "extra", and "browser".  "std" or other labels will be interpreted
+ * as the standard socket.
+ *
+ * This function is designed to log errors when the expected file
+ * descriptors don't make sense, but to do its best to continue to
+ * work even in the face of minor misconfigurations.
+ *
+ * For more information on the LISTEN_FDS convention, see
+ * sd_listen_fds(3) on certain Linux distributions.
+ */
+#ifndef HAVE_W32_SYSTEM
+static void
+map_supervised_sockets (gnupg_fd_t *r_fd,
+                        gnupg_fd_t *r_fd_extra,
+                        gnupg_fd_t *r_fd_browser,
+                        gnupg_fd_t *r_fd_ssh)
+{
+  struct {
+    const char *label;
+    int **fdaddr;
+    char **nameaddr;
+  } tbl[] = {
+    { "ssh",     &r_fd_ssh,     &socket_name_ssh },
+    { "browser", &r_fd_browser, &socket_name_browser },
+    { "extra",   &r_fd_extra,   &socket_name_extra },
+    { "std",     &r_fd,         &socket_name }  /* (Must be the last item.)  */
+  };
+  const char *envvar;
+  char **fdnames;
+  int nfdnames;
+  int fd_count;
+
+  *r_fd = *r_fd_extra = *r_fd_browser = *r_fd_ssh = -1;
+
+  /* Print a warning if LISTEN_PID does not match outr pid.  */
+  envvar = getenv ("LISTEN_PID");
+  if (!envvar)
+    log_error ("no LISTEN_PID environment variable found in "
+               "--supervised mode (ignoring)\n");
+  else if (strtoul (envvar, NULL, 10) != (unsigned long)getpid ())
+    log_error ("environment variable LISTEN_PID (%lu) does not match"
+               " our pid (%lu) in --supervised mode (ignoring)\n",
+               (unsigned long)strtoul (envvar, NULL, 10),
+               (unsigned long)getpid ());
+
+  /* Parse LISTEN_FDNAMES into the array FDNAMES.  */
+  envvar = getenv ("LISTEN_FDNAMES");
+  if (envvar)
+    {
+      fdnames = strtokenize (envvar, ":");
+      if (!fdnames)
+        {
+          log_error ("strtokenize failed: %s\n",
+                     gpg_strerror (gpg_error_from_syserror ()));
+          agent_exit (1);
+        }
+      for (nfdnames=0; fdnames[nfdnames]; nfdnames++)
+        ;
+    }
+  else
+    {
+      fdnames = NULL;
+      nfdnames = 0;
+    }
+
+  /* Parse LISTEN_FDS into fd_count or provide a replacement.  */
+  envvar = getenv ("LISTEN_FDS");
+  if (envvar)
+    fd_count = atoi (envvar);
+  else if (fdnames)
+    {
+      log_error ("no LISTEN_FDS environment variable found in --supervised"
+                 " mode (relying on LISTEN_FDNAMES instead)\n");
+      fd_count = nfdnames;
+    }
+  else
+    {
+      log_error ("no LISTEN_FDS or LISTEN_FDNAMES environment variables "
+                "found in --supervised mode"
+                " (assuming 1 active descriptor)\n");
+      fd_count = 1;
+    }
+
+  if (fd_count < 1)
+    {
+      log_error ("--supervised mode expects at least one file descriptor"
+                 " (was told %d, carrying on as though it were 1)\n",
+                 fd_count);
+      fd_count = 1;
+    }
+
+  /* Assign the descriptors to the return values.  */
+  if (!fdnames)
+    {
+      if (fd_count != 1)
+        log_error ("no LISTEN_FDNAMES and LISTEN_FDS (%d) != 1"
+                   " in --supervised mode."
+                   " (ignoring all sockets but the first one)\n",
+                   fd_count);
+      *r_fd = 3;
+    }
+  else if (fd_count != nfdnames)
+    {
+      log_fatal ("number of items in LISTEN_FDNAMES (%d) does not match "
+                 "LISTEN_FDS (%d) in --supervised mode\n",
+                 nfdnames, fd_count);
+    }
+  else
+    {
+      int i, j, fd;
+      char *name;
+
+      for (i = 0; i < nfdnames; i++)
+        {
+          for (j = 0; j < DIM (tbl); j++)
+            {
+              log_debug ("i=%d j=%d fdname=%s check=%s\n", i, j,
+                         fdnames[i], tbl[j].label);
+              if (!strcmp (fdnames[i], tbl[j].label) || j == DIM(tbl)-1)
+                {
+                  if (**tbl[j].fdaddr == -1)
+                    {
+                      fd = 3 + i;
+                      name = get_socket_name (fd);
+                      if (name)
+                        {
+                          **tbl[j].fdaddr = fd;
+                          *tbl[j].nameaddr = name;
+                          log_info ("using fd %d for %s socket (%s)\n",
+                                    fd, tbl[j].label, name);
+                        }
+                      else
+                        {
+                          log_error ("cannot listen on fd %d for %s socket\n",
+                                     fd, tbl[j].label);
+                          close (i);
+                        }
+                    }
+                  else
+                    {
+                      log_error ("cannot listen on more than one %s socket\n",
+                                 tbl[j].label);
+                      close (i);
+                    }
+                  break;
+                }
+            }
+        }
+    }
+
+  xfree (fdnames);
+}
+#endif /*!HAVE_W32_SYSTEM*/
+
+
 /* Cleanup code for this program.  This is either called has an atexit
    handler or directly.  */
 static void
@@ -756,180 +958,6 @@ initialize_modules (void)
 }
 
 
-/* return a malloc'ed string that is the path to the passed unix-domain socket
-   (or return NULL if this is not a valid unix-domain socket) */
-static char *
-get_socket_path (gnupg_fd_t fd)
-{
-#ifdef HAVE_W32_SYSTEM
-  return NULL;
-#else
-  struct sockaddr_un un;
-  socklen_t len = sizeof(un);
-  char *ret = NULL;
-
-  if (fd == GNUPG_INVALID_FD)
-    return NULL;
-
-  if (getsockname (fd, (struct sockaddr*)&un, &len) != 0)
-    log_error ("could not getsockname(%d) -- error %d (%s)\n", fd,
-               errno, strerror(errno));
-  else if (un.sun_family != AF_UNIX)
-    log_error ("file descriptor %d is not a unix-domain socket\n", fd);
-  else if (len <= offsetof (struct sockaddr_un, sun_path))
-    log_error ("socket path not present for file descriptor %d\n", fd);
-  else if (len > sizeof(un))
-    log_error ("socket path for file descriptor %d was truncated "
-               "(passed %lu bytes, wanted %u)\n", fd, sizeof(un), len);
-  else
-    {
-      log_debug ("file descriptor %d has path %s (%lu octets)\n", fd,
-                 un.sun_path, len - offsetof (struct sockaddr_un, sun_path));
-      ret = malloc(len - offsetof (struct sockaddr_un, sun_path));
-      if (ret == NULL)
-        log_error ("failed to allocate memory for path to file "
-                   "descriptor %d\n", fd);
-      else
-        memcpy (ret, un.sun_path, len);
-    }
-  return ret;
-#endif /* HAVE_W32_SYSTEM */
-}
-
-
-/* Discover which inherited file descriptors correspond to which
-   services/sockets offered by gpg-agent, using the LISTEN_FDS and
-   LISTEN_FDNAMES convention.  The understood labels are "ssh",
-   "extra", and "browser".  Any other label will be interpreted as the
-   standard socket.
-
-   This function is designed to log errors when the expected file
-   descriptors don't make sense, but to do its best to continue to
-   work even in the face of minor misconfigurations.
-
-   For more information on the LISTEN_FDS convention, see
-   sd_listen_fds(3).
- */
-static void
-map_supervised_sockets (gnupg_fd_t *fd,
-                        gnupg_fd_t *fd_extra,
-                        gnupg_fd_t *fd_browser,
-                        gnupg_fd_t *fd_ssh)
-{
-  const char *listen_pid = NULL;
-  const char *listen_fds = NULL;
-  const char *listen_fdnames = NULL;
-  int listen_fd_count = -1;
-  int listen_fdnames_colons = 0;
-  const char *fdnamep = NULL;
-
-  listen_pid = getenv ("LISTEN_PID");
-  listen_fds = getenv ("LISTEN_FDS");
-  listen_fdnames = getenv ("LISTEN_FDNAMES");
-
-  if (!listen_pid)
-    log_error ("no $LISTEN_PID environment variable found in "
-               "--supervised mode (ignoring).\n");
-  else if (atoi (listen_pid) != getpid ())
-    log_error ("$LISTEN_PID (%d) does not match process ID (%d) "
-               "in --supervised mode (ignoring).\n",
-               atoi (listen_pid), getpid ());
-  else
-    log_debug ("$LISTEN_PID matches process ID (%d)\n",
-               getpid());
-
-  if (listen_fdnames)
-    for (fdnamep = listen_fdnames; *fdnamep; fdnamep++)
-      if (*fdnamep == ':')
-        listen_fdnames_colons++;
-  log_debug ("%d colon(s) in $LISTEN_FDNAMES: (%s)\n", listen_fdnames_colons, listen_fdnames);
-
-  if (!listen_fds)
-    {
-      if (!listen_fdnames)
-        {
-          log_error ("no LISTEN_FDS or LISTEN_FDNAMES environment variables "
-                     "found in --supervised mode (assuming 1 active descriptor).\n");
-          listen_fd_count = 1;
-        }
-      else
-        {
-          log_error ("no LISTEN_FDS environment variable found in --supervised "
-                     " mode (relying on colons in LISTEN_FDNAMES instead)\n");
-          listen_fd_count = listen_fdnames_colons + 1;
-        }
-    }
-  else
-    listen_fd_count = atoi (listen_fds);
-
-  if (listen_fd_count < 1)
-    {
-      log_error ("--supervised mode expects at least one file descriptor (was told %d) "
-                 "(carrying on as though it were 1)\n", listen_fd_count);
-      listen_fd_count = 1;
-    }
-
-  if (!listen_fdnames)
-    {
-      if (listen_fd_count != 1)
-        log_error ("no LISTEN_FDNAMES and LISTEN_FDS (%d) != 1 in --supervised mode. "
-                   "(ignoring all sockets but the first one)\n", listen_fd_count);
-      *fd = 3;
-    }
-  else
-    {
-      int i;
-      if (listen_fd_count != listen_fdnames_colons + 1)
-        {
-          log_fatal ("number of items in LISTEN_FDNAMES (%d) does not match "
-                     "LISTEN_FDS (%d) in --supervised mode\n",
-                     listen_fdnames_colons + 1, listen_fd_count);
-          exit (1);
-        }
-
-      for (i = 3; i < 3 + listen_fd_count; i++)
-        {
-          int found = 0;
-          char *next = strchrnul(listen_fdnames, ':');
-          *next = '\0';
-#define match_socket(var) if (!found && strcmp (listen_fdnames, #var) == 0) \
-            {                                                           \
-              found = 1;                                                \
-              if (*fd_ ## var == GNUPG_INVALID_FD)                      \
-                {                                                       \
-                  *fd_ ## var = i;                                      \
-                  log_info (#var " socket on fd %d\n", i);              \
-                }                                                       \
-              else                                                      \
-                {                                                       \
-                  log_error ("cannot listen on more than one " #var " socket. (closing fd %d)\n", i); \
-                  close (i);                                            \
-                }                                                       \
-            }
-          match_socket(ssh);
-          match_socket(browser);
-          match_socket(extra);
-#undef match_socket
-          if (!found)
-            {
-              if (*fd == GNUPG_INVALID_FD)
-                {
-                  *fd = i;
-                  log_info ("standard socket (\"%s\") on fd %d\n",
-                            listen_fdnames, i);
-                }
-              else
-                {
-                  log_error ("cannot listen on more than one standard socket. (closing fd %d)\n", i);
-                  close (i);
-                }
-            }
-          listen_fdnames = next + 1;
-        }
-    }
-}
-
-
 /* The main entry point.  */
 int
 main (int argc, char **argv )
@@ -1425,10 +1453,8 @@ main (int argc, char **argv )
     }
   else if (is_supervised)
     {
-      gnupg_fd_t fd = GNUPG_INVALID_FD;
-      gnupg_fd_t fd_extra = GNUPG_INVALID_FD;
-      gnupg_fd_t fd_browser = GNUPG_INVALID_FD;
-      gnupg_fd_t fd_ssh = GNUPG_INVALID_FD;
+#ifndef HAVE_W32_SYSTEM
+      gnupg_fd_t fd, fd_extra, fd_browser, fd_ssh;
 
       /* when supervised and sending logs to stderr, the process
          supervisor should handle log entry metadata (pid, name,
@@ -1439,29 +1465,17 @@ main (int argc, char **argv )
       log_info ("%s %s starting in supervised mode.\n",
                 strusage(11), strusage(13) );
 
-      /* See below on why we remove certain envvars.  */
-#ifndef HAVE_W32_SYSTEM
+      /* See below in "regular server mode" on why we remove certain
+       * envvars.  */
       if (!opt.keep_display)
         gnupg_unsetenv ("DISPLAY");
-#endif
       gnupg_unsetenv ("INSIDE_EMACS");
 
-      /* Virtually create the sockets.  */
+      /* Virtually create the sockets.  Note that we use -1 here
+       * because the whole thing works only on Unix. */
       map_supervised_sockets (&fd, &fd_extra, &fd_browser, &fd_ssh);
-      if (fd == GNUPG_INVALID_FD)
-        {
-          log_error ("no standard socket provided\n");
-          agent_exit (1);
-        }
-      /* record socket names where possible: */
-      socket_name = get_socket_path (fd);
-      socket_name_extra = get_socket_path (fd_extra);
-      if (socket_name_extra)
-        opt.extra_socket = 2;
-      socket_name_browser = get_socket_path (fd_browser);
-      if (socket_name_browser)
-        opt.browser_socket = 2;
-      socket_name_ssh = get_socket_path (fd_ssh);
+      if (fd == -1)
+        log_fatal ("no standard socket provided\n");
 
 #ifdef HAVE_SIGPROCMASK
       if (startup_signal_mask_valid)
@@ -1477,7 +1491,7 @@ main (int argc, char **argv )
       log_info ("listening on: std=%d extra=%d browser=%d ssh=%d\n",
                 fd, fd_extra, fd_browser, fd_ssh);
       handle_connections (fd, fd_extra, fd_browser, fd_ssh);
-      assuan_sock_close (fd);
+#endif /*!HAVE_W32_SYSTEM*/
     }
   else if (!is_daemon)
     ; /* NOTREACHED */
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 7aacb7b..cc10a79 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -164,12 +164,14 @@ shell, gpg-agent terminates within a few seconds.
 Run in the foreground, sending logs by default to stderr, and
 listening on provided file descriptors, which must already be bound to
 listening sockets.  This command is useful when running under systemd
-or other similar process supervision schemes.
+or other similar process supervision schemes.  This option is not
+supported on Windows.
 
 In --supervised mode, different file descriptors can be provided for
 use as different socket types (e.g. ssh, extra) as long as they are
-identified in the environment variable $LISTEN_FDNAMES (see
-sd_listen_fds(3) for more information on this convention).
+identified in the environment variable @code{LISTEN_FDNAMES} (see
+sd_listen_fds(3) on some Linux distributions for more information on
+this convention).
 @end table
 
 @mansect options

commit afcfae7959f39e7d85309b9496e1f1cf9acd5cc2
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Oct 4 16:57:55 2016 +0200

    agent: Adjust cleanup for supervised mode.  Fix for W32.
    
    * agent/gpg-agent.c (opts) [W32]: Remove option --supervised.
    (is_supervised): Move from main() to global.
    (inhibit_socket_removal): New.
    (cleanup): Take care of supervise mode and INHIBIT_SOCKET_REMOVAL.
    (check_own_socket_thread): Set INHIBIT_SOCKET_REMOVAL instead of
    seting the socket names to empty.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 3e938f5..0ebba1e 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -153,7 +153,9 @@ static ARGPARSE_OPTS opts[] = {
 
   ARGPARSE_s_n (oDaemon,  "daemon", N_("run in daemon mode (background)")),
   ARGPARSE_s_n (oServer,  "server", N_("run in server mode (foreground)")),
-  ARGPARSE_s_n (oSupervised,  "supervised", N_("run supervised (e.g., systemd)")),
+#ifndef HAVE_W32_SYSTEM
+  ARGPARSE_s_n (oSupervised,  "supervised", N_("run in supervised mode")),
+#endif
   ARGPARSE_s_n (oVerbose, "verbose", N_("verbose")),
   ARGPARSE_s_n (oQuiet,	  "quiet",     N_("be somewhat more quiet")),
   ARGPARSE_s_n (oSh,	  "sh",        N_("sh-style command output")),
@@ -323,6 +325,12 @@ static int check_own_socket_running;
 /* Flags to indicate that check_own_socket shall not be called.  */
 static int disable_check_own_socket;
 
+/* Flag indicating that we are in supervised mode.  */
+static int is_supervised;
+
+/* Flag to inhibit socket removal in cleanup.  */
+static int inhibit_socket_removal;
+
 /* It is possible that we are currently running under setuid permissions */
 static int maybe_setuid = 1;
 
@@ -579,12 +587,15 @@ cleanup (void)
     return;
   done = 1;
   deinitialize_module_cache ();
-  remove_socket (socket_name, redir_socket_name);
-  if (opt.extra_socket > 1)
-    remove_socket (socket_name_extra, redir_socket_name_extra);
-  if (opt.browser_socket > 1)
-    remove_socket (socket_name_browser, redir_socket_name_browser);
-  remove_socket (socket_name_ssh, redir_socket_name_ssh);
+  if (!is_supervised && !inhibit_socket_removal)
+    {
+      remove_socket (socket_name, redir_socket_name);
+      if (opt.extra_socket > 1)
+        remove_socket (socket_name_extra, redir_socket_name_extra);
+      if (opt.browser_socket > 1)
+        remove_socket (socket_name_browser, redir_socket_name_browser);
+      remove_socket (socket_name_ssh, redir_socket_name_ssh);
+    }
 }
 
 
@@ -934,7 +945,6 @@ main (int argc, char **argv )
   int default_config =1;
   int pipe_server = 0;
   int is_daemon = 0;
-  int is_supervised = 0;
   int nodetach = 0;
   int csh_style = 0;
   char *logfile = NULL;
@@ -3055,11 +3065,8 @@ check_own_socket_thread (void *arg)
   if (rc)
     {
       /* We may not remove the socket as it is now in use by another
-         server.  Setting the name to empty does this.  */
-      if (socket_name)
-        *socket_name = 0;
-      if (socket_name_ssh)
-        *socket_name_ssh = 0;
+         server. */
+      inhibit_socket_removal = 1;
       shutdown_pending = 2;
       log_info ("this process is useless - shutting down\n");
     }

commit dc059af1ff007842e2633e686c87d05daf1d45e3
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Oct 4 11:23:18 2016 +0200

    agent: Adjust supervised mode for the new default socket names.
    
    * agent/gpg-agent.c (main): In supervised mode do not provide default
    socket names.  Unset DISPLAY and INSIDE_EMACS.  Use log_error and
    agent_exit.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 9221dc3..3e938f5 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -1244,10 +1244,10 @@ main (int argc, char **argv )
       agent_exit (0);
     }
 
-  if (! opt.extra_socket)
-    {
-      opt.extra_socket = 1;
-    }
+  if (is_supervised)
+    ;
+  else if (!opt.extra_socket)
+    opt.extra_socket = 1;
   else if (socket_name_extra
            && (!strcmp (socket_name_extra, "none")
                || !strcmp (socket_name_extra, "/dev/null")))
@@ -1257,10 +1257,10 @@ main (int argc, char **argv )
       socket_name_extra = NULL;
     }
 
-  if (! opt.browser_socket)
-    {
-      opt.browser_socket = 1;
-    }
+  if (is_supervised)
+    ;
+  else if (!opt.browser_socket)
+    opt.browser_socket = 1;
   else if (socket_name_browser
            && (!strcmp (socket_name_browser, "none")
                || !strcmp (socket_name_browser, "/dev/null")))
@@ -1429,11 +1429,19 @@ main (int argc, char **argv )
       log_info ("%s %s starting in supervised mode.\n",
                 strusage(11), strusage(13) );
 
+      /* See below on why we remove certain envvars.  */
+#ifndef HAVE_W32_SYSTEM
+      if (!opt.keep_display)
+        gnupg_unsetenv ("DISPLAY");
+#endif
+      gnupg_unsetenv ("INSIDE_EMACS");
+
+      /* Virtually create the sockets.  */
       map_supervised_sockets (&fd, &fd_extra, &fd_browser, &fd_ssh);
       if (fd == GNUPG_INVALID_FD)
         {
-          log_fatal ("no standard socket provided\n");
-          exit (1);
+          log_error ("no standard socket provided\n");
+          agent_exit (1);
         }
       /* record socket names where possible: */
       socket_name = get_socket_path (fd);
@@ -1456,8 +1464,8 @@ main (int argc, char **argv )
         log_info ("no saved signal mask\n");
 #endif /*HAVE_SIGPROCMASK*/
 
-      log_debug ("FDs: std: %d extra: %d browser: %d ssh: %d\n",
-                 fd, fd_extra, fd_browser, fd_ssh);
+      log_info ("listening on: std=%d extra=%d browser=%d ssh=%d\n",
+                fd, fd_extra, fd_browser, fd_ssh);
       handle_connections (fd, fd_extra, fd_browser, fd_ssh);
       assuan_sock_close (fd);
     }

commit 9f92b62a51d2d60f038fdbe01602865c5933fa95
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Fri Aug 12 01:37:59 2016 -0400

    agent: Implement --supervised command (for systemd, etc).
    
    * agent/gpg-agent.c (get_socket_path): New function for POSIX systems
    to return the path for a provided unix-domain socket.
    (map_supervised_sockets): New function to inspect $LISTEN_FDS and
    $LISTEN_FDNAMES and map them to the specific functionality offered by
    the agent.
    (main): Add --supervised command.  When used, listen on already-open
    file descriptors instead of opening our own.
    * doc/gpg-agent.texi: Document --supervised option.
    
    --
    
    "gpg-agent --supervised" is a way to invoke gpg-agent such that a
    system supervisor like systemd can provide socket-activated startup,
    log management, and scheduled shutdown.
    
    When running in this mode, gpg-agent:
    
     * Does not open its own listening socket; rather, it expects to be
       given a listening socket on incoming file descriptors.
    
     * Does not detach from the invoking process, staying in the
       foreground instead.  Unless otherwise specified, logs are sent to
       stderr.
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index e65198a..9221dc3 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -90,6 +90,7 @@ enum cmd_and_opt_values
   oLogFile,
   oServer,
   oDaemon,
+  oSupervised,
   oBatch,
 
   oPinentryProgram,
@@ -152,6 +153,7 @@ static ARGPARSE_OPTS opts[] = {
 
   ARGPARSE_s_n (oDaemon,  "daemon", N_("run in daemon mode (background)")),
   ARGPARSE_s_n (oServer,  "server", N_("run in server mode (foreground)")),
+  ARGPARSE_s_n (oSupervised,  "supervised", N_("run supervised (e.g., systemd)")),
   ARGPARSE_s_n (oVerbose, "verbose", N_("verbose")),
   ARGPARSE_s_n (oQuiet,	  "quiet",     N_("be somewhat more quiet")),
   ARGPARSE_s_n (oSh,	  "sh",        N_("sh-style command output")),
@@ -730,6 +732,7 @@ thread_init_once (void)
     }
 }
 
+
 static void
 initialize_modules (void)
 {
@@ -742,6 +745,180 @@ initialize_modules (void)
 }
 
 
+/* return a malloc'ed string that is the path to the passed unix-domain socket
+   (or return NULL if this is not a valid unix-domain socket) */
+static char *
+get_socket_path (gnupg_fd_t fd)
+{
+#ifdef HAVE_W32_SYSTEM
+  return NULL;
+#else
+  struct sockaddr_un un;
+  socklen_t len = sizeof(un);
+  char *ret = NULL;
+
+  if (fd == GNUPG_INVALID_FD)
+    return NULL;
+
+  if (getsockname (fd, (struct sockaddr*)&un, &len) != 0)
+    log_error ("could not getsockname(%d) -- error %d (%s)\n", fd,
+               errno, strerror(errno));
+  else if (un.sun_family != AF_UNIX)
+    log_error ("file descriptor %d is not a unix-domain socket\n", fd);
+  else if (len <= offsetof (struct sockaddr_un, sun_path))
+    log_error ("socket path not present for file descriptor %d\n", fd);
+  else if (len > sizeof(un))
+    log_error ("socket path for file descriptor %d was truncated "
+               "(passed %lu bytes, wanted %u)\n", fd, sizeof(un), len);
+  else
+    {
+      log_debug ("file descriptor %d has path %s (%lu octets)\n", fd,
+                 un.sun_path, len - offsetof (struct sockaddr_un, sun_path));
+      ret = malloc(len - offsetof (struct sockaddr_un, sun_path));
+      if (ret == NULL)
+        log_error ("failed to allocate memory for path to file "
+                   "descriptor %d\n", fd);
+      else
+        memcpy (ret, un.sun_path, len);
+    }
+  return ret;
+#endif /* HAVE_W32_SYSTEM */
+}
+
+
+/* Discover which inherited file descriptors correspond to which
+   services/sockets offered by gpg-agent, using the LISTEN_FDS and
+   LISTEN_FDNAMES convention.  The understood labels are "ssh",
+   "extra", and "browser".  Any other label will be interpreted as the
+   standard socket.
+
+   This function is designed to log errors when the expected file
+   descriptors don't make sense, but to do its best to continue to
+   work even in the face of minor misconfigurations.
+
+   For more information on the LISTEN_FDS convention, see
+   sd_listen_fds(3).
+ */
+static void
+map_supervised_sockets (gnupg_fd_t *fd,
+                        gnupg_fd_t *fd_extra,
+                        gnupg_fd_t *fd_browser,
+                        gnupg_fd_t *fd_ssh)
+{
+  const char *listen_pid = NULL;
+  const char *listen_fds = NULL;
+  const char *listen_fdnames = NULL;
+  int listen_fd_count = -1;
+  int listen_fdnames_colons = 0;
+  const char *fdnamep = NULL;
+
+  listen_pid = getenv ("LISTEN_PID");
+  listen_fds = getenv ("LISTEN_FDS");
+  listen_fdnames = getenv ("LISTEN_FDNAMES");
+
+  if (!listen_pid)
+    log_error ("no $LISTEN_PID environment variable found in "
+               "--supervised mode (ignoring).\n");
+  else if (atoi (listen_pid) != getpid ())
+    log_error ("$LISTEN_PID (%d) does not match process ID (%d) "
+               "in --supervised mode (ignoring).\n",
+               atoi (listen_pid), getpid ());
+  else
+    log_debug ("$LISTEN_PID matches process ID (%d)\n",
+               getpid());
+
+  if (listen_fdnames)
+    for (fdnamep = listen_fdnames; *fdnamep; fdnamep++)
+      if (*fdnamep == ':')
+        listen_fdnames_colons++;
+  log_debug ("%d colon(s) in $LISTEN_FDNAMES: (%s)\n", listen_fdnames_colons, listen_fdnames);
+
+  if (!listen_fds)
+    {
+      if (!listen_fdnames)
+        {
+          log_error ("no LISTEN_FDS or LISTEN_FDNAMES environment variables "
+                     "found in --supervised mode (assuming 1 active descriptor).\n");
+          listen_fd_count = 1;
+        }
+      else
+        {
+          log_error ("no LISTEN_FDS environment variable found in --supervised "
+                     " mode (relying on colons in LISTEN_FDNAMES instead)\n");
+          listen_fd_count = listen_fdnames_colons + 1;
+        }
+    }
+  else
+    listen_fd_count = atoi (listen_fds);
+
+  if (listen_fd_count < 1)
+    {
+      log_error ("--supervised mode expects at least one file descriptor (was told %d) "
+                 "(carrying on as though it were 1)\n", listen_fd_count);
+      listen_fd_count = 1;
+    }
+
+  if (!listen_fdnames)
+    {
+      if (listen_fd_count != 1)
+        log_error ("no LISTEN_FDNAMES and LISTEN_FDS (%d) != 1 in --supervised mode. "
+                   "(ignoring all sockets but the first one)\n", listen_fd_count);
+      *fd = 3;
+    }
+  else
+    {
+      int i;
+      if (listen_fd_count != listen_fdnames_colons + 1)
+        {
+          log_fatal ("number of items in LISTEN_FDNAMES (%d) does not match "
+                     "LISTEN_FDS (%d) in --supervised mode\n",
+                     listen_fdnames_colons + 1, listen_fd_count);
+          exit (1);
+        }
+
+      for (i = 3; i < 3 + listen_fd_count; i++)
+        {
+          int found = 0;
+          char *next = strchrnul(listen_fdnames, ':');
+          *next = '\0';
+#define match_socket(var) if (!found && strcmp (listen_fdnames, #var) == 0) \
+            {                                                           \
+              found = 1;                                                \
+              if (*fd_ ## var == GNUPG_INVALID_FD)                      \
+                {                                                       \
+                  *fd_ ## var = i;                                      \
+                  log_info (#var " socket on fd %d\n", i);              \
+                }                                                       \
+              else                                                      \
+                {                                                       \
+                  log_error ("cannot listen on more than one " #var " socket. (closing fd %d)\n", i); \
+                  close (i);                                            \
+                }                                                       \
+            }
+          match_socket(ssh);
+          match_socket(browser);
+          match_socket(extra);
+#undef match_socket
+          if (!found)
+            {
+              if (*fd == GNUPG_INVALID_FD)
+                {
+                  *fd = i;
+                  log_info ("standard socket (\"%s\") on fd %d\n",
+                            listen_fdnames, i);
+                }
+              else
+                {
+                  log_error ("cannot listen on more than one standard socket. (closing fd %d)\n", i);
+                  close (i);
+                }
+            }
+          listen_fdnames = next + 1;
+        }
+    }
+}
+
+
 /* The main entry point.  */
 int
 main (int argc, char **argv )
@@ -757,6 +934,7 @@ main (int argc, char **argv )
   int default_config =1;
   int pipe_server = 0;
   int is_daemon = 0;
+  int is_supervised = 0;
   int nodetach = 0;
   int csh_style = 0;
   char *logfile = NULL;
@@ -954,6 +1132,7 @@ main (int argc, char **argv )
         case oSh: csh_style = 0; break;
         case oServer: pipe_server = 1; break;
         case oDaemon: is_daemon = 1; break;
+        case oSupervised: is_supervised = 1; break;
 
         case oDisplay: default_display = xstrdup (pargs.r.ret_str); break;
         case oTTYname: default_ttyname = xstrdup (pargs.r.ret_str); break;
@@ -1053,9 +1232,9 @@ main (int argc, char **argv )
     bind_textdomain_codeset (PACKAGE_GT, "UTF-8");
 #endif
 
-  if (!pipe_server && !is_daemon && !gpgconf_list)
+  if (!pipe_server && !is_daemon && !gpgconf_list && !is_supervised)
     {
-     /* We have been called without any options and thus we merely
+     /* We have been called without any command and thus we merely
         check whether an agent is already running.  We do this right
         here so that we don't clobber a logfile with this check but
         print the status directly to stderr. */
@@ -1234,6 +1413,54 @@ main (int argc, char **argv )
       agent_deinit_default_ctrl (ctrl);
       xfree (ctrl);
     }
+  else if (is_supervised)
+    {
+      gnupg_fd_t fd = GNUPG_INVALID_FD;
+      gnupg_fd_t fd_extra = GNUPG_INVALID_FD;
+      gnupg_fd_t fd_browser = GNUPG_INVALID_FD;
+      gnupg_fd_t fd_ssh = GNUPG_INVALID_FD;
+
+      /* when supervised and sending logs to stderr, the process
+         supervisor should handle log entry metadata (pid, name,
+         timestamp) */
+      if (!logfile)
+        log_set_prefix (NULL, 0);
+
+      log_info ("%s %s starting in supervised mode.\n",
+                strusage(11), strusage(13) );
+
+      map_supervised_sockets (&fd, &fd_extra, &fd_browser, &fd_ssh);
+      if (fd == GNUPG_INVALID_FD)
+        {
+          log_fatal ("no standard socket provided\n");
+          exit (1);
+        }
+      /* record socket names where possible: */
+      socket_name = get_socket_path (fd);
+      socket_name_extra = get_socket_path (fd_extra);
+      if (socket_name_extra)
+        opt.extra_socket = 2;
+      socket_name_browser = get_socket_path (fd_browser);
+      if (socket_name_browser)
+        opt.browser_socket = 2;
+      socket_name_ssh = get_socket_path (fd_ssh);
+
+#ifdef HAVE_SIGPROCMASK
+      if (startup_signal_mask_valid)
+        {
+          if (sigprocmask (SIG_SETMASK, &startup_signal_mask, NULL))
+            log_error ("error restoring signal mask: %s\n",
+                       strerror (errno));
+        }
+      else
+        log_info ("no saved signal mask\n");
+#endif /*HAVE_SIGPROCMASK*/
+
+      log_debug ("FDs: std: %d extra: %d browser: %d ssh: %d\n",
+                 fd, fd_extra, fd_browser, fd_ssh);
+      handle_connections (fd, fd_extra, fd_browser, fd_ssh);
+      assuan_sock_close (fd);
+    }
   else if (!is_daemon)
     ; /* NOTREACHED */
   else
@@ -1246,6 +1473,8 @@ main (int argc, char **argv )
       pid_t pid;
 #endif
 
+      initialize_modules ();
+
       /* Remove the DISPLAY variable so that a pinentry does not
          default to a specific display.  There is still a default
          display when gpg-agent was started using --display or a
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 0bb7db2..7aacb7b 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -158,6 +158,18 @@ As an alternative you may create a new process as a child of
 gpg-agent: @code{gpg-agent --daemon /bin/sh}.  This way you get a new
 shell with the environment setup properly; after you exit from this
 shell, gpg-agent terminates within a few seconds.
+
+ at item --supervised
+ at opindex supervised
+Run in the foreground, sending logs by default to stderr, and
+listening on provided file descriptors, which must already be bound to
+listening sockets.  This command is useful when running under systemd
+or other similar process supervision schemes.
+
+In --supervised mode, different file descriptors can be provided for
+use as different socket types (e.g. ssh, extra) as long as they are
+identified in the environment variable $LISTEN_FDNAMES (see
+sd_listen_fds(3) for more information on this convention).
 @end table
 
 @mansect options

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

Summary of changes:
 agent/gpg-agent.c  | 300 +++++++++++++++++++++++++++++++++++++++++++++++++----
 doc/gpg-agent.texi |  14 +++
 2 files changed, 293 insertions(+), 21 deletions(-)


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



From cvs at cvs.gnupg.org  Wed Oct  5 08:16:21 2016
From: cvs at cvs.gnupg.org (by Daniel Kahn Gillmor)
Date: Wed, 05 Oct 2016 08:16:21 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-198-ga2127c7
Message-ID: <E1brfV9-0001Kx-Iv@lists.gnupg.org>

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  a2127c71dbf87c1710b43d91a733dd4c9b2953bc (commit)
      from  1a9c8d78ece2f31fdb1a8e2be049aa71053061fa (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 a2127c71dbf87c1710b43d91a733dd4c9b2953bc
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Oct 5 00:23:11 2016 -0400

    agent: Fix error handling in map_supervised_sockets
    
    * agent/gpg-agent.c (map_supervised_sockets): the file descriptor to
      close on error is fd, not i.
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 1696e5a..9c7b8fc 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -758,14 +758,14 @@ map_supervised_sockets (gnupg_fd_t *r_fd,
                         {
                           log_error ("cannot listen on fd %d for %s socket\n",
                                      fd, tbl[j].label);
-                          close (i);
+                          close (fd);
                         }
                     }
                   else
                     {
                       log_error ("cannot listen on more than one %s socket\n",
                                  tbl[j].label);
-                      close (i);
+                      close (fd);
                     }
                   break;
                 }

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

Summary of changes:
 agent/gpg-agent.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


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



From cvs at cvs.gnupg.org  Wed Oct  5 09:21:00 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 05 Oct 2016 09:21:00 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-199-gf57dc2b
Message-ID: <E1brgVj-0003tp-5u@lists.gnupg.org>

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  f57dc2b1e6f28d164f882373535dbcb0d632ca17 (commit)
      from  a2127c71dbf87c1710b43d91a733dd4c9b2953bc (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 f57dc2b1e6f28d164f882373535dbcb0d632ca17
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Oct 5 09:13:27 2016 +0200

    agent: Fix npth + supervised mode problem.
    
    * agent/gpg-agent.c (main): Initialize modules in supervised mode.
    --
    
    It was probably my fault.  I had to rebase my patches to take in the
    npth patches but for some reason my addition of initialize_modules got
    lost.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 9c7b8fc..dcc9bb6 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -1456,6 +1456,8 @@ main (int argc, char **argv )
 #ifndef HAVE_W32_SYSTEM
       gnupg_fd_t fd, fd_extra, fd_browser, fd_ssh;
 
+      initialize_modules ();
+
       /* when supervised and sending logs to stderr, the process
          supervisor should handle log entry metadata (pid, name,
          timestamp) */

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

Summary of changes:
 agent/gpg-agent.c | 2 ++
 1 file changed, 2 insertions(+)


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



From cvs at cvs.gnupg.org  Wed Oct  5 12:00:43 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 05 Oct 2016 12:00:43 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-201-ge514a5b
Message-ID: <E1brj0I-0001aH-4l@lists.gnupg.org>

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  e514a5b725f0c997cef4362808b2778a3faa9cf8 (commit)
       via  1cedc32c95c2e3c3ab98af23ddc2845d51e596c1 (commit)
      from  f57dc2b1e6f28d164f882373535dbcb0d632ca17 (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 e514a5b725f0c997cef4362808b2778a3faa9cf8
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Oct 5 11:51:32 2016 +0200

    wks: Add option --fake-submission-addr to gpg-wks-client.
    
    * tools/gpg-wks-client.c (oFakeSubmissionAddr): New.
    (opts): Add option --fake-submission-addr.
    (fake_submission_addr): New variable.
    (parse_arguments): Set it.
    (command_send): Use --fake-submission-addr.
    --
    
    This option is useful for testing.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/tools/gpg-wks-client.c b/tools/gpg-wks-client.c
index f4257ec..4df54cc 100644
--- a/tools/gpg-wks-client.c
+++ b/tools/gpg-wks-client.c
@@ -56,6 +56,7 @@ enum cmd_and_opt_values
 
     oGpgProgram,
     oSend,
+    oFakeSubmissionAddr,
 
     oDummy
   };
@@ -83,6 +84,7 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_s_n (oSend, "send", "send the mail using sendmail"),
   ARGPARSE_s_s (oOutput, "output", "|FILE|write the mail to FILE"),
 
+  ARGPARSE_s_s (oFakeSubmissionAddr, "fake-submission-addr", "@"),
 
   ARGPARSE_end ()
 };
@@ -102,6 +104,11 @@ static struct debug_flags_s debug_flags [] =
   };
 
 
+
+/* Value of the option --fake-submission-addr.  */
+const char *fake_submission_addr;
+
+
 static void wrong_args (const char *text) GPGRT_ATTR_NORETURN;
 static gpg_error_t command_supported (char *userid);
 static gpg_error_t command_send (const char *fingerprint, char *userid);
@@ -180,6 +187,9 @@ parse_arguments (ARGPARSE_ARGS *pargs, ARGPARSE_OPTS *popts)
         case oOutput:
           opt.output = pargs->r.ret_str;
           break;
+        case oFakeSubmissionAddr:
+          fake_submission_addr = pargs->r.ret_str;
+          break;
 
 	case aSupported:
 	case aCreate:
@@ -551,30 +561,37 @@ command_send (const char *fingerprint, char *userid)
     goto leave;
 
   /* Get the submission address.  */
-  err = wkd_get_submission_address (addrspec, &submission_to);
+  if (fake_submission_addr)
+    {
+      submission_to = xstrdup (fake_submission_addr);
+      err = 0;
+    }
+  else
+    err = wkd_get_submission_address (addrspec, &submission_to);
   if (err)
     goto leave;
   log_info ("submitting request to '%s'\n", submission_to);
 
   /* Get the policy flags.  */
-  {
-    estream_t mbuf;
+  if (!fake_submission_addr)
+    {
+      estream_t mbuf;
 
-    err = wkd_get_policy_flags (addrspec, &mbuf);
-    if (err)
-      {
-        log_error ("error reading policy flags for '%s': %s\n",
-                   submission_to, gpg_strerror (err));
-        goto leave;
-      }
-    if (mbuf)
-      {
-        err = wks_parse_policy (&policy, mbuf, 1);
-        es_fclose (mbuf);
-        if (err)
+      err = wkd_get_policy_flags (addrspec, &mbuf);
+      if (err)
+        {
+          log_error ("error reading policy flags for '%s': %s\n",
+                     submission_to, gpg_strerror (err));
           goto leave;
       }
-  }
+      if (mbuf)
+        {
+          err = wks_parse_policy (&policy, mbuf, 1);
+          es_fclose (mbuf);
+          if (err)
+            goto leave;
+        }
+    }
 
   if (policy.auth_submit)
     log_info ("no confirmation required for '%s'\n", addrspec);

commit 1cedc32c95c2e3c3ab98af23ddc2845d51e596c1
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Oct 5 11:48:59 2016 +0200

    agent: Another minor fix to map_supervised_sockets.
    
    * agent/gpg-agent.c (map_supervised_sockets): Remove debug message.
    Provide correct fd in the second error case.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index dcc9bb6..a4025ce 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -739,13 +739,11 @@ map_supervised_sockets (gnupg_fd_t *r_fd,
         {
           for (j = 0; j < DIM (tbl); j++)
             {
-              log_debug ("i=%d j=%d fdname=%s check=%s\n", i, j,
-                         fdnames[i], tbl[j].label);
               if (!strcmp (fdnames[i], tbl[j].label) || j == DIM(tbl)-1)
                 {
+                  fd = 3 + i;
                   if (**tbl[j].fdaddr == -1)
                     {
-                      fd = 3 + i;
                       name = get_socket_name (fd);
                       if (name)
                         {

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

Summary of changes:
 agent/gpg-agent.c      |  4 +---
 tools/gpg-wks-client.c | 49 +++++++++++++++++++++++++++++++++----------------
 2 files changed, 34 insertions(+), 19 deletions(-)


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



From cvs at cvs.gnupg.org  Wed Oct  5 13:09:46 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 05 Oct 2016 13:09:46 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. e28c0acedc6f13459022f3324264e77c2da4f768
Message-ID: <E1brk56-000434-An@lists.gnupg.org>

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 GnuPG website and other docs".

The branch, master has been updated
       via  e28c0acedc6f13459022f3324264e77c2da4f768 (commit)
      from  83cb8037c27558e8de8bc62876a713562f491aed (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 e28c0acedc6f13459022f3324264e77c2da4f768
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Oct 5 13:06:48 2016 +0200

    drafts,openpgp-webkey-service: Published -02

diff --git a/misc/id/openpgp-webkey-service/Makefile b/misc/id/openpgp-webkey-service/Makefile
index dad63f1..9023455 100644
--- a/misc/id/openpgp-webkey-service/Makefile
+++ b/misc/id/openpgp-webkey-service/Makefile
@@ -14,6 +14,7 @@ draft.txt, draft.xml: draft.org
            --eval $(MD_EXAMPLE_FIX)  \
            --visit "draft.org" \
            --eval "(org-md-export-to-markdown)"
+	sed -i 's/\*\*\(.*\):\*\*/"\1":/' draft.md
 	sed <draft.md  -n '/^# Abstract/q;1,$$ p' >template.xml
 	sed <draft.md  -n '/^# Abstract/,/^# Middle/p' | \
 		sed  '1 d;$$ d' >tmp-abstract.md
diff --git a/misc/id/openpgp-webkey-service/draft-koch-openpgp-webkey-service-02.txt b/misc/id/openpgp-webkey-service/draft-koch-openpgp-webkey-service-02.txt
new file mode 100644
index 0000000..0ac9ab9
--- /dev/null
+++ b/misc/id/openpgp-webkey-service/draft-koch-openpgp-webkey-service-02.txt
@@ -0,0 +1,896 @@
+
+
+
+
+Network Working Group                                            W. Koch
+Internet-Draft                                             GnuPG Project
+Intended status: Informational                           October 5, 2016
+Expires: April 8, 2017
+
+
+                        OpenPGP Web Key Service
+                  draft-koch-openpgp-webkey-service-02
+
+Abstract
+
+   This specification describes a service to locate OpenPGP keys by mail
+   address using a Web service and the HTTPS protocol.  It also provides
+   a method for secure communication between the key owner and the mail
+   provider to publish and revoke the public key.
+
+Status of This Memo
+
+   This Internet-Draft is submitted in full conformance with the
+   provisions of BCP 78 and BCP 79.
+
+   Internet-Drafts are working documents of the Internet Engineering
+   Task Force (IETF).  Note that other groups may also distribute
+   working documents as Internet-Drafts.  The list of current Internet-
+   Drafts is at http://datatracker.ietf.org/drafts/current/.
+
+   Internet-Drafts are draft documents valid for a maximum of six months
+   and may be updated, replaced, or obsoleted by other documents at any
+   time.  It is inappropriate to use Internet-Drafts as reference
+   material or to cite them other than as "work in progress."
+
+   This Internet-Draft will expire on April 8, 2017.
+
+Copyright Notice
+
+   Copyright (c) 2016 IETF Trust and the persons identified as the
+   document authors.  All rights reserved.
+
+   This document is subject to BCP 78 and the IETF Trust's Legal
+   Provisions Relating to IETF Documents
+   (http://trustee.ietf.org/license-info) in effect on the date of
+   publication of this document.  Please review these documents
+   carefully, as they describe your rights and restrictions with respect
+   to this document.  Code Components extracted from this document must
+   include Simplified BSD License text as described in Section 4.e of
+   the Trust Legal Provisions and are provided without warranty as
+   described in the Simplified BSD License.
+
+
+
+
+Koch                      Expires April 8, 2017                 [Page 1]
+

+Internet-Draft           OpenPGP Web Key Service            October 2016
+
+
+Table of Contents
+
+   1.  Introduction  . . . . . . . . . . . . . . . . . . . . . . . .   2
+   2.  Notational Conventions  . . . . . . . . . . . . . . . . . . .   2
+   3.  Web Key Directory . . . . . . . . . . . . . . . . . . . . . .   2
+     3.1.  Key Discovery . . . . . . . . . . . . . . . . . . . . . .   3
+   4.  Web Key Directory Update Protocol . . . . . . . . . . . . . .   4
+     4.1.  The Submission Address  . . . . . . . . . . . . . . . . .   5
+     4.2.  The Submission Mail . . . . . . . . . . . . . . . . . . .   6
+     4.3.  The Confirmation Request  . . . . . . . . . . . . . . . .   6
+     4.4.  The Confirmation Response . . . . . . . . . . . . . . . .   8
+     4.5.  Policy Flags  . . . . . . . . . . . . . . . . . . . . . .   8
+   5.  Security Considerations . . . . . . . . . . . . . . . . . . .   9
+   6.  IANA Considerations . . . . . . . . . . . . . . . . . . . . .   9
+     6.1.  Well-Known URI  . . . . . . . . . . . . . . . . . . . . .   9
+   7.  Acknowledgments . . . . . . . . . . . . . . . . . . . . . . .   9
+   8.  Normative References  . . . . . . . . . . . . . . . . . . . .  10
+   Appendix A.  Sample Protocol Run  . . . . . . . . . . . . . . . .  10
+     A.1.  Sample Keys . . . . . . . . . . . . . . . . . . . . . . .  10
+     A.2.  Sample Messages . . . . . . . . . . . . . . . . . . . . .  11
+   Appendix B.  Changes Since -01  . . . . . . . . . . . . . . . . .  15
+   Author's Address  . . . . . . . . . . . . . . . . . . . . . . . .  16
+
+1.  Introduction
+
+   This memo describes a method to associate OpenPGP keys with a mail
+   address and how to look them up using a web service with a well-known
+   URI.  In addition a mail based protocol is given to allow a client to
+   setup such an association and to maintain it.
+
+2.  Notational Conventions
+
+   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
+   "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
+   document are to be interpreted as described in [RFC2119].
+
+3.  Web Key Directory
+
+   A major use case for OpenPGP is the encryption of mail.  A common
+   difficulty of sending encrypted mails to a new communication partner
+   is to find the appropriate public key of the recipient.  Unless an
+   off-channel key exchange has been done, there are no easy ways to
+   discover the required key.  The common practice is to search the
+   network of public key servers for a key matching the recipient's mail
+   address.  This practise bears the problem that the keyservers are not
+   able to give a positive confirmation that a key actually belongs to
+   the mail addresses given in the key.  Further, there are often
+   several keys matching a mail address and thus one needs to pick a key
+
+
+
+Koch                      Expires April 8, 2017                 [Page 2]
+

+Internet-Draft           OpenPGP Web Key Service            October 2016
+
+
+   on good luck.  This is clearly not a secure way to setup an end-to-
+   end encryption.  Even if the need for a trusted key for an initial
+   mail message is relinquished, a non-authenticated key may be a wrong
+   one and the actual recipient would receive a mail which she can't
+   decrypt, due to the use of a wrong key.
+
+   Methods to overcome this problem are
+
+   o  sending an initial unencrypted message with the public key
+      attached,
+
+   o  using the OpenPGP DANE protocol to lookup the recipients key via
+      the DNS.
+
+   The first method has the obvious problems of not even trying to
+   encrypt the initial mail, an extra mail round-trip, and problems with
+   unattended key discovery.
+
+   The latter method works fine but requires that mail providers need to
+   set up a separate DNS resolver to provide the key.  The
+   administration of a DNS zone is often not in the hands of small mail
+   installations.  Thus an update of the DNS resource records needs to
+   be delegated to the ISP running the DNS service.  Further, DNS
+   lookups are not encrypted and missing all confidentially.  Even if
+   the participating MUAs are using STARTTLS to encrypt the mail
+   exchange, a DNS lookup for the key unnecessarily identifies the
+   local-part of the recipients mail address to any passive
+   eavesdroppers.
+
+   This memo specified a new method for key discovery using an encrypted
+   https connection.
+
+3.1.  Key Discovery
+
+   Although URIs are able to encode all kind of characters,
+   straightforward implementations of a key directory may want to store
+   the "local-part" of a mail address directly in the file system.  This
+   forbids the use of certain characters in the "local-part".  To allow
+   for such an implementation method the URI uses an encoded form of the
+   "local-part" which can be directly mapped to a file name.
+
+   OpenPGP defines its User IDs, and thus the mail address, as UTF-8
+   strings.  To help with the common pattern of using capitalized names
+   (e.g.  "Joe.Doe at example.org") for mail addresses, and under the
+   premise that almost all MTAs treat the "local-part" case-insensitive
+   and that the "domain-part" is required to be compared case-
+   insensitive anyway, all upper-case ASCII characters in a User ID are
+   mapped to lowercase.  Non-ASCII characters are not changed.
+
+
+
+Koch                      Expires April 8, 2017                 [Page 3]
+

+Internet-Draft           OpenPGP Web Key Service            October 2016
+
+
+   The so mapped "local-part" is hashed using the SHA-1 algorithm.  The
+   resulting 160 bit digest is encoded using the Z-Base-32 method as
+   described in [RFC6189], section 5.1.6.  The resulting string has a
+   fixed length of 32 octets.  To form the URI, the scheme "https://" is
+   concatenated with the mapped "domain-part", the fixed string "/.well-
+   known/openpgpkey/hu/", and the above constructed 32 octet string.
+
+   For example the URI to lookup the key for Joe.Doe at Example.ORG is:
+
+     https://example.org/.well-known/openpgpkey/
+     hu/iy9q119eutrkn8s1mk4r39qejnbu3n5q
+
+   (line has been wrapped for rendering purposes)
+
+   The HTTP GET method MUST return the binary representation of the
+   OpenPGP key for the given mail address.  The key needs to carry a
+   User ID packet ([RFC4880]) with that mail address.  Note that the key
+   may be revoked or expired - it is up to the client to handle such
+   conditions.  To ease distribution of revoked keys, a server may
+   return revoked keys in addition to a new key.  The keys are returned
+   by a single request as concatenated key blocks.
+
+   The server MUST accept the HTTP HEAD method to allow a client to
+   check for the existence of a key.
+
+   The server SHOULD return "application/octet-string" as the Content-
+   Type for the data but clients SHOULD also accept any other Content-
+   Type.  The server MUST NOT return an ASCII armored version of the
+   key.
+
+4.  Web Key Directory Update Protocol
+
+   To put keys into the key directory a protocol to automate the task is
+   desirable.  The protocol defined here is entirely based on mail and
+   the assumption that a mail provider can securely deliver mail to the
+   INBOX of a user (e.g. an IMAP folder).  Note that the same protocol
+   may also be used for submitting keys for use with OpenPGP DANE.
+
+   We assume that the user already created a key for her mail account
+   alice at example.org.  To install the key at her provider's Web Key
+   Directory, she performs the following steps:
+
+   1.  She retrieves a file which contains one line with the mail
+       address used to submit the key to the mail provider.  See below
+       for the syntax of that file.  For a mail address at the domain
+       "example.org" the URI of the file is
+
+       https://example.org/.well-known/openpgpkey/submission-address
+
+
+
+Koch                      Expires April 8, 2017                 [Page 4]
+

+Internet-Draft           OpenPGP Web Key Service            October 2016
+
+
+   2.  She sends her key using SMTP (or any other transport mechanism)
+       to the provider using the submission address and key format as
+       specified by PGP/MIME.
+
+   3.  The provider checks that the received key has a User ID which
+       matches an account name of the provider.
+
+   4.  The provider sends an encrypted message containing a nonce and
+       the fingerprint of the key to the mail account of the user.  Note
+       that a similar scheme is used by the well known caff(1) tool to
+       help with key signing parties.
+
+   5.  A legitimate user will be able to decrypt the message because she
+       created the key and is in charge of the private key.  This step
+       verifies that the submitted key has actually been created by the
+       owner of the account.
+
+   6.  The user sends the decrypted nonce back to the submission address
+       as a confirmation that the private key is owned by her and that
+       the provider may now publish the key.  Although technically not
+       required, it is suggested that the mail to the provider is
+       encrypted.  The public key for this is retrieved using the key
+       lookup protocol described above.
+
+   7.  The provider receives the nonce, matches it with its database of
+       pending confirmations and then publishes the key.  Finally the
+       provider sends a mail back to the user to notify her of the
+       publication of her key.
+
+   The message data structures used for the above protocol are specified
+   in detail below.  In the following sections the string "WELLKNOWN"
+   denotes the first part of an URI specific for a domain.  In the
+   examples the domain "example.org" is assumed, thus
+
+     WELLKNOWN := https://example.org/.well-known/openpgpkey
+
+   The term "target key" denotes the to be published key, the term
+   "submission key" the key associated with the submission-address of
+   the mail provider.
+
+4.1.  The Submission Address
+
+   The address of the submission file is
+
+     WELLKNOWN/submission-address
+
+   The file consists of exactly one line, terminated by a LF, or the
+   sequence of CR and LF, with the full mail address to be used for
+
+
+
+Koch                      Expires April 8, 2017                 [Page 5]
+

+Internet-Draft           OpenPGP Web Key Service            October 2016
+
+
+   submission of a key to the mail provider.  For example the content of
+   the file may be
+
+     key-submission-example.org at directory.example.org
+
+4.2.  The Submission Mail
+
+   The mail used to submit a key to the mail provider MUST comply to the
+   PGP/MIME specification ([RFC3156], section 7), which states that the
+   Content-Type must be "application/pgp-keys", there are no required or
+   optional parameters, and the body part contains the ASCII-armored
+   transferable Public Key Packets as defined in [RFC4880], section
+   11.1.
+
+   The mail provider MUST publish a key capable of signing and
+   encryption for the submission-address in the Web Key Directory or via
+   DANE.  The key to be published MUST be submitted using a PGP/MIME
+   encrypted message ([RFC3156], section 4).  The message MUST NOT be
+   signed (because the authenticity of the signing key has not yet been
+   confirmed).  After decryption of the message at the mail provider a
+   single "application/pgp-keys" part, as specified above, is expected.
+
+4.3.  The Confirmation Request
+
+   The mail provider sends a confirmation mail in response to a received
+   key publication request.  The message MUST be sent from the
+   submission-address of the mail provider to the mail address extracted
+   from the target key.  The message needs to be a PGP/MIME signed
+   message using the submission key of the provider for the signature.
+   The signed message MUST have two parts:
+
+   The first part MUST have "text" as its Content-Type and can be used
+   to explain the purpose of the mail.  For example it may point to this
+   RFC and explain on how to manually perform the protocol.
+
+   The second part jMUST have "application/vnd.gnupg.wkd" as its
+   Content-Type and carry an OpenPGP encrypted message in ASCII Armor
+   format.  The message MUST be encrypted to the target key and MUST not
+   be signed.  After decryption a text file in the Web Key data format
+   must be yielded.
+
+   That data format consists of name-value pairs with one name-value
+   pair per LF or CR+LF terminated line.  Empty lines are allowed and
+   will be ignored by the receiver.  A colon is used to terminate a
+   name.
+
+   In a confirmation request the following names MUST be send in the
+   specified order:
+
+
+
+Koch                      Expires April 8, 2017                 [Page 6]
+

+Internet-Draft           OpenPGP Web Key Service            October 2016
+
+
+   o  "type": The value must be "confirmation-request".
+
+   o  "sender": This is the mailbox the user is expected to sent the
+      confirmation response to.  The value must match the mailbox part
+      of the "From:" address of this request.  Exactly one address MUST
+      be given.
+
+   o  "address": The value is the addr-spec part of the target key's
+      mail address.  The value SHOULD match the addr-spec part of the
+      recipient's address.  The value MUST be UTF-8 encoded as required
+      for an OpenPGP User ID.
+
+   o  "fingerprint": The value is the fingerprint of the target key.
+      The fingerprint is given in uppercase hex encoding without any
+      interleaving spaces.
+
+   o  "nonce": The value is a string with a minimum length of 16 octets
+      and a maximum length of 64 octets.  The string must entirely be
+      made up of random ASCII letters or digits.  This nonce will be
+      sent back to the mail provider as proof that the recipient is the
+      legitimate owner of the target-key.
+
+   The receiver of that message is expected to verify the outer
+   signature and disregard the entire message if it can't be verified or
+   has not been signed by the key associated with the submission
+   address.
+
+   After the message as been verified the receiver decrypts the second
+   part of the message, checks that the "fingerprint" matches the target
+   key, checks that the "address" matches a User ID of the target key,
+   and checks the other constrains of the request format.  If any
+   constraint is not asserted, or the fingerprint or User ID do not
+   match the target key, or there is no pending publication requests
+   (i.e. a mail recently sent o the submission address), the user MAY be
+   notified about this fake confirmation attempt.
+
+   In other cases the confirmation request is legitimate and the MUA
+   shall silently send a response as described in the next section.
+
+   The rationale for the outer signature used with this request is to
+   allow early detection of spam mails.  This can be done prior to the
+   decryption step and avoids asking the user to enter a passphrase to
+   perform the decryption for a non-legitimate message.  The use of a
+   simple encrypted attachment, instead of using PGP/MIME encryption, is
+   to convey the Content-Type of that attachment in the clear and also
+   to prevent automatic decryption of that attachment by PGP/MIME aware
+   clients.  The MUA may in fact detect this confirmation request and
+   present a customized dialog for confirming that request.
+
+
+
+Koch                      Expires April 8, 2017                 [Page 7]
+

+Internet-Draft           OpenPGP Web Key Service            October 2016
+
+
+4.4.  The Confirmation Response
+
+   A response to a confirmation request MUST only be send in the
+   positive case; there is no negative confirmation response.  A mail
+   service provider is expected to cancel a pending key submission after
+   a suitable time without a confirmation.  The mail service provider
+   SHOULD NOT retry the sending of a confirmation request after the
+   first request has been send successfully.
+
+   The user MUST send the confirmation response from her target mail
+   address to the "from" address of the confirmation request.  The
+   message MUST be signed and encrypted using the PGP/MIME Combined
+   format ([RFC3156], section 6.2).  The signing key is the target key
+   and the encryption key is the key associated with the provider's
+   submission address.
+
+   The Content-Type used for the plaintext message MUST also be
+   "application/vnd.gnupg.wkd".  The format is the same as described
+   above for the Confirmation Request.  The body must contain three
+   name-value pairs in this order:
+
+   o  "type": The value must be "confirmation-response".
+
+   o  "sender": The value must match the mailbox part of the "From:"
+      address of this response.  Exactly one address MUST be given.
+
+   o  "nonce": The value is the value of the "nonce" parameter from the
+      confirmation request.
+
+4.5.  Policy Flags
+
+   For key generation and submission it is sometimes useful to tell the
+   client about certain properties of the mail provider in advance.
+   This can be done with a file at the URL
+
+     WELLKNOWN/policy
+
+   The file contains keywords and optioanlly values, one per line with
+   each line terminated by a LF or the sequence of CR and LF.  Empty
+   lines and lines starting with a '#' character are considered comment
+   lines.  A keyword is made up of lowercase letters, digits, hyphens,
+   or dots.  An underscore is allowed as a name space delimiters; see
+   below.  The first character must be a letter.  Keywords which are
+   defined to require a value are directly followed by a colon and then
+   after optional white space the value.  Clients MUST use case-
+   insensitive matching for the keyword.
+
+   Currently defined keywords are:
+
+
+
+Koch                      Expires April 8, 2017                 [Page 8]
+

+Internet-Draft           OpenPGP Web Key Service            October 2016
+
+
+   o  "mailbox-only": The mail server provider does only accept keys
+      with only a mailbox in the User ID.  In particular User IDs with a
+      real name in addition to the mailbox will be rejected as invalid.
+
+   o  "dane-only": The mail server provider does not run a Web Key
+      Directory but only an OpenPGP DANE service.  The Web Key Directory
+      Update protocol is used to update the keys for the DANE service.
+
+   o  "auth-submit": The submission of the mail to the server is done
+      using an authenticated connection.  Thus the submitted key will be
+      published immediately without any confirmation request.
+
+   More keywords will be defined in updates to this I-D.  There is no
+   registry except for this document.  For experimental use of new
+   features or for provider specific settings, keywords MUST be prefixed
+   with a domain name and an underscore.
+
+5.  Security Considerations
+
+   The use of SHA-1 for the mapping of the "local-part" to a fixed
+   string is not a security feature but merely used to map the local-
+   part to a fixed-sized string made from a well defined set of
+   characters.  It is not intended to conceal information about a mail
+   address.
+
+   The domain name part of the mail address is not part of the hash to
+   avoid problems with internationalized domain names.  Instead a
+   separate URL is required for each domain name.
+
+6.  IANA Considerations
+
+6.1.  Well-Known URI
+
+   IANA is requested to assign a well-known URI in the "Well-Known URIs"
+   registry as defined by [RFC5785]:
+
+   URI suffix: openpgpkey
+
+   Change controller: IETF
+
+   Specification document: This
+
+7.  Acknowledgments
+
+   The author would like to acknowledge the help of the individuals who
+   kindly voiced their opinions on the GnuPG mailing lists, in
+   particular, the help of Bernhard Reiter and Guilhem Moulin.
+
+
+
+
+Koch                      Expires April 8, 2017                 [Page 9]
+

+Internet-Draft           OpenPGP Web Key Service            October 2016
+
+
+8.  Normative References
+
+   [RFC2119]  Bradner, S., "Key words for use in RFCs to Indicate
+              Requirement Levels", BCP 14, RFC 2119, March 1997.
+
+   [RFC3156]  Elkins, M., Del Torto, D., Levien, R., and T. Roessler,
+              "MIME Security with OpenPGP", RFC 3156, August 2001.
+
+   [RFC4880]  Callas, J., Donnerhacke, L., Finney, H., Shaw, D., and R.
+              Thayer, "OpenPGP Message Format", RFC 4880, November 2007.
+
+   [RFC5785]  Nottingham, M. and E. Hammer-Lahav, "Defining Well-Known
+              Uniform Resource Identifiers (URIs)", RFC 5785, DOI
+              10.17487/RFC5785, April 2010,
+              <http://www.rfc-editor.org/info/rfc5785>.
+
+   [RFC6189]  Zimmermann, P., Johnston, A., Ed., and J. Callas, "ZRTP:
+              Media Path Key Agreement for Unicast Secure RTP", RFC
+              6189, DOI 10.17487/RFC6189, April 2011,
+              <http://www.rfc-editor.org/info/rfc6189>.
+
+Appendix A.  Sample Protocol Run
+
+   The following non-normative example can be used by implementors as
+   guidance.
+
+   Note that GnuPG version 2.1.12 supports the key discovery described
+   in version -00 of this document (auto-key-locate method "wkd").
+   Version 2.1.16 can run the protocol decribed in this document but is
+   also able to run the protocol version specified by -01.
+
+A.1.  Sample Keys
+
+   This is the provider's submission key:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Koch                      Expires April 8, 2017                [Page 10]
+

+Internet-Draft           OpenPGP Web Key Service            October 2016
+
+
+     -----BEGIN PGP PRIVATE KEY BLOCK-----
+
+     lFgEV/TAohYJKwYBBAHaRw8BAQdAB/k9YQfSTI8qQqqK1KimH/BsvzsowWItSQPT
+     FP+fOC4AAP46uJ3Snno3Vy+kORye3rf0VvWvuz82voEQLxG6WpfHhREEtBprZXkt
+     c3VibWlzc2lvbkBleGFtcGxlLm5ldIh5BBMWCAAhBQJX9MCiAhsDBQsJCAcCBhUI
+     CQoLAgQWAgMBAh4BAheAAAoJEKhtNooW0cqEWMUA/0e9XaeptszWC9ZvPg8INL6a
+     BvRqPBYGU7PGmuXsxBovAQDyckOykG0UAfHVyN1w4gSK/biMcnqVr857i8/HuvjW
+     C5xdBFf0wKISCisGAQQBl1UBBQEBB0Apvaoe4MtSEJ1fpds/4DFl2kXXBpnVji/s
+     Wg9btdthNQMBCAcAAP9FJX99T1LEJzBnvBBnc6bimnT6/1OKM9RdO4R0/uVP6BFL
+     iGEEGBYIAAkFAlf0wKICGwwACgkQqG02ihbRyoTlGwD9FBr92osjL7HkhhZZ7Z2D
+     My3b9zpoZeMjvPg5YPqpdKMA/jhZoHuZCRMBYf7YRFb8aXtuyetDFZYrkjnum+OG
+     HFAD
+     =Hnwd
+     -----END PGP PRIVATE KEY BLOCK-----
+
+   This is the target key to be published:
+
+     -----BEGIN PGP PRIVATE KEY BLOCK-----
+
+     lFgEV2o9XRYJKwYBBAHaRw8BAQdAZ8zkuQDL9x7rcvvoo6s3iEF1j88Dknd9nZhL
+     nTEoBRkAAP94nCZMM4WY2IORXfM6phLGSz3RsHvs/vA1Opaus4+R3BKJtBtwYXRy
+     aWNlLmx1bXVtYmFAZXhhbXBsZS5uZXSIeQQTFggAIQUCV2o9XQIbAwULCQgHAgYV
+     CAkKCwIEFgIDAQIeAQIXgAAKCRATlWNoKgINCpkNAQDFDcwJUzsxu7aJUiPdpYXj
+     4uVarrXakxEE8mGFotWhLAD9GH4rqLDYIE3NKEU0s+Okt4tEIwJaV8H1NNPPPMiK
+     3g2cXQRXaj2NEgorBgEEAZdVAQUBAQdAFnnmZc99TuKk5iCq9wmYZUVF2RcXN2Cs
+     qAl8iGQQUWsDAQgHAAD/VN/VGmlcwGBPcLTya2hfU4t37nMcFCKdNSXjJ5DFA0AP
+     PohhBBgWCAAJBQJXaj2NAhsMAAoJEBOVY2gqAg0Ky4UA/0GmVaXzXemLvv1Xw4yx
+     Eaz/KfKKGc4RJ+38fyqUzw8NAQCohQ+ki3I5f84EXLZEiUiLsnVtOn1HNxvND/gW
+     TiFZBA==
+     =GHi7
+     -----END PGP PRIVATE KEY BLOCK-----
+
+A.2.  Sample Messages
+
+   The first message triggeres the publication requests.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Koch                      Expires April 8, 2017                [Page 11]
+

+Internet-Draft           OpenPGP Web Key Service            October 2016
+
+
+     From: patrice.lumumba at example.net
+     To: key-submission at example.net
+     Subject: Key publishing request
+     MIME-Version: 1.0
+     Content-Type: multipart/encrypted;
+             protocol="application/pgp-encrypted";
+             boundary="=-=01-e8k41e11ob31eefa36wo=-="
+     Date: Wed, 05 Oct 2016 10:15:51 +0000
+
+
+     --=-=01-e8k41e11ob31eefa36wo=-=
+     Content-Type: application/pgp-encrypted
+
+     Version: 1
+
+     --=-=01-e8k41e11ob31eefa36wo=-=
+     Content-Type: application/octet-stream
+
+     -----BEGIN PGP MESSAGE-----
+
+     hF4DUgLY5tvmW2sSAQdAR1AcqvFpQe/fHRZbf0xcnl9Tb+AtwaX2yZnZXGELGHsw
+     1/e3E0JptwM5tpRAVe71ooF8Zq4jl76ZgQKfj/SyjpLJxyoEDy2N5wTQaqW4JtML
+     0ukB1vh7dIRDxBJX/LQIJC0wz8o1Q3vjcLJKFFvDb7YrerABpPIzwOAupcgIbQHj
+     5m1+2WU5CL8ffyJy2h1jV2X4OnvWF1Sn6J6SVD6DfZpOPRt9TxSemJrN1LJ3lG0N
+     ts8AuYmCOeC1H2r5TYyxqkC98JF8+Nvyxd/fwne8IOjK9uixkNMC5H9/ZOH0YWCb
+     wBnNB4iXuym4OIPxiLkDymsVF0ww/XrODE9Y259EGmO45VFNrJAX3HFs9/PcMCVk
+     n2qMyEkr8LHiXeEPun6Z54RHUPYv2cUkEZ0hhSJ+rtBxkc/5D/cAScCEXRKFSKEF
+     jLJAvLK/u/ga5DAzVai+vh6b6Bq+YVPaD9GWMhWj4CgR90p9LULi6S/Hzwhv9Wzf
+     8fJoJOaDjyvRDgr09jYLWamxkS9NWxqwy6MXJvxwbNdd5XtqiW4Y4o0Ll1hDJhxR
+     ljn/XvotXKwhKN+4QGhIXDVt4Dl4XxS5ptWfVTau8W8DYqDsU2obEcfsirZv53M1
+     Q9FCD8CD9+dkBt8VAJekCWVhEltcRHxlrznbk2jxm93xSD2o6gZ5X0VSaSUXyEhm
+     J+8F3gyTHGgbq/TgyjFoockWh5EtGgAFuWvmPJCF5PO/UaNeoKwgwSJBu6oTXkHx
+     R4nvvMRcj5UgTsKpZ79NiDQukbjG5ScNT5TCUiiZsBXBqBx3fD61EH6cAuh4P3Kr
+     iM7PY4fwAHo890Dx+Qlt
+     =WIhx
+     -----END PGP MESSAGE-----
+
+     --=-=01-e8k41e11ob31eefa36wo=-=--
+
+   The server decrypts this message to
+
+
+
+
+
+
+
+
+
+
+
+Koch                      Expires April 8, 2017                [Page 12]
+

+Internet-Draft           OpenPGP Web Key Service            October 2016
+
+
+     Content-Type: application/pgp-keys
+
+     -----BEGIN PGP PUBLIC KEY BLOCK-----
+
+     mDMEV2o9XRYJKwYBBAHaRw8BAQdAZ8zkuQDL9x7rcvvoo6s3iEF1j88Dknd9nZhL
+     nTEoBRm0G3BhdHJpY2UubHVtdW1iYUBleGFtcGxlLm5ldIh5BBMWCAAhBQJXaj1d
+     AhsDBQsJCAcCBhUICQoLAgQWAgMBAh4BAheAAAoJEBOVY2gqAg0KmQ0BAMUNzAlT
+     OzG7tolSI92lhePi5VqutdqTEQTyYYWi1aEsAP0YfiuosNggTc0oRTSz46S3i0Qj
+     AlpXwfU00888yIreDbg4BFdqPY0SCisGAQQBl1UBBQEBB0AWeeZlz31O4qTmIKr3
+     CZhlRUXZFxc3YKyoCXyIZBBRawMBCAeIYQQYFggACQUCV2o9jQIbDAAKCRATlWNo
+     KgINCsuFAP9BplWl813pi779V8OMsRGs/ynyihnOESft/H8qlM8PDQEAqIUPpIty
+     OX/OBFy2RIlIi7J1bTp9RzcbzQ/4Fk4hWQQ=
+     =qRfF
+     -----END PGP PUBLIC KEY BLOCK-----
+
+   and returns this confirmation request
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Koch                      Expires April 8, 2017                [Page 13]
+

+Internet-Draft           OpenPGP Web Key Service            October 2016
+
+
+     From: key-submission at example.net
+     To: patrice.lumumba at example.net
+     Subject: Confirm your key publication
+     MIME-Version: 1.0
+     Content-Type: multipart/encrypted;
+             protocol="application/pgp-encrypted";
+             boundary="=-=01-wrzqued738dfx4x97u7y=-="
+     Date: Wed, 05 Oct 2016 10:16:57 +0000
+
+
+     --=-=01-wrzqued738dfx4x97u7y=-=
+     Content-Type: application/pgp-encrypted
+
+     Version: 1
+
+     --=-=01-wrzqued738dfx4x97u7y=-=
+     Content-Type: application/octet-stream
+
+     -----BEGIN PGP MESSAGE-----
+
+     hF4DkYWHjk/NdMASAQdAluQeqhECpU2T0zEyBAEbFzhLkpubN160wjkFCrtUc0Mw
+     FwYgM2fp9cvTMdJ/xjkvmAcIEOT4AY/hn1yFQ4z0KG0gCkSac+8mkDylnPdxlXYw
+     0sBSAXlbqpVA7eUpFuU2Zs10zbIXxlwe6osR5wUIJut/RCOsYQmfvxC55x8mUX5/
+     zgTnNzlMzye5ws4pTgAeQm2x0Yv018L8IZgY5KxwJLBzlss0wLZ45ZcS80hR11Fx
+     NCow1fKF8lMnOJxagTEOih807nctz8vT5bR1gx0d7N3LM+th8nAg9/6Ghf1XTpLo
+     MzwGW0FtOG7Dg1Uxbw2bjaOuRBeh6IIpmNAw1pmIfnNu7PpoRydU5w1K/R8MT06z
+     MKdJ7IW5mVGes9EGnG3e4mjuILvNaZhfYy+a73IhDSaPm3oqdl1Qx7tbNg6lGjn6
+     KStCYAcPGPp3m7aWkfsPGThOVRhEXqaFFywfwSVEj1pdIRjDFA==
+     =Cdjh
+     -----END PGP MESSAGE-----
+
+     --=-=01-wrzqued738dfx4x97u7y=-=--
+
+   The client decrypts the attachment as
+
+     Content-Type: application/vnd.gnupg.wks
+     Content-Transfer-Encoding: 8bit
+
+     type: confirmation-request
+     sender: key-submission at example.net
+     address: patrice.lumumba at example.net
+     fingerprint: B21DEAB4F875FB3DA42F1D1D139563682A020D0A
+     nonce: f5pscz57zj6fk11wekk8gx4cmrb659a7
+
+   creates this response
+
+
+
+
+
+
+Koch                      Expires April 8, 2017                [Page 14]
+

+Internet-Draft           OpenPGP Web Key Service            October 2016
+
+
+     Content-Type: application/vnd.gnupg.wks
+     Content-Transfer-Encoding: 8bit
+
+     type: confirmation-response
+     sender: key-submission at example.net
+     address: patrice.lumumba at example.net
+     nonce: f5pscz57zj6fk11wekk8gx4cmrb659a7
+
+   and sends it encrypted to the server
+
+     From: patrice.lumumba at example.net
+     To: key-submission at example.net
+     Subject: Key publication confirmation
+     MIME-Version: 1.0
+     Content-Type: multipart/encrypted;
+             protocol="application/pgp-encrypted";
+             boundary="=-=01-iacqg4og4pqz11a5cg1o=-="
+     Date: Wed, 05 Oct 2016 10:18:52 +0000
+
+
+     --=-=01-iacqg4og4pqz11a5cg1o=-=
+     Content-Type: application/pgp-encrypted
+
+     Version: 1
+
+     --=-=01-iacqg4og4pqz11a5cg1o=-=
+     Content-Type: application/octet-stream
+
+     -----BEGIN PGP MESSAGE-----
+
+     hF4DUgLY5tvmW2sSAQdAnB1C3PMjS4AsGU0qaCqBdWQO5i6blWEyZrEsY+JZY1Qw
+     ooNq7zdVWOHhL9LPGAALAgoL3Qfz+dN2u5QamSQ/LJ2c8M0XipNs3lqlNH63yQN1
+     0sAmAc3W8xkwul+rf6OLK/gMi6WzM4fnUhd4D1LJGIJoNUN0l3636C7ecOt2lkMl
+     5bVAYg/SyMT3ymyfQnvtiem2T5DSnPsS1g6n6QNXWvkqvX9yGxNsNDJEHTuGJB8k
+     OJoRlfWQTEo6pgA89febWl1EdeM1pPLstQ2uZE8NPjXoY1nMxAlu+iPYsR41/4sg
+     dqwOv5BPLh/GIat8hh9SPWCA9iKlgSQ/EIv5DpjQogEzpriT55dkgfvSVYIAcOdO
+     ShZ91YKkcZffevdY72omqTk10a1SUXehPooIlRFmroDsi3VDaRKrUIo=
+     =7uve
+     -----END PGP MESSAGE-----
+
+     --=-=01-iacqg4og4pqz11a5cg1o=-=--
+
+Appendix B.  Changes Since -01
+
+   o  Changed the format of the confirmation request.
+
+   o  Added sample messages.
+
+
+
+
+Koch                      Expires April 8, 2017                [Page 15]
+

+Internet-Draft           OpenPGP Web Key Service            October 2016
+
+
+Author's Address
+
+   Werner Koch
+   GnuPG Project
+
+   Email: wk at gnupg.org
+   URI:   https://gnupg.org
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Koch                      Expires April 8, 2017                [Page 16]
diff --git a/misc/id/openpgp-webkey-service/draft.org b/misc/id/openpgp-webkey-service/draft.org
index e259279..df58654 100644
--- a/misc/id/openpgp-webkey-service/draft.org
+++ b/misc/id/openpgp-webkey-service/draft.org
@@ -19,7 +19,7 @@
 ]>
 
 <rfc ipr="trust200902" category="info"
-     docName="draft-koch-openpgp-webkey-service-01">
+     docName="draft-koch-openpgp-webkey-service-02">
 
 <?rfc toc="yes"?>
 <?rfc symrefs="yes"?>
@@ -39,7 +39,7 @@
       </address>
     </author>
 
-    <date month="May" year="2016" />
+    <date month="October" year="2016" />
     <area>Security</area>
 
     <abstract>
@@ -162,16 +162,20 @@ For example the URI to lookup the key for Joe.Doe at Example.ORG is:
 
 (line has been wrapped for rendering purposes)
 
-The HTTP GET method MUST return the binary representation of the OpenPGP
-key for the given mail address.  The key needs to carry a User ID packet
-({{{RFC(4880)}}}) with that mail address.  Note that the key may be
-revoked or expired - it is up to the client to handle such conditions.
-The server MUST also accept a HEAD method so that a client may only
+The HTTP GET method MUST return the binary representation of the
+OpenPGP key for the given mail address.  The key needs to carry a User
+ID packet ({{{RFC(4880)}}}) with that mail address.  Note that the key
+may be revoked or expired - it is up to the client to handle such
+conditions.  To ease distribution of revoked keys, a server may return
+revoked keys in addition to a new key.  The keys are returned by a
+single request as concatenated key blocks.
+
+The server MUST accept the HTTP HEAD method to allow a client to
 check for the existence of a key.
 
 The server SHOULD return "application/octet-string" as the
-content-type for the data but clients SHOULD also accept any other
-content-type.  The server MUST NOT return an ASCII armored version of
+Content-Type for the data but clients SHOULD also accept any other
+Content-Type.  The server MUST NOT return an ASCII armored version of
 the key.
 
 * Web Key Directory Update Protocol
@@ -262,66 +266,89 @@ or optional parameters, and the body part contains the ASCII-armored
 transferable Public Key Packets as defined in {{{RFC(4880)}}}, section
 11.1.
 
-If the mail provider has published an encryption key for the
-submission-address in the Web Key Directory, the key to be published
-MUST be submitted using a PGP/MIME encrypted message ({{{RFC(3156)}}},
-section 4).  The message MUST NOT be signed (because the authenticity of
-the signing key has not yet been confirmed).  After decryption of the
-message at the mail provider a single "application/pgp-keys" part, as
-specified above, is expected.
+The mail provider MUST publish a key capable of signing and encryption
+for the submission-address in the Web Key Directory or via DANE.  The
+key to be published MUST be submitted using a PGP/MIME encrypted
+message ({{{RFC(3156)}}}, section 4).  The message MUST NOT be signed
+(because the authenticity of the signing key has not yet been
+confirmed).  After decryption of the message at the mail provider a
+single "application/pgp-keys" part, as specified above, is expected.
 
 ** The Confirmation Request
 
 The mail provider sends a confirmation mail in response to a received
-key publication request.  The message SHOULD be sent from the
+key publication request.  The message MUST be sent from the
 submission-address of the mail provider to the mail address extracted
-from the target key.  The message needs to be encrypted to the target key
-and MAY be signed by the submission key.  PGP/MIME MUST be used for
-encryption and signing; the Combined method ({{{RFC(3156)}}}, section
-6.2) MUST be used if the message is to be signed.
-
-The Content-type used for the plaintext part MUST be
-"application/vnd.gnupg.wkd".  The body consists of name-value pairs with
-one name-value pair per LF or CR+LF terminated line.  Empty lines are
-allowed and will be ignored by the receiver.  A colon is used to
-terminate a name.
-
-In a confirmation request the following names MUST be send in the
-specified order:
+from the target key.  The message needs to be a PGP/MIME signed
+message using the submission key of the provider for the
+signature.  The signed message MUST have two parts:
 
-- "type" :: The value must be "confirmation-request".
+The first part MUST have "text" as its Content-Type and can be used to
+explain the purpose of the mail.  For example it may point to this RFC
+and explain on how to manually perform the protocol.
 
-- "sender" :: This is the mailbox the user is expected to sent the
-              confirmation response to.  The value must match the
-              mailbox part of the "From:" address of this
-              request.  Exactly one address MUST be given.
+The second part jMUST have "application/vnd.gnupg.wkd" as its
+Content-Type and carry an OpenPGP encrypted message in ASCII Armor
+format.  The message MUST be encrypted to the target key and MUST not
+be signed.  After decryption a text file in the Web Key data format
+must be yielded.
 
-- "address" :: The value is the addr-spec part of the target key's
-               mail address.  The value SHOULD match the addr-spec part
-               of the recipient's address.  The value MUST be UTF-8
-               encoded as required for an OpenPGP User ID.
+That data format consists of name-value pairs with one name-value pair
+per LF or CR+LF terminated line.  Empty lines are allowed and will be
+ignored by the receiver.  A colon is used to terminate a name.
 
-- "fingerprint" :: The value is the fingerprint of the target key.  The
-                   fingerprint is given in uppercase hex encoding
-                   without any interleaving spaces.
-
-- "nonce" :: The value is a string with a minimum length of 16 octets
-             and a maximum length of 64 octets.  The string must
-             entirely be made up of random ASCII letters or
-             digits.  This nonce will be sent back to the mail provider
-             as proof that the recipient is the legitimate owner of
-             the target-key.
+In a confirmation request the following names MUST be send in the
+specified order:
 
-The receiver of the message decrypts the message, checks that the
-"fingerprint" matches the target key, checks that the "address" matches
-a User ID of the target key, and checks the other constrains of the
-request format.  If any constraint is not asserted, or the fingerprint or
-User ID do not match the target key, or there is no pending publication
-requests (i.e. a mail recently sent o the submission address), the user
-MAY be notified about this fake confirmation attempt.
+- type :: The value must be "confirmation-request".
+
+- sender :: This is the mailbox the user is expected to sent the
+            confirmation response to.  The value must match the
+            mailbox part of the "From:" address of this
+            request.  Exactly one address MUST be given.
+
+- address :: The value is the addr-spec part of the target key's
+             mail address.  The value SHOULD match the addr-spec part
+             of the recipient's address.  The value MUST be UTF-8
+             encoded as required for an OpenPGP User ID.
+
+- fingerprint :: The value is the fingerprint of the target key.  The
+                 fingerprint is given in uppercase hex encoding
+                 without any interleaving spaces.
+
+- nonce :: The value is a string with a minimum length of 16 octets
+           and a maximum length of 64 octets.  The string must
+           entirely be made up of random ASCII letters or
+           digits.  This nonce will be sent back to the mail provider
+           as proof that the recipient is the legitimate owner of
+           the target-key.
+
+The receiver of that message is expected to verify the outer signature
+and disregard the entire message if it can't be verified or has not
+been signed by the key associated with the submission address.
+
+After the message as been verified the receiver decrypts the second part
+of the message, checks that the "fingerprint" matches the target key,
+checks that the "address" matches a User ID of the target key, and
+checks the other constrains of the request format.  If any constraint
+is not asserted, or the fingerprint or User ID do not match the target
+key, or there is no pending publication requests (i.e. a mail recently
+sent o the submission address), the user MAY be notified about this
+fake confirmation attempt.
+
+In other cases the confirmation request is legitimate and the MUA
+shall silently send a response as described in the next section.
+
+The rationale for the outer signature used with this request is to
+allow early detection of spam mails.  This can be done prior to the
+decryption step and avoids asking the user to enter a passphrase to
+perform the decryption for a non-legitimate message.  The use of a
+simple encrypted attachment, instead of using PGP/MIME encryption, is
+to convey the Content-Type of that attachment in the clear and also to
+prevent automatic decryption of that attachment by PGP/MIME aware
+clients.  The MUA may in fact detect this confirmation request and
+present a customized dialog for confirming that request.
 
-In other cases the confirmation request is legitimate and the MUA shall
-silently send a response as described in the next section.
 
 ** The Confirmation Response
 
@@ -333,24 +360,25 @@ the sending of a confirmation request after the first request has been
 send successfully.
 
 The user MUST send the confirmation response from her target mail
-address to the "from" address of the confirmation request.  The message
-MUST be signed and SHOULD be encrypted.  The PGP/MIME Combined format
-MUST be used for encryption and signing ({{{RFC(3156)}}}, section 6.2).
-The encryption key can be taken from the Web Key Directory.
+address to the "from" address of the confirmation request.  The
+message MUST be signed and encrypted using the PGP/MIME Combined
+format ({{{RFC(3156)}}}, section 6.2).  The signing key is the target
+key and the encryption key is the key associated with the provider's
+submission address.
 
-The Content-type used for the plaintext message MUST also be
+The Content-Type used for the plaintext message MUST also be
 "application/vnd.gnupg.wkd".  The format is the same as described above
 for the Confirmation Request.  The body must contain three name-value
 pairs in this order:
 
-- "type" :: The value must be "confirmation-response".
+- type :: The value must be "confirmation-response".
 
-- "sender" :: The value must match the mailbox part of the "From:"
-              address of this response.  Exactly one address MUST be
-              given.
+- sender :: The value must match the mailbox part of the "From:"
+            address of this response.  Exactly one address MUST be
+            given.
 
-- "nonce" :: The value is the value of the "nonce" parameter from the
-             confirmation request.
+- nonce :: The value is the value of the "nonce" parameter from the
+           confirmation request.
 
 ** Policy Flags
 
@@ -374,17 +402,17 @@ case-insensitive matching for the keyword.
 
 Currently defined keywords are:
 
-- "mailbox-only" :: The mail server provider does only accept keys
+- mailbox-only :: The mail server provider does only accept keys
                     with only a mailbox in the User ID.  In particular
                     User IDs with a real name in addition to the
                     mailbox will be rejected as invalid.
 
-- "dane-only" :: The mail server provider does not run a Web Key
+- dane-only :: The mail server provider does not run a Web Key
                  Directory but only an OpenPGP DANE service.  The Web
                  Key Directory Update protocol is used to update the
                  keys for the DANE service.
 
-- "auth-submit" :: The submission of the mail to the server is done
+- auth-submit :: The submission of the mail to the server is done
                    using an authenticated connection.  Thus the
                    submitted key will be published immediately without
                    any confirmation request.
@@ -404,7 +432,7 @@ intended to conceal information about a mail address.
 
 The domain name part of the mail address is not part of the hash to
 avoid problems with internationalized domain names.  Instead a separate
-web service is required for each domain name.
+URL is required for each domain name.
 
 * IANA Considerations
 
@@ -427,30 +455,212 @@ the help of Bernhard Reiter and Guilhem Moulin.
 
 * Back
 
-* Test Vectors
+* Sample Protocol Run
+
+The following non-normative example can be used by implementors as
+guidance.
+
+Note that GnuPG version 2.1.12 supports the key discovery described in
+version -00 of this document (auto-key-locate method "wkd").  Version
+2.1.16 can run the protocol decribed in this document but is also able
+to run the protocol version specified by -01.
+
+** Sample Keys
+
+This is the provider's submission key:
+#+begin_example
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+lFgEV/TAohYJKwYBBAHaRw8BAQdAB/k9YQfSTI8qQqqK1KimH/BsvzsowWItSQPT
+FP+fOC4AAP46uJ3Snno3Vy+kORye3rf0VvWvuz82voEQLxG6WpfHhREEtBprZXkt
+c3VibWlzc2lvbkBleGFtcGxlLm5ldIh5BBMWCAAhBQJX9MCiAhsDBQsJCAcCBhUI
+CQoLAgQWAgMBAh4BAheAAAoJEKhtNooW0cqEWMUA/0e9XaeptszWC9ZvPg8INL6a
+BvRqPBYGU7PGmuXsxBovAQDyckOykG0UAfHVyN1w4gSK/biMcnqVr857i8/HuvjW
+C5xdBFf0wKISCisGAQQBl1UBBQEBB0Apvaoe4MtSEJ1fpds/4DFl2kXXBpnVji/s
+Wg9btdthNQMBCAcAAP9FJX99T1LEJzBnvBBnc6bimnT6/1OKM9RdO4R0/uVP6BFL
+iGEEGBYIAAkFAlf0wKICGwwACgkQqG02ihbRyoTlGwD9FBr92osjL7HkhhZZ7Z2D
+My3b9zpoZeMjvPg5YPqpdKMA/jhZoHuZCRMBYf7YRFb8aXtuyetDFZYrkjnum+OG
+HFAD
+=Hnwd
+-----END PGP PRIVATE KEY BLOCK-----
+#+end_example
+
+This is the target key to be published:
+#+begin_example
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+lFgEV2o9XRYJKwYBBAHaRw8BAQdAZ8zkuQDL9x7rcvvoo6s3iEF1j88Dknd9nZhL
+nTEoBRkAAP94nCZMM4WY2IORXfM6phLGSz3RsHvs/vA1Opaus4+R3BKJtBtwYXRy
+aWNlLmx1bXVtYmFAZXhhbXBsZS5uZXSIeQQTFggAIQUCV2o9XQIbAwULCQgHAgYV
+CAkKCwIEFgIDAQIeAQIXgAAKCRATlWNoKgINCpkNAQDFDcwJUzsxu7aJUiPdpYXj
+4uVarrXakxEE8mGFotWhLAD9GH4rqLDYIE3NKEU0s+Okt4tEIwJaV8H1NNPPPMiK
+3g2cXQRXaj2NEgorBgEEAZdVAQUBAQdAFnnmZc99TuKk5iCq9wmYZUVF2RcXN2Cs
+qAl8iGQQUWsDAQgHAAD/VN/VGmlcwGBPcLTya2hfU4t37nMcFCKdNSXjJ5DFA0AP
+PohhBBgWCAAJBQJXaj2NAhsMAAoJEBOVY2gqAg0Ky4UA/0GmVaXzXemLvv1Xw4yx
+Eaz/KfKKGc4RJ+38fyqUzw8NAQCohQ+ki3I5f84EXLZEiUiLsnVtOn1HNxvND/gW
+TiFZBA==
+=GHi7
+-----END PGP PRIVATE KEY BLOCK-----
+#+end_example
+
+** Sample Messages
+
+The first message triggeres the publication requests.
+#+begin_example
+From: patrice.lumumba at example.net
+To: key-submission at example.net
+Subject: Key publishing request
+MIME-Version: 1.0
+Content-Type: multipart/encrypted;
+        protocol="application/pgp-encrypted";
+	boundary="=-=01-e8k41e11ob31eefa36wo=-="
+Date: Wed, 05 Oct 2016 10:15:51 +0000
+
+
+--=-=01-e8k41e11ob31eefa36wo=-=
+Content-Type: application/pgp-encrypted
+
+Version: 1
+
+--=-=01-e8k41e11ob31eefa36wo=-=
+Content-Type: application/octet-stream
+
+-----BEGIN PGP MESSAGE-----
+
+hF4DUgLY5tvmW2sSAQdAR1AcqvFpQe/fHRZbf0xcnl9Tb+AtwaX2yZnZXGELGHsw
+1/e3E0JptwM5tpRAVe71ooF8Zq4jl76ZgQKfj/SyjpLJxyoEDy2N5wTQaqW4JtML
+0ukB1vh7dIRDxBJX/LQIJC0wz8o1Q3vjcLJKFFvDb7YrerABpPIzwOAupcgIbQHj
+5m1+2WU5CL8ffyJy2h1jV2X4OnvWF1Sn6J6SVD6DfZpOPRt9TxSemJrN1LJ3lG0N
+ts8AuYmCOeC1H2r5TYyxqkC98JF8+Nvyxd/fwne8IOjK9uixkNMC5H9/ZOH0YWCb
+wBnNB4iXuym4OIPxiLkDymsVF0ww/XrODE9Y259EGmO45VFNrJAX3HFs9/PcMCVk
+n2qMyEkr8LHiXeEPun6Z54RHUPYv2cUkEZ0hhSJ+rtBxkc/5D/cAScCEXRKFSKEF
+jLJAvLK/u/ga5DAzVai+vh6b6Bq+YVPaD9GWMhWj4CgR90p9LULi6S/Hzwhv9Wzf
+8fJoJOaDjyvRDgr09jYLWamxkS9NWxqwy6MXJvxwbNdd5XtqiW4Y4o0Ll1hDJhxR
+ljn/XvotXKwhKN+4QGhIXDVt4Dl4XxS5ptWfVTau8W8DYqDsU2obEcfsirZv53M1
+Q9FCD8CD9+dkBt8VAJekCWVhEltcRHxlrznbk2jxm93xSD2o6gZ5X0VSaSUXyEhm
+J+8F3gyTHGgbq/TgyjFoockWh5EtGgAFuWvmPJCF5PO/UaNeoKwgwSJBu6oTXkHx
+R4nvvMRcj5UgTsKpZ79NiDQukbjG5ScNT5TCUiiZsBXBqBx3fD61EH6cAuh4P3Kr
+iM7PY4fwAHo890Dx+Qlt
+=WIhx
+-----END PGP MESSAGE-----
+
+--=-=01-e8k41e11ob31eefa36wo=-=--
+#+end_example
 
-For help implementing this specification a non-normative example is
-given:
+The server decrypts this message to
+#+begin_example
+Content-Type: application/pgp-keys
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEV2o9XRYJKwYBBAHaRw8BAQdAZ8zkuQDL9x7rcvvoo6s3iEF1j88Dknd9nZhL
+nTEoBRm0G3BhdHJpY2UubHVtdW1iYUBleGFtcGxlLm5ldIh5BBMWCAAhBQJXaj1d
+AhsDBQsJCAcCBhUICQoLAgQWAgMBAh4BAheAAAoJEBOVY2gqAg0KmQ0BAMUNzAlT
+OzG7tolSI92lhePi5VqutdqTEQTyYYWi1aEsAP0YfiuosNggTc0oRTSz46S3i0Qj
+AlpXwfU00888yIreDbg4BFdqPY0SCisGAQQBl1UBBQEBB0AWeeZlz31O4qTmIKr3
+CZhlRUXZFxc3YKyoCXyIZBBRawMBCAeIYQQYFggACQUCV2o9jQIbDAAKCRATlWNo
+KgINCsuFAP9BplWl813pi779V8OMsRGs/ynyihnOESft/H8qlM8PDQEAqIUPpIty
+OX/OBFy2RIlIi7J1bTp9RzcbzQ/4Fk4hWQQ=
+=qRfF
+-----END PGP PUBLIC KEY BLOCK-----
+#+end_example
 
-** Sample key
+and returns this confirmation request
+#+begin_example
+From: key-submission at example.net
+To: patrice.lumumba at example.net
+Subject: Confirm your key publication
+MIME-Version: 1.0
+Content-Type: multipart/encrypted;
+	protocol="application/pgp-encrypted";
+	boundary="=-=01-wrzqued738dfx4x97u7y=-="
+Date: Wed, 05 Oct 2016 10:16:57 +0000
+
+
+--=-=01-wrzqued738dfx4x97u7y=-=
+Content-Type: application/pgp-encrypted
+
+Version: 1
+
+--=-=01-wrzqued738dfx4x97u7y=-=
+Content-Type: application/octet-stream
+
+-----BEGIN PGP MESSAGE-----
+
+hF4DkYWHjk/NdMASAQdAluQeqhECpU2T0zEyBAEbFzhLkpubN160wjkFCrtUc0Mw
+FwYgM2fp9cvTMdJ/xjkvmAcIEOT4AY/hn1yFQ4z0KG0gCkSac+8mkDylnPdxlXYw
+0sBSAXlbqpVA7eUpFuU2Zs10zbIXxlwe6osR5wUIJut/RCOsYQmfvxC55x8mUX5/
+zgTnNzlMzye5ws4pTgAeQm2x0Yv018L8IZgY5KxwJLBzlss0wLZ45ZcS80hR11Fx
+NCow1fKF8lMnOJxagTEOih807nctz8vT5bR1gx0d7N3LM+th8nAg9/6Ghf1XTpLo
+MzwGW0FtOG7Dg1Uxbw2bjaOuRBeh6IIpmNAw1pmIfnNu7PpoRydU5w1K/R8MT06z
+MKdJ7IW5mVGes9EGnG3e4mjuILvNaZhfYy+a73IhDSaPm3oqdl1Qx7tbNg6lGjn6
+KStCYAcPGPp3m7aWkfsPGThOVRhEXqaFFywfwSVEj1pdIRjDFA==
+=Cdjh
+-----END PGP MESSAGE-----
+
+--=-=01-wrzqued738dfx4x97u7y=-=--
+#+end_example
 
-TODO
+The client decrypts the attachment as
+#+begin_example
+Content-Type: application/vnd.gnupg.wks
+Content-Transfer-Encoding: 8bit
+
+type: confirmation-request
+sender: key-submission at example.net
+address: patrice.lumumba at example.net
+fingerprint: B21DEAB4F875FB3DA42F1D1D139563682A020D0A
+nonce: f5pscz57zj6fk11wekk8gx4cmrb659a7
+#+end_example
 
-** Software Notes
+creates this response
+#+begin_example
+Content-Type: application/vnd.gnupg.wks
+Content-Transfer-Encoding: 8bit
 
-GnuPG supports the key discovery described in version -00 of this
-document since version 2.1.12, 2.1.13 and the gurrent git version will
-be adjusted to the changes specs dfescribed in -01.  To use it, the
-new method "wkd" needs to be used with the =--auto-key-locate= option.
+type: confirmation-response
+sender: key-submission at example.net
+address: patrice.lumumba at example.net
+nonce: f5pscz57zj6fk11wekk8gx4cmrb659a7
+#+end_example
 
-* Changes since -00
+and sends it encrypted to the server
+#+begin_example
+From: patrice.lumumba at example.net
+To: key-submission at example.net
+Subject: Key publication confirmation
+MIME-Version: 1.0
+Content-Type: multipart/encrypted;
+	protocol="application/pgp-encrypted";
+	boundary="=-=01-iacqg4og4pqz11a5cg1o=-="
+Date: Wed, 05 Oct 2016 10:18:52 +0000
+
+
+--=-=01-iacqg4og4pqz11a5cg1o=-=
+Content-Type: application/pgp-encrypted
+
+Version: 1
+
+--=-=01-iacqg4og4pqz11a5cg1o=-=
+Content-Type: application/octet-stream
+
+-----BEGIN PGP MESSAGE-----
+
+hF4DUgLY5tvmW2sSAQdAnB1C3PMjS4AsGU0qaCqBdWQO5i6blWEyZrEsY+JZY1Qw
+ooNq7zdVWOHhL9LPGAALAgoL3Qfz+dN2u5QamSQ/LJ2c8M0XipNs3lqlNH63yQN1
+0sAmAc3W8xkwul+rf6OLK/gMi6WzM4fnUhd4D1LJGIJoNUN0l3636C7ecOt2lkMl
+5bVAYg/SyMT3ymyfQnvtiem2T5DSnPsS1g6n6QNXWvkqvX9yGxNsNDJEHTuGJB8k
+OJoRlfWQTEo6pgA89febWl1EdeM1pPLstQ2uZE8NPjXoY1nMxAlu+iPYsR41/4sg
+dqwOv5BPLh/GIat8hh9SPWCA9iKlgSQ/EIv5DpjQogEzpriT55dkgfvSVYIAcOdO
+ShZ91YKkcZffevdY72omqTk10a1SUXehPooIlRFmroDsi3VDaRKrUIo=
+=7uve
+-----END PGP MESSAGE-----
+
+--=-=01-iacqg4og4pqz11a5cg1o=-=--
+#+end_example
 
--  Dropped the second occurrence of the domain name from the URL.
--  Changed field names in the request and response format.
--  Removed useless checks.
--  Added a new policy flag.
 
-** TODO
+* Changes Since -01
 
--  What about authenticated submission?
--  Describe how to handle a key with several User IDs.
+- Changed the format of the confirmation request.
+- Added sample messages.

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

Summary of changes:
 misc/id/openpgp-webkey-service/Makefile            |   1 +
 .../draft-koch-openpgp-webkey-service-02.txt       | 896 +++++++++++++++++++++
 misc/id/openpgp-webkey-service/draft.org           | 392 ++++++---
 3 files changed, 1198 insertions(+), 91 deletions(-)
 create mode 100644 misc/id/openpgp-webkey-service/draft-koch-openpgp-webkey-service-02.txt


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org



From cvs at cvs.gnupg.org  Wed Oct  5 14:34:58 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 05 Oct 2016 14:34:58 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. cef834fb232bd2f8b4c485122d8c7c3dd1024d7a
Message-ID: <E1brlPY-00071G-MA@lists.gnupg.org>

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 GnuPG website and other docs".

The branch, master has been updated
       via  cef834fb232bd2f8b4c485122d8c7c3dd1024d7a (commit)
      from  e28c0acedc6f13459022f3324264e77c2da4f768 (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 cef834fb232bd2f8b4c485122d8c7c3dd1024d7a
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Oct 5 14:32:01 2016 +0200

    drafts,openpgp-webkey-service: Fix nits from last publication

diff --git a/misc/id/openpgp-webkey-service/draft.org b/misc/id/openpgp-webkey-service/draft.org
index df58654..25a661f 100644
--- a/misc/id/openpgp-webkey-service/draft.org
+++ b/misc/id/openpgp-webkey-service/draft.org
@@ -19,7 +19,7 @@
 ]>
 
 <rfc ipr="trust200902" category="info"
-     docName="draft-koch-openpgp-webkey-service-02">
+     docName="draft-koch-openpgp-webkey-service-03">
 
 <?rfc toc="yes"?>
 <?rfc symrefs="yes"?>
@@ -39,7 +39,7 @@
       </address>
     </author>
 
-    <date month="October" year="2016" />
+    <date month="MONTH" year="2016" />
     <area>Security</area>
 
     <abstract>
@@ -287,9 +287,9 @@ The first part MUST have "text" as its Content-Type and can be used to
 explain the purpose of the mail.  For example it may point to this RFC
 and explain on how to manually perform the protocol.
 
-The second part jMUST have "application/vnd.gnupg.wkd" as its
+The second part MUST have "application/vnd.gnupg.wkd" as its
 Content-Type and carry an OpenPGP encrypted message in ASCII Armor
-format.  The message MUST be encrypted to the target key and MUST not
+format.  The message MUST be encrypted to the target key and MUST NOT
 be signed.  After decryption a text file in the Web Key data format
 must be yielded.
 

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

Summary of changes:
 misc/id/openpgp-webkey-service/draft.org | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org



From cvs at cvs.gnupg.org  Wed Oct  5 14:42:02 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 05 Oct 2016 14:42:02 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-202-g8ce800d
Message-ID: <E1brlWP-00074q-3C@lists.gnupg.org>

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  8ce800d21919eaaba7ed4f04f712292be310fd66 (commit)
      from  e514a5b725f0c997cef4362808b2778a3faa9cf8 (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 8ce800d21919eaaba7ed4f04f712292be310fd66
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Oct 5 14:38:37 2016 +0200

    wks: Send key encrypted as required by draft -02
    
    * tools/gpg-wks-client.c (get_key): Encrypt.
    (encrypt_response): Take care of --fake-submission-addr.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/tools/gpg-wks-client.c b/tools/gpg-wks-client.c
index 4df54cc..7630953 100644
--- a/tools/gpg-wks-client.c
+++ b/tools/gpg-wks-client.c
@@ -112,6 +112,8 @@ const char *fake_submission_addr;
 static void wrong_args (const char *text) GPGRT_ATTR_NORETURN;
 static gpg_error_t command_supported (char *userid);
 static gpg_error_t command_send (const char *fingerprint, char *userid);
+static gpg_error_t encrypt_response (estream_t *r_output, estream_t input,
+                                     const char *addrspec);
 static gpg_error_t read_confirmation_request (estream_t msg);
 static gpg_error_t command_receive_cb (void *opaque,
                                        const char *mediatype, estream_t fp,
@@ -346,6 +348,9 @@ get_key (estream_t *r_key, const char *fingerprint, const char *addrspec)
       log_error ("error allocating memory buffer: %s\n", gpg_strerror (err));
       goto leave;
     }
+  /* Prefix the key with the MIME content type.  */
+  es_fputs ("Content-Type: application/pgp-keys\n"
+            "\n", key);
 
   filterexp = es_bsprintf ("keep-uid=mbox = %s", addrspec);
   if (!filterexp)
@@ -535,6 +540,7 @@ command_send (const char *fingerprint, char *userid)
   KEYDB_SEARCH_DESC desc;
   char *addrspec = NULL;
   estream_t key = NULL;
+  estream_t keyenc = NULL;
   char *submission_to = NULL;
   mime_maker_t mime = NULL;
   struct policy_flags_s policy;
@@ -596,6 +602,15 @@ command_send (const char *fingerprint, char *userid)
   if (policy.auth_submit)
     log_info ("no confirmation required for '%s'\n", addrspec);
 
+  /* Encrypt the key part.  */
+  es_rewind (key);
+  err = encrypt_response (&keyenc, key, submission_to);
+  if (err)
+    goto leave;
+  es_fclose (key);
+  key = NULL;
+
+
   /* Send the key.  */
   err = mime_maker_new (&mime, NULL);
   if (err)
@@ -610,16 +625,33 @@ command_send (const char *fingerprint, char *userid)
   if (err)
     goto leave;
 
-  err = mime_maker_add_header (mime, "Content-type", "application/pgp-keys");
+  /* Tell server that we support draft version 3.  */
+  err = mime_maker_add_header (mime, "Wks-Draft-Version", "3");
   if (err)
     goto leave;
 
-  /* Tell server that we support draft version 3.  */
-  err = mime_maker_add_header (mime, "Wks-Draft-Version", "3");
+  err = mime_maker_add_header (mime, "Content-Type",
+                               "multipart/encrypted; "
+                               "protocol=\"application/pgp-encrypted\"");
+  if (err)
+    goto leave;
+  err = mime_maker_add_container (mime);
   if (err)
     goto leave;
 
-  err = mime_maker_add_stream (mime, &key);
+  err = mime_maker_add_header (mime, "Content-Type",
+                               "application/pgp-encrypted");
+  if (err)
+    goto leave;
+  err = mime_maker_add_body (mime, "Version: 1\n");
+  if (err)
+    goto leave;
+  err = mime_maker_add_header (mime, "Content-Type",
+                               "application/octet-stream");
+  if (err)
+    goto leave;
+
+  err = mime_maker_add_stream (mime, &keyenc);
   if (err)
     goto leave;
 
@@ -628,6 +660,7 @@ command_send (const char *fingerprint, char *userid)
  leave:
   mime_maker_release (mime);
   xfree (submission_to);
+  es_fclose (keyenc);
   es_fclose (key);
   xfree (addrspec);
   return err;
@@ -691,7 +724,10 @@ encrypt_response (estream_t *r_output, estream_t input, const char *addrspec)
   ccparray_put (&ccp, "--status-fd=2");
   ccparray_put (&ccp, "--always-trust");
   ccparray_put (&ccp, "--armor");
-  ccparray_put (&ccp, "--auto-key-locate=clear,wkd,dane,local");
+  if (fake_submission_addr)
+    ccparray_put (&ccp, "--auto-key-locate=clear,local");
+  else
+    ccparray_put (&ccp, "--auto-key-locate=clear,wkd,dane,local");
   ccparray_put (&ccp, "--recipient");
   ccparray_put (&ccp, addrspec);
   ccparray_put (&ccp, "--encrypt");

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

Summary of changes:
 tools/gpg-wks-client.c | 46 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 5 deletions(-)


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



From cvs at cvs.gnupg.org  Wed Oct  5 15:20:03 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 05 Oct 2016 15:20:03 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. f13388fd42405ea806e86c6f094074999831b360
Message-ID: <E1brm7B-0000Xp-3a@lists.gnupg.org>

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 GnuPG website and other docs".

The branch, master has been updated
       via  f13388fd42405ea806e86c6f094074999831b360 (commit)
      from  cef834fb232bd2f8b4c485122d8c7c3dd1024d7a (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 f13388fd42405ea806e86c6f094074999831b360
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Oct 5 15:17:05 2016 +0200

    web: Typo fix

diff --git a/web/documentation/security.org b/web/documentation/security.org
index 783a5c9..c724827 100644
--- a/web/documentation/security.org
+++ b/web/documentation/security.org
@@ -25,5 +25,5 @@ publish it, please report it by mail to security at gnupg.org.
 Note that we do not use a team OpenPGP key.  Thus please write a
 non-encrypted message to the security address and ask for the keys of
 the developers at duty and then encrypt the mail to all of them.  A
-list of our core developers can be found [[../people/index.org][here]]; the are all active on
+list of our core developers can be found [[../people/index.org][here]]; they are all active on
 the gnupg-devel mailing list.

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

Summary of changes:
 web/documentation/security.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org



From cvs at cvs.gnupg.org  Wed Oct  5 16:05:29 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Wed, 05 Oct 2016 16:05:29 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.7.0-25-g52a91cc
Message-ID: <E1brmp9-00025i-I2@lists.gnupg.org>

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 "GnuPG Made Easy".

The branch, master has been updated
       via  52a91ccc6a25425d4374b77040e30efb6816940f (commit)
      from  453ab9d24ca48c9e01d21e1454d6b08de1938b76 (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 52a91ccc6a25425d4374b77040e30efb6816940f
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 5 16:01:20 2016 +0200

    qt: Disable t-wkspublish test
    
    * lang/qt/tests/Makefile.am (TESTS): Remove t-wkspublish.
    
    --
    Even the only enabled test did a connection to localhost this
    might fail if it is stalled and is an outside factor. It also might
    be disturbing other services locally.

diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
index f243a55..72ea324 100644
--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
@@ -25,7 +25,7 @@ TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir)
 EXTRA_DIST = initial.test
 
 TESTS = initial.test t-keylist t-keylocate t-ownertrust t-tofuinfo \
-        t-encrypt t-wkspublish
+        t-encrypt
 
 moc_files = t-keylist.moc t-keylocate.moc t-ownertrust.moc t-tofuinfo.moc \
             t-encrypt.moc t-support.hmoc t-wkspublish.moc

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

Summary of changes:
 lang/qt/tests/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org



From cvs at cvs.gnupg.org  Wed Oct  5 17:23:10 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Wed, 05 Oct 2016 17:23:10 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.7.0-30-g24779c9
Message-ID: <E1bro2L-0005I6-7Z@lists.gnupg.org>

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 "GnuPG Made Easy".

The branch, master has been updated
       via  24779c9e2301bd17fd328d65b0383e1cbc944119 (commit)
       via  4984cc93db6b55f2420a9abd844c074a5fb4ed0c (commit)
       via  9d1df990386010e0581b542a76a4f5d85d8d11b5 (commit)
       via  370ee1aa802ec6a4030a39b2df7d24a0c47e5ac7 (commit)
       via  39dd7585f5a7d801942efcb375d6dd46d01d2968 (commit)
      from  52a91ccc6a25425d4374b77040e30efb6816940f (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 24779c9e2301bd17fd328d65b0383e1cbc944119
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 5 17:19:20 2016 +0200

    qt: Disable tests that require a password for 2.0
    
    * lang/qt/tests/t-encrypt.cpp: Disable tests that require
    a password for 2.0.
    
    --
    The passphrase_cb apparently does not work with 2.0 so we would
    need a fake pinentry to get this to work. We just disable the
    test instead as this is a rarely used feature and works with
    1.4 and 2.1.

diff --git a/lang/qt/tests/t-encrypt.cpp b/lang/qt/tests/t-encrypt.cpp
index c3ce610..4d65dc7 100644
--- a/lang/qt/tests/t-encrypt.cpp
+++ b/lang/qt/tests/t-encrypt.cpp
@@ -53,6 +53,23 @@
 using namespace QGpgME;
 using namespace GpgME;
 
+static bool decryptSupported()
+{
+    /* With GnuPG 2.0.x (at least 2.0.26 by default on jessie)
+     * the passphrase_cb does not work. So the test popped up
+     * a pinentry. So tests requiring decryption don't work. */
+    static auto version = GpgME::engineInfo(GpgME::GpgEngine).engineVersion();
+    if (version < "2.0.0") {
+        /* With 1.4 it just works */
+        return true;
+    }
+    if (version < "2.1.0") {
+        /* With 2.1 it works with loopback mode */
+        return false;
+    }
+    return true;
+}
+
 class EncryptionTest : public QGpgMETest
 {
     Q_OBJECT
@@ -82,6 +99,9 @@ private Q_SLOTS:
         Q_ASSERT(cipherString.startsWith("-----BEGIN PGP MESSAGE-----"));
 
         /* Now decrypt */
+        if (!decryptSupported()) {
+            return;
+        }
         auto ctx = Context::createForProtocol(OpenPGP);
         TestPassphraseProvider provider;
         ctx->setPassphraseProvider(&provider);
@@ -150,6 +170,9 @@ private Q_SLOTS:
 
     void testSymmetricEncryptDecrypt()
     {
+        if (!decryptSupported()) {
+            return;
+        }
         auto ctx = Context::createForProtocol(OpenPGP);
         TestPassphraseProvider provider;
         ctx->setPassphraseProvider(&provider);
@@ -182,6 +205,9 @@ private:
      * So this test is disabled until gnupg(?) is fixed for this. */
     void testMixedEncryptDecrypt()
     {
+        if (!decryptSupported()) {
+            return;
+        }
         auto listjob = openpgp()->keyListJob(false, false, false);
         std::vector<Key> keys;
         auto keylistresult = listjob->exec(QStringList() << QStringLiteral("alfa at example.net"),

commit 4984cc93db6b55f2420a9abd844c074a5fb4ed0c
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 5 16:55:14 2016 +0200

    Add warning flags for c++ compiler, too
    
    * configure.ac (CXXFLAGS): Add Wall and Wextra.

diff --git a/configure.ac b/configure.ac
index efa1f19..114225a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -588,6 +588,7 @@ if test "$GCC" = yes; then
           CFLAGS="$CFLAGS -Wno-missing-field-initializers"
           CFLAGS="$CFLAGS -Wno-sign-compare"
         fi
+        CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-shadow"
 
         AC_MSG_CHECKING([if gcc supports -Wpointer-arith])
         _gcc_cflags_save=$CFLAGS

commit 9d1df990386010e0581b542a76a4f5d85d8d11b5
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 5 16:44:53 2016 +0200

    qt: Fix unused variable warnings
    
    * qt/src/qgpgmenewcryptoconfig.cpp,
    qt/src/threadedjobmixin.h,
    qt/tests/t-encrypt.cpp,
    qt/tests/t-support.h,
    qt/tests/t-wkspublish.cpp: Mark additional variables as unused.

diff --git a/lang/qt/src/qgpgmenewcryptoconfig.cpp b/lang/qt/src/qgpgmenewcryptoconfig.cpp
index 62566d5..eb3af56 100644
--- a/lang/qt/src/qgpgmenewcryptoconfig.cpp
+++ b/lang/qt/src/qgpgmenewcryptoconfig.cpp
@@ -84,7 +84,7 @@ QGpgMENewCryptoConfig::~QGpgMENewCryptoConfig()
     clear();
 }
 
-void QGpgMENewCryptoConfig::reloadConfiguration(bool showErrors)
+void QGpgMENewCryptoConfig::reloadConfiguration(bool)
 {
     clear();
 
diff --git a/lang/qt/src/threadedjobmixin.h b/lang/qt/src/threadedjobmixin.h
index 62d7f1c..d1b1043 100644
--- a/lang/qt/src/threadedjobmixin.h
+++ b/lang/qt/src/threadedjobmixin.h
@@ -223,7 +223,8 @@ protected:
     {
         return m_auditLogError;
     }
-    void showProgress(const char *what, int type, int current, int total) Q_DECL_OVERRIDE {
+    void showProgress(const char * /*what*/,
+                      int /*type*/, int current, int total) Q_DECL_OVERRIDE {
         // will be called from the thread exec'ing the operation, so
         // just bounce everything to the owning thread:
         // ### hope this is thread-safe (meta obj is const, and
diff --git a/lang/qt/tests/t-encrypt.cpp b/lang/qt/tests/t-encrypt.cpp
index bc6b878..c3ce610 100644
--- a/lang/qt/tests/t-encrypt.cpp
+++ b/lang/qt/tests/t-encrypt.cpp
@@ -117,7 +117,7 @@ private Q_SLOTS:
 
         bool initSeen = false;
         bool finishSeen = false;
-        connect(job, &Job::progress, this, [this, &initSeen, &finishSeen] (const QString& what, int current, int total) {
+        connect(job, &Job::progress, this, [this, &initSeen, &finishSeen] (const QString&, int current, int total) {
                 // We only check for progress 0 and max progress as the other progress
                 // lines depend on the system speed and are as such unreliable to test.
                 Q_ASSERT(total == PROGRESS_TEST_SIZE);
@@ -129,8 +129,8 @@ private Q_SLOTS:
                 }
                 Q_ASSERT(current >= 0 && current <= total);
             });
-        connect(job, &EncryptJob::result, this, [this, &initSeen, &finishSeen] (const GpgME::EncryptionResult &result,
-                                                                                const QByteArray &cipherText,
+        connect(job, &EncryptJob::result, this, [this, &initSeen, &finishSeen] (const GpgME::EncryptionResult &,
+                                                                                const QByteArray &,
                                                                                 const QString,
                                                                                 const GpgME::Error) {
                 Q_ASSERT(initSeen);
diff --git a/lang/qt/tests/t-support.h b/lang/qt/tests/t-support.h
index 59d9a4d..704fab4 100644
--- a/lang/qt/tests/t-support.h
+++ b/lang/qt/tests/t-support.h
@@ -39,8 +39,8 @@ namespace GpgME
 class TestPassphraseProvider : public PassphraseProvider
 {
 public:
-    char *getPassphrase(const char *useridHint, const char *description,
-                        bool previousWasBad, bool &canceled) Q_DECL_OVERRIDE
+    char *getPassphrase(const char * /*useridHint*/, const char * /*description*/,
+                        bool /*previousWasBad*/, bool &/*canceled*/) Q_DECL_OVERRIDE
     {
         return strdup("abc");
     }
diff --git a/lang/qt/tests/t-wkspublish.cpp b/lang/qt/tests/t-wkspublish.cpp
index 4558fdc..130c53b 100644
--- a/lang/qt/tests/t-wkspublish.cpp
+++ b/lang/qt/tests/t-wkspublish.cpp
@@ -126,7 +126,7 @@ private Q_SLOTS:
         // First check if it is supported
         auto job = openpgp()->wksPublishJob();
         connect(job, &WKSPublishJob::result, this,
-                [this] (Error err, QByteArray out, QByteArray errout, QString, Error) {
+                [this] (Error err, QByteArray, QByteArray, QString, Error) {
             Q_ASSERT(err);
             Q_EMIT asyncDone();
         });
@@ -144,7 +144,7 @@ private:
         // First check if it is supported
         auto job = openpgp()->wksPublishJob();
         connect(job, &WKSPublishJob::result, this,
-                [this] (Error err, QByteArray out, QByteArray errout, QString, Error) {
+                [this] (Error err, QByteArray, QByteArray, QString, Error) {
             if (GpgME::engineInfo(GpgME::GpgEngine).engineVersion() < "2.0.16") {
                 std::cout << err;
                 Q_ASSERT(err);
@@ -165,7 +165,7 @@ private:
         }
         auto job = openpgp()->wksPublishJob();
         connect(job, &WKSPublishJob::result, this,
-                [this] (Error err, QByteArray out, QByteArray errout, QString, Error) {
+                [this] (Error err, QByteArray, QByteArray, QString, Error) {
             Q_ASSERT(err);
             Q_EMIT asyncDone();
         });
@@ -197,7 +197,7 @@ private:
         auto keygenjob = openpgp()->keyGenerationJob();
         QByteArray fpr;
         connect(keygenjob, &KeyGenerationJob::result, this,
-                [this, &fpr](KeyGenerationResult result, QByteArray pubkeyData, QString, Error)
+                [this, &fpr](KeyGenerationResult result, QByteArray, QString, Error)
         {
             Q_ASSERT(!result.error());
             fpr = QByteArray(result.fingerprint());
@@ -211,7 +211,7 @@ private:
         /* Then try to create a request. */
         auto job = openpgp()->wksPublishJob();
         connect(job, &WKSPublishJob::result, this,
-                [this] (Error err, QByteArray out, QByteArray errout, QString, Error) {
+                [this] (Error err, QByteArray out, QByteArray, QString, Error) {
             Q_ASSERT(!err);
             Q_EMIT asyncDone();
             const QString outstr = QString(out);
@@ -247,7 +247,7 @@ private:
         /* Get a response. */
         auto job = openpgp()->wksPublishJob();
         connect(job, &WKSPublishJob::result, this,
-                [this] (Error err, QByteArray out, QByteArray errout, QString, Error) {
+                [this] (Error err, QByteArray out, QByteArray, QString, Error) {
             Q_ASSERT(!err);
             Q_EMIT asyncDone();
             const QString outstr = QString(out);

commit 370ee1aa802ec6a4030a39b2df7d24a0c47e5ac7
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 5 16:43:16 2016 +0200

    cpp: Add support for URL Data encodings
    
    * lang/cpp/src/data.h (Data::Encoding): Extend enum.
    * lang/cpp/src/data.cpp (Data::encoding),
    Data::setEncoding): Support new values.

diff --git a/lang/cpp/src/data.cpp b/lang/cpp/src/data.cpp
index 84ed336..2cb4fa8 100644
--- a/lang/cpp/src/data.cpp
+++ b/lang/cpp/src/data.cpp
@@ -161,6 +161,9 @@ GpgME::Data::Encoding GpgME::Data::encoding() const
     case GPGME_DATA_ENCODING_BASE64: return Base64Encoding;
     case GPGME_DATA_ENCODING_ARMOR:  return ArmorEncoding;
     case GPGME_DATA_ENCODING_MIME:   return MimeEncoding;
+    case GPGME_DATA_ENCODING_URL:    return UrlEncoding;
+    case GPGME_DATA_ENCODING_URLESC: return UrlEscEncoding;
+    case GPGME_DATA_ENCODING_URL0:   return Url0Encoding;
     }
     return AutoEncoding;
 }
@@ -174,6 +177,9 @@ GpgME::Error GpgME::Data::setEncoding(Encoding enc)
     case Base64Encoding: ge = GPGME_DATA_ENCODING_BASE64; break;
     case ArmorEncoding:  ge = GPGME_DATA_ENCODING_ARMOR;  break;
     case MimeEncoding:   ge = GPGME_DATA_ENCODING_MIME;  break;
+    case UrlEncoding:    ge = GPGME_DATA_ENCODING_URL; break;
+    case UrlEscEncoding: ge = GPGME_DATA_ENCODING_URLESC; break;
+    case Url0Encoding:   ge = GPGME_DATA_ENCODING_URL0; break;
     }
     return Error(gpgme_data_set_encoding(d->data, ge));
 }
diff --git a/lang/cpp/src/data.h b/lang/cpp/src/data.h
index b2f2173..50bdf62 100644
--- a/lang/cpp/src/data.h
+++ b/lang/cpp/src/data.h
@@ -78,7 +78,10 @@ public:
         BinaryEncoding,
         Base64Encoding,
         ArmorEncoding,
-        MimeEncoding
+        MimeEncoding,
+        UrlEncoding,
+        UrlEscEncoding,
+        Url0Encoding,
     };
     Encoding encoding() const;
     Error setEncoding(Encoding encoding);

commit 39dd7585f5a7d801942efcb375d6dd46d01d2968
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 5 16:27:18 2016 +0200

    cpp: Fix gcc diagnostic push / pop
    
    * lang/cpp/src/context.cpp: Fix pragmas.
    
    --
    This fixes an error with -Werror=unknown-pragmas

diff --git a/lang/cpp/src/context.cpp b/lang/cpp/src/context.cpp
index 34d0efc..1121104 100644
--- a/lang/cpp/src/context.cpp
+++ b/lang/cpp/src/context.cpp
@@ -699,7 +699,7 @@ Error Context::startPasswd(const Key &key)
 }
 
 
-#pragma GCC push_diagnostics
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
 Error Context::edit(const Key &key, std::unique_ptr<EditInteractor> func, Data &data)
@@ -759,7 +759,7 @@ Error Context::startCardEditing(const Key &key, std::unique_ptr<EditInteractor>
                               dp ? dp->data : 0));
 }
 
-#pragma GCC pop_diagnostics
+#pragma GCC diagnostic pop
 
 EditInteractor *Context::lastCardEditInteractor() const
 {

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

Summary of changes:
 configure.ac                          |  1 +
 lang/cpp/src/context.cpp              |  4 ++--
 lang/cpp/src/data.cpp                 |  6 ++++++
 lang/cpp/src/data.h                   |  5 ++++-
 lang/qt/src/qgpgmenewcryptoconfig.cpp |  2 +-
 lang/qt/src/threadedjobmixin.h        |  3 ++-
 lang/qt/tests/t-encrypt.cpp           | 32 +++++++++++++++++++++++++++++---
 lang/qt/tests/t-support.h             |  4 ++--
 lang/qt/tests/t-wkspublish.cpp        | 12 ++++++------
 9 files changed, 53 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org



From cvs at cvs.gnupg.org  Wed Oct  5 17:40:57 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Wed, 05 Oct 2016 17:40:57 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.7.0-32-g8033cff
Message-ID: <E1broJX-000633-0b@lists.gnupg.org>

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 "GnuPG Made Easy".

The branch, master has been updated
       via  8033cff441e9ea185531290273ec343f3402703c (commit)
       via  88c7e84ede4b6017cac3a396e8c87c2bd3a2bf58 (commit)
      from  24779c9e2301bd17fd328d65b0383e1cbc944119 (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 8033cff441e9ea185531290273ec343f3402703c
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 5 17:38:49 2016 +0200

    cpp: Bump Revision
    
    * configure.ac (LIBGPGMEPP_LT_REVISION): Bump revision.
    
    --
    The Data::Encoding enum now supports more encodings so
    this should have been done then.

diff --git a/configure.ac b/configure.ac
index 8634d8b..bc4aad9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,7 +63,7 @@ LIBGPGME_LT_REVISION=0
 
 LIBGPGMEPP_LT_CURRENT=6
 LIBGPGMEPP_LT_AGE=0
-LIBGPGMEPP_LT_REVISION=1
+LIBGPGMEPP_LT_REVISION=2
 
 LIBQGPGME_LT_CURRENT=7
 LIBQGPGME_LT_AGE=0

commit 88c7e84ede4b6017cac3a396e8c87c2bd3a2bf58
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 5 17:27:36 2016 +0200

    qt: Fix spelling error in WKSPublishJob
    
    * src/qgpgmewkspublishjob.cpp,
    src/qgpgmewkspublishjob.h,
    src/wkspublishjob.h,
    tests/t-wkspublish.cpp: Fix spelling of received.
    * src/configure.ac (LIBQGPGME_LT_CURRENT): Bump
    accordingly.
    
    --
    While this is an API break I've decided to fix this now
    instead of deprecating / keeping it around forever in the API.
    
    The only known users of QGpgME are KDE Applications and
    there it is not yet used.

diff --git a/configure.ac b/configure.ac
index 114225a..8634d8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,9 +65,9 @@ LIBGPGMEPP_LT_CURRENT=6
 LIBGPGMEPP_LT_AGE=0
 LIBGPGMEPP_LT_REVISION=1
 
-LIBQGPGME_LT_CURRENT=6
+LIBQGPGME_LT_CURRENT=7
 LIBQGPGME_LT_AGE=0
-LIBQGPGME_LT_REVISION=1
+LIBQGPGME_LT_REVISION=0
 
 # If the API is changed in an incompatible way: increment the next counter.
 GPGME_CONFIG_API_VERSION=1
diff --git a/lang/qt/src/qgpgmewkspublishjob.cpp b/lang/qt/src/qgpgmewkspublishjob.cpp
index 96f5a1d..9773893 100644
--- a/lang/qt/src/qgpgmewkspublishjob.cpp
+++ b/lang/qt/src/qgpgmewkspublishjob.cpp
@@ -141,7 +141,7 @@ static QGpgMEWKSPublishJob::result_type create_worker(const char *fpr, const QSt
                             proc.readAllStandardOutput(), proc.readAllStandardError(), QString(), Error());
 }
 
-static QGpgMEWKSPublishJob::result_type recieve_worker(const QByteArray &response)
+static QGpgMEWKSPublishJob::result_type receive_worker(const QByteArray &response)
 {
     if (response.isEmpty()) {
         return std::make_tuple (Error(make_error(GPG_ERR_INV_ARG)),
@@ -185,9 +185,9 @@ void QGpgMEWKSPublishJob::startCreate(const char *fpr, const QString &mailbox) {
     run(std::bind(&create_worker, fpr, mailbox));
 }
 
-void QGpgMEWKSPublishJob::startRecieve(const QByteArray &response)
+void QGpgMEWKSPublishJob::startReceive(const QByteArray &response)
 {
-    run(std::bind(&recieve_worker, response));
+    run(std::bind(&receive_worker, response));
 }
 
 #include "qgpgmewkspublishjob.moc"
diff --git a/lang/qt/src/qgpgmewkspublishjob.h b/lang/qt/src/qgpgmewkspublishjob.h
index 1a31149..5fd3c03 100644
--- a/lang/qt/src/qgpgmewkspublishjob.h
+++ b/lang/qt/src/qgpgmewkspublishjob.h
@@ -62,7 +62,7 @@ public:
 
     void startCheck(const QString &mailbox) Q_DECL_OVERRIDE;
     void startCreate(const char *fpr, const QString &mailbox) Q_DECL_OVERRIDE;
-    void startRecieve(const QByteArray &response) Q_DECL_OVERRIDE;
+    void startReceive(const QByteArray &response) Q_DECL_OVERRIDE;
 };
 
 }
diff --git a/lang/qt/src/wkspublishjob.h b/lang/qt/src/wkspublishjob.h
index d7bcd5d..0cec630 100644
--- a/lang/qt/src/wkspublishjob.h
+++ b/lang/qt/src/wkspublishjob.h
@@ -82,7 +82,7 @@ public:
      *
      * @param response The response of the server.
      **/
-    virtual void startRecieve(const QByteArray &response) = 0;
+    virtual void startReceive(const QByteArray &response) = 0;
 
 Q_SIGNALS:
     /* Result of the operation returned Data and returned Error are
diff --git a/lang/qt/tests/t-wkspublish.cpp b/lang/qt/tests/t-wkspublish.cpp
index 130c53b..326ecaa 100644
--- a/lang/qt/tests/t-wkspublish.cpp
+++ b/lang/qt/tests/t-wkspublish.cpp
@@ -226,7 +226,7 @@ private:
         Q_ASSERT(spy.wait());
     }
 
-    void testWKSPublishRecieve() {
+    void testWKSPublishReceive() {
         if (GpgME::engineInfo(GpgME::GpgEngine).engineVersion() < "2.0.16") {
             /* Not supported */
             return;
@@ -258,7 +258,7 @@ private:
             Q_ASSERT(outstr.contains(
                      QStringLiteral("From: " TEST_ADDRESS)));
         });
-        job->startRecieve(QByteArray(testResponse));
+        job->startReceive(QByteArray(testResponse));
         Q_ASSERT(spy.wait());
     }
 

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

Summary of changes:
 configure.ac                        | 6 +++---
 lang/qt/src/qgpgmewkspublishjob.cpp | 6 +++---
 lang/qt/src/qgpgmewkspublishjob.h   | 2 +-
 lang/qt/src/wkspublishjob.h         | 2 +-
 lang/qt/tests/t-wkspublish.cpp      | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org



From cvs at cvs.gnupg.org  Thu Oct  6 13:27:15 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Thu, 06 Oct 2016 13:27:15 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.7.0-33-g8575920
Message-ID: <E1bs6pZ-00023U-Ku@lists.gnupg.org>

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 "GnuPG Made Easy".

The branch, master has been updated
       via  857592041b8355cd58a7068c9f2446cf8dc0968f (commit)
      from  8033cff441e9ea185531290273ec343f3402703c (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 857592041b8355cd58a7068c9f2446cf8dc0968f
Author: Justus Winter <justus at g10code.com>
Date:   Thu Oct 6 13:12:28 2016 +0200

    Add missing includes.
    
    * lang/cpp/src/key.cpp: Include <strings.h> for 'strcasecmp'.
    * tests/gpg/t-cancel.c: Include <sys/select.h> for 'fd_set' and
    friends.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/lang/cpp/src/key.cpp b/lang/cpp/src/key.cpp
index df3dc02..4531a2b 100644
--- a/lang/cpp/src/key.cpp
+++ b/lang/cpp/src/key.cpp
@@ -33,6 +33,7 @@
 #include <gpgme.h>
 
 #include <string.h>
+#include <strings.h>
 #include <istream>
 #include <iterator>
 
diff --git a/tests/gpg/t-cancel.c b/tests/gpg/t-cancel.c
index af98af9..16a062a 100644
--- a/tests/gpg/t-cancel.c
+++ b/tests/gpg/t-cancel.c
@@ -34,6 +34,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <pthread.h>
+#include <sys/select.h>
 
 #include <gpgme.h>
 

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

Summary of changes:
 lang/cpp/src/key.cpp | 1 +
 tests/gpg/t-cancel.c | 1 +
 2 files changed, 2 insertions(+)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org



From cvs at cvs.gnupg.org  Thu Oct  6 14:53:19 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Thu, 06 Oct 2016 14:53:19 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-209-g4aadc75
Message-ID: <E1bs8At-00053z-TN@lists.gnupg.org>

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  4aadc751f201f8f97c9c1f454e3a29803cce3edb (commit)
       via  b0d2526bc4e5c663eeffe04500420c70cee98712 (commit)
       via  73000d1ce0317210f5a9e5262404cc90258041ff (commit)
       via  2d446759bd43ae38fbce9a18c955285ca535bc08 (commit)
       via  6b626824c8e30b41c47724b5ccbf761937499512 (commit)
       via  32f81f56a8be6d13dea0a64d24f52343c7e72c84 (commit)
       via  07cfb3b27a77491eae818d57f6eb660e75fa013f (commit)
      from  8ce800d21919eaaba7ed4f04f712292be310fd66 (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 4aadc751f201f8f97c9c1f454e3a29803cce3edb
Author: Justus Winter <justus at g10code.com>
Date:   Thu Oct 6 14:48:52 2016 +0200

    common: Avoid pointer arithmetic on string literals.
    
    * common/gettime.c (rfctimestamp): Use indexing instead.
    * common/signal.c (got_fatal_signal): Likewise.

diff --git a/common/gettime.c b/common/gettime.c
index 9702bbc..9c63658 100644
--- a/common/gettime.c
+++ b/common/gettime.c
@@ -740,10 +740,10 @@ rfctimestamp (u32 stamp)
   if (!tp)
     return NULL;
   return xtryasprintf ("%.3s, %02d %.3s %04d %02d:%02d:%02d +0000",
-                       ("SunMonTueWedThuFriSat" + (tp->tm_wday%7)*3),
+                       &"SunMonTueWedThuFriSat"[(tp->tm_wday%7)*3],
                        tp->tm_mday,
-                       ("JanFebMarAprMayJunJulAugSepOctNovDec"
-                        + (tp->tm_mon%12)*3),
+                       &"JanFebMarAprMayJunJulAugSepOctNovDec"
+                       [(tp->tm_mon%12)*3],
                        tp->tm_year + 1900,
                        tp->tm_hour,
                        tp->tm_min,
diff --git a/common/signal.c b/common/signal.c
index b202f0f..9064adc 100644
--- a/common/signal.c
+++ b/common/signal.c
@@ -134,7 +134,7 @@ got_fatal_signal (int sig)
             {
               if (value >= i || ((any || i==1) && !(value/i)))
                 {
-                  (void)write (2, "0123456789"+(value/i), 1);
+                  (void)write (2, &"0123456789"[value/i], 1);
                   if ((value/i))
                     any = 1;
                   value %= i;

commit b0d2526bc4e5c663eeffe04500420c70cee98712
Author: Justus Winter <justus at g10code.com>
Date:   Thu Oct 6 14:33:20 2016 +0200

    g10: Fix singular term.
    
    * g10/tofu.c (ask_about_binding): Fix singular message.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/g10/tofu.c b/g10/tofu.c
index 5b01c27..c100c43 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -1619,7 +1619,7 @@ ask_about_binding (ctrl_t ctrl,
           else
             {
               if (labs(stats_iter->time_ago) == 3)
-                es_fprintf (fp, ngettext(" over the past days.",
+                es_fprintf (fp, ngettext(" over the past day.",
                                          " over the past %d days.",
                                          seen_in_past),
                             TIME_AGO_SMALL_THRESHOLD

commit 73000d1ce0317210f5a9e5262404cc90258041ff
Author: Justus Winter <justus at g10code.com>
Date:   Thu Oct 6 14:32:10 2016 +0200

    g10: Use appropriate variant of 'abs'.
    
    * g10/tofu.c (ask_about_binding): Use 'labs' instead of 'abs'.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/g10/tofu.c b/g10/tofu.c
index 1bd8ce2..5b01c27 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -1588,7 +1588,7 @@ ask_about_binding (ctrl_t ctrl,
               seen_in_past = 0;
             }
 
-          if (abs(stats_iter->time_ago) == 1)
+          if (labs(stats_iter->time_ago) == 1)
             {
               /* The 1 in this case is the NULL entry.  */
               log_assert (stats_iter->count == 1);
@@ -1610,7 +1610,7 @@ ask_about_binding (ctrl_t ctrl,
 
           if (!stats_iter->count)
             es_fputs (".", fp);
-          else if (abs(stats_iter->time_ago) == 2)
+          else if (labs(stats_iter->time_ago) == 2)
             {
               es_fprintf (fp, "in the future.");
               /* Reset it.  */
@@ -1618,25 +1618,25 @@ ask_about_binding (ctrl_t ctrl,
             }
           else
             {
-              if (abs(stats_iter->time_ago) == 3)
+              if (labs(stats_iter->time_ago) == 3)
                 es_fprintf (fp, ngettext(" over the past days.",
                                          " over the past %d days.",
                                          seen_in_past),
                             TIME_AGO_SMALL_THRESHOLD
                             / TIME_AGO_UNIT_SMALL);
-              else if (abs(stats_iter->time_ago) == 4)
+              else if (labs(stats_iter->time_ago) == 4)
                 es_fprintf (fp, ngettext(" over the past month.",
                                          " over the past %d months.",
                                          seen_in_past),
                             TIME_AGO_MEDIUM_THRESHOLD
                             / TIME_AGO_UNIT_MEDIUM);
-              else if (abs(stats_iter->time_ago) == 5)
+              else if (labs(stats_iter->time_ago) == 5)
                 es_fprintf (fp, ngettext(" over the past year.",
                                          " over the past %d years.",
                                          seen_in_past),
                             TIME_AGO_LARGE_THRESHOLD
                             / TIME_AGO_UNIT_LARGE);
-              else if (abs(stats_iter->time_ago) == 6)
+              else if (labs(stats_iter->time_ago) == 6)
                 es_fprintf (fp, _(" in the past."));
               else
                 log_assert (! "Broken SQL.\n");

commit 2d446759bd43ae38fbce9a18c955285ca535bc08
Author: Justus Winter <justus at g10code.com>
Date:   Thu Oct 6 14:30:56 2016 +0200

    sm: Remove statement without effect.
    
    * sm/call-dirmngr.c (gpgsm_dirmngr_isvalid): Remove statement without
    effect.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c
index 91f0c2f..f561bb0 100644
--- a/sm/call-dirmngr.c
+++ b/sm/call-dirmngr.c
@@ -559,7 +559,6 @@ gpgsm_dirmngr_isvalid (ctrl_t ctrl,
                         isvalid_status_cb, &stparm);
   if (opt.verbose > 1)
     log_info ("response of dirmngr: %s\n", rc? gpg_strerror (rc): "okay");
-  rc = rc;
 
   if (!rc && stparm.seen)
     {

commit 6b626824c8e30b41c47724b5ccbf761937499512
Author: Justus Winter <justus at g10code.com>
Date:   Thu Oct 6 14:17:55 2016 +0200

    g10: Fix testing for debug flag.
    
    * g10/parse-packet.c (set_packet_list_mode): Fix testing for debug
    flag.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 9a733b5..86c2be4 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -220,7 +220,7 @@ set_packet_list_mode (int mode)
       else
         listfp = es_stderr;
 
-      if (opt.debug && DBG_MPI_VALUE)
+      if (opt.debug & DBG_MPI_VALUE)
         mpi_print_mode = 1;
     }
   return old;

commit 32f81f56a8be6d13dea0a64d24f52343c7e72c84
Author: Justus Winter <justus at g10code.com>
Date:   Thu Oct 6 14:17:03 2016 +0200

    tools: Improve error handling.
    
    * tools/gpg-wks-server.c (copy_key_as_binary): Initialize 'argv'.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tools/gpg-wks-server.c b/tools/gpg-wks-server.c
index 408e3f5..60505ab 100644
--- a/tools/gpg-wks-server.c
+++ b/tools/gpg-wks-server.c
@@ -519,7 +519,7 @@ copy_key_as_binary (const char *keyfile, const char *outfile,
 {
   gpg_error_t err;
   ccparray_t ccp;
-  const char **argv;
+  const char **argv = NULL;
   char *filterexp = NULL;
 
   if (addrspec)

commit 07cfb3b27a77491eae818d57f6eb660e75fa013f
Author: Justus Winter <justus at g10code.com>
Date:   Thu Oct 6 14:13:18 2016 +0200

    gpgscm: Update callsite of 'gnupg_spawn_process'.
    
    * tests/gpgscm/ffi.c (do_spawn_process): Adapt to the changes to
    'gnupg_spawn_process'.
    
    Fixes-commit: 44a32455
    Fixes-commit: 96c7901e
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/gpgscm/ffi.c b/tests/gpgscm/ffi.c
index 829384a..44db6bb 100644
--- a/tests/gpgscm/ffi.c
+++ b/tests/gpgscm/ffi.c
@@ -653,7 +653,7 @@ do_spawn_process (scheme *sc, pointer args)
     }
 
   err = gnupg_spawn_process (argv[0], (const char **) &argv[1],
-                             GPG_ERR_SOURCE_DEFAULT,
+                             NULL,
                              NULL,
                              flags,
                              &infp, &outfp, &errfp, &pid);

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

Summary of changes:
 common/gettime.c       |  6 +++---
 common/signal.c        |  2 +-
 g10/parse-packet.c     |  2 +-
 g10/tofu.c             | 14 +++++++-------
 sm/call-dirmngr.c      |  1 -
 tests/gpgscm/ffi.c     |  2 +-
 tools/gpg-wks-server.c |  2 +-
 7 files changed, 14 insertions(+), 15 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Oct  7 03:52:36 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Fri, 07 Oct 2016 03:52:36 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-210-gfc0b392
Message-ID: <E1bsKL0-0000rK-VT@lists.gnupg.org>

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  fc0b392e766af8127094e8b529d25abb84ad1d65 (commit)
      from  4aadc751f201f8f97c9c1f454e3a29803cce3edb (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 fc0b392e766af8127094e8b529d25abb84ad1d65
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Oct 7 10:45:22 2016 +0900

    agent, dirmngr, scd: Fix init_common_subsystems.
    
    * common/init.c (_init_common_subsystems): Don't call
    gpgrt_set_syscall_clamp in this function.
    * agent/gpg-agent.c, dirmngr/dirmngr.c, scd/scdaemon.c: Call
    gpgrt_set_syscall_clamp after npth_init.
    
    --
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index a4025ce..70d9775 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -941,6 +941,7 @@ thread_init_once (void)
       npth_initialized++;
       npth_init ();
     }
+  gpgrt_set_syscall_clamp (npth_unprotect, npth_protect);
 }
 
 
diff --git a/common/init.c b/common/init.c
index 8a86266..cb4228a 100644
--- a/common/init.c
+++ b/common/init.c
@@ -29,20 +29,12 @@
 
 #include <config.h>
 
-#ifdef WITHOUT_NPTH /* Give the Makefile a chance to build without Pth.  */
-#undef HAVE_NPTH
-#undef USE_NPTH
-#endif
-
 #ifdef HAVE_W32_SYSTEM
 # ifdef HAVE_WINSOCK2_H
 #  include <winsock2.h>
 # endif
 # include <windows.h>
 #endif
-#ifdef HAVE_NPTH
-# include <npth.h>
-#endif
 #ifdef HAVE_W32CE_SYSTEM
 # include <assuan.h> /* For _assuan_w32ce_finish_pipe. */
 #endif
@@ -197,9 +189,6 @@ _init_common_subsystems (gpg_err_source_t errsource, int *argcp, char ***argvp)
   /* Initialize the Estream library. */
   gpgrt_init ();
   gpgrt_set_alloc_func (gcry_realloc);
-#ifdef USE_NPTH
-  gpgrt_set_syscall_clamp (npth_unprotect, npth_protect);
-#endif
 
   /* Special hack for Windows CE: We extract some options from arg
      to setup the standard handles.  */
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 621c2bb..271360e 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -651,6 +651,7 @@ static void
 thread_init (void)
 {
   npth_init ();
+  gpgrt_set_syscall_clamp (npth_unprotect, npth_protect);
 
   /* Now with NPth running we can set the logging callback.  Our
      windows implementation does not yet feature the NPth TLS
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 3571e66..df1abe8 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -723,6 +723,7 @@ main (int argc, char **argv )
 #endif
 
       npth_init ();
+      gpgrt_set_syscall_clamp (npth_unprotect, npth_protect);
 
       /* If --debug-allow-core-dump has been given we also need to
          switch the working directory to a place where we can actually
@@ -862,6 +863,7 @@ main (int argc, char **argv )
       /* This is the child. */
 
       npth_init ();
+      gpgrt_set_syscall_clamp (npth_unprotect, npth_protect);
 
       /* Detach from tty and put process into a new session. */
       if (!nodetach )

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

Summary of changes:
 agent/gpg-agent.c |  1 +
 common/init.c     | 11 -----------
 dirmngr/dirmngr.c |  1 +
 scd/scdaemon.c    |  2 ++
 4 files changed, 4 insertions(+), 11 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Oct  7 08:10:06 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 07 Oct 2016 08:10:06 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-212-g1a24c67
Message-ID: <E1bsOMD-0001Zd-I2@lists.gnupg.org>

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  1a24c67e20e6ccc6c8e37403a26c715c0f1b6216 (commit)
       via  5d43d28aa3c44c3a27fde823f467b0c4be1a58c2 (commit)
      from  fc0b392e766af8127094e8b529d25abb84ad1d65 (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 1a24c67e20e6ccc6c8e37403a26c715c0f1b6216
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Oct 7 07:59:21 2016 +0200

    Revert "g10: Fix singular term."
    
    --
    
    This reverts commit b0d2526bc4e5c663eeffe04500420c70cee98712.
    
    The number of format elements may not change in ngettext.  The entire
    construct is anyway wrong because ngettext is passed a different value
    than what is used in the printf.
    
    We need to rework the use of most strings in tofu.c.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/tofu.c b/g10/tofu.c
index c100c43..5b01c27 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -1619,7 +1619,7 @@ ask_about_binding (ctrl_t ctrl,
           else
             {
               if (labs(stats_iter->time_ago) == 3)
-                es_fprintf (fp, ngettext(" over the past day.",
+                es_fprintf (fp, ngettext(" over the past days.",
                                          " over the past %d days.",
                                          seen_in_past),
                             TIME_AGO_SMALL_THRESHOLD

commit 5d43d28aa3c44c3a27fde823f467b0c4be1a58c2
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Oct 7 07:54:38 2016 +0200

    gpg: Put extra parens around bit tests.
    
    * g10/options.h (DBG_MPI): New.
    * g10/gpg.c (set_debug): Use macro or extra parens for binary operator.
    * g10/parse-packet.c (set_packet_list_mode): Use dbg macro.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/doc/HACKING b/doc/HACKING
index bb04fdf..e717479 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -174,6 +174,8 @@ Note that such a comment will be removed if the git commit option
     indicate a problem with the code.
   - Never init static or file local variables to 0 to make sure they
     end up in BSS.
+  - But extra parenthesis around terms with binary operators to make
+    it clear that the binary operator was indeed intended.
   - Use --enable-maintainer-mode with configure so that all suitable
     warnings are enabled.
 
diff --git a/g10/gpg.c b/g10/gpg.c
index 2d5b4ff..9ffce48 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1190,15 +1190,15 @@ set_debug (const char *level)
       g10_exit (2);
     }
 
-  if (opt.debug & DBG_MEMORY_VALUE )
+  if ((opt.debug & DBG_MEMORY_VALUE))
     memory_debug_mode = 1;
-  if (opt.debug & DBG_MEMSTAT_VALUE )
+  if ((opt.debug & DBG_MEMSTAT_VALUE))
     memory_stat_debug_mode = 1;
-  if (opt.debug & DBG_MPI_VALUE)
+  if (DBG_MPI)
     gcry_control (GCRYCTL_SET_DEBUG_FLAGS, 2);
-  if (opt.debug & DBG_CRYPTO_VALUE )
+  if (DBG_CRYPTO)
     gcry_control (GCRYCTL_SET_DEBUG_FLAGS, 1);
-  if (opt.debug & DBG_IOBUF_VALUE )
+  if ((opt.debug & DBG_IOBUF_VALUE))
     iobuf_debug_mode = 1;
   gcry_control (GCRYCTL_SET_VERBOSITY, (int)opt.verbose);
 
diff --git a/g10/options.h b/g10/options.h
index 544be60..43dfd99 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -305,6 +305,7 @@ struct {
 
 /* Tests for the debugging flags.  */
 #define DBG_PACKET (opt.debug & DBG_PACKET_VALUE)
+#define DBG_MPI    (opt.debug & DBG_MPI_VALUE)
 #define DBG_CRYPTO (opt.debug & DBG_CRYPTO_VALUE)
 #define DBG_FILTER (opt.debug & DBG_FILTER_VALUE)
 #define DBG_CACHE  (opt.debug & DBG_CACHE_VALUE)
@@ -317,7 +318,7 @@ struct {
 #define DBG_LOOKUP  (opt.debug & DBG_LOOKUP_VALUE)
 #define DBG_EXTPROG (opt.debug & DBG_EXTPROG_VALUE)
 
-/* FIXME: We need to check whey we did not put this into opt. */
+/* FIXME: We need to check why we did not put this into opt. */
 #define DBG_MEMORY    memory_debug_mode
 #define DBG_MEMSTAT   memory_stat_debug_mode
 
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 86c2be4..bda3e14 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -220,7 +220,7 @@ set_packet_list_mode (int mode)
       else
         listfp = es_stderr;
 
-      if (opt.debug & DBG_MPI_VALUE)
+      if (DBG_MPI)
         mpi_print_mode = 1;
     }
   return old;

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

Summary of changes:
 doc/HACKING        |  2 ++
 g10/gpg.c          | 10 +++++-----
 g10/options.h      |  3 ++-
 g10/parse-packet.c |  2 +-
 g10/tofu.c         |  2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Oct  7 12:01:59 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Fri, 07 Oct 2016 12:01:59 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-213-gfb3b3e1
Message-ID: <E1bsRyc-0002AH-4u@lists.gnupg.org>

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  fb3b3e1e7a4219f61a834fd07809898918611c2f (commit)
      from  1a24c67e20e6ccc6c8e37403a26c715c0f1b6216 (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 fb3b3e1e7a4219f61a834fd07809898918611c2f
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Oct 7 19:00:10 2016 +0900

    agent: Fix get_socket_name.
    
    * agent/gpg-agent.c (get_socket_name): Fix the size of copying.
    
    --
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 70d9775..32e072b 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -599,19 +599,21 @@ get_socket_name (int fd)
     log_error ("socket name not present for file descriptor %d\n", fd);
   else if (len > sizeof(un))
     log_error ("socket name for file descriptor %d was truncated "
-               "(passed %lu bytes, wanted %u)\n", fd, sizeof(un), len);
+               "(passed %zu bytes, wanted %u)\n", fd, sizeof(un), len);
   else
     {
-      log_debug ("file descriptor %d has path %s (%lu octets)\n", fd,
-                 un.sun_path, len - offsetof (struct sockaddr_un, sun_path));
-      name = xtrymalloc (len - offsetof (struct sockaddr_un, sun_path) + 1);
+      size_t namelen = len - offsetof (struct sockaddr_un, sun_path);
+
+      log_debug ("file descriptor %d has path %s (%zu octets)\n", fd,
+                 un.sun_path, namelen);
+      name = xtrymalloc (namelen + 1);
       if (!name)
         log_error ("failed to allocate memory for name of fd %d: %s\n",
                    fd, gpg_strerror (gpg_error_from_syserror ()));
       else
         {
-          memcpy (name, un.sun_path, len);
-          name[len] = 0;
+          memcpy (name, un.sun_path, namelen);
+          name[namelen] = 0;
         }
     }
 

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

Summary of changes:
 agent/gpg-agent.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Oct  7 14:16:02 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Fri, 07 Oct 2016 14:16:02 +0200
Subject: [git] GpgOL - branch, nomapi, updated. gpgol-1.4.0-67-gc50e22b
Message-ID: <E1bsU4K-00076V-MA@lists.gnupg.org>

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 "GnuPG extension for MS Outlook".

The branch, nomapi has been updated
       via  c50e22b8d996be374905e977deaaaacce040b15c (commit)
       via  9c4c7cdebd018a2e4bcb4fb519ba06cc0c6550ed (commit)
       via  f0b818676f11d0c7395f6cf11a24e6a6ad6940a5 (commit)
      from  037b2aa3cba5d354586c1c7d311e86775ebb341e (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 c50e22b8d996be374905e977deaaaacce040b15c
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Oct 7 14:14:38 2016 +0200

    Clean up set_pa_info and add comment
    
    * src/oomhelp.cpp (set_pa_variant): Cleanup.
    * src/oomhelp.h (set_pa_variant): Document painful experiments.

diff --git a/src/oomhelp.cpp b/src/oomhelp.cpp
index 3296637..562582c 100644
--- a/src/oomhelp.cpp
+++ b/src/oomhelp.cpp
@@ -811,7 +811,8 @@ get_oom_context_window (LPDISPATCH context)
   return ret;
 }
 
-int set_pa_variant (LPDISPATCH pDisp, const char *dasl_id, VARIANT *value)
+int
+set_pa_variant (LPDISPATCH pDisp, const char *dasl_id, VARIANT *value)
 {
   LPDISPATCH propertyAccessor;
   VARIANT cVariant[2];
@@ -824,6 +825,8 @@ int set_pa_variant (LPDISPATCH pDisp, const char *dasl_id, VARIANT *value)
   wchar_t *w_property;
   unsigned int argErr = 0;
 
+  init_excepinfo (&execpinfo);
+
   log_oom ("%s:%s: Looking up property: %s;",
              SRCNAME, __func__, dasl_id);
 
@@ -849,9 +852,12 @@ int set_pa_variant (LPDISPATCH pDisp, const char *dasl_id, VARIANT *value)
   b_property = SysAllocString (w_property);
   xfree (w_property);
 
+  /* Variant 0 carries the data. */
+  VariantCopy (&cVariant[0], value);
+
+  /* Variant 1 is the DASL as found out by experiments. */
   cVariant[1].vt = VT_BSTR;
   cVariant[1].bstrVal = b_property;
-  VariantCopy (&cVariant[0], value);
   dispparams.rgvarg = cVariant;
   dispparams.cArgs = 2;
   dispparams.cNamedArgs = 0;
@@ -861,6 +867,7 @@ int set_pa_variant (LPDISPATCH pDisp, const char *dasl_id, VARIANT *value)
                                  DISPATCH_METHOD, &dispparams,
                                  &rVariant, &execpinfo, &argErr);
   SysFreeString (b_property);
+  VariantClear (&cVariant[0]);
   gpgol_release (propertyAccessor);
   if (hr != S_OK)
     {
diff --git a/src/oomhelp.h b/src/oomhelp.h
index d352a8f..0859d17 100644
--- a/src/oomhelp.h
+++ b/src/oomhelp.h
@@ -163,7 +163,24 @@ get_pa_string (LPDISPATCH pDisp, const char *property);
 int
 get_pa_int (LPDISPATCH pDisp, const char *property, int *rInt);
 
-/* Set a variant with the propertyAccessor interface */
+/* Set a variant with the propertyAccessor interface.
+
+   This is tested to work at least vor BSTR variants. Trying
+   to set PR_ATTACH_DATA_BIN_DASL with this failed with
+   hresults 0x80020005 type mismatch or 0x80020008 vad
+   variable type for:
+   VT_ARRAY | VT_UI1 | VT_BYREF
+   VT_SAFEARRAY | VT_UI1 | VT_BYREF
+   VT_BSTR | VT_BYREF
+   VT_BSTR
+   VT_ARRAY | VT_UI1
+   VT_SAFEARRAY | VT_UI1
+
+   No idea whats wrong there. Needs more experiments. The
+   Type is only documented as "Binary". Outlookspy also
+   fails with the same error when trying to modify the
+   property.
+*/
 int
 set_pa_variant (LPDISPATCH pDisp, const char *dasl_id, VARIANT *value);
 

commit 9c4c7cdebd018a2e4bcb4fb519ba06cc0c6550ed
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Oct 7 14:13:10 2016 +0200

    Add excepinfo init helper
    
    * src/oomhelp.cpp (init_excepinfo): New. Init the struct.
    
    --
    Some invocation calls do not set excepinfo on failure this avoids
    that unitialized pointers in excepinfo are used in that case.

diff --git a/src/oomhelp.cpp b/src/oomhelp.cpp
index 2a286e9..3296637 100644
--- a/src/oomhelp.cpp
+++ b/src/oomhelp.cpp
@@ -107,6 +107,24 @@ lookup_oom_dispid (LPDISPATCH pDisp, const char *name)
   return dispid;
 }
 
+static void
+init_excepinfo (EXCEPINFO *err)
+{
+  if (!err)
+    {
+      return;
+    }
+  err->wCode = 0;
+  err->wReserved = 0;
+  err->bstrSource = nullptr;
+  err->bstrDescription = nullptr;
+  err->bstrHelpFile = nullptr;
+  err->dwHelpContext = 0;
+  err->pvReserved = nullptr;
+  err->pfnDeferredFillIn = nullptr;
+  err->scode = 0;
+}
+
 void
 dump_excepinfo (EXCEPINFO err)
 {
@@ -121,7 +139,9 @@ dump_excepinfo (EXCEPINFO err)
              "              scode: 0x%x\n",
              SRCNAME, __func__, (unsigned int) err.wCode,
              (unsigned int) err.wReserved,
-             err.bstrSource, err.bstrDescription, err.bstrHelpFile,
+             err.bstrSource ? err.bstrSource : L"null",
+             err.bstrDescription ? err.bstrDescription : L"null",
+             err.bstrHelpFile ? err.bstrDescription : L"null",
              (unsigned int) err.dwHelpContext,
              err.pfnDeferredFillIn,
              (unsigned int) err.scode);

commit f0b818676f11d0c7395f6cf11a24e6a6ad6940a5
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Oct 7 14:04:07 2016 +0200

    Simplify Attachment code by using just Data
    
    * src/attachment.cpp (Attachment::get_data): Direct access
    to the underlying data structure.
    * src/attachment.h, src/mimedataprovider.cpp: Update accordingly.
    
    --
    The plan was initially to use a MAPI Stream to hold the data
    now with the testing on GNU/Linux it's better to use a platform
    independent data structure and that simplifies the code.

diff --git a/src/attachment.cpp b/src/attachment.cpp
index 2dac020..fc528c7 100644
--- a/src/attachment.cpp
+++ b/src/attachment.cpp
@@ -51,34 +51,8 @@ Attachment::set_attach_type(attachtype_t type)
   m_type = type;
 }
 
-bool
-Attachment::isSupported(GpgME::DataProvider::Operation op) const
+GpgME::Data &
+Attachment::get_data()
 {
-  return op == GpgME::DataProvider::Read ||
-         op == GpgME::DataProvider::Write ||
-         op == GpgME::DataProvider::Seek ||
-         op == GpgME::DataProvider::Release;
-}
-
-ssize_t
-Attachment::read(void *buffer, size_t bufSize)
-{
-  return m_data.read (buffer, bufSize);
-}
-
-ssize_t
-Attachment::write(const void *data, size_t size)
-{
-  return m_data.write (data, size);
-}
-
-off_t Attachment::seek(off_t offset, int whence)
-{
-  return m_data.seek (offset, whence);
-}
-
-void Attachment::release()
-{
-  /* No op. */
-  log_debug ("%s:%s", SRCNAME, __func__);
+  return m_data;
 }
diff --git a/src/attachment.h b/src/attachment.h
index f2ba143..47c536e 100644
--- a/src/attachment.h
+++ b/src/attachment.h
@@ -22,11 +22,10 @@
 
 #include <string>
 
-#include <gpgme++/interfaces/dataprovider.h>
 #include <gpgme++/data.h>
 
 /** Helper class for attachment actions. */
-class Attachment : public GpgME::DataProvider
+class Attachment
 {
 public:
   /** Creates and opens a new in memory attachment. */
@@ -39,12 +38,8 @@ public:
 
   void set_attach_type(attachtype_t type);
 
-  /* Dataprovider interface */
-  bool isSupported(Operation) const;
-  ssize_t read(void *buffer, size_t bufSize);
-  ssize_t write(const void *buffer, size_t bufSize);
-  off_t seek(off_t offset, int whence);
-  void release();
+  /* get the underlying data structure */
+  GpgME::Data& get_data();
 
 private:
   GpgME::Data m_data;
diff --git a/src/mimedataprovider.cpp b/src/mimedataprovider.cpp
index 59fcd38..a4aea43 100644
--- a/src/mimedataprovider.cpp
+++ b/src/mimedataprovider.cpp
@@ -662,10 +662,10 @@ MimeDataProvider::collect_input_lines(const char *input, size_t insize)
                 }
               else if (m_mime_ctx->current_attachment && len)
                 {
-                  m_mime_ctx->current_attachment->write(linebuf, len);
+                  m_mime_ctx->current_attachment->get_data().write(linebuf, len);
                   if (!m_mime_ctx->is_base64_encoded && !slbrk)
                     {
-                      m_mime_ctx->current_attachment->write("\r\n", 2);
+                      m_mime_ctx->current_attachment->get_data().write("\r\n", 2);
                     }
                 }
               else

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

Summary of changes:
 src/attachment.cpp       | 32 +++-----------------------------
 src/attachment.h         | 11 +++--------
 src/mimedataprovider.cpp |  4 ++--
 src/oomhelp.cpp          | 33 ++++++++++++++++++++++++++++++---
 src/oomhelp.h            | 19 ++++++++++++++++++-
 5 files changed, 56 insertions(+), 43 deletions(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org



From cvs at cvs.gnupg.org  Fri Oct  7 15:04:01 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Fri, 07 Oct 2016 15:04:01 +0200
Subject: [git] GpgOL - branch, nomapi, updated. gpgol-1.4.0-68-ga224067
Message-ID: <E1bsUol-0000GF-8F@lists.gnupg.org>

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 "GnuPG extension for MS Outlook".

The branch, nomapi has been updated
       via  a2240672cf62c7caea7b4d442f83d36b6c122ee7 (commit)
      from  c50e22b8d996be374905e977deaaaacce040b15c (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 a2240672cf62c7caea7b4d442f83d36b6c122ee7
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Oct 7 15:01:11 2016 +0200

    Make attachments work again
    
    * src/common.c (get_tmp_outfile): Add SHARE_DELETE
    * src/mail.cpp (get_attachment, get_cipherstream),
    (get_attachment_stream): Split get_cipherstream in two subfunctions.
    (copy_data_property): Add disabled experimental code.
    (copy_attachment_to_file): Copy attachment data to tmp file.
    (add_attachments): Use copy to file.
    (Mail::decrypt_verify): Update call according to new function.

diff --git a/src/common.c b/src/common.c
index 6e41876..557bc2a 100644
--- a/src/common.c
+++ b/src/common.c
@@ -758,7 +758,7 @@ get_tmp_outfile (wchar_t *name, HANDLE *outHandle)
 
   while ((*outHandle = CreateFileW (outName,
                                     GENERIC_WRITE | GENERIC_READ,
-                                    FILE_SHARE_READ,
+                                    FILE_SHARE_READ | FILE_SHARE_DELETE,
                                     NULL,
                                     CREATE_NEW,
                                     FILE_ATTRIBUTE_TEMPORARY,
diff --git a/src/mail.cpp b/src/mail.cpp
index 4c488eb..e4984c0 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -39,6 +39,8 @@
 
 static std::map<LPDISPATCH, Mail*> g_mail_map;
 
+#define COPYBUFSIZE (8 * 1024)
+
 /* TODO: Localize this once it is less bound to change.
    TODO: Use a dedicated message for failed decryption. */
 #define HTML_TEMPLATE  \
@@ -182,15 +184,11 @@ Mail::pre_process_message ()
   return 0;
 }
 
-/** Get the cipherstream of the mailitem. */
-static LPSTREAM
-get_cipherstream (LPDISPATCH mailitem, int pos)
+static LPDISPATCH
+get_attachment (LPDISPATCH mailitem, int pos)
 {
+  LPDISPATCH attachment;
   LPDISPATCH attachments = get_oom_object (mailitem, "Attachments");
-  LPDISPATCH attachment = NULL;
-  LPATTACH mapi_attachment = NULL;
-  LPSTREAM stream = NULL;
-
   if (!attachments)
     {
       log_debug ("%s:%s: Failed to get attachments.",
@@ -198,6 +196,7 @@ get_cipherstream (LPDISPATCH mailitem, int pos)
       return NULL;
     }
 
+  const auto item_str = std::string("Item(") + std::to_string(pos) + ")";
   int count = get_oom_int (attachments, "Count");
   if (count < 1)
     {
@@ -206,11 +205,19 @@ get_cipherstream (LPDISPATCH mailitem, int pos)
       gpgol_release (attachments);
       return NULL;
     }
-  /* We assume the crypto attachment is the second item. */
-  const auto item_str = std::string("Item(") + std::to_string(pos) + ")";
   attachment = get_oom_object (attachments, item_str.c_str());
   gpgol_release (attachments);
-  attachments = NULL;
+
+  return attachment;
+}
+
+/** Get the cipherstream of the mailitem. */
+static LPSTREAM
+get_attachment_stream (LPDISPATCH mailitem, int pos)
+{
+  LPDISPATCH attachment = get_attachment (mailitem, pos);
+  LPATTACH mapi_attachment = NULL;
+  LPSTREAM stream = NULL;
 
   mapi_attachment = (LPATTACH) get_oom_iunknown (attachment,
                                                  "MapiObject");
@@ -230,28 +237,177 @@ get_cipherstream (LPDISPATCH mailitem, int pos)
   return stream;
 }
 
+#if 0
+
+This should work. But Outlook says no. See the comment in set_pa_variant
+about this. I left the code here as an example how to work with
+safearrays and how this probably should work.
+
+static int
+copy_data_property(LPDISPATCH target, std::shared_ptr<Attachment> attach)
+{
+  VARIANT var;
+  VariantInit (&var);
+
+  /* Get the size */
+  off_t size = attach->get_data ().seek (0, SEEK_END);
+  attach->get_data ().seek (0, SEEK_SET);
+
+  if (!size)
+    {
+      TRACEPOINT;
+      return 1;
+    }
+
+  if (!get_pa_variant (target, PR_ATTACH_DATA_BIN_DASL, &var))
+    {
+      log_debug("Have variant. type: %x", var.vt);
+    }
+  else
+    {
+      log_debug("failed to get variant.");
+    }
+
+  /* Set the type to an array of unsigned chars (OLE SAFEARRAY) */
+  var.vt = VT_ARRAY | VT_UI1;
+
+  /* Set up the bounds structure */
+  SAFEARRAYBOUND rgsabound[1];
+  rgsabound[0].cElements = static_cast<unsigned long> (size);
+  rgsabound[0].lLbound = 0;
+
+  /* Create an OLE SAFEARRAY */
+  var.parray = SafeArrayCreate (VT_UI1, 1, rgsabound);
+  if (var.parray == NULL)
+    {
+      TRACEPOINT;
+      VariantClear(&var);
+      return 1;
+    }
+
+  void *buffer = NULL;
+  /* Get a safe pointer to the array */
+  if (SafeArrayAccessData(var.parray, &buffer) != S_OK)
+    {
+      TRACEPOINT;
+      VariantClear(&var);
+      return 1;
+    }
+
+  /* Copy data to it */
+  size_t nread = attach->get_data ().read (buffer, static_cast<size_t> (size));
+
+  if (nread != static_cast<size_t> (size))
+    {
+      TRACEPOINT;
+      VariantClear(&var);
+      return 1;
+    }
+
+  /*/ Unlock the variant data */
+  if (SafeArrayUnaccessData(var.parray) != S_OK)
+    {
+      TRACEPOINT;
+      VariantClear(&var);
+      return 1;
+    }
+
+  if (set_pa_variant (target, PR_ATTACH_DATA_BIN_DASL, &var))
+    {
+      TRACEPOINT;
+      VariantClear(&var);
+      return 1;
+    }
+
+  VariantClear(&var);
+  return 0;
+}
+#endif
+
+static int
+copy_attachment_to_file (std::shared_ptr<Attachment> att, HANDLE hFile)
+{
+  char copybuf[COPYBUFSIZE];
+  size_t nread;
+
+  /* Security considerations: Writing the data to a temporary
+     file is necessary as neither MAPI manipulation works in the
+     read event to transmit the data nor Property Accessor
+     works (see above). From a security standpoint there is a
+     short time where the temporary files are on disk. Tempdir
+     should be protected so that only the user can read it. Thus
+     we have a local attack that could also take the data out
+     of Outlook. FILE_SHARE_READ is necessary so that outlook
+     can read the file.
+
+     A bigger concern is that the file is manipulated
+     by another software to fake the signature state. So
+     we keep the write exlusive to us.
+
+     We delete the file before closing the write file handle.
+  */
+
+  /* Make sure we start at the beginning */
+  att->get_data ().seek (0, SEEK_SET);
+  while ((nread = att->get_data ().read (copybuf, COPYBUFSIZE)))
+    {
+      DWORD nwritten;
+      if (!WriteFile (hFile, copybuf, nread, &nwritten, NULL))
+        {
+          log_error ("%s:%s: Failed to write in tmp attachment.",
+                     SRCNAME, __func__);
+          return 1;
+        }
+      if (nread != nwritten)
+        {
+          log_error ("%s:%s: Write truncated.",
+                     SRCNAME, __func__);
+          return 1;
+        }
+    }
+  return 0;
+}
+
 /** Helper to update the attachments of a mail object in oom.
   does not modify the underlying mapi structure. */
-static bool
+static int
 add_attachments(LPDISPATCH mail,
                 std::vector<std::shared_ptr<Attachment> > attachments)
 {
+  int err = 0;
   for (auto att: attachments)
     {
       wchar_t* wchar_name = utf8_to_wchar (att->get_display_name().c_str());
-      log_debug("DisplayName %s", att->get_display_name().c_str());
       HANDLE hFile;
-      wchar_t* wchar_file = get_tmp_outfile (GpgOLStr("gpgol-attach-"), &hFile);
+      wchar_t* wchar_file = get_tmp_outfile (GpgOLStr (att->get_display_name().c_str()),
+                                             &hFile);
+      if (copy_attachment_to_file (att, hFile))
+        {
+          log_error ("%s:%s: Failed to copy attachment %s to temp file",
+                     SRCNAME, __func__, att->get_display_name().c_str());
+          err = 1;
+        }
       if (add_oom_attachment (mail, wchar_file, wchar_name))
         {
-          log_debug ("Failed to add attachment.");
+          log_error ("%s:%s: Failed to add attachment: %s",
+                     SRCNAME, __func__, att->get_display_name().c_str());
+          err = 1;
+        }
+      if (!DeleteFileW (wchar_file))
+        {
+          log_error ("%s:%s: Failed to delete tmp attachment for: %s",
+                     SRCNAME, __func__, att->get_display_name().c_str());
+          err = 1;
         }
       CloseHandle (hFile);
-      DeleteFileW (wchar_file);
       xfree (wchar_file);
       xfree (wchar_name);
+      if (err)
+        {
+          return err;
+        }
     }
-  return false;
+  return 0;
 }
 
 static DWORD WINAPI
@@ -305,7 +461,7 @@ Mail::decrypt_verify()
   xfree (placeholder_buf);
 
   /* Do the actual parsing */
-  auto cipherstream = get_cipherstream (m_mailitem, m_moss_position);
+  auto cipherstream = get_attachment_stream (m_mailitem, m_moss_position);
 
   if (!cipherstream)
     {

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

Summary of changes:
 src/common.c |   2 +-
 src/mail.cpp | 190 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 174 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org



From cvs at cvs.gnupg.org  Fri Oct  7 16:26:22 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Fri, 07 Oct 2016 16:26:22 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-218-gcbbf0a7
Message-ID: <E1bsW6U-0002sd-Fp@lists.gnupg.org>

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  cbbf0a7a8da1757fea29cff0daaa42a6bbb95b26 (commit)
       via  1f76f8d8bc65fad98927c977baf4d5e36dafe52b (commit)
       via  11eac7eb2fa3392a9aa052f8f5bb9875129ab84b (commit)
       via  dff266059813d22d1e2ba7e77279999cd41ceb75 (commit)
       via  5afbfdfd59540cb882d891ff1f4afa73fe48f99a (commit)
      from  fb3b3e1e7a4219f61a834fd07809898918611c2f (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 cbbf0a7a8da1757fea29cff0daaa42a6bbb95b26
Author: Justus Winter <justus at g10code.com>
Date:   Fri Oct 7 16:17:49 2016 +0200

    tests: Rework test environment setup.
    
    * tests/openpgp/setup.scm: Import one keyring at a time.  This works
    around a yet to be investigated hang on Windows.  It is also much
    prettier.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/openpgp/setup.scm b/tests/openpgp/setup.scm
index 0a9a153..75310d1 100755
--- a/tests/openpgp/setup.scm
+++ b/tests/openpgp/setup.scm
@@ -84,11 +84,12 @@
 		 "C6A6390E9388CDBAD71EAEA698233FE5E04F001E"
 		 "D69102E0F5AC6B6DB8E4D16DA8E18CF46D88CAE3"))
 
-  (info "Importing public demo and test keys")
-  (call-check `(, at GPG --yes --import
-		      ,(in-srcdir "pubdemo.asc")
-		      ,(in-srcdir "pubring.asc")
-		      ,(in-srcdir key-file1)))
+  (for-each-p
+   "Importing public demo and test keys"
+   (lambda (file)
+     (call-check `(, at GPG --yes --import ,(in-srcdir file))))
+   (list "pubdemo.asc" "pubring.asc" key-file1))
+
   (pipe:do
    (pipe:open (in-srcdir "pubring.pkr.asc") (logior O_RDONLY O_BINARY))
    (pipe:spawn `(, at GPG --dearmor))

commit 1f76f8d8bc65fad98927c977baf4d5e36dafe52b
Author: Justus Winter <justus at g10code.com>
Date:   Fri Oct 7 16:16:15 2016 +0200

    tests: Improve handling of Windows newlines.
    
    * tests/gpgscm/lib.scm (string-split-newlines): New function.
    * tests/openpgp/default-key.scm: Use new function.
    * tests/openpgp/defs.scm: Likewise.
    * tests/openpgp/export.scm: Likewise.
    * tests/openpgp/import.scm: Likewise.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/gpgscm/lib.scm b/tests/gpgscm/lib.scm
index fe28262..e4ab483 100644
--- a/tests/gpgscm/lib.scm
+++ b/tests/gpgscm/lib.scm
@@ -92,6 +92,15 @@
 (assert (string=? "bar" (cadr (string-split "foo:bar:baz" #\:))))
 (assert (string=? "baz" (caddr (string-split "foo:bar:baz" #\:))))
 
+;; Split haystack at newlines.
+(define (string-split-newlines haystack)
+  (if *win32*
+      (map (lambda (line) (if (string-suffix? line "\r")
+			      (substring line 0 (- (string-length line) 1))
+			      line))
+	   (string-split haystack #\newline))
+      (string-split haystack #\newline)))
+
 ;; Trim the prefix of S containing only characters that make PREDICATE
 ;; true.
 (define (string-ltrim predicate s)
diff --git a/tests/openpgp/default-key.scm b/tests/openpgp/default-key.scm
index 4433658..07cc8c0 100755
--- a/tests/openpgp/default-key.scm
+++ b/tests/openpgp/default-key.scm
@@ -71,6 +71,6 @@
 	(unless (any (lambda (line)
 		       (and (string-prefix? line ":pubkey enc packet:")
 			    (string-suffix? line "45117079")))
-		     (string-split c #\newline))
+		     (string-split-newlines c))
 	    (exit 1))))))
  '("8BC90111" "3E880CFF" "F5F77B83" "45117079" "1EA97479"))
diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm
index 4a968da..e484e86 100644
--- a/tests/openpgp/defs.scm
+++ b/tests/openpgp/defs.scm
@@ -91,7 +91,7 @@
 (define (gpg-with-colons args)
   (let ((s (call-popen `(, at GPG --with-colons , at args) "")))
     (map (lambda (line) (string-split line #\:))
-	 (string-split s #\newline))))
+	 (string-split-newlines s))))
 
 (define (get-config what)
   (string-split (caddar (gpg-with-colons `(--list-config ,what))) #\;))
@@ -133,8 +133,8 @@
    (lambda (line)
      (let ((p (string-split line #\:)))
        (list (string->number (cadr p)) (caddr p))))
-   (string-split
-    (call-popen `(, at GPG --with-colons , at args) input) #\newline)))
+   (string-split-newlines
+    (call-popen `(, at GPG --with-colons , at args) input))))
 
 ;; Dearmor a file.
 (define (dearmor source-name sink-name)
diff --git a/tests/openpgp/export.scm b/tests/openpgp/export.scm
index 8291705..f7a23f4 100755
--- a/tests/openpgp/export.scm
+++ b/tests/openpgp/export.scm
@@ -37,13 +37,13 @@
 		    "Signature packet not found"))
 
 (define (check-exported-public-key packet-dump keyid)
-  (let ((dump (string-split packet-dump #\newline)))
+  (let ((dump (string-split-newlines packet-dump)))
     (check-for (lambda (l) (string-prefix? l ":public key packet:")) dump
 	       "Public key packet not found")
     (check-exported-key dump keyid)))
 
 (define (check-exported-private-key packet-dump keyid)
-  (let ((dump (string-split packet-dump #\newline)))
+  (let ((dump (string-split-newlines packet-dump)))
     (check-for (lambda (l) (string-prefix? l ":secret key packet:")) dump
 	       "Secret key packet not found")
     (check-exported-key dump keyid)))
diff --git a/tests/openpgp/import.scm b/tests/openpgp/import.scm
index 580acea..98f3ad9 100755
--- a/tests/openpgp/import.scm
+++ b/tests/openpgp/import.scm
@@ -36,7 +36,7 @@
     (unless (any (lambda (line)
 		   (and (string-prefix? line "rvk:")
 			(string-contains? line ":0EE5BE979282D80B9F7540F1CCD2ED94D21739E9:")))
-		 (string-split c #\newline))
+		 (string-split-newlines c))
 	    (exit 1)))))
 
 (define fpr1 "9E669861368BCA0BE42DAF7DDDA252EBB8EBE1AF")
@@ -55,6 +55,6 @@
 		 (lambda (line)
 		   (and (string-prefix? line "pub:")
 			(string-contains? line ":4096:1:DDA252EBB8EBE1AF:")))
-		 (string-split c #\newline))))
+		 (string-split-newlines c))))
       (unless (= 2 (length keys))
 	      (error "Importing keys with long id collision failed"))))))

commit 11eac7eb2fa3392a9aa052f8f5bb9875129ab84b
Author: Justus Winter <justus at g10code.com>
Date:   Fri Oct 7 16:13:08 2016 +0200

    gpgscm: Improve test of low-level functions.
    
    * tests/gpgscm/t-child.c: Print large amounts of data.
    * tests/gpgscm/t-child.scm: Test that this works.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/gpgscm/t-child.c b/tests/gpgscm/t-child.c
index fe2e7b4..ae1a635 100644
--- a/tests/gpgscm/t-child.c
+++ b/tests/gpgscm/t-child.c
@@ -30,6 +30,8 @@
 int
 main (int argc, char **argv)
 {
+  char buffer[4096];
+  memset (buffer, 'A', sizeof buffer);
 #if _WIN32
   if (! setmode (stdin, O_BINARY))
     return 23;
@@ -49,10 +51,16 @@ main (int argc, char **argv)
     fprintf (stdout, "hello");
   else if (strcmp (argv[1], "hello_stderr") == 0)
     fprintf (stderr, "hello");
+  else if (strcmp (argv[1], "stdout4096") == 0)
+    fwrite (buffer, 1, sizeof buffer, stdout);
+  else if (strcmp (argv[1], "stdout8192") == 0)
+    {
+      fwrite (buffer, 1, sizeof buffer, stdout);
+      fwrite (buffer, 1, sizeof buffer, stdout);
+    }
   else if (strcmp (argv[1], "cat") == 0)
     while (! feof (stdin))
       {
-        char buffer[4096];
         size_t bytes_read;
         bytes_read = fread (buffer, 1, sizeof buffer, stdin);
         fwrite (buffer, 1, bytes_read, stdout);
diff --git a/tests/gpgscm/t-child.scm b/tests/gpgscm/t-child.scm
index 27928f6..93208f4 100644
--- a/tests/gpgscm/t-child.scm
+++ b/tests/gpgscm/t-child.scm
@@ -22,6 +22,8 @@
 (define (qualify executable)
   (string-append executable (getenv "EXEEXT")))
 
+(define child (qualify "t-child"))
+
 (assert (= 0 (call `(,(qualify "t-child") "return0"))))
 (assert (= 1 (call `(,(qualify "t-child") "return1"))))
 (assert (= 77 (call `(,(qualify "t-child") "return77"))))
@@ -51,6 +53,16 @@
   (assert (string=? "" (:stdout r)))
   (assert (string=? "hello" (:stderr r))))
 
+(let ((r (call-with-io `(,(qualify "t-child") "stdout4096") "")))
+  (assert (= 0 (:retcode r)))
+  (assert (= 4096 (string-length (:stdout r))))
+  (assert (string=? "" (:stderr r))))
+
+(let ((r (call-with-io `(,(qualify "t-child") "stdout8192") "")))
+  (assert (= 0 (:retcode r)))
+  (assert (= 8192 (string-length (:stdout r))))
+  (assert (string=? "" (:stderr r))))
+
 (let ((r (call-with-io `(,(qualify "t-child") "cat") "hellohello")))
   (assert (= 0 (:retcode r)))
   (assert (string=? "hellohello" (:stdout r)))
@@ -90,4 +102,17 @@
 	   (wait-processes '("child0" "child1") (list pid0 pid1) #t))))
 (echo " world.")
 
+(tr:do
+ (tr:pipe-do
+  (pipe:spawn `(,child stdout4096))
+  (pipe:spawn `(,child cat)))
+ (tr:call-with-content (lambda (c)
+			 (assert (= 4096 (length c))))))
+(tr:do
+ (tr:pipe-do
+  (pipe:spawn `(,child stdout8192))
+  (pipe:spawn `(,child cat)))
+ (tr:call-with-content (lambda (c)
+			 (assert (= 8192 (length c))))))
+
 (echo "All good.")

commit dff266059813d22d1e2ba7e77279999cd41ceb75
Author: Justus Winter <justus at g10code.com>
Date:   Fri Oct 7 12:53:25 2016 +0200

    gpgscm: Improve path handling.
    
    * tests/gpgscm/ffi.c (ffi_init): New Scheme variable '*win32*'.
    * tests/gpgscm/tests.scm (canonical-path): Correctly handle paths with
    drive letter on Windows.  Use 'path-join'.
    (path-expand): Use 'path-join'.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/gpgscm/ffi.c b/tests/gpgscm/ffi.c
index 44db6bb..a0fbe2e 100644
--- a/tests/gpgscm/ffi.c
+++ b/tests/gpgscm/ffi.c
@@ -1276,6 +1276,15 @@ ffi_init (scheme *sc, const char *argv0, const char *scriptname,
   ffi_define (sc, "*pathsep*", sc->vptr->mk_character (sc, ':'));
 #endif
 
+  ffi_define (sc, "*win32*",
+#if _WIN32
+              sc->T
+#else
+              sc->F
+#endif
+              );
+
+
   ffi_define (sc, "*stdin*",
               sc->vptr->mk_port_from_file (sc, stdin, port_input));
   ffi_define (sc, "*stdout*",
diff --git a/tests/gpgscm/tests.scm b/tests/gpgscm/tests.scm
index 71ca369..8986a70 100644
--- a/tests/gpgscm/tests.scm
+++ b/tests/gpgscm/tests.scm
@@ -181,9 +181,15 @@
 (assert (string=? (path-join "" "bar" "baz") "bar/baz"))
 
 (define (canonical-path path)
-  (if (char=? #\/ (string-ref path 0))
+  (if (or (char=? #\/ (string-ref path 0))
+	  (and *win32* (char=? #\\ (string-ref path 0)))
+	  (and *win32*
+	       (char-alphabetic? (string-ref path 0))
+	       (char=? #\: (string-ref path 1))
+	       (or (char=? #\/ (string-ref path 2))
+		   (char=? #\\ (string-ref path 2)))))
       path
-      (string-append (getcwd) "/" path)))
+      (path-join (getcwd) path)))
 
 (define (in-srcdir . names)
   (canonical-path (apply path-join (cons (getenv "srcdir") names))))
@@ -194,7 +200,7 @@
   (let loop ((path paths))
     (if (null? path)
 	(throw "Could not find" name "in" paths)
-	(let* ((qualified-name (string-append (car path) "/" name))
+	(let* ((qualified-name (path-join (car path) name))
 	       (file-exists (call-with-input-file qualified-name
 			      (lambda (x) #t))))
 	  (if file-exists

commit 5afbfdfd59540cb882d891ff1f4afa73fe48f99a
Author: Justus Winter <justus at g10code.com>
Date:   Fri Oct 7 12:52:09 2016 +0200

    tools: Fix error handling.
    
    * tools/gpgtar-create.c (gpgtar_create): Do not crash if opening the
    tarball failed.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tools/gpgtar-create.c b/tools/gpgtar-create.c
index 6adc1f5..6780eff 100644
--- a/tools/gpgtar-create.c
+++ b/tools/gpgtar-create.c
@@ -853,8 +853,6 @@ gpgtar_create (char **inpattern, int encrypt, int sign)
       if (!outstream)
         {
           err = gpg_error_from_syserror ();
-          log_error (_("can't create '%s': %s\n"),
-                     opt.outfile, gpg_strerror (err));
           goto leave;
         }
     }
@@ -958,7 +956,7 @@ gpgtar_create (char **inpattern, int encrypt, int sign)
   if (err)
     {
       log_error ("creating tarball '%s' failed: %s\n",
-                 es_fname_get (outstream), gpg_strerror (err));
+                 opt.outfile ? opt.outfile : "-", gpg_strerror (err));
       if (outstream && outstream != es_stdout)
         es_fclose (outstream);
       if (cipher_stream && cipher_stream != es_stdout)

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

Summary of changes:
 tests/gpgscm/ffi.c            |  9 +++++++++
 tests/gpgscm/lib.scm          |  9 +++++++++
 tests/gpgscm/t-child.c        | 10 +++++++++-
 tests/gpgscm/t-child.scm      | 25 +++++++++++++++++++++++++
 tests/gpgscm/tests.scm        | 12 +++++++++---
 tests/openpgp/default-key.scm |  2 +-
 tests/openpgp/defs.scm        |  6 +++---
 tests/openpgp/export.scm      |  4 ++--
 tests/openpgp/import.scm      |  4 ++--
 tests/openpgp/setup.scm       | 11 ++++++-----
 tools/gpgtar-create.c         |  4 +---
 11 files changed, 76 insertions(+), 20 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Oct  7 16:28:46 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 07 Oct 2016 16:28:46 +0200
Subject: [git] GPG-ERROR - branch, master,
 updated. libgpg-error-1.24-6-g0c837a8
Message-ID: <E1bsW8m-0002uK-2f@lists.gnupg.org>

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 "Error codes used by GnuPG et al.".

The branch, master has been updated
       via  0c837a82207d0b19f9dabc8870ffb23d6a4ade64 (commit)
       via  d6416fbd55256d8e693519cb548ad2cc7847898e (commit)
      from  bf7eb978597ba07906f0a7490e626c071af1987f (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 0c837a82207d0b19f9dabc8870ffb23d6a4ade64
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Oct 7 16:25:34 2016 +0200

    Add error code USER_ID_EXISTS, NAME_EXISTS, and DUP_NAME.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/NEWS b/NEWS
index f7e1af6..a646c7d 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,9 @@ Noteworthy changes in version 1.25 (unreleased) [C19/A19/R_)
  GPG_ERR_WINDOW_TOO_SMALL         NEW.
  GPG_ERR_WINDOW_TOO_LARGE         NEW.
  GPG_ERR_MISSING_ENVVAR	          NEW.
+ GPG_ERR_USER_ID_EXISTS           NEW.
+ GPG_ERR_NAME_EXISTS              NEW.
+ GPG_ERR_DUP_NAME                 NEW.
 
 
 Noteworthy changes in version 1.24 (2016-07-14) [C19/A19/R1)
diff --git a/doc/errorref.txt b/doc/errorref.txt
index b943c67..da5df23 100644
--- a/doc/errorref.txt
+++ b/doc/errorref.txt
@@ -798,7 +798,7 @@ GPG_ERR_INV_LOCK_OBJ		Invalid lock object
 
 GPG_ERR_TRUE			True
 
-    Used to retrun the boolena value True.  Note that GPG_ERR_NO_ERROR
+    Used to return the boolean value True.  Note that GPG_ERR_NO_ERROR
     (with the value 0) is also often used to indicate the value true.
 
 GPG_ERR_FALSE			False
@@ -844,6 +844,14 @@ GPG_ERR_MISSING_ENVVAR (303)	Required environment variable not set
 
     Pinentry: - The size of the screen can't be determined.
 
+GPG_ERR_USER_ID_EXISTS (304)	User ID already exists
+
+    GNUPG: - Existing user ID in --quick-gen-key.
+
+GPG_ERR_NAME_EXISTS (305)	Name already exists
+GPG_ERR_DUP_NAME (306)		Duplicated name
+
+
 GPG_ERR_LDAP_GENERAL		LDAP General error
 
    Catch all error for LDAP.  Use if if can't map an erro rocde to an
diff --git a/src/err-codes.h.in b/src/err-codes.h.in
index dcbc0a3..1bf717d 100644
--- a/src/err-codes.h.in
+++ b/src/err-codes.h.in
@@ -323,7 +323,9 @@
 301	GPG_ERR_WINDOW_TOO_SMALL	Screen or window too small
 302	GPG_ERR_WINDOW_TOO_LARGE	Screen or window too large
 303	GPG_ERR_MISSING_ENVVAR		Required environment variable not set
-
+304	GPG_ERR_USER_ID_EXISTS		User ID already exists
+305	GPG_ERR_NAME_EXISTS		Name already exists
+306	GPG_ERR_DUP_NAME		Duplicated name
 # This range is free for use.
 
 #

commit d6416fbd55256d8e693519cb548ad2cc7847898e
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Oct 7 16:23:51 2016 +0200

    syscfg: Add support for {i686,x86_64}-apple-darwin.
    
    --
    
    Thanks to Chris Ballinger <chris at chatsecure.org> for the files.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/Makefile.am b/src/Makefile.am
index 5623aff..c1e86a7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,6 +51,7 @@ lock_obj_pub = \
         syscfg/lock-obj-pub.armv5-unknown-linux-musleabi.h  \
         syscfg/lock-obj-pub.armv6-unknown-linux-musleabihf.h \
         syscfg/lock-obj-pub.hppa-unknown-linux-gnu.h        \
+	syscfg/lock-obj-pub.i386-apple-darwin.h             \
         syscfg/lock-obj-pub.i686-pc-gnu.h                   \
         syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h          \
         syscfg/lock-obj-pub.i686-pc-linux-gnu.h             \
@@ -68,6 +69,7 @@ lock_obj_pub = \
         syscfg/lock-obj-pub.sh4-unknown-linux-gnu.h         \
         syscfg/lock-obj-pub.sparc-unknown-linux-gnu.h       \
         syscfg/lock-obj-pub.sparc64-unknown-linux-gnu.h     \
+	syscfg/lock-obj-pub.x86_64-apple-darwin.h           \
         syscfg/lock-obj-pub.x86_64-pc-kfreebsd-gnu.h        \
         syscfg/lock-obj-pub.x86_64-pc-linux-gnu.h           \
         syscfg/lock-obj-pub.x86_64-pc-linux-gnux32.h        \
diff --git a/src/syscfg/lock-obj-pub.i386-apple-darwin.h b/src/syscfg/lock-obj-pub.i386-apple-darwin.h
new file mode 100644
index 0000000..a5963c4
--- /dev/null
+++ b/src/syscfg/lock-obj-pub.i386-apple-darwin.h
@@ -0,0 +1,26 @@
+## lock-obj-pub.i386-apple-darwin.h
+## File created by gen-posix-lock-obj - DO NOT EDIT
+## To be included by mkheader into gpg-error.h
+
+typedef struct
+{
+  long _vers;
+  union {
+    volatile char _priv[44];
+    long _x_align;
+    long *_xp_align;
+  } u;
+} gpgrt_lock_t;
+
+#define GPGRT_LOCK_INITIALIZER {1,{{167,171,170,50,0,0,0,0, \
+                                    0,0,0,0,0,0,0,0, \
+                                    0,0,0,0,0,0,0,0, \
+                                    0,0,0,0,0,0,0,0, \
+                                    0,0,0,0,0,0,0,0, \
+                                    0,0,0,0}}}
+##
+## Local Variables:
+## mode: c
+## buffer-read-only: t
+## End:
+##
diff --git a/src/syscfg/lock-obj-pub.x86_64-apple-darwin.h b/src/syscfg/lock-obj-pub.x86_64-apple-darwin.h
new file mode 100644
index 0000000..eaf8689
--- /dev/null
+++ b/src/syscfg/lock-obj-pub.x86_64-apple-darwin.h
@@ -0,0 +1,28 @@
+## lock-obj-pub.x86_64-apple-darwin.h
+## File created by gen-posix-lock-obj - DO NOT EDIT
+## To be included by mkheader into gpg-error.h
+
+typedef struct
+{
+    long _vers;
+    union {
+        volatile char _priv[64];
+        long _x_align;
+        long *_xp_align;
+    } u;
+} gpgrt_lock_t;
+
+#define GPGRT_LOCK_INITIALIZER {1,{{167,171,170,50,0,0,0,0, \
+0,0,0,0,0,0,0,0, \
+0,0,0,0,0,0,0,0, \
+0,0,0,0,0,0,0,0, \
+0,0,0,0,0,0,0,0, \
+0,0,0,0,0,0,0,0, \
+0,0,0,0,0,0,0,0, \
+0,0,0,0,0,0,0,0}}}
+##
+## Local Variables:
+## mode: c
+## buffer-read-only: t
+## End:
+##

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

Summary of changes:
 NEWS                                                           |  3 +++
 doc/errorref.txt                                               | 10 +++++++++-
 src/Makefile.am                                                |  2 ++
 src/err-codes.h.in                                             |  4 +++-
 ...64-unknown-linux-gnu.h => lock-obj-pub.i386-apple-darwin.h} |  8 ++++----
 ...rch64-apple-darwin.h => lock-obj-pub.x86_64-apple-darwin.h} |  2 +-
 6 files changed, 22 insertions(+), 7 deletions(-)
 copy src/syscfg/{lock-obj-pub.aarch64-unknown-linux-gnu.h => lock-obj-pub.i386-apple-darwin.h} (72%)
 copy src/syscfg/{lock-obj-pub.aarch64-apple-darwin.h => lock-obj-pub.x86_64-apple-darwin.h} (92%)


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org



From cvs at cvs.gnupg.org  Sat Oct  8 21:22:19 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Sat, 08 Oct 2016 21:22:19 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.7.0-34-g0ea2ff6
Message-ID: <E1bsxCU-0008NV-4Q@lists.gnupg.org>

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 "GnuPG Made Easy".

The branch, master has been updated
       via  0ea2ff67900c243fff9f689658dcb23d1c0961cd (commit)
      from  857592041b8355cd58a7068c9f2446cf8dc0968f (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 0ea2ff67900c243fff9f689658dcb23d1c0961cd
Author: Werner Koch <wk at gnupg.org>
Date:   Sat Oct 8 21:14:52 2016 +0200

    core: New helper function gpgme_addrspec_from_uid.
    
    * src/gpgme.h.in: Add gpgme_addrspec_from_uid.
    * src/gpgme.def, src/libgpgme.vers: Ditto.
    * src/mbox-util.c (gpgme_addrspec_from_uid): New.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/NEWS b/NEWS
index b13c3a6..86e1d4f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,12 @@
 Noteworthy changes in version 1.7.1 (unreleased) [C26/A15/R_]
 ------------------------------------------------
 
+
+ * Interface changes relative to the 1.7.0 release:
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ gpgme_addrspec_from_uid         NEW.
+
+
 Noteworthy changes in version 1.7.0 (2016-09-21) [C26/A15/R0]
 ------------------------------------------------
 
diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index 6d6d692..cc59888 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -5109,6 +5109,23 @@ pointer, and @code{GPG_ERR_NO_DATA} if @var{cipher} does not contain
 any data to decrypt.
 @end deftypefun
 
+When processing mails it is sometimes useful to extract the actual
+mail address (the ``addr-spec'') from a string.  GPGME provides this
+helper function which uses the same semantics as the internal
+functions in GPGME and GnuPG:
+
+ at deftypefun @w{char *} gpgme_addrspec_from_uid (@w{const char *@var{uid}})
+
+Return the mail address (called ``addr-spec'' in RFC-5322) from the
+string @var{uid} which is assumed to be a user id (called ``address''
+in RFC-5322).  All plain ASCII characters (i.e. those with bit 7
+cleared) in the result are converted to lowercase.  Caller must free
+the result using @code{gpgme_free}.  Returns @code{NULL} if no valid
+address was found (in which case @code{ERRNO} is set to @code{EINVAL})
+or for other errors.
+
+ at end deftypefun
+
 
 @node Sign
 @subsection Sign
diff --git a/src/gpgme.def b/src/gpgme.def
index 9815a83..c94c960 100644
--- a/src/gpgme.def
+++ b/src/gpgme.def
@@ -244,5 +244,7 @@ EXPORTS
     gpgme_op_interact_start               @184
     gpgme_op_interact                     @185
 
+    gpgme_addrspec_from_uid               @186
+
 ; END
 
diff --git a/src/gpgme.h.in b/src/gpgme.h.in
index 20654db..5c914ae 100644
--- a/src/gpgme.h.in
+++ b/src/gpgme.h.in
@@ -846,7 +846,7 @@ struct _gpgme_user_id
 
   /* The mail address (addr-spec from RFC5322) of the UID string.
    * This is general the same as the EMAIL part of this struct but
-   * might be slightly different.  IF no mail address is available
+   * might be slightly different.  If no mail address is available
    * NULL is stored.  */
   char *address;
 
@@ -2471,6 +2471,10 @@ const char *gpgme_pubkey_algo_name (gpgme_pubkey_algo_t algo);
    algorithm ALGO, or NULL if that name is not known.  */
 const char *gpgme_hash_algo_name (gpgme_hash_algo_t algo);
 
+/* Return the addr-spec from a user id.  Caller must free the result
+ * with gpgme_free. */
+char *gpgme_addrspec_from_uid (const char *uid);
+
 
 

 /*
diff --git a/src/libgpgme.vers b/src/libgpgme.vers
index aec9090..d3962db 100644
--- a/src/libgpgme.vers
+++ b/src/libgpgme.vers
@@ -117,6 +117,8 @@ GPGME_1.1 {
     gpgme_op_tofu_policy;
     gpgme_op_interact_start;
     gpgme_op_interact;
+
+    gpgme_addrspec_from_uid;
 };
 
 
diff --git a/src/mbox-util.c b/src/mbox-util.c
index 656b5d7..81e929b 100644
--- a/src/mbox-util.c
+++ b/src/mbox-util.c
@@ -255,3 +255,21 @@ _gpgme_mailbox_from_userid (const char *userid)
 
 /*   return 1; */
 /* } */
+
+
+/*
+ * Exported public API
+ */
+
+
+/* Return the mail address ("addr-spec" as per RFC-5322) from a string
+ * which is assumed to be an user id ("address" in RFC-5322).  All
+ * plain ASCII characters (those with bit 7 cleared) in the result
+ * are converted to lowercase.  Caller must free the result using
+ * gpgme_free.  Returns NULL if no valid address was found (in which
+ * case ERRNO is set to EINVAL) or for other errors.  */
+char *
+gpgme_addrspec_from_uid (const char *uid)
+{
+  return _gpgme_mailbox_from_userid (uid);
+}

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

Summary of changes:
 NEWS              |  6 ++++++
 doc/gpgme.texi    | 17 +++++++++++++++++
 src/gpgme.def     |  2 ++
 src/gpgme.h.in    |  6 +++++-
 src/libgpgme.vers |  2 ++
 src/mbox-util.c   | 18 ++++++++++++++++++
 6 files changed, 50 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org



From cvs at cvs.gnupg.org  Mon Oct 10 12:27:40 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Mon, 10 Oct 2016 12:27:40 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.7.0-35-g098a2da
Message-ID: <E1btXo7-0008Vp-5n@lists.gnupg.org>

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 "GnuPG Made Easy".

The branch, master has been updated
       via  098a2da15b1b46b145add623dec0488abd39bd74 (commit)
      from  0ea2ff67900c243fff9f689658dcb23d1c0961cd (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 098a2da15b1b46b145add623dec0488abd39bd74
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Oct 10 12:19:48 2016 +0200

    core: Fix w32 crash in find_program_in_dir
    
    * src/w32-util.c (find_program_in_dir): Fix call to _gpgme_strconcat.
    
    --
    This fixes a crash introduced by dc39552d0 because it tried
    to concat a strlen.

diff --git a/src/w32-util.c b/src/w32-util.c
index 9d42139..21de6dc 100644
--- a/src/w32-util.c
+++ b/src/w32-util.c
@@ -390,7 +390,7 @@ find_program_in_dir (const char *dir, const char *name)
 {
   char *result;
 
-  result = _gpgme_strconcat (dir, "\\", strlen (name), NULL);
+  result = _gpgme_strconcat (dir, "\\", name, NULL);
   if (!result)
     return NULL;
 

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

Summary of changes:
 src/w32-util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org



From cvs at cvs.gnupg.org  Mon Oct 10 14:25:05 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Mon, 10 Oct 2016 14:25:05 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. 683620c456f46d246ba218675f6a6977d3c620d6
Message-ID: <E1btZdj-00053j-3U@lists.gnupg.org>

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 GnuPG website and other docs".

The branch, master has been updated
       via  683620c456f46d246ba218675f6a6977d3c620d6 (commit)
      from  f13388fd42405ea806e86c6f094074999831b360 (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 683620c456f46d246ba218675f6a6977d3c620d6
Author: Justus Winter <justus at g10code.com>
Date:   Mon Oct 10 14:18:43 2016 +0200

    misc: Use https, avoid mixed content on git.gnupg.org.
    
    GnuPG-bug-id: 2744
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/misc/git.gnupg.org/index.html b/misc/git.gnupg.org/index.html
index 831c3d8..3e4fd23 100644
--- a/misc/git.gnupg.org/index.html
+++ b/misc/git.gnupg.org/index.html
@@ -118,12 +118,21 @@ Here is a list of shortcuts to often used repositories:
 For actual work you should clone a repository; use
 </p>
 <pre>
+  git clone https://git.gnupg.org/foo.git
+</pre>
+<p>or</p>
+<pre>
   git clone git://git.gnupg.org/foo.git
 </pre>
 <p>
 and replace <i>foo</i> by the name of the project (e.g. <i>gnupg</i>
-or <i>libgcrypt</i>).
+or <i>libgcrypt</i>).  Many commits and all tags are signed using
+GnuPG.  To verify the signatures on a tag (e.g. <i>gnupg-2.1.15</i>)
+do
 </p>
+<pre>
+  git tag -v gnupg-2.1.15
+</pre>
 <p>
 
 
@@ -135,8 +144,8 @@ Here is a list of projects now hosted on other servers:
 </p>
 <ul>
 <li> gnupg-for-java is now at
-     <a href="http://github.com/smartrevolution/gnupg-for-java"
-       >http://github.com/smartrevolution/gnupg-for-java</a>.</li>
+     <a href="https://github.com/smartrevolution/gnupg-for-java"
+       >https://github.com/smartrevolution/gnupg-for-java</a>.</li>
 </ul>
 
 
@@ -183,8 +192,8 @@ Here is a list of projects now hosted on other servers:
 
          <p>
 
-          <a class="img" href="http://validator.w3.org/check/referer">
-             <img src="http://www.w3.org/Icons/valid-xhtml10"
+          <a class="img" href="https://validator.w3.org/check/referer">
+             <img src="https://www.w3.org/Icons/valid-xhtml10"
                   alt="Valid XHTML 1.0!"
                   height="31" width="88" /></a>
           &nbsp;&nbsp;&nbsp;
@@ -193,13 +202,13 @@ Here is a list of projects now hosted on other servers:
                   alt="Digital Respect for the Masses"
                   height="40" width="69" /></a>
           &nbsp;&nbsp;&nbsp;
-          <a class="img" href="http://www.un.org/aboutun/charter/">
+          <a class="img" href="https://www.un.org/en/charter-united-nations/">
              <img src="pace.png"
                   alt="Peace!"
                   height="40" width="58" /></a>
           &nbsp;&nbsp;&nbsp;
-          <a class="img" href="http://jigsaw.w3.org/css-validator/validator?uri=http://www.gnupg.org/share/site.css">
-             <img src="http://jigsaw.w3.org/css-validator/images/vcss"
+          <a class="img" href="https://jigsaw.w3.org/css-validator/validator?uri=https://www.gnupg.org/share/site.css">
+             <img src="https://jigsaw.w3.org/css-validator/images/vcss"
                   alt="Valid CSS!"
                   height="31" width="88" /></a>
          </p>

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

Summary of changes:
 misc/git.gnupg.org/index.html | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org



From cvs at cvs.gnupg.org  Mon Oct 10 15:09:31 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Mon, 10 Oct 2016 15:09:31 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. 6a6de7e95dcf0ef104134b7d47c8401e792f7895
Message-ID: <E1btaKj-0006wI-7Z@lists.gnupg.org>

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 GnuPG website and other docs".

The branch, master has been updated
       via  6a6de7e95dcf0ef104134b7d47c8401e792f7895 (commit)
      from  683620c456f46d246ba218675f6a6977d3c620d6 (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 6a6de7e95dcf0ef104134b7d47c8401e792f7895
Author: Justus Winter <justus at g10code.com>
Date:   Mon Oct 10 15:08:47 2016 +0200

    git.gnupg.org: Fix markup.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/misc/git.gnupg.org/index.html b/misc/git.gnupg.org/index.html
index 3e4fd23..67c2198 100644
--- a/misc/git.gnupg.org/index.html
+++ b/misc/git.gnupg.org/index.html
@@ -97,13 +97,13 @@ Here is a list of shortcuts to often used repositories:
     <li> <a href="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=summary"
             >View the code of the GnuPG Made Easy library</a></li>
   </ul>
-
+</li>
 <li>Libgcrypt
   <ul>
     <li> <a href="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=shortlog;h=refs/heads/master"
             >View the code of the Libgcrypt development version</a></li>
   </ul>
-
+</li>
 <li>Gpg4win
   <ul>
     <li> <a href="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpg4win.git;a=summary"
@@ -113,6 +113,7 @@ Here is a list of shortcuts to often used repositories:
     <li> <a href="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgol.git;a=summary"
             >View the code of the GpgOL, the Outlook plugin</a></li>
   </ul>
+</li>
 </ul>
 <p>
 For actual work you should clone a repository; use
@@ -133,10 +134,6 @@ do
 <pre>
   git tag -v gnupg-2.1.15
 </pre>
-<p>
-
-
-
 
 <h2>Notes</h2>
 <p>

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

Summary of changes:
 misc/git.gnupg.org/index.html | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org



From cvs at cvs.gnupg.org  Mon Oct 10 17:43:21 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Mon, 10 Oct 2016 17:43:21 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.7.0-39-ge7ceb83
Message-ID: <E1btcjb-0003yY-BL@lists.gnupg.org>

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 "GnuPG Made Easy".

The branch, master has been updated
       via  e7ceb83a5969581f5e1b0b6a69d18a93b594f6d4 (commit)
       via  b6b820bff14a9aa8fa67755b246c90062ffdba14 (commit)
       via  34e9dfee81958160f6604849b63369ae4de67417 (commit)
       via  f131a5e72b0881cafcc3b0a91da8f050af2684a6 (commit)
      from  098a2da15b1b46b145add623dec0488abd39bd74 (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 e7ceb83a5969581f5e1b0b6a69d18a93b594f6d4
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Oct 10 17:42:10 2016 +0200

    Add NEWS for cpp and qt, bump cpp version
    
    * NEWS: Add entries for cpp and qt changes.
    * configure.ac: Bump cpp version because of added API.

diff --git a/NEWS b/NEWS
index 86e1d4f..dff8e47 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,14 @@ Noteworthy changes in version 1.7.1 (unreleased) [C26/A15/R_]
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  gpgme_addrspec_from_uid         NEW.
 
+ * qt Interface changes relative to the 1.7.0 release:
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ WksPublishJob::startReceive     NEW.
+ WksPublishJob::startRecieve     REMOVED.
+
+ * cpp Interface changes relative to the 1.7.0 release:
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Signature::key(bool, bool)      NEW.
 
 Noteworthy changes in version 1.7.0 (2016-09-21) [C26/A15/R0]
 ------------------------------------------------
diff --git a/configure.ac b/configure.ac
index bc4aad9..64f9385 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,7 @@ LIBGPGME_LT_AGE=15
 LIBGPGME_LT_REVISION=0
 
 LIBGPGMEPP_LT_CURRENT=6
-LIBGPGMEPP_LT_AGE=0
+LIBGPGMEPP_LT_AGE=1
 LIBGPGMEPP_LT_REVISION=2
 
 LIBQGPGME_LT_CURRENT=7

commit b6b820bff14a9aa8fa67755b246c90062ffdba14
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Oct 10 17:38:43 2016 +0200

    Add convenience function to get key from sig
    
    * lang/cpp/src/verificationresult.cpp (Signature::key(bool, bool)):
    New. Can be used to search / update the key associcated with this
    signature.
    
    --
    By using update a caller can ensure that an incomplete key
    obtainable through the new key() function is fully loaded.
    With search the key can be looked up in the internal keyring.
    
    As the results are cached this can be done in the crypto thread
    and the result then better used in the UI thread.

diff --git a/lang/cpp/src/verificationresult.cpp b/lang/cpp/src/verificationresult.cpp
index a7b073e..23c458e 100644
--- a/lang/cpp/src/verificationresult.cpp
+++ b/lang/cpp/src/verificationresult.cpp
@@ -29,6 +29,7 @@
 #include "result_p.h"
 #include "util.h"
 #include "key.h"
+#include "context.h"
 
 #include <gpgme.h>
 
@@ -121,6 +122,7 @@ public:
     std::vector<GpgME::Key> keys;
     std::vector<char *> purls;
     std::string file_name;
+    Protocol proto;
 };
 
 GpgME::VerificationResult::VerificationResult(gpgme_ctx_t ctx, int error)
@@ -145,6 +147,10 @@ void GpgME::VerificationResult::init(gpgme_ctx_t ctx)
         return;
     }
     d.reset(new Private(res));
+    gpgme_protocol_t proto = gpgme_get_protocol(ctx);
+    d->proto = proto == GPGME_PROTOCOL_OpenPGP ? OpenPGP :
+               proto == GPGME_PROTOCOL_CMS ? CMS :
+               UnknownProtocol;
 }
 
 make_standard_stuff(VerificationResult)
@@ -386,6 +392,32 @@ GpgME::Key GpgME::Signature::key() const
     return d->keys[idx];
 }
 
+GpgME::Key GpgME::Signature::key(bool search, bool update) const
+{
+    if (isNull()) {
+        return Key();
+    }
+
+    GpgME::Key ret = key();
+    if (ret.isNull() && search) {
+        auto ctx = Context::createForProtocol (d->proto);
+        if (ctx) {
+            ctx->setKeyListMode(KeyListMode::Local |
+                        KeyListMode::Signatures |
+                        KeyListMode::SignatureNotations |
+                        KeyListMode::Validate |
+                        KeyListMode::WithTofu);
+            Error e;
+            ret = d->keys[idx] = ctx->key(fingerprint(), e, false);
+            delete ctx;
+        }
+    }
+    if (update) {
+        ret.update();
+    }
+    return ret;
+}
+
 class GpgME::Notation::Private
 {
 public:
diff --git a/lang/cpp/src/verificationresult.h b/lang/cpp/src/verificationresult.h
index 93288af..b6d1d8c 100644
--- a/lang/cpp/src/verificationresult.h
+++ b/lang/cpp/src/verificationresult.h
@@ -163,6 +163,27 @@ public:
      * set or the associated TOFU Information if applicable. */
     GpgME::Key key() const;
 
+    /* Search / Update the key of this signature.
+     *
+     * Same as above but if search is set to true this will
+     * either update the key provided by the engine or search
+     * the key in the engine. The key is cached.
+     *
+     * As this involves an engine call it might take some time
+     * to finish so it should be avoided to do this in a UI
+     * thread. The result will be cached and no engine call
+     * will be done if update is set to false and a key is
+     * already cached.
+     *
+     * If no key was provided by the engine this will look
+     * up the key so this call might block while the engine
+     * is called to obtain the key.
+     *
+     * If both search and update are false this is the same
+     * as calling key()
+     */
+    GpgME::Key key(bool search, bool update) const;
+
 private:
     std::shared_ptr<VerificationResult::Private> d;
     unsigned int idx;

commit 34e9dfee81958160f6604849b63369ae4de67417
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Oct 10 17:36:41 2016 +0200

    cpp: Return null key if the signature had no key
    
    * lang/cpp/src/verificationresult.cpp (Private): Add null key
    to list when there is no key associated with the signature.
    
    --
    This fixes an out of bounds read when a verification did
    not have a key.

diff --git a/lang/cpp/src/verificationresult.cpp b/lang/cpp/src/verificationresult.cpp
index be33ca2..a7b073e 100644
--- a/lang/cpp/src/verificationresult.cpp
+++ b/lang/cpp/src/verificationresult.cpp
@@ -72,6 +72,8 @@ public:
             // copy keys
             if (scopy->key) {
                 keys.push_back(Key(scopy->key, true));
+            } else {
+                keys.push_back(Key());
             }
             // copy notations:
             nota.push_back(std::vector<Nota>());

commit f131a5e72b0881cafcc3b0a91da8f050af2684a6
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Oct 10 15:22:17 2016 +0200

    qt: Add simple verify test
    
    * lang/qt/tests/t-verify.cpp: New. Small test if a signature
    returns a key with fingerprint.
    * lang/qt/tests/Makefile.am: Add new test.

diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
index 72ea324..ad08ad4 100644
--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
@@ -25,10 +25,10 @@ TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir)
 EXTRA_DIST = initial.test
 
 TESTS = initial.test t-keylist t-keylocate t-ownertrust t-tofuinfo \
-        t-encrypt
+        t-encrypt t-verify
 
 moc_files = t-keylist.moc t-keylocate.moc t-ownertrust.moc t-tofuinfo.moc \
-            t-encrypt.moc t-support.hmoc t-wkspublish.moc
+            t-encrypt.moc t-support.hmoc t-wkspublish.moc t-verify.moc
 
 AM_LDFLAGS = -no-install
 
@@ -56,6 +56,7 @@ t_ownertrust_SOURCES = t-ownertrust.cpp $(support_src)
 t_tofuinfo_SOURCES = t-tofuinfo.cpp $(support_src)
 t_encrypt_SOURCES = t-encrypt.cpp $(support_src)
 t_wkspublish_SOURCES = t-wkspublish.cpp $(support_src)
+t_verify_SOURCES = t-verify.cpp $(support_src)
 run_keyformailboxjob_SOURCES = run-keyformailboxjob.cpp
 
 nodist_t_keylist_SOURCES = $(moc_files)
@@ -63,7 +64,7 @@ nodist_t_keylist_SOURCES = $(moc_files)
 BUILT_SOURCES = $(moc_files)
 
 noinst_PROGRAMS = t-keylist t-keylocate t-ownertrust t-tofuinfo t-encrypt \
-    run-keyformailboxjob t-wkspublish
+    run-keyformailboxjob t-wkspublish t-verify
 
 CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
 	gpg-agent.conf pubring.kbx~ S.gpg-agent gpg.conf pubring.gpg~ \
diff --git a/lang/qt/tests/t-verify.cpp b/lang/qt/tests/t-verify.cpp
new file mode 100644
index 0000000..aedfc19
--- /dev/null
+++ b/lang/qt/tests/t-verify.cpp
@@ -0,0 +1,93 @@
+/* t-verifiy.cpp
+
+    This file is part of qgpgme, the Qt API binding for gpgme
+    Copyright (c) 2016 Intevation GmbH
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+#ifdef HAVE_CONFIG_H
+ #include "config.h"
+#endif
+
+#include <QDebug>
+#include <QTest>
+
+
+#include "protocol.h"
+
+#include "verifyopaquejob.h"
+#include "verificationresult.h"
+#include "key.h"
+#include "t-support.h"
+
+using namespace QGpgME;
+using namespace GpgME;
+
+static const char testMsg1[] =
+"-----BEGIN PGP MESSAGE-----\n"
+"\n"
+"owGbwMvMwCSoW1RzPCOz3IRxjXQSR0lqcYleSUWJTZOvjVdpcYmCu1+oQmaJIleH\n"
+"GwuDIBMDGysTSIqBi1MApi+nlGGuwDeHao53HBr+FoVGP3xX+kvuu9fCMJvl6IOf\n"
+"y1kvP4y+8D5a11ang0udywsA\n"
+"=Crq6\n"
+"-----END PGP MESSAGE-----\n";
+
+
+class VerifyTest: public QGpgMETest
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+
+    /* Check that a signature always has a key. */
+    void testSignatureKey()
+    {
+        const QByteArray signedData(testMsg1);
+        auto verifyJob = openpgp()->verifyOpaqueJob(true);
+        QByteArray verified;
+
+        auto result = verifyJob->exec(signedData, verified);
+        Q_ASSERT(!result.error());
+        delete verifyJob;
+
+        Q_ASSERT(result.numSignatures() == 1);
+        auto sig = result.signatures()[0];
+
+        const auto key = sig.key(true, false);
+        Q_ASSERT(!key.isNull());
+
+        bool found = false;
+        for (const auto subkey: key.subkeys()) {
+            if (!strcmp (subkey.fingerprint(), sig.fingerprint())) {
+                found = true;
+            }
+        }
+        Q_ASSERT(found);
+    }
+};
+
+QTEST_MAIN(VerifyTest)
+#include "t-verify.moc"

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

Summary of changes:
 NEWS                                               |  8 ++
 configure.ac                                       |  2 +-
 lang/cpp/src/verificationresult.cpp                | 34 ++++++++
 lang/cpp/src/verificationresult.h                  | 21 +++++
 lang/qt/tests/Makefile.am                          |  7 +-
 .../qgpgmeverifyopaquejob.h => tests/t-verify.cpp} | 95 ++++++++++++----------
 6 files changed, 120 insertions(+), 47 deletions(-)
 copy lang/qt/{src/qgpgmeverifyopaquejob.h => tests/t-verify.cpp} (52%)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org



From cvs at cvs.gnupg.org  Tue Oct 11 10:38:40 2016
From: cvs at cvs.gnupg.org (by Daiki Ueno)
Date: Tue, 11 Oct 2016 10:38:40 +0200
Subject: [git] Pinentry - branch, master, updated. pinentry-0.9.7-33-ga383dde
Message-ID: <E1btsaA-0007kF-JC@lists.gnupg.org>

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 standard pinentry collection".

The branch, master has been updated
       via  a383ddeb76463ddcf5aca2fb38847ea3158c42a7 (commit)
      from  65d8e0ec19795d9ec60d7f37f1511f65135cfd84 (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 a383ddeb76463ddcf5aca2fb38847ea3158c42a7
Author: Daiki Ueno <ueno at gnu.org>
Date:   Mon Oct 10 10:33:36 2016 +0200

    core: Don't report error on setting option 'allow-emacs-pinentry'.
    
    Previously "OPTION allow-emacs-pinentry" returned an error if the Emacs
    pinentry is not compiled in.  Since it is merely an option, it would
    make more sense to just return OK.
    
    Suggested-by: Werner Koch <wk at gnupg.org>
    Signed-off-by: Daiki Ueno <ueno at gnu.org>

diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c
index e5cb806..3131b1e 100644
--- a/pinentry/pinentry.c
+++ b/pinentry/pinentry.c
@@ -910,8 +910,6 @@ option_handler (assuan_context_t ctx, const char *key, const char *value)
     {
 #ifdef INSIDE_EMACS
       pinentry_enable_emacs_cmd_handler ();
-#else
-      return gpg_error (GPG_ERR_NOT_SUPPORTED);
 #endif
     }
   else if (!strcmp (key, "invisible-char"))

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

Summary of changes:
 pinentry/pinentry.c | 2 --
 1 file changed, 2 deletions(-)


hooks/post-receive
-- 
The standard pinentry collection
http://git.gnupg.org



From cvs at cvs.gnupg.org  Tue Oct 11 14:14:57 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Tue, 11 Oct 2016 14:14:57 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.7.0-40-g54f94b1
Message-ID: <E1btvxT-0007Yk-Fb@lists.gnupg.org>

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 "GnuPG Made Easy".

The branch, master has been updated
       via  54f94b14e2bb9b38ffd89f509406bfbd012da632 (commit)
      from  e7ceb83a5969581f5e1b0b6a69d18a93b594f6d4 (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 54f94b14e2bb9b38ffd89f509406bfbd012da632
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Oct 11 14:13:15 2016 +0200

    cpp: Add API for gpgme_addrspec_from_uid
    
    * lang/cpp/src/key.cpp (UserID::addrSpecFromString): New static
    function to expose addrspec from uid.
    (UserID::addrSpec): New. Get addrSpec from Userid.
    * NEWS: Update accordingly.

diff --git a/NEWS b/NEWS
index dff8e47..72f6f77 100644
--- a/NEWS
+++ b/NEWS
@@ -13,7 +13,9 @@ Noteworthy changes in version 1.7.1 (unreleased) [C26/A15/R_]
 
  * cpp Interface changes relative to the 1.7.0 release:
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Signature::key(bool, bool)      NEW.
+ Signature::key(bool, bool)              NEW.
+ UserID::addrSpecFromString(const char*) NEW.
+ UserID::addrSpec()                      NEW.
 
 Noteworthy changes in version 1.7.0 (2016-09-21) [C26/A15/R0]
 ------------------------------------------------
diff --git a/lang/cpp/src/key.cpp b/lang/cpp/src/key.cpp
index 4531a2b..947405f 100644
--- a/lang/cpp/src/key.cpp
+++ b/lang/cpp/src/key.cpp
@@ -878,6 +878,22 @@ const char *UserID::Signature::policyURL() const
     return 0;
 }
 
+std::string UserID::addrSpecFromString(const char *userid)
+{
+    if (!userid) {
+        return std::string();
+    }
+    char *normalized = gpgme_addrspec_from_uid (userid);
+    std::string ret(normalized);
+    gpgme_free(normalized);
+    return ret;
+}
+
+std::string UserID::addrSpec() const
+{
+    return addrSpecFromString(email());
+}
+
 std::ostream &operator<<(std::ostream &os, const UserID &uid)
 {
     os << "GpgME::UserID(";
diff --git a/lang/cpp/src/key.h b/lang/cpp/src/key.h
index f193093..3f596a8 100644
--- a/lang/cpp/src/key.h
+++ b/lang/cpp/src/key.h
@@ -320,6 +320,21 @@ public:
      * @returns The TOFU stats or a null TofuInfo.
      */
     GpgME::TofuInfo tofuInfo() const;
+
+    /*! Wrapper around gpgme_addrspec_from_uid.
+     *
+     * The input string should match the format of
+     * a user id string.
+     *
+     * @returns a normalized mail address if found
+     * or an empty string. */
+    static std::string addrSpecFromString(const char *uid);
+
+    /*! Wrapper around gpgme_addrspec_from_uid.
+     *
+     * @returns a normalized mail address for this userid
+     * or an empty string. */
+    std::string addrSpec() const;
 private:
     shared_gpgme_key_t key;
     gpgme_user_id_t uid;

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

Summary of changes:
 NEWS                 |  4 +++-
 lang/cpp/src/key.cpp | 16 ++++++++++++++++
 lang/cpp/src/key.h   | 15 +++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org



From cvs at cvs.gnupg.org  Tue Oct 11 14:16:01 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Tue, 11 Oct 2016 14:16:01 +0200
Subject: [git] GpgOL - branch, nomapi, updated. gpgol-1.4.0-77-gb4708d2
Message-ID: <E1btvyV-00080f-7p@lists.gnupg.org>

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 "GnuPG extension for MS Outlook".

The branch, nomapi has been updated
       via  b4708d27c6a03dbcfb9eb5a29be15fff159be662 (commit)
       via  06369d42f7a4b486dd1023824d7584709d337f2a (commit)
       via  7bfc018dc713996e48c6db60cd78ce6490712720 (commit)
       via  f8073ceb48e0dc0248165127dd731840d6a7b3b9 (commit)
       via  d9d6454e9e8ac31c68e0dddcba14198e267ef686 (commit)
       via  30db9ee468bee6921c94c64033299eb84c6ab9da (commit)
       via  2eb057e3a033b34a20fd3c03115ece6938f75b0a (commit)
       via  1966b2b09940aa60f9f96553ef18860d4781d630 (commit)
       via  ce29969cced4f9bd78061c27ed3b97e66ba9dc60 (commit)
      from  a2240672cf62c7caea7b4d442f83d36b6c122ee7 (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 b4708d27c6a03dbcfb9eb5a29be15fff159be662
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Oct 11 14:15:16 2016 +0200

    Factor out is_valid check into own function
    
    * src/mail.cpp (is_valid_sig): New. Helper to check
    validity.

diff --git a/src/mail.cpp b/src/mail.cpp
index 5098347..4e33c06 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -845,42 +845,20 @@ Mail::close_inspector ()
   return 0;
 }
 
-void
-Mail::update_categories ()
+static bool
+is_valid_sig (const VerificationResult &result, const char *sender)
 {
-  const auto dec_result = m_parser->decrypt_result();
-  const char *decCategory = _("GpgOL: Encrypted Message");
-  const char *verifyCategory = _("GpgOL: Verified Sender");
-  if (dec_result.numRecipients())
-    {
-      /* We use the number of recipients as we don't care
-         if decryption was successful or not for this category */
-      add_category (m_mailitem, decCategory);
-    }
-  else
-    {
-      /* As a small safeguard against fakes we remove our
-         categories */
-      remove_category (m_mailitem, decCategory);
-    }
-
-  const auto ver_result = m_parser->verify_result();
-  const char *sender = get_sender();
-
-  if (ver_result.error() || !sender)
+  if (result.error() || !sender)
     {
-      remove_category (m_mailitem, verifyCategory);
-      return;
+      return false;
     }
-
-  bool valid = false;
-  for (const auto sig: ver_result.signatures())
+  for (const auto sig: result.signatures())
     {
       if (sig.validity() != Signature::Validity::Marginal &&
           sig.validity() != Signature::Validity::Full &&
           sig.validity() != Signature::Validity::Ultimate)
         {
-          /* For our category we only care about full / ultimate. */
+          /* For our category we only care about trusted sigs. */
           continue;
         }
       Key k = sig.key();
@@ -891,24 +869,17 @@ Mail::update_categories ()
               TRACEPOINT;
               continue;
             }
-          char *normalized_uid = gpgme_addrspec_from_uid (uid.email());
-          char *normalized_sender = gpgme_addrspec_from_uid (sender);
-
-          log_debug ("%s:%s: comparing '%s' and '%s'",
-                     SRCNAME, __func__, normalized_uid, normalized_sender);
+          auto normalized_uid = uid.addrSpec();
+          auto normalized_sender = UserID::addrSpecFromString(sender);
 
-          if (!normalized_sender || !normalized_uid)
+          if (normalized_sender.empty() || normalized_uid.empty())
             {
               log_error ("%s:%s: normalizing '%s' or '%s' failed.",
                          SRCNAME, __func__, uid.email(), sender);
               continue;
             }
 
-          int result = strcmp(normalized_uid, normalized_sender);
-          gpgme_free (normalized_sender);
-          gpgme_free (normalized_uid);
-
-          if (!result)
+          if (normalized_sender == normalized_uid)
             {
               if (sig.validity() == Signature::Validity::Marginal)
                 {
@@ -926,12 +897,36 @@ Mail::update_categories ()
                 }
               log_debug ("%s:%s: Classified sender as verified",
                          SRCNAME, __func__);
-              valid = true;
-              break;
+              return true;
             }
         }
     }
-  if (valid)
+  return false;
+}
+
+void
+Mail::update_categories ()
+{
+  const auto dec_result = m_parser->decrypt_result();
+  const char *decCategory = _("GpgOL: Encrypted Message");
+  const char *verifyCategory = _("GpgOL: Verified Sender");
+  if (dec_result.numRecipients())
+    {
+      /* We use the number of recipients as we don't care
+         if decryption was successful or not for this category */
+      add_category (m_mailitem, decCategory);
+    }
+  else
+    {
+      /* As a small safeguard against fakes we remove our
+         categories */
+      remove_category (m_mailitem, decCategory);
+    }
+
+  const auto ver_result = m_parser->verify_result();
+  const char *sender = get_sender();
+
+  if (is_valid_sig (ver_result, sender))
     {
       add_category (m_mailitem, verifyCategory);
     }

commit 06369d42f7a4b486dd1023824d7584709d337f2a
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Oct 11 13:47:58 2016 +0200

    Fix crash when mail is deleted while parsing
    
    * src/windowmessages.cpp (gpgol_window_proc): Make safeguard
    actually work.

diff --git a/src/windowmessages.cpp b/src/windowmessages.cpp
index c1d7a18..db7b243 100644
--- a/src/windowmessages.cpp
+++ b/src/windowmessages.cpp
@@ -67,6 +67,7 @@ gpgol_window_proc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                 {
                   log_debug ("%s:%s: Parsing done for mail which is gone.",
                              SRCNAME, __func__);
+                  break;
                 }
               mail->parsing_done();
             }

commit 7bfc018dc713996e48c6db60cd78ce6490712720
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Oct 11 13:37:05 2016 +0200

    Add categories for crypto status and use them
    
    * src/gpgoladdin.cpp (OnStartupComplete): Create categories.
    * src/mail.cpp (Mail::update_categories): New. Set up categories
    based on trust.
    * src/mail.cpp (Mail::parsing_done): Update categories.
    * src/parsecontroller.cpp (ParseController::parse): Cache
    Signature keys in background thread.
    
    --
    As we are already requiureing latest gpgme this also adds
    support for TOFU. A marginally trusted key with 10 or more
    signatures is shown as green.

diff --git a/src/gpgoladdin.cpp b/src/gpgoladdin.cpp
index 58d2a58..21cf950 100644
--- a/src/gpgoladdin.cpp
+++ b/src/gpgoladdin.cpp
@@ -331,6 +331,12 @@ GpgolAddin::OnStartupComplete (SAFEARRAY** custom)
                  SRCNAME, __func__);
     }
 
+  /* Set up categories */
+  const char *decCategory = _("GpgOL: Encrypted Message");
+  const char *verifyCategory = _("GpgOL: Verified Sender");
+  ensure_category_exists (m_application, decCategory, 8);
+  ensure_category_exists (m_application, verifyCategory, 5);
+
   if (m_application)
     {
       m_applicationEventSink = install_ApplicationEvents_sink(m_application);
diff --git a/src/mail.cpp b/src/mail.cpp
index c3016e8..5098347 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -33,10 +33,17 @@
 #include "gpgolstr.h"
 #include "windowmessages.h"
 
+#include <gpgme++/tofuinfo.h>
+#include <gpgme++/verificationresult.h>
+#include <gpgme++/decryptionresult.h>
+#include <gpgme++/key.h>
+
 #include <map>
 #include <vector>
 #include <memory>
 
+using namespace GpgME;
+
 static std::map<LPDISPATCH, Mail*> g_mail_map;
 
 #define COPYBUFSIZE (8 * 1024)
@@ -525,6 +532,9 @@ void
 Mail::parsing_done()
 {
   m_needs_wipe = true;
+  /* Set categories according to the result. */
+  update_categories();
+
   /* Update the body */
   update_body();
 
@@ -834,3 +844,100 @@ Mail::close_inspector ()
     }
   return 0;
 }
+
+void
+Mail::update_categories ()
+{
+  const auto dec_result = m_parser->decrypt_result();
+  const char *decCategory = _("GpgOL: Encrypted Message");
+  const char *verifyCategory = _("GpgOL: Verified Sender");
+  if (dec_result.numRecipients())
+    {
+      /* We use the number of recipients as we don't care
+         if decryption was successful or not for this category */
+      add_category (m_mailitem, decCategory);
+    }
+  else
+    {
+      /* As a small safeguard against fakes we remove our
+         categories */
+      remove_category (m_mailitem, decCategory);
+    }
+
+  const auto ver_result = m_parser->verify_result();
+  const char *sender = get_sender();
+
+  if (ver_result.error() || !sender)
+    {
+      remove_category (m_mailitem, verifyCategory);
+      return;
+    }
+
+  bool valid = false;
+  for (const auto sig: ver_result.signatures())
+    {
+      if (sig.validity() != Signature::Validity::Marginal &&
+          sig.validity() != Signature::Validity::Full &&
+          sig.validity() != Signature::Validity::Ultimate)
+        {
+          /* For our category we only care about full / ultimate. */
+          continue;
+        }
+      Key k = sig.key();
+      for (const auto uid: k.userIDs())
+        {
+          if (!uid.email())
+            {
+              TRACEPOINT;
+              continue;
+            }
+          char *normalized_uid = gpgme_addrspec_from_uid (uid.email());
+          char *normalized_sender = gpgme_addrspec_from_uid (sender);
+
+          log_debug ("%s:%s: comparing '%s' and '%s'",
+                     SRCNAME, __func__, normalized_uid, normalized_sender);
+
+          if (!normalized_sender || !normalized_uid)
+            {
+              log_error ("%s:%s: normalizing '%s' or '%s' failed.",
+                         SRCNAME, __func__, uid.email(), sender);
+              continue;
+            }
+
+          int result = strcmp(normalized_uid, normalized_sender);
+          gpgme_free (normalized_sender);
+          gpgme_free (normalized_uid);
+
+          if (!result)
+            {
+              if (sig.validity() == Signature::Validity::Marginal)
+                {
+                  const auto tofu = uid.tofuInfo();
+                  if (tofu.isNull() ||
+                      (tofu.validity() != TofuInfo::Validity::BasicHistory &&
+                       tofu.validity() != TofuInfo::Validity::LargeHistory))
+                    {
+                      /* Marginal is not good enough without tofu.
+                         We also wait for basic trust. */
+                      log_debug ("%s:%s: Discarding marginal signature.",
+                                 SRCNAME, __func__);
+                      continue;
+                    }
+                }
+              log_debug ("%s:%s: Classified sender as verified",
+                         SRCNAME, __func__);
+              valid = true;
+              break;
+            }
+        }
+    }
+  if (valid)
+    {
+      add_category (m_mailitem, verifyCategory);
+    }
+  else
+    {
+      remove_category (m_mailitem, verifyCategory);
+    }
+  return;
+}
diff --git a/src/mail.h b/src/mail.h
index af47f13..e76badd 100644
--- a/src/mail.h
+++ b/src/mail.h
@@ -195,6 +195,7 @@ public:
   */
   void parsing_done ();
 private:
+  void update_categories ();
   void update_body ();
 
   LPDISPATCH m_mailitem;
diff --git a/src/parsecontroller.cpp b/src/parsecontroller.cpp
index 2235c30..cf4adab 100644
--- a/src/parsecontroller.cpp
+++ b/src/parsecontroller.cpp
@@ -26,6 +26,7 @@
 
 #include <gpgme++/context.h>
 #include <gpgme++/decryptionresult.h>
+#include <gpgme++/key.h>
 
 #include <sstream>
 
@@ -293,6 +294,13 @@ ParseController::parse()
        ss << m_decrypt_result << '\n' << m_verify_result;
        log_debug ("Decrypt / Verify result: %s", ss.str().c_str());
     }
+
+  /* Ensure that the Keys for the signatures are available */
+  for (const auto sig: m_verify_result.signatures())
+    {
+      sig.key(true, false);
+    }
+
   return;
 }
 

commit f8073ceb48e0dc0248165127dd731840d6a7b3b9
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Oct 11 13:36:06 2016 +0200

    Add yet another way to lookup sender
    
    * src/mail.cpp (Mail::update_sender): Use SenderEmailAddress, too.

diff --git a/src/mail.cpp b/src/mail.cpp
index 8cf9af6..c3016e8 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -630,8 +630,25 @@ int
 Mail::update_sender ()
 {
   LPDISPATCH sender = NULL;
-  sender = get_oom_object (m_mailitem, "SendUsingAccount");
 
+  /* For some reason outlook my store the recipient address
+     in the send using account field. If we have SMTP we prefer
+     the SenderEmailAddress string. */
+  char *type = get_oom_string (m_mailitem, "SenderEmailType");
+  if (type && !strcmp ("SMTP", type))
+    {
+      xfree (type);
+      char *senderMail = get_oom_string (m_mailitem, "SenderEmailAddress");
+      if (senderMail)
+        {
+          xfree (m_sender);
+          m_sender = senderMail;
+          return 0;
+        }
+    }
+  xfree (type);
+
+  sender = get_oom_object (m_mailitem, "SendUsingAccount");
   xfree (m_sender);
   m_sender = NULL;
 

commit d9d6454e9e8ac31c68e0dddcba14198e267ef686
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Oct 11 13:35:18 2016 +0200

    Clarify that placeholder is used for verify, too
    
    * src/mail.cpp (Mail::decrypt_verify): Update string.

diff --git a/src/mail.cpp b/src/mail.cpp
index ceea551..8cf9af6 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -451,7 +451,7 @@ Mail::decrypt_verify()
   if (gpgrt_asprintf (&placeholder_buf, decrypt_template,
                       is_smime() ? "S/MIME" : "OpenPGP",
                       _("Encrypted message"),
-                      _("Please wait while the message is being decrypted...")) == -1)
+                      _("Please wait while the message is being decrypted / verified...")) == -1)
     {
       log_error ("%s:%s: Failed to format placeholder.",
                  SRCNAME, __func__);

commit 30db9ee468bee6921c94c64033299eb84c6ab9da
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Oct 11 13:29:29 2016 +0200

    Add safeground around parser start
    
    * src/mail.cpp (do_parsing): Safeguard against no parser.

diff --git a/src/mail.cpp b/src/mail.cpp
index dc5d21b..ceea551 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -414,11 +414,17 @@ add_attachments(LPDISPATCH mail,
 static DWORD WINAPI
 do_parsing (LPVOID arg)
 {
-  log_debug ("%s:%s: starting parsing for: %p",
+  log_debug ("%s:%s: starting the parser for: %p",
              SRCNAME, __func__, arg);
 
   Mail *mail = (Mail *)arg;
   auto parser = mail->parser();
+  if (!parser)
+    {
+      log_error ("%s:%s: no parser found for mail: %p",
+                 SRCNAME, __func__, arg);
+      return -1;
+    }
   parser->parse();
   do_in_ui_thread (PARSING_DONE, arg);
   return 0;

commit 2eb057e3a033b34a20fd3c03115ece6938f75b0a
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Oct 11 13:28:48 2016 +0200

    Free sender string on Mail deletion
    
    * src/mail.cpp (Mail::~Mail): Free sender.

diff --git a/src/mail.cpp b/src/mail.cpp
index e4984c0..dc5d21b 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -114,6 +114,7 @@ Mail::~Mail()
       g_mail_map.erase (it);
     }
 
+  xfree (m_sender);
   gpgol_release(m_mailitem);
 }
 

commit 1966b2b09940aa60f9f96553ef18860d4781d630
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Oct 11 13:25:38 2016 +0200

    Add category helpers to oomhelp
    
    * src/oomhelp.cpp (ensure_category_exists, create_category),
    (add_category, remove_category): New.
    * src/oomhelp.h: Update accordingly.

diff --git a/src/oomhelp.cpp b/src/oomhelp.cpp
index 562582c..32c83f9 100644
--- a/src/oomhelp.cpp
+++ b/src/oomhelp.cpp
@@ -24,6 +24,7 @@
 
 #include <windows.h>
 #include <olectl.h>
+#include <string>
 
 #include "myexchext.h"
 #include "common.h"
@@ -1295,3 +1296,219 @@ get_oom_mapi_session ()
     }
   return session;
 }
+
+static int
+create_category (LPDISPATCH categories, const char *category, int color)
+{
+  VARIANT cVariant[3];
+  VARIANT rVariant;
+  DISPID dispid;
+  DISPPARAMS dispparams;
+  HRESULT hr;
+  EXCEPINFO execpinfo;
+  BSTR b_name;
+  wchar_t *w_name;
+  unsigned int argErr = 0;
+
+  init_excepinfo (&execpinfo);
+
+  if (!categories || !category)
+    {
+      TRACEPOINT;
+      return 1;
+    }
+
+  dispid = lookup_oom_dispid (categories, "Add");
+  if (dispid == DISPID_UNKNOWN)
+  {
+    log_error ("%s:%s: could not find Add DISPID",
+               SRCNAME, __func__);
+    return -1;
+  }
+
+  /* Do the string dance */
+  w_name = utf8_to_wchar (category);
+  b_name = SysAllocString (w_name);
+  xfree (w_name);
+
+  /* Variants are in reverse order
+     ShortcutKey -> 0 / Int
+     Color -> 1 / Int
+     Name -> 2 / Bstr */
+  VariantInit (&cVariant[2]);
+  cVariant[2].vt = VT_BSTR;
+  cVariant[2].bstrVal = b_name;
+
+  VariantInit (&cVariant[1]);
+  cVariant[1].vt = VT_INT;
+  cVariant[1].intVal = color;
+
+  VariantInit (&cVariant[0]);
+  cVariant[0].vt = VT_INT;
+  cVariant[0].intVal = 0;
+
+  dispparams.cArgs = 3;
+  dispparams.cNamedArgs = 0;
+  dispparams.rgvarg = cVariant;
+
+  hr = categories->Invoke (dispid, IID_NULL, LOCALE_SYSTEM_DEFAULT,
+                           DISPATCH_METHOD, &dispparams,
+                           &rVariant, &execpinfo, &argErr);
+  SysFreeString (b_name);
+  VariantClear (&cVariant[0]);
+  VariantClear (&cVariant[1]);
+  VariantClear (&cVariant[2]);
+  if (hr != S_OK)
+    {
+      log_debug ("%s:%s: error: invoking Add p=%p vt=%d"
+                 " hr=0x%x argErr=0x%x",
+                 SRCNAME, __func__,
+                 rVariant.pdispVal, rVariant.vt, (unsigned int)hr,
+                 (unsigned int)argErr);
+      dump_excepinfo (execpinfo);
+      VariantClear (&rVariant);
+      return -1;
+    }
+  VariantClear (&rVariant);
+  log_debug ("%s:%s: Created category '%s'",
+             SRCNAME, __func__, category);
+  return 0;
+}
+
+void
+ensure_category_exists (LPDISPATCH application, const char *category, int color)
+{
+  if (!application || !category)
+    {
+      TRACEPOINT;
+      return;
+    }
+
+  log_debug ("Ensure category exists called for %s, %i", category, color);
+
+  LPDISPATCH stores = get_oom_object (application, "Session.Stores");
+  if (!stores)
+    {
+      log_error ("%s:%s: No stores found.",
+                 SRCNAME, __func__);
+      return;
+    }
+  auto store_count = get_oom_int (stores, "Count");
+
+  for (int n = 1; n <= store_count; n++)
+    {
+      const auto store_str = std::string("Item(") + std::to_string(n) + ")";
+      LPDISPATCH store = get_oom_object (stores, store_str.c_str());
+
+      if (!store)
+        {
+          TRACEPOINT;
+          continue;
+        }
+
+      LPDISPATCH categories = get_oom_object (store, "Categories");
+      gpgol_release (store);
+      if (!categories)
+        {
+          TRACEPOINT;
+          continue;
+        }
+
+      auto count = get_oom_int (categories, "Count");
+      bool found = false;
+      for (int i = 1; i <= count && !found; i++)
+        {
+          const auto item_str = std::string("Item(") + std::to_string(i) + ")";
+          LPDISPATCH category_obj = get_oom_object (categories, item_str.c_str());
+          if (!category_obj)
+            {
+              TRACEPOINT;
+              break;
+            }
+          char *name = get_oom_string (category_obj, "Name");
+          if (name && !strcmp (category, name))
+            {
+              log_debug ("%s:%s: Found category '%s'",
+                         SRCNAME, __func__, name);
+              found = true;
+            }
+          /* We don't check the color here as the user may change that. */
+          gpgol_release (category_obj);
+          xfree (name);
+        }
+
+      if (!found)
+        {
+          if (create_category (categories, category, color))
+            {
+              log_debug ("%s:%s: Found category '%s'",
+                         SRCNAME, __func__, category);
+            }
+        }
+      /* Otherwise we have to create the category */
+      gpgol_release (categories);
+    }
+  gpgol_release (stores);
+}
+
+int
+add_category (LPDISPATCH mail, const char *category)
+{
+  char *tmp = get_oom_string (mail, "Categories");
+  if (!tmp)
+    {
+      TRACEPOINT;
+      return 1;
+    }
+
+  if (strstr (tmp, category))
+    {
+      log_debug ("%s:%s: category '%s' already added.",
+                 SRCNAME, __func__, category);
+      return 0;
+    }
+
+  std::string newstr (tmp);
+  xfree (tmp);
+  if (!newstr.empty ())
+    {
+      newstr += ", ";
+    }
+  newstr += category;
+
+  return put_oom_string (mail, "Categories", newstr.c_str ());
+}
+
+int
+remove_category (LPDISPATCH mail, const char *category)
+{
+  char *tmp = get_oom_string (mail, "Categories");
+  if (!tmp)
+    {
+      TRACEPOINT;
+      return 1;
+    }
+  std::string newstr (tmp);
+  xfree (tmp);
+  std::string cat (category);
+
+  size_t pos1 = newstr.find (cat);
+  size_t pos2 = newstr.find (std::string(", ") + cat);
+  if (pos1 == std::string::npos && pos2 == std::string::npos)
+    {
+      log_debug ("%s:%s: category '%s' not found.",
+                 SRCNAME, __func__, category);
+      return 0;
+    }
+
+  size_t len = cat.size();
+  if (pos2)
+    {
+      len += 2;
+    }
+  newstr.erase (pos2 != std::string::npos ? pos2 : pos1, len);
+  log_debug ("%s:%s: removing category '%s'",
+             SRCNAME, __func__, category);
+
+  return put_oom_string (mail, "Categories", newstr.c_str ());
+}
diff --git a/src/oomhelp.h b/src/oomhelp.h
index 0859d17..65a489f 100644
--- a/src/oomhelp.h
+++ b/src/oomhelp.h
@@ -233,6 +233,24 @@ invoke_oom_method (LPDISPATCH pDisp, const char *name, VARIANT *rVariant);
 LPMAPISESSION
 get_oom_mapi_session (void);
 
+/* Ensure a category of the name name exists in
+  the session for the Mail mail.
+
+  Creates the category with the specified color if required.
+
+  returns 0 on success. */
+void
+ensure_category_exists (LPDISPATCH mail, const char *category, int color);
+
+/* Add a category to a mail if it is not already added. */
+int
+add_category (LPDISPATCH mail, const char *category);
+
+/* Remove a category from a mail if it was added. */
+int
+remove_category (LPDISPATCH mail, const char *category);
+
+
 #ifdef __cplusplus
 }
 #endif

commit ce29969cced4f9bd78061c27ed3b97e66ba9dc60
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Oct 11 13:19:33 2016 +0200

    Define _FILE_OFFSET_BITS for gpgme data compat
    
    * src/Makefile.am (AM_CXXFLAGS): Add file offset bits.

diff --git a/src/Makefile.am b/src/Makefile.am
index 96207d8..8613260 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,7 +34,7 @@ EXEEXT = .dll
 
 AM_CFLAGS = $(GPGME_CFLAGS) $(LIBASSUAN_CFLAGS) -shared
 AM_CXXFLAGS = $(GPGME_CFLAGS) $(LIBASSUAN_CFLAGS) -shared -std=c++11
-AM_CXXFLAGS += $(GPGMEPP_CXXFLAGS)
+AM_CXXFLAGS += $(GPGMEPP_CXXFLAGS) -D_FILE_OFFSET_BITS=64
 
 gpgol_SOURCES = \
 	main.c  gpgol.def           \

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

Summary of changes:
 src/Makefile.am         |   2 +-
 src/gpgoladdin.cpp      |   6 ++
 src/mail.cpp            | 132 ++++++++++++++++++++++++++++-
 src/mail.h              |   1 +
 src/oomhelp.cpp         | 217 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/oomhelp.h           |  18 ++++
 src/parsecontroller.cpp |   8 ++
 src/windowmessages.cpp  |   1 +
 8 files changed, 381 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org



From cvs at cvs.gnupg.org  Tue Oct 11 19:58:27 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Tue, 11 Oct 2016 19:58:27 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.7.0-43-g5f64018
Message-ID: <E1bu1Jt-0004dN-6p@lists.gnupg.org>

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 "GnuPG Made Easy".

The branch, master has been updated
       via  5f64018af89e07dd0494775d6dfc82564536d6e0 (commit)
       via  e5a35af5573651b96a90ef4a537b040333595472 (commit)
       via  ce7385caabb57e5435695cc912acffe2815770b7 (commit)
      from  54f94b14e2bb9b38ffd89f509406bfbd012da632 (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 5f64018af89e07dd0494775d6dfc82564536d6e0
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Oct 11 19:57:35 2016 +0200

    Mention Qt API fixes in news
    
    --

diff --git a/NEWS b/NEWS
index 72f6f77..ebe2dd9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
 Noteworthy changes in version 1.7.1 (unreleased) [C26/A15/R_]
 ------------------------------------------------
 
+ * qt: Missed API from the Qt Binding inclusion has
+   been added again.
+
+ * qt: abstractimportjob.h is now installed to that
+   ImportJobs can be used again.
 
  * Interface changes relative to the 1.7.0 release:
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -10,6 +15,8 @@ Noteworthy changes in version 1.7.1 (unreleased) [C26/A15/R_]
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  WksPublishJob::startReceive     NEW.
  WksPublishJob::startRecieve     REMOVED.
+ MultiDeleteJob                  NEW.
+ AbstractImportJob               NEW.
 
  * cpp Interface changes relative to the 1.7.0 release:
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

commit e5a35af5573651b96a90ef4a537b040333595472
Author: Daniel Vr?til <dvratil at kde.org>
Date:   Tue Oct 11 19:32:54 2016 +0200

    qt: Add missing implementation of MultiDeleteJob
    
    * lang/qt/src/multideletejob.h: Fix include, cryptobackend.h is now
    called protocol.h
    * lang/qt/src/multideletejob.cpp: New file.
    * lang/qt/src/Makefile.am: Add multideletejob.cpp.

diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am
index df93a1d..e09e0d9 100644
--- a/lang/qt/src/Makefile.am
+++ b/lang/qt/src/Makefile.am
@@ -22,7 +22,7 @@ EXTRA_DIST = QGpgmeConfig.cmake.in.in QGpgmeConfigVersion.cmake.in \
              gpgme_backend_debug.h qgpgme_version.h.in
 
 qgpgme_sources = \
-    dataprovider.cpp job.cpp qgpgmeadduseridjob.cpp \
+    dataprovider.cpp job.cpp multideletejob.cpp qgpgmeadduseridjob.cpp \
     qgpgmebackend.cpp qgpgmechangeexpiryjob.cpp qgpgmechangeownertrustjob.cpp \
     qgpgmechangepasswdjob.cpp qgpgmedecryptjob.cpp \
     qgpgmedecryptverifyjob.cpp qgpgmedeletejob.cpp qgpgmedownloadjob.cpp \
@@ -76,6 +76,7 @@ qgpgme_headers= \
 
 camelcase_headers= \
     AddUserIDJob \
+    AbstractImportJob \
     ChangeExpiryJob \
     ChangeOwnerTrustJob \
     ChangePasswdJob \
diff --git a/lang/qt/src/multideletejob.cpp b/lang/qt/src/multideletejob.cpp
new file mode 100644
index 0000000..67f2a78
--- /dev/null
+++ b/lang/qt/src/multideletejob.cpp
@@ -0,0 +1,117 @@
+/*
+    multideletejob.cpp
+
+    This file is part of qgpgme, the Qt API binding for gpgme
+    Copyright (c) 2004 Klar?lvdalens Datakonsult AB
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+
+#ifdef HAVE_CONFIG_H
+ #include "config.h"
+#endif
+
+#include "multideletejob.h"
+#include "protocol.h"
+#include "deletejob.h"
+
+#include <key.h>
+#include <context.h>
+#include <data.h>
+
+#include <iterator>
+
+#include <assert.h>
+
+QGpgME::MultiDeleteJob::MultiDeleteJob(const Protocol *protocol)
+    : Job(0),
+      mProtocol(protocol),
+      mJob(0)
+{
+    assert(protocol);
+}
+
+QGpgME::MultiDeleteJob::~MultiDeleteJob()
+{
+
+}
+
+GpgME::Error QGpgME::MultiDeleteJob::start(const std::vector<GpgME::Key> &keys, bool allowSecretKeyDeletion)
+{
+    mKeys = keys;
+    mAllowSecretKeyDeletion = allowSecretKeyDeletion;
+    mIt = mKeys.begin();
+
+    const GpgME::Error err = startAJob();
+
+    if (err) {
+        deleteLater();
+    }
+    return err;
+}
+
+void QGpgME::MultiDeleteJob::slotCancel()
+{
+    if (mJob) {
+        mJob->slotCancel();
+    }
+    mIt = mKeys.end();
+}
+
+void QGpgME::MultiDeleteJob::slotResult(const GpgME::Error &err)
+{
+    mJob = 0;
+    GpgME::Error error = err;
+    if (error ||  // error in last op
+            mIt == mKeys.end() || // (shouldn't happen)
+            ++mIt == mKeys.end() || // was the last key
+            (error = startAJob())) {  // error starting the job for the new key
+        Q_EMIT done();
+        Q_EMIT result(error, error && mIt != mKeys.end() ? *mIt : GpgME::Key::null);
+        deleteLater();
+        return;
+    }
+
+    const int current = mIt - mKeys.begin();
+    const int total = mKeys.size();
+    Q_EMIT progress(QStringLiteral("%1/%2").arg(current).arg(total), current, total);
+}
+
+GpgME::Error QGpgME::MultiDeleteJob::startAJob()
+{
+    if (mIt == mKeys.end()) {
+        return GpgME::Error(0);
+    }
+    mJob = mProtocol->deleteJob();
+    assert(mJob);   // FIXME: we need a way to generate errors ourselves,
+    // but I don't like the dependency on gpg-error :/
+
+    connect(mJob.data(), &DeleteJob::result, this, &MultiDeleteJob::slotResult);
+
+    return mJob->start(*mIt, mAllowSecretKeyDeletion);
+}
+
+#include "multideletejob.moc"
diff --git a/lang/qt/src/multideletejob.h b/lang/qt/src/multideletejob.h
index 8915cd1..8e9eb14 100644
--- a/lang/qt/src/multideletejob.h
+++ b/lang/qt/src/multideletejob.h
@@ -36,7 +36,7 @@
 
 #include "qgpgme_export.h"
 #include "job.h"
-#include "cryptobackend.h"
+#include "protocol.h"
 
 #include <QPointer>
 

commit ce7385caabb57e5435695cc912acffe2815770b7
Author: Daniel Vr?til <dvratil at kde.org>
Date:   Tue Oct 11 19:32:08 2016 +0200

    qt: Install abstractimportjob.h
    
    * lang/cpp/src/Makefile.am: Install abstractimportjob.h since it's
    included from importjob.h
    
    --
    Fixes build when someone inclues importjob.h in their code.

diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am
index 96b77b4..df93a1d 100644
--- a/lang/qt/src/Makefile.am
+++ b/lang/qt/src/Makefile.am
@@ -39,6 +39,7 @@ qgpgme_sources = \
 
 # If you add one here make sure that you also add one in camelcase
 qgpgme_headers= \
+    abstractimportjob.h \
     adduseridjob.h \
     changeexpiryjob.h \
     changeownertrustjob.h \
@@ -109,7 +110,6 @@ camelcase_headers= \
 
 private_qgpgme_headers = \
     qgpgme_export.h \
-    abstractimportjob.h \
     protocol_p.h \
     qgpgmeadduseridjob.h \
     qgpgmebackend.h \

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

Summary of changes:
 NEWS                           |   7 +++
 lang/qt/src/Makefile.am        |   5 +-
 lang/qt/src/multideletejob.cpp | 117 +++++++++++++++++++++++++++++++++++++++++
 lang/qt/src/multideletejob.h   |   2 +-
 4 files changed, 128 insertions(+), 3 deletions(-)
 create mode 100644 lang/qt/src/multideletejob.cpp


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org



From cvs at cvs.gnupg.org  Wed Oct 12 10:40:06 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Wed, 12 Oct 2016 10:40:06 +0200
Subject: [git] GpgOL - branch, nomapi, updated. gpgol-1.4.0-79-gfb3c90c
Message-ID: <E1buF57-0004QV-2A@lists.gnupg.org>

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 "GnuPG extension for MS Outlook".

The branch, nomapi has been updated
       via  fb3c90c8852edf41ac97ef3e821228dc4a54bafe (commit)
       via  4d3b317569e3637692f7f925064cccf31d6671f9 (commit)
      from  b4708d27c6a03dbcfb9eb5a29be15fff159be662 (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 fb3c90c8852edf41ac97ef3e821228dc4a54bafe
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 12 10:37:47 2016 +0200

    tests: Add two more multipart-signed tests
    
    * tests/data/openpgp-signed-no-attach-gpgol.mbox,
    tests/data/openpgp-signed-no-attach-gpgol.plain,
    tests/data/openpgp-signed-two-attachments.mbox,
    tests/data/openpgp-signed-two-attachments.plain: New.
    * tests/t-parser.cpp: Use them.
    
    --
    The attachment test includes inline attachments.
    The gpgol test adds a message like it is seen by gpgol
    (Without headers)

diff --git a/tests/data/openpgp-signed-no-attach-gpgol.mbox b/tests/data/openpgp-signed-no-attach-gpgol.mbox
new file mode 100644
index 0000000..8e022f0
--- /dev/null
+++ b/tests/data/openpgp-signed-no-attach-gpgol.mbox
@@ -0,0 +1,32 @@
+MIME-Version: 1.0
+Content-Type: multipart/signed; boundary="nextPart1693035.rOZRFYHO8F"; micalg="pgp-sha256"; protocol="application/pgp-signature"
+
+--nextPart1693035.rOZRFYHO8F
+Content-Transfer-Encoding: quoted-printable
+Content-Type: text/plain; charset="iso-8859-1"
+
+Hallo Welt!
+=2D-=20
+Andre Heinecke |  ++49-541-335083-262  | http://www.intevation.de/
+Intevation GmbH, Neuer Graben 17, 49074 Osnabr=FCck | AG Osnabr=FCck, H=
+R B 18998
+Gesch=E4ftsf=FChrer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wa=
+gner
+--nextPart1693035.rOZRFYHO8F
+Content-Type: application/pgp-signature; name="signature.asc"
+Content-Description: This is a digitally signed message part.
+Content-Transfer-Encoding: 7Bit
+
+-----BEGIN PGP SIGNATURE-----
+
+iQEcBAABCAAGBQJX49NGAAoJEI2YYMWPJG3mYDsH/3DuwYTTYSxYdk3WecCn2TPx
+UzzUB332tVE5SLzZcvH426jFwQ2qt7/f8kWjmr5+GCOenM6Nzz1FbC4K3ARuF4c3
+fZDlFegpsRg735uV8vjEEwQVkipyYMHeUJJ6d5O4FxF8q0dfkjNM53EC3cLiuKF7
+P4AjRZBycPyMf7XBaaU0zfMQkC+UkiBXMrcITQoPSSgbadlxLEc4oJIdD8zZDFVx
+q2I8RFoKzVpHMn/OjBfXi94JVz7wCTa4wGG/emxoamRvqMp2S5SWPNps79/Trvzv
+64F+3UalXGBfDybyUYgGb0wLtXnbFux03GJoY20NMjsMRBBKYfqMQbh0m8VZSI4=
+=UY6M
+-----END PGP SIGNATURE-----
+
+--nextPart1693035.rOZRFYHO8F--
+
diff --git a/tests/data/openpgp-signed-no-attach-gpgol.plain b/tests/data/openpgp-signed-no-attach-gpgol.plain
new file mode 100644
index 0000000..aba8dba
--- /dev/null
+++ b/tests/data/openpgp-signed-no-attach-gpgol.plain
@@ -0,0 +1,5 @@
+Hallo Welt!
+-- 
+Andre Heinecke |  ++49-541-335083-262  | http://www.intevation.de/
+Intevation GmbH, Neuer Graben 17, 49074 Osnabr?ck | AG Osnabr?ck, HR B 18998
+Gesch?ftsf?hrer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner
\ No newline at end of file
diff --git a/tests/data/openpgp-signed-two-attachments.mbox b/tests/data/openpgp-signed-two-attachments.mbox
new file mode 100644
index 0000000..462f62a
--- /dev/null
+++ b/tests/data/openpgp-signed-two-attachments.mbox
@@ -0,0 +1,54 @@
+From: firstname.lastname at example.com
+To: test at kolab.org
+Subject: OpenPGP signed with 2 text attachments
+Date: Sun, 30 Aug 2015 12:02:56 +0200
+Message-ID: <2033829.IGepAdxqt9 at vkpc5>
+X-KMail-Identity: 402312391
+X-KMail-Dictionary: en_US
+User-Agent: KMail/5.0.42 pre (Linux/3.16.6-2-desktop; KDE/5.14.0; x86_64; ; )
+MIME-Version: 1.0
+Content-Type: multipart/signed; boundary="nextPart3682207.KLrp2sxpbf"; micalg="pgp-sha1"; protocol="application/pgp-signature"
+
+--nextPart3682207.KLrp2sxpbf
+Content-Type: multipart/mixed; boundary="nextPart2397422.QDHKUNdbyg"
+Content-Transfer-Encoding: 7Bit
+
+This is a multi-part message in MIME format.
+
+--nextPart2397422.QDHKUNdbyg
+Content-Transfer-Encoding: 7Bit
+Content-Type: text/plain; charset="us-ascii"
+
+this is the main body text
+--nextPart2397422.QDHKUNdbyg
+Content-Disposition: inline; filename="attachment1.txt"
+Content-Transfer-Encoding: 7Bit
+Content-Type: text/plain; charset="utf-8"; name="attachment1.txt"
+
+this is attachment one
+--nextPart2397422.QDHKUNdbyg
+Content-Disposition: inline; filename="attachment2.txt"
+Content-Transfer-Encoding: 7Bit
+Content-Type: text/plain; charset="utf-8"; name="attachment2.txt"
+
+this is attachment two
+--nextPart2397422.QDHKUNdbyg--
+
+--nextPart3682207.KLrp2sxpbf
+Content-Type: application/pgp-signature; name="signature.asc"
+Content-Description: This is a digitally signed message part.
+Content-Transfer-Encoding: 7Bit
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEVAwUAVeLU0I2YYMWPJG3mAQL/fgf+LXmO7bKafdd4g5OOVHHyXRprVmX/6hBq
+mZoor29KLIHkvAH9OJi4qBy/ZKwqqKLfttLzHb2UaAfl5kn4f0ckmnwUhU7u32Sm
+JZ0Q50SxrRVFRyvTvPG22ho9IwQUO1YSZrL4wO9v8ZBQ3vkfpmAiUQVxPQMINc8L
+i68xQEm4y1Dtoc+DTUkoIMeOOPnEl6PTMPrwn906K0r30hI4788fEGRn6uOXb+vD
+G/ISlXu+JHIxxf/J5/jVjKNbra+trrfSPzB3piJIjBLEPO5FvLx8SgQFJcJHt/kw
+ps8D5YULj/MVMLlsPtXDdZmbOi/G9pN0tr05MKcXsO5Ywe7n2BhASw==
+=2Nzb
+-----END PGP SIGNATURE-----
+
+--nextPart3682207.KLrp2sxpbf--
diff --git a/tests/data/openpgp-signed-two-attachments.plain b/tests/data/openpgp-signed-two-attachments.plain
new file mode 100644
index 0000000..6c3403f
--- /dev/null
+++ b/tests/data/openpgp-signed-two-attachments.plain
@@ -0,0 +1 @@
+this is the main body text
diff --git a/tests/t-parser.cpp b/tests/t-parser.cpp
index bc68c5e..0c06636 100644
--- a/tests/t-parser.cpp
+++ b/tests/t-parser.cpp
@@ -50,6 +50,18 @@ struct
     NULL,
     0,
     "iso-8859-1"},
+  { DATADIR "/openpgp-signed-no-attach-gpgol.mbox",
+    MSGTYPE_GPGOL_MULTIPART_SIGNED,
+    DATADIR "/openpgp-signed-no-attach-gpgol.plain",
+    NULL,
+    0,
+    "iso-8859-1"},
+  { DATADIR "/openpgp-signed-two-attachments.mbox",
+    MSGTYPE_GPGOL_MULTIPART_SIGNED,
+    DATADIR "/openpgp-signed-two-attachments.plain",
+    NULL,
+    2,
+    "us-ascii"},
   { DATADIR "/openpgp-encrypted+signed.mbox",
     MSGTYPE_GPGOL_MULTIPART_ENCRYPTED,
     DATADIR "/openpgp-encrypted+signed.plain",

commit 4d3b317569e3637692f7f925064cccf31d6671f9
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 12 10:35:50 2016 +0200

    Change behavior of inline attachments
    
    * src/mimedataprovider.cpp (t2body): Treat inline attachments
    as attachments.
    
    --
    The old parser added inline attachments to the body. Outlook
    by default shows inline attachments just as attachments. I also
    think this is better then just adding them in the body.

diff --git a/src/mimedataprovider.cpp b/src/mimedataprovider.cpp
index a4aea43..e5dbe8f 100644
--- a/src/mimedataprovider.cpp
+++ b/src/mimedataprovider.cpp
@@ -158,7 +158,11 @@ is_cms_signed_data (const char *buffer, size_t length)
 /* Process the transition to body event.
 
    This means we have received the empty line indicating the body and
-   should now check the headers to see what to do about this part.  */
+   should now check the headers to see what to do about this part.
+
+   This is mostly a C style function because it was based on the old
+   c mimeparser.
+*/
 static int
 t2body (MimeDataProvider *provider, rfc822parse_t msg)
 {
@@ -169,7 +173,7 @@ t2body (MimeDataProvider *provider, rfc822parse_t msg)
   size_t off;
   char *p;
   int is_text = 0;
-  int not_inline_text = 0;
+  int is_text_attachment = 0;
   char *filename = NULL;
   char *charset = NULL;
 
@@ -197,8 +201,21 @@ t2body (MimeDataProvider *provider, rfc822parse_t msg)
       if (s)
         filename = rfc2047_parse (s);
       s = rfc822parse_query_parameter (field, NULL, 1);
-      if (s && strcmp (s, "inline"))
-        not_inline_text = 1;
+
+      /* This is a bit of a taste matter how to treat inline
+         attachments. Outlook does not show them inline so we
+         should not put it in the body either as we have
+         no way to show that it was actually an attachment.
+         For something like an inline patch it is better
+         to add it as an attachment instead of just putting
+         it in the body.
+
+         The handling in the old parser was:
+
+         if (s && strcmp (s, "inline"))
+           not_inline_text = 1;
+       */
+      is_text_attachment = 1;
       rfc822parse_release_field (field);
     }
 
@@ -325,16 +342,16 @@ t2body (MimeDataProvider *provider, rfc822parse_t msg)
   ctx->in_data = 1;
 
   log_mime_parser ("%s:%s: this body: nesting=%d partno=%d is_text=%d"
-                   " charset=\"%s\"\n body_seen=%d not_inline_text=%d",
+                   " charset=\"%s\"\n body_seen=%d is_text_attachment=%d",
                    SRCNAME, __func__,
                    ctx->nesting_level, ctx->part_counter, is_text,
                    ctx->mimestruct_cur->charset?ctx->mimestruct_cur->charset:"",
-                   ctx->body_seen, not_inline_text);
+                   ctx->body_seen, is_text_attachment);
 
   /* If this is a text part, decide whether we treat it as one
      of our bodies.
      */
-  if ((is_text && !not_inline_text))
+  if ((is_text && !is_text_attachment))
     {
       if (is_text == 2)
         {

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

Summary of changes:
 src/mimedataprovider.cpp                           | 31 ++++++++++---
 ...ch.mbox => openpgp-signed-no-attach-gpgol.mbox} |  9 ----
 ....plain => openpgp-signed-no-attach-gpgol.plain} |  0
 tests/data/openpgp-signed-two-attachments.mbox     | 54 ++++++++++++++++++++++
 tests/data/openpgp-signed-two-attachments.plain    |  1 +
 tests/t-parser.cpp                                 | 12 +++++
 6 files changed, 91 insertions(+), 16 deletions(-)
 copy tests/data/{openpgp-signed-no-attach.mbox => openpgp-signed-no-attach-gpgol.mbox} (75%)
 copy tests/data/{openpgp-signed-no-attach.plain => openpgp-signed-no-attach-gpgol.plain} (100%)
 create mode 100644 tests/data/openpgp-signed-two-attachments.mbox
 create mode 100644 tests/data/openpgp-signed-two-attachments.plain


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org



From cvs at cvs.gnupg.org  Wed Oct 12 21:17:23 2016
From: cvs at cvs.gnupg.org (by Jussi Kivilinna)
Date: Wed, 12 Oct 2016 21:17:23 +0200
Subject: [git] GCRYPT - branch, master, updated. libgcrypt-1.7.3-10-gbfd732f
Message-ID: <E1buP1p-0003ME-Rb@lists.gnupg.org>

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 crypto library".

The branch, master has been updated
       via  bfd732f53a9b5dfe14217a68a0fa289bf6913ec0 (commit)
       via  27747921cb1dfced83c5666cd1c474764724c52b (commit)
      from  5418d9ca4c0e087fd6872ad350a996fe74880d86 (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 bfd732f53a9b5dfe14217a68a0fa289bf6913ec0
Author: Jussi Kivilinna <jussi.kivilinna at iki.fi>
Date:   Sun Oct 9 12:53:48 2016 +0300

    GCM: Add bulk processing for ARMv8/AArch64 implementation
    
    * cipher/cipher-gcm-armv8-aarch64-ce.S: Add 6 blocks bulk processing.
    --
    
    Benchmark on Cortex-A53 (1152 Mhz):
    
    Before:
                        |  nanosecs/byte   mebibytes/sec   cycles/byte
     GMAC_AES           |      1.30 ns/B     731.6 MiB/s      1.50 c/B
    
    After (1.49x faster):
                        |  nanosecs/byte   mebibytes/sec   cycles/byte
     GMAC_AES           |     0.873 ns/B    1092.1 MiB/s      1.01 c/B
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>

diff --git a/cipher/cipher-gcm-armv8-aarch64-ce.S b/cipher/cipher-gcm-armv8-aarch64-ce.S
index 51d67b7..4830b61 100644
--- a/cipher/cipher-gcm-armv8-aarch64-ce.S
+++ b/cipher/cipher-gcm-armv8-aarch64-ce.S
@@ -43,14 +43,37 @@ gcry_gcm_reduction_constant:
 /* Register macros */
 
 #define rhash   v0
-#define rbuf    v1
-#define rh0     v2
-#define rr0     v3
-#define rr1     v4
-#define rrconst v5
-#define vT0     v16
-#define vT1     v17
-#define vZZ     v18
+#define rr0     v1
+#define rr1     v2
+#define rbuf    v3
+#define rbuf1   v4
+#define rbuf2   v5
+#define rbuf3   v6
+#define rbuf4   v7
+#define rbuf5   v8
+#define rr2     v9
+#define rr3     v10
+#define rr4     v11
+#define rr5     v12
+#define rr6     v13
+#define rr7     v14
+#define rr8     v15
+#define rr9     v16
+
+#define rrconst v18
+#define rh1     v19
+#define rh2     v20
+#define rh3     v21
+#define rh4     v22
+#define rh5     v23
+#define rh6     v24
+#define t0      v25
+#define t1      v26
+#define t2      v27
+#define t3      v28
+#define t4      v29
+#define t5      v30
+#define vZZ     v31
 
 /* GHASH macros */
 
@@ -59,38 +82,90 @@ gcry_gcm_reduction_constant:
  */
 
 /* Input: 'a' and 'b', Output: 'r0:r1' (low 128-bits in r0, high in r1) */
-#define PMUL_128x128(r0, r1, a, b, interleave_op) \
-	ext vT0.16b, b.16b, b.16b, #8; \
+#define PMUL_128x128(r0, r1, a, b, T0, T1, interleave_op) \
+	ext T0.16b, b.16b, b.16b, #8; \
 	pmull r0.1q, a.1d, b.1d; \
 	pmull2 r1.1q, a.2d, b.2d; \
-	pmull vT1.1q, a.1d, vT0.1d; \
-	pmull2 vT0.1q, a.2d, vT0.2d; \
-	interleave_op(); \
-	eor vT0.16b, vT0.16b, vT1.16b; \
-	ext vT1.16b, vZZ.16b, vT0.16b, #8; \
-	ext vT0.16b, vT0.16b, vZZ.16b, #8; \
-	eor r0.16b, r0.16b, vT1.16b; \
-	eor r1.16b, r1.16b, vT0.16b;
+	pmull T1.1q, a.1d, T0.1d; \
+	pmull2 T0.1q, a.2d, T0.2d; \
+	interleave_op; \
+	eor T0.16b, T0.16b, T1.16b; \
+	ext T1.16b, vZZ.16b, T0.16b, #8; \
+	ext T0.16b, T0.16b, vZZ.16b, #8; \
+	eor r0.16b, r0.16b, T1.16b; \
+	eor r1.16b, r1.16b, T0.16b;
+
+/* Input: 'aA' and 'bA', Output: 'r0A:r1A' (low 128-bits in r0A, high in r1A)
+ * Input: 'aB' and 'bB', Output: 'r0B:r1B' (low 128-bits in r0B, high in r1B)
+ * Input: 'aC' and 'bC', Output: 'r0C:r1C' (low 128-bits in r0C, high in r1C)
+ */
+#define PMUL_128x128_3(r0A, r1A, aA, bA, t0A, t1A, \
+                       r0B, r1B, aB, bB, t0B, t1B, \
+                       r0C, r1C, aC, bC, t0C, t1C,  interleave_op) \
+        ext t0A.16b, bA.16b, bA.16b, #8; \
+        pmull r0A.1q, aA.1d, bA.1d; \
+        pmull2 r1A.1q, aA.2d, bA.2d; \
+          ext t0B.16b, bB.16b, bB.16b, #8; \
+          pmull r0B.1q, aB.1d, bB.1d; \
+          pmull2 r1B.1q, aB.2d, bB.2d; \
+            ext t0C.16b, bC.16b, bC.16b, #8; \
+            pmull r0C.1q, aC.1d, bC.1d; \
+            pmull2 r1C.1q, aC.2d, bC.2d; \
+        pmull t1A.1q, aA.1d, t0A.1d; \
+        pmull2 t0A.1q, aA.2d, t0A.2d; \
+          pmull t1B.1q, aB.1d, t0B.1d; \
+          pmull2 t0B.1q, aB.2d, t0B.2d; \
+            pmull t1C.1q, aC.1d, t0C.1d; \
+            pmull2 t0C.1q, aC.2d, t0C.2d; \
+        eor t0A.16b, t0A.16b, t1A.16b; \
+          eor t0B.16b, t0B.16b, t1B.16b; \
+            eor t0C.16b, t0C.16b, t1C.16b; \
+              interleave_op; \
+        ext t1A.16b, vZZ.16b, t0A.16b, #8; \
+        ext t0A.16b, t0A.16b, vZZ.16b, #8; \
+          ext t1B.16b, vZZ.16b, t0B.16b, #8; \
+          ext t0B.16b, t0B.16b, vZZ.16b, #8; \
+            ext t1C.16b, vZZ.16b, t0C.16b, #8; \
+            ext t0C.16b, t0C.16b, vZZ.16b, #8; \
+        eor r0A.16b, r0A.16b, t1A.16b; \
+        eor r1A.16b, r1A.16b, t0A.16b; \
+          eor r0B.16b, r0B.16b, t1B.16b; \
+          eor r1B.16b, r1B.16b, t0B.16b; \
+            eor r0C.16b, r0C.16b, t1C.16b; \
+            eor r1C.16b, r1C.16b, t0C.16b; \
 
 /* Input: 'r0:r1', Output: 'a' */
-#define REDUCTION(a, r0, r1, rconst, interleave_op) \
-        pmull2 vT0.1q, r1.2d, rconst.2d; \
-        interleave_op(); \
-        ext vT1.16b, vT0.16b, vZZ.16b, #8; \
-        ext vT0.16b, vZZ.16b, vT0.16b, #8; \
-        eor r1.16b, r1.16b, vT1.16b; \
-        eor r0.16b, r0.16b, vT0.16b; \
-        pmull vT0.1q, r1.1d, rconst.1d; \
-        eor a.16b, r0.16b, vT0.16b;
-
-#define _(...) /*_*/
-#define ld1_rbuf()  ld1 {rbuf.16b}, [x2], #16;
-#define rbit_rbuf() rbit rbuf.16b, rbuf.16b;
+#define REDUCTION(a, r0, r1, rconst, T0, T1, interleave_op1, interleave_op2, \
+                  interleave_op3) \
+        pmull2 T0.1q, r1.2d, rconst.2d; \
+        interleave_op1; \
+        ext T1.16b, T0.16b, vZZ.16b, #8; \
+        ext T0.16b, vZZ.16b, T0.16b, #8; \
+        interleave_op2; \
+        eor r1.16b, r1.16b, T1.16b; \
+        eor r0.16b, r0.16b, T0.16b; \
+        pmull T0.1q, r1.1d, rconst.1d; \
+        interleave_op3; \
+        eor a.16b, r0.16b, T0.16b;
 
 /* Other functional macros */
 
+#define _(...) __VA_ARGS__
+#define __ _()
+
 #define CLEAR_REG(reg) eor reg.16b, reg.16b, reg.16b;
 
+#define VPUSH_ABI \
+        stp d8, d9, [sp, #-16]!; \
+        stp d10, d11, [sp, #-16]!; \
+        stp d12, d13, [sp, #-16]!; \
+        stp d14, d15, [sp, #-16]!;
+
+#define VPOP_ABI \
+        ldp d14, d15, [sp], #16; \
+        ldp d12, d13, [sp], #16; \
+        ldp d10, d11, [sp], #16; \
+        ldp d8, d9, [sp], #16;
 
 /*
  * unsigned int _gcry_ghash_armv8_ce_pmull (void *gcm_key, byte *result,
@@ -112,16 +187,145 @@ _gcry_ghash_armv8_ce_pmull:
 
   GET_DATA_POINTER(x5, .Lrconst)
 
-  sub x3, x3, #1
-
   eor vZZ.16b, vZZ.16b, vZZ.16b
   ld1 {rhash.16b}, [x1]
-  ld1 {rh0.16b}, [x0]
+  ld1 {rh1.16b}, [x0]
 
   rbit rhash.16b, rhash.16b /* bit-swap */
   ld1r {rrconst.2d}, [x5]
 
+  cmp x3, #6
+  b.lo .Less_than_6
+
+  add x6, x4, #64
+  VPUSH_ABI
+
+  ld1 {rh2.16b-rh5.16b}, [x4]
+  ld1 {rh6.16b}, [x6]
+
+  sub x3, x3, #6
+
+  ld1 {rbuf.16b-rbuf2.16b}, [x2], #(3*16)
+  ld1 {rbuf3.16b-rbuf5.16b}, [x2], #(3*16)
+
+  rbit rbuf.16b, rbuf.16b /* bit-swap */
+  rbit rbuf1.16b, rbuf1.16b /* bit-swap */
+  rbit rbuf2.16b, rbuf2.16b /* bit-swap */
+  rbit rbuf3.16b, rbuf3.16b /* bit-swap */
+  rbit rbuf4.16b, rbuf4.16b /* bit-swap */
+  rbit rbuf5.16b, rbuf5.16b /* bit-swap */
+  eor rhash.16b, rhash.16b, rbuf.16b
+
+  cmp x3, #6
+  b.lo .Lend_6
+
+.Loop_6:
+
+  /* (in1) * H? => rr0:rr1 */
+  /* (in2) * H? => rr2:rr3 */
+  /* (in0 ^ hash) * H? => rr4:rr5 */
+  PMUL_128x128_3(rr0, rr1, rbuf1, rh5, t0, t1,
+                 rr2, rr3, rbuf2, rh4, t2, t3,
+                 rr4, rr5, rhash, rh6, t4, t5,
+                 _(sub x3, x3, #6))
+
+  ld1 {rbuf.16b-rbuf2.16b}, [x2], #(3*16)
+  cmp x3, #6
+
+  eor rr0.16b, rr0.16b, rr2.16b
+  eor rr1.16b, rr1.16b, rr3.16b
+
+  /* (in3) * H? => rr2:rr3 */
+  /* (in4) * H? => rr6:rr7 */
+  /* (in5) * H? => rr8:rr9 */
+  PMUL_128x128_3(rr2, rr3, rbuf3, rh3, t0, t1,
+                 rr6, rr7, rbuf4, rh2, t2, t3,
+                 rr8, rr9, rbuf5, rh1, t4, t5,
+                 _(eor rr0.16b, rr0.16b, rr4.16b;
+                   eor rr1.16b, rr1.16b, rr5.16b))
+
+  eor rr0.16b, rr0.16b, rr2.16b
+  eor rr1.16b, rr1.16b, rr3.16b
+  rbit rbuf.16b, rbuf.16b
+  eor rr0.16b, rr0.16b, rr6.16b
+  eor rr1.16b, rr1.16b, rr7.16b
+  rbit rbuf1.16b, rbuf1.16b
+  eor rr0.16b, rr0.16b, rr8.16b
+  eor rr1.16b, rr1.16b, rr9.16b
+  ld1 {rbuf3.16b-rbuf5.16b}, [x2], #(3*16)
+
+  REDUCTION(rhash, rr0, rr1, rrconst, t0, t1,
+            _(rbit rbuf2.16b, rbuf2.16b),
+            _(rbit rbuf3.16b, rbuf3.16b),
+            _(rbit rbuf4.16b, rbuf4.16b))
+
+  rbit rbuf5.16b, rbuf5.16b
+  eor rhash.16b, rhash.16b, rbuf.16b
+
+  b.hs .Loop_6
+
+.Lend_6:
+
+  /* (in1) * H? => rr0:rr1 */
+  /* (in0 ^ hash) * H? => rr2:rr3 */
+  /* (in2) * H? => rr4:rr5 */
+  PMUL_128x128_3(rr0, rr1, rbuf1, rh5, t0, t1,
+                 rr2, rr3, rhash, rh6, t2, t3,
+                 rr4, rr5, rbuf2, rh4, t4, t5,
+                 __)
+  eor rr0.16b, rr0.16b, rr2.16b
+  eor rr1.16b, rr1.16b, rr3.16b
+  eor rr0.16b, rr0.16b, rr4.16b
+  eor rr1.16b, rr1.16b, rr5.16b
+
+  /* (in3) * H? => rhash:rbuf */
+  /* (in4) * H? => rr6:rr7 */
+  /* (in5) * H? => rr8:rr9 */
+  PMUL_128x128_3(rhash, rbuf, rbuf3, rh3, t0, t1,
+                 rr6, rr7, rbuf4, rh2, t2, t3,
+                 rr8, rr9, rbuf5, rh1, t4, t5,
+                 _(CLEAR_REG(rh4);
+                   CLEAR_REG(rh5);
+                   CLEAR_REG(rh6)))
+  eor rr0.16b, rr0.16b, rhash.16b
+  eor rr1.16b, rr1.16b, rbuf.16b
+  eor rr0.16b, rr0.16b, rr6.16b
+  eor rr1.16b, rr1.16b, rr7.16b
+  eor rr0.16b, rr0.16b, rr8.16b
+  eor rr1.16b, rr1.16b, rr9.16b
+
+  REDUCTION(rhash, rr0, rr1, rrconst, t0, t1,
+            _(CLEAR_REG(rh2);
+              CLEAR_REG(rh3);
+              CLEAR_REG(rr2);
+              CLEAR_REG(rbuf2);
+              CLEAR_REG(rbuf3)),
+            _(CLEAR_REG(rr3);
+              CLEAR_REG(rr4);
+              CLEAR_REG(rr5);
+              CLEAR_REG(rr6);
+              CLEAR_REG(rr7)),
+            _(CLEAR_REG(rr8);
+              CLEAR_REG(rr9);
+              CLEAR_REG(rbuf1);
+              CLEAR_REG(rbuf2)))
+
+  CLEAR_REG(rbuf4)
+  CLEAR_REG(rbuf5)
+  CLEAR_REG(t2)
+  CLEAR_REG(t3)
+  CLEAR_REG(t4)
+  CLEAR_REG(t5)
+
+  VPOP_ABI
+
+  cbz x3, .Ldone
+
+.Less_than_6:
+  /* Handle remaining blocks. */
+
   ld1 {rbuf.16b}, [x2], #16
+  sub x3, x3, #1
 
   rbit rbuf.16b, rbuf.16b /* bit-swap */
 
@@ -130,24 +334,25 @@ _gcry_ghash_armv8_ce_pmull:
   cbz x3, .Lend
 
 .Loop:
-  PMUL_128x128(rr0, rr1, rh0, rhash, ld1_rbuf)
-  sub x3, x3, #1
-  REDUCTION(rhash, rr0, rr1, rrconst, rbit_rbuf)
+  PMUL_128x128(rr0, rr1, rh1, rhash, t0, t1, _(ld1 {rbuf.16b}, [x2], #16))
+  REDUCTION(rhash, rr0, rr1, rrconst, t0, t1,
+            _(sub x3, x3, #1),
+            _(rbit rbuf.16b, rbuf.16b),
+            __)
   eor rhash.16b, rhash.16b, rbuf.16b
 
   cbnz x3, .Loop
 
 .Lend:
-  PMUL_128x128(rr0, rr1, rh0, rhash, _)
-  REDUCTION(rhash, rr0, rr1, rrconst, _)
+  PMUL_128x128(rr0, rr1, rh1, rhash, t0, t1, _(CLEAR_REG(rbuf)))
+  REDUCTION(rhash, rr0, rr1, rrconst, t0, t1, __, _(CLEAR_REG(rh1)), __)
 
+.Ldone:
   CLEAR_REG(rr1)
   CLEAR_REG(rr0)
   rbit rhash.16b, rhash.16b /* bit-swap */
-  CLEAR_REG(rbuf)
-  CLEAR_REG(vT0)
-  CLEAR_REG(vT1)
-  CLEAR_REG(rh0)
+  CLEAR_REG(t0)
+  CLEAR_REG(t1)
 
   st1 {rhash.2d}, [x1]
   CLEAR_REG(rhash)
@@ -170,9 +375,37 @@ _gcry_ghash_setup_armv8_ce_pmull:
    *	x1: gcm_table
    */
 
-  ld1 {vT0.16b}, [x0]
-  rbit vT0.16b, vT0.16b
-  st1 {vT0.16b}, [x0]
+  GET_DATA_POINTER(x2, .Lrconst)
+
+  /* H? */
+  ld1 {rh1.16b}, [x0]
+  rbit rh1.16b, rh1.16b
+  st1 {rh1.16b}, [x0]
+
+  ld1r {rrconst.2d}, [x2]
+
+  /* H? */
+  PMUL_128x128(rr0, rr1, rh1, rh1, t0, t1, __)
+  REDUCTION(rh2, rr0, rr1, rrconst, t0, t1, __, __, __)
+
+  /* H? */
+  PMUL_128x128(rr0, rr1, rh2, rh1, t0, t1, __)
+  REDUCTION(rh3, rr0, rr1, rrconst, t0, t1, __, __, __)
+
+  /* H? */
+  PMUL_128x128(rr0, rr1, rh2, rh2, t0, t1, __)
+  REDUCTION(rh4, rr0, rr1, rrconst, t0, t1, __, __, __)
+
+  /* H? */
+  PMUL_128x128(rr0, rr1, rh2, rh3, t0, t1, __)
+  REDUCTION(rh5, rr0, rr1, rrconst, t0, t1, __, __, __)
+
+  /* H? */
+  PMUL_128x128(rr0, rr1, rh3, rh3, t0, t1, __)
+  REDUCTION(rh6, rr0, rr1, rrconst, t0, t1, __, __, __)
+
+  st1 {rh2.16b-rh4.16b}, [x1], #(3*16)
+  st1 {rh5.16b-rh6.16b}, [x1]
 
   ret
 .size _gcry_ghash_setup_armv8_ce_pmull,.-_gcry_ghash_setup_armv8_ce_pmull;

commit 27747921cb1dfced83c5666cd1c474764724c52b
Author: Jussi Kivilinna <jussi.kivilinna at iki.fi>
Date:   Sun Oct 9 12:52:55 2016 +0300

    GCM: Add bulk processing for ARMv8/AArch32 implementation
    
    * cipher/cipher-gcm-armv8-aarch32-ce.S: Add 4 blocks bulk processing.
    * tests/basic.c (check_digests): Print correct data length for "?"
    tests.
    (check_one_mac): Add large 1000000 bytes tests, when input is "!" or
    "?".
    (check_mac): Add "?" tests vectors for HMAC, CMAC, GMAC and POLY1305.
    --
    
    Benchmark on Cortex-A53 (1152 Mhz):
    
    Before:
                        |  nanosecs/byte   mebibytes/sec   cycles/byte
     GMAC_AES           |     0.924 ns/B    1032.2 MiB/s      1.06 c/B
    
    After (1.21x faster):
                        |  nanosecs/byte   mebibytes/sec   cycles/byte
     GMAC_AES           |     0.764 ns/B    1248.2 MiB/s     0.880 c/B
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>

diff --git a/cipher/cipher-gcm-armv8-aarch32-ce.S b/cipher/cipher-gcm-armv8-aarch32-ce.S
index b879fb2..b61a787 100644
--- a/cipher/cipher-gcm-armv8-aarch32-ce.S
+++ b/cipher/cipher-gcm-armv8-aarch32-ce.S
@@ -57,69 +57,125 @@ gcry_gcm_reduction_constant:
 #define rhash_l d0
 #define rhash_h d1
 
-#define rbuf q1
-#define rbuf_l d2
-#define rbuf_h d3
+#define rh1 q1
+#define rh1_l d2
+#define rh1_h d3
 
-#define rh0 q2
-#define rh0_l d4
-#define rh0_h d5
+#define rbuf q2
+#define rbuf_l d4
+#define rbuf_h d5
 
-#define rt0 q3
-#define rt0_l d6
-#define rt0_h d7
+#define rbuf1 q3
+#define rbuf1_l d6
+#define rbuf1_h d7
 
-#define rr0 q8
-#define rr0_l d16
-#define rr0_h d17
+#define rbuf2 q4
+#define rbuf2_l d8
+#define rbuf2_h d9
 
-#define rr1 q9
-#define rr1_l d18
-#define rr1_h d19
+#define rbuf3 q5
+#define rbuf3_l d10
+#define rbuf3_h d11
+
+#define rh2 q6
+#define rh2_l d12
+#define rh2_h d13
+
+#define rh3 q7
+#define rh3_l d14
+#define rh3_h d15
+
+#define rh4 q8
+#define rh4_l d16
+#define rh4_h d17
+
+#define rr2 q9
+#define rr2_l d18
+#define rr2_h d19
+
+#define rr3 q10
+#define rr3_l d20
+#define rr3_h d21
+
+#define rr0 q11
+#define rr0_l d22
+#define rr0_h d23
+
+#define rr1 q12
+#define rr1_l d24
+#define rr1_h d25
+
+#define rt0 q13
+#define rt0_l d26
+#define rt0_h d27
+
+#define rt1 q14
+#define rt1_l d28
+#define rt1_h d29
 
 #define rrconst q15
 #define rrconst_l d30
 #define rrconst_h d31
 
-#define ia rbuf_h
-#define ib rbuf_l
-#define oa rh0_l
-#define ob rh0_h
-#define co rrconst_l
-#define ma rrconst_h
-
 /* GHASH macros */
 
 /* See "Gouv?a, C. P. L. & L?pez, J. Implementing GCM on ARMv8. Topics in
  * Cryptology ? CT-RSA 2015" for details.
  */
 
-/* Input: 'a' and 'b', Output: 'r0:r1' (low 128-bits in r0, high in r1) */
+/* Input: 'a' and 'b', Output: 'r0:r1' (low 128-bits in r0, high in r1)
+ *  Note: 'r1' may be 'a' or 'b', 'r0' must not be either 'a' or 'b'.
+ */
 #define PMUL_128x128(r0, r1, a, b, t, interleave_op) \
         veor t##_h, b##_l, b##_h; \
         veor t##_l, a##_l, a##_h; \
         vmull.p64 r0, a##_l, b##_l; \
         vmull.p64 r1, a##_h, b##_h; \
         vmull.p64 t, t##_h, t##_l; \
-        interleave_op(); \
+        interleave_op; \
         veor t, r0; \
         veor t, r1; \
         veor r0##_h, t##_l; \
         veor r1##_l, t##_h;
 
+/* Input: 'aA' and 'bA', Output: 'r0A:r1A' (low 128-bits in r0A, high in r1A)
+ *  Note: 'r1A' may be 'aA' or 'bA', 'r0A' must not be either 'aA' or 'bA'.
+ * Input: 'aB' and 'bB', Output: 'r0B:r1B' (low 128-bits in r0B, high in r1B)
+ *  Note: 'r1B' may be 'aB' or 'bB', 'r0B' must not be either 'aB' or 'bB'.
+ */
+#define PMUL_128x128_2(r0A, r1A, aA, bA, r0B, r1B, aB, bB, tA, tB, interleave_op) \
+        veor tA##_h, bA##_l, bA##_h; \
+        veor tA##_l, aA##_l, aA##_h; \
+          veor tB##_h, bB##_l, bB##_h; \
+          veor tB##_l, aB##_l, aB##_h; \
+        vmull.p64 r0A, aA##_l, bA##_l; \
+        vmull.p64 r1A, aA##_h, bA##_h; \
+        vmull.p64 tA, tA##_h, tA##_l; \
+          vmull.p64 r0B, aB##_l, bB##_l; \
+          vmull.p64 r1B, aB##_h, bB##_h; \
+          vmull.p64 tB, tB##_h, tB##_l; \
+        interleave_op; \
+        veor tA, r0A; \
+        veor tA, r1A; \
+          veor tB, r0B; \
+          veor tB, r1B; \
+        veor r0A##_h, tA##_l; \
+        veor r1A##_l, tA##_h; \
+          veor r0B##_h, tB##_l; \
+          veor r1B##_l, tB##_h; \
+
 /* Input: 'r0:r1', Output: 'a' */
 #define REDUCTION(a, r0, r1, rconst, t, interleave_op) \
         vmull.p64 t, r0##_l, rconst; \
         veor r0##_h, t##_l; \
         veor r1##_l, t##_h; \
-        interleave_op(); \
+        interleave_op; \
         vmull.p64 t, r0##_h, rconst; \
         veor r1, t; \
         veor a, r0, r1;
 
-#define _(...) /*_*/
-#define vrev_rbuf() vrev64.8 rbuf, rbuf;
-#define vext_rbuf() vext.8 rbuf, rbuf, rbuf, #8;
+#define _(...) __VA_ARGS__
+#define __ _()
 
 /* Other functional macros */
 
@@ -142,22 +198,128 @@ _gcry_ghash_armv8_ce_pmull:
    *    r3: nblocks
    *    %st+0: gcm_table
    */
-  push {r4, lr}
+  push {r4-r6, lr}
 
   cmp r3, #0
   beq .Ldo_nothing
 
-  GET_DATA_POINTER(lr, .Lrconst64, r4)
+  GET_DATA_POINTER(r4, .Lrconst64, lr)
 
-  subs r3, r3, #1
   vld1.64 {rhash}, [r1]
-  vld1.64 {rh0}, [r0]
+  vld1.64 {rh1}, [r0]
 
   vrev64.8 rhash, rhash /* byte-swap */
-  vld1.64 {rrconst_h}, [lr]
+  vld1.64 {rrconst_h}, [r4]
   vext.8 rhash, rhash, rhash, #8
 
+  cmp r3, #4
+  blo .Less_than_4
+
+  /* Bulk processing of 4 blocks per loop iteration. */
+
+  ldr r5, [sp, #(4*4)];
+  add r6, r5, #32
+
+  vpush {q4-q7}
+
+  vld1.64 {rh2-rh3}, [r5]
+  vld1.64 {rh4}, [r6]
+
+  vld1.64 {rbuf-rbuf1}, [r2]!
+  sub r3, r3, #4
+  vld1.64 {rbuf2-rbuf3}, [r2]!
+
+  cmp r3, #4
+  vrev64.8 rbuf, rbuf /* byte-swap */
+  vrev64.8 rbuf1, rbuf1 /* byte-swap */
+  vrev64.8 rbuf2, rbuf2 /* byte-swap */
+  vrev64.8 rbuf3, rbuf3 /* byte-swap */
+
+  vext.8 rbuf, rbuf, rbuf, #8
+  vext.8 rbuf1, rbuf1, rbuf1, #8
+  vext.8 rbuf2, rbuf2, rbuf2, #8
+  vext.8 rbuf3, rbuf3, rbuf3, #8
+  veor rhash, rhash, rbuf /* in0 ^ hash */
+
+  blo .Lend_4
+
+.Loop_4:
+  /* (in0 ^ hash) * H? => rr2:rr3 */
+  /* (in1) * H? => rr0:rr1 */
+  PMUL_128x128_2(rr0, rr1, rbuf1, rh3, rr2, rr3, rhash, rh4, rt1, rt0, __)
+
+  vld1.64 {rbuf-rbuf1}, [r2]!
+  sub r3, r3, #4
+  veor rr0, rr0, rr2
+  veor rr1, rr1, rr3
+
+  /* (in2) * H? => rr2:rr3 */
+  /* (in3) * H? => rhash:rbuf3 */
+  PMUL_128x128_2(rr2, rr3, rbuf2, rh2, rhash, rbuf3, rbuf3, rh1, rt0, rt1,
+                 _(vrev64.8 rbuf, rbuf))
+
+  vld1.64 {rbuf2}, [r2]!
+
+  vrev64.8 rbuf1, rbuf1
+  veor rr0, rr0, rr2
+  veor rr1, rr1, rr3
+
+  cmp r3, #4
+  vext.8 rbuf, rbuf, rbuf, #8
+  vext.8 rbuf1, rbuf1, rbuf1, #8
+
+  veor rr0, rr0, rhash
+  veor rr1, rr1, rbuf3
+
+  vld1.64 {rbuf3}, [r2]!
+
+  REDUCTION(rhash, rr0, rr1, rrconst_h, rt1,
+            _(vrev64.8 rbuf2, rbuf2;
+              vrev64.8 rbuf3, rbuf3))
+
+  vext.8 rbuf2, rbuf2, rbuf2, #8
+  vext.8 rbuf3, rbuf3, rbuf3, #8
+  veor rhash, rhash, rbuf /* in0 ^ hash */
+
+  bhs .Loop_4
+
+.Lend_4:
+  /* (in0 ^ hash) * H? => rr2:rr3 */
+  /* (in1) * H? => rr0:rr1 */
+  PMUL_128x128_2(rr0, rr1, rbuf1, rh3, rr2, rr3, rhash, rh4, rt1, rt0, __)
+
+  /* (in2) * H? => rhash:rbuf */
+  /* (in3) * H? => rbuf1:rbuf2 */
+  PMUL_128x128_2(rhash, rbuf, rbuf2, rh2, rbuf1, rbuf2, rbuf3, rh1, rt0, rt1,
+                 _(veor rr0, rr0, rr2;
+                   veor rr1, rr1, rr3))
+
+  veor rr0, rr0, rhash
+  veor rr1, rr1, rbuf
+
+  veor rr0, rr0, rbuf1
+  veor rr1, rr1, rbuf2
+
+  REDUCTION(rhash, rr0, rr1, rrconst_h, rt1,
+            _(CLEAR_REG(rr2);
+              CLEAR_REG(rr3);
+              CLEAR_REG(rbuf1);
+              CLEAR_REG(rbuf2);
+              CLEAR_REG(rbuf3);
+              CLEAR_REG(rh2);
+              CLEAR_REG(rh3);
+              CLEAR_REG(rh4)))
+
+  vpop {q4-q7}
+
+  cmp r3, #0
+  beq .Ldone
+
+.Less_than_4:
+  /* Handle remaining blocks. */
+
   vld1.64 {rbuf}, [r2]!
+  subs r3, r3, #1
 
   vrev64.8 rbuf, rbuf /* byte-swap */
   vext.8 rbuf, rbuf, rbuf, #8
@@ -169,30 +331,29 @@ _gcry_ghash_armv8_ce_pmull:
 .Loop:
   vld1.64 {rbuf}, [r2]!
   subs r3, r3, #1
-  PMUL_128x128(rr0, rr1, rh0, rhash, rt0, vrev_rbuf)
-  REDUCTION(rhash, rr0, rr1, rrconst_h, rt0, vext_rbuf)
+  PMUL_128x128(rr0, rr1, rhash, rh1, rt0, _(vrev64.8 rbuf, rbuf))
+  REDUCTION(rhash, rr0, rr1, rrconst_h, rt0, _(vext.8 rbuf, rbuf, rbuf, #8))
   veor rhash, rhash, rbuf
 
   bne .Loop
 
 .Lend:
-  PMUL_128x128(rr0, rr1, rh0, rhash, rt0, _)
-  REDUCTION(rhash, rr0, rr1, rrconst_h, rt0, _)
+  PMUL_128x128(rr0, rr1, rhash, rh1, rt0, _(CLEAR_REG(rbuf)))
+  REDUCTION(rhash, rr0, rr1, rrconst_h, rt0, _(CLEAR_REG(rh1)))
 
+.Ldone:
   CLEAR_REG(rr1)
-  CLEAR_REG(rr0)
   vrev64.8 rhash, rhash /* byte-swap */
-  CLEAR_REG(rbuf)
   CLEAR_REG(rt0)
+  CLEAR_REG(rr0)
   vext.8 rhash, rhash, rhash, #8
-  CLEAR_REG(rh0)
-
+  CLEAR_REG(rt1)
   vst1.64 {rhash}, [r1]
   CLEAR_REG(rhash)
 
 .Ldo_nothing:
   mov r0, #0
-  pop {r4, pc}
+  pop {r4-r6, pc}
 .size _gcry_ghash_armv8_ce_pmull,.-_gcry_ghash_armv8_ce_pmull;
 
 
@@ -208,28 +369,64 @@ _gcry_ghash_setup_armv8_ce_pmull:
    *	r1: gcm_table
    */
 
-  push {r4, lr}
+  vpush {q4-q7}
 
-  GET_DATA_POINTER(r4, .Lrconst64, lr)
+  GET_DATA_POINTER(r2, .Lrconst64, r3)
+
+  vld1.64 {rrconst_h}, [r2]
+
+#define GCM_LSH_1(r_out, ia, ib, const_d, oa, ob, ma) \
+        /* H <<< 1 */ \
+        vshr.s64 ma, ib, #63; \
+        vshr.u64 oa, ib, #63; \
+        vshr.u64 ob, ia, #63; \
+        vand ma, const_d; \
+        vshl.u64 ib, ib, #1; \
+        vshl.u64 ia, ia, #1; \
+        vorr ob, ib; \
+        vorr oa, ia; \
+        veor ob, ma; \
+        vst1.64 {oa, ob}, [r_out]
+
+  vld1.64 {rhash}, [r0]
+  vrev64.8 rhash, rhash /* byte-swap */
+  vext.8 rhash, rhash, rhash, #8
+
+  vmov rbuf1, rhash
+  GCM_LSH_1(r0, rhash_l, rhash_h, rrconst_h, rh1_l, rh1_h, rt1_l) /* H<<<1 */
 
-  /* H <<< 1 */
-  vld1.64 {ib,ia}, [r0]
-  vld1.64 {co}, [r4]
-  vrev64.8 ib, ib;
-  vrev64.8 ia, ia;
-  vshr.s64 ma, ib, #63
-  vshr.u64 oa, ib, #63
-  vshr.u64 ob, ia, #63
-  vand ma, co
-  vshl.u64 ib, ib, #1
-  vshl.u64 ia, ia, #1
-  vorr ob, ib
-  vorr oa, ia
-  veor ob, ma
-
-  vst1.64 {oa, ob}, [r0]
-
-  pop {r4, pc}
+  /* H? */
+  PMUL_128x128(rr0, rr1, rbuf1, rh1, rt0, __)
+  REDUCTION(rh2, rr0, rr1, rrconst_h, rt0, __)
+  vmov rhash, rh2
+  GCM_LSH_1(r1, rh2_l, rh2_h, rrconst_h, rbuf1_l, rbuf1_h, rt1_l) /* H?<<<1 */
+  add r1, r1, #16
+
+  /* H? */
+  PMUL_128x128(rr0, rr1, rhash, rh1, rt1, __)
+  REDUCTION(rh3, rr0, rr1, rrconst_h, rt1, __)
+
+  /* H? */
+  PMUL_128x128(rr0, rr1, rhash, rbuf1, rt0, __)
+  REDUCTION(rh4, rr0, rr1, rrconst_h, rt0, __)
+
+  GCM_LSH_1(r1, rh3_l, rh3_h, rrconst_h, rt0_l, rt0_h, rt1_l) /* H?<<<1 */
+  add r1, r1, #16
+  GCM_LSH_1(r1, rh4_l, rh4_h, rrconst_h, rt0_l, rt0_h, rt1_l) /* H?<<<1 */
+
+  CLEAR_REG(rt0)
+  CLEAR_REG(rt1)
+  CLEAR_REG(rr1)
+  CLEAR_REG(rr0)
+  CLEAR_REG(rh1)
+  CLEAR_REG(rh2)
+  CLEAR_REG(rh3)
+  CLEAR_REG(rh4)
+  CLEAR_REG(rhash)
+  CLEAR_REG(rbuf1)
+  CLEAR_REG(rrconst)
+  vpop {q4-q7}
+  bx lr
 .size _gcry_ghash_setup_armv8_ce_pmull,.-_gcry_ghash_setup_armv8_ce_pmull;
 
 #endif
diff --git a/tests/basic.c b/tests/basic.c
index 96fb4cb..e5a325b 100644
--- a/tests/basic.c
+++ b/tests/basic.c
@@ -6902,7 +6902,7 @@ check_digests (void)
 	fprintf (stderr, "  checking %s [%i] for length %d\n",
 		 gcry_md_algo_name (algos[i].md),
 		 algos[i].md,
-                 !strcmp (algos[i].data, "!")?
+                 (!strcmp (algos[i].data, "!") || !strcmp (algos[i].data, "?"))?
                  1000000 : (int)strlen(algos[i].data));
 
       check_one_md (algos[i].md, algos[i].data,
@@ -7359,6 +7359,15 @@ check_one_mac (int algo, const char *data, int datalen,
   int i;
   gcry_error_t err = 0;
 
+  if (test_buffering)
+    {
+      if ((*data == '!' && !data[1]) ||
+          (*data == '?' && !data[1]))
+        {
+          return; /* Skip. */
+        }
+    }
+
   err = gcry_mac_open (&hd, algo, 0, NULL);
   if (err)
     {
@@ -7416,7 +7425,60 @@ check_one_mac (int algo, const char *data, int datalen,
     }
   else
     {
-      err = gcry_mac_write (hd, data, datalen);
+      if ((*data == '!' && !data[1]) || /* hash one million times a "a" */
+          (*data == '?' && !data[1]))   /* hash million byte data-set with byte pattern 0x00,0x01,0x02,... */
+        {
+          char aaa[1000];
+          size_t left = 1000 * 1000;
+          size_t startlen = 1;
+          size_t piecelen = startlen;
+
+          if (*data == '!')
+            memset (aaa, 'a', 1000);
+
+          /* Write in chuck with all sizes 1 to 1000 (500500 bytes)  */
+          for (i = 1; i <= 1000 && left > 0; i++)
+            {
+              piecelen = i;
+              if (piecelen > sizeof(aaa))
+                piecelen = sizeof(aaa);
+              if (piecelen > left)
+                piecelen = left;
+
+              if (*data == '?')
+                fillbuf_count(aaa, piecelen, 1000 * 1000 - left);
+
+              gcry_mac_write (hd, aaa, piecelen);
+
+              left -= piecelen;
+            }
+
+          /* Write in odd size chunks so that we test the buffering.  */
+          while (left > 0)
+            {
+              if (piecelen > sizeof(aaa))
+                piecelen = sizeof(aaa);
+              if (piecelen > left)
+                piecelen = left;
+
+              if (*data == '?')
+                fillbuf_count(aaa, piecelen, 1000 * 1000 - left);
+
+              gcry_mac_write (hd, aaa, piecelen);
+
+              left -= piecelen;
+
+              if (piecelen == sizeof(aaa))
+                piecelen = ++startlen;
+              else
+                piecelen = piecelen * 2 - ((piecelen != startlen) ? startlen : 0);
+            }
+        }
+      else
+        {
+          err = gcry_mac_write (hd, data, datalen);
+        }
+
       if (err)
         fail("algo %d, mac gcry_mac_write failed: %s\n", algo, gpg_strerror (err));
       if (err)
@@ -7426,8 +7488,6 @@ check_one_mac (int algo, const char *data, int datalen,
   err = gcry_mac_verify (hd, expect, maclen);
   if (err)
     fail("algo %d, mac gcry_mac_verify failed: %s\n", algo, gpg_strerror (err));
-  if (err)
-    goto out;
 
   macoutlen = maclen;
   err = gcry_mac_read (hd, p, &macoutlen);
@@ -7511,6 +7571,8 @@ check_mac (void)
         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
         "\xaa\xaa\xaa\xaa\xaa",
         "\x6f\x63\x0f\xad\x67\xcd\xa0\xee\x1f\xb1\xf5\x62\xdb\x3a\xa5\x3e", },
+      { GCRY_MAC_HMAC_MD5, "?", "????????????????",
+        "\x7e\x28\xf8\x8e\xf4\x6c\x48\x30\xa2\x0c\xe3\xe1\x42\xd4\xb5\x6b" },
       { GCRY_MAC_HMAC_SHA256, "what do ya want for nothing?", "Jefe",
         "\x5b\xdc\xc1\x46\xbf\x60\x75\x4e\x6a\x04\x24\x26\x08\x95\x75\xc7\x5a"
         "\x00\x3f\x08\x9d\x27\x39\x83\x9d\xec\x58\xb9\x64\xec\x38\x43" },
@@ -7564,6 +7626,9 @@ check_mac (void)
         "\xaa\xaa\xaa",
         "\x9b\x09\xff\xa7\x1b\x94\x2f\xcb\x27\x63\x5f\xbc\xd5\xb0\xe9\x44"
         "\xbf\xdc\x63\x64\x4f\x07\x13\x93\x8a\x7f\x51\x53\x5c\x3a\x35\xe2" },
+      { GCRY_MAC_HMAC_SHA256, "?", "????????????????",
+        "\x1c\x0e\x57\xad\x4a\x02\xd2\x30\xce\x7e\xf8\x08\x23\x25\x71\x5e"
+        "\x16\x9b\x30\xca\xc3\xf4\x99\xc5\x1d\x4c\x25\x32\xa9\xf2\x15\x28" },
       { GCRY_MAC_HMAC_SHA224, "what do ya want for nothing?", "Jefe",
         "\xa3\x0e\x01\x09\x8b\xc6\xdb\xbf\x45\x69\x0f\x3a\x7e\x9e\x6d\x0f"
         "\x8b\xbe\xa2\xa3\x9e\x61\x48\x00\x8f\xd0\x5e\x44" },
@@ -7617,6 +7682,9 @@ check_mac (void)
         "\xaa\xaa\xaa",
         "\x3a\x85\x41\x66\xac\x5d\x9f\x02\x3f\x54\xd5\x17\xd0\xb3\x9d\xbd"
         "\x94\x67\x70\xdb\x9c\x2b\x95\xc9\xf6\xf5\x65\xd1" },
+      { GCRY_MAC_HMAC_SHA224, "?", "????????????????",
+        "\xc1\x88\xaf\xcf\xce\x51\xa2\x14\x3d\xc1\xaf\x93\xcc\x2b\xe9\x4d"
+        "\x39\x55\x90\x4c\x46\x70\xfc\xc2\x04\xcf\xab\xfa" },
       { GCRY_MAC_HMAC_SHA384, "what do ya want for nothing?", "Jefe",
         "\xaf\x45\xd2\xe3\x76\x48\x40\x31\x61\x7f\x78\xd2\xb5\x8a\x6b\x1b"
         "\x9c\x7e\xf4\x64\xf5\xa0\x1b\x47\xe4\x2e\xc3\x73\x63\x22\x44\x5e"
@@ -7676,6 +7744,10 @@ check_mac (void)
         "\x66\x17\x17\x8e\x94\x1f\x02\x0d\x35\x1e\x2f\x25\x4e\x8f\xd3\x2c"
         "\x60\x24\x20\xfe\xb0\xb8\xfb\x9a\xdc\xce\xbb\x82\x46\x1e\x99\xc5"
         "\xa6\x78\xcc\x31\xe7\x99\x17\x6d\x38\x60\xe6\x11\x0c\x46\x52\x3e" },
+      { GCRY_MAC_HMAC_SHA384, "?", "????????????????",
+        "\xe7\x96\x29\xa3\x40\x5f\x1e\x6e\x92\xa5\xdb\xa5\xc6\xe9\x60\xa8"
+        "\xf5\xd1\x6d\xcb\x10\xec\x30\x2f\x6b\x9c\x37\xe0\xea\xf1\x53\x28"
+        "\x08\x01\x9b\xe3\x4a\x43\xc6\xc2\x2b\x0c\xd9\x43\x64\x35\x25\x78" },
       { GCRY_MAC_HMAC_SHA512, "what do ya want for nothing?", "Jefe",
         "\x16\x4b\x7a\x7b\xfc\xf8\x19\xe2\xe3\x95\xfb\xe7\x3b\x56\xe0\xa3"
         "\x87\xbd\x64\x22\x2e\x83\x1f\xd6\x10\x27\x0c\xd7\xea\x25\x05\x54"
@@ -7741,6 +7813,11 @@ check_mac (void)
         "\xde\xbd\x71\xf8\x86\x72\x89\x86\x5d\xf5\xa3\x2d\x20\xcd\xc9\x44"
         "\xb6\x02\x2c\xac\x3c\x49\x82\xb1\x0d\x5e\xeb\x55\xc3\xe4\xde\x15"
         "\x13\x46\x76\xfb\x6d\xe0\x44\x60\x65\xc9\x74\x40\xfa\x8c\x6a\x58" },
+      { GCRY_MAC_HMAC_SHA512, "?", "????????????????",
+        "\xd4\x43\x61\xfa\x3d\x3d\x57\xd6\xac\xc3\x9f\x1c\x3d\xd9\x26\x84"
+        "\x1f\xfc\x4d\xf2\xbf\x78\x87\x72\x5e\x6c\x3e\x00\x6d\x39\x5f\xfa"
+        "\xd7\x3a\xf7\x83\xb7\xb5\x61\xbd\xfb\x33\xe0\x03\x97\xa7\x72\x79"
+        "\x66\x66\xbf\xbd\x44\xfa\x04\x01\x1b\xc1\x48\x1d\x9e\xde\x5b\x8e" },
       /* HMAC-SHA3 test vectors from
        * http://wolfgang-ehrhardt.de/hmac-sha3-testvectors.html */
       { GCRY_MAC_HMAC_SHA3_224,
@@ -7904,6 +7981,21 @@ check_mac (void)
 	"\x1f\x3e\x6c\xf0\x48\x60\xc6\xbb\xd7\xfa\x48\x86\x74\x78\x2b\x46"
 	"\x59\xfd\xbd\xf3\xfd\x87\x78\x52\x88\x5c\xfe\x6e\x22\x18\x5f\xe7"
 	"\xb2\xee\x95\x20\x43\x62\x9b\xc9\xd5\xf3\x29\x8a\x41\xd0\x2c\x66" },
+      { GCRY_MAC_HMAC_SHA3_224, "?", "????????????????",
+        "\x80\x2b\x3c\x84\xfe\x3e\x01\x22\x14\xf8\xba\x74\x79\xfd\xb5\x02"
+	"\xea\x0c\x06\xa4\x7e\x01\xe3\x2c\xc7\x24\x89\xc3" },
+      { GCRY_MAC_HMAC_SHA3_256, "?", "????????????????",
+        "\x6c\x7c\x96\x5b\x19\xba\xcd\x61\x69\x8a\x2c\x7a\x2b\x96\xa1\xc3"
+	"\x33\xa0\x3c\x5d\x54\x87\x37\x60\xc8\x2f\xa2\xa6\x12\x38\x8d\x1b" },
+      { GCRY_MAC_HMAC_SHA3_384, "?", "????????????????",
+        "\xc0\x20\xd0\x9b\xa7\xb9\xd5\xb8\xa6\xa4\xba\x20\x55\xd9\x0b\x35"
+	"\x8b\xe0\xb7\xec\x1e\x9f\xe6\xb9\xbd\xd5\xe9\x9b\xfc\x0a\x11\x3a"
+	"\x15\x41\xed\xfd\xef\x30\x8d\x03\xb8\xca\x3a\xa8\xc7\x2d\x89\x32" },
+      { GCRY_MAC_HMAC_SHA3_512, "?", "????????????????",
+        "\xb4\xef\x24\xd2\x07\xa7\x01\xb3\xe1\x81\x11\x22\x93\x83\x64\xe0"
+	"\x5e\xad\x03\xb7\x43\x4f\x87\xa1\x14\x8e\x17\x8f\x2a\x97\x7d\xe8"
+	"\xbd\xb0\x37\x3b\x67\xb9\x97\x36\xa5\x82\x9b\xdc\x0d\xe4\x5a\x8c"
+	"\x5e\xda\xb5\xca\xea\xa9\xb4\x6e\xba\xca\x25\xc8\xbf\xa1\x0e\xb0" },
       /* CMAC AES and DES test vectors from
          http://web.archive.org/web/20130930212819/http://csrc.nist.gov/publica\
          tions/nistpubs/800-38B/Updated_CMAC_Examples.pdf */
@@ -7978,6 +8070,8 @@ check_mac (void)
         "\x60\x3d\xeb\x10\x15\xca\x71\xbe\x2b\x73\xae\xf0\x85\x7d\x77\x81"
         "\x1f\x35\x2c\x07\x3b\x61\x08\xd7\x2d\x98\x10\xa3\x09\x14\xdf\xf4",
         "\xe1\x99\x21\x90\x54\x9f\x6e\xd5\x69\x6a\x2c\x05\x6c\x31\x54\x10" },
+      { GCRY_MAC_CMAC_AES, "?", "????????????????????????????????",
+        "\x9f\x72\x73\x68\xb0\x49\x2e\xb1\x35\xa0\x1d\xf9\xa8\x0a\xf6\xee" },
       { GCRY_MAC_CMAC_3DES,
         "",
         "\x8a\xa8\x3b\xf8\xcb\xda\x10\x62\x0b\xc1\xbf\x19\xfb\xb6\xcd\x58"
@@ -8022,6 +8116,8 @@ check_mac (void)
         "\x4c\xf1\x51\x34\xa2\x85\x0d\xd5\x8a\x3d\x10\xba\x80\x57\x0d\x38"
         "\x4c\xf1\x51\x34\xa2\x85\x0d\xd5",
         "\x31\xb1\xe4\x31\xda\xbc\x4e\xb8" },
+      { GCRY_MAC_CMAC_3DES, "?", "????????????????????????",
+        "\xc1\x38\x13\xb2\x31\x8f\x3a\xdf" },
       /* CMAC Camellia test vectors from
          http://tools.ietf.org/html/draft-kato-ipsec-camellia-cmac96and128-05 */
       { GCRY_MAC_CMAC_CAMELLIA,
@@ -8045,6 +8141,8 @@ check_mac (void)
         "\xf6\x9f\x24\x45\xdf\x4f\x9b\x17\xad\x2b\x41\x7b\xe6\x6c\x37\x10",
         "\x2b\x7e\x15\x16\x28\xae\xd2\xa6\xab\xf7\x15\x88\x09\xcf\x4f\x3c",
         "\xc2\x69\x9a\x6e\xba\x55\xce\x9d\x93\x9a\x8a\x4e\x19\x46\x6e\xe9" },
+      { GCRY_MAC_CMAC_CAMELLIA, "?", "????????????????????????????????",
+        "\xba\x8a\x5a\x8d\xa7\x54\x26\x83\x3e\xb1\x20\xb5\x45\xd0\x9f\x4e" },
       /* http://csrc.nist.gov/groups/STM/cavp/documents/mac/gcmtestvectors.zip */
       { GCRY_MAC_GMAC_AES,
         "",
@@ -8081,6 +8179,8 @@ check_mac (void)
         "\xc9\xfc\xa7\x29\xab\x60\xad\xa0",
         "\x20\x4b\xdb\x1b\xd6\x21\x54\xbf\x08\x92\x2a\xaa\x54\xee\xd7\x05",
         "\x05\xad\x13\xa5\xe2\xc2\xab\x66\x7e\x1a\x6f\xbc" },
+      { GCRY_MAC_GMAC_AES, "?", "????????????????????????????????",
+        "\x84\x37\xc3\x42\xae\xf5\xd0\x40\xd3\x73\x90\xa9\x36\xed\x8a\x12" },
       /* from NaCl */
       { GCRY_MAC_POLY1305,
         "\x8e\x99\x3b\x9f\x48\x68\x12\x73\xc2\x96\x50\xba\x32\xfc\x76\xce"
@@ -8250,6 +8350,8 @@ check_mac (void)
         "\x12\x97\x6a\x08\xc4\x42\x6d\x0c\xe8\xa8\x24\x07\xc4\xf4\x82\x07"
         "\x80\xf8\xc2\x0a\xa7\x12\x02\xd1\xe2\x91\x79\xcb\xcb\x55\x5a\x57",
         "\x51\x54\xad\x0d\x2c\xb2\x6e\x01\x27\x4f\xc5\x11\x48\x49\x1f\x1b" },
+      { GCRY_MAC_POLY1305, "?", "????????????????????????????????",
+        "\xc3\x88\xce\x8a\x52\xd6\xe7\x21\x86\xfa\xaa\x5d\x2d\x16\xf9\xa3" },
       /* from http://cr.yp.to/mac/poly1305-20050329.pdf */
       { GCRY_MAC_POLY1305_AES,
         "\xf3\xf6",
@@ -8283,6 +8385,10 @@ check_mac (void)
         "\x51\x54\xad\x0d\x2c\xb2\x6e\x01\x27\x4f\xc5\x11\x48\x49\x1f\x1b",
 	"\x9a\xe8\x31\xe7\x43\x97\x8d\x3a\x23\x52\x7c\x71\x28\x14\x9e\x3a",
         0, 32 },
+      { GCRY_MAC_POLY1305_AES, "?", "????????????????????????????????",
+        "\x9d\xeb\xb0\xcd\x24\x90\xd3\x9b\x47\x78\x37\x0a\x81\xf2\x83\x2a",
+        "\x61\xee\x09\x21\x8d\x29\xb0\xaa\xed\x7e\x15\x4a\x2c\x55\x09\xcc",
+        0, 32 },
       { 0 },
     };
   int i;
@@ -8310,8 +8416,9 @@ check_mac (void)
 	fprintf (stderr,
                  "  checking %s [%i] for %d byte key and %d byte data\n",
 		 gcry_mac_algo_name (algos[i].algo),
-		 algos[i].algo,
-		 (int)strlen(algos[i].key), (int)strlen(algos[i].data));
+		 algos[i].algo, (int)strlen(algos[i].key),
+                 (!strcmp(algos[i].data, "!") || !strcmp(algos[i].data, "?"))
+                   ? 1000000 : (int)strlen(algos[i].data));
 
       klen = algos[i].klen ? algos[i].klen : strlen(algos[i].key);
       dlen = algos[i].dlen ? algos[i].dlen : strlen (algos[i].data);

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

Summary of changes:
 cipher/cipher-gcm-armv8-aarch32-ce.S | 321 +++++++++++++++++++++++++++-------
 cipher/cipher-gcm-armv8-aarch64-ce.S | 325 ++++++++++++++++++++++++++++++-----
 tests/basic.c                        | 119 ++++++++++++-
 3 files changed, 651 insertions(+), 114 deletions(-)


hooks/post-receive
-- 
The GNU crypto library
http://git.gnupg.org



From cvs at cvs.gnupg.org  Wed Oct 12 21:45:32 2016
From: cvs at cvs.gnupg.org (by Neal H. Walfield)
Date: Wed, 12 Oct 2016 21:45:32 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-222-g3ad17e7
Message-ID: <E1buPT6-0004DG-Kj@lists.gnupg.org>

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  3ad17e72fa81d18c95732ddcd4def244f52bb5b1 (commit)
       via  ca84f65c7cf2c6a08a01018519965a82e6c52cac (commit)
       via  6fdf37f0831949cb279de6dc6b247ab2ed53fe5a (commit)
       via  78eda335fd1c29038b74b9cc912b6a4515fccd9f (commit)
      from  cbbf0a7a8da1757fea29cff0daaa42a6bbb95b26 (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 3ad17e72fa81d18c95732ddcd4def244f52bb5b1
Author: Neal H. Walfield <neal at g10code.com>
Date:   Wed Oct 12 21:42:10 2016 +0200

    g10: When changing a TOFU binding's policy, update the conflict info
    
    * g10/tofu.c (record_binding): Take an additional argument, CONFLICT.
    Set the binding's conflict accordingly.  Update callers.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>

diff --git a/g10/tofu.c b/g10/tofu.c
index ae7166c..d7f4e4c 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -797,8 +797,9 @@ get_single_long_cb2 (void *cookie, int argc, char **argv, char **azColName,
    If SHOW_OLD is set, the binding's old policy is displayed.  */
 static gpg_error_t
 record_binding (tofu_dbs_t dbs, const char *fingerprint, const char *email,
-		const char *user_id, enum tofu_policy policy, int show_old,
-                time_t now)
+		const char *user_id, enum tofu_policy policy,
+                const char *conflict,
+                int show_old, time_t now)
 {
   char *fingerprint_pp = format_hexfingerprint (fingerprint, NULL, 0);
   gpg_error_t rc;
@@ -850,12 +851,6 @@ record_binding (tofu_dbs_t dbs, const char *fingerprint, const char *email,
            " <key: %s, user id: %s> to %s.\n",
            fingerprint, show_old ? user_id : email,
            tofu_policy_str (policy));
-
-      if (policy_old == policy)
-        {
-          rc = 0;
-          goto leave; /* Nothing to do.  */
-        }
     }
 
   if (opt.dry_run)
@@ -868,18 +863,19 @@ record_binding (tofu_dbs_t dbs, const char *fingerprint, const char *email,
   rc = gpgsql_stepx
     (dbs->db, &dbs->s.record_binding_update, NULL, NULL, &err,
      "insert or replace into bindings\n"
-     " (oid, fingerprint, email, user_id, time, policy)\n"
+     " (oid, fingerprint, email, user_id, time, policy, conflict)\n"
      " values (\n"
      /* If we don't explicitly reuse the OID, then SQLite will
 	reallocate a new one.  We just need to search for the OID
 	based on the fingerprint and email since they are unique.  */
      "  (select oid from bindings where fingerprint = ? and email = ?),\n"
-     "  ?, ?, ?, ?, ?);",
+     "  ?, ?, ?, ?, ?, ?);",
      GPGSQL_ARG_STRING, fingerprint, GPGSQL_ARG_STRING, email,
      GPGSQL_ARG_STRING, fingerprint, GPGSQL_ARG_STRING, email,
      GPGSQL_ARG_STRING, user_id,
      GPGSQL_ARG_LONG_LONG, (long long) now,
      GPGSQL_ARG_INT, (int) policy,
+     GPGSQL_ARG_STRING, conflict ? conflict : "",
      GPGSQL_ARG_END);
   if (rc)
     {
@@ -1747,7 +1743,7 @@ ask_about_binding (ctrl_t ctrl,
                 }
 
               if (record_binding (dbs, fingerprint, email, user_id,
-                                  *policy, 0, now))
+                                  *policy, NULL, 0, now))
                 {
                   /* If there's an error registering the
                    * binding, don't save the signature.  */
@@ -2087,7 +2083,7 @@ get_trust (ctrl_t ctrl, PKT_public_key *pk,
           /* New binding.  */
           {
             if (record_binding (dbs, fingerprint, email, user_id,
-                                TOFU_POLICY_GOOD, 0, now) != 0)
+                                TOFU_POLICY_GOOD, NULL, 0, now) != 0)
               {
                 log_error (_("error setting TOFU binding's trust level"
                              " to %s\n"), "good");
@@ -2206,7 +2202,7 @@ get_trust (ctrl_t ctrl, PKT_public_key *pk,
     if (is_signed_by_utk)
       {
         if (record_binding (dbs, fingerprint, email, user_id,
-                            TOFU_POLICY_GOOD, 0, now) != 0)
+                            TOFU_POLICY_GOOD, NULL, 0, now) != 0)
           {
             log_error (_("error setting TOFU binding's trust level"
                          " to %s\n"), "good");
@@ -2246,7 +2242,7 @@ get_trust (ctrl_t ctrl, PKT_public_key *pk,
 		   fingerprint, email);
 
       if (record_binding (dbs, fingerprint, email, user_id,
-			  TOFU_POLICY_AUTO, 0, now) != 0)
+			  TOFU_POLICY_AUTO, NULL, 0, now) != 0)
 	{
 	  log_error (_("error setting TOFU binding's trust level to %s\n"),
 		       "auto");
@@ -2275,7 +2271,7 @@ get_trust (ctrl_t ctrl, PKT_public_key *pk,
                    fingerprint, email);
 
       if (record_binding (dbs, fingerprint, email, user_id,
-			  TOFU_POLICY_AUTO, 0, now) != 0)
+			  TOFU_POLICY_AUTO, NULL, 0, now) != 0)
 	log_error (_("error setting TOFU binding's trust level to %s\n"),
 		   "auto");
 
@@ -2297,7 +2293,10 @@ get_trust (ctrl_t ctrl, PKT_public_key *pk,
       log_assert (policy == TOFU_POLICY_NONE);
 
       if (record_binding (dbs, fingerprint, email, user_id,
-			  TOFU_POLICY_ASK, 0, now) != 0)
+			  TOFU_POLICY_ASK,
+                          conflict_set && conflict_set->next
+                          ? conflict_set->next->d : NULL,
+                          0, now) != 0)
 	log_error (_("error setting TOFU binding's trust level to %s\n"),
 		   "ask");
 
@@ -3378,7 +3377,7 @@ tofu_set_policy (ctrl_t ctrl, kbnode_t kb, enum tofu_policy policy)
       email = email_from_user_id (user_id->name);
 
       err = record_binding (dbs, fingerprint, email, user_id->name,
-                            policy, 1, now);
+                            policy, NULL, 1, now);
       if (err)
         {
           log_error (_("error setting policy for key %s, user id \"%s\": %s"),

commit ca84f65c7cf2c6a08a01018519965a82e6c52cac
Author: Neal H. Walfield <neal at g10code.com>
Date:   Wed Oct 12 21:40:03 2016 +0200

    g10: Make a singular string singular.
    
    * g10/tofu.c (ask_about_binding): Make the singular string singular.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>

diff --git a/g10/tofu.c b/g10/tofu.c
index ce107de..ae7166c 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -1619,7 +1619,7 @@ ask_about_binding (ctrl_t ctrl,
           else
             {
               if (labs(stats_iter->time_ago) == 3)
-                es_fprintf (fp, ngettext(" over the past days.",
+                es_fprintf (fp, ngettext(" over the past day.",
                                          " over the past %d days.",
                                          seen_in_past),
                             TIME_AGO_SMALL_THRESHOLD

commit 6fdf37f0831949cb279de6dc6b247ab2ed53fe5a
Author: Neal H. Walfield <neal at g10code.com>
Date:   Wed Oct 12 21:39:12 2016 +0200

    g10: Correctly determine whether a binding has a conflict.
    
    * g10/tofu.c (build_conflict_set): A binding has a conflict is
    conflict is *not* NULL, not if it is NULL.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>

diff --git a/g10/tofu.c b/g10/tofu.c
index 97e7a6e..ce107de 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -1793,7 +1793,7 @@ build_conflict_set (tofu_dbs_t dbs, const char *fingerprint, const char *email)
      "select"
      /* A binding should only appear once, but try not to break in the
       * case of corruption.  */
-     "  fingerprint || case sum(conflict ISNULL) when 0 then '' else '!' end"
+     "  fingerprint || case sum(conflict NOTNULL) when 0 then '' else '!' end"
      " from bindings where email = ?"
      "  group by fingerprint"
      /* Make sure the current key comes first in the result list (if

commit 78eda335fd1c29038b74b9cc912b6a4515fccd9f
Author: Neal H. Walfield <neal at g10code.com>
Date:   Wed Oct 12 21:37:34 2016 +0200

    g10: Fix a column's type in TOFU DB.
    
    * g10/tofu.c (initdb): Change policy from a boolean to an integer.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>
    Reported-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
    
    Note: sqlite ignores type information so this change has no real
    impact.

diff --git a/g10/tofu.c b/g10/tofu.c
index 5b01c27..97e7a6e 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -606,7 +606,7 @@ initdb (sqlite3 *db)
        "create table bindings\n"
        " (oid INTEGER PRIMARY KEY AUTOINCREMENT,\n"
        "  fingerprint TEXT, email TEXT, user_id TEXT, time INTEGER,\n"
-       "  policy BOOLEAN CHECK (policy in (%d, %d, %d, %d, %d)),\n"
+       "  policy INTEGER CHECK (policy in (%d, %d, %d, %d, %d)),\n"
        "  conflict STRING,\n"
        "  unique (fingerprint, email));\n"
        "create index bindings_fingerprint_email\n"

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

Summary of changes:
 g10/tofu.c | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Oct 13 09:15:56 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Thu, 13 Oct 2016 09:15:56 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.7.0-45-g2538c12
Message-ID: <E1buaFD-0004bI-6w@lists.gnupg.org>

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 "GnuPG Made Easy".

The branch, master has been updated
       via  2538c12fa0728f4113f83f69f8c8ec9efb163872 (commit)
       via  a3cf30f89418c8a6bc9456533d95ba7fc2a33a4c (commit)
      from  5f64018af89e07dd0494775d6dfc82564536d6e0 (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 2538c12fa0728f4113f83f69f8c8ec9efb163872
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Oct 13 09:13:50 2016 +0200

    qt: Install SpecialJob
    
    * lang/qt/src/Makefile.am: Install SpecialJob
    * NEWS: mention it.
    
    --
    SpecialJob was and is public API. So it needs to be installed.

diff --git a/NEWS b/NEWS
index ebe2dd9..a34d37c 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ Noteworthy changes in version 1.7.1 (unreleased) [C26/A15/R_]
  WksPublishJob::startRecieve     REMOVED.
  MultiDeleteJob                  NEW.
  AbstractImportJob               NEW.
+ SpecialJob                      NEW.
 
  * cpp Interface changes relative to the 1.7.0 release:
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am
index e09e0d9..8c27e67 100644
--- a/lang/qt/src/Makefile.am
+++ b/lang/qt/src/Makefile.am
@@ -57,6 +57,7 @@ qgpgme_headers= \
     protocol.h \
     qgpgme_export.h \
     qgpgmenewcryptoconfig.h \
+    specialjob.h \
     signjob.h \
     signkeyjob.h \
     signencryptjob.h \
@@ -91,6 +92,7 @@ camelcase_headers= \
     MultiDeleteJob \
     Protocol \
     QGpgMENewCryptoConfig \
+    SpecialJob \
     SignJob \
     SignKeyJob \
     SignEncryptJob \
@@ -138,7 +140,6 @@ private_qgpgme_headers = \
     qgpgmekeyformailboxjob.h \
     qgpgmewkspublishjob.h \
     qgpgmetofupolicyjob.h \
-    specialjob.h \
     threadedjobmixin.h
 
 qgpgme_moc_sources = \

commit a3cf30f89418c8a6bc9456533d95ba7fc2a33a4c
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Oct 13 09:07:36 2016 +0200

    qt, cpp: Fix expected targets in Config files
    
    * lang/cpp/src/GpgmeppConfig.cmake.in.in,
    lang/qt/src/QGpgmeConfig.cmake.in.in: Remove KF5 variants.

diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in
index ca11deb..73f5eaa 100644
--- a/lang/cpp/src/GpgmeppConfig.cmake.in.in
+++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in
@@ -37,7 +37,7 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
 set(_targetsDefined)
 set(_targetsNotDefined)
 set(_expectedTargets)
-foreach(_expectedTarget KF5::Gpgmepp Gpgmepp)
+foreach(_expectedTarget Gpgmepp)
   list(APPEND _expectedTargets ${_expectedTarget})
   if(NOT TARGET ${_expectedTarget})
     list(APPEND _targetsNotDefined ${_expectedTarget})
diff --git a/lang/qt/src/QGpgmeConfig.cmake.in.in b/lang/qt/src/QGpgmeConfig.cmake.in.in
index 9063408..5b6c188 100644
--- a/lang/qt/src/QGpgmeConfig.cmake.in.in
+++ b/lang/qt/src/QGpgmeConfig.cmake.in.in
@@ -37,7 +37,7 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
 set(_targetsDefined)
 set(_targetsNotDefined)
 set(_expectedTargets)
-foreach(_expectedTarget QGpgme KF5::QGpgme)
+foreach(_expectedTarget QGpgme)
   list(APPEND _expectedTargets ${_expectedTarget})
   if(NOT TARGET ${_expectedTarget})
     list(APPEND _targetsNotDefined ${_expectedTarget})

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

Summary of changes:
 NEWS                                   | 1 +
 lang/cpp/src/GpgmeppConfig.cmake.in.in | 2 +-
 lang/qt/src/Makefile.am                | 3 ++-
 lang/qt/src/QGpgmeConfig.cmake.in.in   | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org



From cvs at cvs.gnupg.org  Thu Oct 13 09:45:59 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Thu, 13 Oct 2016 09:45:59 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.7.0-46-ga274c75
Message-ID: <E1buaiH-0005rL-Oi@lists.gnupg.org>

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 "GnuPG Made Easy".

The branch, master has been updated
       via  a274c7590aa0e38d682d5177904983632f471cb0 (commit)
      from  2538c12fa0728f4113f83f69f8c8ec9efb163872 (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 a274c7590aa0e38d682d5177904983632f471cb0
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Oct 13 09:35:30 2016 +0200

    qt, cpp: Fix permissions of Config files
    
    * lang/cpp/src/Makefile.am,
    lang/qt/src/Makefile.am: Do not install config files as executable.

diff --git a/lang/cpp/src/Makefile.am b/lang/cpp/src/Makefile.am
index 0500dbf..342bdf8 100644
--- a/lang/cpp/src/Makefile.am
+++ b/lang/cpp/src/Makefile.am
@@ -82,9 +82,9 @@ GpgmeppConfig.cmake: GpgmeppConfig.cmake.in
 
 install-cmake-files: GpgmeppConfig.cmake GpgmeppConfigVersion.cmake
 	-$(INSTALL) -d $(DESTDIR)$(libdir)/cmake/Gpgmepp
-	$(INSTALL) GpgmeppConfig.cmake \
+	$(INSTALL) -m 644 GpgmeppConfig.cmake \
         $(DESTDIR)$(libdir)/cmake/Gpgmepp/GpgmeppConfig.cmake
-	$(INSTALL) GpgmeppConfigVersion.cmake \
+	$(INSTALL) -m 644 GpgmeppConfigVersion.cmake \
         $(DESTDIR)$(libdir)/cmake/Gpgmepp/GpgmeppConfigVersion.cmake
 
 uninstall-cmake-files:
diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am
index 8c27e67..51fe314 100644
--- a/lang/qt/src/Makefile.am
+++ b/lang/qt/src/Makefile.am
@@ -234,9 +234,9 @@ $(camelcase_headers): Makefile.am
 
 install-cmake-files: QGpgmeConfig.cmake QGpgmeConfigVersion.cmake
 	-$(INSTALL) -d $(DESTDIR)$(libdir)/cmake/Gpgmepp
-	$(INSTALL) QGpgmeConfig.cmake \
+	$(INSTALL) -m 644 QGpgmeConfig.cmake \
         $(DESTDIR)$(libdir)/cmake/Gpgmepp/QGpgmeConfig.cmake
-	$(INSTALL) QGpgmeConfigVersion.cmake \
+	$(INSTALL) -m 644 QGpgmeConfigVersion.cmake \
         $(DESTDIR)$(libdir)/cmake/Gpgmepp/QGpgmeConfigVersion.cmake
 
 uninstall-cmake-files:

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

Summary of changes:
 lang/cpp/src/Makefile.am | 4 ++--
 lang/qt/src/Makefile.am  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org



From cvs at cvs.gnupg.org  Thu Oct 13 10:15:07 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Thu, 13 Oct 2016 10:15:07 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.7.0-47-g56302e7
Message-ID: <E1bubAT-0006rl-KL@lists.gnupg.org>

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 "GnuPG Made Easy".

The branch, master has been updated
       via  56302e7bb6a694a7c570f389f9a7883efdfdaf42 (commit)
      from  a274c7590aa0e38d682d5177904983632f471cb0 (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 56302e7bb6a694a7c570f389f9a7883efdfdaf42
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Oct 13 10:13:47 2016 +0200

    cpp: Fix version number
    
    * configure.ac (LIBGPGMEPP_LT_CURRENT): Bump.
    --
    Added API so it should have been correct to bump current
    and age and not to bump age.

diff --git a/configure.ac b/configure.ac
index 64f9385..0cfda5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,9 +61,9 @@ LIBGPGME_LT_CURRENT=26
 LIBGPGME_LT_AGE=15
 LIBGPGME_LT_REVISION=0
 
-LIBGPGMEPP_LT_CURRENT=6
-LIBGPGMEPP_LT_AGE=1
-LIBGPGMEPP_LT_REVISION=2
+LIBGPGMEPP_LT_CURRENT=8
+LIBGPGMEPP_LT_AGE=2
+LIBGPGMEPP_LT_REVISION=0
 
 LIBQGPGME_LT_CURRENT=7
 LIBQGPGME_LT_AGE=0

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

Summary of changes:
 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org



From cvs at cvs.gnupg.org  Thu Oct 13 12:48:01 2016
From: cvs at cvs.gnupg.org (by Neal H. Walfield)
Date: Thu, 13 Oct 2016 12:48:01 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-226-g4c0389f
Message-ID: <E1budYT-0005LJ-Jz@lists.gnupg.org>

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  4c0389f8eb19ae7dfd9c5d784a629b386d93cc5c (commit)
       via  e09166c77273f459c8f87cab9224f85808af2cba (commit)
       via  5bf92e51dfdfb4f4746ecd817d8d2240ed27ea74 (commit)
       via  2282c3b761413dfa894300e70084bbd58908c0b1 (commit)
      from  3ad17e72fa81d18c95732ddcd4def244f52bb5b1 (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 4c0389f8eb19ae7dfd9c5d784a629b386d93cc5c
Author: Neal H. Walfield <neal at g10code.com>
Date:   Thu Oct 13 12:44:59 2016 +0200

    g10: Be more careful when checking cross signatures.
    
    * g10/tofu.c (cross_sigs): When checking cross signatures, only
    consider the signatures on the specified user id.
    * tests/openpgp/tofu.scm: Add test for the above.
    * tests/openpgp/tofu/cross-sigs/
      1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg:
      New file.
    * tests/openpgp/tofu/cross-sigs/
      1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt: New file.
    * tests/openpgp/tofu/cross-sigs/
      1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg: New file.
    * tests/openpgp/tofu/cross-sigs/
      1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt: New file.
    * tests/openpgp/tofu/cross-sigs/
      1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt: New file.
    * tests/openpgp/tofu/cross-sigs/
      1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg: New file.
    * tests/openpgp/tofu/cross-sigs/
      DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg: New file.
    * tests/openpgp/tofu/cross-sigs/
      DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt: New file.
    * tests/openpgp/tofu/cross-sigs/
      DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg: New file.
    * tests/openpgp/tofu/cross-sigs/
      DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt: New file.
    * tests/openpgp/tofu/cross-sigs/
      DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg: New file.
    * tests/openpgp/tofu/cross-sigs/
      DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt: New file.
    * tests/openpgp/tofu/cross-sigs/
      DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg: New file.
    * tests/openpgp/tofu/cross-sigs/
      DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg: New file.
    * tests/openpgp/tofu/cross-sigs/README: New file.
    
    --
    Signed-off-by: Neal H. Walfield

diff --git a/g10/tofu.c b/g10/tofu.c
index 8184c6f..dcee6e7 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -1211,7 +1211,7 @@ format_conflict_msg_part1 (int policy, strlist_t conflict_set,
 
 /* Return 1 if A signed B and B signed A.  */
 static int
-cross_sigs (kbnode_t a, kbnode_t b)
+cross_sigs (const char *email, kbnode_t a, kbnode_t b)
 {
   int i;
 
@@ -1240,12 +1240,36 @@ cross_sigs (kbnode_t a, kbnode_t b)
       u32 *signer_kid = pk_main_keyid (signer_pk);
       kbnode_t n;
 
+      int saw_email = 0;
+
       /* Iterate over SIGNEE's keyblock and see if there is a valid
          signature from SIGNER.  */
       for (n = signee; n; n = n->next)
         {
           PKT_signature *sig;
 
+          if (n->pkt->pkttype == PKT_USER_ID)
+            {
+              if (saw_email)
+                /* We're done: we've processed all signatures on the
+                   user id.  */
+                break;
+              else
+                {
+                  /* See if this is the matching user id.  */
+                  PKT_user_id *user_id = n->pkt->pkt.user_id;
+                  char *email2 = email_from_user_id (user_id->name);
+
+                  if (strcmp (email, email2) == 0)
+                    saw_email = 1;
+
+                  xfree (email2);
+                }
+            }
+
+          if (! saw_email)
+            continue;
+
           if (n->pkt->pkttype != PKT_SIGNATURE)
             continue;
 
@@ -1974,7 +1998,7 @@ build_conflict_set (tofu_dbs_t dbs, const char *fingerprint, const char *email)
 
         for (j = i + 1; j < conflict_set_count; j ++)
           /* Be careful: we might not have a key block for a key.  */
-          if (kb_all[i] && kb_all[j] && cross_sigs (kb_all[i], kb_all[j]))
+          if (kb_all[i] && kb_all[j] && cross_sigs (email, kb_all[i], kb_all[j]))
             die[j] = 1;
       }
 
diff --git a/tests/openpgp/tofu.scm b/tests/openpgp/tofu.scm
index e514ddf..96f7abe 100755
--- a/tests/openpgp/tofu.scm
+++ b/tests/openpgp/tofu.scm
@@ -159,3 +159,76 @@
 (checkpolicy "BC15C85A" "ask")
 (checkpolicy "2183839A" "bad")
 (checkpolicy "EE37CF96" "ask")
+
+
+
+;; Check that we detect the following attack:
+;;
+;; Alice and Bob each have a key and cross sign them.  Bob then adds a
+;; new user id, "Alice".  TOFU should now detect a conflict, because
+;; Alice only signed Bob's "Bob" user id.
+
+(display "Checking cross sigs...\n")
+(define GPG `(,(tool 'gpg) --no-permission-warning
+	      --faked-system-time=1476304861))
+
+;; Carefully remove the TOFU db.
+(catch '() (unlink (string-append GNUPGHOME "/tofu.db")))
+
+(define DIR "tofu/cross-sigs")
+;; The test keys.
+(define KEYA "1938C3A0E4674B6C217AC0B987DB2814EC38277E")
+(define KEYB "DC463A16E42F03240D76E8BA8B48C6BD871C2247")
+
+(define (verify-messages)
+  (for-each
+   (lambda (key)
+     (for-each
+      (lambda (i)
+        (let ((fn (in-srcdir DIR (string-append key "-" i ".txt"))))
+          (call-check `(, at GPG --trust-model=tofu --verify ,fn))))
+      (list "1" "2")))
+   (list KEYA KEYB)))
+
+;; Import the public keys.
+(display "    > Two keys. ")
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYA "-1.gpg"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYB "-1.gpg"))))
+;; Make sure the tofu engine registers the keys.
+(verify-messages)
+(display "<\n")
+
+;; Since their is no conflict, the policy should be auto.
+(checkpolicy KEYA "auto")
+(checkpolicy KEYB "auto")
+
+;; Import the cross sigs.
+(display "    > Adding cross signatures. ")
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYA "-2.gpg"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYB "-2.gpg"))))
+(verify-messages)
+(display "<\n")
+
+;; There is still no conflict, so the policy shouldn't have changed.
+(checkpolicy KEYA "auto")
+(checkpolicy KEYB "auto")
+
+;; Import the conflicting user id.
+(display "    > Adding conflicting user id. ")
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYB "-3.gpg"))))
+(call-check `(, at GPG --trust-model=tofu
+		    --verify ,(in-srcdir DIR (string-append KEYB "-1.txt"))))
+(verify-messages)
+(display "<\n")
+
+(checkpolicy KEYA "ask")
+(checkpolicy KEYB "ask")
+
+;; Import Alice's signature on the conflicting user id.
+(display "    > Adding cross signature on user id. ")
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYB "-4.gpg"))))
+(verify-messages)
+(display "<\n")
+
+(checkpolicy KEYA "auto")
+(checkpolicy KEYB "auto")
diff --git a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg b/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg
new file mode 100644
index 0000000..e6becec
Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg differ
diff --git a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt b/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt
new file mode 100644
index 0000000..92236be
Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt differ
diff --git a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg b/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg
new file mode 100644
index 0000000..d26bd54
Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg differ
diff --git a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt b/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt
new file mode 100644
index 0000000..b4013d3
Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt differ
diff --git a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt b/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt
new file mode 100644
index 0000000..9b2d49d
Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt differ
diff --git a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg b/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg
new file mode 100644
index 0000000..1839e3a
Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg differ
diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg b/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg
new file mode 100644
index 0000000..f706f70
Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg differ
diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt b/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt
new file mode 100644
index 0000000..0bdc1fc
Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt differ
diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg b/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg
new file mode 100644
index 0000000..0b2485f
Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg differ
diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt b/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt
new file mode 100644
index 0000000..4d3aaaa
Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt differ
diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg b/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg
new file mode 100644
index 0000000..eb2c435
Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg differ
diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt b/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt
new file mode 100644
index 0000000..9b2d49d
Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt differ
diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg b/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg
new file mode 100644
index 0000000..9c98ec1
Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg differ
diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg b/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg
new file mode 100644
index 0000000..a87c61b
Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg differ
diff --git a/tests/openpgp/tofu/cross-sigs/README b/tests/openpgp/tofu/cross-sigs/README
new file mode 100644
index 0000000..439962b
--- /dev/null
+++ b/tests/openpgp/tofu/cross-sigs/README
@@ -0,0 +1,79 @@
+# How I generate the keys and messages to verify:
+
+# Generate and export two non-conflicting keys.
+gpg --quick-gen-key 'Spy Cow <spy at cow.com>'
+gpg --quick-gen-key 'Spy R. Cow <spy at cow.de>'
+
+KEYIDA=1938C3A0E4674B6C217AC0B987DB2814EC38277E
+KEYIDB=DC463A16E42F03240D76E8BA8B48C6BD871C2247
+
+for KEYID in $KEYIDA $KEYIDB
+do
+  gpg --export $KEYID  > tofu-$KEYID.gpg
+  gpg --export-secret-keys $KEYID  > tofu-$KEYID-secret.gpg
+done
+
+# Sign some data.
+echo foo | gpg --default-key $KEYIDA -s > tofu-$KEYIDA-1.txt
+echo foo | gpg --default-key $KEYIDB -s > tofu-$KEYIDB-1.txt
+
+# Again, but with an issuer.
+echo foo | gpg --default-key "<spy at cow.com>" -s > tofu-$KEYIDA-2.txt
+echo foo | gpg --default-key "<spy at cow.de>" -s > tofu-$KEYIDB-2.txt
+
+# Have A sign B and vice versa.
+gpg --default-key $KEYIDA --quick-sign $KEYIDB
+gpg --default-key $KEYIDB --quick-sign $KEYIDA
+
+gpg --export $KEYIDA  > tofu-$KEYIDA-2.gpg
+gpg --export $KEYIDB  > tofu-$KEYIDB-2.gpg
+
+# Cause A and B to conflict.
+gpg --quick-adduid $KEYIDB 'Spy R. Cow <spy at cow.com>'
+gpg --export $KEYIDB  > tofu-$KEYIDB-3.gpg
+
+echo foo | gpg --default-key "<spy at cow.com>" -s > tofu-$KEYIDA-3.txt
+echo foo | gpg --default-key "<spy at cow.com>" -s > tofu-$KEYIDB-3.txt
+
+# Have A sign B's conflicting user id.
+gpg --default-key $KEYIDA --quick-sign $KEYIDB
+gpg --export $KEYIDB  > tofu-$KEYIDB-4.gpg
+
+exit 0
+
+# In a new directory (so the keys are not ultimately trusted).
+
+D=~/neal/work/gpg/test
+echo 'trust-model tofu+pgp' > gpg.conf
+gpg --import $D/tofu-$KEYIDA.gpg
+gpg --import $D/tofu-$KEYIDB.gpg
+gpg -k
+
+gpg --verify $D/tofu-$KEYIDA-1.txt
+gpg --verify $D/tofu-$KEYIDB-1.txt
+# With an issuer.
+gpg --verify $D/tofu-$KEYIDA-2.txt
+gpg --verify $D/tofu-$KEYIDB-2.txt
+
+# Import the cross signatures.
+gpg --import $D/tofu-$KEYIDA-2.gpg
+gpg --import $D/tofu-$KEYIDB-2.gpg
+gpg -k
+
+gpg --verify $D/tofu-$KEYIDA-1.txt
+gpg --verify $D/tofu-$KEYIDB-1.txt
+# With an issuer.
+gpg --verify $D/tofu-$KEYIDA-2.txt
+gpg --verify $D/tofu-$KEYIDB-2.txt
+
+
+gpg --status-fd=1 --batch --verify $D/tofu-$KEYIDA-3.txt | grep TRUST_UNDEFINED
+gpg --status-fd=1 --batch --verify $D/tofu-$KEYIDB-3.txt | grep TRUST_UNDEFINED
+
+# Import the conflicting user id.
+gpg --import $D/tofu-$KEYIDB-3.gpg
+gpg -k
+
+# Import the cross signature, which should remove the conflict.
+gpg --import $D/tofu-$KEYIDB-4.gpg
+gpg -k

commit e09166c77273f459c8f87cab9224f85808af2cba
Author: Neal H. Walfield <neal at g10code.com>
Date:   Thu Oct 13 12:38:19 2016 +0200

    g10: Still check if the key is an UTK or cross signed in batch mode.
    
    * g10/tofu.c (get_trust): If POLICY is ask, but we can't ask, don't
    bail immediately.  Instead, check if the key in question is an
    ultimately trusted key or cross signed.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>

diff --git a/g10/tofu.c b/g10/tofu.c
index b9416d5..8184c6f 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -2131,12 +2131,6 @@ get_trust (ctrl_t ctrl, PKT_public_key *pk,
 
     case TOFU_POLICY_ASK:
       /* We need to ask the user what to do.  Case #1 or #2 below.  */
-      if (! may_ask)
-	{
-	  trust_level = TRUST_UNDEFINED;
-	  goto out;
-	}
-
       break;
 
     case TOFU_POLICY_NONE:
@@ -2296,18 +2290,19 @@ get_trust (ctrl_t ctrl, PKT_public_key *pk,
 
   if (! may_ask)
     {
-      /* We can only get here in the third case (no saved policy) and
-       * if there is a conflict.  (If the policy was ask (cases #1 and
-       * #2) and we weren't allowed to ask, we'd have already exited).  */
-      log_assert (policy == TOFU_POLICY_NONE);
-
-      if (record_binding (dbs, fingerprint, email, user_id,
-			  TOFU_POLICY_ASK,
-                          conflict_set && conflict_set->next
-                          ? conflict_set->next->d : NULL,
-                          0, now) != 0)
-	log_error (_("error setting TOFU binding's trust level to %s\n"),
-		   "ask");
+      log_assert (policy == TOFU_POLICY_NONE || policy == TOFU_POLICY_ASK);
+      if (policy == TOFU_POLICY_NONE)
+        {
+          /* We get here in the third case (no saved policy) and if
+           * there is a conflict.  */
+          if (record_binding (dbs, fingerprint, email, user_id,
+                              TOFU_POLICY_ASK,
+                              conflict_set && conflict_set->next
+                              ? conflict_set->next->d : NULL,
+                              0, now) != 0)
+            log_error (_("error setting TOFU binding's trust level to %s\n"),
+                       "ask");
+        }
 
       trust_level = TRUST_UNDEFINED;
       goto out;

commit 5bf92e51dfdfb4f4746ecd817d8d2240ed27ea74
Author: Neal H. Walfield <neal at g10code.com>
Date:   Thu Oct 13 12:32:03 2016 +0200

    g10: If an sqlite operation fails, map the error code to GPG_ERR_GENERAL
    
    * g10/tofu.c (get_policy): If an sqlite operation fails, map the error
      code to GPG_ERR_GENERAL.
    (ask_about_binding): Likewise.
    (build_conflict_set): Likewise.
    (get_trust): Likewise.
    (show_statistics): Likewise.
    (tofu_register_signature): Likewise.
    (tofu_register_encryption): Likewise.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>

diff --git a/g10/tofu.c b/g10/tofu.c
index d7f4e4c..b9416d5 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -1082,6 +1082,7 @@ get_policy (tofu_dbs_t dbs, const char *fingerprint, const char *email,
       log_error (_("error reading TOFU database: %s\n"), err);
       print_further_info ("checking for existing bad bindings");
       sqlite3_free (err);
+      rc = gpg_error (GPG_ERR_GENERAL);
       goto out;
     }
 
@@ -1404,6 +1405,7 @@ ask_about_binding (ctrl_t ctrl,
       log_error (_("error gathering other user IDs: %s\n"), sqerr);
       sqlite3_free (sqerr);
       sqerr = NULL;
+      rc = gpg_error (GPG_ERR_GENERAL);
     }
 
   if (other_user_ids)
@@ -1481,7 +1483,10 @@ ask_about_binding (ctrl_t ctrl,
          GPGSQL_ARG_STRING, iter->d,
          GPGSQL_ARG_END);
       if (rc)
-        break;
+        {
+          rc = gpg_error (GPG_ERR_GENERAL);
+          break;
+        }
 
       if (!stats || strcmp (iter->d, stats->fingerprint) != 0)
         /* No stats for this binding.  Add a dummy entry.  */
@@ -1496,7 +1501,10 @@ ask_about_binding (ctrl_t ctrl,
          GPGSQL_ARG_STRING, iter->d,
          GPGSQL_ARG_END);
       if (rc)
-        break;
+        {
+          rc = gpg_error (GPG_ERR_GENERAL);
+          break;
+        }
 
 #undef STATS_SQL
 
@@ -1803,6 +1811,7 @@ build_conflict_set (tofu_dbs_t dbs, const char *fingerprint, const char *email)
       log_error (_("error reading TOFU database: %s\n"), sqerr);
       print_further_info ("listing fingerprints");
       sqlite3_free (sqerr);
+      rc = gpg_error (GPG_ERR_GENERAL);
       return NULL;
     }
 
@@ -2349,6 +2358,7 @@ get_trust (ctrl_t ctrl, PKT_public_key *pk,
                                   fingerprint, user_id);
               sqlite3_free (sqerr);
               sqerr = NULL;
+              rc = gpg_error (GPG_ERR_GENERAL);
             }
           else if (DBG_TRUST)
             log_debug ("Set %s to conflict with %s\n",
@@ -2597,6 +2607,7 @@ show_statistics (tofu_dbs_t dbs, const char *fingerprint,
       log_error (_("error reading TOFU database: %s\n"), err);
       print_further_info ("getting signature statistics");
       sqlite3_free (err);
+      rc = gpg_error (GPG_ERR_GENERAL);
       goto out;
     }
 
@@ -2629,6 +2640,7 @@ show_statistics (tofu_dbs_t dbs, const char *fingerprint,
       log_error (_("error reading TOFU database: %s\n"), err);
       print_further_info ("getting encryption statistics");
       sqlite3_free (err);
+      rc = gpg_error (GPG_ERR_GENERAL);
       goto out;
     }
 
@@ -2927,6 +2939,7 @@ tofu_register_signature (ctrl_t ctrl,
           log_error (_("error reading TOFU database: %s\n"), err);
           print_further_info ("checking existence");
           sqlite3_free (err);
+          rc = gpg_error (GPG_ERR_GENERAL);
         }
       else if (c > 1)
         /* Duplicates!  This should not happen.  In particular,
@@ -2980,6 +2993,7 @@ tofu_register_signature (ctrl_t ctrl,
               log_error (_("error updating TOFU database: %s\n"), err);
               print_further_info ("insert signatures");
               sqlite3_free (err);
+              rc = gpg_error (GPG_ERR_GENERAL);
             }
         }
 
@@ -3093,6 +3107,7 @@ tofu_register_encryption (ctrl_t ctrl,
           log_error (_("error updating TOFU database: %s\n"), err);
           print_further_info ("insert encryption");
           sqlite3_free (err);
+          rc = gpg_error (GPG_ERR_GENERAL);
         }
 
       xfree (email);

commit 2282c3b761413dfa894300e70084bbd58908c0b1
Author: Neal H. Walfield <neal at g10code.com>
Date:   Thu Oct 13 12:30:12 2016 +0200

    tests: Remove support for deprecated functionality.
    
    * tests/openpgp/tofu.scm: Don't remove tofu.d.  It's deprecated.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>

diff --git a/tests/openpgp/tofu.scm b/tests/openpgp/tofu.scm
index f4de1d8..e514ddf 100755
--- a/tests/openpgp/tofu.scm
+++ b/tests/openpgp/tofu.scm
@@ -99,7 +99,6 @@
 
 ;; Carefully remove the TOFU db.
 (catch '() (unlink (string-append GNUPGHOME "/tofu.db")))
-(catch '() (unlink-recursively (string-append GNUPGHOME "/tofu.d")))
 
 ;; Verify a message.  There should be no conflict and the trust
 ;; policy should be set to auto.

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

Summary of changes:
 g10/tofu.c                                         |  78 ++++++++++++++------
 tests/openpgp/tofu.scm                             |  74 ++++++++++++++++++-
 .../1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg | Bin 0 -> 1171 bytes
 .../1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt | Bin 0 -> 321 bytes
 .../1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg | Bin 0 -> 1458 bytes
 .../1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt | Bin 0 -> 334 bytes
 .../1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt | Bin 0 -> 334 bytes
 ...C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg | Bin 0 -> 2473 bytes
 .../DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg | Bin 0 -> 1173 bytes
 .../DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt | Bin 0 -> 321 bytes
 .../DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg | Bin 0 -> 1460 bytes
 .../DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt | Bin 0 -> 333 bytes
 .../DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg | Bin 0 -> 1800 bytes
 .../DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt | Bin 0 -> 334 bytes
 .../DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg | Bin 0 -> 2087 bytes
 ...3A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg | Bin 0 -> 2475 bytes
 tests/openpgp/tofu/cross-sigs/README               |  79 +++++++++++++++++++++
 17 files changed, 208 insertions(+), 23 deletions(-)
 create mode 100644 tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg
 create mode 100644 tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt
 create mode 100644 tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg
 create mode 100644 tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt
 create mode 100644 tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt
 create mode 100644 tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg
 create mode 100644 tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg
 create mode 100644 tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt
 create mode 100644 tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg
 create mode 100644 tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt
 create mode 100644 tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg
 create mode 100644 tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt
 create mode 100644 tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg
 create mode 100644 tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg
 create mode 100644 tests/openpgp/tofu/cross-sigs/README


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



From cvs at cvs.gnupg.org  Thu Oct 13 13:22:24 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Thu, 13 Oct 2016 13:22:24 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.7.0-50-gf526d0e
Message-ID: <E1bue5i-0006Qq-AA@lists.gnupg.org>

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 "GnuPG Made Easy".

The branch, master has been updated
       via  f526d0e22e8b881ccbca66b46a0e1b68bbc4cd6b (commit)
       via  1e6073ffa98db2c265adbcf0dbbe70c067a910f0 (commit)
       via  cabd4c74e52c8983d624b6877cddc7f8912eff04 (commit)
      from  56302e7bb6a694a7c570f389f9a7883efdfdaf42 (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 f526d0e22e8b881ccbca66b46a0e1b68bbc4cd6b
Author: Justus Winter <justus at g10code.com>
Date:   Thu Oct 13 13:13:23 2016 +0200

    python: Make 'get_key' more idiomatic.
    
    * lang/python/pyme/core.py (Context.get_key): Raise errors.KeyNotFound
    if the key is not found.  This error is both a KeyError for idiomatic
    error handling as well as a GPGMEError so we don't break existing
    code.
    * lang/python/pyme/errors.py (KeyNotFound): New class.
    * lang/python/tests/support.py (no_such_key): New variable.
    * lang/python/tests/t-keylist.py: Test the new behavior.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py
index cd5217f..f0eab43 100644
--- a/lang/python/pyme/core.py
+++ b/lang/python/pyme/core.py
@@ -680,11 +680,19 @@ class Context(GpgmeWrapper):
                         -- the matching key
 
         Raises:
+        KeyError	-- if the key was not found
         GPGMEError	-- as signaled by the underlying library
 
         """
         ptr = gpgme.new_gpgme_key_t_p()
-        errorcheck(gpgme.gpgme_get_key(self.wrapped, fpr, ptr, secret))
+
+        try:
+            errorcheck(gpgme.gpgme_get_key(self.wrapped, fpr, ptr, secret))
+        except errors.GPGMEError as e:
+            if e.getcode() == errors.EOF:
+                raise errors.KeyNotFound(fpr)
+            raise e
+
         key = gpgme.gpgme_key_t_p_value(ptr)
         gpgme.delete_gpgme_key_t_p(ptr)
         assert key
diff --git a/lang/python/pyme/errors.py b/lang/python/pyme/errors.py
index e26c747..0fd85ef 100644
--- a/lang/python/pyme/errors.py
+++ b/lang/python/pyme/errors.py
@@ -21,10 +21,12 @@ del absolute_import, print_function, unicode_literals
 from . import gpgme
 from . import util
 
-util.process_constants('GPG_ERR_', globals())
+# To appease static analysis tools, we define some constants here.
+# They are overwritten with the proper values by process_constants.
+NO_ERROR = None
+EOF = None
 
-# To appease static analysis tools, we define some constants here:
-NO_ERROR = 0
+util.process_constants('GPG_ERR_', globals())
 
 class PymeError(Exception):
     pass
@@ -58,6 +60,20 @@ def errorcheck(retval, extradata = None):
     if retval:
         raise GPGMEError(retval, extradata)
 
+class KeyNotFound(GPGMEError, KeyError):
+    """Raised if a key was not found
+
+    GPGME indicates this condition with EOF, which is not very
+    idiomatic.  We raise this error that is both a GPGMEError
+    indicating EOF, and a KeyError.
+
+    """
+    def __init__(self, keystr):
+        self.keystr = keystr
+        GPGMEError.__init__(self, EOF)
+    def __str__(self):
+        return self.keystr
+
 # These errors are raised in the idiomatic interface code.
 
 class EncryptionError(PymeError):
diff --git a/lang/python/tests/support.py b/lang/python/tests/support.py
index 4d7135e..f1ffdc3 100644
--- a/lang/python/tests/support.py
+++ b/lang/python/tests/support.py
@@ -27,6 +27,7 @@ alpha = "A0FF4590BB6122EDEF6E3C542D727CC768697734"
 bob = "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2"
 encrypt_only = "F52770D5C4DB41408D918C9F920572769B9FE19C"
 sign_only = "7CCA20CCDE5394CEE71C9F0BFED153F12F18F45D"
+no_such_key = "A" * 40
 
 def make_filename(name):
     return os.path.join(os.environ['top_srcdir'], 'tests', 'gpg', name)
diff --git a/lang/python/tests/t-keylist.py b/lang/python/tests/t-keylist.py
index 5e8b333..f7f6674 100755
--- a/lang/python/tests/t-keylist.py
+++ b/lang/python/tests/t-keylist.py
@@ -20,6 +20,7 @@
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
+import pyme
 from pyme import core, constants
 import support
 
@@ -244,3 +245,25 @@ for i, key in enumerate(c.keylist()):
 
     if misc_check:
         misc_check (uids[0][0], key)
+
+
+# check get_key()
+with pyme.Context() as c:
+  c.get_key(support.alpha)
+  c.get_key(support.alpha, secret=True)
+
+  c.get_key(support.bob)
+  try:
+    c.get_key(support.bob, secret=True)
+  except KeyError:
+    pass
+  else:
+    assert False, "Expected KeyError"
+
+  # Legacy error
+  try:
+    c.get_key(support.no_such_key)
+  except pyme.errors.GPGMEError:
+    pass
+  else:
+    assert False, "Expected GPGMEError"

commit 1e6073ffa98db2c265adbcf0dbbe70c067a910f0
Author: Justus Winter <justus at g10code.com>
Date:   Thu Oct 13 12:05:59 2016 +0200

    python: Return public keys by default.
    
    * lang/python/pyme/core.py (Core.get_key): Return public keys by
    default, improve docstring.
    * lang/python/examples/testCMSgetkey.py: Update example.
    * lang/python/examples/verifydetails.py: Likewise.
    
    GnuPG-bug-id: 2751
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/lang/python/examples/testCMSgetkey.py b/lang/python/examples/testCMSgetkey.py
index 4467b6c..62c35d2 100644
--- a/lang/python/examples/testCMSgetkey.py
+++ b/lang/python/examples/testCMSgetkey.py
@@ -28,7 +28,7 @@ if len(sys.argv) != 2:
     sys.exit("fingerprint or unique key ID for gpgme_get_key()")
 
 with pyme.Context(protocol=pyme.constants.PROTOCOL_CMS) as c:
-    key = c.get_key(sys.argv[1], False)
+    key = c.get_key(sys.argv[1])
 
     print("got key: ", key.subkeys[0].fpr)
     for uid in key.uids:
diff --git a/lang/python/examples/verifydetails.py b/lang/python/examples/verifydetails.py
index fa34926..81f82e9 100755
--- a/lang/python/examples/verifydetails.py
+++ b/lang/python/examples/verifydetails.py
@@ -52,7 +52,7 @@ def verifyprintdetails(filename, detached_sig_filename=None):
             print("  status:      %#0x" % (sign.status))
             print("  timestamp:  ", sign.timestamp)
             print("  fingerprint:", sign.fpr)
-            print("  uid:        ", c.get_key(sign.fpr, 0).uids[0].uid)
+            print("  uid:        ", c.get_key(sign.fpr).uids[0].uid)
 
     # Print "unsigned" text if inline signature
     if data:
diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py
index 88a086b..cd5217f 100644
--- a/lang/python/pyme/core.py
+++ b/lang/python/pyme/core.py
@@ -670,15 +670,26 @@ class Context(GpgmeWrapper):
             key.__del__ = lambda self: gpgme.gpgme_key_unref(self)
             return key
 
-    def get_key(self, fpr, secret):
-        """Return the key corresponding to the fingerprint 'fpr'"""
+    def get_key(self, fpr, secret=False):
+        """Get a key given a fingerprint
+
+        Keyword arguments:
+        secret		-- to request a secret key
+
+        Returns:
+                        -- the matching key
+
+        Raises:
+        GPGMEError	-- as signaled by the underlying library
+
+        """
         ptr = gpgme.new_gpgme_key_t_p()
         errorcheck(gpgme.gpgme_get_key(self.wrapped, fpr, ptr, secret))
         key = gpgme.gpgme_key_t_p_value(ptr)
         gpgme.delete_gpgme_key_t_p(ptr)
-        if key:
-            key.__del__ = lambda self: gpgme.gpgme_key_unref(self)
-            return key
+        assert key
+        key.__del__ = lambda self: gpgme.gpgme_key_unref(self)
+        return key
 
     def op_trustlist_all(self, *args, **kwargs):
         self.op_trustlist_start(*args, **kwargs)

commit cabd4c74e52c8983d624b6877cddc7f8912eff04
Author: Justus Winter <justus at g10code.com>
Date:   Thu Oct 13 12:45:50 2016 +0200

    python: Fix example.
    
    * lang/python/examples/inter-edit.py: Fix example.
    
    Fixes-commit: a458e7fe
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/lang/python/examples/inter-edit.py b/lang/python/examples/inter-edit.py
index 39d6f17..3c0f29b 100644
--- a/lang/python/examples/inter-edit.py
+++ b/lang/python/examples/inter-edit.py
@@ -40,8 +40,8 @@ with pyme.Context() as c:
     print("Editing key {} ({}):".format(key.uids[0].uid, key.subkeys[0].fpr))
 
     def edit_fnc(keyword, args):
-        print("Status: {} ({}), args: {} > ".format(
-            keyword, status, args), end='', flush=True)
+        print("Status: {}, args: {} > ".format(
+            keyword, args), end='', flush=True)
 
         if not 'GET' in keyword:
             # no prompt

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

Summary of changes:
 lang/python/examples/inter-edit.py    |  4 ++--
 lang/python/examples/testCMSgetkey.py |  2 +-
 lang/python/examples/verifydetails.py |  2 +-
 lang/python/pyme/core.py              | 31 +++++++++++++++++++++++++------
 lang/python/pyme/errors.py            | 22 +++++++++++++++++++---
 lang/python/tests/support.py          |  1 +
 lang/python/tests/t-keylist.py        | 23 +++++++++++++++++++++++
 7 files changed, 72 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org



From cvs at cvs.gnupg.org  Thu Oct 13 14:26:56 2016
From: cvs at cvs.gnupg.org (by Neal H. Walfield)
Date: Thu, 13 Oct 2016 14:26:56 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-227-gd2d936f
Message-ID: <E1buf6B-0000KS-8D@lists.gnupg.org>

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  d2d936fbe86d61b89cead95df633b2b575690e05 (commit)
      from  4c0389f8eb19ae7dfd9c5d784a629b386d93cc5c (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 d2d936fbe86d61b89cead95df633b2b575690e05
Author: Neal H. Walfield <neal at g10code.com>
Date:   Thu Oct 13 14:26:53 2016 +0200

    tests: Add test data to TEST_FILES.
    
    * tests/openpgp/Makefile.am (TEST_FILES): Add new test data.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>
    Fixes-commit: 4c0389f8eb19ae7dfd9c5d784a629b386d93cc5c

diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index 8c51ae6..be110fb 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -109,7 +109,22 @@ TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \
 	     bug537-test.data.asc bug894-test.asc \
 	     bug1223-good.asc bug1223-bogus.asc 4gb-packet.asc \
 	     tofu-keys.asc tofu-keys-secret.asc \
-	     tofu-2183839A-1.txt tofu-BC15C85A-1.txt tofu-EE37CF96-1.txt
+	     tofu-2183839A-1.txt tofu-BC15C85A-1.txt tofu-EE37CF96-1.txt \
+	     tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg \
+	     tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg \
+	     tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt \
+	     tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg \
+	     tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt \
+	     tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt \
+	     tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg \
+	     tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg \
+	     tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt \
+	     tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg \
+	     tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt \
+	     tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg \
+	     tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt \
+	     tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg \
+	     tofu/cross-sigs/README
 
 data_files = data-500 data-9000 data-32000 data-80000 plain-large
 

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

Summary of changes:
 tests/openpgp/Makefile.am | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)


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



From cvs at cvs.gnupg.org  Thu Oct 13 21:22:05 2016
From: cvs at cvs.gnupg.org (by Neal H. Walfield)
Date: Thu, 13 Oct 2016 21:22:05 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-228-g95d0f3e
Message-ID: <E1bulZv-0007Kf-DP@lists.gnupg.org>

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  95d0f3e5eebd85dcf226dca14891a1215bfe93ae (commit)
      from  d2d936fbe86d61b89cead95df633b2b575690e05 (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 95d0f3e5eebd85dcf226dca14891a1215bfe93ae
Author: Neal H. Walfield <neal at g10code.com>
Date:   Thu Oct 13 20:54:06 2016 +0200

    g10: Be more careful when checking if a binding is signed by a UTK.
    
    * g10/tofu.c (signed_by_utk): When checking if a key is signed by an
    ultimately trusted key, only consider the signatures on the specified
    user id.
    * tests/openpgp/tofu.scm: Add test for the above.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>

diff --git a/g10/tofu.c b/g10/tofu.c
index dcee6e7..d437c5a 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -1308,14 +1308,37 @@ cross_sigs (const char *email, kbnode_t a, kbnode_t b)
 
 /* Return whether the key was signed by an ultimately trusted key.  */
 static int
-signed_by_utk (kbnode_t a)
+signed_by_utk (const char *email, kbnode_t a)
 {
   kbnode_t n;
+  int saw_email = 0;
 
   for (n = a; n; n = n->next)
     {
       PKT_signature *sig;
 
+      if (n->pkt->pkttype == PKT_USER_ID)
+        {
+          if (saw_email)
+            /* We're done: we've processed all signatures on the
+               user id.  */
+            break;
+          else
+            {
+              /* See if this is the matching user id.  */
+              PKT_user_id *user_id = n->pkt->pkt.user_id;
+              char *email2 = email_from_user_id (user_id->name);
+
+              if (strcmp (email, email2) == 0)
+                saw_email = 1;
+
+              xfree (email2);
+            }
+        }
+
+      if (! saw_email)
+        continue;
+
       if (n->pkt->pkttype != PKT_SIGNATURE)
         continue;
 
@@ -2221,7 +2244,7 @@ get_trust (ctrl_t ctrl, PKT_public_key *pk,
           }
         else
           {
-            is_signed_by_utk = signed_by_utk (kb);
+            is_signed_by_utk = signed_by_utk (email, kb);
             release_kbnode (kb);
           }
       }
diff --git a/tests/openpgp/tofu.scm b/tests/openpgp/tofu.scm
index 96f7abe..2939250 100755
--- a/tests/openpgp/tofu.scm
+++ b/tests/openpgp/tofu.scm
@@ -198,7 +198,7 @@
 (verify-messages)
 (display "<\n")
 
-;; Since their is no conflict, the policy should be auto.
+;; Since there is no conflict, the policy should be auto.
 (checkpolicy KEYA "auto")
 (checkpolicy KEYB "auto")
 
@@ -232,3 +232,85 @@
 
 (checkpolicy KEYA "auto")
 (checkpolicy KEYB "auto")
+
+;; Remove the keys.
+(call-check `(, at GPG --delete-key ,KEYA))
+(call-check `(, at GPG --delete-key ,KEYB))
+
+
+;; Check that we detect the following attack:
+;;
+;; Alice has an ultimately trusted key and she signs Bob's key.  Then
+;; Bob adds a new user id, "Alice".  TOFU should now detect a
+;; conflict, because Alice only signed Bob's "Bob" user id.
+
+(display "Checking UTK sigs...\n")
+(define GPG `(,(tool 'gpg) --no-permission-warning
+	      --faked-system-time=1476304861))
+
+;; Carefully remove the TOFU db.
+(catch '() (unlink (string-append GNUPGHOME "/tofu.db")))
+
+(define DIR "tofu/cross-sigs")
+;; The test keys.
+(define KEYA "1938C3A0E4674B6C217AC0B987DB2814EC38277E")
+(define KEYB "DC463A16E42F03240D76E8BA8B48C6BD871C2247")
+
+(define (verify-messages)
+  (for-each
+   (lambda (key)
+     (for-each
+      (lambda (i)
+        (let ((fn (in-srcdir DIR (string-append key "-" i ".txt"))))
+          (call-check `(, at GPG --trust-model=tofu --verify ,fn))))
+      (list "1" "2")))
+   (list KEYA KEYB)))
+
+;; Import the public keys.
+(display "    > Two keys. ")
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYA "-1.gpg"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYB "-1.gpg"))))
+(display "<\n")
+
+;; Import the cross sigs.
+(display "    > Adding cross signatures. ")
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYA "-2.gpg"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYB "-2.gpg"))))
+(display "<\n")
+
+;; Make KEYA ultimately trusted.
+(display (string-append "    > Marking " KEYA " as ultimately trusted. "))
+(pipe:do
+ (pipe:echo (string-append KEYA ":6:\n"))
+ (pipe:gpg `(--import-ownertrust)))
+(display "<\n")
+
+;; An ultimately trusted key's policy is good.
+(checkpolicy KEYA "good")
+;; A key signed by a UTK for which there is no policy gets the default
+;; policy of good.
+(checkpolicy KEYB "good")
+
+;; Import the conflicting user id.
+(display "    > Adding conflicting user id. ")
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYB "-3.gpg"))))
+(call-check `(, at GPG --trust-model=tofu
+		    --verify ,(in-srcdir DIR (string-append KEYB "-1.txt"))))
+(verify-messages)
+(display "<\n")
+
+(checkpolicy KEYA "good")
+(checkpolicy KEYB "ask")
+
+;; Import Alice's signature on the conflicting user id.
+(display "    > Adding cross signature on user id. ")
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYB "-4.gpg"))))
+(verify-messages)
+(display "<\n")
+
+(checkpolicy KEYA "good")
+(checkpolicy KEYB "good")
+
+;; Remove the keys.
+(call-check `(, at GPG --delete-key ,KEYA))
+(call-check `(, at GPG --delete-key ,KEYB))

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

Summary of changes:
 g10/tofu.c             | 27 ++++++++++++++--
 tests/openpgp/tofu.scm | 84 +++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 108 insertions(+), 3 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Oct 13 22:02:42 2016
From: cvs at cvs.gnupg.org (by Neal H. Walfield)
Date: Thu, 13 Oct 2016 22:02:42 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-229-g0c56ad5
Message-ID: <E1bumDE-0000Ni-PG@lists.gnupg.org>

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  0c56ad5a8d89d69a9ed00571720b3b105f955214 (commit)
      from  95d0f3e5eebd85dcf226dca14891a1215bfe93ae (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 0c56ad5a8d89d69a9ed00571720b3b105f955214
Author: Neal H. Walfield <neal at g10code.com>
Date:   Thu Oct 13 21:38:50 2016 +0200

    tests: Use shorter filenames.
    
    * tests/openpgp/tofu/cross-sigs/
      1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg: Rename from this...
    * tests/openpgp/tofu/cross-sigs/EC38277E-1.gpg: .. to this.
    * tests/openpgp/tofu/cross-sigs/
      1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt: Rename from this...
    * tests/openpgp/tofu/cross-sigs/EC38277E-1.txt: .. to this.
    * tests/openpgp/tofu/cross-sigs/
      1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg: Rename from this...
    * tests/openpgp/tofu/cross-sigs/EC38277E-2.gpg: .. to this.
    * tests/openpgp/tofu/cross-sigs/
      1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt: Rename from this...
    * tests/openpgp/tofu/cross-sigs/EC38277E-2.txt: .. to this.
    * tests/openpgp/tofu/cross-sigs/
      1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt: Rename from this...
    * tests/openpgp/tofu/cross-sigs/EC38277E-3.txt: .. to this.
    * tests/openpgp/tofu/cross-sigs/
      1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg: Rename from
      this...
    * tests/openpgp/tofu/cross-sigs/EC38277E-secret.gpg: .. to this.
    * tests/openpgp/tofu/cross-sigs/
      DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg: Rename from this...
    * tests/openpgp/tofu/cross-sigs/871C2247-1.gpg: .. to this.
    * tests/openpgp/tofu/cross-sigs/
      DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt: Rename from this...
    * tests/openpgp/tofu/cross-sigs/871C2247-1.txt: .. to this.
    * tests/openpgp/tofu/cross-sigs/
      DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg: Rename from this...
    * tests/openpgp/tofu/cross-sigs/871C2247-2.gpg: .. to this.
    * tests/openpgp/tofu/cross-sigs/
      DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt: Rename from this...
    * tests/openpgp/tofu/cross-sigs/871C2247-2.txt: .. to this.
    * tests/openpgp/tofu/cross-sigs/
      DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg: Rename from this...
    * tests/openpgp/tofu/cross-sigs/871C2247-3.gpg: .. to this.
    * tests/openpgp/tofu/cross-sigs/
      DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt: Rename from this...
    * tests/openpgp/tofu/cross-sigs/871C2247-3.txt: .. to this.
    * tests/openpgp/tofu/cross-sigs/
      DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg: Rename from this...
    * tests/openpgp/tofu/cross-sigs/871C2247-4.gpg: .. to this.
    * tests/openpgp/tofu/cross-sigs/
      DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg: Rename from
      this...
    * tests/openpgp/tofu/cross-sigs/871C2247-secret.gpg: .. to this.
    * tests/openpgp/Makefile.am (TEST_FILES): Update accordingly.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>
    Fixed-commit: d2d936fbe86d61b89cead95df633b2b575690e05

diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index be110fb..bb9b2f4 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -110,20 +110,20 @@ TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \
 	     bug1223-good.asc bug1223-bogus.asc 4gb-packet.asc \
 	     tofu-keys.asc tofu-keys-secret.asc \
 	     tofu-2183839A-1.txt tofu-BC15C85A-1.txt tofu-EE37CF96-1.txt \
-	     tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg \
-	     tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg \
-	     tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt \
-	     tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg \
-	     tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt \
-	     tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt \
-	     tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg \
-	     tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg \
-	     tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt \
-	     tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg \
-	     tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt \
-	     tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg \
-	     tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt \
-	     tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg \
+	     tofu/cross-sigs/EC38277E-secret.gpg \
+	     tofu/cross-sigs/EC38277E-1.gpg \
+	     tofu/cross-sigs/EC38277E-1.txt \
+	     tofu/cross-sigs/EC38277E-2.gpg \
+	     tofu/cross-sigs/EC38277E-2.txt \
+	     tofu/cross-sigs/EC38277E-3.txt \
+	     tofu/cross-sigs/871C2247-secret.gpg \
+	     tofu/cross-sigs/871C2247-1.gpg \
+	     tofu/cross-sigs/871C2247-1.txt \
+	     tofu/cross-sigs/871C2247-2.gpg \
+	     tofu/cross-sigs/871C2247-2.txt \
+	     tofu/cross-sigs/871C2247-3.gpg \
+	     tofu/cross-sigs/871C2247-3.txt \
+	     tofu/cross-sigs/871C2247-4.gpg \
 	     tofu/cross-sigs/README
 
 data_files = data-500 data-9000 data-32000 data-80000 plain-large
diff --git a/tests/openpgp/tofu.scm b/tests/openpgp/tofu.scm
index 2939250..3cca189 100755
--- a/tests/openpgp/tofu.scm
+++ b/tests/openpgp/tofu.scm
@@ -179,6 +179,8 @@
 ;; The test keys.
 (define KEYA "1938C3A0E4674B6C217AC0B987DB2814EC38277E")
 (define KEYB "DC463A16E42F03240D76E8BA8B48C6BD871C2247")
+(define KEYIDA (substring KEYA (- (string-length KEYA) 8)))
+(define KEYIDB (substring KEYB (- (string-length KEYB) 8)))
 
 (define (verify-messages)
   (for-each
@@ -188,12 +190,12 @@
         (let ((fn (in-srcdir DIR (string-append key "-" i ".txt"))))
           (call-check `(, at GPG --trust-model=tofu --verify ,fn))))
       (list "1" "2")))
-   (list KEYA KEYB)))
+   (list KEYIDA KEYIDB)))
 
 ;; Import the public keys.
 (display "    > Two keys. ")
-(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYA "-1.gpg"))))
-(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYB "-1.gpg"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYIDA "-1.gpg"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYIDB "-1.gpg"))))
 ;; Make sure the tofu engine registers the keys.
 (verify-messages)
 (display "<\n")
@@ -204,8 +206,8 @@
 
 ;; Import the cross sigs.
 (display "    > Adding cross signatures. ")
-(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYA "-2.gpg"))))
-(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYB "-2.gpg"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYIDA "-2.gpg"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYIDB "-2.gpg"))))
 (verify-messages)
 (display "<\n")
 
@@ -215,9 +217,7 @@
 
 ;; Import the conflicting user id.
 (display "    > Adding conflicting user id. ")
-(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYB "-3.gpg"))))
-(call-check `(, at GPG --trust-model=tofu
-		    --verify ,(in-srcdir DIR (string-append KEYB "-1.txt"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYIDB "-3.gpg"))))
 (verify-messages)
 (display "<\n")
 
@@ -226,7 +226,7 @@
 
 ;; Import Alice's signature on the conflicting user id.
 (display "    > Adding cross signature on user id. ")
-(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYB "-4.gpg"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYIDB "-4.gpg"))))
 (verify-messages)
 (display "<\n")
 
@@ -255,6 +255,8 @@
 ;; The test keys.
 (define KEYA "1938C3A0E4674B6C217AC0B987DB2814EC38277E")
 (define KEYB "DC463A16E42F03240D76E8BA8B48C6BD871C2247")
+(define KEYIDA (substring KEYA (- (string-length KEYA) 8)))
+(define KEYIDB (substring KEYB (- (string-length KEYB) 8)))
 
 (define (verify-messages)
   (for-each
@@ -264,18 +266,18 @@
         (let ((fn (in-srcdir DIR (string-append key "-" i ".txt"))))
           (call-check `(, at GPG --trust-model=tofu --verify ,fn))))
       (list "1" "2")))
-   (list KEYA KEYB)))
+   (list KEYIDA KEYIDB)))
 
 ;; Import the public keys.
 (display "    > Two keys. ")
-(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYA "-1.gpg"))))
-(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYB "-1.gpg"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYIDA "-1.gpg"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYIDB "-1.gpg"))))
 (display "<\n")
 
 ;; Import the cross sigs.
 (display "    > Adding cross signatures. ")
-(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYA "-2.gpg"))))
-(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYB "-2.gpg"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYIDA "-2.gpg"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYIDB "-2.gpg"))))
 (display "<\n")
 
 ;; Make KEYA ultimately trusted.
@@ -293,9 +295,7 @@
 
 ;; Import the conflicting user id.
 (display "    > Adding conflicting user id. ")
-(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYB "-3.gpg"))))
-(call-check `(, at GPG --trust-model=tofu
-		    --verify ,(in-srcdir DIR (string-append KEYB "-1.txt"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYIDB "-3.gpg"))))
 (verify-messages)
 (display "<\n")
 
@@ -304,7 +304,7 @@
 
 ;; Import Alice's signature on the conflicting user id.
 (display "    > Adding cross signature on user id. ")
-(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYB "-4.gpg"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYIDB "-4.gpg"))))
 (verify-messages)
 (display "<\n")
 
diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg b/tests/openpgp/tofu/cross-sigs/871C2247-1.gpg
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg
rename to tests/openpgp/tofu/cross-sigs/871C2247-1.gpg
diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt b/tests/openpgp/tofu/cross-sigs/871C2247-1.txt
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt
rename to tests/openpgp/tofu/cross-sigs/871C2247-1.txt
diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg b/tests/openpgp/tofu/cross-sigs/871C2247-2.gpg
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg
rename to tests/openpgp/tofu/cross-sigs/871C2247-2.gpg
diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt b/tests/openpgp/tofu/cross-sigs/871C2247-2.txt
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt
rename to tests/openpgp/tofu/cross-sigs/871C2247-2.txt
diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg b/tests/openpgp/tofu/cross-sigs/871C2247-3.gpg
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg
rename to tests/openpgp/tofu/cross-sigs/871C2247-3.gpg
diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt b/tests/openpgp/tofu/cross-sigs/871C2247-3.txt
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt
rename to tests/openpgp/tofu/cross-sigs/871C2247-3.txt
diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg b/tests/openpgp/tofu/cross-sigs/871C2247-4.gpg
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg
rename to tests/openpgp/tofu/cross-sigs/871C2247-4.gpg
diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg b/tests/openpgp/tofu/cross-sigs/871C2247-secret.gpg
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg
rename to tests/openpgp/tofu/cross-sigs/871C2247-secret.gpg
diff --git a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg b/tests/openpgp/tofu/cross-sigs/EC38277E-1.gpg
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg
rename to tests/openpgp/tofu/cross-sigs/EC38277E-1.gpg
diff --git a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt b/tests/openpgp/tofu/cross-sigs/EC38277E-1.txt
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt
rename to tests/openpgp/tofu/cross-sigs/EC38277E-1.txt
diff --git a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg b/tests/openpgp/tofu/cross-sigs/EC38277E-2.gpg
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg
rename to tests/openpgp/tofu/cross-sigs/EC38277E-2.gpg
diff --git a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt b/tests/openpgp/tofu/cross-sigs/EC38277E-2.txt
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt
rename to tests/openpgp/tofu/cross-sigs/EC38277E-2.txt
diff --git a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt b/tests/openpgp/tofu/cross-sigs/EC38277E-3.txt
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt
rename to tests/openpgp/tofu/cross-sigs/EC38277E-3.txt
diff --git a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg b/tests/openpgp/tofu/cross-sigs/EC38277E-secret.gpg
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg
rename to tests/openpgp/tofu/cross-sigs/EC38277E-secret.gpg

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

Summary of changes:
 tests/openpgp/Makefile.am                          |  28 ++++++++--------
 tests/openpgp/tofu.scm                             |  36 ++++++++++-----------
 ...76E8BA8B48C6BD871C2247-1.gpg => 871C2247-1.gpg} | Bin
 ...76E8BA8B48C6BD871C2247-1.txt => 871C2247-1.txt} | Bin
 ...76E8BA8B48C6BD871C2247-2.gpg => 871C2247-2.gpg} | Bin
 ...76E8BA8B48C6BD871C2247-2.txt => 871C2247-2.txt} | Bin
 ...76E8BA8B48C6BD871C2247-3.gpg => 871C2247-3.gpg} | Bin
 ...76E8BA8B48C6BD871C2247-3.txt => 871C2247-3.txt} | Bin
 ...76E8BA8B48C6BD871C2247-4.gpg => 871C2247-4.gpg} | Bin
 ...C6BD871C2247-secret.gpg => 871C2247-secret.gpg} | Bin
 ...7AC0B987DB2814EC38277E-1.gpg => EC38277E-1.gpg} | Bin
 ...7AC0B987DB2814EC38277E-1.txt => EC38277E-1.txt} | Bin
 ...7AC0B987DB2814EC38277E-2.gpg => EC38277E-2.gpg} | Bin
 ...7AC0B987DB2814EC38277E-2.txt => EC38277E-2.txt} | Bin
 ...7AC0B987DB2814EC38277E-3.txt => EC38277E-3.txt} | Bin
 ...2814EC38277E-secret.gpg => EC38277E-secret.gpg} | Bin
 16 files changed, 32 insertions(+), 32 deletions(-)
 rename tests/openpgp/tofu/cross-sigs/{DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg => 871C2247-1.gpg} (100%)
 rename tests/openpgp/tofu/cross-sigs/{DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt => 871C2247-1.txt} (100%)
 rename tests/openpgp/tofu/cross-sigs/{DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg => 871C2247-2.gpg} (100%)
 rename tests/openpgp/tofu/cross-sigs/{DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt => 871C2247-2.txt} (100%)
 rename tests/openpgp/tofu/cross-sigs/{DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg => 871C2247-3.gpg} (100%)
 rename tests/openpgp/tofu/cross-sigs/{DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt => 871C2247-3.txt} (100%)
 rename tests/openpgp/tofu/cross-sigs/{DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg => 871C2247-4.gpg} (100%)
 rename tests/openpgp/tofu/cross-sigs/{DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg => 871C2247-secret.gpg} (100%)
 rename tests/openpgp/tofu/cross-sigs/{1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg => EC38277E-1.gpg} (100%)
 rename tests/openpgp/tofu/cross-sigs/{1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt => EC38277E-1.txt} (100%)
 rename tests/openpgp/tofu/cross-sigs/{1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg => EC38277E-2.gpg} (100%)
 rename tests/openpgp/tofu/cross-sigs/{1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt => EC38277E-2.txt} (100%)
 rename tests/openpgp/tofu/cross-sigs/{1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt => EC38277E-3.txt} (100%)
 rename tests/openpgp/tofu/cross-sigs/{1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg => EC38277E-secret.gpg} (100%)


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



From cvs at cvs.gnupg.org  Fri Oct 14 10:31:34 2016
From: cvs at cvs.gnupg.org (by Kai Michaelis)
Date: Fri, 14 Oct 2016 10:31:34 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-230-gf99c5fa
Message-ID: <E1buxtx-0003Dy-Pd@lists.gnupg.org>

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  f99c5fa1c970dc1122ac62371eb8d758f380ed57 (commit)
      from  0c56ad5a8d89d69a9ed00571720b3b105f955214 (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 f99c5fa1c970dc1122ac62371eb8d758f380ed57
Author: Kai Michaelis <kai at gnupg.org>
Date:   Thu Oct 13 17:43:47 2016 +0200

    dirmngr: add VERSIONCHECK command
    
    Given an application name and version VERSIONCHECK fetches the software
    version list from version.gnupg.org, verifies the signature and returns
    whenever the given version is older (UPDATE), current (CURRENT) or newer
    (ROLLBACK).

diff --git a/dirmngr/server.c b/dirmngr/server.c
index e5cf2c3..22d6f2d 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -54,6 +54,7 @@
 #include "mbox-util.h"
 #include "zb32.h"
 #include "server-help.h"
+#include "../common/exectool.h"
 
 /* To avoid DoS attacks we limit the size of a certificate to
    something reasonable.  The DoS was actually only an issue back when
@@ -2340,6 +2341,231 @@ cmd_reloaddirmngr (assuan_context_t ctx, char *line)
 }
 
 
+

+/* Returns -1 if version a is less than b, 0 if the versions are equal and 1 otherwise.
+ * Versions are compared as period-separated tuples starting at the front. Elements are
+ * interpreted as decimals first. If this fails strcmp is used. Comparison continues
+ * until two elements are found the be unequal of the end is reached. */
+static int
+cmp_version(const char* a, const char* b)
+{
+  char *a_dup, *b_dup, *strtok_internal_a = NULL, *strtok_internal_b = NULL, *a_comp, *b_comp;
+  int ret = 0;
+
+  assert (a && b);
+
+  a_dup = xstrdup (a);
+  b_dup = xstrdup (b);
+  a_comp = strtok_r (a_dup, ".", &strtok_internal_a);
+  b_comp = strtok_r (b_dup, ".", &strtok_internal_b);
+
+  while (a_comp || b_comp)
+    {
+      if (a_comp && *a_comp && b_comp && *b_comp)
+        {
+          char* a_end;
+          char* b_end;
+          int a_ver = strtol (a_comp, &a_end, 10);
+          int b_ver = strtol (b_comp, &b_end, 10);
+
+          if (!*a_end && !*b_end)
+            {
+              if (a_ver != b_ver)
+                {
+                  ret = a_ver - b_ver;
+                  break;
+                }
+            }
+          else
+            {
+              int r = strcmp (a_comp, b_comp);
+              if (r != 0)
+                {
+                  ret = r;
+                  break;
+                }
+            }
+        }
+      else
+        {
+          if ((!a_comp || !*a_comp) && b_comp && *b_comp)
+            ret = -1;
+          else if (a_comp && *a_comp && (!b_comp || !*b_comp))
+            ret = 1;
+          else
+            ret = 0;
+          break;
+        }
+
+      a_comp = strtok_r (NULL, ".", &strtok_internal_a);
+      b_comp = strtok_r (NULL, ".", &strtok_internal_b);
+    }
+
+  xfree (a_dup);
+  xfree (b_dup);
+  return ret;
+}
+
+static int
+fetch_into_tmpfile(const char* url, ctrl_t ctrl, estream_t* strm_out, char** path)
+{
+  gpg_error_t err = 0;
+  char* filename = xmalloc (128);
+  int fd = -1;
+  estream_t file;
+  estream_t strm;
+  size_t len = 0;
+  char buf[1024];
+
+  if (!strm_out)
+    {
+      err = (GPG_ERR_INV_ARG);
+      goto leave;
+    }
+
+  snprintf (filename ,128 ,"%s%s%s" ,P_tmpdir ,DIRSEP_S ,"dirmngr_fetch_XXXXXX");
+
+  if ((fd = mkstemp (filename)) < 0)
+    {
+      err = gpg_err_code_from_syserror ();
+      goto leave;
+    }
+
+  file = es_fdopen (fd, "w+");
+
+  if ((err = ks_http_fetch (ctrl, url, &strm)))
+    goto leave;
+
+  while (!es_read (strm, buf, 1024, &len))
+    {
+      if (!len)
+        break;
+      if ((err = es_write (file, buf, len, NULL)))
+        {
+          log_error ("error writing message to pipe: %s\n", gpg_strerror (err));
+          es_free (strm);
+          goto leave;
+        }
+    }
+
+  es_rewind (file);
+  es_fclose (strm);
+  *strm_out = file;
+
+  if (path)
+    {
+    *path = filename;
+    filename = NULL;
+    }
+
+leave:
+  if (filename)
+    xfree (filename);
+  return err;
+}
+
+static const char hlp_versioncheck[] =
+  "VERSIONCHECK <name> <version>"
+  "\n"
+  "Checks the internet to find whenever a new program version is available."
+  "\n"
+  "<name> program name i.e. \"gnupg\""
+  "<version> current version of the program i.e. \"2.0.2\"";
+static gpg_error_t
+cmd_versioncheck (assuan_context_t ctx, char *line)
+{
+  gpg_error_t err;
+  char* strtok_internal = NULL;
+  char* name = strtok_r (line, " ", &strtok_internal);
+  char* version = strtok_r (NULL, " ", &strtok_internal);
+  ctrl_t ctrl = assuan_get_pointer (ctx);
+  estream_t swdb;
+  estream_t swdb_sig;
+  char* swdb_path = NULL;
+  char* swdb_sig_path = NULL;
+  char* buf = NULL;
+  size_t len = 0;
+  const size_t name_len = (name ? strlen (name) : 0);
+  const size_t version_len = (version ? strlen (version) : 0);
+  const char *argv[8];
+  char keyring_path[128];
+
+  if (!name || name_len == 0)
+    {
+      err = set_error (GPG_ERR_ASS_PARAMETER, "No program name given");
+      goto out;
+    }
+
+  if (!version || version_len == 0)
+    {
+      err = set_error (GPG_ERR_ASS_PARAMETER, "No program version given");
+      goto out;
+    }
+
+  if ((err = fetch_into_tmpfile ("https://versions.gnupg.org/swdb.lst", ctrl, &swdb, &swdb_path)))
+    goto out;
+
+  if ((err = fetch_into_tmpfile ("https://versions.gnupg.org/swdb.lst.sig", ctrl, &swdb_sig, &swdb_sig_path)))
+    goto out;
+
+  snprintf(keyring_path, 128, "%s%s%s", gnupg_datadir (), DIRSEP_S, "distsigkey.gpg");
+
+  argv[0] = "--batch";
+  argv[1] = "--no-default-keyring";
+  argv[2] = "--keyring";
+  argv[3] = keyring_path;
+  argv[4] = "--verify";
+  argv[5] = swdb_sig_path;
+  argv[6] = "-";
+  argv[7] = NULL;
+
+  if ((err = gnupg_exec_tool_stream(gnupg_module_name (GNUPG_MODULE_NAME_GPG),
+                                    argv, swdb, NULL, NULL, NULL, NULL)))
+    goto out;
+
+  es_fseek (swdb, 0, SEEK_SET);
+
+  while (es_getline (&buf, &len, swdb) > 0)
+    {
+      if (len > name_len + 5 &&
+          strncmp (buf, name, name_len) == 0 &&
+          strncmp (buf + name_len, "_ver ", 5) == 0)
+        {
+          const char* this_ver_start = buf + name_len + 5;
+          char* this_ver_end = strchr (this_ver_start, '\n');
+          int cmp;
+
+          if (this_ver_end)
+            *this_ver_end = 0;
+
+          err = assuan_write_status (ctx, "LINE", buf);
+
+          cmp = cmp_version(this_ver_start,version);
+
+          if (cmp < 0)
+            err = assuan_send_data (ctx, "ROLLBACK", strlen ("ROLLBACK"));
+          else if (cmp == 0)
+            err = assuan_send_data (ctx, "CURRENT", strlen ("CURRENT"));
+          else
+            err = assuan_send_data (ctx, "UPDATE", strlen ("UPDATE"));
+
+          goto out;
+        }
+    }
+
+  err = assuan_send_data (ctx, "NOT_FOUND", strlen ("NOT_FOUND"));
+
+  out:
+  es_fclose (swdb);
+  es_fclose (swdb_sig);
+  xfree(buf);
+  unlink(swdb_path);
+  unlink(swdb_sig_path);
+  xfree(swdb_path);
+  xfree(swdb_sig_path);
+  return leave_cmd (ctx, err);
+}
+
 
 

 /* Tell the assuan library about our commands. */
@@ -2370,6 +2596,7 @@ register_commands (assuan_context_t ctx)
     { "GETINFO",    cmd_getinfo,    hlp_getinfo },
     { "KILLDIRMNGR",cmd_killdirmngr,hlp_killdirmngr },
     { "RELOADDIRMNGR",cmd_reloaddirmngr,hlp_reloaddirmngr },
+    { "VERSIONCHECK",cmd_versioncheck,hlp_versioncheck },
     { NULL, NULL }
   };
   int i, j, rc;

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

Summary of changes:
 dirmngr/server.c | 227 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 227 insertions(+)


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



From cvs at cvs.gnupg.org  Fri Oct 14 15:15:08 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Fri, 14 Oct 2016 15:15:08 +0200
Subject: [git] GpgOL - branch, nomapi, updated. gpgol-1.4.0-85-g0499861
Message-ID: <E1bv2KN-0005bj-2o@lists.gnupg.org>

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 "GnuPG extension for MS Outlook".

The branch, nomapi has been updated
       via  0499861a0dda3fd159d93e3638550e7fcd768501 (commit)
       via  04be440d4d1aad06a6d6f2f9f91a56b4be53d2eb (commit)
       via  d299d6357ed98e31914bfc3cfe09f681b3deb73a (commit)
       via  d3a2f213e0fd0ac0771d57d7af474332b81c63f9 (commit)
       via  cf5689b2cd8226a440e8dbc8b17e226186e52781 (commit)
       via  6cb1c3fd4f31fa90a1cc003a4ae162c89614add4 (commit)
      from  fb3c90c8852edf41ac97ef3e821228dc4a54bafe (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 0499861a0dda3fd159d93e3638550e7fcd768501
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Oct 14 14:42:40 2016 +0200

    Start implementation of ribbon base sigstate
    
    * src/gpgoladdin.cpp (GpgolRibbonExtender::GetIDsOfNames): Register
    new names.
    (GpgolRibbonExtender::Invoke): Handle new names.
    (GetCustomUI_MIME): Reactivate Read code. Use new callbacks.
    (Mail::Mail): Do not cache sig validity.
    (Mail::get_valid_sig): Get Sig / UID pair of the valid sig.
    (Mail::is_valid_sig): Use get_valid_sig.
    (Mail::is_signed): Fix use of temporary parser object.
    (Mail::set_uid): Set uid to be identifyable from callbacks.
    (Mail::get_signature_status): Format string for supertip.
    * src/mail.h: Update accordingly.
    * src/ribbon-callbacks.cpp (get_crypt_status): Removed.
    (get_mail_from_control): New. Helper to resolve the Mail object.
    (MY_MAIL_GETTER): Helper macro for common task.
    (get_is_signed, get_sig_label, get_sig_ttip, get_sig_stip): New
    callbacks.
    (launch_cert_details): Dummy.
    
    --
    This shows the signature state (currently only for valid signatures)
    in the GpgOL ribbon when reading mails. The UID is used to
    identify the according Mail object that belongs to a read inspector.

diff --git a/src/gpgoladdin.cpp b/src/gpgoladdin.cpp
index 21cf950..ac5d399 100644
--- a/src/gpgoladdin.cpp
+++ b/src/gpgoladdin.cpp
@@ -528,10 +528,13 @@ GpgolRibbonExtender::GetIDsOfNames (REFIID riid, LPOLESTR *rgszNames,
       ID_MAPPER (L"signMimeEx", ID_CMD_MIME_SIGN_EX)
       ID_MAPPER (L"getEncryptPressedEx", ID_GET_ENCRYPT_PRESSED_EX)
       ID_MAPPER (L"getSignPressedEx", ID_GET_SIGN_PRESSED_EX)
-      ID_MAPPER (L"ribbonLoaded", ID_ON_LOAD);
+      ID_MAPPER (L"ribbonLoaded", ID_ON_LOAD)
       ID_MAPPER (L"openOptions", ID_CMD_OPEN_OPTIONS)
-      ID_MAPPER (L"getSigStatus", ID_GET_SIG_STATUS)
-      ID_MAPPER (L"getEncStatus", ID_GET_ENC_STATUS)
+      ID_MAPPER (L"getSigLabel", ID_GET_SIG_LABEL)
+      ID_MAPPER (L"getSigSTip", ID_GET_SIG_STIP)
+      ID_MAPPER (L"getSigTip", ID_GET_SIG_TTIP)
+      ID_MAPPER (L"launchDetails", ID_LAUNCH_CERT_DETAILS)
+      ID_MAPPER (L"getIsSigned", ID_GET_IS_SIGNED)
     }
 
   if (cNames > 1)
@@ -603,11 +606,17 @@ GpgolRibbonExtender::Invoke (DISPID dispid, REFIID riid, LCID lcid,
       case ID_GET_SIGN_PRESSED_EX:
         return get_crypt_pressed (parms->rgvarg[0].pdispVal, OP_SIGN,
                                   result, true);
-      case ID_GET_ENC_STATUS:
-        return get_crypt_status (parms->rgvarg[0].pdispVal, OP_ENCRYPT,
-                                 result);
-      case ID_GET_SIG_STATUS:
-        return get_crypt_status (parms->rgvarg[0].pdispVal, OP_SIGN, result);
+      case ID_GET_SIG_STIP:
+        return get_sig_stip (parms->rgvarg[0].pdispVal, result);
+      case ID_GET_SIG_TTIP:
+        return get_sig_ttip (parms->rgvarg[0].pdispVal, result);
+      case ID_GET_SIG_LABEL:
+        return get_sig_label (parms->rgvarg[0].pdispVal, result);
+      case ID_LAUNCH_CERT_DETAILS:
+        return launch_cert_details (parms->rgvarg[0].pdispVal, result);
+      case ID_GET_IS_SIGNED:
+        return get_is_signed (parms->rgvarg[0].pdispVal, result);
+
       case ID_ON_LOAD:
           {
             g_ribbon_uis.push_back (parms->rgvarg[0].pdispVal);
@@ -663,16 +672,6 @@ GetCustomUI_MIME (BSTR RibbonID, BSTR * RibbonXml)
     _("Sign the message and all attachments before sending.");
   const char *optsSTip =
     _("Open the settings dialog for GpgOL.");
-#if 0
-  const char *encryptedTTip =
-    "If this is toggled the message was encrypted. (this is development UI)";
-  const char *encryptedSTip =
-    "TODO insert more details here";
-  const char *signedTTip =
-    "If this is toggled the message was signed. (this is development UI)";
-  const char *signedSTip =
-    "TODO insert more details here";
-#endif
   log_debug ("%s:%s: GetCustomUI_MIME for id: %ls", SRCNAME, __func__, RibbonID);
 
   if (!RibbonXml || !RibbonID)
@@ -724,27 +723,19 @@ GetCustomUI_MIME (BSTR RibbonID, BSTR * RibbonXml)
       gpgrt_asprintf (&buffer,
         "<customUI xmlns=\"http://schemas.microsoft.com/office/2009/07/customui\""
         " onLoad=\"ribbonLoaded\">"
-#if 0
         " <ribbon>"
         "   <tabs>"
         "    <tab idMso=\"TabReadMessage\">"
         "     <group id=\"general\""
         "            label=\"%s\">"
-        "       <toggleButton id=\"idEncrypted\""
-        "               getImage=\"btnCryptStatus\""
-        "               size=\"large\""
-        "               label=\"%s\""
-        "               screentip=\"%s\""
-        "               supertip=\"%s\""
-        "               getEnabled=\"getEncStatus\"/>"
         "       <button id=\"idSigned\""
         "               getImage=\"btnSignLarge\""
         "               size=\"large\""
-        "               label=\"%s\""
-        "               screentip=\"%s\""
-        "               supertip=\"%s\""
-        "               onAction=\"verifyBody\""
-        "               getEnabled=\"getSigStatus\"/>"
+        "               getLabel=\"getSigLabel\""
+        "               getScreentip=\"getSigTip\""
+        "               getSupertip=\"getSigSTip\""
+        "               onAction=\"launchDetails\""
+        "               getEnabled=\"getIsSigned\"/>"
         "       <dialogBoxLauncher>"
         "         <button id=\"optsBtn\""
         "                 onAction=\"openOptions\""
@@ -754,7 +745,6 @@ GetCustomUI_MIME (BSTR RibbonID, BSTR * RibbonXml)
         "    </tab>"
         "   </tabs>"
         " </ribbon>"
-#endif
         "<contextMenus>"
         " <contextMenu idMso=\"ContextMenuAttachments\">"
         "   <button id=\"gpgol_decrypt\""
@@ -764,12 +754,8 @@ GetCustomUI_MIME (BSTR RibbonID, BSTR * RibbonXml)
         " </contextMenu>"
         "</contextMenus>"
         "</customUI>",
-#if 0
         _("GpgOL"),
-        _("Encrypted"), encryptedTTip, encryptedSTip,
-        _("Signed"), signedTTip, signedSTip,
         optsSTip,
-#endif
         _("Decrypt")
         );
     }
diff --git a/src/mail.cpp b/src/mail.cpp
index 953d085..e50b466 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -85,7 +85,6 @@ Mail::Mail (LPDISPATCH mailitem) :
     m_crypt_successful(false),
     m_is_smime(false),
     m_is_smime_checked(false),
-    m_is_valid_sig(false),
     m_moss_position(0),
     m_sender(NULL),
     m_type(MSGTYPE_UNKNOWN)
@@ -560,8 +559,6 @@ Mail::parsing_done()
   m_verify_result = m_parser->verify_result ();
   m_needs_wipe = true;
 
-  /* Check our validity */
-  is_valid_sig ();
   /* Set categories according to the result. */
   update_categories();
 
@@ -875,26 +872,30 @@ Mail::close_inspector ()
   return 0;
 }
 
-bool
-Mail::is_valid_sig ()
+const std::pair <Signature, UserID>
+Mail::get_valid_sig ()
 {
   const char *sender = get_sender();
+  std::pair <Signature, UserID> ret;
 
-  static bool sig_checked;
-
-  if (m_verify_result.isNull())
+  if (!sender)
     {
-      return false;
+      log_error ("%s:%s:%i", SRCNAME, __func__, __LINE__);
+      return ret;
     }
-  if (sig_checked)
+
+  if (m_verify_result.isNull())
     {
-      return m_is_valid_sig;
+      log_debug ("%s:%s: No verify result.",
+                 SRCNAME, __func__);
+      return ret;
     }
 
-  if (m_verify_result.error() || !sender)
+  if (m_verify_result.error())
     {
-      m_is_valid_sig = false;
-      sig_checked = true;
+      log_debug ("%s:%s: verify error.",
+                 SRCNAME, __func__);
+      return ret;
     }
 
   for (const auto sig: m_verify_result.signatures())
@@ -942,13 +943,20 @@ Mail::is_valid_sig ()
                 }
               log_debug ("%s:%s: Classified sender as verified",
                          SRCNAME, __func__);
-              m_is_valid_sig = true;
-              break;
+              return std::pair<Signature, UserID> (sig, uid);
             }
         }
     }
-  sig_checked = true;
-  return m_is_valid_sig;
+  log_debug ("%s:%s: No signature with enough trust.",
+             SRCNAME, __func__);
+  return ret;
+}
+
+bool
+Mail::is_valid_sig ()
+{
+   const auto pair = get_valid_sig();
+   return !pair.first.isNull() && !pair.second.isNull();
 }
 
 void
@@ -969,7 +977,7 @@ Mail::update_categories ()
       remove_category (m_mailitem, decCategory);
     }
 
-  if (m_is_valid_sig)
+  if (is_valid_sig())
     {
       add_category (m_mailitem, verifyCategory);
     }
@@ -983,10 +991,75 @@ Mail::update_categories ()
 bool
 Mail::is_signed()
 {
-  if (!m_parser)
+  return m_verify_result.numSignatures() > 0;
+}
+
+int
+Mail::set_uid()
+{
+  if (!m_uid.empty())
     {
-      return false;
+      return 0;
+    }
+  char *uid = get_unique_id (m_mailitem, 1);
+
+  if (!uid)
+    {
+      log_debug ("%s:%s: Failed to get uid for %p",
+                 SRCNAME, __func__, m_mailitem);
+      return -1;
+    }
+  m_uid = uid;
+  xfree (uid);
+  g_uid_map.insert (std::pair<std::string, Mail *> (m_uid, this));
+  return 0;
+}
+
+std::string
+Mail::get_signature_status()
+{
+  std::string message;
+  if (!is_signed())
+    {
+      return _("This message is not signed.\nYou cannot be sure who wrote the message.");
+    }
+
+  const auto pair = get_valid_sig ();
+  const auto sig = pair.first;
+  const auto uid = pair.second;
+  char *buf;
+  bool isOpenPGP = sig.key().protocol() == Protocol::OpenPGP;
+  if (!sig.isNull () && !uid.isNull ())
+    {
+      /* We are valid */
+      gpgrt_asprintf (&buf, _("The signature is valid because:\n\nThe used %s %s"),
+                      isOpenPGP ? _("key") : _("certificate"),
+                      sig.validity() == Signature::Validity::Ultimate ?
+                      _("is marked as your own.") :
+                      sig.validity() == Signature::Validity::Full && isOpenPGP ?
+                      _("was certified by enough trusted keys.") :
+                      "");
+      message += buf;
+      xfree (buf);
+      if (sig.validity() == Signature::Validity::Full && !isOpenPGP)
+        {
+          gpgrt_asprintf (&buf, _("is cerified by the trusted issuer:\n'%s'\n"),
+                          sig.key().issuerName());
+          message += buf;
+          xfree (buf);
+        }
+      else if (sig.validity() == Signature::Validity::Marginal)
+        {
+          gpgrt_asprintf (&buf, _("was consistently used for %i messages since %lu."),
+                          uid.tofuInfo().signCount (), uid.tofuInfo().signFirst());
+          message += buf;
+          xfree (buf);
+        }
     }
-  const auto result = m_parser->verify_result ();
-  return result.numSignatures() > 0;
+  message += "\n\n";
+  gpgrt_asprintf (&buf, _("Click here for details about the %s."),
+                  isOpenPGP ? _("key") : _("certificate."));
+  message += buf;
+  xfree (buf);
+  return message;
 }
diff --git a/src/mail.h b/src/mail.h
index fcacfba..e715504 100644
--- a/src/mail.h
+++ b/src/mail.h
@@ -25,6 +25,7 @@
 #include "mapihelp.h"
 #include "gpgme++/verificationresult.h"
 #include "gpgme++/decryptionresult.h"
+#include "gpgme++/key.h"
 
 #include <string>
 #include <future>
@@ -210,11 +211,27 @@ public:
     signature. Regardless of the validity of the mail */
   bool is_signed ();
 
-  /** Returns true if the mail was verified and the validity
+  /** Returns a non null signature / uid if the mail was verified and the validity
     was high enough that we treat it as "verified sender" in
-    the UI. */
+    the UI. The signature / uid pair returned is the signature that was used
+    to determine the verified sender in that case. */
+  const std::pair<GpgME::Signature, GpgME::UserID> get_valid_sig ();
+
+  /** Small helper to check if get_valid_sig returns non null results. */
   bool is_valid_sig ();
 
+  /** Get UID gets UniqueID property of this mail. Returns
+    an empty string if the uid was not set with set uid.*/
+  const std::string & get_uid () const { return m_uid; }
+
+  /** Returns 0 on success if the mail has a uid alrady or sets
+    the uid. Setting only succeeds if the OOM is currently
+    accessible. Returns -1 on error. */
+  int set_uid ();
+
+  /** Returns a localized string describing the signature state
+    of this mail. */
+  std::string get_signature_status ();
 private:
   void update_categories ();
   void update_body ();
@@ -226,8 +243,7 @@ private:
        m_needs_save,   /* A property was changed but not by us. */
        m_crypt_successful, /* We successfuly performed crypto on the item. */
        m_is_smime, /* This is an smime mail. */
-       m_is_smime_checked, /* it was checked if this is an smime mail */
-       m_is_valid_sig; /* We treat the signature as valid (verified) */
+       m_is_smime_checked; /* it was checked if this is an smime mail */
   int m_moss_position; /* The number of the original message attachment. */
   char *m_sender;
   msgtype_t m_type; /* Our messagetype as set in mapi */
diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index 12f40e7..f9c47d7 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -47,6 +47,7 @@
 #include "filetype.h"
 #include "gpgolstr.h"
 #include "message.h"
+#include "mail.h"
 
 #define OPAQUE_SIGNED_MARKER "-----BEGIN PGP MESSAGE-----"
 
@@ -1402,78 +1403,151 @@ done:
   return S_OK;
 }
 
-/* Get the encrypt / sign status of this mail. */
-HRESULT get_crypt_status (LPDISPATCH ctrl, int flags, VARIANT *result)
+static Mail *
+get_mail_from_control (LPDISPATCH ctrl)
 {
   HRESULT hr;
   LPDISPATCH context = NULL,
              mailitem = NULL;
-  LPMESSAGE message = NULL;
-  char *sigstat;
-
-  /* First the usual defensive check about our parameters */
-  if (!ctrl || !result)
+  if (!ctrl)
     {
       log_error ("%s:%s:%i", SRCNAME, __func__, __LINE__);
-      return E_FAIL;
+      return NULL;
     }
-
-  result->vt = VT_BOOL | VT_BYREF;
-  result->pboolVal = (VARIANT_BOOL*) xmalloc (sizeof (VARIANT_BOOL));
-
   hr = getContext (ctrl, &context);
 
   if (hr)
     {
       log_error ("%s:%s:%i : hresult %lx", SRCNAME, __func__, __LINE__,
                  hr);
-      return E_FAIL;
+      return NULL;
     }
 
   mailitem = get_oom_object (context, "CurrentItem");
-
+  gpgol_release (context);
   if (!mailitem)
     {
       log_error ("%s:%s: Failed to get mailitem.",
                  SRCNAME, __func__);
-      goto done;
+      return NULL;
     }
 
-  message = get_oom_base_message (mailitem);
+  /* Get the uid of this item. */
+  char *uid = get_unique_id (mailitem, 0);
+  gpgol_release (mailitem);
+  if (!uid)
+    {
+      log_oom ("%s:%s: Failed to get uid for %p .",
+               SRCNAME, __func__, mailitem);
+      return NULL;
+    }
 
-  if (!message)
+  auto ret = Mail::get_mail_for_uid (uid);
+  xfree (uid);
+  if (!ret)
     {
-      log_error ("%s:%s: No message found.",
+      log_error ("%s:%s: Failed to find mail %p in map.",
+                 SRCNAME, __func__, mailitem);
+    }
+  gpgol_release (mailitem);
+  return ret;
+}
+
+/* Helper to reduce code duplication.*/
+#define MY_MAIL_GETTER \
+  if (!ctrl || !result) \
+    { \
+      log_error ("%s:%s:%i", SRCNAME, __func__, __LINE__); \
+      return E_FAIL; \
+    } \
+  const auto mail = get_mail_from_control (ctrl); \
+  if (!mail) \
+    { \
+      log_oom ("%s:%s:%i Failed to get mail", \
+               SRCNAME, __func__, __LINE__); \
+    }
+
+HRESULT get_is_signed (LPDISPATCH ctrl, VARIANT *result)
+{
+  MY_MAIL_GETTER
+
+  result->vt = VT_BOOL | VT_BYREF;
+  result->pboolVal = (VARIANT_BOOL*) xmalloc (sizeof (VARIANT_BOOL));
+  *(result->pboolVal) = !mail ? VARIANT_FALSE :
+                        mail->is_signed () ? VARIANT_TRUE : VARIANT_FALSE;
+
+  return S_OK;
+}
+
+HRESULT get_sig_label (LPDISPATCH ctrl, VARIANT *result)
+{
+  MY_MAIL_GETTER
+
+  result->vt = VT_BSTR;
+  wchar_t *w_result;
+  if (!mail)
+    {
+      log_debug ("%s:%s: No mail.",
                  SRCNAME, __func__);
-      goto done;
     }
+  if (mail && mail->is_valid_sig ())
+    {
+      w_result = utf8_to_wchar (_("Verified Sender"));
+    }
+  else
+    {
+      w_result = utf8_to_wchar (_("Unverified Sender"));
+    }
+  result->bstrVal = SysAllocString (w_result);
+  xfree (w_result);
+  return S_OK;
+}
 
-  sigstat = mapi_get_sig_status (message);
-  /* sigstat will never be NULL */
-  if (flags & OP_SIGN)
+HRESULT get_sig_ttip (LPDISPATCH ctrl, VARIANT *result)
+{
+  MY_MAIL_GETTER
+
+  result->vt = VT_BSTR;
+  wchar_t *w_result;
+  if (mail && mail->is_signed ())
     {
-      *(result->pboolVal) = *sigstat == '!' ? VARIANT_TRUE : VARIANT_FALSE;
+      char *buf;
+      gpgrt_asprintf (&buf, _("This is a signed %s message."),
+                      mail->is_smime() ? _("S/MIME") : _("OpenPGP"));
+      w_result = utf8_to_wchar (buf);
+      xfree(buf);
     }
-  else if (flags & OP_ENCRYPT)
+  else
     {
-      msgtype_t type = mapi_get_message_type (message);
-      /* FIXME: This reports encrypted for Opaque signed messages ! */
-      if (type == MSGTYPE_GPGOL_OPAQUE_ENCRYPTED ||
-          type == MSGTYPE_GPGOL_PGP_MESSAGE ||
-          type == MSGTYPE_GPGOL_MULTIPART_ENCRYPTED)
-        {
-          *(result->pboolVal) = VARIANT_TRUE;
-        }
-      else
-        {
-          *(result->pboolVal) = VARIANT_FALSE;
-        }
+      w_result = utf8_to_wchar (_("This message is not cryptographically signed"));
     }
+  result->bstrVal = SysAllocString (w_result);
+  xfree (w_result);
+  return S_OK;
+}
 
-done:
-  gpgol_release (context);
-  gpgol_release (mailitem);
-  gpgol_release (message);
+HRESULT get_sig_stip (LPDISPATCH ctrl, VARIANT *result)
+{
+  MY_MAIL_GETTER
 
+  result->vt = VT_BSTR;
+  if (!mail)
+    {
+      log_debug ("%s:%s: No mail.",
+                 SRCNAME, __func__);
+      result->bstrVal = SysAllocString (L"");
+      return S_OK;
+    }
+  const auto message = mail->get_signature_status ();
+  wchar_t *w_message = utf8_to_wchar (message.c_str());
+  result->bstrVal = SysAllocString (w_message);
+  xfree (w_message);
+  return S_OK;
+}
+
+HRESULT launch_cert_details (LPDISPATCH ctrl, VARIANT *result)
+{
+  (void) ctrl;
+  (void) result;
   return S_OK;
 }
diff --git a/src/ribbon-callbacks.h b/src/ribbon-callbacks.h
index 0c72f74..8dad389 100644
--- a/src/ribbon-callbacks.h
+++ b/src/ribbon-callbacks.h
@@ -42,12 +42,15 @@
 #define ID_GET_ENCRYPT_PRESSED  16
 #define ID_ON_LOAD              17
 #define ID_CMD_OPEN_OPTIONS     18
-#define ID_GET_SIG_STATUS       19
-#define ID_GET_ENC_STATUS       20
+#define ID_GET_IS_SIGNED        19
 #define ID_CMD_MIME_SIGN_EX     21
 #define ID_CMD_MIME_ENCRYPT_EX  22
 #define ID_GET_SIGN_PRESSED_EX  23
 #define ID_GET_ENCRYPT_PRESSED_EX 24
+#define ID_GET_SIG_STIP         25
+#define ID_GET_SIG_TTIP         26
+#define ID_GET_SIG_LABEL        27
+#define ID_LAUNCH_CERT_DETAILS  28
 
 #define ID_BTN_CERTMANAGER       IDI_KEY_MANAGER_64_PNG
 #define ID_BTN_DECRYPT           IDI_DECRYPT_16_PNG
@@ -77,8 +80,16 @@ HRESULT verifyBody (LPDISPATCH ctrl);
 HRESULT get_crypt_pressed (LPDISPATCH ctrl, int flags, VARIANT *result, bool is_explorer);
 /* Mark the mail to be mime encrypted on send. Flags as above */
 HRESULT mark_mime_action (LPDISPATCH ctrl, int flags, bool is_explorer);
-/* Get the general crypto status / if the buttons should be toggled. */
-HRESULT get_crypt_status (LPDISPATCH ctrl, int flags, VARIANT *result);
+/* Check the if the mail was signed. Returns BOOL */
+HRESULT get_is_signed (LPDISPATCH ctrl, VARIANT *result);
+/* Get the label for the signature. Returns BSTR */
+HRESULT get_sig_label (LPDISPATCH ctrl, VARIANT *result);
+/* Get the tooltip for the signature. Returns BSTR */
+HRESULT get_sig_ttip (LPDISPATCH ctrl, VARIANT *result);
+/* Get the supertip for the signature. Returns BSTR */
+HRESULT get_sig_stip (LPDISPATCH ctrl, VARIANT *result);
+/* Show a certificate details dialog. Returns nothing. */
+HRESULT launch_cert_details (LPDISPATCH ctrl, VARIANT *result);
 /* Callback to get our own control reference */
 HRESULT ribbon_loaded (LPDISPATCH ctrl);
 #endif

commit 04be440d4d1aad06a6d6f2f9f91a56b4be53d2eb
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Oct 14 14:36:37 2016 +0200

    Add UID to mails / mail objects
    
    * src/Makefile.am: Link librpcrt4 for uid functions.
    * src/mail.cpp (g_uid_map): New.
    (Mail::~Mail): Remove from uid map if added.
    (Mail::get_mail_for_uid): New. Get Mail object for uid.
    (Mail::is_mail_valid, Mail::is_valid_ptr): Renamd is_mail_valid
    to is_valid_ptr to avoid confusion.
    (Mail::decrypt_verify): Set uid.
    * src/mail.h: Update accordingly.
    * src/oomhelp.cpp (generate_uid, get_unique_id): New.
    (set_pa_variant): Changed to put_pa_string.
    * src/oomhelp.h: Update accordingly.
    (GPGOL_UID_DASL): Declare.
    * src/windowmessages.cpp (gpgol_window_proc): Use is_mail_valid.
    
    --
    The unique identifier allows us to find the according mail object
    even if the pointer to the mailitem differs. This is usefull
    because mailitem pointers obtained over the ribbon context differ
    from the one we get on ItemLoad.

diff --git a/src/Makefile.am b/src/Makefile.am
index 8613260..6909886 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -131,7 +131,7 @@ gpgol_LDADD = $(srcdir)/gpgol.def  \
 	-L . -lgpgmepp -lgpgme -lassuan -lgpg-error \
 	-lmapi32 -lshell32 -lgdi32 -lcomdlg32 \
 	-lole32 -loleaut32 -lws2_32 -ladvapi32 \
-	-luuid -lgdiplus
+	-luuid -lgdiplus -lrpcrt4
 
 resource.o: resource.rc versioninfo.rc dialogs.rc dialogs.h
 
diff --git a/src/mail.cpp b/src/mail.cpp
index 5b55093..953d085 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -45,6 +45,7 @@
 using namespace GpgME;
 
 static std::map<LPDISPATCH, Mail*> g_mail_map;
+static std::map<std::string, Mail*> g_uid_map;
 
 #define COPYBUFSIZE (8 * 1024)
 
@@ -122,6 +123,15 @@ Mail::~Mail()
       g_mail_map.erase (it);
     }
 
+  if (!m_uid.empty())
+    {
+      auto it2 = g_uid_map.find(m_uid);
+      if (it2 != g_uid_map.end())
+        {
+          g_uid_map.erase (it2);
+        }
+    }
+
   xfree (m_sender);
   gpgol_release(m_mailitem);
 }
@@ -142,8 +152,23 @@ Mail::get_mail_for_item (LPDISPATCH mailitem)
   return it->second;
 }
 
+Mail *
+Mail::get_mail_for_uid (const char *uid)
+{
+  if (!uid)
+    {
+      return NULL;
+    }
+  auto it = g_uid_map.find(std::string(uid));
+  if (it == g_uid_map.end())
+    {
+      return NULL;
+    }
+  return it->second;
+}
+
 bool
-Mail::is_mail_valid (const Mail *mail)
+Mail::is_valid_ptr (const Mail *mail)
 {
   auto it = g_mail_map.begin();
   while (it != g_mail_map.end())
@@ -452,7 +477,7 @@ Mail::decrypt_verify()
                  SRCNAME, __func__, m_mailitem);
       return 1;
     }
-
+  set_uid ();
   m_processed = true;
   /* Insert placeholder */
   char *placeholder_buf;
diff --git a/src/mail.h b/src/mail.h
index 75bd335..fcacfba 100644
--- a/src/mail.h
+++ b/src/mail.h
@@ -62,12 +62,21 @@ public:
   */
   static Mail* get_mail_for_item (LPDISPATCH mailitem);
 
+  /** @brief looks for existing Mail objects in the uid map.
+    Only objects for which set_uid has been called can be found
+    in the uid map. Get the UID of a mailitem thorugh get_unique_id
+
+    @returns A reference to an existing mailitem or NULL in case none
+    could be found.
+  */
+  static Mail* get_mail_for_uid (const char *uid);
+
   /** @brief looks for existing Mail objects.
 
     @returns A reference to an existing mailitem or NULL in case none
     could be found. Can be used to check if a mail object was destroyed.
   */
-  static bool is_mail_valid (const Mail *mail);
+  static bool is_valid_ptr (const Mail *mail);
 
   /** @brief wipe the plaintext from all known Mail objects.
     *
diff --git a/src/oomhelp.cpp b/src/oomhelp.cpp
index 8e107c5..cca297b 100644
--- a/src/oomhelp.cpp
+++ b/src/oomhelp.cpp
@@ -25,6 +25,7 @@
 #include <windows.h>
 #include <olectl.h>
 #include <string>
+#include <rpc.h>
 
 #include "myexchext.h"
 #include "common.h"
@@ -813,7 +814,7 @@ get_oom_context_window (LPDISPATCH context)
 }
 
 int
-set_pa_variant (LPDISPATCH pDisp, const char *dasl_id, VARIANT *value)
+put_pa_string (LPDISPATCH pDisp, const char *dasl_id, const char *value)
 {
   LPDISPATCH propertyAccessor;
   VARIANT cVariant[2];
@@ -854,7 +855,10 @@ set_pa_variant (LPDISPATCH pDisp, const char *dasl_id, VARIANT *value)
   xfree (w_property);
 
   /* Variant 0 carries the data. */
-  VariantCopy (&cVariant[0], value);
+  wchar_t *w_value = utf8_to_wchar (value);
+  BSTR b_value = SysAllocString(w_value);
+  cVariant[0].vt = VT_BSTR;
+  cVariant[0].bstrVal = b_value;
 
   /* Variant 1 is the DASL as found out by experiments. */
   cVariant[1].vt = VT_BSTR;
@@ -868,6 +872,7 @@ set_pa_variant (LPDISPATCH pDisp, const char *dasl_id, VARIANT *value)
                                  DISPATCH_METHOD, &dispparams,
                                  &rVariant, &execpinfo, &argErr);
   SysFreeString (b_property);
+  SysFreeString (b_value);
   VariantClear (&cVariant[0]);
   gpgol_release (propertyAccessor);
   if (hr != S_OK)
@@ -1553,3 +1558,60 @@ remove_category (LPDISPATCH mail, const char *category)
 
   return put_oom_string (mail, "Categories", newstr.c_str ());
 }
+
+static char *
+generate_uid ()
+{
+  UUID uuid;
+  UuidCreate (&uuid);
+
+  unsigned char *str;
+  UuidToStringA (&uuid, &str);
+
+  char *ret = strdup ((char*)str);
+  RpcStringFreeA (&str);
+
+  return ret;
+}
+
+char *
+get_unique_id (LPDISPATCH mail, int create)
+{
+  if (!mail)
+    {
+      return NULL;
+    }
+
+  /* Get the User Properties. */
+  char *uid = get_pa_string (mail, GPGOL_UID_DASL);
+  if (!uid)
+    {
+      log_debug ("%s:%s: No uuid found for '%p'",
+                 SRCNAME, __func__, mail);
+      if (!create)
+        {
+          return NULL;
+        }
+    }
+  else
+    {
+      log_debug ("%s:%s: Found uid '%s' for '%p'",
+                 SRCNAME, __func__, uid, mail);
+      return uid;
+    }
+  char *newuid = generate_uid ();
+  int ret = put_pa_string (mail, GPGOL_UID_DASL, newuid);
+
+  if (ret)
+    {
+      log_debug ("%s:%s: failed to set uid '%s' for '%p'",
+                 SRCNAME, __func__, newuid, mail);
+      xfree (newuid);
+      return NULL;
+    }
+
+
+  log_debug ("%s:%s: '%p' has now the uid: '%s' ",
+             SRCNAME, __func__, mail, newuid);
+  return newuid;
+}
diff --git a/src/oomhelp.h b/src/oomhelp.h
index 8654505..e9ab03a 100644
--- a/src/oomhelp.h
+++ b/src/oomhelp.h
@@ -85,6 +85,9 @@ DEFINE_OLEGUID(IID_IOleWindow,                0x00000114, 0, 0);
 #define GPGOL_ATTACHTYPE_DASL \
   "http://schemas.microsoft.com/mapi/string/" \
   "{31805AB8-3E92-11DC-879C-00061B031004}/GpgOL Attach Type/0x00000003"
+#define GPGOL_UID_DASL \
+  "http://schemas.microsoft.com/mapi/string/" \
+  "{31805AB8-3E92-11DC-879C-00061B031004}/GpgOL UID/0x0000001F"
 #define PR_ATTACH_DATA_BIN_DASL \
   "http://schemas.microsoft.com/mapi/proptag/0x37010102"
 #define PR_BODY_W_DASL \
@@ -182,7 +185,7 @@ get_pa_int (LPDISPATCH pDisp, const char *property, int *rInt);
    property.
 */
 int
-set_pa_variant (LPDISPATCH pDisp, const char *dasl_id, VARIANT *value);
+put_pa_string (LPDISPATCH pDisp, const char *dasl_id, const char *value);
 
 /* Look up a variant with the propertyAccessor interface */
 int
@@ -276,6 +279,15 @@ add_category (LPDISPATCH mail, const char *category);
 int
 remove_category (LPDISPATCH mail, const char *category);
 
+/* Get a unique identifier for a mail object. The
+   uuid is a custom property. If create is set
+   a new uuid will be added if none exists and the
+   value of that uuid returned.
+
+   Return value has to be freed by the caller.
+   */
+char *
+get_unique_id (LPDISPATCH mail, int create);
 
 #ifdef __cplusplus
 }
diff --git a/src/windowmessages.cpp b/src/windowmessages.cpp
index db7b243..7825e9c 100644
--- a/src/windowmessages.cpp
+++ b/src/windowmessages.cpp
@@ -63,7 +63,7 @@ gpgol_window_proc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
           case (PARSING_DONE):
             {
               auto mail = (Mail*) ctx->data;
-              if (!Mail::is_mail_valid (mail))
+              if (!Mail::is_valid_ptr (mail))
                 {
                   log_debug ("%s:%s: Parsing done for mail which is gone.",
                              SRCNAME, __func__);

commit d299d6357ed98e31914bfc3cfe09f681b3deb73a
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Oct 14 10:22:51 2016 +0200

    Dont fail if placeholder can't be inserted
    
    * src/mail.cpp (decrypt_verify): Don't fail if placeholder
    can't be inserted.
    
    --
    There needs to be more fixes for failures to insert html as it
    fails when HTML mails are disabled in Outlook. Which is a good
    security setting.

diff --git a/src/mail.cpp b/src/mail.cpp
index 42d9f35..5b55093 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -470,8 +470,6 @@ Mail::decrypt_verify()
     {
       log_error ("%s:%s: Failed to modify html body of item.",
                  SRCNAME, __func__);
-      xfree (placeholder_buf);
-      return 1;
     }
   xfree (placeholder_buf);
 

commit d3a2f213e0fd0ac0771d57d7af474332b81c63f9
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Oct 14 10:20:46 2016 +0200

    Store decrypt / verify results in mail
    
    * src/mail.cpp (Mail::is_signed): New. Check if signed at all.
    (Mail::is_valid_sig): New. Check if signature is valid.
    (Mail::update_categories): Use member variables / new functions.
    (is_valid_sig): Removed.

diff --git a/src/mail.cpp b/src/mail.cpp
index 4e33c06..42d9f35 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -84,6 +84,7 @@ Mail::Mail (LPDISPATCH mailitem) :
     m_crypt_successful(false),
     m_is_smime(false),
     m_is_smime_checked(false),
+    m_is_valid_sig(false),
     m_moss_position(0),
     m_sender(NULL),
     m_type(MSGTYPE_UNKNOWN)
@@ -531,7 +532,13 @@ Mail::update_body()
 void
 Mail::parsing_done()
 {
+  /* Store the results. */
+  m_decrypt_result = m_parser->decrypt_result ();
+  m_verify_result = m_parser->verify_result ();
   m_needs_wipe = true;
+
+  /* Check our validity */
+  is_valid_sig ();
   /* Set categories according to the result. */
   update_categories();
 
@@ -845,14 +852,29 @@ Mail::close_inspector ()
   return 0;
 }
 
-static bool
-is_valid_sig (const VerificationResult &result, const char *sender)
+bool
+Mail::is_valid_sig ()
 {
-  if (result.error() || !sender)
+  const char *sender = get_sender();
+
+  static bool sig_checked;
+
+  if (m_verify_result.isNull())
     {
       return false;
     }
-  for (const auto sig: result.signatures())
+  if (sig_checked)
+    {
+      return m_is_valid_sig;
+    }
+
+  if (m_verify_result.error() || !sender)
+    {
+      m_is_valid_sig = false;
+      sig_checked = true;
+    }
+
+  for (const auto sig: m_verify_result.signatures())
     {
       if (sig.validity() != Signature::Validity::Marginal &&
           sig.validity() != Signature::Validity::Full &&
@@ -897,20 +919,21 @@ is_valid_sig (const VerificationResult &result, const char *sender)
                 }
               log_debug ("%s:%s: Classified sender as verified",
                          SRCNAME, __func__);
-              return true;
+              m_is_valid_sig = true;
+              break;
             }
         }
     }
-  return false;
+  sig_checked = true;
+  return m_is_valid_sig;
 }
 
 void
 Mail::update_categories ()
 {
-  const auto dec_result = m_parser->decrypt_result();
   const char *decCategory = _("GpgOL: Encrypted Message");
   const char *verifyCategory = _("GpgOL: Verified Sender");
-  if (dec_result.numRecipients())
+  if (m_decrypt_result.numRecipients())
     {
       /* We use the number of recipients as we don't care
          if decryption was successful or not for this category */
@@ -923,10 +946,7 @@ Mail::update_categories ()
       remove_category (m_mailitem, decCategory);
     }
 
-  const auto ver_result = m_parser->verify_result();
-  const char *sender = get_sender();
-
-  if (is_valid_sig (ver_result, sender))
+  if (m_is_valid_sig)
     {
       add_category (m_mailitem, verifyCategory);
     }
@@ -936,3 +956,14 @@ Mail::update_categories ()
     }
   return;
 }
+
+bool
+Mail::is_signed()
+{
+  if (!m_parser)
+    {
+      return false;
+    }
+  const auto result = m_parser->verify_result ();
+  return result.numSignatures() > 0;
+}
diff --git a/src/mail.h b/src/mail.h
index e76badd..75bd335 100644
--- a/src/mail.h
+++ b/src/mail.h
@@ -23,6 +23,8 @@
 
 #include "oomhelp.h"
 #include "mapihelp.h"
+#include "gpgme++/verificationresult.h"
+#include "gpgme++/decryptionresult.h"
 
 #include <string>
 #include <future>
@@ -194,6 +196,16 @@ public:
    handler.
   */
   void parsing_done ();
+
+  /** Returns true if the mail was verified and has at least one
+    signature. Regardless of the validity of the mail */
+  bool is_signed ();
+
+  /** Returns true if the mail was verified and the validity
+    was high enough that we treat it as "verified sender" in
+    the UI. */
+  bool is_valid_sig ();
+
 private:
   void update_categories ();
   void update_body ();
@@ -205,10 +217,14 @@ private:
        m_needs_save,   /* A property was changed but not by us. */
        m_crypt_successful, /* We successfuly performed crypto on the item. */
        m_is_smime, /* This is an smime mail. */
-       m_is_smime_checked; /* it was checked if this is an smime mail */
+       m_is_smime_checked, /* it was checked if this is an smime mail */
+       m_is_valid_sig; /* We treat the signature as valid (verified) */
   int m_moss_position; /* The number of the original message attachment. */
   char *m_sender;
   msgtype_t m_type; /* Our messagetype as set in mapi */
   ParseController *m_parser;
+  GpgME::VerificationResult m_verify_result;
+  GpgME::DecryptionResult m_decrypt_result;
+  std::string m_uid;
 };
 #endif // MAIL_H

commit cf5689b2cd8226a440e8dbc8b17e226186e52781
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Oct 14 10:10:24 2016 +0200

    Add some more oom helpers
    
    * src/oomhelp.cpp (get_strong_reference): New obtain a strong
    reference through the application object.
    (invoke_oom_method_with_params): New. Useful helper.
    (invoke_oom_method): Use invoke_oom_method_with_params.
    
    --
    The get_strong_reference code is left over from experiments how
    to fix the occassional crash when sending. Didn't work but it
    might be useful in the future.

diff --git a/src/oomhelp.cpp b/src/oomhelp.cpp
index 32c83f9..8e107c5 100644
--- a/src/oomhelp.cpp
+++ b/src/oomhelp.cpp
@@ -1165,6 +1165,40 @@ get_object_by_id (LPDISPATCH pDisp, REFIID id)
   return disp;
 }
 
+LPDISPATCH
+get_strong_reference (LPDISPATCH mail)
+{
+  VARIANT var;
+  VariantInit (&var);
+  DISPPARAMS args;
+  VARIANT argvars[2];
+  VariantInit (&argvars[0]);
+  VariantInit (&argvars[1]);
+  argvars[1].vt = VT_DISPATCH;
+  argvars[1].pdispVal = mail;
+  argvars[0].vt = VT_INT;
+  argvars[0].intVal = 1;
+  args.cArgs = 2;
+  args.cNamedArgs = 0;
+  args.rgvarg = argvars;
+  LPDISPATCH ret = NULL;
+  if (!invoke_oom_method_with_parms (
+      GpgolAddin::get_instance()->get_application(),
+      "GetObjectReference", &var, &args))
+    {
+      ret = var.pdispVal;
+      log_oom ("%s:%s: Got strong ref %p for %p",
+               SRCNAME, __func__, ret, mail);
+    }
+  else
+    {
+      log_error ("%s:%s: Failed to get strong ref.",
+                 SRCNAME, __func__);
+    }
+  VariantClear (&var);
+  return ret;
+}
+
 LPMESSAGE
 get_oom_message (LPDISPATCH mailitem)
 {
@@ -1230,7 +1264,8 @@ get_oom_base_message (LPDISPATCH mailitem)
 }
 
 int
-invoke_oom_method (LPDISPATCH pDisp, const char *name, VARIANT *rVariant)
+invoke_oom_method_with_parms (LPDISPATCH pDisp, const char *name,
+                              VARIANT *rVariant, DISPPARAMS *params)
 {
   HRESULT hr;
   DISPID dispid;
@@ -1242,7 +1277,7 @@ invoke_oom_method (LPDISPATCH pDisp, const char *name, VARIANT *rVariant)
       DISPPARAMS dispparams = {NULL, NULL, 0, 0};
 
       hr = pDisp->Invoke (dispid, IID_NULL, LOCALE_SYSTEM_DEFAULT,
-                          DISPATCH_METHOD, &dispparams,
+                          DISPATCH_METHOD, params ? params : &dispparams,
                           rVariant, &execpinfo, NULL);
       if (hr != S_OK)
         {
@@ -1256,6 +1291,12 @@ invoke_oom_method (LPDISPATCH pDisp, const char *name, VARIANT *rVariant)
   return 0;
 }
 
+int
+invoke_oom_method (LPDISPATCH pDisp, const char *name, VARIANT *rVariant)
+{
+  return invoke_oom_method_with_parms (pDisp, name, rVariant, NULL);
+}
+
 LPMAPISESSION
 get_oom_mapi_session ()
 {
diff --git a/src/oomhelp.h b/src/oomhelp.h
index 65a489f..8654505 100644
--- a/src/oomhelp.h
+++ b/src/oomhelp.h
@@ -218,6 +218,18 @@ get_oom_message (LPDISPATCH mailitem);
 LPMESSAGE
 get_oom_base_message (LPDISPATCH mailitem);
 
+/* Get a strong reference for a mail object by calling
+   Application.GetObjectReference with type strong. The
+   documentation is unclear what this acutally does.
+   This function is left over from experiments about
+   strong references. Maybe there is a use for them.
+   The reference we use in the Mail object is documented
+   as a Weak reference. But changing that does not appear
+   to make a difference.
+*/
+LPDISPATCH
+get_strong_reference (LPDISPATCH mail);
+
 /* Invoke a method of an outlook object.
    returns true on success false otherwise.
 
@@ -228,6 +240,20 @@ get_oom_base_message (LPDISPATCH mailitem);
 int
 invoke_oom_method (LPDISPATCH pDisp, const char *name, VARIANT *rVariant);
 
+/* Invoke a method of an outlook object.
+   returns true on success false otherwise.
+
+   rVariant should either point to a propery initialized
+   variant (initinalized wiht VariantInit) to hold
+   the return value or a pointer to NULL.
+
+   parms can optionally be used to provide a DISPPARAMS structure
+   with parameters for the function.
+   */
+int
+invoke_oom_method_with_parms (LPDISPATCH pDisp, const char *name,
+                              VARIANT *rVariant, DISPPARAMS *params);
+
 /* Try to obtain the mapisession through the Application.
   returns NULL on error.*/
 LPMAPISESSION

commit 6cb1c3fd4f31fa90a1cc003a4ae162c89614add4
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 12 11:32:54 2016 +0200

    Fix last line handling of text mails
    
    * src/mimedataprovider.cpp (t2body): Store if we have a html part.
    (t2body): Improve debug output.
    (get_html_body): Only fetch last line if we have seen an html part.

diff --git a/src/mimedataprovider.cpp b/src/mimedataprovider.cpp
index e5dbe8f..44944bd 100644
--- a/src/mimedataprovider.cpp
+++ b/src/mimedataprovider.cpp
@@ -316,14 +316,16 @@ t2body (MimeDataProvider *provider, rfc822parse_t msg)
          sig_data has not been set yet).  We also do this only while
          in verify mode because we don't want to write a full MUA.  */
       ctx->collect_signature = 1;
-      log_mime_parser ("Collecting signature now");
+      log_mime_parser ("%s:%s: Collecting signature.",
+                       SRCNAME, __func__);
     }
   else if (ctx->nesting_level == 1 && ctx->is_encrypted
            && !strcmp (ctmain, "application")
            && (ctx->protocol == PROTOCOL_OPENPGP
                && !strcmp (ctsub, "octet-stream")))
     {
-      log_mime_parser ("Collecting encrypted data from now on");
+      log_mime_parser ("%s:%s: Collecting encrypted PGP data.",
+                       SRCNAME, __func__);
       ctx->collect_crypto_data = 1;
     }
   else /* Other type. */
@@ -335,6 +337,8 @@ t2body (MimeDataProvider *provider, rfc822parse_t msg)
           && (!strcmp (ctsub, "pkcs7-mime")
               || !strcmp (ctsub, "x-pkcs7-mime")))
         {
+          log_mime_parser ("%s:%s: Collecting crypted S/MIME data.",
+                           SRCNAME, __func__);
           ctx->collect_crypto_data = 1;
         }
     }
@@ -358,9 +362,18 @@ t2body (MimeDataProvider *provider, rfc822parse_t msg)
           ctx->body_seen = 2;
           ctx->collect_html_body = 1;
           ctx->collect_body = 0;
+          log_debug ("%s:%s: Collecting HTML body.",
+                     SRCNAME, __func__);
+          /* We need this crutch because of one liner html
+             mails which would not be collected by the line
+             collector if they dont have a linefeed at the
+             end. */
+          provider->set_has_html_body (true);
         }
       else
         {
+          log_debug ("%s:%s: Collecting text body.",
+                     SRCNAME, __func__);
           ctx->body_seen = 1;
           ctx->collect_body = 1;
           ctx->collect_html_body = 0;
@@ -372,6 +385,8 @@ t2body (MimeDataProvider *provider, rfc822parse_t msg)
       ctx->current_attachment = provider->create_attachment();
       ctx->collect_body = 0;
       ctx->collect_html_body = 0;
+      log_mime_parser ("%s:%s: Collecting attachment.",
+                       SRCNAME, __func__);
     }
 
   return 0;
@@ -483,7 +498,8 @@ message_cb (void *opaque, rfc822parse_event_t event,
 }
 
 MimeDataProvider::MimeDataProvider(bool no_headers) :
-  m_signature(nullptr)
+  m_signature(nullptr),
+  m_has_html_body(false)
 {
   m_mime_ctx = (mime_context_t) xcalloc (1, sizeof *m_mime_ctx);
   m_mime_ctx->msg = rfc822parse_open (message_cb, this);
@@ -891,6 +907,12 @@ const std::string &MimeDataProvider::get_body()
 
 const std::string &MimeDataProvider::get_html_body()
 {
+  if (!m_has_html_body)
+    {
+      /* Don't do the last line handling if we don't
+         have html */
+      return m_html_body;
+    }
   if (m_rawbuf.size())
     {
       /* If there was some data left in the rawbuf this could
diff --git a/src/mimedataprovider.h b/src/mimedataprovider.h
index 661e0ca..85d1127 100644
--- a/src/mimedataprovider.h
+++ b/src/mimedataprovider.h
@@ -115,6 +115,8 @@ public:
     {return m_attachments;}
   const std::string &get_html_charset() const;
   const std::string &get_body_charset() const;
+
+  void set_has_html_body(bool value) {m_has_html_body = value;}
 private:
 #ifdef HAVE_W32_SYSTEM
   /* Collect the data from mapi. */
@@ -144,5 +146,7 @@ private:
   std::string m_html_charset;
   /* Charset of body */
   std::string m_body_charset;
+  /* Do we have html at all */
+  bool m_has_html_body;
 };
 #endif // MIMEDATAPROVIDER_H

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

Summary of changes:
 src/Makefile.am          |   2 +-
 src/gpgoladdin.cpp       |  58 +++++++----------
 src/mail.cpp             | 161 ++++++++++++++++++++++++++++++++++++++++++-----
 src/mail.h               |  43 ++++++++++++-
 src/mimedataprovider.cpp |  28 ++++++++-
 src/mimedataprovider.h   |   4 ++
 src/oomhelp.cpp          | 111 ++++++++++++++++++++++++++++++--
 src/oomhelp.h            |  40 +++++++++++-
 src/ribbon-callbacks.cpp | 154 +++++++++++++++++++++++++++++++++------------
 src/ribbon-callbacks.h   |  19 ++++--
 src/windowmessages.cpp   |   2 +-
 11 files changed, 514 insertions(+), 108 deletions(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org



From cvs at cvs.gnupg.org  Fri Oct 14 15:44:14 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 14 Oct 2016 15:44:14 +0200
Subject: [git] KSBA - branch, master, updated. libksba-1.3.5-2-g100ed50
Message-ID: <E1bv2mW-0006jT-Ev@lists.gnupg.org>

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 "KSBA is a library to access X.509 certificates and CMS data.".

The branch, master has been updated
       via  100ed5092aec0afe16ca7a4fe660602745e92a36 (commit)
      from  861cd1eb38453a39226c7e206486078e9ac4a12c (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 100ed5092aec0afe16ca7a4fe660602745e92a36
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Oct 14 15:40:37 2016 +0200

    Let configure print a note if Yacc is not Bison.
    
    * m4/ax_prog_bison.m4: New.
    * m4/Makefile.am (EXTRA_DIST): Add it.
    * configure.ac: Test for Bison and print a note.
    --
    
    GnuPG-bug-id: 2753
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/configure.ac b/configure.ac
index 44da1cb..1efb3ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,6 +125,8 @@ AC_PROG_MAKE_SET
 gl_EARLY
 #AC_ARG_PROGRAM
 AC_PROG_YACC
+AX_PROG_BISON([have_bison=yes],[have_bison=no])
+
 AC_C_INLINE
 
 # We need to compile and run a program on the build machine.
@@ -419,6 +421,13 @@ doc/Makefile
 ])
 AC_OUTPUT
 
+if test x"$have_bison" = xno; then
+    AC_MSG_NOTICE([[
+***
+*** Note: The installed yacc version is not GNU Bison.  You need
+*** to install Bison if you want to change any grammar (.y) file.
+***]])
+fi
 
 echo "
         Libksba v${VERSION} has been configured as follows:
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 3a1716c..6078d25 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,5 +1,5 @@
 
 EXTRA_DIST = autobuild.m4  gnupg-typedef.m4  gpg-error.m4  libgcrypt.m4 \
-             libtool.m4
+             libtool.m4 ax_prog_bison.m4
 
 
diff --git a/m4/ax_prog_bison.m4 b/m4/ax_prog_bison.m4
new file mode 100644
index 0000000..b7ba31d
--- /dev/null
+++ b/m4/ax_prog_bison.m4
@@ -0,0 +1,64 @@
+# ===========================================================================
+#       http://www.gnu.org/software/autoconf-archive/ax_prog_bison.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PROG_BISON(ACTION-IF-TRUE,ACTION-IF-FALSE)
+#
+# DESCRIPTION
+#
+#   Check whether bison is the parser generator. Run ACTION-IF-TRUE if
+#   successful, ACTION-IF-FALSE otherwise
+#
+# LICENSE
+#
+#   Copyright (c) 2009 Francesco Salvestrini <salvestrini at users.sourceforge.net>
+#   Copyright (c) 2010 Diego Elio Petteno` <flameeyes at gmail.com>
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation; either version 2 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 9
+
+AC_DEFUN([AX_PROG_BISON], [
+  AC_REQUIRE([AC_PROG_YACC])
+  AC_REQUIRE([AC_PROG_EGREP])
+
+  AC_CACHE_CHECK([if bison is the parser generator],[ax_cv_prog_bison],[
+    AS_IF([$YACC --version 2>/dev/null | $EGREP -q '^bison '],
+      [ax_cv_prog_bison=yes], [ax_cv_prog_bison=no])
+  ])
+  AS_IF([test "$ax_cv_prog_bison" = "yes"], [
+      dnl replace the yacc-compatible compiler with the real bison, as
+      dnl otherwise autoconf limits us to the POSIX yacc.
+      dnl We also change the generated filename to the old one, so that
+      dnl automake's ylwrap can deal with it.
+      YACC="${YACC% -y} -o y.tab.c"
+    ] m4_ifnblank([$1], [[$1]]),
+    m4_ifnblank([$2], [[$2]])
+  )
+])

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

Summary of changes:
 configure.ac        |  9 ++++++++
 m4/Makefile.am      |  2 +-
 m4/ax_prog_bison.m4 | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 m4/ax_prog_bison.m4


hooks/post-receive
-- 
KSBA is a library to access X.509 certificates and CMS data.
http://git.gnupg.org



From cvs at cvs.gnupg.org  Fri Oct 14 16:29:28 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Fri, 14 Oct 2016 16:29:28 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.7.0-51-g1e8c34a
Message-ID: <E1bv3UI-0008Iz-6X@lists.gnupg.org>

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 "GnuPG Made Easy".

The branch, master has been updated
       via  1e8c34a9192956bb2fe96a7a6a76ff59de8d1c0c (commit)
      from  f526d0e22e8b881ccbca66b46a0e1b68bbc4cd6b (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 1e8c34a9192956bb2fe96a7a6a76ff59de8d1c0c
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Oct 14 16:23:57 2016 +0200

    cpp: Fix init of string from null
    
    * lang/cpp/src/key.cpp (UserID::addrSpecFromString): Check return
    value before creating the string.

diff --git a/lang/cpp/src/key.cpp b/lang/cpp/src/key.cpp
index 947405f..235a3c8 100644
--- a/lang/cpp/src/key.cpp
+++ b/lang/cpp/src/key.cpp
@@ -884,9 +884,12 @@ std::string UserID::addrSpecFromString(const char *userid)
         return std::string();
     }
     char *normalized = gpgme_addrspec_from_uid (userid);
-    std::string ret(normalized);
-    gpgme_free(normalized);
-    return ret;
+    if (normalized) {
+        std::string ret(normalized);
+        gpgme_free(normalized);
+        return ret;
+    }
+    return std::string();
 }
 
 std::string UserID::addrSpec() const

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

Summary of changes:
 lang/cpp/src/key.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org



From cvs at cvs.gnupg.org  Fri Oct 14 18:14:04 2016
From: cvs at cvs.gnupg.org (by Kai Michaelis)
Date: Fri, 14 Oct 2016 18:14:04 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-231-gc318561
Message-ID: <E1bv57X-0003hO-DG@lists.gnupg.org>

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  c318561ef4c97f0c2767aef377531d58174060a1 (commit)
      from  f99c5fa1c970dc1122ac62371eb8d758f380ed57 (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 c318561ef4c97f0c2767aef377531d58174060a1
Author: Kai Michaelis <kai at gnupg.org>
Date:   Fri Oct 14 18:16:43 2016 +0200

    dirmngr: use gnupg_mkdtemp instead of mkstemp
    
    MinGW on debian does not support mkstemp.

diff --git a/dirmngr/server.c b/dirmngr/server.c
index 22d6f2d..2836cef 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -2407,11 +2407,11 @@ cmp_version(const char* a, const char* b)
 }
 
 static int
-fetch_into_tmpfile(const char* url, ctrl_t ctrl, estream_t* strm_out, char** path)
+fetch_into_tmpdir(const char* url, ctrl_t ctrl, estream_t* strm_out, char** path)
 {
   gpg_error_t err = 0;
-  char* filename = xmalloc (128);
-  int fd = -1;
+  char filename[128];
+  char* dirname = xmalloc (128);
   estream_t file;
   estream_t strm;
   size_t len = 0;
@@ -2423,15 +2423,16 @@ fetch_into_tmpfile(const char* url, ctrl_t ctrl, estream_t* strm_out, char** pat
       goto leave;
     }
 
-  snprintf (filename ,128 ,"%s%s%s" ,P_tmpdir ,DIRSEP_S ,"dirmngr_fetch_XXXXXX");
+  snprintf (dirname ,128 ,"%s%s%s" ,P_tmpdir ,DIRSEP_S ,"dirmngr_fetch_XXXXXX");
 
-  if ((fd = mkstemp (filename)) < 0)
+  if (!gnupg_mkdtemp (dirname))
     {
-      err = gpg_err_code_from_syserror ();
+      err = gpg_error_from_syserror ();
       goto leave;
     }
 
-  file = es_fdopen (fd, "w+");
+  snprintf (filename ,128 ,"%s%s%s" ,dirname ,DIRSEP_S ,"file");
+  file = es_fopen (filename, "w+");
 
   if ((err = ks_http_fetch (ctrl, url, &strm)))
     goto leave;
@@ -2454,13 +2455,13 @@ fetch_into_tmpfile(const char* url, ctrl_t ctrl, estream_t* strm_out, char** pat
 
   if (path)
     {
-    *path = filename;
-    filename = NULL;
+    *path = dirname;
+    dirname = NULL;
     }
 
 leave:
-  if (filename)
-    xfree (filename);
+  if (dirname)
+    xfree (dirname);
   return err;
 }
 
@@ -2481,14 +2482,19 @@ cmd_versioncheck (assuan_context_t ctx, char *line)
   ctrl_t ctrl = assuan_get_pointer (ctx);
   estream_t swdb;
   estream_t swdb_sig;
-  char* swdb_path = NULL;
-  char* swdb_sig_path = NULL;
+  char* swdb_dir = NULL;
+  char* swdb_sig_dir = NULL;
   char* buf = NULL;
   size_t len = 0;
   const size_t name_len = (name ? strlen (name) : 0);
   const size_t version_len = (version ? strlen (version) : 0);
   const char *argv[8];
   char keyring_path[128];
+  char swdb_path[128];
+  char swdb_sig_path[128];
+
+  swdb_path[0] = 0;
+  swdb_sig_path[0] = 0;
 
   if (!name || name_len == 0)
     {
@@ -2502,13 +2508,16 @@ cmd_versioncheck (assuan_context_t ctx, char *line)
       goto out;
     }
 
-  if ((err = fetch_into_tmpfile ("https://versions.gnupg.org/swdb.lst", ctrl, &swdb, &swdb_path)))
+  if ((err = fetch_into_tmpdir ("https://versions.gnupg.org/swdb.lst", ctrl, &swdb, &swdb_dir)))
     goto out;
 
-  if ((err = fetch_into_tmpfile ("https://versions.gnupg.org/swdb.lst.sig", ctrl, &swdb_sig, &swdb_sig_path)))
+  snprintf(swdb_path, 128, "%s%s%s", swdb_dir, DIRSEP_S, "file");
+
+  if ((err = fetch_into_tmpdir ("https://versions.gnupg.org/swdb.lst.sig", ctrl, &swdb_sig, &swdb_sig_dir)))
     goto out;
 
   snprintf(keyring_path, 128, "%s%s%s", gnupg_datadir (), DIRSEP_S, "distsigkey.gpg");
+  snprintf(swdb_sig_path, 128, "%s%s%s", swdb_sig_dir, DIRSEP_S, "file");
 
   argv[0] = "--batch";
   argv[1] = "--no-default-keyring";
@@ -2558,11 +2567,26 @@ cmd_versioncheck (assuan_context_t ctx, char *line)
   out:
   es_fclose (swdb);
   es_fclose (swdb_sig);
-  xfree(buf);
-  unlink(swdb_path);
-  unlink(swdb_sig_path);
-  xfree(swdb_path);
-  xfree(swdb_sig_path);
+
+  if (buf)
+    xfree(buf);
+
+  if (strlen (swdb_path) > 0)
+    unlink(swdb_path);
+  if (swdb_dir)
+    {
+      rmdir(swdb_dir);
+      xfree(swdb_dir);
+    }
+
+  if (strlen (swdb_sig_path) > 0)
+    unlink(swdb_sig_path);
+  if (swdb_sig_dir)
+    {
+      rmdir(swdb_sig_dir);
+      xfree(swdb_sig_dir);
+    }
+
   return leave_cmd (ctx, err);
 }
 

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

Summary of changes:
 dirmngr/server.c | 64 ++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 44 insertions(+), 20 deletions(-)


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



From cvs at cvs.gnupg.org  Sat Oct 15 21:38:39 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Sat, 15 Oct 2016 21:38:39 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-232-g2f7d4c3
Message-ID: <E1bvUn4-0005zF-6B@lists.gnupg.org>

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  2f7d4c38c9e7bcc14e6e0bf219d688c40a4afecb (commit)
      from  c318561ef4c97f0c2767aef377531d58174060a1 (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 2f7d4c38c9e7bcc14e6e0bf219d688c40a4afecb
Author: Werner Koch <wk at gnupg.org>
Date:   Sat Oct 15 21:35:05 2016 +0200

    agent: Move inotify code to common and improve it.
    
    * common/sysutils.c: Include sys/inotify.h.
    (my_error_from_syserror, my_error): New.
    (gnupg_inotify_watch_socket): New.
    (gnupg_inotify_has_name): New.
    * agent/gpg-agent.c: Do not include sys/inotify.h.
    (my_inotify_is_name): Remove.
    (handle_connections): Remove HAVE_INOTIFY_INIT protected code and use
    the new functions.
    --
    
    When removing not a simple socket file but the entire directory the
    old code missed most events and thus did not worked properly.
    
    IN_DELETE_SELF has also been added to the watch list to detect a
    removal of the directory.  However, in all tests that event was not
    triggered.  The only way it could be triggered was by not watching
    the socket dir but an arbitary directory and rmdir that.
    
    GnuPG-bug-id: 2756
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 32e072b..16edae0 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -47,9 +47,6 @@
 #ifdef HAVE_SIGNAL_H
 # include <signal.h>
 #endif
-#ifdef HAVE_INOTIFY_INIT
-# include <sys/inotify.h>
-#endif /*HAVE_INOTIFY_INIT*/
 #include <npth.h>
 
 #define GNUPG_COMMON_NEED_AFLOCAL
@@ -2716,31 +2713,6 @@ start_connection_thread_ssh (void *arg)
 }
 
 
-#ifdef HAVE_INOTIFY_INIT
-/* Read an inotify event and return true if it matches NAME.  */
-static int
-my_inotify_is_name (int fd, const char *name)
-{
-  union {
-    struct inotify_event ev;
-    char _buf[sizeof (struct inotify_event) + 100 + 1];
-  } buf;
-  int n;
-
-  n = npth_read (fd, &buf, sizeof buf);
-  if (n < sizeof (struct inotify_event))
-    return 0;
-  if (buf.ev.len < strlen (name)+1)
-    return 0;
-  if (strcmp (buf.ev.name, name))
-    return 0; /* Not the desired file.  */
-
-  return 1; /* Found.  */
-}
-#endif /*HAVE_INOTIFY_INIT*/
-
-
-
 /* Connection handler loop.  Wait for connection requests and spawn a
    thread after accepting a connection.  */
 static void
@@ -2749,6 +2721,7 @@ handle_connections (gnupg_fd_t listen_fd,
                     gnupg_fd_t listen_fd_browser,
                     gnupg_fd_t listen_fd_ssh)
 {
+  gpg_error_t err;
   npth_attr_t tattr;
   struct sockaddr_un paddr;
   socklen_t plen;
@@ -2764,9 +2737,7 @@ handle_connections (gnupg_fd_t listen_fd,
   HANDLE events[2];
   unsigned int events_set;
 #endif
-#ifdef HAVE_INOTIFY_INIT
-  int my_inotify_fd;
-#endif /*HAVE_INOTIFY_INIT*/
+  int my_inotify_fd = -1;
   struct {
     const char *name;
     void *(*func) (void *arg);
@@ -2804,27 +2775,14 @@ handle_connections (gnupg_fd_t listen_fd,
 # endif
 #endif
 
-#ifdef HAVE_INOTIFY_INIT
   if (disable_check_own_socket)
     my_inotify_fd = -1;
-  else if ((my_inotify_fd = inotify_init ()) == -1)
-    log_info ("error enabling fast daemon termination: %s\n",
-              strerror (errno));
-  else
+  else if ((err = gnupg_inotify_watch_socket (&my_inotify_fd, socket_name)))
     {
-      /* We need to watch the directory for the file because there
-       * won't be an IN_DELETE_SELF for a socket file.  */
-      char *slash = strrchr (socket_name, '/');
-      log_assert (slash && slash[1]);
-      *slash = 0;
-      if (inotify_add_watch (my_inotify_fd, socket_name, IN_DELETE) == -1)
-        {
-          close (my_inotify_fd);
-          my_inotify_fd = -1;
-        }
-      *slash = '/';
+      if (gpg_err_code (err) != GPG_ERR_NOT_SUPPORTED)
+        log_info ("error enabling fast daemon termination: %s\n",
+                  gpg_strerror (err));
     }
-#endif /*HAVE_INOTIFY_INIT*/
 
   /* On Windows we need to fire up a separate thread to listen for
      requests from Putty (an SSH client), so we can replace Putty's
@@ -2867,14 +2825,12 @@ handle_connections (gnupg_fd_t listen_fd,
       if (FD2INT (listen_fd_ssh) > nfd)
         nfd = FD2INT (listen_fd_ssh);
     }
-#ifdef HAVE_INOTIFY_INIT
   if (my_inotify_fd != -1)
     {
       FD_SET (my_inotify_fd, &fdset);
       if (my_inotify_fd > nfd)
         nfd = my_inotify_fd;
     }
-#endif /*HAVE_INOTIFY_INIT*/
 
   listentbl[0].l_fd = listen_fd;
   listentbl[1].l_fd = listen_fd_extra;
@@ -2949,14 +2905,13 @@ handle_connections (gnupg_fd_t listen_fd,
           ctrl_t ctrl;
           npth_t thread;
 
-#ifdef HAVE_INOTIFY_INIT
-          if (my_inotify_fd != -1 && FD_ISSET (my_inotify_fd, &read_fdset)
-              && my_inotify_is_name (my_inotify_fd, GPG_AGENT_SOCK_NAME))
+          if (my_inotify_fd != -1
+              && FD_ISSET (my_inotify_fd, &read_fdset)
+              && gnupg_inotify_has_name (my_inotify_fd, GPG_AGENT_SOCK_NAME))
             {
               shutdown_pending = 1;
               log_info ("socket file has been removed - shutting down\n");
             }
-#endif /*HAVE_INOTIFY_INIT*/
 
           for (idx=0; idx < DIM(listentbl); idx++)
             {
@@ -3004,10 +2959,8 @@ handle_connections (gnupg_fd_t listen_fd,
         }
     }
 
-#ifdef HAVE_INOTIFY_INIT
   if (my_inotify_fd != -1)
     close (my_inotify_fd);
-#endif /*HAVE_INOTIFY_INIT*/
   cleanup ();
   log_info (_("%s %s stopped\n"), strusage(11), strusage(13));
   npth_attr_destroy (&tattr);
diff --git a/common/sysutils.c b/common/sysutils.c
index 0f7b7f5..2e663bc 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -63,6 +63,9 @@
 # endif
 # include <windows.h>
 #endif
+#ifdef HAVE_INOTIFY_INIT
+# include <sys/inotify.h>
+#endif /*HAVE_INOTIFY_INIT*/
 #ifdef HAVE_NPTH
 # include <npth.h>
 #endif
@@ -78,6 +81,20 @@
 #define tohex(n) ((n) < 10 ? ((n) + '0') : (((n) - 10) + 'A'))
 
 
+static GPGRT_INLINE gpg_error_t
+my_error_from_syserror (void)
+{
+  return gpg_err_make (default_errsource, gpg_err_code_from_syserror ());
+}
+
+static GPGRT_INLINE gpg_error_t
+my_error (int e)
+{
+  return gpg_err_make (default_errsource, (e));
+}
+
+
+
 #if defined(__linux__) && defined(__alpha__) && __GLIBC__ < 2
 #warning using trap_unaligned
 static int
@@ -929,3 +946,113 @@ w32_get_user_sid (void)
   return sid;
 }
 #endif /*HAVE_W32_SYSTEM*/
+
+
+

+/* Support for inotify under Linux.  */
+
+/* Store a new inotify file handle for SOCKET_NAME at R_FD or return
+ * an error code. */
+gpg_error_t
+gnupg_inotify_watch_socket (int *r_fd, const char *socket_name)
+{
+#if HAVE_INOTIFY_INIT
+  gpg_error_t err;
+  char *fname;
+  int fd;
+  char *p;
+
+  *r_fd = -1;
+
+  fname = xtrystrdup (socket_name);
+  if (!fname)
+    return my_error_from_syserror ();
+
+  fd = inotify_init ();
+  if (fd == -1)
+    {
+      err = my_error_from_syserror ();
+      xfree (fname);
+      return err;
+    }
+
+  /* We need to watch the directory for the file because there won't
+   * be an IN_DELETE_SELF for a socket file.  To handle a removal of
+   * the directory we also watch the directory itself. */
+  p = strrchr (fname, '/');
+  if (p)
+    *p = 0;
+  if (inotify_add_watch (fd, fname,
+                         (IN_DELETE|IN_DELETE_SELF|IN_EXCL_UNLINK)) == -1)
+    {
+      err = my_error_from_syserror ();
+      close (fd);
+      xfree (fname);
+      return err;
+    }
+
+  xfree (fname);
+
+  *r_fd = fd;
+  return 0;
+#else /*!HAVE_INOTIFY_INIT*/
+
+  (void)socket_name;
+  *r_fd = -1;
+  return my_error (GPG_ERR_NOT_SUPPORTED);
+
+#endif /*!HAVE_INOTIFY_INIT*/
+}
+
+
+/* Read an inotify event and return true if it matches NAME or if it
+ * sees an IN_DELETE_SELF event for the directory of NAME.  */
+int
+gnupg_inotify_has_name (int fd, const char *name)
+{
+#if USE_NPTH && HAVE_INOTIFY_INIT
+  union {
+    struct inotify_event ev;
+    char _buf[sizeof (struct inotify_event) + 255 + 1];
+  } buf;
+  struct inotify_event *evp;
+  int n;
+
+  n = npth_read (fd, &buf, sizeof buf);
+  /* log_debug ("notify read: n=%d\n", n); */
+  evp = &buf.ev;
+  while (n >= sizeof (struct inotify_event))
+    {
+      /* log_debug ("             mask=%x len=%u name=(%s)\n", */
+      /*        evp->mask, (unsigned int)evp->len, evp->len? evp->name:""); */
+      if ((evp->mask & IN_UNMOUNT))
+        {
+          /* log_debug ("             found (dir unmounted)\n"); */
+          return 3; /* Directory was unmounted.  */
+        }
+      if ((evp->mask & IN_DELETE_SELF))
+        {
+          /* log_debug ("             found (dir removed)\n"); */
+          return 2; /* Directory was removed.  */
+        }
+      if ((evp->mask & IN_DELETE))
+        {
+          if (evp->len >= strlen (name) && !strcmp (evp->name, name))
+            {
+              /* log_debug ("             found (file removed)\n"); */
+              return 1; /* File was removed.  */
+            }
+        }
+      n -= sizeof (*evp) + evp->len;
+      evp = (struct inotify_event *)((char*)evp + sizeof (*evp) + evp->len);
+    }
+
+#else /*!(USE_NPTH && HAVE_INOTIFY_INIT)*/
+
+  (void)fd;
+  (void)name;
+
+#endif  /*!(USE_NPTH && HAVE_INOTIFY_INIT)*/
+
+  return 0; /* Not found.  */
+}
diff --git a/common/sysutils.h b/common/sysutils.h
index ba66ce6..ea92e4c 100644
--- a/common/sysutils.h
+++ b/common/sysutils.h
@@ -67,6 +67,10 @@ int  gnupg_setenv (const char *name, const char *value, int overwrite);
 int  gnupg_unsetenv (const char *name);
 char *gnupg_getcwd (void);
 
+gpg_error_t gnupg_inotify_watch_socket (int *r_fd, const char *socket_name);
+int gnupg_inotify_has_name (int fd, const char *name);
+
+
 #ifdef HAVE_W32_SYSTEM
 void *w32_get_user_sid (void);
 

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

Summary of changes:
 agent/gpg-agent.c |  65 ++++------------------------
 common/sysutils.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 common/sysutils.h |   4 ++
 3 files changed, 140 insertions(+), 56 deletions(-)


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



From cvs at cvs.gnupg.org  Sun Oct 16 23:29:41 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Sun, 16 Oct 2016 23:29:41 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-233-g0b0f9a3
Message-ID: <E1bvt04-0003xK-F5@lists.gnupg.org>

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  0b0f9a3788cb5d3c26cec16cd24acc973069d280 (commit)
      from  2f7d4c38c9e7bcc14e6e0bf219d688c40a4afecb (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 0b0f9a3788cb5d3c26cec16cd24acc973069d280
Author: Werner Koch <wk at gnupg.org>
Date:   Sun Oct 16 22:30:26 2016 +0200

    agent: Use straightforward names for the default socket names.
    
    * configure.ac (GPG_AGENT_SOCK_NAME): Change name to *.extra.
    (GPG_AGENT_EXTRA_SOCK_NAME): Change name to *browser.
    --
    
    There has been quite some fuzz about the naming of the (new) default
    socket files.  The used names do not match the names of the option.
    Because these are just names we now change the names to match the
    names of the options instead of changing the option names to something
    we can't agree upon.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/configure.ac b/configure.ac
index 9c591ed..91ef5c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1742,9 +1742,9 @@ AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool])
 
 AC_DEFINE_UNQUOTED(GPG_AGENT_SOCK_NAME, "S.gpg-agent",
                    [The name of the agent socket])
-AC_DEFINE_UNQUOTED(GPG_AGENT_EXTRA_SOCK_NAME, "S.gpg-agent.rstrd",
+AC_DEFINE_UNQUOTED(GPG_AGENT_EXTRA_SOCK_NAME, "S.gpg-agent.extra",
                    [The name of the agent socket for remote access])
-AC_DEFINE_UNQUOTED(GPG_AGENT_BROWSER_SOCK_NAME, "S.gpg-agent.brwsr",
+AC_DEFINE_UNQUOTED(GPG_AGENT_BROWSER_SOCK_NAME, "S.gpg-agent.browser",
                    [The name of the agent socket for browsers])
 AC_DEFINE_UNQUOTED(GPG_AGENT_SSH_SOCK_NAME, "S.gpg-agent.ssh",
                    [The name of the agent socket for ssh])

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

Summary of changes:
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


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



From cvs at cvs.gnupg.org  Mon Oct 17 04:40:21 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Mon, 17 Oct 2016 04:40:21 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-234-g70a8584
Message-ID: <E1bvxqi-0006bD-7C@lists.gnupg.org>

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  70a8584ec4389209762eb65bb77f20f7881577be (commit)
      from  0b0f9a3788cb5d3c26cec16cd24acc973069d280 (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 70a8584ec4389209762eb65bb77f20f7881577be
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Oct 17 11:36:45 2016 +0900

    gpgconf: Fix for --homedir.
    
    * tools/gpgconf-comp.c (gpg_agent_runtime_change,
    scdaemon_runtime_change, dirmngr_runtime_change): Provide the homedir
    arguments by --homedir when it's not default.
    
    --
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 82b5325..8bf3086 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -1088,33 +1088,48 @@ struct error_line_s
 static void
 gpg_agent_runtime_change (int killflag)
 {
-  gpg_error_t err;
+  gpg_error_t err = 0;
   const char *pgmname;
-  const char *argv[3];
+  const char *argv[5];
   pid_t pid;
+  char *abs_homedir = NULL;
+  int i = 0;
 
   pgmname = gnupg_module_name (GNUPG_MODULE_NAME_CONNECT_AGENT);
-  argv[0] = "--no-autostart";
-  argv[1] = killflag? "KILLAGENT" : "RELOADAGENT";
-  argv[2] = NULL;
+  if (!gnupg_default_homedir_p ())
+    {
+      abs_homedir = make_absfilename_try (gnupg_homedir (), NULL);
+      if (!abs_homedir)
+        err = gpg_error_from_syserror ();
 
-  err = gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid);
+      argv[i++] = "--homedir";
+      argv[i++] = abs_homedir;
+    }
+  argv[i++] = "--no-autostart";
+  argv[i++] = killflag? "KILLAGENT" : "RELOADAGENT";
+  argv[i++] = NULL;
+
+  if (!err)
+    err = gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid);
   if (!err)
     err = gnupg_wait_process (pgmname, pid, 1, NULL);
   if (err)
     gc_error (0, 0, "error running '%s %s': %s",
               pgmname, argv[1], gpg_strerror (err));
   gnupg_release_process (pid);
+  xfree (abs_homedir);
 }
 
 
 static void
 scdaemon_runtime_change (int killflag)
 {
-  gpg_error_t err;
+  gpg_error_t err = 0;
   const char *pgmname;
-  const char *argv[7];
+  const char *argv[9];
   pid_t pid;
+  char *abs_homedir = NULL;
+  int i = 0;
 
   (void)killflag;  /* For scdaemon kill and reload are synonyms.  */
 
@@ -1124,45 +1139,70 @@ scdaemon_runtime_change (int killflag)
      obviously a race condition but that should not harm too much.  */
 
   pgmname = gnupg_module_name (GNUPG_MODULE_NAME_CONNECT_AGENT);
-  argv[0] = "-s";
-  argv[1] = "--no-autostart";
-  argv[2] = "GETINFO scd_running";
-  argv[3] = "/if ${! $?}";
-  argv[4] = "scd killscd";
-  argv[5] = "/end";
-  argv[6] = NULL;
+  if (!gnupg_default_homedir_p ())
+    {
+      abs_homedir = make_absfilename_try (gnupg_homedir (), NULL);
+      if (!abs_homedir)
+        err = gpg_error_from_syserror ();
+
+      argv[i++] = "--homedir";
+      argv[i++] = abs_homedir;
+    }
+  argv[i++] = "-s";
+  argv[i++] = "--no-autostart";
+  argv[i++] = "GETINFO scd_running";
+  argv[i++] = "/if ${! $?}";
+  argv[i++] = "scd killscd";
+  argv[i++] = "/end";
+  argv[i++] = NULL;
 
-  err = gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid);
+  if (!err)
+    err = gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid);
   if (!err)
     err = gnupg_wait_process (pgmname, pid, 1, NULL);
   if (err)
     gc_error (0, 0, "error running '%s %s': %s",
               pgmname, argv[4], gpg_strerror (err));
   gnupg_release_process (pid);
+  xfree (abs_homedir);
 }
 
 
 static void
 dirmngr_runtime_change (int killflag)
 {
-  gpg_error_t err;
+  gpg_error_t err = 0;
   const char *pgmname;
-  const char *argv[4];
+  const char *argv[6];
   pid_t pid;
+  char *abs_homedir = NULL;
 
   pgmname = gnupg_module_name (GNUPG_MODULE_NAME_CONNECT_AGENT);
   argv[0] = "--no-autostart";
   argv[1] = "--dirmngr";
   argv[2] = killflag? "KILLDIRMNGR" : "RELOADDIRMNGR";
-  argv[3] = NULL;
+  if (gnupg_default_homedir_p ())
+    argv[3] = NULL;
+  else
+    {
+      abs_homedir = make_absfilename_try (gnupg_homedir (), NULL);
+      if (!abs_homedir)
+        err = gpg_error_from_syserror ();
 
-  err = gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid);
+      argv[3] = "--homedir";
+      argv[4] = abs_homedir;
+      argv[5] = NULL;
+    }
+
+  if (!err)
+    err = gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid);
   if (!err)
     err = gnupg_wait_process (pgmname, pid, 1, NULL);
   if (err)
     gc_error (0, 0, "error running '%s %s': %s",
               pgmname, argv[2], gpg_strerror (err));
   gnupg_release_process (pid);
+  xfree (abs_homedir);
 }
 
 

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

Summary of changes:
 tools/gpgconf-comp.c | 80 +++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 60 insertions(+), 20 deletions(-)


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



From cvs at cvs.gnupg.org  Mon Oct 17 05:06:24 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Mon, 17 Oct 2016 05:06:24 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-235-g25428be
Message-ID: <E1bvyFv-0007dS-AG@lists.gnupg.org>

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  25428be52168fa9c581b7f11c95a5c63b25343b7 (commit)
      from  70a8584ec4389209762eb65bb77f20f7881577be (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 25428be52168fa9c581b7f11c95a5c63b25343b7
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Oct 17 12:02:28 2016 +0900

    scd: Fix keytocard for ECC.
    
    * scd/app-openpgp.c (build_ecc_privkey_template): Size can be greater
    than 128 when it comes with public key for curve of larger field.
    
    --
    
    Reported-by: Arnaud Fontaine <arnaud.fontaine at ssi.gouv.fr>
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 563a045..ef335fe 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -2689,6 +2689,8 @@ build_ecc_privkey_template (app_t app, int keyno,
                    + privkey_len
                    + suffix_len
                    + datalen);
+  if (exthdr_len + privkey_len + suffix_len + datalen >= 128)
+    template_size++;
   tp = template = xtrymalloc_secure (template_size);
   if (!template)
     return gpg_error_from_syserror ();

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

Summary of changes:
 scd/app-openpgp.c | 2 ++
 1 file changed, 2 insertions(+)


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



From cvs at cvs.gnupg.org  Mon Oct 17 10:50:04 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Mon, 17 Oct 2016 10:50:04 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-238-gc2e713d
Message-ID: <E1bw3cW-00042G-Lt@lists.gnupg.org>

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  c2e713d9e25ef8b61e8eeb3c01ee1e31cb70b794 (commit)
       via  869c06efa791bbc8330becdb3f13f7cf9506257e (commit)
       via  c53ce53ab1fa6a328c368f2a15e3ccd803f03ee2 (commit)
      from  25428be52168fa9c581b7f11c95a5c63b25343b7 (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 c2e713d9e25ef8b61e8eeb3c01ee1e31cb70b794
Author: Justus Winter <justus at g10code.com>
Date:   Fri Oct 14 11:17:50 2016 +0200

    gpgscm: Initialize nesting stack.
    
    * tests/gpgscm/scheme.c (scheme_init_custom_alloc): Initialize nesting
    stack.
    
    Fixes-commit: f2249b737055f84842778285bbeff5e61fa55225
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
index 5a85063..0e31dc5 100644
--- a/tests/gpgscm/scheme.c
+++ b/tests/gpgscm/scheme.c
@@ -4765,6 +4765,7 @@ int scheme_init_custom_alloc(scheme *sc, func_alloc malloc, func_dealloc free) {
   sc->save_inport=sc->NIL;
   sc->loadport=sc->NIL;
   sc->nesting=0;
+  memset (sc->nesting_stack, 0, sizeof sc->nesting_stack);
   sc->interactive_repl=0;
   sc->strbuff = sc->malloc(STRBUFFSIZE);
   if (sc->strbuff == 0) {

commit 869c06efa791bbc8330becdb3f13f7cf9506257e
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Fri Oct 14 12:42:24 2016 -0400

    doc: Document how to manually shut down gpg-agent.
    
    * doc/gpg-agent.texi: document "gpgconf --kill gpg-agent" for manual
      agent termination.
    
    This was requested in a side-comment in https://bugs.debian.org/840669
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 7c41027..3177af4 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -85,6 +85,14 @@ gpg-connect-agent /bye
 @end example
 
 @noindent
+If you want to manually terminate the currently-running agent, you can
+safely do so with:
+
+ at example
+gpgconf --kill gpg-agent
+ at end example
+
+ at noindent
 @efindex GPG_TTY
 You should always add the following lines to your @code{.bashrc} or
 whatever initialization file is used for all shell invocations:
@@ -1518,6 +1526,7 @@ much slower or faster than the actual box.
 @ifset isman
 @command{@gpgname}(1),
 @command{gpgsm}(1),
+ at command{gpgconf}(1),
 @command{gpg-connect-agent}(1),
 @command{scdaemon}(1)
 @end ifset

commit c53ce53ab1fa6a328c368f2a15e3ccd803f03ee2
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Fri Oct 14 02:23:37 2016 -0400

    doc: Point gpg-agent(1) at the right gpg manpage in SEE ALSO.
    
    * doc/gpg-agent.texi (SEE ALSO): refer to @gpgname, instead of
      hard-coding "gpg2".
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index cc10a79..7c41027 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -1516,7 +1516,7 @@ much slower or faster than the actual box.
 
 @mansect see also
 @ifset isman
- at command{gpg2}(1),
+ at command{@gpgname}(1),
 @command{gpgsm}(1),
 @command{gpg-connect-agent}(1),
 @command{scdaemon}(1)

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

Summary of changes:
 doc/gpg-agent.texi    | 11 ++++++++++-
 tests/gpgscm/scheme.c |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)


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



From cvs at cvs.gnupg.org  Tue Oct 18 09:54:24 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Tue, 18 Oct 2016 09:54:24 +0200
Subject: [git] GpgOL - branch, nomapi, updated. gpgol-1.4.0-90-g5c7b1ba
Message-ID: <E1bwPEB-0005oy-74@lists.gnupg.org>

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 "GnuPG extension for MS Outlook".

The branch, nomapi has been updated
       via  5c7b1ba75cb929b9caa9b1805215eaf1768efc66 (commit)
       via  95012778c925908aff80a4df2705d32549de53fc (commit)
       via  cbfe240a04e9ca530c7ba6050616a099f946f522 (commit)
       via  13f607ec249e7b923b15af0aa6b1eaba73ba1d75 (commit)
       via  015d515c6b591e73f54c275fe4e664b7a49e605e (commit)
      from  0499861a0dda3fd159d93e3638550e7fcd768501 (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 5c7b1ba75cb929b9caa9b1805215eaf1768efc66
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Oct 18 09:53:15 2016 +0200

    Extend signature status display
    
    * src/mail.cpp (get_uid_for_sender): Factored out of get_valid_sig.
    (Mail::get_valid_sig): Improve tofu handling.
    (Mail::get_signature_status): Handle more states.

diff --git a/src/mail.cpp b/src/mail.cpp
index e50b466..4e06a88 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -49,6 +49,11 @@ static std::map<std::string, Mail*> g_uid_map;
 
 #define COPYBUFSIZE (8 * 1024)
 
+/* Our own basic trust level for tofu.
+   GnuPG's can't be trusted. See comment
+   in get_valid_sig why.*/
+#define GPGOL_BASIC_TOFU_TRUST 10
+
 /* TODO: Localize this once it is less bound to change.
    TODO: Use a dedicated message for failed decryption. */
 #define HTML_TEMPLATE  \
@@ -872,6 +877,46 @@ Mail::close_inspector ()
   return 0;
 }
 
+static const UserID
+get_uid_for_sender (const Key k, const char *sender)
+{
+  UserID ret;
+
+  if (!sender)
+    {
+      return ret;
+    }
+
+  if (!k.numUserIDs())
+    {
+      log_debug ("%s:%s: Key without uids",
+                 SRCNAME, __func__);
+      return ret;
+    }
+
+  for (const auto uid: k.userIDs())
+    {
+      if (!uid.email())
+        {
+          continue;
+        }
+      auto normalized_uid = uid.addrSpec();
+      auto normalized_sender = UserID::addrSpecFromString(sender);
+
+      if (normalized_sender.empty() || normalized_uid.empty())
+        {
+          log_error ("%s:%s: normalizing '%s' or '%s' failed.",
+                     SRCNAME, __func__, uid.email(), sender);
+          continue;
+        }
+      if (normalized_sender == normalized_uid)
+        {
+          ret = uid;
+        }
+    }
+  return ret;
+}
+
 const std::pair <Signature, UserID>
 Mail::get_valid_sig ()
 {
@@ -907,45 +952,36 @@ Mail::get_valid_sig ()
           /* For our category we only care about trusted sigs. */
           continue;
         }
-      Key k = sig.key();
-      for (const auto uid: k.userIDs())
+      const auto uid = get_uid_for_sender (sig.key(), sender);
+      if (sig.validity() == Signature::Validity::Marginal)
         {
-          if (!uid.email())
-            {
-              TRACEPOINT;
-              continue;
-            }
-          auto normalized_uid = uid.addrSpec();
-          auto normalized_sender = UserID::addrSpecFromString(sender);
-
-          if (normalized_sender.empty() || normalized_uid.empty())
+          const auto tofu = uid.tofuInfo();
+          if (tofu.isNull() ||
+              (tofu.validity() != TofuInfo::Validity::LittleHistory &&
+               tofu.validity() != TofuInfo::Validity::BasicHistory &&
+               tofu.validity() != TofuInfo::Validity::LargeHistory))
             {
-              log_error ("%s:%s: normalizing '%s' or '%s' failed.",
-                         SRCNAME, __func__, uid.email(), sender);
+              /* Marginal is not good enough without tofu.
+                 We also wait for basic trust. */
+              log_debug ("%s:%s: Discarding marginal signature.",
+                         SRCNAME, __func__);
               continue;
             }
-
-          if (normalized_sender == normalized_uid)
-            {
-              if (sig.validity() == Signature::Validity::Marginal)
-                {
-                  const auto tofu = uid.tofuInfo();
-                  if (tofu.isNull() ||
-                      (tofu.validity() != TofuInfo::Validity::BasicHistory &&
-                       tofu.validity() != TofuInfo::Validity::LargeHistory))
-                    {
-                      /* Marginal is not good enough without tofu.
-                         We also wait for basic trust. */
-                      log_debug ("%s:%s: Discarding marginal signature.",
-                                 SRCNAME, __func__);
-                      continue;
-                    }
-                }
-              log_debug ("%s:%s: Classified sender as verified",
+          /* GnuPG uses the encrypt cound to determine validity.
+             This does not make sense for us. E.g. Drafts may have
+             been encrypted and encryption is no communication so
+             it does not track communication.
+             So basically "Our" Tofu validity is then more then 10 messages
+             have been exchanged. */
+          if (!tofu.isNull() && tofu.signCount() <= GPGOL_BASIC_TOFU_TRUST) {
+              log_debug ("%s:%s: Tofu signcount too small.",
                          SRCNAME, __func__);
-              return std::pair<Signature, UserID> (sig, uid);
-            }
+              continue;
+          }
         }
+      log_debug ("%s:%s: Classified sender as verified",
+                 SRCNAME, __func__);
+      return std::pair<Signature, UserID> (sig, uid);
     }
   log_debug ("%s:%s: No signature with enough trust.",
              SRCNAME, __func__);
@@ -1021,18 +1057,22 @@ Mail::get_signature_status()
   std::string message;
   if (!is_signed())
     {
-      return _("This message is not signed.\nYou cannot be sure who wrote the message.");
+      message =_("This message is not signed.\n");
+      message += _("You cannot be sure who wrote the message.");
+      return message;
     }
 
   const auto pair = get_valid_sig ();
-  const auto sig = pair.first;
-  const auto uid = pair.second;
+  bool keyFound = false;
   char *buf;
-  bool isOpenPGP = sig.key().protocol() == Protocol::OpenPGP;
-  if (!sig.isNull () && !uid.isNull ())
+  bool isOpenPGP = pair.first.key().protocol() == Protocol::OpenPGP;
+  if (!pair.first.isNull () && !pair.second.isNull ())
     {
+      const auto sig = pair.first;
+      const auto uid = pair.second;
       /* We are valid */
-      gpgrt_asprintf (&buf, _("The signature is valid because:\n\nThe used %s %s"),
+      keyFound = true;
+      gpgrt_asprintf (&buf, _("The sender is verified because:\n\nThe used %s %s"),
                       isOpenPGP ? _("key") : _("certificate"),
                       sig.validity() == Signature::Validity::Ultimate ?
                       _("is marked as your own.") :
@@ -1050,15 +1090,128 @@ Mail::get_signature_status()
         }
       else if (sig.validity() == Signature::Validity::Marginal)
         {
-          gpgrt_asprintf (&buf, _("was consistently used for %i messages since %lu."),
-                          uid.tofuInfo().signCount (), uid.tofuInfo().signFirst());
+          char *time = format_date_from_gpgme (uid.tofuInfo().signFirst());
+          gpgrt_asprintf (&buf, _("was consistently used for %i messages since %s."),
+                          uid.tofuInfo().signCount (), time);
+          xfree (time);
           message += buf;
           xfree (buf);
         }
     }
+  else
+    {
+      if (m_verify_result.numSignatures() > 1)
+        {
+          log_debug ("%s:%s: More then one signature found on %p",
+                     SRCNAME, __func__, m_mailitem);
+        }
+      /* We only handle the first signature. */
+      const auto sig = m_verify_result.signature (0);
+      keyFound = !(sig.summary() & Signature::Summary::KeyMissing);
+
+      log_debug ("%s:%s: Formatting sig. Validity: %x Summary: %x",
+                 SRCNAME, __func__, sig.validity(), sig.summary());
+
+      /* There is a signature but we don't accepted it as fully valid. */
+      message += _("The sender is not verified because:\n\n");
+
+      /* First the general stuff. */
+      if (sig.summary() & Signature::Summary::Red)
+        {
+          message += _("The signature is invalid.\n");
+          message += _("You cannot be sure who wrote the message.");
+        }
+      else if (sig.summary() & Signature::Summary::SysError ||
+               m_verify_result.numSignatures() < 1)
+        {
+          message += _("There was an error verifying the signature.\n");
+          message += _("You cannot be sure who wrote the message.");
+        }
+      else if (sig.summary() & Signature::Summary::SigExpired)
+        {
+          message += _("The signature is expired.\n");
+        }
+      else
+        {
+          gpgrt_asprintf (&buf, _("The used %s "),
+                          isOpenPGP ? _("key") : _("certificate"));
+          message += buf;
+          xfree (buf);
+        }
+
+      const auto uid = get_uid_for_sender (sig.key(), get_sender());
+      /* Now the key problems */
+      if ((sig.summary() & Signature::Summary::KeyMissing))
+        {
+          message += _("is not in your keyring.");
+        }
+      else if ((sig.summary() & Signature::Summary::KeyRevoked))
+        {
+          message += _("is revoked.");
+        }
+      else if ((sig.summary() & Signature::Summary::KeyExpired))
+        {
+          message += _("is expired.");
+        }
+      else if ((sig.summary() & Signature::Summary::BadPolicy))
+        {
+          message += _("is not meant for signing.");
+        }
+      else if ((sig.summary() & Signature::Summary::CrlMissing))
+        {
+          message += _("could not be checked for revocation.");
+        }
+      else if ((sig.summary() & Signature::Summary::CrlTooOld))
+        {
+          message += _("could not be checked for revocation.");
+        }
+      else if ((sig.summary() & Signature::Summary::TofuConflict))
+        {
+          message += _("conflicts with another key that was used in the past by the sender.");
+        }
+      else if (uid.isNull())
+        {
+          gpgrt_asprintf (&buf, _("does not claim the address: \"%s\"."),
+                          get_sender());
+          message += buf;
+          xfree (buf);
+        }
+      else if ((sig.validity() & Signature::Validity::Marginal))
+        {
+          const auto tofuInfo = uid.tofuInfo();
+          if (tofuInfo.isNull() || !tofuInfo.signCount())
+            {
+              message += _("is not certified by enough trusted keys.");
+            }
+          else
+            {
+              message += _("does not have enough history for basic trust.");
+            }
+        }
+      else if ((sig.validity() & Signature::Validity::Undefined) ||
+               (sig.validity() & Signature::Validity::Unknown) ||
+               (sig.summary() == Signature::Summary::None) ||
+               (sig.validity() == 0))
+        {
+           /* Bit of a catch all for weird results. */
+           message += _("is not ceritified by any trusted key.");
+        }
+      else if ((sig.validity() & Signature::Validity::Never))
+        {
+          message += _("is explicitly marked as invalid.");
+        }
+    }
   message += "\n\n";
-  gpgrt_asprintf (&buf, _("Click here for details about the %s."),
+  if (keyFound)
+    {
+      gpgrt_asprintf (&buf, _("Click here for details about the %s."),
                   isOpenPGP ? _("key") : _("certificate."));
+    }
+  else
+    {
+      gpgrt_asprintf (&buf, _("Click here to search the %s on a public keyserver."),
+                  isOpenPGP ? _("key") : _("certificate."));
+    }
   message += buf;
   xfree (buf);
   return message;

commit 95012778c925908aff80a4df2705d32549de53fc
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Oct 18 09:50:35 2016 +0200

    Also update key if a signature already has key
    
    * src/parsecontroller.cpp (ParseController::parse): Update key
    if a signature has a key.

diff --git a/src/parsecontroller.cpp b/src/parsecontroller.cpp
index cf4adab..a7fa842 100644
--- a/src/parsecontroller.cpp
+++ b/src/parsecontroller.cpp
@@ -288,6 +288,12 @@ ParseController::parse()
              SRCNAME, __func__, m_decrypt_result.error().code(),
              m_verify_result.error().code());
 
+  /* Ensure that the Keys for the signatures are available */
+  for (const auto sig: m_verify_result.signatures())
+    {
+      sig.key(true, true);
+    }
+
   if (opt.enable_debug)
     {
        std::stringstream ss;
@@ -295,12 +301,6 @@ ParseController::parse()
        log_debug ("Decrypt / Verify result: %s", ss.str().c_str());
     }
 
-  /* Ensure that the Keys for the signatures are available */
-  for (const auto sig: m_verify_result.signatures())
-    {
-      sig.key(true, false);
-    }
-
   return;
 }
 

commit cbfe240a04e9ca530c7ba6050616a099f946f522
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Oct 17 18:41:08 2016 +0200

    Add helper to format epoch time with windows
    
    * src/common.c (epoch_to_file_time): New.
    (format_date_from_gpgme): New.
    
    --
    Format's an unsinged long into a string according to the users
    locale.

diff --git a/src/common.c b/src/common.c
index 557bc2a..42598f9 100644
--- a/src/common.c
+++ b/src/common.c
@@ -819,3 +819,37 @@ get_gpg4win_dir()
     }
   return NULL;
 }
+
+
+static void
+epoch_to_file_time (unsigned long time, LPFILETIME pft)
+{
+ LONGLONG ll;
+
+ ll = Int32x32To64(time, 10000000) + 116444736000000000;
+ pft->dwLowDateTime = (DWORD)ll;
+ pft->dwHighDateTime = ll >> 32;
+}
+
+char *
+format_date_from_gpgme (unsigned long time)
+{
+  wchar_t buf[256];
+  FILETIME ft;
+  SYSTEMTIME st;
+
+  epoch_to_file_time (time, &ft);
+  FileTimeToSystemTime(&ft, &st);
+  int ret = GetDateFormatEx (NULL,
+                             DATE_SHORTDATE,
+                             &st,
+                             NULL,
+                             buf,
+                             256,
+                             NULL);
+  if (ret == 0)
+    {
+      return NULL;
+    }
+  return wchar_to_utf8 (buf);
+}
diff --git a/src/common.h b/src/common.h
index 9a3887c..70b4ee7 100644
--- a/src/common.h
+++ b/src/common.h
@@ -116,6 +116,8 @@ char *percent_escape (const char *str, const char *extra);
 
 void fix_linebreaks (char *str, int *len);
 
+char *format_date_from_gpgme (unsigned long time);
+
 /*-- main.c --*/
 const void *get_128bit_session_key (void);
 const void *get_64bit_session_marker (void);

commit 13f607ec249e7b923b15af0aa6b1eaba73ba1d75
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Oct 17 12:59:42 2016 +0200

    Handle Explorer context in mail from control
    
    * src/ribbon-callbacks.cpp (get_mail_from_control): Handle explorer.
    --
    This fixes the mail lookup if the mail is only viewed in the
    preview window of outlook

diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index 4c3ccd5..d38cfe3 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -1429,22 +1429,42 @@ get_mail_from_control (LPDISPATCH ctrl)
       return NULL;
     }
 
-  mailitem = get_oom_object (context, "CurrentItem");
+  char *ctx_name = get_object_name (context);
+
+  if (!ctx_name)
+    {
+      log_error ("%s:%s: Failed to get context name",
+                 SRCNAME, __func__);
+      gpgol_release (context);
+      return NULL;
+
+    }
+  if (!strcmp (ctx_name, "_Inspector"))
+    {
+      mailitem = get_oom_object (context, "CurrentItem");
+    }
+  else if (!strcmp (ctx_name, "_Explorer"))
+    {
+      mailitem = get_oom_object (context, "Selection.Item(1)");
+    }
+
   gpgol_release (context);
   if (!mailitem)
     {
-      log_error ("%s:%s: Failed to get mailitem.",
-                 SRCNAME, __func__);
+      log_error ("%s:%s: Failed to get mailitem. From %s",
+                 SRCNAME, __func__, ctx_name);
+      xfree (ctx_name);
       return NULL;
     }
+  xfree (ctx_name);
 
   /* Get the uid of this item. */
   char *uid = get_unique_id (mailitem, 0);
-  gpgol_release (mailitem);
   if (!uid)
     {
       log_oom ("%s:%s: Failed to get uid for %p .",
                SRCNAME, __func__, mailitem);
+      gpgol_release (mailitem);
       return NULL;
     }
 

commit 015d515c6b591e73f54c275fe4e664b7a49e605e
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Oct 17 12:59:07 2016 +0200

    Fix memleak in get context dbg output
    
    * src/ribbon-callbacks (getContext): Release object name.

diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index f9c47d7..4c3ccd5 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -56,8 +56,14 @@
 HRESULT getContext (LPDISPATCH ctrl, LPDISPATCH *context)
 {
   *context = get_oom_object (ctrl, "get_Context");
-  log_debug ("%s:%s: contextObj: %s",
-             SRCNAME, __func__, get_object_name (*context));
+  if (*context)
+    {
+      char *name = get_object_name (*context);
+      log_debug ("%s:%s: contextObj: %s",
+                 SRCNAME, __func__, name);
+      xfree (name);
+    }
+
   return context ? S_OK : E_FAIL;
 }
 

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

Summary of changes:
 src/common.c             |  34 +++++++
 src/common.h             |   2 +
 src/mail.cpp             | 237 ++++++++++++++++++++++++++++++++++++++---------
 src/parsecontroller.cpp  |  12 +--
 src/ribbon-callbacks.cpp |  38 ++++++--
 5 files changed, 269 insertions(+), 54 deletions(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org



From cvs at cvs.gnupg.org  Tue Oct 18 10:27:56 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Tue, 18 Oct 2016 10:27:56 +0200
Subject: [git] GpgOL - branch, nomapi, updated. gpgol-1.4.0-92-g51f5a2d
Message-ID: <E1bwPkc-0007Wx-U1@lists.gnupg.org>

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 "GnuPG extension for MS Outlook".

The branch, nomapi has been updated
       via  51f5a2d9628c60ac490fbd5ee0c1511179ec74a0 (commit)
       via  608ba6ac6170ff0e2bc8884a5a234d8775c1beb0 (commit)
      from  5c7b1ba75cb929b9caa9b1805215eaf1768efc66 (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 51f5a2d9628c60ac490fbd5ee0c1511179ec74a0
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Oct 18 10:27:14 2016 +0200

    Move icons into subdir
    
    --

diff --git a/configure.ac b/configure.ac
index e7e8f57..876977d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -311,6 +311,7 @@ fi
 
 AC_CONFIG_FILES([ Makefile
 src/Makefile
+src/icons/Makefile
 src/versioninfo.rc
 forms/Makefile
 doc/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 6909886..4f242df 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,7 @@
-# Makefile.am - main makefile for dialogs part of GPGol
+# Makefile.am - makefile for GPGol
 # Copyright (C) 2005 g10 Code GmbH
-# 
+# Copyright (C) 2016 Intevation GmbH
+#
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
@@ -11,24 +12,15 @@
 
 ## Process this file with automake to produce Makefile.in
 
+
 unused_sources = item-events.cpp 
 
+SUBDIRS = icons
+
 bin_PROGRAMS = gpgol 
-#treeview
 EXTRA_DIST = \
 	versioninfo.rc.in mapi32.def $(unused_sources) Outlook.gpl \
-	encrypt-16.bmp encrypt-16m.bmp \
-	sign-16.bmp sign-16m.bmp \
-	key-manager-16.bmp key-manager-16m.bmp \
-	decrypt-16.bmp decrypt-16m.bmp \
-	verify-16.bmp  verify-16m.bmp \
-	decrypt-verify-16.bmp decrypt-verify-16m.bmp \
-	encrypt-16.png encrypt-48.png \
-	key-manager-64.png \
-	decrypt-16.png decrypt-48.png \
-	encrypt-sign-file-48.png \
-	sign-48.png verify-48.png \
-	dialogs.rc README.icons
+	dialogs.rc
 
 EXEEXT = .dll
 
diff --git a/src/dialogs.rc b/src/dialogs.rc
index f233a9c..5c975ad 100644
--- a/src/dialogs.rc
+++ b/src/dialogs.rc
@@ -25,32 +25,32 @@
 #include "afxres.h"
 
 
-IDB_ENCRYPT_16            BITMAP  DISCARDABLE  "encrypt-16.bmp"
-IDB_ENCRYPT_16M           BITMAP  DISCARDABLE  "encrypt-16m.bmp"
-IDI_ENCRYPT_16_PNG        RCDATA               "encrypt-16.png"
-IDI_ENCRYPT_48_PNG        RCDATA               "encrypt-48.png"
+IDB_ENCRYPT_16            BITMAP  DISCARDABLE  "icons/encrypt-16.bmp"
+IDB_ENCRYPT_16M           BITMAP  DISCARDABLE  "icons/encrypt-16m.bmp"
+IDI_ENCRYPT_16_PNG        RCDATA               "icons/encrypt-16.png"
+IDI_ENCRYPT_48_PNG        RCDATA               "icons/encrypt-48.png"
 
-IDB_SIGN_16               BITMAP  DISCARDABLE  "sign-16.bmp"
-IDB_SIGN_16M              BITMAP  DISCARDABLE  "sign-16m.bmp"
-IDI_SIGN_48_PNG           RCDATA               "sign-48.png"
+IDB_SIGN_16               BITMAP  DISCARDABLE  "icons/sign-16.bmp"
+IDB_SIGN_16M              BITMAP  DISCARDABLE  "icons/sign-16m.bmp"
+IDI_SIGN_48_PNG           RCDATA               "icons/sign-48.png"
 
-IDB_KEY_MANAGER_16        BITMAP  DISCARDABLE  "key-manager-16.bmp"
-IDB_KEY_MANAGER_16M       BITMAP  DISCARDABLE  "key-manager-16m.bmp"
-IDI_KEY_MANAGER_64_PNG    RCDATA               "key-manager-64.png"
+IDB_KEY_MANAGER_16        BITMAP  DISCARDABLE  "icons/key-manager-16.bmp"
+IDB_KEY_MANAGER_16M       BITMAP  DISCARDABLE  "icons/key-manager-16m.bmp"
+IDI_KEY_MANAGER_64_PNG    RCDATA               "icons/key-manager-64.png"
 
-IDB_DECRYPT_16            BITMAP  DISCARDABLE  "decrypt-16.bmp"
-IDB_DECRYPT_16M           BITMAP  DISCARDABLE  "decrypt-16m.bmp"
-IDI_DECRYPT_16_PNG        RCDATA               "decrypt-16.png"
-IDI_DECRYPT_48_PNG        RCDATA               "decrypt-48.png"
+IDB_DECRYPT_16            BITMAP  DISCARDABLE  "icons/decrypt-16.bmp"
+IDB_DECRYPT_16M           BITMAP  DISCARDABLE  "icons/decrypt-16m.bmp"
+IDI_DECRYPT_16_PNG        RCDATA               "icons/decrypt-16.png"
+IDI_DECRYPT_48_PNG        RCDATA               "icons/decrypt-48.png"
 
-IDB_VERIFY_16             BITMAP  DISCARDABLE  "verify-16.bmp"
-IDB_VERIFY_16M            BITMAP  DISCARDABLE  "verify-16m.bmp"
-IDI_VERIFY_48_PNG         RCDATA               "verify-48.png"
+IDB_VERIFY_16             BITMAP  DISCARDABLE  "icons/verify-16.bmp"
+IDB_VERIFY_16M            BITMAP  DISCARDABLE  "icons/verify-16m.bmp"
+IDI_VERIFY_48_PNG         RCDATA               "icons/verify-48.png"
 
-IDB_DECRYPT_VERIFY_16     BITMAP  DISCARDABLE  "decrypt-verify-16.bmp" 
-IDB_DECRYPT_VERIFY_16M    BITMAP  DISCARDABLE  "decrypt-verify-16m.bmp"
+IDB_DECRYPT_VERIFY_16     BITMAP  DISCARDABLE  "icons/decrypt-verify-16.bmp"
+IDB_DECRYPT_VERIFY_16M    BITMAP  DISCARDABLE  "icons/decrypt-verify-16m.bmp"
 
-IDI_ENCSIGN_FILE_48_PNG   RCDATA               "encrypt-sign-file-48.png"
+IDI_ENCSIGN_FILE_48_PNG   RCDATA               "icons/encrypt-sign-file-48.png"
 
 
 
diff --git a/src/README.icons b/src/icons/README.icons
similarity index 93%
rename from src/README.icons
rename to src/icons/README.icons
index 3d55741..edf7fb8 100644
--- a/src/README.icons
+++ b/src/icons/README.icons
@@ -21,13 +21,13 @@ and those installed via the forms extensions from external files.
   dialogs.rc to create the resource.  This is all integtraged into the
   Makefile.  A sample entry in dialogs.rc looks like this:
 
-    IDB_KEY_MANAGER_16        BITMAP  DISCARDABLE  "key-manager-16.bmp"
-    IDB_KEY_MANAGER_16M       BITMAP  DISCARDABLE  "key-manager-16m.bmp"
-    IDB_KEY_MANAGER_32        BITMAP  DISCARDABLE  "key-manager-32.bmp"
-    IDB_KEY_MANAGER_32M       BITMAP  DISCARDABLE  "key-manager-32m.bmp"
+    IDB_KEY_MANAGER_16        BITMAP  DISCARDABLE  "icons/key-manager-16.bmp"
+    IDB_KEY_MANAGER_16M       BITMAP  DISCARDABLE  "icons/key-manager-16m.bmp"
+    IDB_KEY_MANAGER_32        BITMAP  DISCARDABLE  "icons/key-manager-32.bmp"
+    IDB_KEY_MANAGER_32M       BITMAP  DISCARDABLE  "icons/key-manager-32m.bmp"
     //IDB_KEY_MANAGER_64        BITMAP  DISCARDABLE
     //IDB_KEY_MANAGER_64M       BITMAP  DISCARDABLE
-    IDI_KEY_MANAGER_64_PNG    RCDATA               "key-manager-64.png"
+    IDI_KEY_MANAGER_64_PNG    RCDATA               "icons/key-manager-64.png"
 
   This is the icon for the certificate manager.  We provide two
   resolutions: 16x16 and 32x32 pixel.  I have not yet encountered the
@@ -62,7 +62,7 @@ and those installed via the forms extensions from external files.
   6. Select Select->By_Color, click on the transparent area.
      Change the background color to white (0xffffff) and run
      Layer->Transparency->Remove_Alpha_Channel.
- 
+
   7. Select Select->Invert.  Use "Bucket Fill" to fill the now
      selected non-transparent area with black (0x000000).  "Fill whole
      selection" comes handy here.  Make sure that you have a only
@@ -99,7 +99,7 @@ and those installed via the forms extensions from external files.
      compression.  Click "Save".
 
   4. Load a 32x32 PNG version of the icon into The Gimp.
-   
+
   5. Select File->SaveAs and enter a file name with the suffix ".ico".
      Click "Save" and you will be asked for the type.  From the
      drop-down box choose "8 bpp, 1-bit alpha, 256-slot palette", no
@@ -130,4 +130,3 @@ like this:
   src/sign-16m.bmp:           PC bitmap data, Windows 3.x format, 16 x 16 x 1
   src/verify-16.bmp:          PC bitmap data, Windows 3.x format, 16 x 16 x 8
   src/verify-16m.bmp:         PC bitmap data, Windows 3.x format, 16 x 16 x 1
-
diff --git a/src/decrypt-16.bmp b/src/icons/decrypt-16.bmp
similarity index 100%
rename from src/decrypt-16.bmp
rename to src/icons/decrypt-16.bmp
diff --git a/src/decrypt-16.png b/src/icons/decrypt-16.png
similarity index 100%
rename from src/decrypt-16.png
rename to src/icons/decrypt-16.png
diff --git a/src/decrypt-16m.bmp b/src/icons/decrypt-16m.bmp
similarity index 100%
rename from src/decrypt-16m.bmp
rename to src/icons/decrypt-16m.bmp
diff --git a/src/decrypt-48.png b/src/icons/decrypt-48.png
similarity index 100%
rename from src/decrypt-48.png
rename to src/icons/decrypt-48.png
diff --git a/src/decrypt-verify-16.bmp b/src/icons/decrypt-verify-16.bmp
similarity index 100%
rename from src/decrypt-verify-16.bmp
rename to src/icons/decrypt-verify-16.bmp
diff --git a/src/decrypt-verify-16m.bmp b/src/icons/decrypt-verify-16m.bmp
similarity index 100%
rename from src/decrypt-verify-16m.bmp
rename to src/icons/decrypt-verify-16m.bmp
diff --git a/src/encrypt-16.bmp b/src/icons/encrypt-16.bmp
similarity index 100%
rename from src/encrypt-16.bmp
rename to src/icons/encrypt-16.bmp
diff --git a/src/encrypt-16.png b/src/icons/encrypt-16.png
similarity index 100%
rename from src/encrypt-16.png
rename to src/icons/encrypt-16.png
diff --git a/src/encrypt-16m.bmp b/src/icons/encrypt-16m.bmp
similarity index 100%
rename from src/encrypt-16m.bmp
rename to src/icons/encrypt-16m.bmp
diff --git a/src/encrypt-48.png b/src/icons/encrypt-48.png
similarity index 100%
rename from src/encrypt-48.png
rename to src/icons/encrypt-48.png
diff --git a/src/encrypt-sign-file-48.png b/src/icons/encrypt-sign-file-48.png
similarity index 100%
rename from src/encrypt-sign-file-48.png
rename to src/icons/encrypt-sign-file-48.png
diff --git a/src/key-manager-16.bmp b/src/icons/key-manager-16.bmp
similarity index 100%
rename from src/key-manager-16.bmp
rename to src/icons/key-manager-16.bmp
diff --git a/src/key-manager-16m.bmp b/src/icons/key-manager-16m.bmp
similarity index 100%
rename from src/key-manager-16m.bmp
rename to src/icons/key-manager-16m.bmp
diff --git a/src/key-manager-64.png b/src/icons/key-manager-64.png
similarity index 100%
rename from src/key-manager-64.png
rename to src/icons/key-manager-64.png
diff --git a/src/kleopatra.bmp b/src/icons/kleopatra.bmp
similarity index 100%
rename from src/kleopatra.bmp
rename to src/icons/kleopatra.bmp
diff --git a/src/sign-16.bmp b/src/icons/sign-16.bmp
similarity index 100%
rename from src/sign-16.bmp
rename to src/icons/sign-16.bmp
diff --git a/src/sign-16m.bmp b/src/icons/sign-16m.bmp
similarity index 100%
rename from src/sign-16m.bmp
rename to src/icons/sign-16m.bmp
diff --git a/src/sign-48.png b/src/icons/sign-48.png
similarity index 100%
rename from src/sign-48.png
rename to src/icons/sign-48.png
diff --git a/src/verify-16.bmp b/src/icons/verify-16.bmp
similarity index 100%
rename from src/verify-16.bmp
rename to src/icons/verify-16.bmp
diff --git a/src/verify-16m.bmp b/src/icons/verify-16m.bmp
similarity index 100%
rename from src/verify-16m.bmp
rename to src/icons/verify-16m.bmp
diff --git a/src/verify-48.png b/src/icons/verify-48.png
similarity index 100%
rename from src/verify-48.png
rename to src/icons/verify-48.png

commit 608ba6ac6170ff0e2bc8884a5a234d8775c1beb0
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Oct 18 10:15:12 2016 +0200

    Enable signature status in home tab
    
    * src/gpgoladdin.cpp (GetCustomUI_MIME): Enable inline and
    Status icons.
    
    --
    Inline editor support does not work yet but It's also part
    of the explorer customui so it's enabled again.

diff --git a/src/gpgoladdin.cpp b/src/gpgoladdin.cpp
index ac5d399..e8c5bd8 100644
--- a/src/gpgoladdin.cpp
+++ b/src/gpgoladdin.cpp
@@ -759,7 +759,6 @@ GetCustomUI_MIME (BSTR RibbonID, BSTR * RibbonXml)
         _("Decrypt")
         );
     }
-#if 0
   /* We don't use this code currently because calling the send
      event for Inline Response mailitems fails. */
   else if (!wcscmp (RibbonID, L"Microsoft.Outlook.Explorer"))
@@ -768,6 +767,26 @@ GetCustomUI_MIME (BSTR RibbonID, BSTR * RibbonXml)
         "<customUI xmlns=\"http://schemas.microsoft.com/office/2009/07/customui\""
         " onLoad=\"ribbonLoaded\">"
         " <ribbon>"
+        "   <tabs>"
+        "    <tab idMso=\"TabMail\">"
+        "     <group id=\"general_read\""
+        "            label=\"%s\">"
+        "       <button id=\"idSigned\""
+        "               getImage=\"btnSignLarge\""
+        "               size=\"large\""
+        "               getLabel=\"getSigLabel\""
+        "               getScreentip=\"getSigTip\""
+        "               getSupertip=\"getSigSTip\""
+        "               onAction=\"launchDetails\""
+        "               getEnabled=\"getIsSigned\"/>"
+        "       <dialogBoxLauncher>"
+        "         <button id=\"optsBtn_read\""
+        "                 onAction=\"openOptions\""
+        "                 screentip=\"%s\"/>"
+        "       </dialogBoxLauncher>"
+        "     </group>"
+        "    </tab>"
+        "   </tabs>"
         "   <contextualTabs>"
         "   <tabSet idMso=\"TabComposeTools\">"
         "    <tab idMso=\"TabMessage\">"
@@ -799,13 +818,15 @@ GetCustomUI_MIME (BSTR RibbonID, BSTR * RibbonXml)
         "   </tabSet>"
         "   </contextualTabs>"
         " </ribbon>"
-        "</customUI>", _("GpgOL"),
+        "</customUI>",
+        _("GpgOL"),
+        optsSTip,
+        _("GpgOL"),
         _("Encrypt"), encryptTTip, encryptSTip,
         _("Sign"), signTTip, signSTip,
         optsSTip
         );
     }
-#endif
 
   if (buffer)
     {

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

Summary of changes:
 configure.ac                             |   1 +
 src/Makefile.am                          |  22 ++++++-----------
 src/dialogs.rc                           |  40 +++++++++++++++----------------
 src/gpgoladdin.cpp                       |  27 ++++++++++++++++++---
 src/{ => icons}/README.icons             |  15 ++++++------
 src/{ => icons}/decrypt-16.bmp           | Bin
 src/{ => icons}/decrypt-16.png           | Bin
 src/{ => icons}/decrypt-16m.bmp          | Bin
 src/{ => icons}/decrypt-48.png           | Bin
 src/{ => icons}/decrypt-verify-16.bmp    | Bin
 src/{ => icons}/decrypt-verify-16m.bmp   | Bin
 src/{ => icons}/encrypt-16.bmp           | Bin
 src/{ => icons}/encrypt-16.png           | Bin
 src/{ => icons}/encrypt-16m.bmp          | Bin
 src/{ => icons}/encrypt-48.png           | Bin
 src/{ => icons}/encrypt-sign-file-48.png | Bin
 src/{ => icons}/key-manager-16.bmp       | Bin
 src/{ => icons}/key-manager-16m.bmp      | Bin
 src/{ => icons}/key-manager-64.png       | Bin
 src/{ => icons}/kleopatra.bmp            | Bin
 src/{ => icons}/sign-16.bmp              | Bin
 src/{ => icons}/sign-16m.bmp             | Bin
 src/{ => icons}/sign-48.png              | Bin
 src/{ => icons}/verify-16.bmp            | Bin
 src/{ => icons}/verify-16m.bmp           | Bin
 src/{ => icons}/verify-48.png            | Bin
 26 files changed, 59 insertions(+), 46 deletions(-)
 rename src/{ => icons}/README.icons (93%)
 rename src/{ => icons}/decrypt-16.bmp (100%)
 rename src/{ => icons}/decrypt-16.png (100%)
 rename src/{ => icons}/decrypt-16m.bmp (100%)
 rename src/{ => icons}/decrypt-48.png (100%)
 rename src/{ => icons}/decrypt-verify-16.bmp (100%)
 rename src/{ => icons}/decrypt-verify-16m.bmp (100%)
 rename src/{ => icons}/encrypt-16.bmp (100%)
 rename src/{ => icons}/encrypt-16.png (100%)
 rename src/{ => icons}/encrypt-16m.bmp (100%)
 rename src/{ => icons}/encrypt-48.png (100%)
 rename src/{ => icons}/encrypt-sign-file-48.png (100%)
 rename src/{ => icons}/key-manager-16.bmp (100%)
 rename src/{ => icons}/key-manager-16m.bmp (100%)
 rename src/{ => icons}/key-manager-64.png (100%)
 rename src/{ => icons}/kleopatra.bmp (100%)
 rename src/{ => icons}/sign-16.bmp (100%)
 rename src/{ => icons}/sign-16m.bmp (100%)
 rename src/{ => icons}/sign-48.png (100%)
 rename src/{ => icons}/verify-16.bmp (100%)
 rename src/{ => icons}/verify-16m.bmp (100%)
 rename src/{ => icons}/verify-48.png (100%)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org



From cvs at cvs.gnupg.org  Tue Oct 18 11:23:09 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 18 Oct 2016 11:23:09 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-239-ge0e782b
Message-ID: <E1bwQc4-0001So-By@lists.gnupg.org>

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  e0e782b4c619d3f83080fb4324c89f6b756f21a3 (commit)
      from  c2e713d9e25ef8b61e8eeb3c01ee1e31cb70b794 (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 e0e782b4c619d3f83080fb4324c89f6b756f21a3
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Oct 18 11:18:47 2016 +0200

    Register DCO for Arnaud Fontaine
    
    --
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/AUTHORS b/AUTHORS
index 92b11b3..2bbacd9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -197,6 +197,9 @@ Werner Koch <wk at gnupg.org>
 Yann E. MORIN <yann.morin.1998 at free.fr>
 2016-07-10:20160710093202.GA3688 at free.fr:
 
+Arnaud Fontaine <arnaud.fontaine at ssi.gouv.fr>
+2016-10-17:580484F4.8040806 at ssi.gouv.fr:
+
 
 Other authors
 =============

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

Summary of changes:
 AUTHORS | 3 +++
 1 file changed, 3 insertions(+)


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



From cvs at cvs.gnupg.org  Tue Oct 18 13:50:51 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Tue, 18 Oct 2016 13:50:51 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-240-gf1845f2
Message-ID: <E1bwSuz-000875-Pe@lists.gnupg.org>

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  f1845f25dbea79c191427710fa56ed01e63a045b (commit)
      from  e0e782b4c619d3f83080fb4324c89f6b756f21a3 (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 f1845f25dbea79c191427710fa56ed01e63a045b
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Oct 18 20:40:09 2016 +0900

    scd: minor cleanup to merge other works.
    
    * scd/iso7816.c (do_generate_keypair): Use const char * for DATA.
    (iso7816_generate_keypair, iso7816_read_public_key): Likewise.
    * scd/app-openpgp.c (get_public_key): Follow the change.
    (do_genkey): Ditto.  Use ERR instead of RC.  Use u32 for CREATED_AT.
    --
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index ef335fe..ba16255 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -1276,12 +1276,10 @@ get_public_key (app_t app, int keyno)
           le_value = 256; /* Use legacy value. */
         }
 
-      err = iso7816_read_public_key
-        (app->slot, exmode,
-         (const unsigned char*)(keyno == 0? "\xB6" :
-                                keyno == 1? "\xB8" : "\xA4"), 2,
-         le_value,
-         &buffer, &buflen);
+      err = iso7816_read_public_key (app->slot, exmode,
+                                     (keyno == 0? "\xB6" :
+                                      keyno == 1? "\xB8" : "\xA4"),
+                                     2, le_value, &buffer, &buflen);
       if (err)
         {
           log_error (_("reading public key failed: %s\n"), gpg_strerror (err));
@@ -3534,13 +3532,13 @@ do_genkey (app_t app, ctrl_t ctrl,  const char *keynostr, unsigned int flags,
            gpg_error_t (*pincb)(void*, const char *, char **),
            void *pincb_arg)
 {
-  int rc;
+  gpg_error_t err;
   char numbuf[30];
   unsigned char fprbuf[20];
   const unsigned char *keydata, *m, *e;
   unsigned char *buffer = NULL;
   size_t buflen, keydatalen, mlen, elen;
-  time_t created_at;
+  u32 created_at;
   int keyno = atoi (keynostr) - 1;
   int force = (flags & 1);
   time_t start_at;
@@ -3562,9 +3560,9 @@ do_genkey (app_t app, ctrl_t ctrl,  const char *keynostr, unsigned int flags,
   app->app_local->pk[keyno].read_done = 0;
 
   /* Check whether a key already exists.  */
-  rc = does_key_exist (app, keyno, 1, force);
-  if (rc)
-    return rc;
+  err = does_key_exist (app, keyno, 1, force);
+  if (err)
+    return err;
 
   /* Because we send the key parameter back via status lines we need
      to put a limit on the max. allowed keysize.  2048 bit will
@@ -3575,8 +3573,8 @@ do_genkey (app_t app, ctrl_t ctrl,  const char *keynostr, unsigned int flags,
     return gpg_error (GPG_ERR_TOO_LARGE);
 
   /* Prepare for key generation by verifying the Admin PIN.  */
-  rc = verify_chv3 (app, pincb, pincb_arg);
-  if (rc)
+  err = verify_chv3 (app, pincb, pincb_arg);
+  if (err)
     goto leave;
 
   /* Test whether we will need extended length mode.  (1900 is an
@@ -3597,17 +3595,13 @@ do_genkey (app_t app, ctrl_t ctrl,  const char *keynostr, unsigned int flags,
 
   log_info (_("please wait while key is being generated ...\n"));
   start_at = time (NULL);
-  rc = iso7816_generate_keypair
-/* # warning key generation temporary replaced by reading an existing key. */
-/*   rc = iso7816_read_public_key */
-    (app->slot, exmode,
-     (const unsigned char*)(keyno == 0? "\xB6" :
-                            keyno == 1? "\xB8" : "\xA4"), 2,
-     le_value,
-     &buffer, &buflen);
-  if (rc)
+  err = iso7816_generate_keypair (app->slot, exmode,
+                                  (keyno == 0? "\xB6" :
+                                   keyno == 1? "\xB8" : "\xA4"),
+                                  2, le_value, &buffer, &buflen);
+  if (err)
     {
-      rc = gpg_error (GPG_ERR_CARD);
+      err = gpg_error (GPG_ERR_CARD);
       log_error (_("generating key failed\n"));
       goto leave;
     }
@@ -3622,7 +3616,7 @@ do_genkey (app_t app, ctrl_t ctrl,  const char *keynostr, unsigned int flags,
   keydata = find_tlv (buffer, buflen, 0x7F49, &keydatalen);
   if (!keydata)
     {
-      rc = gpg_error (GPG_ERR_CARD);
+      err = gpg_error (GPG_ERR_CARD);
       log_error (_("response does not contain the public key data\n"));
       goto leave;
     }
@@ -3630,7 +3624,7 @@ do_genkey (app_t app, ctrl_t ctrl,  const char *keynostr, unsigned int flags,
   m = find_tlv (keydata, keydatalen, 0x0081, &mlen);
   if (!m)
     {
-      rc = gpg_error (GPG_ERR_CARD);
+      err = gpg_error (GPG_ERR_CARD);
       log_error (_("response does not contain the RSA modulus\n"));
       goto leave;
     }
@@ -3640,15 +3634,15 @@ do_genkey (app_t app, ctrl_t ctrl,  const char *keynostr, unsigned int flags,
   e = find_tlv (keydata, keydatalen, 0x0082, &elen);
   if (!e)
     {
-      rc = gpg_error (GPG_ERR_CARD);
+      err = gpg_error (GPG_ERR_CARD);
       log_error (_("response does not contain the RSA public exponent\n"));
       goto leave;
     }
   /* log_printhex ("RSA e:", e, elen); */
   send_key_data (ctrl, "e", e, elen);
 
-  created_at = createtime? createtime : gnupg_get_time ();
-  sprintf (numbuf, "%lu", (unsigned long)created_at);
+  created_at = (u32)(createtime? createtime : gnupg_get_time ());
+  sprintf (numbuf, "%u", created_at);
   send_status_info (ctrl, "KEY-CREATED-AT",
                     numbuf, (size_t)strlen(numbuf), NULL, 0);
 
@@ -3657,16 +3651,16 @@ do_genkey (app_t app, ctrl_t ctrl,  const char *keynostr, unsigned int flags,
   for (; elen && !*e; elen--, e++) /* strip leading zeroes */
     ;
 
-  rc = store_fpr (app, keyno, (u32)created_at, fprbuf, PUBKEY_ALGO_RSA,
-                  m, mlen, e, elen);
-  if (rc)
+  err = store_fpr (app, keyno, created_at, fprbuf, PUBKEY_ALGO_RSA,
+                   m, mlen, e, elen);
+  if (err)
     goto leave;
   send_fpr_if_not_null (ctrl, "KEY-FPR", -1, fprbuf);
 
 
  leave:
   xfree (buffer);
-  return rc;
+  return err;
 }
 
 
diff --git a/scd/iso7816.c b/scd/iso7816.c
index 515e21f..28cd2eb 100644
--- a/scd/iso7816.c
+++ b/scd/iso7816.c
@@ -604,8 +604,7 @@ iso7816_internal_authenticate (int slot, int extended_mode,
    (e.g. 4096 bytes), a value larger 256 used that value.  */
 static gpg_error_t
 do_generate_keypair (int slot, int extended_mode, int read_only,
-                     const unsigned char *data, size_t datalen,
-                     int le,
+                     const char *data, size_t datalen, int le,
                      unsigned char **result, size_t *resultlen)
 {
   int sw;
@@ -617,7 +616,7 @@ do_generate_keypair (int slot, int extended_mode, int read_only,
 
   sw = apdu_send_le (slot, extended_mode,
                      0x00, CMD_GENERATE_KEYPAIR, read_only? 0x81:0x80, 0,
-                     datalen, (const char*)data,
+                     datalen, data,
                      le >= 0 && le < 256? 256:le,
                      result, resultlen);
   if (sw != SW_SUCCESS)
@@ -635,7 +634,7 @@ do_generate_keypair (int slot, int extended_mode, int read_only,
 
 gpg_error_t
 iso7816_generate_keypair (int slot, int extended_mode,
-                          const unsigned char *data, size_t datalen,
+                          const char *data, size_t datalen,
                           int le,
                           unsigned char **result, size_t *resultlen)
 {
@@ -646,7 +645,7 @@ iso7816_generate_keypair (int slot, int extended_mode,
 
 gpg_error_t
 iso7816_read_public_key (int slot, int extended_mode,
-                         const unsigned char *data, size_t datalen,
+                         const char *data, size_t datalen,
                          int le,
                          unsigned char **result, size_t *resultlen)
 {
diff --git a/scd/iso7816.h b/scd/iso7816.h
index 6dd1052..45cd416 100644
--- a/scd/iso7816.h
+++ b/scd/iso7816.h
@@ -100,11 +100,11 @@ gpg_error_t iso7816_internal_authenticate (int slot, int extended_mode,
                                    int le,
                                    unsigned char **result, size_t *resultlen);
 gpg_error_t iso7816_generate_keypair (int slot, int extended_mode,
-                                    const unsigned char *data, size_t datalen,
+                                    const char *data, size_t datalen,
                                     int le,
                                     unsigned char **result, size_t *resultlen);
 gpg_error_t iso7816_read_public_key (int slot, int extended_mode,
-                                    const unsigned char *data, size_t datalen,
+                                    const char *data, size_t datalen,
                                     int le,
                                     unsigned char **result, size_t *resultlen);
 gpg_error_t iso7816_get_challenge (int slot,

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

Summary of changes:
 scd/app-openpgp.c | 58 +++++++++++++++++++++++++------------------------------
 scd/iso7816.c     |  9 ++++-----
 scd/iso7816.h     |  4 ++--
 3 files changed, 32 insertions(+), 39 deletions(-)


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



From cvs at cvs.gnupg.org  Tue Oct 18 15:22:13 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Tue, 18 Oct 2016 15:22:13 +0200
Subject: [git] GPG-ERROR - branch, master,
 updated. libgpg-error-1.24-8-g5985580
Message-ID: <E1bwULP-00036P-5G@lists.gnupg.org>

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 "Error codes used by GnuPG et al.".

The branch, master has been updated
       via  59855806e11a27c5b63d9c25f7516c8cc74668aa (commit)
       via  0734f4863859257d18ca96f4b9be62be75fcffe1 (commit)
      from  0c837a82207d0b19f9dabc8870ffb23d6a4ade64 (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 59855806e11a27c5b63d9c25f7516c8cc74668aa
Author: Justus Winter <justus at g10code.com>
Date:   Tue Oct 18 14:45:03 2016 +0200

    tests: Fix name of the test.
    
    --
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/t-poll.c b/tests/t-poll.c
index a26cbfa..026bb88 100644
--- a/tests/t-poll.c
+++ b/tests/t-poll.c
@@ -39,7 +39,7 @@
 # endif
 #endif
 
-#define PGM "t-lock"
+#define PGM "t-poll"
 
 #include "t-common.h"
 

commit 0734f4863859257d18ca96f4b9be62be75fcffe1
Author: Justus Winter <justus at g10code.com>
Date:   Tue Oct 11 11:58:54 2016 +0200

    estream: Fix modestring parsing.
    
    * src/estream.c (parse_mode): Fix parsing the 'sysopen' flag.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/src/estream.c b/src/estream.c
index 4cc72ba..95d7211 100644
--- a/src/estream.c
+++ b/src/estream.c
@@ -1809,7 +1809,7 @@ parse_mode (const char *modestr,
         }
       else if (!strncmp (modestr, "sysopen", 7))
         {
-          modestr += 8;
+          modestr += 7;
           if (*modestr && !strchr (" \t,", *modestr))
             {
               _set_errno (EINVAL);

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

Summary of changes:
 src/estream.c  | 2 +-
 tests/t-poll.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org



From cvs at cvs.gnupg.org  Tue Oct 18 15:24:04 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Tue, 18 Oct 2016 15:24:04 +0200
Subject: [git] GpgOL - branch, nomapi, updated. gpgol-1.4.0-96-gcdf5d93
Message-ID: <E1bwUNC-00037k-4M@lists.gnupg.org>

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 "GnuPG extension for MS Outlook".

The branch, nomapi has been updated
       via  cdf5d93e22ad19730a7bd31c3b751f8738b87bd4 (commit)
       via  20dace4ab5dd5e3e0590929698767327d8e5db70 (commit)
       via  bdc38c2c812fc4806927d3a574bea55c568a90a6 (commit)
       via  376084db0aa59c44a2ccc4e0f7878033fd76d2a6 (commit)
      from  51f5a2d9628c60ac490fbd5ee0c1511179ec74a0 (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 cdf5d93e22ad19730a7bd31c3b751f8738b87bd4
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Oct 18 15:17:28 2016 +0200

    Improve sigdetails button and verify caching
    
    * src/gpgoladdin.cpp (GpgolRibbonExtender::GetIDsOfNames):
    (GpgolRibbonExtender::Invoke): Handle new icon callback.
    (GetCustomUI_MIME): Use new icon callback.
    * src/mail.cpp (Mail::Mail): New members for state caching.
    Rename m_uid to m_uuid to avoid confusion with the valid uid.
    (Mail::~Mail): Use renamed variables.
    (Mail::get_mail_for_uuid): Renamed.
    (Mail::decrypt_verify): Use renamed functions.
    (Mail::parsing_done): Add some traces for a crash.
    (Mail::update_sigstate): New. Called once after parsing done.
    (Mail::get_valid_sig): Use cached values.
    (Mail::is_valid_sig): Use cached values.
    (Mail::set_uuid): Renamed.
    (Mail::get_signature_status): Fix isOpenPGP
    (Mail::get_signature_icon_id): New. Use for new icons.
    (Mail::get_sig_fpr): New. Used for launch details.
    * src/mail.h: Update accordingly.
    * src/parsecontroller.cpp (ParseController::parse):
    Add some traces for a crash.
    * src/ribbon-callbacks.cpp (get_mail_from_control): Use renamed
    functions.
    (HRESULT launch_cert_details): Launch kleopatra on details.
    (HRESULT get_sigstate_icon): Get the Icon of a signature.
    * src/ribbon-callbacks.h: Update accordingly.

diff --git a/src/gpgoladdin.cpp b/src/gpgoladdin.cpp
index e8c5bd8..0b36f87 100644
--- a/src/gpgoladdin.cpp
+++ b/src/gpgoladdin.cpp
@@ -512,6 +512,7 @@ GpgolRibbonExtender::GetIDsOfNames (REFIID riid, LPOLESTR *rgszNames,
       ID_MAPPER (L"btnEncryptFileLarge", ID_BTN_ENCSIGN_LARGE)
       ID_MAPPER (L"btnSignLarge", ID_BTN_SIGN_LARGE)
       ID_MAPPER (L"btnVerifyLarge", ID_BTN_VERIFY_LARGE)
+      ID_MAPPER (L"btnSigstateLarge", ID_BTN_SIGSTATE_LARGE)
       ID_MAPPER (L"encryptBody", ID_CMD_ENCRYPT_BODY)
       ID_MAPPER (L"decryptBody", ID_CMD_DECRYPT_BODY)
       ID_MAPPER (L"addEncSignedAttachment", ID_CMD_ATT_ENCSIGN_FILE)
@@ -613,7 +614,7 @@ GpgolRibbonExtender::Invoke (DISPID dispid, REFIID riid, LCID lcid,
       case ID_GET_SIG_LABEL:
         return get_sig_label (parms->rgvarg[0].pdispVal, result);
       case ID_LAUNCH_CERT_DETAILS:
-        return launch_cert_details (parms->rgvarg[0].pdispVal, result);
+        return launch_cert_details (parms->rgvarg[0].pdispVal);
       case ID_GET_IS_SIGNED:
         return get_is_signed (parms->rgvarg[0].pdispVal, result);
 
@@ -636,6 +637,8 @@ GpgolRibbonExtender::Invoke (DISPID dispid, REFIID riid, LCID lcid,
       case ID_BTN_SIGN_LARGE:
       case ID_BTN_VERIFY_LARGE:
         return getIcon (dispid, result);
+      case ID_BTN_SIGSTATE_LARGE:
+        return get_sigstate_icon (parms->rgvarg[0].pdispVal, result);
     }
 
   log_debug ("%s:%s: leave", SRCNAME, __func__);
@@ -729,7 +732,7 @@ GetCustomUI_MIME (BSTR RibbonID, BSTR * RibbonXml)
         "     <group id=\"general\""
         "            label=\"%s\">"
         "       <button id=\"idSigned\""
-        "               getImage=\"btnSignLarge\""
+        "               getImage=\"btnSigstateLarge\""
         "               size=\"large\""
         "               getLabel=\"getSigLabel\""
         "               getScreentip=\"getSigTip\""
@@ -772,7 +775,7 @@ GetCustomUI_MIME (BSTR RibbonID, BSTR * RibbonXml)
         "     <group id=\"general_read\""
         "            label=\"%s\">"
         "       <button id=\"idSigned\""
-        "               getImage=\"btnSignLarge\""
+        "               getImage=\"btnSigstateLarge\""
         "               size=\"large\""
         "               getLabel=\"getSigLabel\""
         "               getScreentip=\"getSigTip\""
diff --git a/src/mail.cpp b/src/mail.cpp
index 4e06a88..0f6e20b 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "config.h"
+#include "dialogs.h"
 #include "common.h"
 #include "mail.h"
 #include "eventsinks.h"
@@ -90,6 +91,8 @@ Mail::Mail (LPDISPATCH mailitem) :
     m_crypt_successful(false),
     m_is_smime(false),
     m_is_smime_checked(false),
+    m_is_signed(false),
+    m_is_valid(false),
     m_moss_position(0),
     m_sender(NULL),
     m_type(MSGTYPE_UNKNOWN)
@@ -127,9 +130,9 @@ Mail::~Mail()
       g_mail_map.erase (it);
     }
 
-  if (!m_uid.empty())
+  if (!m_uuid.empty())
     {
-      auto it2 = g_uid_map.find(m_uid);
+      auto it2 = g_uid_map.find(m_uuid);
       if (it2 != g_uid_map.end())
         {
           g_uid_map.erase (it2);
@@ -157,13 +160,13 @@ Mail::get_mail_for_item (LPDISPATCH mailitem)
 }
 
 Mail *
-Mail::get_mail_for_uid (const char *uid)
+Mail::get_mail_for_uuid (const char *uuid)
 {
-  if (!uid)
+  if (!uuid)
     {
       return NULL;
     }
-  auto it = g_uid_map.find(std::string(uid));
+  auto it = g_uid_map.find(std::string(uuid));
   if (it == g_uid_map.end())
     {
       return NULL;
@@ -481,7 +484,7 @@ Mail::decrypt_verify()
                  SRCNAME, __func__, m_mailitem);
       return 1;
     }
-  set_uid ();
+  set_uuid ();
   m_processed = true;
   /* Insert placeholder */
   char *placeholder_buf;
@@ -559,16 +562,22 @@ Mail::update_body()
 void
 Mail::parsing_done()
 {
+  TRACEPOINT;
   /* Store the results. */
   m_decrypt_result = m_parser->decrypt_result ();
   m_verify_result = m_parser->verify_result ();
+
+  update_sigstate ();
   m_needs_wipe = true;
 
+  TRACEPOINT;
   /* Set categories according to the result. */
   update_categories();
 
+  TRACEPOINT;
   /* Update the body */
   update_body();
+  TRACEPOINT;
 
   /* Update attachments */
   if (add_attachments (m_mailitem, m_parser->get_attachments()))
@@ -582,6 +591,7 @@ Mail::parsing_done()
   delete m_parser;
   m_parser = nullptr;
   gpgoladdin_invalidate_ui ();
+  TRACEPOINT;
   return;
 }
 
@@ -917,34 +927,34 @@ get_uid_for_sender (const Key k, const char *sender)
   return ret;
 }
 
-const std::pair <Signature, UserID>
-Mail::get_valid_sig ()
+void
+Mail::update_sigstate ()
 {
   const char *sender = get_sender();
-  std::pair <Signature, UserID> ret;
 
   if (!sender)
     {
       log_error ("%s:%s:%i", SRCNAME, __func__, __LINE__);
-      return ret;
+      return;
     }
 
   if (m_verify_result.isNull())
     {
       log_debug ("%s:%s: No verify result.",
                  SRCNAME, __func__);
-      return ret;
+      return;
     }
 
   if (m_verify_result.error())
     {
       log_debug ("%s:%s: verify error.",
                  SRCNAME, __func__);
-      return ret;
+      return;
     }
 
   for (const auto sig: m_verify_result.signatures())
     {
+      m_is_signed = true;
       if (sig.validity() != Signature::Validity::Marginal &&
           sig.validity() != Signature::Validity::Full &&
           sig.validity() != Signature::Validity::Ultimate)
@@ -981,18 +991,32 @@ Mail::get_valid_sig ()
         }
       log_debug ("%s:%s: Classified sender as verified",
                  SRCNAME, __func__);
-      return std::pair<Signature, UserID> (sig, uid);
+      m_sig = sig;
+      m_uid = uid;
+      m_is_valid = true;
     }
-  log_debug ("%s:%s: No signature with enough trust.",
+
+  log_debug ("%s:%s: No signature with enough trust. Using first",
              SRCNAME, __func__);
-  return ret;
+  m_sig = m_verify_result.signature(0);
+  return;
+}
+
+const std::pair <Signature, UserID>
+Mail::get_valid_sig ()
+{
+  std::pair <Signature, UserID> ret;
+  if (!m_is_valid)
+    {
+      return ret;
+    }
+  return std::pair<Signature, UserID> (m_sig, m_uid);
 }
 
 bool
 Mail::is_valid_sig ()
 {
-   const auto pair = get_valid_sig();
-   return !pair.first.isNull() && !pair.second.isNull();
+   return m_is_valid;
 }
 
 void
@@ -1031,23 +1055,23 @@ Mail::is_signed()
 }
 
 int
-Mail::set_uid()
+Mail::set_uuid()
 {
-  if (!m_uid.empty())
+  if (!m_uuid.empty())
     {
       return 0;
     }
-  char *uid = get_unique_id (m_mailitem, 1);
+  char *uuid = get_unique_id (m_mailitem, 1);
 
-  if (!uid)
+  if (!uuid)
     {
-      log_debug ("%s:%s: Failed to get uid for %p",
+      log_debug ("%s:%s: Failed to get uuid for %p",
                  SRCNAME, __func__, m_mailitem);
       return -1;
     }
-  m_uid = uid;
-  xfree (uid);
-  g_uid_map.insert (std::pair<std::string, Mail *> (m_uid, this));
+  m_uuid = uuid;
+  xfree (uuid);
+  g_uid_map.insert (std::pair<std::string, Mail *> (m_uuid, this));
   return 0;
 }
 
@@ -1107,6 +1131,7 @@ Mail::get_signature_status()
         }
       /* We only handle the first signature. */
       const auto sig = m_verify_result.signature (0);
+      isOpenPGP = sig.key().protocol() == Protocol::OpenPGP;
       keyFound = !(sig.summary() & Signature::Summary::KeyMissing);
 
       log_debug ("%s:%s: Formatting sig. Validity: %x Summary: %x",
@@ -1216,3 +1241,35 @@ Mail::get_signature_status()
   xfree (buf);
   return message;
 }
+
+int
+Mail::get_signature_icon_id () const
+{
+  if (!m_is_signed)
+    {
+      return IDI_EMBLEM_INFORMATION_64_PNG;
+    }
+  if (m_is_valid)
+    {
+      return IDI_EMBLEM_SUCCESS_64_PNG;
+    }
+  const auto sig = m_verify_result.signature (0);
+  if ((sig.summary() & Signature::Summary::KeyMissing))
+    {
+      return IDI_EMBLEM_QUESTION_64_PNG;
+    }
+
+  /* Maybe warning for unsigned and invalid sigs? */
+
+  return IDI_EMBLEM_INFORMATION_64_PNG;
+}
+
+const char*
+Mail::get_sig_fpr() const
+{
+  if (!m_is_signed || m_sig.isNull())
+    {
+      return nullptr;
+    }
+  return m_sig.fingerprint();
+}
diff --git a/src/mail.h b/src/mail.h
index e715504..9b8527a 100644
--- a/src/mail.h
+++ b/src/mail.h
@@ -63,14 +63,14 @@ public:
   */
   static Mail* get_mail_for_item (LPDISPATCH mailitem);
 
-  /** @brief looks for existing Mail objects in the uid map.
+  /** @brief looks for existing Mail objects in the uuid map.
     Only objects for which set_uid has been called can be found
-    in the uid map. Get the UID of a mailitem thorugh get_unique_id
+    in the uid map. Get the Unique ID of a mailitem thorugh get_unique_id
 
     @returns A reference to an existing mailitem or NULL in case none
     could be found.
   */
-  static Mail* get_mail_for_uid (const char *uid);
+  static Mail* get_mail_for_uuid (const char *uuid);
 
   /** @brief looks for existing Mail objects.
 
@@ -222,19 +222,28 @@ public:
 
   /** Get UID gets UniqueID property of this mail. Returns
     an empty string if the uid was not set with set uid.*/
-  const std::string & get_uid () const { return m_uid; }
+  const std::string & get_uuid () const { return m_uuid; }
 
   /** Returns 0 on success if the mail has a uid alrady or sets
     the uid. Setting only succeeds if the OOM is currently
     accessible. Returns -1 on error. */
-  int set_uid ();
+  int set_uuid ();
 
   /** Returns a localized string describing the signature state
     of this mail. */
   std::string get_signature_status ();
+
+  /** Get the icon id of the appropiate icon for this mail */
+  int get_signature_icon_id () const;
+
+  /** Get the fingerprint of an associated signature or null
+      if it is not signed. */
+  const char *get_sig_fpr() const;
+
 private:
   void update_categories ();
   void update_body ();
+  void update_sigstate ();
 
   LPDISPATCH m_mailitem;
   LPDISPATCH m_event_sink;
@@ -243,13 +252,17 @@ private:
        m_needs_save,   /* A property was changed but not by us. */
        m_crypt_successful, /* We successfuly performed crypto on the item. */
        m_is_smime, /* This is an smime mail. */
-       m_is_smime_checked; /* it was checked if this is an smime mail */
+       m_is_smime_checked, /* it was checked if this is an smime mail */
+       m_is_signed, /* Mail is signed */
+       m_is_valid; /* Mail is valid signed. */
   int m_moss_position; /* The number of the original message attachment. */
   char *m_sender;
   msgtype_t m_type; /* Our messagetype as set in mapi */
   ParseController *m_parser;
   GpgME::VerificationResult m_verify_result;
   GpgME::DecryptionResult m_decrypt_result;
-  std::string m_uid;
+  GpgME::Signature m_sig;
+  GpgME::UserID m_uid;
+  std::string m_uuid;
 };
 #endif // MAIL_H
diff --git a/src/parsecontroller.cpp b/src/parsecontroller.cpp
index a7fa842..8a69550 100644
--- a/src/parsecontroller.cpp
+++ b/src/parsecontroller.cpp
@@ -288,6 +288,7 @@ ParseController::parse()
              SRCNAME, __func__, m_decrypt_result.error().code(),
              m_verify_result.error().code());
 
+  TRACEPOINT;
   /* Ensure that the Keys for the signatures are available */
   for (const auto sig: m_verify_result.signatures())
     {
@@ -300,6 +301,7 @@ ParseController::parse()
        ss << m_decrypt_result << '\n' << m_verify_result;
        log_debug ("Decrypt / Verify result: %s", ss.str().c_str());
     }
+  TRACEPOINT;
 
   return;
 }
diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index d38cfe3..2bb80e5 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -49,6 +49,11 @@
 #include "message.h"
 #include "mail.h"
 
+#include <gpgme++/context.h>
+#include <gpgme++/data.h>
+
+using namespace GpgME;
+
 #define OPAQUE_SIGNED_MARKER "-----BEGIN PGP MESSAGE-----"
 
 /* Gets the context of a ribbon control. And prints some
@@ -1468,7 +1473,7 @@ get_mail_from_control (LPDISPATCH ctrl)
       return NULL;
     }
 
-  auto ret = Mail::get_mail_for_uid (uid);
+  auto ret = Mail::get_mail_for_uuid (uid);
   xfree (uid);
   if (!ret)
     {
@@ -1481,7 +1486,7 @@ get_mail_from_control (LPDISPATCH ctrl)
 
 /* Helper to reduce code duplication.*/
 #define MY_MAIL_GETTER \
-  if (!ctrl || !result) \
+  if (!ctrl) \
     { \
       log_error ("%s:%s:%i", SRCNAME, __func__, __LINE__); \
       return E_FAIL; \
@@ -1571,9 +1576,74 @@ HRESULT get_sig_stip (LPDISPATCH ctrl, VARIANT *result)
   return S_OK;
 }
 
-HRESULT launch_cert_details (LPDISPATCH ctrl, VARIANT *result)
+HRESULT launch_cert_details (LPDISPATCH ctrl)
 {
-  (void) ctrl;
-  (void) result;
+  MY_MAIL_GETTER
+
+  if (!mail)
+    {
+      log_debug ("%s:%s: No mail.",
+                 SRCNAME, __func__);
+      return S_OK;
+    }
+
+  char *uiserver = get_uiserver_name ();
+  bool showError = false;
+  if (uiserver)
+    {
+      std::string path (uiserver);
+      xfree (uiserver);
+      if (path.find("kleopatra.exe") != std::string::npos)
+        {
+        size_t dpos;
+        if ((dpos = path.find(" --daemon")) != std::string::npos)
+            {
+              path.erase(dpos, strlen(" --daemon"));
+            }
+          auto ctx = Context::createForEngine(SpawnEngine);
+          if (!ctx)
+            {
+              log_error ("%s:%s: No spawn engine.",
+                         SRCNAME, __func__);
+            }
+            const char *argv[] = {path.c_str(),
+                                  "--query",
+                                  mail->get_sig_fpr(),
+                                  NULL };
+            log_debug ("%s:%s: Starting %s %s %s",
+                       SRCNAME, __func__, path.c_str(), argv[1], argv[2]);
+            Data d(Data::null);
+            ctx->spawnAsync(path.c_str(), argv, d, d,
+                            d, Context::SpawnNone);
+        }
+      else
+        {
+          showError = true;
+        }
+    }
+  else
+    {
+      showError = true;
+    }
+
+  if (showError)
+    {
+      MessageBox (NULL,
+                  _("Could not find Kleopatra.\n"
+                  "Please reinstall Gpg4win with the Kleopatra component enabled."),
+                  _("GpgOL"),
+                  MB_ICONINFORMATION|MB_OK);
+    }
   return S_OK;
 }
+
+HRESULT get_sigstate_icon (LPDISPATCH ctrl, VARIANT *result)
+{
+  MY_MAIL_GETTER
+
+  if (mail)
+    {
+      return getIcon (mail->get_signature_icon_id (), result);
+    }
+  return getIcon (IDI_EMBLEM_INFORMATION_64_PNG, result);
+}
diff --git a/src/ribbon-callbacks.h b/src/ribbon-callbacks.h
index 8dad389..be64eb5 100644
--- a/src/ribbon-callbacks.h
+++ b/src/ribbon-callbacks.h
@@ -51,6 +51,7 @@
 #define ID_GET_SIG_TTIP         26
 #define ID_GET_SIG_LABEL        27
 #define ID_LAUNCH_CERT_DETAILS  28
+#define ID_BTN_SIGSTATE_LARGE   29
 
 #define ID_BTN_CERTMANAGER       IDI_KEY_MANAGER_64_PNG
 #define ID_BTN_DECRYPT           IDI_DECRYPT_16_PNG
@@ -89,7 +90,9 @@ HRESULT get_sig_ttip (LPDISPATCH ctrl, VARIANT *result);
 /* Get the supertip for the signature. Returns BSTR */
 HRESULT get_sig_stip (LPDISPATCH ctrl, VARIANT *result);
 /* Show a certificate details dialog. Returns nothing. */
-HRESULT launch_cert_details (LPDISPATCH ctrl, VARIANT *result);
+HRESULT launch_cert_details (LPDISPATCH ctrl);
+/* Callback to get the sigstate icon. */
+HRESULT get_sigstate_icon (LPDISPATCH ctrl, VARIANT *result);
 /* Callback to get our own control reference */
 HRESULT ribbon_loaded (LPDISPATCH ctrl);
 #endif

commit 20dace4ab5dd5e3e0590929698767327d8e5db70
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Oct 18 15:15:16 2016 +0200

    Add new icons for signature state
    
    * COPYING-ICONS,
    src/icons/Makefile.am,
    src/icons/README.icons,
    src/icons/emblem-information-64.png,
    src/icons/emblem-information.svg,
    src/icons/emblem-question-64.png,
    src/icons/emblem-question.svg,
    src/icons/emblem-success-64.png,
    src/icons/emblem-success.svg,
    src/icons/emblem-warning-64.png,
    src/icons/emblem-warning.svg: New.
    * src/dialogs.h, src/dialogs.rc: Add new ids / data.

diff --git a/COPYING-ICONS b/COPYING-ICONS
new file mode 100644
index 0000000..19f0a2e
--- /dev/null
+++ b/COPYING-ICONS
@@ -0,0 +1,213 @@
+Several icons used in GpgOL were taken from the Breeze / Oxygen Icon
+Theme. So for the Icons (and the combined package) the following
+copyright notice applies:
+
+The Breeze Icon Theme in src/icons/
+
+    Copyright (C) 2014 Uri Herrera <uri_herrera at nitrux.in> and others
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library. If not, see <http://www.gnu.org/licenses/>.
+
+Clarification:
+
+  The GNU Lesser General Public License or LGPL is written for
+  software libraries in the first place. We expressly want the LGPL to
+  be valid for this artwork library too.
+
+  KDE Breeze theme icons is a special kind of software library, it is an
+  artwork library, it's elements can be used in a Graphical User Interface, or
+  GUI.
+
+  Source code, for this library means:
+   - where they exist, SVG;
+   - otherwise, if applicable, the multi-layered formats xcf or psd, or
+  otherwise png.
+
+  The LGPL in some sections obliges you to make the files carry
+  notices. With images this is in some cases impossible or hardly useful.
+
+  With this library a notice is placed at a prominent place in the directory
+  containing the elements. You may follow this practice.
+
+  The exception in section 5 of the GNU Lesser General Public License covers
+  the use of elements of this art library in a GUI.
+
+ https://vdesign.kde.org/
+
+-----
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/src/dialogs.h b/src/dialogs.h
index 6b4f300..34da890 100644
--- a/src/dialogs.h
+++ b/src/dialogs.h
@@ -112,5 +112,9 @@
 #define IDI_ENCSIGN_FILE_48_PNG         0x6050
 #define IDI_SIGN_48_PNG                 0x6060
 #define IDI_VERIFY_48_PNG               0x6070
+#define IDI_EMBLEM_WARNING_64_PNG       0x6071
+#define IDI_EMBLEM_SUCCESS_64_PNG       0x6072
+#define IDI_EMBLEM_INFORMATION_64_PNG   0x6073
+#define IDI_EMBLEM_QUESTION_64_PNG      0x6074
 
 #endif /*DIALOGS_H*/
diff --git a/src/dialogs.rc b/src/dialogs.rc
index 5c975ad..d1d4abc 100644
--- a/src/dialogs.rc
+++ b/src/dialogs.rc
@@ -52,6 +52,11 @@ IDB_DECRYPT_VERIFY_16M    BITMAP  DISCARDABLE  "icons/decrypt-verify-16m.bmp"
 
 IDI_ENCSIGN_FILE_48_PNG   RCDATA               "icons/encrypt-sign-file-48.png"
 
+IDI_EMBLEM_WARNING_64_PNG RCDATA               "icons/emblem-warning-64.png"
+IDI_EMBLEM_SUCCESS_64_PNG RCDATA               "icons/emblem-success-64.png"
+IDI_EMBLEM_INFORMATION_64_PNG RCDATA           "icons/emblem-information-64.png"
+IDI_EMBLEM_QUESTION_64_PNG RCDATA              "icons/emblem-question-64.png"
+
 
 
 IDD_GPG_OPTIONS  DIALOG DISCARDABLE  0, 0, 266, 274
diff --git a/src/icons/Makefile.am b/src/icons/Makefile.am
new file mode 100644
index 0000000..cfe1261
--- /dev/null
+++ b/src/icons/Makefile.am
@@ -0,0 +1,29 @@
+# Makefile.am - makefile for GPGol icons
+# Copyright (C) 2016 Intevation GmbH
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+## Process this file with automake to produce Makefile.in
+EXTRA_DIST= \
+    encrypt-16.bmp encrypt-16m.bmp \
+    sign-16.bmp sign-16m.bmp \
+    key-manager-16.bmp key-manager-16m.bmp \
+    decrypt-16.bmp decrypt-16m.bmp \
+    verify-16.bmp  verify-16m.bmp \
+    decrypt-verify-16.bmp decrypt-verify-16m.bmp \
+    encrypt-16.png encrypt-48.png \
+    key-manager-64.png \
+    decrypt-16.png decrypt-48.png \
+    encrypt-sign-file-48.png \
+    sign-48.png verify-48.png \
+    README.icons\
+    emblem-question-64.png \
+    emblem-warning-64.png \
+    emblem-success-64.png \
+    emblem-information-64.png
diff --git a/src/icons/README.icons b/src/icons/README.icons
index edf7fb8..ac55319 100644
--- a/src/icons/README.icons
+++ b/src/icons/README.icons
@@ -107,6 +107,13 @@ and those installed via the forms extensions from external files.
 
   6. Done.
 
+  3. SVG icons
+  ============
+
+  To convert svg icons to png it is suggested to use inkscape.
+
+  inkscape -w 64 -h 64 -e "<file>-64.png" "<file>.svg"
+
 
 That's all.  The output of the file(1) command should show something
 like this:
diff --git a/src/icons/emblem-information-64.png b/src/icons/emblem-information-64.png
new file mode 100644
index 0000000..cce8e5e
Binary files /dev/null and b/src/icons/emblem-information-64.png differ
diff --git a/src/icons/emblem-information.svg b/src/icons/emblem-information.svg
new file mode 100644
index 0000000..2deec9a
--- /dev/null
+++ b/src/icons/emblem-information.svg
@@ -0,0 +1,21 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Highlight {
+        color:#3daee9;
+      }
+      </style>
+  </defs>
+  <g
+     transform="translate(-7,-1037.3622)">
+    <path
+       style="fill:currentColor;fill-opacity:1;stroke:none"
+       d="m 15,1041.3622 a 4,4 0 0 1 -4,4 4,4 0 0 1 -4,-4 4,4 0 0 1 4,-4 4,4 0 0 1 4,4 z"
+       class="ColorScheme-Highlight" />
+    <path
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none"
+       d="M 3.5 1 L 3.5 2 L 4.5 2 L 4.5 1 L 3.5 1 z M 3.5 3 L 3.5 7 L 4.5 7 L 4.5 3 L 3.5 3 z "
+       transform="translate(7,1037.3622)"
+       id="rect4241" />
+  </g>
+</svg>
diff --git a/src/icons/emblem-question-64.png b/src/icons/emblem-question-64.png
new file mode 100644
index 0000000..05c1312
Binary files /dev/null and b/src/icons/emblem-question-64.png differ
diff --git a/src/icons/emblem-question.svg b/src/icons/emblem-question.svg
new file mode 100644
index 0000000..f015e64
--- /dev/null
+++ b/src/icons/emblem-question.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8">
+ <path
+     style="fill:#9b59b6;fill-opacity:1;stroke:none"
+     d="M 2 0 C 0.8919807 0 0 0.892 0 2 L 0 6 C 0 7.1081 0.8919807 8 2 8 L 6 8 C 7.108019 8 8 7.1081 8 6 L 8 2 C 8 0.892 7.108019 0 6 0 L 2 0 z "
+     />
+ <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="M 4 1 C 3.51389 1 3.0599989 1.1705344 2.7402344 1.4902344 C 2.4204694 1.8100344 2.25 2.2639 2.25 2.75 L 3.25 2.75 C 3.25 2.4861 3.3295286 2.3149656 3.4472656 2.1972656 C 3.5650006 2.0795656 3.736112 2 4 2 C 4.26389 2 4.4349984 2.0799656 4.5527344 2.1972656 C 4.6704694 2.3149656 4.75 2.4861 4.75 2.75 C 4.75 2.9792 4.7048303 3.0776625 4.6445312 3.1640625 C 4.5842412 3.2500625 4.4849756 3.3305938 4.3378906 3.4335938 C 4.1908036 3.5364937 3.9968862 3.6547344 3.8164062 3.8652344 C 3.6359262 4.0758344 3.5 4.3959 3.5 4.75 L 3.5 5 L 4.5 5 L 4.5 4.75 C 4.5 4.6042 4.5203088 4.578525 4.5742188 4.515625 C 4.6281087 4.452625 4.7466934 4.3697062 4.9121094 4.2539062 C 5.0775214 4.1381062 5.2907638 3.983975 5.4648438 3.734375 C 5.6389238 3.484875 5.75 3.1458 5.75 2.75 C 5.75 2.2639 5.5795326 1.8100344 5.2597656 1.4902344 C 4.9400006 1.1705344 4.486112 1 4 1 z M 3.5 6 L 3.5 7 L 4.5 7 L 4.5 6 L 3.5 6 z "
+     />
+</svg>
diff --git a/src/icons/emblem-success-64.png b/src/icons/emblem-success-64.png
new file mode 100644
index 0000000..b955af1
Binary files /dev/null and b/src/icons/emblem-success-64.png differ
diff --git a/src/icons/emblem-success.svg b/src/icons/emblem-success.svg
new file mode 100644
index 0000000..faa74e3
--- /dev/null
+++ b/src/icons/emblem-success.svg
@@ -0,0 +1,18 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-PositiveText {
+        color:#27ae60;
+      }
+      </style>
+  </defs>
+  <path
+      style="fill:currentColor;fill-opacity:1;stroke:none"
+     class="ColorScheme-PositiveText"
+    d="M 4 0 C 1.784 0 0 1.784 0 4 C 0 6.216 1.784 8 4 8 C 6.216 8 8 6.216 8 4 C 8 1.784 6.216 0 4 0 z "
+      />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="M 6 2 L 3 5 L 2 4 L 1 5 L 2 6 L 3 7 L 7 3 L 6 2 z "
+        />
+</svg>
diff --git a/src/icons/emblem-warning-64.png b/src/icons/emblem-warning-64.png
new file mode 100644
index 0000000..31bbbb8
Binary files /dev/null and b/src/icons/emblem-warning-64.png differ
diff --git a/src/icons/emblem-warning.svg b/src/icons/emblem-warning.svg
new file mode 100644
index 0000000..1cad345
--- /dev/null
+++ b/src/icons/emblem-warning.svg
@@ -0,0 +1,18 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-NeutralText {
+        color:#f67400;
+      }
+      </style>
+  </defs>
+  <path
+      style="fill:currentColor;fill-opacity:1;stroke:none"
+     class="ColorScheme-NeutralText"
+    d="M 4 0 C 3.7964835 0.00025315917 3.644678 0.09649124 3.5371094 0.3125 C 3.5371094 0.3125 0.077246535 7.200596 0.080078125 7.2285156 C 0.043417505 7.3055016 -1.2456632e-05 7.403681 0 7.5 C 0 7.7761424 0.22385763 8 0.5 8 L 7.5 8 C 7.7761424 8 8 7.7761424 8 7.5 C 8.0002021 7.3873383 7.9818808 7.3677538 7.8925781 7.1894531 L 4.4550781 0.29101562 C 4.346001 0.097741395 4.1955491 -0.00033128801 4 0 z "
+      />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="M 3.5 2 L 3.5 5 L 4.5 5 L 4.5 2 L 3.5 2 z M 3.5 6 L 3.5 7 L 4.5 7 L 4.5 6 L 3.5 6 z "
+        />
+</svg>

commit bdc38c2c812fc4806927d3a574bea55c568a90a6
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Oct 18 14:53:24 2016 +0200

    Minor updates for readme
    
    * README: Update copyright and some text.

diff --git a/README b/README
index 8114264..3876d9c 100644
--- a/README
+++ b/README
@@ -1,12 +1,13 @@
-                         GpgOL Version 0.10.x
+                                GpgOL
                        =======================
           Copyright (C) 2004, 2005, 2007, 2008, 2009, 2010,
                         2011 g10 Code GmbH
-
+                        2013, 2015, 2016 Intevation GmbH
 
 GpgOL is a GnuPG plugin for MS Outlook.
 
-WARNING:  This version requires the decent version of Kleopatra or GPA.
+WARNING:  This version requires the decent version of Kleopatra or GPA
+for additional features and sending encrypted mail.
 
 
 .          Top directory with build scripts and information files.
@@ -30,10 +31,8 @@ compiled binary.
 If you are missing icons in the toolbar, checkout the toolbar's
 customize button - you will find the new icons there.
 
-Bug reporting: First click on the logo on the GnuPG options tab to
-check whether a newer version has been released - try this first.  If
-this does not help, check out the mailing lists and also the bug
-archive at http://bugs.gnupg.org (use username and password "guest",
-select "query" and there category "gpgol") if you did not found any
+Bug reporting: First check whether a newer version has been released -
+try this first.  If this does not help, check out the mailing lists
+and also the bug archive at http://bugs.gnupg.org if you did not find any
 information there please send a report, including all relevant version
 numbers to the address given at the top of this AUTHORS file.

commit 376084db0aa59c44a2ccc4e0f7878033fd76d2a6
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Oct 18 14:16:04 2016 +0200

    Move get_uiserver_name into common
    
    * src/common.c (get_uiserver_name): Added.
    * src/common.h: Add prototype.
    * src/engine-assuan.c (get_uiserver_name): Removed.

diff --git a/src/common.c b/src/common.c
index 42598f9..777f085 100644
--- a/src/common.c
+++ b/src/common.c
@@ -853,3 +853,75 @@ format_date_from_gpgme (unsigned long time)
     }
   return wchar_to_utf8 (buf);
 }
+
+/* Return the name of the default UI server.  This name is used to
+   auto start an UI server if an initial connect failed.  */
+char *
+get_uiserver_name (void)
+{
+  char *name = NULL;
+  char *dir, *uiserver, *p;
+  int extra_arglen = 9;
+
+  const char * server_names[] = {"kleopatra.exe",
+                                 "bin\\kleopatra.exe",
+                                 "gpa.exe",
+                                 "bin\\gpa.exe",
+                                 NULL};
+  const char **tmp = NULL;
+
+  dir = get_gpg4win_dir ();
+  if (!dir)
+    {
+      log_error ("Failed to find gpg4win dir");
+      return NULL;
+    }
+  uiserver = read_w32_registry_string (NULL, GPG4WIN_REGKEY_3,
+                                       "UI Server");
+  if (!uiserver)
+    {
+      uiserver = read_w32_registry_string (NULL, GPG4WIN_REGKEY_2,
+                                           "UI Server");
+    }
+  if (uiserver)
+    {
+      name = xmalloc (strlen (dir) + strlen (uiserver) + extra_arglen + 2);
+      strcpy (stpcpy (stpcpy (name, dir), "\\"), uiserver);
+      for (p = name; *p; p++)
+        if (*p == '/')
+          *p = '\\';
+      xfree (uiserver);
+    }
+  if (name && !access (name, F_OK))
+    {
+      /* Set through registry and is accessible */
+      xfree(dir);
+      return name;
+    }
+  /* Fallbacks */
+  for (tmp = server_names; *tmp; tmp++)
+    {
+      if (name)
+        {
+          xfree (name);
+        }
+      name = xmalloc (strlen (dir) + strlen (*tmp) + extra_arglen + 2);
+      strcpy (stpcpy (stpcpy (name, dir), "\\"), *tmp);
+      for (p = name; *p; p++)
+        if (*p == '/')
+          *p = '\\';
+      if (!access (name, F_OK))
+        {
+          /* Found a viable candidate */
+          if (strstr (name, "kleopatra.exe"))
+            {
+              strcat (name, " --daemon");
+            }
+          xfree (dir);
+          return name;
+        }
+    }
+  xfree (dir);
+  log_error ("Failed to find a viable UIServer");
+  return NULL;
+}
diff --git a/src/common.h b/src/common.h
index 70b4ee7..796a8f8 100644
--- a/src/common.h
+++ b/src/common.h
@@ -116,8 +116,13 @@ char *percent_escape (const char *str, const char *extra);
 
 void fix_linebreaks (char *str, int *len);
 
+/* Format a date from gpgme (seconds since epoch)
+   with windows system locale. */
 char *format_date_from_gpgme (unsigned long time);
 
+/* Get the name of the uiserver */
+char *get_uiserver_name (void);
+
 /*-- main.c --*/
 const void *get_128bit_session_key (void);
 const void *get_64bit_session_marker (void);
diff --git a/src/engine-assuan.c b/src/engine-assuan.c
index 5375563..ac56d53 100644
--- a/src/engine-assuan.c
+++ b/src/engine-assuan.c
@@ -338,79 +338,6 @@ get_socket_name (void)
 }
 
 
-/* Return the name of the default UI server.  This name is used to
-   auto start an UI server if an initial connect failed.  */
-static char *
-get_uiserver_name (void)
-{
-  char *name = NULL;
-  char *dir, *uiserver, *p;
-  int extra_arglen = 9;
-
-  const char * server_names[] = {"kleopatra.exe",
-                                 "bin\\kleopatra.exe",
-                                 "gpa.exe",
-                                 "bin\\gpa.exe",
-                                 NULL};
-  const char **tmp = NULL;
-
-  dir = get_gpg4win_dir ();
-  if (!dir)
-    {
-      log_error ("Failed to find gpg4win dir");
-      return NULL;
-    }
-  uiserver = read_w32_registry_string (NULL, GPG4WIN_REGKEY_3,
-                                       "UI Server");
-  if (!uiserver)
-    {
-      uiserver = read_w32_registry_string (NULL, GPG4WIN_REGKEY_2,
-                                           "UI Server");
-    }
-  if (uiserver)
-    {
-      name = xmalloc (strlen (dir) + strlen (uiserver) + extra_arglen + 2);
-      strcpy (stpcpy (stpcpy (name, dir), "\\"), uiserver);
-      for (p = name; *p; p++)
-        if (*p == '/')
-          *p = '\\';
-      xfree (uiserver);
-    }
-  if (name && !access (name, F_OK))
-    {
-      /* Set through registry and is accessible */
-      xfree(dir);
-      return name;
-    }
-  /* Fallbacks */
-  for (tmp = server_names; *tmp; tmp++)
-    {
-      if (name)
-        {
-          xfree (name);
-        }
-      name = xmalloc (strlen (dir) + strlen (*tmp) + extra_arglen + 2);
-      strcpy (stpcpy (stpcpy (name, dir), "\\"), *tmp);
-      for (p = name; *p; p++)
-        if (*p == '/')
-          *p = '\\';
-      if (!access (name, F_OK))
-        {
-          /* Found a viable candidate */
-          if (strstr (name, "kleopatra.exe"))
-            {
-              strcat (name, " --daemon");
-            }
-          xfree (dir);
-          return name;
-        }
-    }
-  xfree (dir);
-  log_error ("Failed to find a viable UIServer");
-  return NULL;
-}
-
-
 static gpg_error_t
 send_one_option (assuan_context_t ctx, const char *name, const char *value)
 {

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

Summary of changes:
 COPYING-ICONS                       | 213 ++++++++++++++++++++++++++++++++++++
 README                              |  15 ++-
 src/common.c                        |  72 ++++++++++++
 src/common.h                        |   5 +
 src/dialogs.h                       |   4 +
 src/dialogs.rc                      |   5 +
 src/engine-assuan.c                 |  73 ------------
 src/gpgoladdin.cpp                  |   9 +-
 src/icons/Makefile.am               |  29 +++++
 src/icons/README.icons              |   7 ++
 src/icons/emblem-information-64.png | Bin 0 -> 1266 bytes
 src/icons/emblem-information.svg    |  21 ++++
 src/icons/emblem-question-64.png    | Bin 0 -> 1518 bytes
 src/icons/emblem-question.svg       |  10 ++
 src/icons/emblem-success-64.png     | Bin 0 -> 1462 bytes
 src/icons/emblem-success.svg        |  18 +++
 src/icons/emblem-warning-64.png     | Bin 0 -> 1117 bytes
 src/icons/emblem-warning.svg        |  18 +++
 src/mail.cpp                        | 107 +++++++++++++-----
 src/mail.h                          |  27 +++--
 src/parsecontroller.cpp             |   2 +
 src/ribbon-callbacks.cpp            |  80 +++++++++++++-
 src/ribbon-callbacks.h              |   5 +-
 23 files changed, 598 insertions(+), 122 deletions(-)
 create mode 100644 COPYING-ICONS
 create mode 100644 src/icons/Makefile.am
 create mode 100644 src/icons/emblem-information-64.png
 create mode 100644 src/icons/emblem-information.svg
 create mode 100644 src/icons/emblem-question-64.png
 create mode 100644 src/icons/emblem-question.svg
 create mode 100644 src/icons/emblem-success-64.png
 create mode 100644 src/icons/emblem-success.svg
 create mode 100644 src/icons/emblem-warning-64.png
 create mode 100644 src/icons/emblem-warning.svg


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org



From cvs at cvs.gnupg.org  Tue Oct 18 16:02:27 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Tue, 18 Oct 2016 16:02:27 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-241-g34439da
Message-ID: <E1bwUyL-0004jt-J3@lists.gnupg.org>

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  34439da2d62b964a914ace66bae7e38f619582a4 (commit)
      from  f1845f25dbea79c191427710fa56ed01e63a045b (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 34439da2d62b964a914ace66bae7e38f619582a4
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Oct 18 22:46:37 2016 +0900

    scd: Support ECC key generation.
    
    * scd/app-openpgp.c (get_public_key): Fix a message.
    (change_keyattr_from_string, ecc_writekey): Call mpi_release sooner.
    (do_genkey): Add ECC support.
    
    --
    
    In OpenPGP card specification 3.0, ECC is introduced.  So far, do_genkey
    only supported RSA.  Since KDF spec. is needed to calculate the
    fingerprint, it is hard coded in app-openpgp.c.  But it's defined by
    OpenPGP ECC (RFC-6637), and card does nothing with KDF in fact.
    
    Co-authored-by: Arnaud Fontaine <arnaud.fontaine at ssi.gouv.fr>
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index ba16255..09e4800 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -1318,7 +1318,7 @@ get_public_key (app_t app, int keyno)
           if (!m)
             {
               err = gpg_error (GPG_ERR_CARD);
-              log_error (_("response does not contain the EC public point\n"));
+              log_error (_("response does not contain the EC public key\n"));
               goto leave;
             }
         }
@@ -2847,6 +2847,7 @@ change_keyattr_from_string (app_t app,
       size_t oid_len;
 
       oidstr = openpgp_curve_to_oid (string+n, NULL);
+      gcry_mpi_release (oid);
       if (!oidstr)
         {
           err = gpg_error (GPG_ERR_INV_DATA);
@@ -2864,7 +2865,6 @@ change_keyattr_from_string (app_t app,
       string[0] = algo;
       memcpy (string+1, oidbuf+1, oid_len-1);
       err = change_keyattr (app, keyno, string, oid_len, pincb, pincb_arg);
-      gcry_mpi_release (oid);
     }
   else
     err = gpg_error (GPG_ERR_PUBKEY_ALGO);
@@ -3355,13 +3355,14 @@ ecc_writekey (app_t app, gpg_error_t (*pincb)(void*, const char *, char **),
   if (err)
     goto leave;
   oidbuf = gcry_mpi_get_opaque (oid, &n);
-  oid_len = (n+7)/8;
   if (!oidbuf)
     {
       err = gpg_error_from_syserror ();
       gcry_mpi_release (oid);
       goto leave;
     }
+  gcry_mpi_release (oid);
+  oid_len = (n+7)/8;
 
   if (app->app_local->keyattr[keyno].key_type != KEY_TYPE_ECC
       || app->app_local->keyattr[keyno].ecc.oid != oidstr
@@ -3442,8 +3443,6 @@ ecc_writekey (app_t app, gpg_error_t (*pincb)(void*, const char *, char **),
                    ecc_q, ecc_q_len, "\x03\x01\x08\x07", (size_t)4);
 
  leave:
-  if (oidbuf)
-    gcry_mpi_release (oid);
   return err;
 }
 
@@ -3535,16 +3534,15 @@ do_genkey (app_t app, ctrl_t ctrl,  const char *keynostr, unsigned int flags,
   gpg_error_t err;
   char numbuf[30];
   unsigned char fprbuf[20];
-  const unsigned char *keydata, *m, *e;
   unsigned char *buffer = NULL;
-  size_t buflen, keydatalen, mlen, elen;
+  const unsigned char *keydata;
+  size_t buflen, keydatalen;
   u32 created_at;
   int keyno = atoi (keynostr) - 1;
   int force = (flags & 1);
   time_t start_at;
-  int exmode;
-  int le_value;
-  unsigned int keybits;
+  int exmode = 0;
+  int le_value = 256; /* Use legacy value. */
 
   if (keyno < 0 || keyno > 2)
     return gpg_error (GPG_ERR_INV_ID);
@@ -3564,34 +3562,34 @@ do_genkey (app_t app, ctrl_t ctrl,  const char *keynostr, unsigned int flags,
   if (err)
     return err;
 
-  /* Because we send the key parameter back via status lines we need
-     to put a limit on the max. allowed keysize.  2048 bit will
-     already lead to a 527 byte long status line and thus a 4096 bit
-     key would exceed the Assuan line length limit.  */
-  keybits = app->app_local->keyattr[keyno].rsa.n_bits;
-  if (keybits > 4096)
-    return gpg_error (GPG_ERR_TOO_LARGE);
+  if (app->app_local->keyattr[keyno].key_type == KEY_TYPE_RSA)
+    {
+      unsigned int keybits = app->app_local->keyattr[keyno].rsa.n_bits;
+
+      /* Because we send the key parameter back via status lines we need
+         to put a limit on the max. allowed keysize.  2048 bit will
+         already lead to a 527 byte long status line and thus a 4096 bit
+         key would exceed the Assuan line length limit.  */
+      if (keybits > 4096)
+        return gpg_error (GPG_ERR_TOO_LARGE);
+
+      /* Test whether we will need extended length mode.  (1900 is an
+         arbitrary length which for sure fits into a short apdu.)  */
+      if (app->app_local->cardcap.ext_lc_le && keybits > 1900)
+        {
+          exmode = 1;    /* Use extended length w/o a limit.  */
+          le_value = app->app_local->extcap.max_rsp_data;
+          /* No need to check le_value because it comes from a 16 bit
+             value and thus can't create an overflow on a 32 bit
+             system.  */
+        }
+    }
 
   /* Prepare for key generation by verifying the Admin PIN.  */
   err = verify_chv3 (app, pincb, pincb_arg);
   if (err)
-    goto leave;
+    return err;
 
-  /* Test whether we will need extended length mode.  (1900 is an
-     arbitrary length which for sure fits into a short apdu.)  */
-  if (app->app_local->cardcap.ext_lc_le && keybits > 1900)
-    {
-      exmode = 1;    /* Use extended length w/o a limit.  */
-      le_value = app->app_local->extcap.max_rsp_data;
-      /* No need to check le_value because it comes from a 16 bit
-         value and thus can't create an overflow on a 32 bit
-         system.  */
-    }
-  else
-    {
-      exmode = 0;
-      le_value = 256; /* Use legacy value. */
-    }
 
   log_info (_("please wait while key is being generated ...\n"));
   start_at = time (NULL);
@@ -3601,9 +3599,8 @@ do_genkey (app_t app, ctrl_t ctrl,  const char *keynostr, unsigned int flags,
                                   2, le_value, &buffer, &buflen);
   if (err)
     {
-      err = gpg_error (GPG_ERR_CARD);
       log_error (_("generating key failed\n"));
-      goto leave;
+      return gpg_error (GPG_ERR_CARD);
     }
 
   {
@@ -3621,38 +3618,117 @@ do_genkey (app_t app, ctrl_t ctrl,  const char *keynostr, unsigned int flags,
       goto leave;
     }
 
-  m = find_tlv (keydata, keydatalen, 0x0081, &mlen);
-  if (!m)
-    {
-      err = gpg_error (GPG_ERR_CARD);
-      log_error (_("response does not contain the RSA modulus\n"));
-      goto leave;
-    }
-  /* log_printhex ("RSA n:", m, mlen); */
-  send_key_data (ctrl, "n", m, mlen);
-
-  e = find_tlv (keydata, keydatalen, 0x0082, &elen);
-  if (!e)
-    {
-      err = gpg_error (GPG_ERR_CARD);
-      log_error (_("response does not contain the RSA public exponent\n"));
-      goto leave;
-    }
-  /* log_printhex ("RSA e:", e, elen); */
-  send_key_data (ctrl, "e", e, elen);
-
   created_at = (u32)(createtime? createtime : gnupg_get_time ());
   sprintf (numbuf, "%u", created_at);
   send_status_info (ctrl, "KEY-CREATED-AT",
                     numbuf, (size_t)strlen(numbuf), NULL, 0);
 
-  for (; mlen && !*m; mlen--, m++) /* strip leading zeroes */
-    ;
-  for (; elen && !*e; elen--, e++) /* strip leading zeroes */
-    ;
+  if (app->app_local->keyattr[keyno].key_type == KEY_TYPE_RSA)
+    {
+      const unsigned char *m, *e;
+      size_t mlen, elen;
+
+      m = find_tlv (keydata, keydatalen, 0x0081, &mlen);
+      if (!m)
+        {
+          err = gpg_error (GPG_ERR_CARD);
+          log_error (_("response does not contain the RSA modulus\n"));
+          goto leave;
+        }
+      /* log_printhex ("RSA n:", m, mlen); */
+      send_key_data (ctrl, "n", m, mlen);
+
+      e = find_tlv (keydata, keydatalen, 0x0082, &elen);
+      if (!e)
+        {
+          err = gpg_error (GPG_ERR_CARD);
+          log_error (_("response does not contain the RSA public exponent\n"));
+          goto leave;
+        }
+      /* log_printhex ("RSA e:", e, elen); */
+      send_key_data (ctrl, "e", e, elen);
+
+      for (; mlen && !*m; mlen--, m++) /* strip leading zeroes */
+        ;
+      for (; elen && !*e; elen--, e++) /* strip leading zeroes */
+        ;
+
+      err = store_fpr (app, keyno, created_at, fprbuf, PUBKEY_ALGO_RSA,
+                       m, mlen, e, elen);
+    }
+  else if (app->app_local->keyattr[keyno].key_type == KEY_TYPE_ECC)
+    {
+      const unsigned char *ecc_q;
+      size_t ecc_q_len;
+      gcry_mpi_t oid;
+      int n;
+      const unsigned char *oidbuf;
+      size_t oid_len;
+      int algo;
+
+      ecc_q = find_tlv (keydata, keydatalen, 0x0086, &ecc_q_len);
+      if (!ecc_q)
+        {
+          err = gpg_error (GPG_ERR_CARD);
+          log_error (_("response does not contain the EC public key\n"));
+          goto leave;
+        }
+
+      err = openpgp_oid_from_str (app->app_local->keyattr[keyno].ecc.oid, &oid);
+      if (err)
+        goto leave;
+
+      oidbuf = gcry_mpi_get_opaque (oid, &n);
+      if (!oidbuf)
+        {
+          err = gpg_error_from_syserror ();
+          gcry_mpi_release (oid);
+          goto leave;
+        }
+      gcry_mpi_release (oid);
+      oid_len = (n+7)/8;
+
+      if ((app->app_local->keyattr[keyno].ecc.flags & ECC_FLAG_DJB_TWEAK))
+        {               /* Prepend 0x40 prefix.  */
+          unsigned char *q = xtrymalloc (ecc_q_len + 1);
+
+          if (!q)
+            {
+              err = gpg_error_from_syserror ();
+              goto leave;
+            }
+          *q = 0x40;
+          memcpy (q+1, ecc_q, ecc_q_len);
+          send_key_data (ctrl, "q", q, ecc_q_len + 1);
+          xfree (q);
+        }
+      else
+        {
+          /* strip leading zeroes */
+          for (; ecc_q_len && !*ecc_q; ecc_q_len--, ecc_q++)
+            ;
+          send_key_data (ctrl, "q", ecc_q, ecc_q_len);
+        }
+
+      send_key_data (ctrl, "curve", oidbuf, oid_len);
+
+      if (keyno == 1)
+        {
+          send_key_data (ctrl, "kdf", "\x03\x01\x08\x07", (size_t)4);
+          algo = PUBKEY_ALGO_ECDH;
+        }
+      else
+        {
+          if ((app->app_local->keyattr[keyno].ecc.flags & ECC_FLAG_DJB_TWEAK))
+            algo = PUBKEY_ALGO_EDDSA;
+          else
+            algo = PUBKEY_ALGO_ECDSA;
+        }
+
+      err = store_fpr (app, keyno, created_at, fprbuf, algo, oidbuf, oid_len,
+                       ecc_q, ecc_q_len, "\x03\x01\x08\x07", (size_t)4);
+    }
 
-  err = store_fpr (app, keyno, created_at, fprbuf, PUBKEY_ALGO_RSA,
-                   m, mlen, e, elen);
   if (err)
     goto leave;
   send_fpr_if_not_null (ctrl, "KEY-FPR", -1, fprbuf);

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

Summary of changes:
 scd/app-openpgp.c | 198 +++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 137 insertions(+), 61 deletions(-)


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



From cvs at cvs.gnupg.org  Tue Oct 18 18:55:27 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Tue, 18 Oct 2016 18:55:27 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-245-g8dce5ee
Message-ID: <E1bwXfm-0003te-Qx@lists.gnupg.org>

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  8dce5ee55a0268d196023224dcf3020306922490 (commit)
       via  05a1e412332dd980353a4e3e59bc75ba40bae7fc (commit)
       via  f2d39a6d051413289c717b9cd2dc387a270b8e7c (commit)
       via  727ca74bb942464217e678012cccbfc347ae08a5 (commit)
      from  34439da2d62b964a914ace66bae7e38f619582a4 (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 8dce5ee55a0268d196023224dcf3020306922490
Author: Justus Winter <justus at g10code.com>
Date:   Tue Oct 18 17:57:19 2016 +0200

    common: Fix copying data to estreams.
    
    * common/exectool.c (copy_buffer_do_copy): Correctly account for
    partially written data in the event of errors.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/common/exectool.c b/common/exectool.c
index e46071c..cf54efe 100644
--- a/common/exectool.c
+++ b/common/exectool.c
@@ -248,7 +248,14 @@ copy_buffer_do_copy (struct copy_buffer *c, estream_t source, estream_t sink)
     return 0;	/* Done copying.  */
 
 
+  nwritten = 0;
   err = sink? es_write (sink, c->writep, c->nread, &nwritten) : 0;
+
+  assert (nwritten <= c->nread);
+  c->writep += nwritten;
+  c->nread -= nwritten;
+  assert (c->writep - c->buffer <= sizeof c->buffer);
+
   if (err)
     {
       if (errno == EAGAIN)
@@ -257,11 +264,6 @@ copy_buffer_do_copy (struct copy_buffer *c, estream_t source, estream_t sink)
       return my_error_from_syserror ();
     }
 
-  assert (nwritten <= c->nread);
-  c->writep += nwritten;
-  c->nread -= nwritten;
-  assert (c->writep - c->buffer <= sizeof c->buffer);
-
   if (sink && es_fflush (sink) && errno != EAGAIN)
     err = my_error_from_syserror ();
 

commit 05a1e412332dd980353a4e3e59bc75ba40bae7fc
Author: Justus Winter <justus at g10code.com>
Date:   Tue Oct 18 14:04:54 2016 +0200

    common,w32: Communicate with child in non-blocking mode.
    
    * common/exechelp-w32.c (gnupg_spawn_process): Open streams in
    non-blocking mode if requested.
    
    Fixes-commit: 83811e3f1f0c615b2b63bafdb49a35a0fc198088
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/common/exechelp-w32.c b/common/exechelp-w32.c
index c5d6b08..19e4d9e 100644
--- a/common/exechelp-w32.c
+++ b/common/exechelp-w32.c
@@ -418,6 +418,7 @@ gnupg_spawn_process (const char *pgmname, const char *argv[],
   int i;
   es_syshd_t syshd;
   gpg_err_source_t errsource = default_errsource;
+  int nonblock = !!(flags & GNUPG_SPAWN_NONBLOCK);
 
   (void)except; /* Not yet used.  */
 
@@ -440,7 +441,7 @@ gnupg_spawn_process (const char *pgmname, const char *argv[],
 
       syshd.type = ES_SYSHD_HANDLE;
       syshd.u.handle = inpipe[1];
-      infp = es_sysopen (&syshd, "w");
+      infp = es_sysopen (&syshd, nonblock? "w,nonblock" : "w");
       if (!infp)
         {
           err = gpg_err_make (errsource, gpg_err_code_from_syserror ());
@@ -464,7 +465,7 @@ gnupg_spawn_process (const char *pgmname, const char *argv[],
 
       syshd.type = ES_SYSHD_HANDLE;
       syshd.u.handle = outpipe[0];
-      outfp = es_sysopen (&syshd, "r");
+      outfp = es_sysopen (&syshd, nonblock? "r,nonblock" : "r");
       if (!outfp)
         {
           err = gpg_err_make (errsource, gpg_err_code_from_syserror ());
@@ -494,7 +495,7 @@ gnupg_spawn_process (const char *pgmname, const char *argv[],
 
       syshd.type = ES_SYSHD_HANDLE;
       syshd.u.handle = errpipe[0];
-      errfp = es_sysopen (&syshd, "r");
+      errfp = es_sysopen (&syshd, nonblock? "r,nonblock" : "r");
       if (!errfp)
         {
           err = gpg_err_make (errsource, gpg_err_code_from_syserror ());

commit f2d39a6d051413289c717b9cd2dc387a270b8e7c
Author: Justus Winter <justus at g10code.com>
Date:   Tue Oct 18 13:55:12 2016 +0200

    common,w32: Extend gnupg_create_inbound_pipe et al.
    
    * common/exechelp-w32.c (do_create_pipe): Rename, add arguments, and
    create a stream if reqested.
    (gnupg_create_inbound_pipe): Use the extended function to open the
    stream if requested.
    (gnupg_create_outbound_pipe): Likewise.
    (gnupg_create_pipe): Update call site.
    
    Fixes-commit: 5d991e333a1885adc40abd9d00c01fec4bd5d9d7
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/common/exechelp-w32.c b/common/exechelp-w32.c
index 418eb9b..c5d6b08 100644
--- a/common/exechelp-w32.c
+++ b/common/exechelp-w32.c
@@ -301,7 +301,8 @@ w32_open_null (int for_write)
 
 
 static gpg_error_t
-do_create_pipe (int filedes[2], int flags)
+create_pipe_and_estream (int filedes[2], int flags,
+                         estream_t *r_fp, int outbound, int nonblock)
 {
   gpg_error_t err = 0;
   HANDLE fds[2];
@@ -330,6 +331,25 @@ do_create_pipe (int filedes[2], int flags)
             err = 0;
         }
     }
+
+  if (! err && r_fp)
+    {
+      if (!outbound)
+        *r_fp = es_fdopen (filedes[0], nonblock? "r,nonblock" : "r");
+      else
+        *r_fp = es_fdopen (filedes[1], nonblock? "w,nonblock" : "w");
+      if (!*r_fp)
+        {
+          err = my_error_from_syserror ();
+          log_error (_("error creating a stream for a pipe: %s\n"),
+                     gpg_strerror (err));
+          close (filedes[0]);
+          close (filedes[1]);
+          filedes[0] = filedes[1] = -1;
+          return err;
+        }
+    }
+
   return err;
 }
 
@@ -339,10 +359,8 @@ do_create_pipe (int filedes[2], int flags)
 gpg_error_t
 gnupg_create_inbound_pipe (int filedes[2], estream_t *r_fp, int nonblock)
 {
-  if (r_fp)
-    return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
-  else
-    return do_create_pipe (filedes, INHERIT_WRITE);
+  return create_pipe_and_estream (filedes, INHERIT_WRITE,
+                                  r_fp, 0, nonblock);
 }
 
 
@@ -352,10 +370,8 @@ gnupg_create_inbound_pipe (int filedes[2], estream_t *r_fp, int nonblock)
 gpg_error_t
 gnupg_create_outbound_pipe (int filedes[2], estream_t *r_fp, int nonblock)
 {
-  if (r_fp)
-    return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
-  else
-    return do_create_pipe (filedes, INHERIT_READ);
+  return create_pipe_and_estream (filedes, INHERIT_READ,
+                                  r_fp, 1, nonblock);
 }
 
 
@@ -364,7 +380,8 @@ gnupg_create_outbound_pipe (int filedes[2], estream_t *r_fp, int nonblock)
 gpg_error_t
 gnupg_create_pipe (int filedes[2])
 {
-  return do_create_pipe (filedes, INHERIT_BOTH);
+  return create_pipe_and_estream (filedes, INHERIT_BOTH,
+                                  NULL, 0, 0);
 }
 
 

commit 727ca74bb942464217e678012cccbfc347ae08a5
Author: Justus Winter <justus at g10code.com>
Date:   Tue Oct 18 14:01:53 2016 +0200

    common,w32: Make use of default_errsource in exechelp.
    
    * common/exechelp-posix.c (my_error_from_syserror, my_error): New.
    Use them instead of gpg_error and gpg_error_from_syserror.
    
    Fixes-commit: 96c7901ec1c79be732570811223d3ea54875abfe
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/common/exechelp-w32.c b/common/exechelp-w32.c
index b2d2457..418eb9b 100644
--- a/common/exechelp-w32.c
+++ b/common/exechelp-w32.c
@@ -84,6 +84,20 @@
 # define handle_to_pid(a) ((int)(a))
 
 
+/* Helper */
+static inline gpg_error_t
+my_error_from_syserror (void)
+{
+  return gpg_err_make (default_errsource, gpg_err_code_from_syserror ());
+}
+
+static inline gpg_error_t
+my_error (int errcode)
+{
+  return gpg_err_make (default_errsource, errcode);
+}
+
+
 /* Return the maximum number of currently allowed open file
    descriptors.  Only useful on POSIX systems but returns a value on
    other systems too.  */
@@ -219,7 +233,7 @@ build_w32_commandline (const char *pgmname, const char * const *argv,
 
   buf = p = xtrymalloc (n);
   if (!buf)
-    return gpg_error_from_syserror ();
+    return my_error_from_syserror ();
 
   p = build_w32_commandline_copy (p, pgmname);
   for (i=0; argv[i]; i++)
@@ -293,7 +307,7 @@ do_create_pipe (int filedes[2], int flags)
   HANDLE fds[2];
 
   filedes[0] = filedes[1] = -1;
-  err = gpg_error (GPG_ERR_GENERAL);
+  err = my_error (GPG_ERR_GENERAL);
   if (!create_inheritable_pipe (fds, flags))
     {
       filedes[0] = _open_osfhandle (handle_to_fd (fds[0]), O_RDONLY);
@@ -662,7 +676,7 @@ gnupg_spawn_process_fd (const char *pgmname, const char *argv[],
                       ))
     {
       log_error ("CreateProcess failed: %s\n", w32_strerror (-1));
-      err = gpg_error (GPG_ERR_GENERAL);
+      err = my_error (GPG_ERR_GENERAL);
     }
   else
     err = 0;
@@ -707,7 +721,7 @@ gnupg_wait_processes (const char **pgmnames, pid_t *pids, size_t count,
 
   procs = xtrycalloc (count, sizeof *procs);
   if (procs == NULL)
-    return gpg_error_from_syserror ();
+    return my_error_from_syserror ();
 
   for (i = 0; i < count; i++)
     {
@@ -715,7 +729,7 @@ gnupg_wait_processes (const char **pgmnames, pid_t *pids, size_t count,
         r_exitcodes[i] = -1;
 
       if (pids[i] == (pid_t)(-1))
-        return gpg_error (GPG_ERR_INV_VALUE);
+        return my_error (GPG_ERR_INV_VALUE);
 
       procs[i] = fd_to_handle (pids[i]);
     }
@@ -818,7 +832,7 @@ gnupg_spawn_process_detached (const char *pgmname, const char *argv[],
   (void)envp;
 
   if (access (pgmname, X_OK))
-    return gpg_error_from_syserror ();
+    return my_error_from_syserror ();
 
   /* Prepare security attributes.  */
   memset (&sec_attr, 0, sizeof sec_attr );
@@ -856,7 +870,7 @@ gnupg_spawn_process_detached (const char *pgmname, const char *argv[],
     {
       log_error ("CreateProcess(detached) failed: %s\n", w32_strerror (-1));
       xfree (cmdline);
-      return gpg_error (GPG_ERR_GENERAL);
+      return my_error (GPG_ERR_GENERAL);
     }
   xfree (cmdline);
   cmdline = NULL;

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

Summary of changes:
 common/exechelp-w32.c | 72 +++++++++++++++++++++++++++++++++++++--------------
 common/exectool.c     | 12 +++++----
 2 files changed, 59 insertions(+), 25 deletions(-)


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



From cvs at cvs.gnupg.org  Tue Oct 18 19:24:29 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 18 Oct 2016 19:24:29 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.7.0-53-g05e8e12
Message-ID: <E1bwY7r-00052h-EH@lists.gnupg.org>

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 "GnuPG Made Easy".

The branch, master has been updated
       via  05e8e1260baa5cbc6f1d6e387e642c1f6c188d44 (commit)
       via  c6cab5a2bd6e7ed226c6c3f0b78b3f48b47db74c (commit)
      from  1e8c34a9192956bb2fe96a7a6a76ff59de8d1c0c (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 05e8e1260baa5cbc6f1d6e387e642c1f6c188d44
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Oct 14 16:29:06 2016 +0200

    tests: Make t-cancel more portable.
    
    * tests/gpg/t-cancel.c: Include sys/time.h and protect sys/select.h.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/tests/gpg/t-cancel.c b/tests/gpg/t-cancel.c
index 16a062a..b5550d8 100644
--- a/tests/gpg/t-cancel.c
+++ b/tests/gpg/t-cancel.c
@@ -32,9 +32,15 @@
 #include <limits.h>
 #include <ctype.h>
 #include <errno.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <sys/types.h>
 #include <unistd.h>
 #include <pthread.h>
-#include <sys/select.h>
+#ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#endif
 
 #include <gpgme.h>
 

commit c6cab5a2bd6e7ed226c6c3f0b78b3f48b47db74c
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Oct 14 16:20:15 2016 +0200

    python: Call ln(1) in a portable way.
    
    * lang/python/Makefile.am: Specify target dir for ln.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
index 9cb99c4..224a91a 100644
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
@@ -54,10 +54,10 @@ copystamp: $(COPY_FILES) $(COPY_FILES_PYME) data.h config.h
 	touch $@
 
 data.h:
-	ln -s "$(top_srcdir)/src/data.h"
+	ln -s "$(top_srcdir)/src/data.h" .
 
 config.h:
-	ln -s "$(top_builddir)/config.h"
+	ln -s "$(top_builddir)/config.h" .
 
 all-local: copystamp
 	for PYTHON in $(PYTHONS); do \

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

Summary of changes:
 lang/python/Makefile.am | 4 ++--
 tests/gpg/t-cancel.c    | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org



From cvs at cvs.gnupg.org  Tue Oct 18 19:43:38 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 18 Oct 2016 19:43:38 +0200
Subject: [git] GPGME - branch, gpgme-1.7-branch,
 updated. gpgme-1.7.0-55-gcffa924
Message-ID: <E1bwYQO-0005fY-Jy@lists.gnupg.org>

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 "GnuPG Made Easy".

The branch, gpgme-1.7-branch has been updated
       via  cffa9240641e1e176ec96ff4c1b5ab261eb96276 (commit)
       via  2c490cdb3e50761c498357982445ebb01f18dc1e (commit)
       via  05e8e1260baa5cbc6f1d6e387e642c1f6c188d44 (commit)
       via  c6cab5a2bd6e7ed226c6c3f0b78b3f48b47db74c (commit)
       via  1e8c34a9192956bb2fe96a7a6a76ff59de8d1c0c (commit)
       via  f526d0e22e8b881ccbca66b46a0e1b68bbc4cd6b (commit)
       via  1e6073ffa98db2c265adbcf0dbbe70c067a910f0 (commit)
       via  cabd4c74e52c8983d624b6877cddc7f8912eff04 (commit)
       via  56302e7bb6a694a7c570f389f9a7883efdfdaf42 (commit)
       via  a274c7590aa0e38d682d5177904983632f471cb0 (commit)
       via  2538c12fa0728f4113f83f69f8c8ec9efb163872 (commit)
       via  a3cf30f89418c8a6bc9456533d95ba7fc2a33a4c (commit)
       via  5f64018af89e07dd0494775d6dfc82564536d6e0 (commit)
       via  e5a35af5573651b96a90ef4a537b040333595472 (commit)
       via  ce7385caabb57e5435695cc912acffe2815770b7 (commit)
       via  54f94b14e2bb9b38ffd89f509406bfbd012da632 (commit)
       via  e7ceb83a5969581f5e1b0b6a69d18a93b594f6d4 (commit)
       via  b6b820bff14a9aa8fa67755b246c90062ffdba14 (commit)
       via  34e9dfee81958160f6604849b63369ae4de67417 (commit)
       via  f131a5e72b0881cafcc3b0a91da8f050af2684a6 (commit)
       via  098a2da15b1b46b145add623dec0488abd39bd74 (commit)
       via  0ea2ff67900c243fff9f689658dcb23d1c0961cd (commit)
       via  857592041b8355cd58a7068c9f2446cf8dc0968f (commit)
       via  8033cff441e9ea185531290273ec343f3402703c (commit)
       via  88c7e84ede4b6017cac3a396e8c87c2bd3a2bf58 (commit)
       via  24779c9e2301bd17fd328d65b0383e1cbc944119 (commit)
       via  4984cc93db6b55f2420a9abd844c074a5fb4ed0c (commit)
       via  9d1df990386010e0581b542a76a4f5d85d8d11b5 (commit)
       via  370ee1aa802ec6a4030a39b2df7d24a0c47e5ac7 (commit)
       via  39dd7585f5a7d801942efcb375d6dd46d01d2968 (commit)
       via  52a91ccc6a25425d4374b77040e30efb6816940f (commit)
       via  453ab9d24ca48c9e01d21e1454d6b08de1938b76 (commit)
       via  68fb8371a1dd5f4e05e50b1733f9996d139cbf38 (commit)
       via  d1509428f30c278ee7e99e2bca5559c5b2536721 (commit)
       via  7302791c0d308c3284ac24a743035d27a0c0b6ba (commit)
       via  a6e9eefb23e57e14afaead5c896452360bdaeb6f (commit)
       via  145392f07f42ef23ebcb83a917b4d8e2964e7aa8 (commit)
       via  a423603f80d9eb653ce9c171662db2175d7456f5 (commit)
       via  c9934bb1eecae28abeb361db9f5eb73e7e02ecb6 (commit)
       via  c38fabfea0601ed5f61e27e0bf43f8e74c67ce2a (commit)
       via  1d80e7374aa3150306c86afe7acdc8e8eb05143f (commit)
       via  3703a4723899d7563937b4b99f5bbe4dd8d3dfed (commit)
       via  95f38652f696476b38a040644eac40b4511d2b32 (commit)
       via  a11450eb048df79a3f2b00ebef6d7cab07ad5054 (commit)
       via  9b38817968b90caf73f123255fe427691e82fec4 (commit)
       via  a142f187b7ddb2728ec3e1743da4a0c4538ab40a (commit)
       via  583aafdd6870a7fb12a34d90993fd0f46928592c (commit)
       via  c447b64d5989845a2ae2cf8fb30a92d2a0bd05af (commit)
       via  dc39552d01094eff2bef5f9fcd1c16928909d20e (commit)
       via  7a6543c2dfeef874a34086c8f3eeb1dbdf1ce822 (commit)
       via  dee56820cabde60c43c9bf8281b8d411cb2ad644 (commit)
       via  d0cf6b15121c9b42dbcef243e5ce30c9996a449c (commit)
       via  0aaf1dedd629446ab991fff76581b4b58e4872a0 (commit)
       via  ae324b51ffa338b891387bff2657d60c1fd3ae40 (commit)
      from  0b78bc7ba40972402f8ab7919313c000ef1f6385 (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 cffa9240641e1e176ec96ff4c1b5ab261eb96276
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Oct 18 19:40:11 2016 +0200

    Post release updates
    
    --

diff --git a/NEWS b/NEWS
index e726c77..f5d7ce0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 1.7.2 (unreleased)
+------------------------------------------------
+
+
 Noteworthy changes in version 1.7.1 (2016-10-18)
 ------------------------------------------------
 
diff --git a/configure.ac b/configure.ac
index 6580b7c..617128e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ min_automake_version="1.14"
 # for the LT versions.
 m4_define(mym4_version_major, [1])
 m4_define(mym4_version_minor, [7])
-m4_define(mym4_version_micro, [1])
+m4_define(mym4_version_micro, [2])
 
 # Below is m4 magic to extract and compute the revision number, the
 # decimalized short revision number, a beta version string, and a flag

commit 2c490cdb3e50761c498357982445ebb01f18dc1e
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Oct 18 19:23:59 2016 +0200

    Release 1.7.1.
    
    * configure.ac: Set LT version to C27/A16/R0.  Note that the LT
    versions for cpp and Qt have already been updated.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/NEWS b/NEWS
index a34d37c..e726c77 100644
--- a/NEWS
+++ b/NEWS
@@ -1,31 +1,35 @@
-Noteworthy changes in version 1.7.1 (unreleased) [C26/A15/R_]
+Noteworthy changes in version 1.7.1 (2016-10-18)
 ------------------------------------------------
 
+ * Fixed problems with the new language bindings.
+
+ * New helper function gpgme_addrspec_from_uid.
+
+ * Use option --exit-on-status-write-error with newer gpg versions.
+
  * qt: Missed API from the Qt Binding inclusion has
    been added again.
 
  * qt: abstractimportjob.h is now installed to that
    ImportJobs can be used again.
 
+ * qt: Fixed spelling error in API (startReceive).
+
  * Interface changes relative to the 1.7.0 release:
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  gpgme_addrspec_from_uid         NEW.
+ qt: WksPublishJob::startRecieve RENAMED to ::startReceive.
+ qt: MultiDeleteJob              NEW.
+ qt: AbstractImportJob           NEW.
+ qt: SpecialJob                  NEW.
+ cpp: Signature::key(bool, bool)              NEW.
+ cpp: UserID::addrSpecFromString(const char*) NEW.
+ cpp: UserID::addrSpec()                      NEW.
 
- * qt Interface changes relative to the 1.7.0 release:
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- WksPublishJob::startReceive     NEW.
- WksPublishJob::startRecieve     REMOVED.
- MultiDeleteJob                  NEW.
- AbstractImportJob               NEW.
- SpecialJob                      NEW.
+ [c=C27/A16/R0 cpp=C8/A2/R0 qt=C7/A0/R0]
 
- * cpp Interface changes relative to the 1.7.0 release:
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Signature::key(bool, bool)              NEW.
- UserID::addrSpecFromString(const char*) NEW.
- UserID::addrSpec()                      NEW.
 
-Noteworthy changes in version 1.7.0 (2016-09-21) [C26/A15/R0]
+Noteworthy changes in version 1.7.0 (2016-09-21)
 ------------------------------------------------
 
  * New language bindings for Python 2 and 3.
@@ -129,6 +133,8 @@ Noteworthy changes in version 1.7.0 (2016-09-21) [C26/A15/R0]
  GPGME_KEYSIGN_LFSEP            NEW.
  GPGME_INTERACT_CARD            NEW.
 
+ [c=C26/A15/R0 cpp=C6/A0/R1 qt=C6/A0/R1]
+
 
 Noteworthy changes in version 1.6.0 (2015-08-26) [C25/A14/R0]
 ------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 0cfda5e..6580b7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,10 +55,8 @@ AC_INIT([gpgme],[mym4_full_version],[http://bugs.gnupg.org])
 #   (Interfaces added:			AGE++)
 #   (Interfaces removed/changed:	AGE=0)
 #
-LIBGPGME_LT_CURRENT=26
-# Subtract 2 from this value if you want to make the LFS transition an
-# ABI break.  [Note to self: Remove this comment with the next regular break.]
-LIBGPGME_LT_AGE=15
+LIBGPGME_LT_CURRENT=27
+LIBGPGME_LT_AGE=16
 LIBGPGME_LT_REVISION=0
 
 LIBGPGMEPP_LT_CURRENT=8

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

Summary of changes:
 NEWS                                               |  38 ++++-
 THANKS                                             |   6 +-
 configure.ac                                       |  21 ++-
 doc/ChangeLog-2011                                 |   2 +-
 doc/gpgme.texi                                     |  39 ++++-
 lang/cpp/src/GpgmeppConfig.cmake.in.in             |  13 +-
 lang/cpp/src/Makefile.am                           |  10 +-
 lang/cpp/src/callbacks.cpp                         |   4 +
 lang/cpp/src/configuration.cpp                     |   4 +
 lang/cpp/src/context.cpp                           |  10 +-
 lang/cpp/src/context.h                             |   4 +-
 lang/cpp/src/context_glib.cpp                      |   4 +
 lang/cpp/src/context_qt.cpp                        |   4 +
 lang/cpp/src/context_vanilla.cpp                   |   4 +
 lang/cpp/src/data.cpp                              |  10 ++
 lang/cpp/src/data.h                                |   5 +-
 lang/cpp/src/decryptionresult.cpp                  |   4 +
 lang/cpp/src/defaultassuantransaction.cpp          |   4 +
 lang/cpp/src/editinteractor.cpp                    |   4 +
 lang/cpp/src/encryptionresult.cpp                  |   4 +
 lang/cpp/src/engineinfo.cpp                        |   4 +
 lang/cpp/src/eventloopinteractor.cpp               |   4 +
 lang/cpp/src/exception.cpp                         |   4 +
 lang/cpp/src/gpgadduserideditinteractor.cpp        |   4 +
 lang/cpp/src/gpgagentgetinfoassuantransaction.cpp  |   4 +
 lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp    |   4 +
 lang/cpp/src/gpgsetownertrusteditinteractor.cpp    |   4 +
 lang/cpp/src/gpgsignkeyeditinteractor.cpp          |   4 +
 lang/cpp/src/importresult.cpp                      |   4 +
 lang/cpp/src/key.cpp                               |  25 +++
 lang/cpp/src/key.h                                 |  15 ++
 lang/cpp/src/keygenerationresult.cpp               |   4 +
 lang/cpp/src/keylistresult.cpp                     |   4 +
 lang/cpp/src/scdgetinfoassuantransaction.cpp       |   4 +
 lang/cpp/src/signingresult.cpp                     |   4 +
 lang/cpp/src/tofuinfo.cpp                          |   5 +
 lang/cpp/src/trustitem.cpp                         |   4 +
 lang/cpp/src/verificationresult.cpp                |  38 +++++
 lang/cpp/src/verificationresult.h                  |  21 +++
 lang/cpp/src/vfsmountresult.cpp                    |   4 +
 lang/python/Makefile.am                            |  17 +-
 lang/python/examples/inter-edit.py                 |   4 +-
 lang/python/examples/testCMSgetkey.py              |   2 +-
 lang/python/examples/verifydetails.py              |   2 +-
 lang/python/gpgme.i                                |  92 ++++++++---
 lang/python/helpers.c                              |   4 +
 lang/python/helpers.h                              |   4 +
 lang/python/pyme/core.py                           |  31 +++-
 lang/python/pyme/errors.py                         |  22 ++-
 lang/python/setup.py.in                            |   3 +-
 lang/python/tests/support.py                       |   1 +
 lang/python/tests/t-keylist.py                     |  23 +++
 lang/python/tests/t-sig-notation.py                |   1 +
 lang/qt/src/Makefile.am                            |  18 ++-
 lang/qt/src/QGpgmeConfig.cmake.in.in               |  13 +-
 lang/qt/src/dataprovider.cpp                       |   6 +-
 lang/qt/src/defaultkeygenerationjob.cpp            |   4 +
 lang/qt/src/gpgme_backend_debug.cpp                |   4 +
 lang/qt/src/job.cpp                                |   4 +
 lang/qt/src/multideletejob.cpp                     | 117 ++++++++++++++
 lang/qt/src/multideletejob.h                       |   2 +-
 lang/qt/src/protocol.h                             |   6 +-
 lang/qt/src/qgpgmeadduseridjob.cpp                 |   4 +
 lang/qt/src/qgpgmebackend.cpp                      |   4 +
 lang/qt/src/qgpgmechangeexpiryjob.cpp              |   4 +
 lang/qt/src/qgpgmechangeownertrustjob.cpp          |   4 +
 lang/qt/src/qgpgmechangepasswdjob.cpp              |   4 +
 lang/qt/src/qgpgmedecryptjob.cpp                   |   4 +
 lang/qt/src/qgpgmedecryptverifyjob.cpp             |   4 +
 lang/qt/src/qgpgmedeletejob.cpp                    |   4 +
 lang/qt/src/qgpgmedownloadjob.cpp                  |   4 +
 lang/qt/src/qgpgmeencryptjob.cpp                   |   4 +
 lang/qt/src/qgpgmeexportjob.cpp                    |   4 +
 lang/qt/src/qgpgmeimportfromkeyserverjob.cpp       |   4 +
 lang/qt/src/qgpgmeimportjob.cpp                    |   4 +
 lang/qt/src/qgpgmekeyformailboxjob.cpp             |   4 +
 lang/qt/src/qgpgmekeygenerationjob.cpp             |   4 +
 lang/qt/src/qgpgmekeylistjob.cpp                   |   4 +
 lang/qt/src/qgpgmelistallkeysjob.cpp               |   4 +
 lang/qt/src/qgpgmenewcryptoconfig.cpp              |   6 +-
 lang/qt/src/qgpgmerefreshkeysjob.cpp               |   6 +-
 lang/qt/src/qgpgmesecretkeyexportjob.cpp           |   6 +-
 lang/qt/src/qgpgmesignencryptjob.cpp               |   4 +
 lang/qt/src/qgpgmesignjob.cpp                      |   4 +
 lang/qt/src/qgpgmesignkeyjob.cpp                   |   4 +
 lang/qt/src/qgpgmetofupolicyjob.cpp                |   4 +
 lang/qt/src/qgpgmeverifydetachedjob.cpp            |   4 +
 lang/qt/src/qgpgmeverifyopaquejob.cpp              |   4 +
 lang/qt/src/qgpgmewkspublishjob.cpp                |  10 +-
 lang/qt/src/qgpgmewkspublishjob.h                  |   2 +-
 lang/qt/src/threadedjobmixin.cpp                   |   4 +
 lang/qt/src/threadedjobmixin.h                     |   3 +-
 lang/qt/src/wkspublishjob.h                        |   4 +-
 lang/qt/tests/Makefile.am                          |   7 +-
 lang/qt/tests/run-keyformailboxjob.cpp             |   4 +
 lang/qt/tests/t-encrypt.cpp                        |  36 ++++-
 lang/qt/tests/t-keylist.cpp                        |   4 +
 lang/qt/tests/t-keylocate.cpp                      |   4 +
 lang/qt/tests/t-ownertrust.cpp                     |   4 +
 lang/qt/tests/t-support.cpp                        |   4 +
 lang/qt/tests/t-support.h                          |   4 +-
 lang/qt/tests/t-tofuinfo.cpp                       |   4 +
 .../qgpgmeverifyopaquejob.h => tests/t-verify.cpp} |  95 ++++++------
 lang/qt/tests/t-wkspublish.cpp                     |  20 ++-
 src/assuan-support.c                               |  14 ++
 src/b64dec.c                                       |   2 +-
 src/conversion.c                                   |  56 +++++++
 src/data-identify.c                                |   2 +-
 src/engine-gpg.c                                   |   4 +-
 src/gpgme.def                                      |   2 +
 src/gpgme.h.in                                     |   6 +-
 src/libgpgme.vers                                  |   2 +
 src/mbox-util.c                                    |  20 ++-
 src/mbox-util.h                                    |   2 +-
 src/util.h                                         |  10 ++
 src/w32-util.c                                     |  39 ++---
 tests/ChangeLog-2011                               |   8 +-
 tests/gpg/.gitignore                               |   1 +
 tests/gpg/Makefile.am                              |  12 +-
 tests/gpg/geheim.txt                               |   2 +-
 tests/gpg/{t-eventloop.c => t-cancel.c}            | 171 +++++++++++++--------
 tests/gpg/t-eventloop.c                            |   6 +-
 tests/gpg/t-sig-notation.c                         |   1 +
 tests/gpgsm/t-decrypt.c                            |  14 +-
 124 files changed, 1154 insertions(+), 277 deletions(-)
 create mode 100644 lang/qt/src/multideletejob.cpp
 copy lang/qt/{src/qgpgmeverifyopaquejob.h => tests/t-verify.cpp} (52%)
 copy tests/gpg/{t-eventloop.c => t-cancel.c} (51%)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org



From cvs at cvs.gnupg.org  Tue Oct 18 19:45:24 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 18 Oct 2016 19:45:24 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.7.1-1-gcffa924
Message-ID: <E1bwYS6-0005hH-1l@lists.gnupg.org>

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 "GnuPG Made Easy".

The branch, master has been updated
       via  cffa9240641e1e176ec96ff4c1b5ab261eb96276 (commit)
       via  2c490cdb3e50761c498357982445ebb01f18dc1e (commit)
      from  05e8e1260baa5cbc6f1d6e387e642c1f6c188d44 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 NEWS         | 38 ++++++++++++++++++++++++--------------
 configure.ac |  8 +++-----
 2 files changed, 27 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org



From cvs at cvs.gnupg.org  Tue Oct 18 19:47:37 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 18 Oct 2016 19:47:37 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. c1c9bbe3827204aac93a79b7824ec6042de4a072
Message-ID: <E1bwYUF-00069I-4z@lists.gnupg.org>

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 GnuPG website and other docs".

The branch, master has been updated
       via  c1c9bbe3827204aac93a79b7824ec6042de4a072 (commit)
      from  6a6de7e95dcf0ef104134b7d47c8401e792f7895 (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 c1c9bbe3827204aac93a79b7824ec6042de4a072
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Oct 18 19:44:28 2016 +0200

    swdb: Release of gpgme 1.7.1

diff --git a/web/swdb.mac b/web/swdb.mac
index 902c0ba..78dde15 100644
--- a/web/swdb.mac
+++ b/web/swdb.mac
@@ -71,11 +71,11 @@
 #
 # GPGME
 #
-#+macro: gpgme_ver  1.7.0
-#+macro: gpgme_date 2016-09-21
-#+macro: gpgme_size 1251k
-#+macro: gpgme_sha1 41030f0f317100af6e9a1a05a4b0218aee684d8a
-#+macro: gpgme_sha2 71f55fed0f2b3eaf7a606e59772aa645ce3ffff322d361ce359951b3f755cc48
+#+macro: gpgme_ver  1.7.1
+#+macro: gpgme_date 2016-10-18
+#+macro: gpgme_size 1255k
+#+macro: gpgme_sha1 af95d75878200407eb577245eeb0681b1ad313ed
+#+macro: gpgme_sha2 d0abe1449395315eac37e4e45076bbb82732cedf94210937b37776e10cdc2bb6
 
 
 #

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

Summary of changes:
 web/swdb.mac | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org



From cvs at cvs.gnupg.org  Tue Oct 18 20:00:41 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 18 Oct 2016 20:00:41 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. 954cadd7b70881ef29b97c11979382546769f2f5
Message-ID: <E1bwYgt-0006IM-IA@lists.gnupg.org>

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 GnuPG website and other docs".

The branch, master has been updated
       via  954cadd7b70881ef29b97c11979382546769f2f5 (commit)
       via  f384df598dabdaff5157718aeb82fad4e7a9f132 (commit)
      from  c1c9bbe3827204aac93a79b7824ec6042de4a072 (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 954cadd7b70881ef29b97c11979382546769f2f5
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Oct 18 19:57:31 2016 +0200

    swdb: Fix macro for 1.4 exe.

diff --git a/web/swdb.mac b/web/swdb.mac
index 78dde15..fd123e2 100644
--- a/web/swdb.mac
+++ b/web/swdb.mac
@@ -47,7 +47,7 @@
 #
 #+macro: gnupg1_w32cli_ver  1.4.21
 #+macro: gnupg1_w32cli_size 2363k
-#+macro: gnupg1_w32cli_sha 8edea5cda7dc9e39d12b24cf12164b28b832918d
+#+macro: gnupg1_w32cli_sha1 8edea5cda7dc9e39d12b24cf12164b28b832918d
 
 
 #

commit f384df598dabdaff5157718aeb82fad4e7a9f132
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Oct 18 19:52:14 2016 +0200

    web: Do not mention GnuPG 1.4 too prominent.

diff --git a/web/download/git.org b/web/download/git.org
index 2b727a6..399edb0 100644
--- a/web/download/git.org
+++ b/web/download/git.org
@@ -35,7 +35,7 @@
   also checks that you have all required tools installed. Please read
   the GIT manual pages before doing so. The =master= revision is the
   development branch; the stable 2.0 version (currently version
-  {{{gnupg_ver}}}) is known as =STABLE-BRANCH-2-0=; the stable 1.4
+  {{{gnupg_ver}}}) is known as =STABLE-BRANCH-2-0=; the old 1.4
   version of GnuPG ({{{gnupg1_ver}}}) is known as =STABLE-BRANCH-1-4=.
 
   Bug reports should go to the developers mailing list. See the page
diff --git a/web/download/index.org b/web/download/index.org
index 3e1d602..c7b8a04 100644
--- a/web/download/index.org
+++ b/web/download/index.org
@@ -44,9 +44,8 @@
    | Name          | Version                | Date                    |                    Size | Tarball                                                                                                | Signature                                                                                                  |
    |---------------+------------------------+-------------------------+-------------------------+--------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------|
    |               | <l>                    |                         |                     <r> |                                                                                                        |                                                                                                            |
-   | GnuPG stable  | {{{gnupg_ver}}}        | {{{gnupg_date}}}        |        {{{gnupg_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg_ver}}}.tar.bz2{{{ftpclose}}}                      | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg_ver}}}.tar.bz2.sig{{{ftpclose}}}                      |
    | GnuPG modern  | {{{gnupg21_ver}}}      | {{{gnupg21_date}}}      |      {{{gnupg21_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg21_ver}}}.tar.bz2{{{ftpclose}}}                    | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg21_ver}}}.tar.bz2.sig{{{ftpclose}}}                    |
-   | GnuPG classic | {{{gnupg1_ver}}}       | {{{gnupg1_date}}}       |       {{{gnupg1_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg1_ver}}}.tar.bz2{{{ftpclose}}}                     | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg1_ver}}}.tar.bz2.sig{{{ftpclose}}}                     |
+   | GnuPG stable  | {{{gnupg_ver}}}        | {{{gnupg_date}}}        |        {{{gnupg_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg_ver}}}.tar.bz2{{{ftpclose}}}                      | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg_ver}}}.tar.bz2.sig{{{ftpclose}}}                      |
    |---------------+------------------------+-------------------------+-------------------------+--------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------|
    | [[../related_software/libgpg-error/index.org][Libgpg-error]]  | {{{libgpg_error_ver}}} | {{{libgpg_error_date}}} | {{{libgpg_error_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/libgpg-error/libgpg-error-{{{libgpg_error_ver}}}.tar.bz2{{{ftpclose}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/libgpg-error/libgpg-error-{{{libgpg_error_ver}}}.tar.bz2.sig{{{ftpclose}}} |
    | [[../related_software/libgcrypt/index.org][Libgcrypt]]     | {{{libgcrypt_ver}}}    | {{{libgcrypt_date}}}    |    {{{libgcrypt_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/libgcrypt/libgcrypt-{{{libgcrypt_ver}}}.tar.bz2{{{ftpclose}}}          | {{{ftpopen}}}{{{ftp_loc_base}}}/libgcrypt/libgcrypt-{{{libgcrypt_ver}}}.tar.bz2.sig{{{ftpclose}}}          |
diff --git a/web/download/integrity_check.org b/web/download/integrity_check.org
index ba4d393..9689ef6 100644
--- a/web/download/integrity_check.org
+++ b/web/download/integrity_check.org
@@ -106,12 +106,9 @@
    that can be downloaded from [[ftp://ftp.gnupg.org/][our site]], have been gathered below.
 
    {{{begin_chksum}}}
-   {{{gnupg_sha1}}}  gnupg-{{{gnupg_ver}}}.tar.bz2
    {{{gnupg21_sha1}}}  gnupg-{{{gnupg21_ver}}}.tar.bz2
    {{{gnupg21_w32_sha1}}}  gnupg-w32-{{{gnupg21_w32_ver}}}.exe
-   {{{gnupg1_sha1}}}  gnupg-{{{gnupg1_ver}}}.tar.bz2
-   {{{gnupg1_sha1_gz}}}  gnupg-{{{gnupg1_ver}}}.tar.gz
-   {{{gnupg1_w32cli_sha1}}}  gnupg-w32cli-{{{gnupg1_w32cli_ver}}}.exe
+   {{{gnupg_sha1}}}  gnupg-{{{gnupg_ver}}}.tar.bz2
    {{{libgpg_error_sha1}}}  libgpg-error-{{{libgpg_error_ver}}}.tar.bz2
    {{{libgcrypt_sha1}}}  libgcrypt-{{{libgcrypt_ver}}}.tar.bz2
    {{{libksba_sha1}}}  libksba-{{{libksba_ver}}}.tar.bz2
@@ -121,6 +118,8 @@
    {{{gpgme_sha1}}}  gpgme-{{{gpgme_ver}}}.tar.bz2
    {{{gpa_sha1}}}  gpa-{{{gpa_ver}}}.tar.bz2
    {{{dirmngr_sha1}}}  dirmngr-{{{dirmngr_ver}}}.tar.bz2
+   {{{gnupg1_sha1}}}  gnupg-{{{gnupg1_ver}}}.tar.bz2
+   {{{gnupg1_w32cli_sha1}}}  gnupg-w32cli-{{{gnupg1_w32cli_ver}}}.exe
    {{{end_chksum}}}
 
 
diff --git a/web/download/release_notes.org b/web/download/release_notes.org
index d0e9aa1..6f27b28 100644
--- a/web/download/release_notes.org
+++ b/web/download/release_notes.org
@@ -8,12 +8,8 @@
 
   Please read the NEWS file for a more complete list. {{{gnupg_ver}}}
   is the stable and modern version of GnuPG. (Version {{{gnupg1_ver}}}
-  is from the old GnuPG-1 series, which is still maintained and useful
-  on some platforms: It is smaller than versions from the GnuPG-2
-  series, easier to build and also better portable to ancient
-  platforms. In contrast to GnuPG-2 it comes with no support for
-  S/MIME, Secure Shell, or other tools useful for desktop
-  environments.
+  is from the old GnuPG-1 series, which is useful to decrypt PGP-2
+  encrypted data.)
 
 ** GnuPG-2
 
diff --git a/web/index.org b/web/index.org
index d9f4aee..63c0717 100644
--- a/web/index.org
+++ b/web/index.org
@@ -22,18 +22,15 @@ GnuPG is [[https://www.gnu.org/philosophy/free-sw.html][Free Software]] (meaning
 be freely used, modified and distributed under the terms of the
 [[https://www.gnu.org/copyleft/gpl.html][GNU General Public License]] .
 
-GnuPG comes in three flavours:
+There are two major flavours of GnuPG:
 
  - {{{gnupg21_ver}}} is the /modern/ version with support
    for [[https://en.wikipedia.org/wiki/Elliptic_curve_cryptography][ECC]] and many other new features,
 
- - {{{gnupg_ver}}} is the /stable/ version from the currently mostly
-   used branch.  This branch will reach end-of-life on 2017-12-31,
+ - {{{gnupg_ver}}} is the /stable/ version from an often used branch.
+   This branch will reach end-of-life on 2017-12-31.
 
- - and {{{gnupg1_ver}}} is the /classic/ portable version for use on
-   very old platforms or to decrypt data created with PGP-2 keys.
-
-Project [[https://www.gpg4win.org][Gpg4win]] provides a Windows version of GnuPG /stable/. It is
+Project [[https://www.gpg4win.org][Gpg4win]] provides a Windows version of the old GnuPG /stable/. It is
 nicely integrated into an installer and features several frontends as
 well as English and German manuals.  A simple Windows installer for the
 /modern/ version is available at our [[file:download/index.org][download]] page.

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

Summary of changes:
 web/download/git.org             |  2 +-
 web/download/index.org           |  3 +--
 web/download/integrity_check.org |  7 +++----
 web/download/release_notes.org   |  8 ++------
 web/index.org                    | 11 ++++-------
 web/swdb.mac                     |  2 +-
 6 files changed, 12 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org



From cvs at cvs.gnupg.org  Wed Oct 19 15:18:40 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Wed, 19 Oct 2016 15:18:40 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.7.1-2-g26cbba3
Message-ID: <E1bwqlW-0003FY-Fj@lists.gnupg.org>

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 "GnuPG Made Easy".

The branch, master has been updated
       via  26cbba3c9cb04a68b95f3a6000ac9bd93fe76dd7 (commit)
      from  cffa9240641e1e176ec96ff4c1b5ab261eb96276 (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 26cbba3c9cb04a68b95f3a6000ac9bd93fe76dd7
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 19 15:17:09 2016 +0200

    qt: Improve WKSPublishJob apidoc
    
    * lang/qt/src/wkspublishjob.h: Improve doc.

diff --git a/lang/qt/src/wkspublishjob.h b/lang/qt/src/wkspublishjob.h
index 0cec630..b17cba4 100644
--- a/lang/qt/src/wkspublishjob.h
+++ b/lang/qt/src/wkspublishjob.h
@@ -47,6 +47,15 @@ namespace QGpgME {
  *
  * Remember that after a result is emitted the job is auto deleted
  * so you can only use it for a single action.
+ *
+ * The workflow is to call startCreate, check for errors and then
+ * send the RFC822 mail returned in returnedData.
+ *
+ * When the response is received start a startRecieve with the
+ * RFC822 mail received as paramater response. Check for errors
+ * and then send again send the result from returnedData back to
+ * the server.
+ *
  */
 class QGPGME_EXPORT WKSPublishJob: public Job
 {
@@ -69,16 +78,16 @@ public:
     virtual void startCheck(const QString &mailbox) = 0;
 
     /** Create a publish request.
-     * The returned Data from the result will contain
-     * the full Mail as returned by gpg-wks-client --create
+     * The returnedData from the result signal will contain
+     * the full Request as returned by gpg-wks-client --create
      *
      * @param fpr the fingerprint of the key to create the request for.
      * @param mailbox A simple mail address without a Name.
      */
     virtual void startCreate(const char *fpr, const QString &mailbox) = 0;
 
-    /** Handle a submisson response. The returned Data will contain
-     * the full Mail as returned by gpg-wks-client --create
+    /** Handle a submisson response. The returnedData in the result singnal
+     * will contain the confirmation response as returned by gpg-wks-client --receive
      *
      * @param response The response of the server.
      **/

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

Summary of changes:
 lang/qt/src/wkspublishjob.h | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org



From cvs at cvs.gnupg.org  Wed Oct 19 16:42:18 2016
From: cvs at cvs.gnupg.org (by Kai Michaelis)
Date: Wed, 19 Oct 2016 16:42:18 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-246-g72a99f5
Message-ID: <E1bws4S-0006NW-Vq@lists.gnupg.org>

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  72a99f582dad4cb4c3b05b97c7ebb8d537f10b79 (commit)
      from  8dce5ee55a0268d196023224dcf3020306922490 (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 72a99f582dad4cb4c3b05b97c7ebb8d537f10b79
Author: Kai Michaelis <kai at gnupg.org>
Date:   Wed Oct 19 16:19:29 2016 +0200

    dirmngr: improve VERSIONCHECK
    
    Replace strtok_r() and code formatting. Use code from libgpg-error for
    version comparison.

diff --git a/dirmngr/server.c b/dirmngr/server.c
index 2836cef..8590fb1 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -2342,102 +2342,134 @@ cmd_reloaddirmngr (assuan_context_t ctx, char *line)
 
 
 

-/* Returns -1 if version a is less than b, 0 if the versions are equal and 1 otherwise.
- * Versions are compared as period-separated tuples starting at the front. Elements are
- * interpreted as decimals first. If this fails strcmp is used. Comparison continues
- * until two elements are found the be unequal of the end is reached. */
-static int
-cmp_version(const char* a, const char* b)
+static const char*
+parse_version_number (const char *s, int *number)
+{
+  int val = 0;
+
+  if (*s == '0' && digitp (&s[1]))
+    return NULL;  /* Leading zeros are not allowed.  */
+  for (; digitp (s); s++)
+    {
+      val *= 10;
+      val += *s - '0';
+    }
+  *number = val;
+  return val < 0 ? NULL : s;
+}
+
+
+static const char *
+parse_version_string (const char *s, int *major, int *minor)
 {
-  char *a_dup, *b_dup, *strtok_internal_a = NULL, *strtok_internal_b = NULL, *a_comp, *b_comp;
-  int ret = 0;
+  s = parse_version_number (s, major);
+  if (!s || *s != '.')
+    return NULL;
+  s++;
+  s = parse_version_number (s, minor);
+  if (!s)
+    return NULL;
+  return s;  /* Patchlevel.  */
+}
+
+/* Class Confucius.
 
-  assert (a && b);
+   "Don't worry that other people don't know you;
+   worry that you don't know other people."            Analects--1.16.  */
 
-  a_dup = xstrdup (a);
-  b_dup = xstrdup (b);
-  a_comp = strtok_r (a_dup, ".", &strtok_internal_a);
-  b_comp = strtok_r (b_dup, ".", &strtok_internal_b);
+/* Create temporary directory with mode 0700.  Returns a dynamically
+   allocated string with the filename of the directory.  */
+static char *
+confucius_mktmpdir (void)
+{
+  char *name, *p;
 
-  while (a_comp || b_comp)
+  p = getenv ("TMPDIR");
+  if (!p || !*p)
+    p = "/tmp";
+  if (p[strlen (p) - 1] == '/')
+    name = xstrconcat (p, "gpg-XXXXXX", NULL);
+  else
+    name = xstrconcat (p, "/", "gpg-XXXXXX", NULL);
+  if (!name || !gnupg_mkdtemp (name))
     {
-      if (a_comp && *a_comp && b_comp && *b_comp)
-        {
-          char* a_end;
-          char* b_end;
-          int a_ver = strtol (a_comp, &a_end, 10);
-          int b_ver = strtol (b_comp, &b_end, 10);
+      log_error (_("can't create temporary directory '%s': %s\n"),
+                 name?name:"", strerror (errno));
+      return NULL;
+    }
 
-          if (!*a_end && !*b_end)
-            {
-              if (a_ver != b_ver)
-                {
-                  ret = a_ver - b_ver;
-                  break;
-                }
-            }
-          else
-            {
-              int r = strcmp (a_comp, b_comp);
-              if (r != 0)
-                {
-                  ret = r;
-                  break;
-                }
-            }
-        }
-      else
-        {
-          if ((!a_comp || !*a_comp) && b_comp && *b_comp)
-            ret = -1;
-          else if (a_comp && *a_comp && (!b_comp || !*b_comp))
-            ret = 1;
-          else
-            ret = 0;
-          break;
-        }
+  return name;
+}
 
-      a_comp = strtok_r (NULL, ".", &strtok_internal_a);
-      b_comp = strtok_r (NULL, ".", &strtok_internal_b);
+/* Sets result to -1 if version a is less than b, 0 if the versions are equal
+ * and 1 otherwise. Patch levels are compared as strings.  */
+static gpg_error_t
+cmp_version (const char *a, const char *b, int *result)
+{
+  int a_major, b_major;
+  int a_minor, b_minor;
+  const char *a_patch, *b_patch;
+
+  if (!a || !b || !result)
+    return GPG_ERR_EINVAL;
+
+  a_patch = parse_version_string (a, &a_major, &a_minor);
+  b_patch = parse_version_string (b, &b_major, &b_minor);
+
+  if (!a_patch || !b_patch)
+    return GPG_ERR_EINVAL;
+
+  if (a_major == b_major)
+    {
+      if (a_minor == b_minor)
+        *result = strcmp (a_patch, b_patch);
+      else
+        *result = a_minor - b_minor;
     }
+  else
+    *result = a_major - b_major;
 
-  xfree (a_dup);
-  xfree (b_dup);
-  return ret;
+  return 0;
 }
 
-static int
-fetch_into_tmpdir(const char* url, ctrl_t ctrl, estream_t* strm_out, char** path)
+static gpg_error_t
+fetch_into_tmpdir (ctrl_t ctrl, const char* url, estream_t* strm_out,
+                   char** path)
 {
-  gpg_error_t err = 0;
-  char filename[128];
-  char* dirname = xmalloc (128);
+  gpg_error_t err;
+  char* filename = NULL;
+  char* dirname = NULL;
   estream_t file;
   estream_t strm;
   size_t len = 0;
   char buf[1024];
 
-  if (!strm_out)
+  if (!strm_out || !path || !url)
     {
       err = (GPG_ERR_INV_ARG);
       goto leave;
     }
 
-  snprintf (dirname ,128 ,"%s%s%s" ,P_tmpdir ,DIRSEP_S ,"dirmngr_fetch_XXXXXX");
+  dirname = confucius_mktmpdir ();
+  if (!dirname)
+    {
+      err = gpg_error_from_syserror ();
+      goto leave;
+    }
 
-  if (!gnupg_mkdtemp (dirname))
+  filename = strconcat (dirname, DIRSEP_S, "file", NULL);
+  if (!filename)
     {
       err = gpg_error_from_syserror ();
       goto leave;
     }
 
-  snprintf (filename ,128 ,"%s%s%s" ,dirname ,DIRSEP_S ,"file");
   file = es_fopen (filename, "w+");
 
   if ((err = ks_http_fetch (ctrl, url, &strm)))
     goto leave;
 
-  while (!es_read (strm, buf, 1024, &len))
+  while (!es_read (strm, buf, sizeof buf, &len))
     {
       if (!len)
         break;
@@ -2452,6 +2484,7 @@ fetch_into_tmpdir(const char* url, ctrl_t ctrl, estream_t* strm_out, char** path
   es_rewind (file);
   es_fclose (strm);
   *strm_out = file;
+  err = 0;
 
   if (path)
     {
@@ -2460,8 +2493,8 @@ fetch_into_tmpdir(const char* url, ctrl_t ctrl, estream_t* strm_out, char** path
     }
 
 leave:
-  if (dirname)
-    xfree (dirname);
+  xfree (dirname);
+  xfree (filename);
   return err;
 }
 
@@ -2476,18 +2509,19 @@ static gpg_error_t
 cmd_versioncheck (assuan_context_t ctx, char *line)
 {
   gpg_error_t err;
-  char* strtok_internal = NULL;
-  char* name = strtok_r (line, " ", &strtok_internal);
-  char* version = strtok_r (NULL, " ", &strtok_internal);
-  ctrl_t ctrl = assuan_get_pointer (ctx);
+
+  char* name;
+  char* version;
+  size_t name_len;
+  char *cmd_fields[2];
+
+  ctrl_t ctrl;
   estream_t swdb;
   estream_t swdb_sig;
   char* swdb_dir = NULL;
   char* swdb_sig_dir = NULL;
   char* buf = NULL;
   size_t len = 0;
-  const size_t name_len = (name ? strlen (name) : 0);
-  const size_t version_len = (version ? strlen (version) : 0);
   const char *argv[8];
   char keyring_path[128];
   char swdb_path[128];
@@ -2495,29 +2529,33 @@ cmd_versioncheck (assuan_context_t ctx, char *line)
 
   swdb_path[0] = 0;
   swdb_sig_path[0] = 0;
+  ctrl = assuan_get_pointer (ctx);
 
-  if (!name || name_len == 0)
+  if (split_fields (line, &cmd_fields, 2) != 2)
     {
-      err = set_error (GPG_ERR_ASS_PARAMETER, "No program name given");
+      err = set_error (GPG_ERR_ASS_PARAMETER,
+                       "No program name and/or version given");
       goto out;
     }
 
-  if (!version || version_len == 0)
-    {
-      err = set_error (GPG_ERR_ASS_PARAMETER, "No program version given");
-      goto out;
-    }
+  name = cmd_fields[0];
+  name_len = strlen (name);
+  version = cmd_fields[1];
 
-  if ((err = fetch_into_tmpdir ("https://versions.gnupg.org/swdb.lst", ctrl, &swdb, &swdb_dir)))
+  if ((err = fetch_into_tmpdir (ctrl, "https://versions.gnupg.org/swdb.lst",
+                                &swdb, &swdb_dir)))
     goto out;
 
-  snprintf(swdb_path, 128, "%s%s%s", swdb_dir, DIRSEP_S, "file");
+  snprintf (swdb_path, sizeof swdb_path, "%s%s%s", swdb_dir, DIRSEP_S, "file");
 
-  if ((err = fetch_into_tmpdir ("https://versions.gnupg.org/swdb.lst.sig", ctrl, &swdb_sig, &swdb_sig_dir)))
+  if ((err = fetch_into_tmpdir (ctrl, "https://versions.gnupg.org/swdb.lst.sig",
+                                &swdb_sig, &swdb_sig_dir)))
     goto out;
 
-  snprintf(keyring_path, 128, "%s%s%s", gnupg_datadir (), DIRSEP_S, "distsigkey.gpg");
-  snprintf(swdb_sig_path, 128, "%s%s%s", swdb_sig_dir, DIRSEP_S, "file");
+  snprintf (keyring_path, sizeof keyring_path, "%s%s%s", gnupg_datadir (),
+           DIRSEP_S, "distsigkey.gpg");
+  snprintf (swdb_sig_path, sizeof swdb_sig_path, "%s%s%s", swdb_sig_dir,
+           DIRSEP_S, "file");
 
   argv[0] = "--batch";
   argv[1] = "--no-default-keyring";
@@ -2528,8 +2566,8 @@ cmd_versioncheck (assuan_context_t ctx, char *line)
   argv[6] = "-";
   argv[7] = NULL;
 
-  if ((err = gnupg_exec_tool_stream(gnupg_module_name (GNUPG_MODULE_NAME_GPG),
-                                    argv, swdb, NULL, NULL, NULL, NULL)))
+  if ((err = gnupg_exec_tool_stream (gnupg_module_name (GNUPG_MODULE_NAME_GPG),
+                                     argv, swdb, NULL, NULL, NULL, NULL)))
     goto out;
 
   es_fseek (swdb, 0, SEEK_SET);
@@ -2549,7 +2587,9 @@ cmd_versioncheck (assuan_context_t ctx, char *line)
 
           err = assuan_write_status (ctx, "LINE", buf);
 
-          cmp = cmp_version(this_ver_start,version);
+          err = cmp_version (this_ver_start, version, &cmp);
+          if (err > 0)
+            goto out;
 
           if (cmp < 0)
             err = assuan_send_data (ctx, "ROLLBACK", strlen ("ROLLBACK"));
@@ -2567,25 +2607,19 @@ cmd_versioncheck (assuan_context_t ctx, char *line)
   out:
   es_fclose (swdb);
   es_fclose (swdb_sig);
-
-  if (buf)
-    xfree(buf);
+  xfree (buf);
 
   if (strlen (swdb_path) > 0)
-    unlink(swdb_path);
+    unlink (swdb_path);
   if (swdb_dir)
-    {
-      rmdir(swdb_dir);
-      xfree(swdb_dir);
-    }
+    rmdir (swdb_dir);
+  xfree (swdb_dir);
 
   if (strlen (swdb_sig_path) > 0)
-    unlink(swdb_sig_path);
+    unlink (swdb_sig_path);
   if (swdb_sig_dir)
-    {
-      rmdir(swdb_sig_dir);
-      xfree(swdb_sig_dir);
-    }
+    rmdir (swdb_sig_dir);
+  xfree (swdb_sig_dir);
 
   return leave_cmd (ctx, err);
 }

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

Summary of changes:
 dirmngr/server.c | 232 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 133 insertions(+), 99 deletions(-)


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



From cvs at cvs.gnupg.org  Wed Oct 19 17:29:11 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Wed, 19 Oct 2016 17:29:11 +0200
Subject: [git] GpgOL - branch, nomapi, updated. gpgol-1.4.0-107-g256f026
Message-ID: <E1bwsnq-00088E-3D@lists.gnupg.org>

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 "GnuPG extension for MS Outlook".

The branch, nomapi has been updated
       via  256f0265bcf8b09e76ad7fcfe348083db26a0965 (commit)
       via  d089674c175e3342d44cad8cf6a1c5725b1af641 (commit)
       via  6665230511a34cdef88417f73b849c0d396f7309 (commit)
       via  906d853b7194413ac1ed40f351dc61a61d38dea3 (commit)
       via  50baf81a7eae15ca0d52d4dc4bfa2db70b39e1b7 (commit)
       via  ef3ce7817e907ee472ef93dba0a94f43e9cb81e8 (commit)
       via  9f9fa94c5d094a9f0e1f50df67db72971540ea87 (commit)
       via  2504182ba54075776645838354a91f07b1f5c585 (commit)
       via  c0ee14685f1f42c5c4e60bc616fc8f188cbd7ac6 (commit)
       via  1a962ea6f281eecf98b3bf1b410831ae7eb5d255 (commit)
       via  9f5274d8f75f27bcbc803ea606c4548d32144dcb (commit)
      from  cdf5d93e22ad19730a7bd31c3b751f8738b87bd4 (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 256f0265bcf8b09e76ad7fcfe348083db26a0965
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 19 17:28:30 2016 +0200

    Fix multipart S/MIME handling
    
    * src/parsecontroller.cpp (ParseController::parse): Use
    gpgme_data_identify to figure out if our data is smime.

diff --git a/src/parsecontroller.cpp b/src/parsecontroller.cpp
index 2e84876..104c3d4 100644
--- a/src/parsecontroller.cpp
+++ b/src/parsecontroller.cpp
@@ -93,29 +93,24 @@ ParseController::~ParseController()
 
 static void
 operation_for_type(msgtype_t type, bool *decrypt,
-                   bool *verify, Protocol *protocol)
+                   bool *verify)
 {
   *decrypt = false;
   *verify = false;
-  *protocol = Protocol::UnknownProtocol;
   switch (type)
     {
       case MSGTYPE_GPGOL_MULTIPART_ENCRYPTED:
       case MSGTYPE_GPGOL_PGP_MESSAGE:
         *decrypt = true;
-        *protocol = Protocol::OpenPGP;
         break;
       case MSGTYPE_GPGOL_MULTIPART_SIGNED:
       case MSGTYPE_GPGOL_CLEAR_SIGNED:
         *verify = true;
-        *protocol = Protocol::OpenPGP;
         break;
       case MSGTYPE_GPGOL_OPAQUE_SIGNED:
-        *protocol = Protocol::CMS;
         *verify = true;
         break;
       case MSGTYPE_GPGOL_OPAQUE_ENCRYPTED:
-        *protocol = Protocol::CMS;
         *decrypt = true;
         break;
       default:
@@ -125,12 +120,12 @@ operation_for_type(msgtype_t type, bool *decrypt,
 }
 
 static bool
-is_opaque_signed (Data &data)
+is_smime (Data &data)
 {
   data.seek (0, SEEK_SET);
   auto id = data.type();
   data.seek (0, SEEK_SET);
-  return id == Data::CMSSigned;
+  return id == Data::CMSSigned || id == Data::CMSEncrypted;
 }
 
 static std::string
@@ -196,7 +191,18 @@ ParseController::parse()
   // Wrap the input stream in an attachment / GpgME Data
   Protocol protocol;
   bool decrypt, verify;
-  operation_for_type (m_type, &decrypt, &verify, &protocol);
+  operation_for_type (m_type, &decrypt, &verify);
+
+  Data input (m_inputprovider);
+  if ((m_inputprovider->signature() && is_smime (*m_inputprovider->signature())) ||
+      is_smime (input))
+    {
+      protocol = Protocol::CMS;
+    }
+  else
+    {
+      protocol = Protocol::OpenPGP;
+    }
   auto ctx = Context::createForProtocol (protocol);
   if (!ctx)
     {
@@ -221,9 +227,7 @@ ParseController::parse()
     }
   ctx->setArmor(true);
 
-  Data output(m_outputprovider);
-
-  Data input (m_inputprovider);
+  Data output (m_outputprovider);
   log_debug ("%s:%s: decrypt: %i verify: %i with protocol: %s",
              SRCNAME, __func__,
              decrypt, verify,
@@ -235,10 +239,11 @@ ParseController::parse()
       auto combined_result = ctx->decryptAndVerify(input, output);
       m_decrypt_result = combined_result.first;
       m_verify_result = combined_result.second;
+
       if ((!m_decrypt_result.error () &&
           m_verify_result.signatures ().empty() &&
           m_outputprovider->signature ()) ||
-          is_opaque_signed (output))
+          is_smime (output))
         {
           /* There is a signature in the output. So we have
              to verify it now as an extra step. */

commit d089674c175e3342d44cad8cf6a1c5725b1af641
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 19 17:26:13 2016 +0200

    Fix some double free's in oomhelp
    
    * src/oomhelp.cpp (get_oom_object): Fix double free on
    error.
    (put_pa_string): Fix double frees.
    
    --
    VariantClear frees the contents of a variant, too. So
    don't free the data in the Variant twice.

diff --git a/src/oomhelp.cpp b/src/oomhelp.cpp
index cca297b..e232f03 100644
--- a/src/oomhelp.cpp
+++ b/src/oomhelp.cpp
@@ -313,8 +313,6 @@ get_oom_object (LPDISPATCH pStart, const char *fullname)
                      (unsigned int)argErr);
           dump_excepinfo (execpinfo);
           VariantClear (&vtResult);
-          if (parmstr)
-            SysFreeString (parmstr);
           gpgol_release (pDisp);
           return NULL;  /* Invoke failed.  */
         }
@@ -857,10 +855,12 @@ put_pa_string (LPDISPATCH pDisp, const char *dasl_id, const char *value)
   /* Variant 0 carries the data. */
   wchar_t *w_value = utf8_to_wchar (value);
   BSTR b_value = SysAllocString(w_value);
+  VariantInit (&cVariant[0]);
   cVariant[0].vt = VT_BSTR;
   cVariant[0].bstrVal = b_value;
 
   /* Variant 1 is the DASL as found out by experiments. */
+  VariantInit (&cVariant[1]);
   cVariant[1].vt = VT_BSTR;
   cVariant[1].bstrVal = b_property;
   dispparams.rgvarg = cVariant;
@@ -871,9 +871,8 @@ put_pa_string (LPDISPATCH pDisp, const char *dasl_id, const char *value)
   hr = propertyAccessor->Invoke (dispid, IID_NULL, LOCALE_SYSTEM_DEFAULT,
                                  DISPATCH_METHOD, &dispparams,
                                  &rVariant, &execpinfo, &argErr);
-  SysFreeString (b_property);
-  SysFreeString (b_value);
   VariantClear (&cVariant[0]);
+  VariantClear (&cVariant[1]);
   gpgol_release (propertyAccessor);
   if (hr != S_OK)
     {
@@ -882,10 +881,11 @@ put_pa_string (LPDISPATCH pDisp, const char *dasl_id, const char *value)
                  SRCNAME, __func__,
                  rVariant.pdispVal, rVariant.vt, (unsigned int)hr,
                  (unsigned int)argErr);
-      dump_excepinfo (execpinfo);
       VariantClear (&rVariant);
+      dump_excepinfo (execpinfo);
       return -1;
     }
+  VariantClear (&rVariant);
   return 0;
 }
 

commit 6665230511a34cdef88417f73b849c0d396f7309
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 19 17:22:04 2016 +0200

    Simplify / fix S/MIME data collection.
    
    * src/mimedataprovider.cpp: Copy everything if expect
    no headers is true.
    * src/parsecontroller.cpp (expect_no_headers): Only expect
    headers for multipart signed.
    
    --
    Besides multipart signed outlook only puts the crypto part in
    the attachment that we treat as MOSS attachment. So we don't
    see any headers and parsing this as text can lead to problems
    for smime where the content is binary.

diff --git a/src/mimedataprovider.cpp b/src/mimedataprovider.cpp
index 44944bd..9e27844 100644
--- a/src/mimedataprovider.cpp
+++ b/src/mimedataprovider.cpp
@@ -60,7 +60,6 @@ struct mime_context
   rfc822parse_t msg;  /* The handle of the RFC822 parser. */
 
   int verify_mode;    /* True if we want to verify a signature. */
-  int no_mail_header; /* True if we want to bypass all MIME parsing.  */
 
   int nesting_level;  /* Current MIME nesting level. */
   int in_data;        /* We are currently in data (body or attachment). */
@@ -403,40 +402,6 @@ message_cb (void *opaque, rfc822parse_event_t event,
   mime_context_t ctx = provider->mime_context();
 
   debug_message_event (event);
-  if (ctx->no_mail_header)
-    {
-      if (event == RFC822PARSE_OPEN)
-        {
-          /* We ignore the open event */
-          return 0;
-        }
-      /* Assume that this is not a regular mail but plain text. */
-      if (!ctx->body_seen)
-        {
-          log_mime_parser ("%s:%s: assuming this is plain text without headers\n",
-                           SRCNAME, __func__);
-          ctx->start_hashing = 1;
-          ctx->collect_crypto_data = 1;
-          /* Create a fake MIME structure.  */
-          /* Fixme: We might want to take it from the enclosing message.  */
-          {
-            const char ctmain[] = "text";
-            const char ctsub[] = "plain";
-            mimestruct_item_t ms;
-
-            ms = (mimestruct_item_t) xmalloc (sizeof *ms + strlen (ctmain) + 1 + strlen (ctsub));
-            ctx->mimestruct_cur = ms;
-            *ctx->mimestruct_tail = ms;
-            ctx->mimestruct_tail = &ms->next;
-            ms->next = NULL;
-            strcpy (stpcpy (stpcpy (ms->content_type, ctmain), "/"), ctsub);
-            ms->level = 0;
-            ms->filename = NULL;
-            ms->charset = NULL;
-          }
-        }
-      return 0;
-    }
 
   if (event == RFC822PARSE_BEGIN_HEADER || event == RFC822PARSE_T2BODY)
     {
@@ -499,15 +464,12 @@ message_cb (void *opaque, rfc822parse_event_t event,
 
 MimeDataProvider::MimeDataProvider(bool no_headers) :
   m_signature(nullptr),
-  m_has_html_body(false)
+  m_has_html_body(false),
+  m_collect_everything(no_headers)
 {
   m_mime_ctx = (mime_context_t) xcalloc (1, sizeof *m_mime_ctx);
   m_mime_ctx->msg = rfc822parse_open (message_cb, this);
   m_mime_ctx->mimestruct_tail = &m_mime_ctx->mimestruct;
-  if (no_headers)
-    {
-      m_mime_ctx->no_mail_header = 1;
-    }
 }
 
 #ifdef HAVE_W32_SYSTEM
@@ -781,6 +743,16 @@ MimeDataProvider::collect_data(LPSTREAM stream)
       log_mime_parser ("%s:%s: Read %lu bytes.",
                        SRCNAME, __func__, bRead);
 
+      if (m_collect_everything)
+        {
+          /* For S/MIME, Clearsigned, PGP MESSAGES we just pass everything
+             on. Only the Multipart classes need parsing. And the output
+             of course. */
+          log_mime_parser ("%s:%s: Just copying data.",
+                           SRCNAME, __func__);
+          m_crypto_data.write ((void*)buf, (size_t) bRead);
+          continue;
+        }
       m_rawbuf += std::string (buf, bRead);
       size_t not_taken = collect_input_lines (m_rawbuf.c_str(),
                                               m_rawbuf.size());
@@ -813,6 +785,16 @@ MimeDataProvider::collect_data(FILE *stream)
       log_mime_parser ("%s:%s: Read " SIZE_T_FORMAT " bytes.",
                        SRCNAME, __func__, bRead);
 
+      if (m_collect_everything)
+        {
+          /* For S/MIME, Clearsigned, PGP MESSAGES we just pass everything
+             on. Only the Multipart classes need parsing. And the output
+             of course. */
+          log_mime_parser ("%s:%s: Making verbatim copy" SIZE_T_FORMAT " bytes.",
+                           SRCNAME, __func__, bRead);
+          m_crypto_data.write ((void*)buf, bRead);
+          continue;
+        }
       m_rawbuf += std::string (buf, bRead);
       size_t not_taken = collect_input_lines (m_rawbuf.c_str(),
                                               m_rawbuf.size());
diff --git a/src/mimedataprovider.h b/src/mimedataprovider.h
index 85d1127..83961ff 100644
--- a/src/mimedataprovider.h
+++ b/src/mimedataprovider.h
@@ -148,5 +148,7 @@ private:
   std::string m_body_charset;
   /* Do we have html at all */
   bool m_has_html_body;
+  /* Collect everything */
+  bool m_collect_everything;
 };
 #endif // MIMEDATAPROVIDER_H
diff --git a/src/parsecontroller.cpp b/src/parsecontroller.cpp
index 8a69550..2e84876 100644
--- a/src/parsecontroller.cpp
+++ b/src/parsecontroller.cpp
@@ -59,9 +59,7 @@ using namespace GpgME;
 static bool
 expect_no_headers (msgtype_t type)
 {
-  return type != MSGTYPE_GPGOL_MULTIPART_SIGNED &&
-         type != MSGTYPE_GPGOL_OPAQUE_SIGNED &&
-         type != MSGTYPE_GPGOL_OPAQUE_ENCRYPTED;
+  return type != MSGTYPE_GPGOL_MULTIPART_SIGNED;
 }
 
 #ifdef HAVE_W32_SYSTEM

commit 906d853b7194413ac1ed40f351dc61a61d38dea3
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 19 17:20:39 2016 +0200

    Fix ignoring S/MIME if S/MIME disabled
    
    * src/mail.cpp (Mail::decrypt_verify): Ignore MSGTYPE_SMIME
    * src/mapihelp.cpp (mapi_change_message_class): Also ignore
    multipartsigned.

diff --git a/src/mail.cpp b/src/mail.cpp
index a4b5fd0..1465836 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -480,7 +480,8 @@ do_parsing (LPVOID arg)
 int
 Mail::decrypt_verify()
 {
-  if (m_type == MSGTYPE_UNKNOWN || m_type == MSGTYPE_GPGOL)
+  if (m_type == MSGTYPE_UNKNOWN || m_type == MSGTYPE_GPGOL ||
+      m_type == MSGTYPE_SMIME)
     {
       /* Not a message for us. */
       return 0;
diff --git a/src/mapihelp.cpp b/src/mapihelp.cpp
index 9c25abc..61768f2 100644
--- a/src/mapihelp.cpp
+++ b/src/mapihelp.cpp
@@ -1242,7 +1242,8 @@ mapi_change_message_class (LPMESSAGE message, int sync_override)
           newvalue = (char*)xmalloc (strlen (s) + 1);
           strcpy (stpcpy (newvalue, "IPM.Note.GpgOL"), s+14);
         }
-      else if (!strcmp (s, "IPM.Note.SMIME.MultipartSigned"))
+      else if (opt.enable_smime &&
+               !strcmp (s, "IPM.Note.SMIME.MultipartSigned"))
         {
           /* This is an S/MIME message class but smime support is not
              enabled.  We need to check whether this is actually a

commit 50baf81a7eae15ca0d52d4dc4bfa2db70b39e1b7
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 19 17:19:25 2016 +0200

    tests: Check if file was opened before parsing.
    
    * tests/run-parser.cpp (main): Check fp_in.

diff --git a/tests/run-parser.cpp b/tests/run-parser.cpp
index 286bd51..49c9226 100644
--- a/tests/run-parser.cpp
+++ b/tests/run-parser.cpp
@@ -104,6 +104,7 @@ int main(int argc, char **argv)
 
   fp_in = fopen (argv[0], "rb");
 
+  if (fp_in)
     {
       ParseController parser(fp_in, msgtype);
       parser.parse();
@@ -116,6 +117,10 @@ int main(int argc, char **argv)
         {
           std::cout << "Attachment: " << attach->get_display_name();
         }
+      fclose (fp_in);
+    }
+  else
+    {
+      std::cout << "failed to open input: " << argv[0];
     }
-  fclose (fp_in);
 }

commit ef3ce7817e907ee472ef93dba0a94f43e9cb81e8
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 19 17:18:47 2016 +0200

    Remove categories on revert
    
    * src/mail.cpp (Mail::remove_categories): New.
    * src/mail.h: Update accordingly.
    * src/revert.cpp: Use it.

diff --git a/src/mail.cpp b/src/mail.cpp
index 9749419..a4b5fd0 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -1027,6 +1027,15 @@ Mail::is_valid_sig ()
 }
 
 void
+Mail::remove_categories ()
+{
+  const char *decCategory = _("GpgOL: Encrypted Message");
+  const char *verifyCategory = _("GpgOL: Verified Sender");
+  remove_category (m_mailitem, decCategory);
+  remove_category (m_mailitem, verifyCategory);
+}
+
+void
 Mail::update_categories ()
 {
   const char *decCategory = _("GpgOL: Encrypted Message");
diff --git a/src/mail.h b/src/mail.h
index 9b8527a..83c10ab 100644
--- a/src/mail.h
+++ b/src/mail.h
@@ -240,6 +240,9 @@ public:
       if it is not signed. */
   const char *get_sig_fpr() const;
 
+  /** Remove all categories of this mail */
+  void remove_categories ();
+
 private:
   void update_categories ();
   void update_body ();
diff --git a/src/revert.cpp b/src/revert.cpp
index 7573e30..719fdfb 100644
--- a/src/revert.cpp
+++ b/src/revert.cpp
@@ -559,6 +559,11 @@ gpgol_mailitem_revert (LPDISPATCH mailitem)
               goto done;
             }
         }
+      else if (is_smime && !opt.enable_smime)
+        {
+          /* SMIME is disabled remove our categories. */
+          mail->remove_categories ();
+        }
     }
 
   result = 0;

commit 9f9fa94c5d094a9f0e1f50df67db72971540ea87
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 19 17:16:37 2016 +0200

    Fix crash if not attachments found
    
    * src/mail.cpp (get_attachment_stream): Add safeguards.
    
    --
    Should never happen bug just happened due to a bug.

diff --git a/src/mail.cpp b/src/mail.cpp
index 0f6e20b..9749419 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -256,6 +256,12 @@ get_attachment (LPDISPATCH mailitem, int pos)
 static LPSTREAM
 get_attachment_stream (LPDISPATCH mailitem, int pos)
 {
+  if (!pos)
+    {
+      log_debug ("%s:%s: Called with zero pos.",
+                 SRCNAME, __func__);
+      return NULL;
+    }
   LPDISPATCH attachment = get_attachment (mailitem, pos);
   LPATTACH mapi_attachment = NULL;
   LPSTREAM stream = NULL;
@@ -267,6 +273,7 @@ get_attachment_stream (LPDISPATCH mailitem, int pos)
     {
       log_debug ("%s:%s: Failed to get MapiObject of attachment: %p",
                  SRCNAME, __func__, attachment);
+      return NULL;
     }
   if (FAILED (mapi_attachment->OpenProperty (PR_ATTACH_DATA_BIN, &IID_IStream,
                                              0, MAPI_MODIFY, (LPUNKNOWN*) &stream)))

commit 2504182ba54075776645838354a91f07b1f5c585
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 19 17:14:57 2016 +0200

    Update messagelist forms icons
    
    * forms/gpgol-cs.cfg, gpgol-ms.cfg, gpgol.cfg: Remove locale.
    * forms/encr-s.ico, forms/sign-s.ico: New.

diff --git a/forms/encr-s.ico b/forms/encr-s.ico
index feb6bfc..b143440 100755
Binary files a/forms/encr-s.ico and b/forms/encr-s.ico differ
diff --git a/forms/gpgol-cs.cfg b/forms/gpgol-cs.cfg
index 8a8a351..11d7471 100644
--- a/forms/gpgol-cs.cfg
+++ b/forms/gpgol-cs.cfg
@@ -10,7 +10,6 @@ LargeIcon=sign-l.ico
 SmallIcon=sign-s.ico
 VersionMajor=1
 VersionMinor=0
-Locale=eng
 Hidden=1
 Owner=Public Domain
 
diff --git a/forms/gpgol-ms.cfg b/forms/gpgol-ms.cfg
index 329be32..10b47c5 100644
--- a/forms/gpgol-ms.cfg
+++ b/forms/gpgol-ms.cfg
@@ -10,7 +10,6 @@ LargeIcon=sign-l.ico
 SmallIcon=sign-s.ico
 VersionMajor=1
 VersionMinor=0
-Locale=eng
 Hidden=1
 Owner=Public Domain
 
diff --git a/forms/gpgol.cfg b/forms/gpgol.cfg
index 13b69e0..08a72f7 100644
--- a/forms/gpgol.cfg
+++ b/forms/gpgol.cfg
@@ -10,7 +10,6 @@ LargeIcon=encr-l.ico
 SmallIcon=encr-s.ico
 VersionMajor=1
 VersionMinor=0
-Locale=eng
 Hidden=1
 Owner=Public Domain
 
diff --git a/forms/sign-s.ico b/forms/sign-s.ico
index 77aebcc..079a02f 100755
Binary files a/forms/sign-s.ico and b/forms/sign-s.ico differ

commit c0ee14685f1f42c5c4e60bc616fc8f188cbd7ac6
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 19 11:52:16 2016 +0200

    Move init code behind check for application
    
    * src/gpgoladdin.cpp (GpgolAddin::OnStartupComplete):
    Move init code together.

diff --git a/src/gpgoladdin.cpp b/src/gpgoladdin.cpp
index 0b36f87..6ea357f 100644
--- a/src/gpgoladdin.cpp
+++ b/src/gpgoladdin.cpp
@@ -323,29 +323,27 @@ GpgolAddin::OnStartupComplete (SAFEARRAY** custom)
   (void)custom;
   TRACEPOINT;
 
-  install_forms ();
-
   if (!create_responder_window())
     {
       log_error ("%s:%s: Failed to create the responder window;",
                  SRCNAME, __func__);
     }
 
+  if (!m_application)
+    {
+      /* Should not happen as OnConnection should be called before */
+      log_error ("%s:%s: no application set;",
+                 SRCNAME, __func__);
+      return E_NOINTERFACE;
+    }
   /* Set up categories */
   const char *decCategory = _("GpgOL: Encrypted Message");
   const char *verifyCategory = _("GpgOL: Verified Sender");
   ensure_category_exists (m_application, decCategory, 8);
   ensure_category_exists (m_application, verifyCategory, 5);
-
-  if (m_application)
-    {
-      m_applicationEventSink = install_ApplicationEvents_sink(m_application);
-      return S_OK;
-    }
-  /* Should not happen as OnConnection should be called before */
-  log_error ("%s:%s: no application set;",
-             SRCNAME, __func__);
-  return E_NOINTERFACE;
+  install_forms ();
+  m_applicationEventSink = install_ApplicationEvents_sink(m_application);
+  return S_OK;
 }
 
 STDMETHODIMP

commit 1a962ea6f281eecf98b3bf1b410831ae7eb5d255
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 19 11:49:50 2016 +0200

    Declare MAPIFormContainer
    
    * src/mymapi.h: Add stub declaration for mapiformcontainer.
    
    --
    Most functions don't have their correct params I only added
    the one I tried to use.

diff --git a/src/mymapi.h b/src/mymapi.h
index c9c2751..7b84d6c 100644
--- a/src/mymapi.h
+++ b/src/mymapi.h
@@ -1200,7 +1200,38 @@ DECLARE_INTERFACE_(IMAPISecureMessage, IUnknown)
 };
 
 STDAPI MAPIOpenLocalFormContainer (LPMAPIFORMCONTAINER FAR *ppfcnt);
+/* IMAPIFormContainer*/
+struct MAPIFormMgr;
+typedef struct MAPIFormMgr *LPMAPIFORMMGR;
 
+typedef ULONG HFRMREG;
+#define HFRMREG_DEFAULT  0
+#define HFRMREG_LOCAL    1
+#define HFRMREG_PERSONAL 2
+#define HFRMREG_FOLDER   3
+
+#undef INTERFACE
+#define INTERFACE MAPIFormMgr
+
+DECLARE_INTERFACE_(MAPIFormMgr, IUnknown)
+{
+  DECLARE_IUNKNOWN_METHODS;
+
+  STDMETHOD(LoadForm)(void) PURE;
+  STDMETHOD(ResolveMessageClass)(void) PURE;
+  STDMETHOD(ResolveMultipleMessageClasses)(void) PURE;
+  STDMETHOD(CalcFormPropSet)(void) PURE;
+  STDMETHOD(CreateForm)(void) PURE;
+  STDMETHOD(SelectForm)(void) PURE;
+  STDMETHOD(SelectMultipleForms)(void) PURE;
+  STDMETHOD(SelectFormContainer)(void) PURE;
+  STDMETHOD(OpenFormContainer)(HFRMREG, LPUNKNOWN, LPMAPIFORMCONTAINER FAR *) PURE;
+  STDMETHOD(PrepareForm)(void) PURE;
+  STDMETHOD(IsInConflict)(void) PURE;
+  STDMETHOD(GetLastError)(void) PURE;
+};
+
+STDAPI MAPIOpenFormMgr (LPMAPISESSION, LPMAPIFORMMGR FAR *);
 
 #ifdef __cplusplus
 }

commit 9f5274d8f75f27bcbc803ea606c4548d32144dcb
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 19 11:47:29 2016 +0200

    Remove localized forms
    
    * forms/Makefile.am: Update accordingly.
    * forms/gpgol-cs_en.cfg,
    forms/gpgol-cs_de.cfg,
    forms/gpgol-ms_en.cfg,
    forms/gpgol-ms_de.cfg,
    forms/gpgol_en.cfg,
    forms/gpgol_de.cfg: Removed.
    *forms/gpgol-cs.cfg,
    forms/gpgol-ms.cfg,
    forms/gpgol.cfg: New.
    
    * src/olflange.cpp: Use generic forms.
    
    --
    The contents were not localized anyway and we only use the
    forms for the icon.

diff --git a/forms/Makefile.am b/forms/Makefile.am
index 564c604..993455d 100644
--- a/forms/Makefile.am
+++ b/forms/Makefile.am
@@ -13,11 +13,6 @@
 
 icons = encr-l.ico encr-s.ico sign-l.ico sign-s.ico
 
-cfg_german  = gpgol_de.cfg gpgol-ms_de.cfg gpgol-cs_de.cfg 
-cfg_english = gpgol_en.cfg gpgol-ms_en.cfg gpgol-cs_en.cfg 
-
-dist_pkgdata_DATA = $(icons) $(cfg_german) $(cfg_english)
-
-
-
+cfg = gpgol.cfg gpgol-ms.cfg gpgol-cs.cfg
 
+dist_pkgdata_DATA = $(icons) $(cfg)
diff --git a/forms/gpgol-cs_en.cfg b/forms/gpgol-cs.cfg
similarity index 100%
rename from forms/gpgol-cs_en.cfg
rename to forms/gpgol-cs.cfg
diff --git a/forms/gpgol-cs_de.cfg b/forms/gpgol-cs_de.cfg
deleted file mode 100644
index e5c541e..0000000
--- a/forms/gpgol-cs_de.cfg
+++ /dev/null
@@ -1,35 +0,0 @@
-[Description]
-MessageClass=IPM.Note.GpgOL.ClearSigned
-DesignerRuntimeGuid={0006F020-0000-0000-C000-000000000046}
-CLSID={00061033-0000-0000-C000-000000000046}
-DisplayName=Form for class IPM.Note.GpgOL.MultipartSigned
-Category=Standard
-Subcategory=Formular
-Comment=
-LargeIcon=sign-l.ico
-SmallIcon=sign-s.ico
-VersionMajor=1
-VersionMinor=0
-Locale=deu
-Hidden=1
-Owner=Public Domain
-
-[Properties]
-
-[Verbs]
-Verb1=1
-
-[Verb.1]
-DisplayName=?&ffnen
-Code=0
-Flags=0
-Attribs=2
-
-[Extensions]
-Extensions1=1
-
-[Extension.1]
-Type=30
-NmidPropset={00020D0C-0000-0000-C000-000000000046}
-NmidInteger=1
-Value=1011111111111111
diff --git a/forms/gpgol-ms_en.cfg b/forms/gpgol-ms.cfg
similarity index 100%
rename from forms/gpgol-ms_en.cfg
rename to forms/gpgol-ms.cfg
diff --git a/forms/gpgol-ms_de.cfg b/forms/gpgol-ms_de.cfg
deleted file mode 100644
index 141d8c4..0000000
--- a/forms/gpgol-ms_de.cfg
+++ /dev/null
@@ -1,35 +0,0 @@
-[Description]
-MessageClass=IPM.Note.GpgOL.MultipartSigned
-DesignerRuntimeGuid={0006F020-0000-0000-C000-000000000046}
-CLSID={00061033-0000-0000-C000-000000000046}
-DisplayName=Form for class IPM.Note.GpgOL.MultipartSigned
-Category=Standard
-Subcategory=Formular
-Comment=
-LargeIcon=sign-l.ico
-SmallIcon=sign-s.ico
-VersionMajor=1
-VersionMinor=0
-Locale=deu
-Hidden=1
-Owner=Public Domain
-
-[Properties]
-
-[Verbs]
-Verb1=1
-
-[Verb.1]
-DisplayName=?&ffnen
-Code=0
-Flags=0
-Attribs=2
-
-[Extensions]
-Extensions1=1
-
-[Extension.1]
-Type=30
-NmidPropset={00020D0C-0000-0000-C000-000000000046}
-NmidInteger=1
-Value=1011111111111111
diff --git a/forms/gpgol_en.cfg b/forms/gpgol.cfg
similarity index 99%
rename from forms/gpgol_en.cfg
rename to forms/gpgol.cfg
index 823dca4..13b69e0 100644
--- a/forms/gpgol_en.cfg
+++ b/forms/gpgol.cfg
@@ -33,4 +33,3 @@ Type=30
 NmidPropset={00020D0C-0000-0000-C000-000000000046}
 NmidInteger=1
 Value=1011111111111111
-
diff --git a/forms/gpgol_de.cfg b/forms/gpgol_de.cfg
deleted file mode 100644
index d4be76c..0000000
--- a/forms/gpgol_de.cfg
+++ /dev/null
@@ -1,36 +0,0 @@
-[Description]
-MessageClass=IPM.Note.GpgOL
-DesignerRuntimeGuid={0006F020-0000-0000-C000-000000000046}
-CLSID={00061033-0000-0000-C000-000000000046}
-DisplayName=Form for class IPM.Note.GpgOL
-Category=Standard
-Subcategory=Formular
-Comment=
-LargeIcon=encr-l.ico
-SmallIcon=encr-s.ico
-VersionMajor=1
-VersionMinor=0
-Locale=deu
-Hidden=1
-Owner=Public Domain
-
-[Properties]
-
-[Verbs]
-Verb1=1
-
-[Verb.1]
-DisplayName=?&ffnen
-Code=0
-Flags=0
-Attribs=2
-
-[Extensions]
-Extensions1=1
-
-[Extension.1]
-Type=30
-NmidPropset={00020D0C-0000-0000-C000-000000000046}
-NmidInteger=1
-Value=1011111111111111
-
diff --git a/src/olflange.cpp b/src/olflange.cpp
index 1020da0..66b5b68 100644
--- a/src/olflange.cpp
+++ b/src/olflange.cpp
@@ -798,26 +798,10 @@ install_forms (void)
       NULL,
     };
   int formidx;
-  LANGID langid;
-  const char *langsuffix;
   char buffer[MAX_PATH+10];
   char *datadir;
   int any_error = 0;
 
-  langid = PRIMARYLANGID (LANGIDFROMLCID (GetThreadLocale ()));
-  switch (langid)
-    {
-    case LANG_ENGLISH: langsuffix = "en"; break;
-    case LANG_GERMAN:  langsuffix = "de"; break;
-    default:
-      log_debug ("%s:%s: No forms available for primary language %d\n",
-                 SRCNAME, __func__, (int)langid);
-      /* Don't try again.  */
-      opt.forms_revision = GPGOL_FORMS_REVISION;
-      write_options ();
-      return;
-    }
-
   MAPIOpenLocalFormContainer (&formcontainer);
   if (!formcontainer)
     {
@@ -831,26 +815,31 @@ install_forms (void)
     {
       log_error ("%s:%s: error getting data directory\n",
                  SRCNAME, __func__);
+      gpgol_release (formcontainer);
       return;
     }
 
   for (formidx=0; forms[formidx]; formidx++)
     {
 
-      snprintf (buffer, MAX_PATH, "%s\\%s_%s.cfg",
-                datadir, forms[formidx], langsuffix);
+      snprintf (buffer, MAX_PATH, "%s\\%s.cfg",
+                datadir, forms[formidx]);
       hr = formcontainer->InstallForm (0, MAPIFORM_INSTALL_OVERWRITEONCONFLICT,
                                        buffer);
       if (hr)
         {
           any_error = 1;
-          log_error ("%s:%s: installing form `%s' failed: hr=%#lx\n",
-                     SRCNAME, __func__, buffer, hr);
+          LPMAPIERROR err;
+          formcontainer->GetLastError (hr, 0, &err);
+          log_error ("%s:%s: installing form `%s' failed: hr=%#lx err=%s\n",
+                     SRCNAME, __func__, buffer, hr, err ? err->lpszError : "null");
+          MAPIFreeBuffer (err);
         }
       else
         log_debug ("%s:%s: form `%s' installed\n",  SRCNAME, __func__, buffer);
     }
 
+  gpgol_release (formcontainer);
   xfree (datadir);
 
   if (!any_error)

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

Summary of changes:
 forms/Makefile.am                       |   9 ++---
 forms/encr-s.ico                        | Bin 2238 -> 2238 bytes
 forms/{gpgol-cs_en.cfg => gpgol-cs.cfg} |   1 -
 forms/gpgol-cs_de.cfg                   |  35 ------------------
 forms/{gpgol-ms_en.cfg => gpgol-ms.cfg} |   1 -
 forms/gpgol-ms_de.cfg                   |  35 ------------------
 forms/{gpgol_en.cfg => gpgol.cfg}       |   2 --
 forms/gpgol_de.cfg                      |  36 -------------------
 forms/sign-s.ico                        | Bin 2238 -> 2238 bytes
 src/gpgoladdin.cpp                      |  22 ++++++------
 src/mail.cpp                            |  19 +++++++++-
 src/mail.h                              |   3 ++
 src/mapihelp.cpp                        |   3 +-
 src/mimedataprovider.cpp                |  62 ++++++++++++--------------------
 src/mimedataprovider.h                  |   2 ++
 src/mymapi.h                            |  31 ++++++++++++++++
 src/olflange.cpp                        |  29 +++++----------
 src/oomhelp.cpp                         |  10 +++---
 src/parsecontroller.cpp                 |  35 +++++++++---------
 src/revert.cpp                          |   5 +++
 tests/run-parser.cpp                    |   7 +++-
 21 files changed, 134 insertions(+), 213 deletions(-)
 rename forms/{gpgol-cs_en.cfg => gpgol-cs.cfg} (98%)
 delete mode 100644 forms/gpgol-cs_de.cfg
 rename forms/{gpgol-ms_en.cfg => gpgol-ms.cfg} (98%)
 delete mode 100644 forms/gpgol-ms_de.cfg
 rename forms/{gpgol_en.cfg => gpgol.cfg} (97%)
 delete mode 100644 forms/gpgol_de.cfg


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org



From cvs at cvs.gnupg.org  Wed Oct 19 17:40:10 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Wed, 19 Oct 2016 17:40:10 +0200
Subject: [git] GpgOL - branch, nomapi, updated. gpgol-1.4.0-108-ged7b79f
Message-ID: <E1bwsyS-0000Fs-Fy@lists.gnupg.org>

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 "GnuPG extension for MS Outlook".

The branch, nomapi has been updated
       via  ed7b79ff86d7c0a3cc1ecac2fc304fe098f29cfb (commit)
      from  256f0265bcf8b09e76ad7fcfe348083db26a0965 (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 ed7b79ff86d7c0a3cc1ecac2fc304fe098f29cfb
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 19 17:37:40 2016 +0200

    Add gimp variants of the new form icons
    
    * forms/encr-s.xcf, forms/ribbon.xcf: Add gimp variants.
    
    --
    Gimp instead of SVG as conversion from SVG to 8bit 1 alpha bit
    images needs some manual work.

diff --git a/forms/Makefile.am b/forms/Makefile.am
index 993455d..e51c006 100644
--- a/forms/Makefile.am
+++ b/forms/Makefile.am
@@ -16,3 +16,5 @@ icons = encr-l.ico encr-s.ico sign-l.ico sign-s.ico
 cfg = gpgol.cfg gpgol-ms.cfg gpgol-cs.cfg
 
 dist_pkgdata_DATA = $(icons) $(cfg)
+
+EXTRA_DIST=encr-s.xcf ribbon.xcf
diff --git a/forms/encr-s.xcf b/forms/encr-s.xcf
new file mode 100644
index 0000000..3d10ecc
Binary files /dev/null and b/forms/encr-s.xcf differ
diff --git a/forms/ribbon.xcf b/forms/ribbon.xcf
new file mode 100644
index 0000000..dbb6782
Binary files /dev/null and b/forms/ribbon.xcf differ

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

Summary of changes:
 forms/Makefile.am |   2 ++
 forms/encr-s.xcf  | Bin 0 -> 1588 bytes
 forms/ribbon.xcf  | Bin 0 -> 1488 bytes
 3 files changed, 2 insertions(+)
 create mode 100644 forms/encr-s.xcf
 create mode 100644 forms/ribbon.xcf


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org



From cvs at cvs.gnupg.org  Thu Oct 20 06:43:37 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Thu, 20 Oct 2016 06:43:37 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-248-g980c037
Message-ID: <E1bx5Ce-0005JX-Hn@lists.gnupg.org>

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  980c037bedb968ddf155dd334c0a70b918a17759 (commit)
       via  82cbab906a3e72a98fdc16096f2f0451465969a2 (commit)
      from  72a99f582dad4cb4c3b05b97c7ebb8d537f10b79 (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 980c037bedb968ddf155dd334c0a70b918a17759
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Oct 20 13:30:47 2016 +0900

    g10: smartcard keygen change.
    
    * g10/call-agent.c (scd_genkey_cb_append_savedbytes): Remove.
    (scd_genkey_cb): Only handle KEY-CREATED-AT and PROGRESS.
    (agent_scd_genkey): Remove INFO argument.  CREATETIME is now in/out
    argument.
    (agent_readkey): Use READKEY --card instead of SCD READKEY.
    * g10/keygen.c (gen_card_key): Use READKEY --card command of the agent
    to retrieve public key information from card and let the agent make
    a file for private key with shadow info.
    --
    
    This change removes gpg's KEY-DATA handling for SCD GENKEY.  Information
    with KEY-DATA is simply not used.  Instead, it is read by READKEY --card
    command of gpg-agent.  This can consolidate public key handling in a
    single method by READKEY.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/g10/call-agent.c b/g10/call-agent.c
index 0fb392c..632cabe 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -103,13 +103,6 @@ struct cache_nonce_parm_s
 };
 
 
-struct scd_genkey_parm_s
-{
-  struct agent_card_genkey_s *cgk;
-  char *savedbytes;     /* Malloced space to save key parameter chunks.  */
-};
-
-
 static gpg_error_t learn_status_cb (void *opaque, const char *line);
 
 
@@ -979,133 +972,50 @@ agent_scd_writekey (int keyno, const char *serialno,
 
 
 

-static gpg_error_t
-scd_genkey_cb_append_savedbytes (struct scd_genkey_parm_s *parm,
-                                 const char *line)
-{
-  gpg_error_t err = 0;
-  char *p;
-
-  if (!parm->savedbytes)
-    {
-      parm->savedbytes = xtrystrdup (line);
-      if (!parm->savedbytes)
-        err = gpg_error_from_syserror ();
-    }
-  else
-    {
-      p = xtrymalloc (strlen (parm->savedbytes) + strlen (line) + 1);
-      if (!p)
-        err = gpg_error_from_syserror ();
-      else
-        {
-          strcpy (stpcpy (p, parm->savedbytes), line);
-          xfree (parm->savedbytes);
-          parm->savedbytes = p;
-        }
-    }
-
-  return err;
-}
-
 /* Status callback for the SCD GENKEY command. */
 static gpg_error_t
 scd_genkey_cb (void *opaque, const char *line)
 {
-  struct scd_genkey_parm_s *parm = opaque;
+  u32 *createtime = opaque;
   const char *keyword = line;
   int keywordlen;
-  gpg_error_t rc = 0;
 
   for (keywordlen=0; *line && !spacep (line); line++, keywordlen++)
     ;
   while (spacep (line))
     line++;
 
-  if (keywordlen == 7 && !memcmp (keyword, "KEY-FPR", keywordlen))
-    {
-      parm->cgk->fprvalid = unhexify_fpr (line, parm->cgk->fpr);
-    }
-  else if (keywordlen == 8 && !memcmp (keyword, "KEY-DATA", keywordlen))
-    {
-      gcry_mpi_t a;
-      const char *name = line;
-
-      while (*line && !spacep (line))
-        line++;
-      while (spacep (line))
-        line++;
-
-      if (*name == '-' && spacep (name+1))
-        rc = scd_genkey_cb_append_savedbytes (parm, line);
-      else
-        {
-          if (parm->savedbytes)
-            {
-              rc = scd_genkey_cb_append_savedbytes (parm, line);
-              if (!rc)
-                rc = gcry_mpi_scan (&a, GCRYMPI_FMT_HEX,
-                                    parm->savedbytes, 0, NULL);
-            }
-          else
-            rc = gcry_mpi_scan (&a, GCRYMPI_FMT_HEX, line, 0, NULL);
-          if (rc)
-            log_error ("error parsing received key data: %s\n",
-                       gpg_strerror (rc));
-          else if (*name == 'n' && spacep (name+1))
-            parm->cgk->n = a;
-          else if (*name == 'e' && spacep (name+1))
-            parm->cgk->e = a;
-          else
-            {
-              log_info ("unknown parameter name in received key data\n");
-              gcry_mpi_release (a);
-              rc = gpg_error (GPG_ERR_INV_PARAMETER);
-            }
-
-          xfree (parm->savedbytes);
-          parm->savedbytes = NULL;
-        }
-    }
-  else if (keywordlen == 14 && !memcmp (keyword,"KEY-CREATED-AT", keywordlen))
+ if (keywordlen == 14 && !memcmp (keyword,"KEY-CREATED-AT", keywordlen))
     {
-      parm->cgk->created_at = (u32)strtoul (line, NULL, 10);
+      *createtime = (u32)strtoul (line, NULL, 10);
     }
   else if (keywordlen == 8 && !memcmp (keyword, "PROGRESS", keywordlen))
     {
       write_status_text (STATUS_PROGRESS, line);
     }
 
-  return rc;
+  return 0;
 }
 
-/* Send a GENKEY command to the SCdaemon.  SERIALNO is not used in
-   this implementation.  If CREATEDATE is not 0, it will be passed to
-   SCDAEMON so that the key is created with this timestamp.  INFO will
-   receive information about the generated key.  */
+/* Send a GENKEY command to the SCdaemon.  If CREATETIME is not 0, it
+  will be passed to SCDAEMON so that the key is created with this
+  timestamp.  On success, creation time  is stored back to CREATETIME.  */
 int
-agent_scd_genkey (struct agent_card_genkey_s *info, int keyno, int force,
-                  const char *serialno, u32 createtime)
+agent_scd_genkey (int keyno, int force, u32 *createtime)
 {
   int rc;
   char line[ASSUAN_LINELENGTH];
   gnupg_isotime_t tbuf;
-  struct scd_genkey_parm_s parms;
   struct default_inq_parm_s dfltparm;
 
   memset (&dfltparm, 0, sizeof dfltparm);
 
-  (void)serialno;
-
-  memset (&parms, 0, sizeof parms);
-  parms.cgk = info;
-
   rc = start_agent (NULL, 1);
   if (rc)
     return rc;
 
-  if (createtime)
-    epoch2isotime (tbuf, createtime);
+  if (*createtime)
+    epoch2isotime (tbuf, *createtime);
   else
     *tbuf = 0;
 
@@ -1116,12 +1026,9 @@ agent_scd_genkey (struct agent_card_genkey_s *info, int keyno, int force,
   line[DIM(line)-1] = 0;
 
   dfltparm.ctx = agent_ctx;
-  memset (info, 0, sizeof *info);
   rc = assuan_transact (agent_ctx, line,
                         NULL, NULL, default_inq_cb, &dfltparm,
-                        scd_genkey_cb, &parms);
-
-  xfree (parms.savedbytes);
+                        scd_genkey_cb, createtime);
 
   status_sc_op_failure (rc);
   return rc;
@@ -1854,7 +1761,8 @@ agent_readkey (ctrl_t ctrl, int fromcard, const char *hexkeygrip,
   if (err)
     return err;
 
-  snprintf (line, DIM(line)-1, "%sREADKEY %s", fromcard? "SCD ":"", hexkeygrip);
+  snprintf (line, DIM(line)-1, "READKEY %s%s", fromcard? "--card ":"",
+            hexkeygrip);
 
   init_membuf (&data, 1024);
   err = assuan_transact (agent_ctx, line,
diff --git a/g10/call-agent.h b/g10/call-agent.h
index d85a6fd..032c345 100644
--- a/g10/call-agent.h
+++ b/g10/call-agent.h
@@ -68,13 +68,6 @@ struct agent_card_info_s
   unsigned int status_indicator;
 };
 
-struct agent_card_genkey_s {
-  char fprvalid;
-  char fpr[20];
-  u32  created_at;
-  gcry_mpi_t n;
-  gcry_mpi_t e;
-};
 
 
 /* Release the card info structure. */
@@ -107,8 +100,7 @@ int agent_scd_writekey (int keyno, const char *serialno,
                         const unsigned char *keydata, size_t keydatalen);
 
 /* Send a GENKEY command to the SCdaemon. */
-int agent_scd_genkey (struct agent_card_genkey_s *info, int keyno, int force,
-                      const char *serialno, u32 createtime);
+int agent_scd_genkey (int keyno, int force, u32 *createtime);
 
 /* Send a READKEY command to the SCdaemon. */
 int agent_scd_readcert (const char *certidstr,
diff --git a/g10/keygen.c b/g10/keygen.c
index 9cf314d..90f8544 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -4870,9 +4870,14 @@ gen_card_key (int algo, int keyno, int is_primary, kbnode_t pub_root,
 {
 #ifdef ENABLE_CARD_SUPPORT
   gpg_error_t err;
-  struct agent_card_genkey_s info;
   PACKET *pkt;
   PKT_public_key *pk;
+  char keyid[10];
+  unsigned char *public;
+  gcry_sexp_t s_key;
+
+  snprintf (keyid, DIM(keyid)-1, "OPENPGP.%d", keyno);
+  keyid[DIM(keyid)-1] = 0;
 
   if (algo != PUBKEY_ALGO_RSA)
     return gpg_error (GPG_ERR_PUBKEY_ALGO);
@@ -4888,7 +4893,7 @@ gen_card_key (int algo, int keyno, int is_primary, kbnode_t pub_root,
     }
 
   /* Note: SCD knows the serialnumber, thus there is no point in passing it.  */
-  err = agent_scd_genkey (&info, keyno, 1, NULL, *timestamp);
+  err = agent_scd_genkey (keyno, 1, timestamp);
   /*  The code below is not used because we force creation of
    *  the a card key (3rd arg).
    * if (gpg_err_code (rc) == GPG_ERR_EEXIST)
@@ -4898,16 +4903,9 @@ gen_card_key (int algo, int keyno, int is_primary, kbnode_t pub_root,
    *     tty_printf ("\n");
    *     if ( cpr_get_answer_is_yes( "keygen.card.replace_key",
    *                                 _("Replace existing key? ")))
-   *       rc = agent_scd_genkey (&info, keyno, 1);
+   *       rc = agent_scd_genkey (keyno, 1, timestamp);
    *   }
   */
-  if (!err && (!info.n || !info.e))
-    {
-      log_error ("communication error with SCD\n");
-      gcry_mpi_release (info.n);
-      gcry_mpi_release (info.e);
-      err =  gpg_error (GPG_ERR_GENERAL);
-    }
   if (err)
     {
       log_error ("key generation failed: %s\n", gpg_strerror (err));
@@ -4916,30 +4914,40 @@ gen_card_key (int algo, int keyno, int is_primary, kbnode_t pub_root,
       return err;
     }
 
-  /* Send the learn command so that the agent creates a shadow key for
+  /* Send the READKEY command so that the agent creates a shadow key for
      card key.  We need to do that now so that we are able to create
      the self-signatures. */
-  err = agent_scd_learn (NULL, 0);
+  err = agent_readkey (NULL, 1, keyid, &public);
+  if (err)
+    return err;
+  err = gcry_sexp_sscan (&s_key, NULL, public,
+                         gcry_sexp_canon_len (public, 0, NULL, NULL));
+  xfree (public);
+  if (err)
+    return err;
+
+  if (algo == PUBKEY_ALGO_RSA)
+    err = key_from_sexp (pk->pkey, s_key, "public-key", "ne");
+  else if (algo == PUBKEY_ALGO_ECDSA
+	   || algo == PUBKEY_ALGO_EDDSA
+	   || algo == PUBKEY_ALGO_ECDH )
+    err = ecckey_from_sexp (pk->pkey, s_key, algo);
+  else
+    err = gpg_error (GPG_ERR_PUBKEY_ALGO);
+  gcry_sexp_release (s_key);
+
   if (err)
     {
-      /* Oops: Card removed during generation.  */
-      log_error (_("OpenPGP card not available: %s\n"), gpg_strerror (err));
-      xfree (pkt);
-      xfree (pk);
+      log_error ("key_from_sexp failed: %s\n", gpg_strerror (err) );
+      free_public_key (pk);
       return err;
     }
 
-  if (*timestamp != info.created_at)
-    log_info ("NOTE: the key does not use the suggested creation date\n");
-  *timestamp = info.created_at;
-
-  pk->timestamp = info.created_at;
+  pk->timestamp = *timestamp;
   pk->version = 4;
   if (expireval)
     pk->expiredate = pk->timestamp + expireval;
   pk->pubkey_algo = algo;
-  pk->pkey[0] = info.n;
-  pk->pkey[1] = info.e;
 
   pkt->pkttype = is_primary ? PKT_PUBLIC_KEY : PKT_PUBLIC_SUBKEY;
   pkt->pkt.public_key = pk;

commit 82cbab906a3e72a98fdc16096f2f0451465969a2
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Oct 20 12:05:15 2016 +0900

    agent: Add --card option for READKEY.
    
    * agent/findkey.c (agent_write_shadow_key): New.
    * agent/command-ssh.c (card_key_available): Use agent_write_shadow_key.
    * agent/learncard.c (agent_handle_learn): Likewise.
    * agent/command.c (cmd_readkey): Add --card option.
    --
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/agent/agent.h b/agent/agent.h
index fe5ffba..a3ec457 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -490,6 +490,9 @@ gpg_error_t s2k_hash_passphrase (const char *passphrase, int hashalgo,
                                  const unsigned char *s2ksalt,
                                  unsigned int s2kcount,
                                  unsigned char *key, size_t keylen);
+gpg_error_t agent_write_shadow_key (const unsigned char *grip,
+                                    const char *serialno, const char *keyid,
+                                    const unsigned char *pkbuf, int force);
 
 
 /*-- trustlist.c --*/
diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 083b8d8..7bcda50 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -2474,39 +2474,9 @@ card_key_available (ctrl_t ctrl, gcry_sexp_t *r_pk, char **cardsn)
   if ( agent_key_available (grip) )
     {
       /* (Shadow)-key is not available in our key storage.  */
-      unsigned char *shadow_info;
-      unsigned char *tmp;
-
-      shadow_info = make_shadow_info (serialno, authkeyid);
-      if (!shadow_info)
-        {
-          err = gpg_error_from_syserror ();
-          xfree (pkbuf);
-          gcry_sexp_release (s_pk);
-          xfree (serialno);
-          xfree (authkeyid);
-          return err;
-        }
-      err = agent_shadow_key (pkbuf, shadow_info, &tmp);
-      xfree (shadow_info);
-      if (err)
-        {
-          log_error (_("shadowing the key failed: %s\n"), gpg_strerror (err));
-          xfree (pkbuf);
-          gcry_sexp_release (s_pk);
-          xfree (serialno);
-          xfree (authkeyid);
-          return err;
-        }
-      xfree (pkbuf);
-      pkbuf = tmp;
-      pkbuflen = gcry_sexp_canon_len (pkbuf, 0, NULL, NULL);
-      assert (pkbuflen);
-
-      err = agent_write_private_key (grip, pkbuf, pkbuflen, 0);
+      err = agent_write_shadow_key (grip, serialno, authkeyid, pkbuf, 0);
       if (err)
         {
-          log_error (_("error writing key: %s\n"), gpg_strerror (err));
           xfree (pkbuf);
           gcry_sexp_release (s_pk);
           xfree (serialno);
diff --git a/agent/command.c b/agent/command.c
index 1ecdf20..a291d5b 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -988,8 +988,10 @@ cmd_genkey (assuan_context_t ctx, char *line)
 

 static const char hlp_readkey[] =
   "READKEY <hexstring_with_keygrip>\n"
+  "        --card <keyid>\n"
   "\n"
-  "Return the public key for the given keygrip.";
+  "Return the public key for the given keygrip or keyid.\n"
+  "With --card, private key file with card information will be created.";
 static gpg_error_t
 cmd_readkey (assuan_context_t ctx, char *line)
 {
@@ -997,10 +999,57 @@ cmd_readkey (assuan_context_t ctx, char *line)
   int rc;
   unsigned char grip[20];
   gcry_sexp_t s_pkey = NULL;
+  unsigned char *pkbuf = NULL;
+  size_t pkbuflen;
 
   if (ctrl->restricted)
     return leave_cmd (ctx, gpg_error (GPG_ERR_FORBIDDEN));
 
+  if (has_option_name (line, "--card"))
+    {
+      const char *keyid;
+      char *serialno = NULL;
+
+      keyid = skip_options (line);
+
+      rc = agent_card_getattr (ctrl, "SERIALNO", &serialno);
+      if (rc)
+        {
+          log_error (_("error getting serial number of card: %s\n"),
+                     gpg_strerror (rc));
+          goto leave;
+        }
+
+      pkbuflen = gcry_sexp_canon_len (pkbuf, 0, NULL, NULL);
+      rc = agent_card_readkey (ctrl, keyid, &pkbuf);
+      if (rc)
+        goto leave;
+      rc = gcry_sexp_sscan (&s_pkey, NULL, (char*)pkbuf, pkbuflen);
+      if (rc)
+        goto leave;
+
+      if (!gcry_pk_get_keygrip (s_pkey, grip))
+        {
+          rc = gcry_pk_testkey (s_pkey);
+          if (rc == 0)
+            rc = gpg_error (GPG_ERR_INTERNAL);
+
+          goto leave;
+        }
+
+      rc = agent_write_shadow_key (grip, serialno, keyid, pkbuf, 0);
+      if (rc)
+        goto leave;
+
+      rc = assuan_send_data (ctx, pkbuf, pkbuflen);
+
+ leave:
+      xfree (serialno);
+      xfree (pkbuf);
+      gcry_sexp_release (s_pkey);
+      return leave_cmd (ctx, rc);
+    }
+
   rc = parse_keygrip (ctx, line, grip);
   if (rc)
     return rc; /* Return immediately as this is already an Assuan error code.*/
@@ -1008,20 +1057,16 @@ cmd_readkey (assuan_context_t ctx, char *line)
   rc = agent_public_key_from_file (ctrl, grip, &s_pkey);
   if (!rc)
     {
-      size_t len;
-      unsigned char *buf;
-
-      len = gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, NULL, 0);
-      assert (len);
-      buf = xtrymalloc (len);
-      if (!buf)
+      pkbuflen = gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, NULL, 0);
+      assert (pkbuflen);
+      pkbuf = xtrymalloc (pkbuflen);
+      if (!pkbuf)
         rc = gpg_error_from_syserror ();
       else
         {
-          len = gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, buf, len);
-          assert (len);
-          rc = assuan_send_data (ctx, buf, len);
-          xfree (buf);
+          gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, pkbuf, pkbuflen);
+          rc = assuan_send_data (ctx, pkbuf, pkbuflen);
+          xfree (pkbuf);
         }
       gcry_sexp_release (s_pkey);
     }
diff --git a/agent/findkey.c b/agent/findkey.c
index c5ab0e9..23e94f0 100644
--- a/agent/findkey.c
+++ b/agent/findkey.c
@@ -1492,3 +1492,39 @@ agent_delete_key (ctrl_t ctrl, const char *desc_text,
   gcry_sexp_release (s_skey);
   return err;
 }
+
+
+/* Write an S-expression formatted shadow key to our key storage.
+   Shadow key is created by an S-expression public key in PKBUF and
+   card's SERIALNO and the IDSTRING.  With FORCE passed as true an
+   existing key with the given GRIP will get overwritten.  */
+gpg_error_t
+agent_write_shadow_key (const unsigned char *grip,
+                        const char *serialno, const char *keyid,
+                        const unsigned char *pkbuf, int force)
+{
+  gpg_error_t err;
+  unsigned char *shadow_info;
+  unsigned char *shdkey;
+  size_t len;
+
+  shadow_info = make_shadow_info (serialno, keyid);
+  if (!shadow_info)
+    return gpg_error_from_syserror ();
+
+  err = agent_shadow_key (pkbuf, shadow_info, &shdkey);
+  xfree (shadow_info);
+  if (err)
+    {
+      log_error ("shadowing the key failed: %s\n", gpg_strerror (err));
+      return err;
+    }
+
+  len = gcry_sexp_canon_len (shdkey, 0, NULL, NULL);
+  err = agent_write_private_key (grip, shdkey, len, force);
+  xfree (shdkey);
+  if (err)
+    log_error ("error writing key: %s\n", gpg_strerror (err));
+
+  return err;
+}
diff --git a/agent/learncard.c b/agent/learncard.c
index e9304fb..103a821 100644
--- a/agent/learncard.c
+++ b/agent/learncard.c
@@ -381,8 +381,7 @@ agent_handle_learn (ctrl_t ctrl, int send, void *assuan_context, int force)
 
   for (item = parm.info; item; item = item->next)
     {
-      unsigned char *pubkey, *shdkey;
-      size_t n;
+      unsigned char *pubkey;
 
       if (opt.verbose)
         log_info ("          id: %s    (grip=%s)\n", item->id, item->hexgrip);
@@ -410,33 +409,10 @@ agent_handle_learn (ctrl_t ctrl, int send, void *assuan_context, int force)
           goto leave;
         }
 
-      {
-        unsigned char *shadow_info = make_shadow_info (serialno, item->id);
-        if (!shadow_info)
-          {
-            rc = gpg_error (GPG_ERR_ENOMEM);
-            xfree (pubkey);
-            goto leave;
-          }
-        rc = agent_shadow_key (pubkey, shadow_info, &shdkey);
-        xfree (shadow_info);
-      }
+      rc = agent_write_shadow_key (grip, serialno, item->id, pubkey, force);
       xfree (pubkey);
       if (rc)
-        {
-          log_error ("shadowing the key failed: %s\n", gpg_strerror (rc));
-          goto leave;
-        }
-      n = gcry_sexp_canon_len (shdkey, 0, NULL, NULL);
-      assert (n);
-
-      rc = agent_write_private_key (grip, shdkey, n, force);
-      xfree (shdkey);
-      if (rc)
-        {
-          log_error ("error writing key: %s\n", gpg_strerror (rc));
-          goto leave;
-        }
+        goto leave;
 
       if (opt.verbose)
         log_info ("          id: %s - shadow key created\n", item->id);

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

Summary of changes:
 agent/agent.h       |   3 ++
 agent/command-ssh.c |  32 +-------------
 agent/command.c     |  69 ++++++++++++++++++++++++------
 agent/findkey.c     |  36 ++++++++++++++++
 agent/learncard.c   |  30 ++-----------
 g10/call-agent.c    | 118 ++++++----------------------------------------------
 g10/call-agent.h    |  10 +----
 g10/keygen.c        |  54 ++++++++++++++----------
 8 files changed, 145 insertions(+), 207 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Oct 20 09:36:07 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Thu, 20 Oct 2016 09:36:07 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-249-gb680f79
Message-ID: <E1bx7tZ-0004hG-JZ@lists.gnupg.org>

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  b680f79cc112c4831293e259d7db2921bcd783a4 (commit)
      from  980c037bedb968ddf155dd334c0a70b918a17759 (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 b680f79cc112c4831293e259d7db2921bcd783a4
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Oct 20 16:25:47 2016 +0900

    scd: GENKEY updates the public key in APP.
    
    * scd/app-openpgp.c (rsa_read_pubkey, ecc_read_pubkey): New.
    (read_public_key): New.
    (get_public_key, do_genkey): Use read_public_key.
    
    --
    
    With this change, since GENKEY updates the public key (pk[keyno].key) in
    APP, READKEY will be possible after the command even for the old
    card (version <= 0x0100).
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 09e4800..843fdf0 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -1221,6 +1221,246 @@ retrieve_key_material (FILE *fp, const char *hexkeyid,
 #endif /*GNUPG_MAJOR_VERSION > 1*/
 
 
+static gpg_error_t
+rsa_read_pubkey (app_t app, ctrl_t ctrl, u32 created_at,  int keyno,
+                 const unsigned char *data, size_t datalen, gcry_sexp_t *r_sexp)
+{
+  gpg_error_t err;
+  const unsigned char *m, *e;
+  size_t mlen, elen;
+  unsigned char *mbuf = NULL, *ebuf = NULL;
+
+  m = find_tlv (data, datalen, 0x0081, &mlen);
+  if (!m)
+    {
+      log_error (_("response does not contain the RSA modulus\n"));
+      return gpg_error (GPG_ERR_CARD);
+    }
+
+  e = find_tlv (data, datalen, 0x0082, &elen);
+  if (!e)
+    {
+      log_error (_("response does not contain the RSA public exponent\n"));
+      return gpg_error (GPG_ERR_CARD);
+    }
+
+  if (ctrl)
+    {
+      send_key_data (ctrl, "n", m, mlen);
+      send_key_data (ctrl, "e", e, elen);
+    }
+
+  for (; mlen && !*m; mlen--, m++) /* strip leading zeroes */
+    ;
+  for (; elen && !*e; elen--, e++) /* strip leading zeroes */
+    ;
+
+  if (ctrl)
+    {
+      unsigned char fprbuf[20];
+
+      err = store_fpr (app, keyno, created_at, fprbuf, PUBKEY_ALGO_RSA,
+                       m, mlen, e, elen);
+      if (err)
+        return err;
+
+      send_fpr_if_not_null (ctrl, "KEY-FPR", -1, fprbuf);
+    }
+
+  mbuf = xtrymalloc (mlen + 1);
+  if (!mbuf)
+    {
+      err = gpg_error_from_syserror ();
+      goto leave;
+    }
+  /* Prepend numbers with a 0 if needed.  */
+  if (mlen && (*m & 0x80))
+    {
+      *mbuf = 0;
+      memcpy (mbuf+1, m, mlen);
+      mlen++;
+    }
+  else
+    memcpy (mbuf, m, mlen);
+
+  ebuf = xtrymalloc (elen + 1);
+  if (!ebuf)
+    {
+      err = gpg_error_from_syserror ();
+      goto leave;
+    }
+  /* Prepend numbers with a 0 if needed.  */
+  if (elen && (*e & 0x80))
+    {
+      *ebuf = 0;
+      memcpy (ebuf+1, e, elen);
+      elen++;
+    }
+  else
+    memcpy (ebuf, e, elen);
+
+  err = gcry_sexp_build (r_sexp, NULL, "(public-key(rsa(n%b)(e%b)))",
+                         (int)mlen, mbuf, (int)elen, ebuf);
+ leave:
+  xfree (mbuf);
+  xfree (ebuf);
+  return err;
+}
+
+static gpg_error_t
+ecc_read_pubkey (app_t app, ctrl_t ctrl, u32 created_at, int keyno,
+                 const unsigned char *data, size_t datalen, gcry_sexp_t *r_sexp)
+{
+  gpg_error_t err;
+  unsigned char *qbuf;
+  const unsigned char *ecc_q;
+  size_t ecc_q_len;
+  gcry_mpi_t oid;
+  int n;
+  const unsigned char *oidbuf;
+  size_t oid_len;
+  int algo;
+  const char *format;
+  const char *curve;
+
+  ecc_q = find_tlv (data, datalen, 0x0086, &ecc_q_len);
+  if (!ecc_q)
+    {
+      log_error (_("response does not contain the EC public key\n"));
+      return gpg_error (GPG_ERR_CARD);
+    }
+
+  err = openpgp_oid_from_str (app->app_local->keyattr[keyno].ecc.oid, &oid);
+  if (err)
+    return err;
+
+  oidbuf = gcry_mpi_get_opaque (oid, &n);
+  if (!oidbuf)
+    {
+      err = gpg_error_from_syserror ();
+      gcry_mpi_release (oid);
+      return err;
+    }
+  gcry_mpi_release (oid);
+  oid_len = (n+7)/8;
+
+  qbuf = xtrymalloc (ecc_q_len + 1);
+  if (!qbuf)
+    return gpg_error_from_syserror ();
+
+  if ((app->app_local->keyattr[keyno].ecc.flags & ECC_FLAG_DJB_TWEAK))
+    {               /* Prepend 0x40 prefix.  */
+      *qbuf = 0x40;
+      memcpy (qbuf+1, ecc_q, ecc_q_len);
+      ecc_q_len++;
+    }
+  else
+    memcpy (qbuf, ecc_q, ecc_q_len);
+
+  if (ctrl)
+    {
+      send_key_data (ctrl, "q", ecc_q, ecc_q_len);
+      send_key_data (ctrl, "curve", oidbuf, oid_len);
+    }
+
+  if (keyno == 1)
+    {
+      if (ctrl)
+        send_key_data (ctrl, "kdf", "\x03\x01\x08\x07", (size_t)4);
+      algo = PUBKEY_ALGO_ECDH;
+    }
+  else
+    {
+      if ((app->app_local->keyattr[keyno].ecc.flags & ECC_FLAG_DJB_TWEAK))
+        algo = PUBKEY_ALGO_EDDSA;
+      else
+        algo = PUBKEY_ALGO_ECDSA;
+    }
+
+  if (ctrl)
+    {
+      unsigned char fprbuf[20];
+
+      err = store_fpr (app, keyno, created_at, fprbuf, algo, oidbuf, oid_len,
+                       qbuf, ecc_q_len, "\x03\x01\x08\x07", (size_t)4);
+      if (err)
+        goto leave;
+
+      send_fpr_if_not_null (ctrl, "KEY-FPR", -1, fprbuf);
+    }
+
+  if (!(app->app_local->keyattr[keyno].ecc.flags & ECC_FLAG_DJB_TWEAK))
+    format = "(public-key(ecc(curve%s)(q%b)))";
+  else if (keyno == 1)
+    format = "(public-key(ecc(curve%s)(flags djb-tweak)(q%b)))";
+  else
+    format = "(public-key(ecc(curve%s)(flags eddsa)(q%b)))";
+
+  curve = openpgp_oid_to_curve (app->app_local->keyattr[keyno].ecc.oid, 1);
+  err = gcry_sexp_build (r_sexp, NULL, format, curve, (int)ecc_q_len, qbuf);
+ leave:
+  xfree (qbuf);
+  return err;
+}
+
+
+/* Parse tag-length-value data for public key in BUFFER of BUFLEN
+   length.  Key of KEYNO in APP is updated with an S-expression of
+   public key.  When CTRL is not NULL, fingerprint is computed with
+   CREATED_AT, and fingerprint is written to the card, and key data
+   and fingerprint are send back to the client side.
+ */
+static gpg_error_t
+read_public_key (app_t app, ctrl_t ctrl, u32 created_at, int keyno,
+                 const unsigned char *buffer, size_t buflen)
+{
+  gpg_error_t err;
+  const unsigned char *data;
+  size_t datalen;
+  gcry_sexp_t s_pkey = NULL;
+
+  data = find_tlv (buffer, buflen, 0x7F49, &datalen);
+  if (!data)
+    {
+      log_error (_("response does not contain the public key data\n"));
+      return gpg_error (GPG_ERR_CARD);
+    }
+
+  if (app->app_local->keyattr[keyno].key_type == KEY_TYPE_RSA)
+    err = rsa_read_pubkey (app, ctrl, created_at, keyno,
+                           data, datalen, &s_pkey);
+  else if (app->app_local->keyattr[keyno].key_type == KEY_TYPE_ECC)
+    err = ecc_read_pubkey (app, ctrl, created_at, keyno,
+                           data, datalen, &s_pkey);
+  else
+    err = gpg_error (GPG_ERR_NOT_IMPLEMENTED);
+
+  if (!err)
+    {
+      unsigned char *keybuf;
+      size_t len;
+
+      len = gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, NULL, 0);
+      keybuf = xtrymalloc (len);
+      if (!data)
+        {
+          err = gpg_error_from_syserror ();
+          gcry_sexp_release (s_pkey);
+          return err;
+        }
+
+      gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, keybuf, len);
+      gcry_sexp_release (s_pkey);
+
+      app->app_local->pk[keyno].key = keybuf;
+      /* Decrement for trailing '\0' */
+      app->app_local->pk[keyno].keylen = len - 1;
+    }
+
+  return err;
+}
+
+
 /* Get the public key for KEYNO and store it as an S-expresion with
    the APP handle.  On error that field gets cleared.  If we already
    know about the public key we will just return.  Note that this does
@@ -1237,12 +1477,10 @@ get_public_key (app_t app, int keyno)
 {
   gpg_error_t err = 0;
   unsigned char *buffer;
-  const unsigned char *keydata, *m, *e;
-  size_t buflen, keydatalen;
+  const unsigned char *m, *e;
+  size_t buflen;
   size_t mlen = 0;
   size_t elen = 0;
-  unsigned char *mbuf = NULL;
-  unsigned char *ebuf = NULL;
   char *keybuf = NULL;
   gcry_sexp_t s_pkey;
   size_t len;
@@ -1286,42 +1524,7 @@ get_public_key (app_t app, int keyno)
           goto leave;
         }
 
-      keydata = find_tlv (buffer, buflen, 0x7F49, &keydatalen);
-      if (!keydata)
-        {
-          err = gpg_error (GPG_ERR_CARD);
-          log_error (_("response does not contain the public key data\n"));
-          goto leave;
-        }
-
-      if (app->app_local->keyattr[keyno].key_type == KEY_TYPE_RSA)
-        {
-          m = find_tlv (keydata, keydatalen, 0x0081, &mlen);
-          if (!m)
-            {
-              err = gpg_error (GPG_ERR_CARD);
-              log_error (_("response does not contain the RSA modulus\n"));
-              goto leave;
-            }
-
-          e = find_tlv (keydata, keydatalen, 0x0082, &elen);
-          if (!e)
-            {
-              err = gpg_error (GPG_ERR_CARD);
-              log_error (_("response does not contain the RSA public exponent\n"));
-              goto leave;
-            }
-        }
-      else
-        {
-          m = find_tlv (keydata, keydatalen, 0x0086, &mlen);
-          if (!m)
-            {
-              err = gpg_error (GPG_ERR_CARD);
-              log_error (_("response does not contain the EC public key\n"));
-              goto leave;
-            }
-        }
+      err = read_public_key (app, NULL, 0U, keyno, buffer, buflen);
     }
   else
     {
@@ -1375,98 +1578,35 @@ get_public_key (app_t app, int keyno)
                      gpg_strerror (err));
 	  goto leave;
 	}
-    }
 
-  mbuf = xtrymalloc (mlen + 1);
-  if (!mbuf)
-    {
-      err = gpg_error_from_syserror ();
-      goto leave;
-    }
+      err = gcry_sexp_build (&s_pkey, NULL, "(public-key(rsa(n%b)(e%b)))",
+                             (int)mlen, m, (int)elen, e);
+      if (err)
+        goto leave;
 
-  if ((app->app_local->keyattr[keyno].key_type == KEY_TYPE_RSA
-       || (app->app_local->keyattr[keyno].key_type == KEY_TYPE_ECC
-           && !(app->app_local->keyattr[keyno].ecc.flags & ECC_FLAG_DJB_TWEAK)))
-      && mlen && (*m & 0x80))
-    {               /* Prepend numbers with a 0 if needed for MPI.  */
-      *mbuf = 0;
-      memcpy (mbuf+1, m, mlen);
-      mlen++;
-    }
-  else if (app->app_local->keyattr[keyno].key_type == KEY_TYPE_ECC
-           && (app->app_local->keyattr[keyno].ecc.flags & ECC_FLAG_DJB_TWEAK))
-    {               /* Prepend 0x40 prefix.  */
-      *mbuf = 0x40;
-      memcpy (mbuf+1, m, mlen);
-      mlen++;
-    }
-  else
-    memcpy (mbuf, m, mlen);
+      len = gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, NULL, 0);
 
-  if (app->app_local->keyattr[keyno].key_type == KEY_TYPE_RSA)
-    {
-      ebuf = xtrymalloc (elen + 1);
-      if (!ebuf)
+      keybuf = xtrymalloc (len);
+      if (!keybuf)
         {
           err = gpg_error_from_syserror ();
+          gcry_sexp_release (s_pkey);
           goto leave;
         }
-      /* Prepend numbers with a 0 if needed.  */
-      if (elen && (*e & 0x80))
-        {
-          *ebuf = 0;
-          memcpy (ebuf+1, e, elen);
-          elen++;
-        }
-      else
-        memcpy (ebuf, e, elen);
 
-      err = gcry_sexp_build (&s_pkey, NULL, "(public-key(rsa(n%b)(e%b)))",
-                             (int)mlen, mbuf, (int)elen, ebuf);
-    }
-  else if (app->app_local->keyattr[keyno].key_type == KEY_TYPE_ECC)
-    {
-      char *format;
-
-      if (!(app->app_local->keyattr[keyno].ecc.flags & ECC_FLAG_DJB_TWEAK))
-        format = "(public-key(ecc(curve%s)(q%b)))";
-      else if (keyno == 1)
-        format = "(public-key(ecc(curve%s)(flags djb-tweak)(q%b)))";
-      else
-        format = "(public-key(ecc(curve%s)(flags eddsa)(q%b)))";
-
-      err = gcry_sexp_build (&s_pkey, NULL, format,
-                openpgp_oid_to_curve (app->app_local->keyattr[keyno].ecc.oid, 1),
-                             (int)mlen, mbuf);
-    }
-  else
-    err = gpg_error (GPG_ERR_NOT_IMPLEMENTED);
-
-  if (err)
-    goto leave;
-
-  len = gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, NULL, 0);
-
-  keybuf = xtrymalloc (len);
-  if (!keybuf)
-    {
+      gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, keybuf, len);
       gcry_sexp_release (s_pkey);
-      err = gpg_error_from_syserror ();
-      goto leave;
-    }
-  gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, keybuf, len);
-  gcry_sexp_release (s_pkey);
 
-  app->app_local->pk[keyno].key = (unsigned char*)keybuf;
-  app->app_local->pk[keyno].keylen = len - 1; /* Decrement for trailing '\0' */
+      app->app_local->pk[keyno].key = (unsigned char*)keybuf;
+      /* Decrement for trailing '\0' */
+      app->app_local->pk[keyno].keylen = len - 1;
+    }
 
  leave:
   /* Set a flag to indicate that we tried to read the key.  */
   app->app_local->pk[keyno].read_done = 1;
 
   xfree (buffer);
-  xfree (mbuf);
-  xfree (ebuf);
   return err;
 }
 #endif /* GNUPG_MAJOR_VERSION > 1 */
@@ -3533,7 +3673,6 @@ do_genkey (app_t app, ctrl_t ctrl,  const char *keynostr, unsigned int flags,
 {
   gpg_error_t err;
   char numbuf[30];
-  unsigned char fprbuf[20];
   unsigned char *buffer = NULL;
   const unsigned char *keydata;
   size_t buflen, keydatalen;
@@ -3623,117 +3762,7 @@ do_genkey (app_t app, ctrl_t ctrl,  const char *keynostr, unsigned int flags,
   send_status_info (ctrl, "KEY-CREATED-AT",
                     numbuf, (size_t)strlen(numbuf), NULL, 0);
 
-  if (app->app_local->keyattr[keyno].key_type == KEY_TYPE_RSA)
-    {
-      const unsigned char *m, *e;
-      size_t mlen, elen;
-
-      m = find_tlv (keydata, keydatalen, 0x0081, &mlen);
-      if (!m)
-        {
-          err = gpg_error (GPG_ERR_CARD);
-          log_error (_("response does not contain the RSA modulus\n"));
-          goto leave;
-        }
-      /* log_printhex ("RSA n:", m, mlen); */
-      send_key_data (ctrl, "n", m, mlen);
-
-      e = find_tlv (keydata, keydatalen, 0x0082, &elen);
-      if (!e)
-        {
-          err = gpg_error (GPG_ERR_CARD);
-          log_error (_("response does not contain the RSA public exponent\n"));
-          goto leave;
-        }
-      /* log_printhex ("RSA e:", e, elen); */
-      send_key_data (ctrl, "e", e, elen);
-
-      for (; mlen && !*m; mlen--, m++) /* strip leading zeroes */
-        ;
-      for (; elen && !*e; elen--, e++) /* strip leading zeroes */
-        ;
-
-      err = store_fpr (app, keyno, created_at, fprbuf, PUBKEY_ALGO_RSA,
-                       m, mlen, e, elen);
-    }
-  else if (app->app_local->keyattr[keyno].key_type == KEY_TYPE_ECC)
-    {
-      const unsigned char *ecc_q;
-      size_t ecc_q_len;
-      gcry_mpi_t oid;
-      int n;
-      const unsigned char *oidbuf;
-      size_t oid_len;
-      int algo;
-
-      ecc_q = find_tlv (keydata, keydatalen, 0x0086, &ecc_q_len);
-      if (!ecc_q)
-        {
-          err = gpg_error (GPG_ERR_CARD);
-          log_error (_("response does not contain the EC public key\n"));
-          goto leave;
-        }
-
-      err = openpgp_oid_from_str (app->app_local->keyattr[keyno].ecc.oid, &oid);
-      if (err)
-        goto leave;
-
-      oidbuf = gcry_mpi_get_opaque (oid, &n);
-      if (!oidbuf)
-        {
-          err = gpg_error_from_syserror ();
-          gcry_mpi_release (oid);
-          goto leave;
-        }
-      gcry_mpi_release (oid);
-      oid_len = (n+7)/8;
-
-      if ((app->app_local->keyattr[keyno].ecc.flags & ECC_FLAG_DJB_TWEAK))
-        {               /* Prepend 0x40 prefix.  */
-          unsigned char *q = xtrymalloc (ecc_q_len + 1);
-
-          if (!q)
-            {
-              err = gpg_error_from_syserror ();
-              goto leave;
-            }
-          *q = 0x40;
-          memcpy (q+1, ecc_q, ecc_q_len);
-          send_key_data (ctrl, "q", q, ecc_q_len + 1);
-          xfree (q);
-        }
-      else
-        {
-          /* strip leading zeroes */
-          for (; ecc_q_len && !*ecc_q; ecc_q_len--, ecc_q++)
-            ;
-          send_key_data (ctrl, "q", ecc_q, ecc_q_len);
-        }
-
-      send_key_data (ctrl, "curve", oidbuf, oid_len);
-
-      if (keyno == 1)
-        {
-          send_key_data (ctrl, "kdf", "\x03\x01\x08\x07", (size_t)4);
-          algo = PUBKEY_ALGO_ECDH;
-        }
-      else
-        {
-          if ((app->app_local->keyattr[keyno].ecc.flags & ECC_FLAG_DJB_TWEAK))
-            algo = PUBKEY_ALGO_EDDSA;
-          else
-            algo = PUBKEY_ALGO_ECDSA;
-        }
-
-      err = store_fpr (app, keyno, created_at, fprbuf, algo, oidbuf, oid_len,
-                       ecc_q, ecc_q_len, "\x03\x01\x08\x07", (size_t)4);
-    }
-
-  if (err)
-    goto leave;
-  send_fpr_if_not_null (ctrl, "KEY-FPR", -1, fprbuf);
-
-
+  err = read_public_key (app, ctrl, created_at, keyno, buffer, buflen);
  leave:
   xfree (buffer);
   return err;

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

Summary of changes:
 scd/app-openpgp.c | 485 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 257 insertions(+), 228 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Oct 20 10:29:17 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Thu, 20 Oct 2016 10:29:17 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. 165f0ecebc8a68bff30d5255962a3b44d8113940
Message-ID: <E1bx8j1-0006xv-2Y@lists.gnupg.org>

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 GnuPG website and other docs".

The branch, master has been updated
       via  165f0ecebc8a68bff30d5255962a3b44d8113940 (commit)
      from  954cadd7b70881ef29b97c11979382546769f2f5 (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 165f0ecebc8a68bff30d5255962a3b44d8113940
Author: Justus Winter <justus at g10code.com>
Date:   Thu Oct 20 10:27:36 2016 +0200

    web: Add 'binary' anchor to download page.
    
    GnuPG-bug-id: 2810

diff --git a/web/download/index.org b/web/download/index.org
index c7b8a04..a83479e 100644
--- a/web/download/index.org
+++ b/web/download/index.org
@@ -89,6 +89,9 @@
 
 
 ** GnuPG binary releases
+   :PROPERTIES:
+   :CUSTOM_ID: binary
+   :END:
 #+index: Binaries!download
 
    In general we do not distribute binary releases but leave that to

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

Summary of changes:
 web/download/index.org | 3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org



From cvs at cvs.gnupg.org  Thu Oct 20 12:02:22 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Thu, 20 Oct 2016 12:02:22 +0200
Subject: [git] GpgOL - branch, nomapi, updated. gpgol-1.4.0-114-gcb08933
Message-ID: <E1bxAB6-0002wB-57@lists.gnupg.org>

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 "GnuPG extension for MS Outlook".

The branch, nomapi has been updated
       via  cb089330c44f37412a47501660b09d09cc382c45 (commit)
       via  e1420cc2a8f0bb8c45c8253212fcc32475531f41 (commit)
       via  71b06f0662a24f66381d349d8ee8da93a33f500b (commit)
       via  b8e39830594d87a41056e7d9dd8dff2ff4904aac (commit)
       via  a4cb385ee539570d6a5d67a9c7651173905be0c3 (commit)
       via  525680f952ed3f2e361c8582f5df3a12f07defb8 (commit)
      from  ed7b79ff86d7c0a3cc1ecac2fc304fe098f29cfb (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 cb089330c44f37412a47501660b09d09cc382c45
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Oct 20 12:01:35 2016 +0200

    Close thread handles immediately after creation
    
    --
    This fixes leaked handles and as we "fire & forget" our threads
    we don't need the handles anymore.

diff --git a/src/mail.cpp b/src/mail.cpp
index 572280b..efe5a29 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -95,8 +95,7 @@ Mail::Mail (LPDISPATCH mailitem) :
     m_is_valid(false),
     m_moss_position(0),
     m_sender(NULL),
-    m_type(MSGTYPE_UNKNOWN),
-    m_parser_thread(NULL)
+    m_type(MSGTYPE_UNKNOWN)
 {
   if (get_mail_for_item (mailitem))
     {
@@ -142,11 +141,6 @@ Mail::~Mail()
 
   xfree (m_sender);
   gpgol_release(m_mailitem);
-
-  if (m_parser_thread)
-    {
-      CloseHandle (m_parser_thread);
-    }
 }
 
 Mail *
@@ -453,7 +447,6 @@ add_attachments(LPDISPATCH mail,
                      SRCNAME, __func__, att->get_display_name().c_str());
           err = 1;
         }
-      CloseHandle (hFile);
       xfree (wchar_file);
       xfree (wchar_name);
       if (err)
@@ -532,14 +525,15 @@ Mail::decrypt_verify()
   m_parser = new ParseController (cipherstream, m_type);
   gpgol_release (cipherstream);
 
-  m_parser_thread = CreateThread (NULL, 0, do_parsing, (LPVOID) this, 0,
-                                  NULL);
+  HANDLE parser_thread = CreateThread (NULL, 0, do_parsing, (LPVOID) this, 0,
+                                       NULL);
 
-  if (!m_parser_thread)
+  if (!parser_thread)
     {
       log_error ("%s:%s: Failed to create decrypt / verify thread.",
                  SRCNAME, __func__);
     }
+  CloseHandle (parser_thread);
 
   return 0;
 }
@@ -613,11 +607,6 @@ Mail::parsing_done()
   m_parser = nullptr;
   gpgoladdin_invalidate_ui ();
   TRACEPOINT;
-  if (m_parser_thread)
-    {
-      CloseHandle (m_parser_thread);
-      m_parser_thread = NULL;
-    }
   return;
 }
 
diff --git a/src/mail.h b/src/mail.h
index 1b69e2a..83c10ab 100644
--- a/src/mail.h
+++ b/src/mail.h
@@ -267,6 +267,5 @@ private:
   GpgME::Signature m_sig;
   GpgME::UserID m_uid;
   std::string m_uuid;
-  HANDLE m_parser_thread;
 };
 #endif // MAIL_H
diff --git a/src/mailitem-events.cpp b/src/mailitem-events.cpp
index e03ba0e..e4442cc 100644
--- a/src/mailitem-events.cpp
+++ b/src/mailitem-events.cpp
@@ -322,16 +322,18 @@ EVENT_SINK_INVOKE(MailItemEvents)
                      Appearently Outlook locks some methods in some events.
                      So we Create a new thread that will sleep a bit before
                      it requests to send the item again. */
-                  CreateThread (NULL, 0, request_send, (LPVOID) m_object, 0,
-                                NULL);
+                  HANDLE thread = CreateThread (NULL, 0, request_send,
+                                                (LPVOID) m_object, 0, NULL);
+                  CloseHandle (thread);
                 }
               return S_OK;
             }
           else if (m_decrypt_after_write)
             {
               char *uuid = strdup (m_mail->get_uuid ().c_str());
-              CreateThread (NULL, 0, request_decrypt, (LPVOID) uuid, 0,
-                            NULL);
+              HANDLE thread = CreateThread (NULL, 0, request_decrypt,
+                                            (LPVOID) uuid, 0, NULL);
+              CloseHandle (thread);
             }
           break;
         }

commit e1420cc2a8f0bb8c45c8253212fcc32475531f41
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Oct 20 11:53:59 2016 +0200

    Fix explorer display after mail was closed
    
    * src/mailitem-events.cpp (request_decrypt): New. Request a decypt.
    (EVENT_SINK_INVOKE(MailItemEvents)): Handle decrypt_after_write.
    Don't always unload in unload.
    * src/windowmessages.cpp: Handle REQUEST_DECRYPT.
    * src/windowmessages.h: Add REQUEST_DECRYPT.
    
    --
    To prevent the question of wether or not to save the changes
    (Which would save the decrypted data without an event to
    prevent it) we save proactively. This happens by set_needs_save
    and calling save. Which will revert a mail because we never want
    to save unreverted mails.
    
    But as a side effect the mail, if opened in the explorer still will
    be reverted, too. So shown as empty. This is bad. To prevent that
    we request a decrypt in the AfterWrite event.
    
    Evil Hack: Outlook sends an Unload event after the message is closed
    This is not true our Internal Object is kept alive if it is opened
    in the explorer. So we ignore the unload event and then check in
    the window message handler that checks for decrypt again if the
    mail is currently open in the active explorer. If not we delete our
    Mail object so that the message is released.

diff --git a/src/mailitem-events.cpp b/src/mailitem-events.cpp
index e526124..e03ba0e 100644
--- a/src/mailitem-events.cpp
+++ b/src/mailitem-events.cpp
@@ -73,6 +73,7 @@ BEGIN_EVENT_SINK(MailItemEvents, IDispatch)
 private:
   Mail * m_mail; /* The mail object related to this mailitem */
   bool m_send_seen;   /* The message is about to be submitted */
+  bool m_decrypt_after_write;
 };
 
 MailItemEvents::MailItemEvents() :
@@ -81,7 +82,8 @@ MailItemEvents::MailItemEvents() :
     m_cookie(0),
     m_ref(1),
     m_mail(NULL),
-    m_send_seen (false)
+    m_send_seen (false),
+    m_decrypt_after_write(false)
 {
 }
 
@@ -109,6 +111,19 @@ request_send (LPVOID arg)
   return 0;
 }
 
+static DWORD WINAPI
+request_decrypt (LPVOID arg)
+{
+  log_debug ("%s:%s: requesting decrypt again for: %p",
+             SRCNAME, __func__, arg);
+  if (do_in_ui_thread (REQUEST_DECRYPT, arg))
+    {
+      log_debug ("%s:%s: second decrypt failed for: %p",
+                 SRCNAME, __func__, arg);
+    }
+  return 0;
+}
+
 /* The main Invoke function. The return value of this
    function does not appear to have any effect on outlook
    although I have read in an example somewhere that you
@@ -312,21 +327,56 @@ EVENT_SINK_INVOKE(MailItemEvents)
                 }
               return S_OK;
             }
+          else if (m_decrypt_after_write)
+            {
+              char *uuid = strdup (m_mail->get_uuid ().c_str());
+              CreateThread (NULL, 0, request_decrypt, (LPVOID) uuid, 0,
+                            NULL);
+            }
           break;
         }
       case Close:
         {
           if (m_mail->is_crypto_mail ())
             {
+              /* Close. This happens when an Opened mail is closed.
+                 To prevent the question of wether or not to save the changes
+                 (Which would save the decrypted data without an event to
+                 prevent it) we save proactively. This happens by set_needs_save
+                 and calling save. Which will revert a mail because we never want
+                 to save unreverted mails.
+
+                 But as a side effect the mail, if opened in the explorer still will
+                 be reverted, too. So shown as empty. This is bad. To prevent that
+                 we request a decrypt in the AfterWrite event.
+
+                 Evil Hack: Outlook sends an Unload event after the message is closed
+                 This is not true our Internal Object is kept alive if it is opened
+                 in the explorer. So we ignore the unload event and then check in
+                 the window message handler that checks for decrypt again if the
+                 mail is currently open in the active explorer. If not we delete our
+                 Mail object so that the message is released.
+              */
               m_mail->set_needs_save (true);
+              m_decrypt_after_write = true;
               invoke_oom_method (m_object, "Save", NULL);
             }
         }
       case Unload:
         {
-          log_debug ("%s:%s: Removing Mail for message: %p.",
-                     SRCNAME, __func__, m_object);
-          delete m_mail;
+          if (!m_decrypt_after_write)
+            {
+              log_debug ("%s:%s: Removing Mail for message: %p.",
+                         SRCNAME, __func__, m_object);
+              delete m_mail;
+            }
+          else
+            {
+              /* See explanation in Close why this is not broken. */
+              log_debug ("%s:%s: Ignoring unload for message: %p.",
+                         SRCNAME, __func__, m_object);
+              m_decrypt_after_write = false;
+            }
           return S_OK;
         }
       default:
diff --git a/src/windowmessages.cpp b/src/windowmessages.cpp
index 7825e9c..d7e9fdc 100644
--- a/src/windowmessages.cpp
+++ b/src/windowmessages.cpp
@@ -23,6 +23,7 @@
 #include "common.h"
 #include "oomhelp.h"
 #include "mail.h"
+#include "gpgoladdin.h"
 
 #include <stdio.h>
 
@@ -70,7 +71,47 @@ gpgol_window_proc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                   break;
                 }
               mail->parsing_done();
+              break;
             }
+          case (REQUEST_DECRYPT):
+            {
+              char *uuid = (char *) ctx->data;
+              auto mail = Mail::get_mail_for_uuid (uuid);
+              if (!mail)
+                {
+                  log_debug ("%s:%s: Decrypt again for uuid which is gone.",
+                             SRCNAME, __func__);
+                  xfree (uuid);
+                  break;
+                }
+              /* Check if we are still in the active explorer. */
+              LPDISPATCH mailitem = get_oom_object (GpgolAddin::get_instance()->get_application (),
+                                                    "ActiveExplorer.Selection.Item(1)");
+              if (!mailitem)
+                {
+                  log_debug ("%s:%s: Decrypt again but no selected mailitem.",
+                             SRCNAME, __func__);
+                  xfree (uuid);
+                  delete mail;
+                  break;
+                }
+
+              char *active_uuid = get_unique_id (mailitem, 0);
+              if (!active_uuid || strcmp (active_uuid, uuid))
+                {
+                  log_debug ("%s:%s: UUID mismatch",
+                             SRCNAME, __func__);
+                  xfree (uuid);
+                  delete mail;
+                  break;
+                }
+              xfree (uuid);
+              xfree (active_uuid);
+
+              mail->decrypt_verify ();
+              break;
+            }
+
           break;
           default:
             log_debug ("Unknown msg");
diff --git a/src/windowmessages.h b/src/windowmessages.h
index ec66f7b..3ebefec 100644
--- a/src/windowmessages.h
+++ b/src/windowmessages.h
@@ -40,8 +40,9 @@ typedef enum _gpgol_wmsg_type
   UNKNOWN = 0,
   REQUEST_SEND_MAIL = 1, /* Request to send a mail.
                             Data should be LPMAILITEM */
-  PARSING_DONE = 2 /* A mail was parsed. Data should be a pointer
+  PARSING_DONE = 2, /* A mail was parsed. Data should be a pointer
                       to the mail object. */
+  REQUEST_DECRYPT = 3
 } gpgol_wmsg_type;
 
 typedef struct

commit 71b06f0662a24f66381d349d8ee8da93a33f500b
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Oct 20 11:52:26 2016 +0200

    Revert all active mails on quit
    
    * src/application-events.cpp: Call revert_all_mails in quit event.
    
    --
    This prevents the Outlook Questions "Do you want to save the
    changes to the mails." As we save the mails first this also
    prevents the buggy Outlook / MAPI layer asymmetry that could
    lead to endless sync loops.

diff --git a/src/application-events.cpp b/src/application-events.cpp
index 44fe2b5..dbce53d 100644
--- a/src/application-events.cpp
+++ b/src/application-events.cpp
@@ -94,6 +94,11 @@ EVENT_SINK_INVOKE(ApplicationEvents)
           gpgoladdin_invalidate_ui ();
           break;
         }
+      case Quit:
+        {
+          log_debug ("%s:%s: Quit event", SRCNAME, __func__);
+          Mail::revert_all_mails();
+        }
       default:
         log_oom_extra ("%s:%s: Unhandled Event: %lx \n",
                        SRCNAME, __func__, dispid);

commit b8e39830594d87a41056e7d9dd8dff2ff4904aac
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Oct 20 11:49:49 2016 +0200

    Fix revert for new attachment code
    
    * src/revert.cpp (gpgol_mailitem_revert): Delete all attachments
    not markes as MOSS.

diff --git a/src/revert.cpp b/src/revert.cpp
index 719fdfb..d33642b 100644
--- a/src/revert.cpp
+++ b/src/revert.cpp
@@ -372,17 +372,7 @@ gpgol_mailitem_revert (LPDISPATCH mailitem)
 
       if (get_pa_int (attachment, GPGOL_ATTACHTYPE_DASL, (int*) &att_type))
         {
-          if (!is_smime && msgtype != MSGTYPE_GPGOL_OPAQUE_SIGNED)
-            {
-              /* The Opaque signed attachment does not have a gpgol type
-                 for some reason. So we fake this here */
-              att_type = ATTACHTYPE_MOSSTEMPL;
-            }
-          else
-            {
-              log_error ("%s:%s: Error: %i", SRCNAME, __func__, __LINE__);
-              goto done;
-            }
+          att_type = ATTACHTYPE_FROMMOSS;
         }
 
       switch (att_type)
@@ -469,8 +459,7 @@ gpgol_mailitem_revert (LPDISPATCH mailitem)
               break;
             }
           default:
-            log_error ("%s:%s: Unknown attachment type: %i",
-                       SRCNAME, __func__, att_type);
+            to_delete[del_cnt++] = attachment;
         }
     }
 

commit a4cb385ee539570d6a5d67a9c7651173905be0c3
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Oct 20 11:48:35 2016 +0200

    Save mail after revert_all_mails
    
    * src/mail.cpp (Mail::revert_all_mails): Save afterwards.
    (Mail::revert): Mark the the mail no longer needs wipe.

diff --git a/src/mail.cpp b/src/mail.cpp
index 84c39b5..572280b 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -780,6 +780,14 @@ Mail::revert_all_mails ()
         {
           log_error ("Failed to revert mail: %p ", it->first);
           err++;
+          continue;
+        }
+      it->second->set_needs_save (true);
+      if (!invoke_oom_method (it->first, "Save", NULL))
+        {
+          log_error ("Failed to save reverted mail: %p ", it->first);
+          err++;
+          continue;
         }
     }
   return err;
@@ -819,6 +827,7 @@ Mail::revert ()
     }
   /* We need to reprocess the mail next time around. */
   m_processed = false;
+  m_needs_wipe = false;
   return 0;
 }
 

commit 525680f952ed3f2e361c8582f5df3a12f07defb8
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Oct 20 11:47:18 2016 +0200

    Ensure parser thread handle is closed
    
    * src/mail.cpp (Mail::parsing_done): CloseHandle.
    (Mail::~Mail): Ditto.
    (Mail::decrypt_verify): Store handle.
    * src/mail.h: Add new member for Handle.

diff --git a/src/mail.cpp b/src/mail.cpp
index 1465836..84c39b5 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -95,7 +95,8 @@ Mail::Mail (LPDISPATCH mailitem) :
     m_is_valid(false),
     m_moss_position(0),
     m_sender(NULL),
-    m_type(MSGTYPE_UNKNOWN)
+    m_type(MSGTYPE_UNKNOWN),
+    m_parser_thread(NULL)
 {
   if (get_mail_for_item (mailitem))
     {
@@ -141,6 +142,11 @@ Mail::~Mail()
 
   xfree (m_sender);
   gpgol_release(m_mailitem);
+
+  if (m_parser_thread)
+    {
+      CloseHandle (m_parser_thread);
+    }
 }
 
 Mail *
@@ -526,8 +532,15 @@ Mail::decrypt_verify()
   m_parser = new ParseController (cipherstream, m_type);
   gpgol_release (cipherstream);
 
-  CreateThread (NULL, 0, do_parsing, (LPVOID) this, 0,
-                NULL);
+  m_parser_thread = CreateThread (NULL, 0, do_parsing, (LPVOID) this, 0,
+                                  NULL);
+
+  if (!m_parser_thread)
+    {
+      log_error ("%s:%s: Failed to create decrypt / verify thread.",
+                 SRCNAME, __func__);
+    }
+
   return 0;
 }
 
@@ -600,6 +613,11 @@ Mail::parsing_done()
   m_parser = nullptr;
   gpgoladdin_invalidate_ui ();
   TRACEPOINT;
+  if (m_parser_thread)
+    {
+      CloseHandle (m_parser_thread);
+      m_parser_thread = NULL;
+    }
   return;
 }
 
diff --git a/src/mail.h b/src/mail.h
index 83c10ab..1b69e2a 100644
--- a/src/mail.h
+++ b/src/mail.h
@@ -267,5 +267,6 @@ private:
   GpgME::Signature m_sig;
   GpgME::UserID m_uid;
   std::string m_uuid;
+  HANDLE m_parser_thread;
 };
 #endif // MAIL_H

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

Summary of changes:
 src/application-events.cpp |  5 ++++
 src/mail.cpp               | 22 +++++++++++++---
 src/mailitem-events.cpp    | 64 +++++++++++++++++++++++++++++++++++++++++-----
 src/revert.cpp             | 15 ++---------
 src/windowmessages.cpp     | 41 +++++++++++++++++++++++++++++
 src/windowmessages.h       |  3 ++-
 6 files changed, 127 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org



From cvs at cvs.gnupg.org  Thu Oct 20 13:02:08 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Thu, 20 Oct 2016 13:02:08 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-250-g9a34e21
Message-ID: <E1bxB6w-0005a6-St@lists.gnupg.org>

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  9a34e2142b426b98c73fd888102ea1596bbce62a (commit)
      from  b680f79cc112c4831293e259d7db2921bcd783a4 (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 9a34e2142b426b98c73fd888102ea1596bbce62a
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Oct 20 20:01:46 2016 +0900

    agent, g10: Fix keygen.
    
    * agent/command.c (cmd_readkey): Get length after card_readkey.
    * g10/keygen.c (gen_card_key): Fix off-by-one error.
    
    --
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/agent/command.c b/agent/command.c
index a291d5b..7d8b4c46 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1020,10 +1020,10 @@ cmd_readkey (assuan_context_t ctx, char *line)
           goto leave;
         }
 
-      pkbuflen = gcry_sexp_canon_len (pkbuf, 0, NULL, NULL);
       rc = agent_card_readkey (ctrl, keyid, &pkbuf);
       if (rc)
         goto leave;
+      pkbuflen = gcry_sexp_canon_len (pkbuf, 0, NULL, NULL);
       rc = gcry_sexp_sscan (&s_pkey, NULL, (char*)pkbuf, pkbuflen);
       if (rc)
         goto leave;
diff --git a/g10/keygen.c b/g10/keygen.c
index 90f8544..2115b5a 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -4876,7 +4876,7 @@ gen_card_key (int algo, int keyno, int is_primary, kbnode_t pub_root,
   unsigned char *public;
   gcry_sexp_t s_key;
 
-  snprintf (keyid, DIM(keyid)-1, "OPENPGP.%d", keyno);
+  snprintf (keyid, DIM(keyid), "OPENPGP.%d", keyno);
   keyid[DIM(keyid)-1] = 0;
 
   if (algo != PUBKEY_ALGO_RSA)

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

Summary of changes:
 agent/command.c | 2 +-
 g10/keygen.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Oct 20 14:19:38 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Thu, 20 Oct 2016 14:19:38 +0200
Subject: [git] GpgOL - branch, nomapi, updated. gpgol-1.4.0-117-gd90adfc
Message-ID: <E1bxCJw-0000V2-OT@lists.gnupg.org>

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 "GnuPG extension for MS Outlook".

The branch, nomapi has been updated
       via  d90adfc3d5e7b8aed8040f483a91914771ba2429 (commit)
       via  318ba6646a5564fdbde2eec027b84f2b3825d6bb (commit)
       via  1c0f6b6ac6281c13bd004ba4118aa88a12c50dc2 (commit)
      from  cb089330c44f37412a47501660b09d09cc382c45 (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 d90adfc3d5e7b8aed8040f483a91914771ba2429
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Oct 20 14:17:49 2016 +0200

    Convert mimemaker to cpp
    
    * src/Makefile.am (GpgOL_SOURCES): Update.
    * src/mimemaker.c: Removed.
    * src/mimemaker.cpp: New.

diff --git a/src/Makefile.am b/src/Makefile.am
index 4f242df..ae4ad97 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,7 +41,7 @@ gpgol_SOURCES = \
 	message.cpp message.h       \
 	revert.cpp revert.h         \
 	mimeparser.c mimeparser.h   \
-	mimemaker.c mimemaker.h     \
+	mimemaker.cpp mimemaker.h     \
 	msgcache.c msgcache.h       \
 	engine.c engine.h           \
         engine-assuan.c engine-assuan.h \
diff --git a/src/mimemaker.c b/src/mimemaker.cpp
similarity index 96%
rename from src/mimemaker.c
rename to src/mimemaker.cpp
index 235b844..56c9d9a 100644
--- a/src/mimemaker.c
+++ b/src/mimemaker.cpp
@@ -41,8 +41,9 @@
 #include "mapihelp.h"
 #include "mimemaker.h"
 #include "oomhelp.h"
+#include "gpgolstr.h"
 
-static const char oid_mimetag[] =
+static const unsigned char oid_mimetag[] =
     {0x2A, 0x86, 0x48, 0x86, 0xf7, 0x14, 0x03, 0x0a, 0x04};
 
 /* The base-64 list used for base64 encoding. */
@@ -73,7 +74,7 @@ int
 sink_std_write (sink_t sink, const void *data, size_t datalen)
 {
   HRESULT hr;
-  LPSTREAM stream = sink->cb_data;
+  LPSTREAM stream = static_cast<LPSTREAM>(sink->cb_data);
 
   if (!stream)
     {
@@ -83,7 +84,7 @@ sink_std_write (sink_t sink, const void *data, size_t datalen)
   if (!data)
     return 0;  /* Flush - nothing to do here.  */
 
-  hr = IStream_Write (stream, data, datalen, NULL);
+  hr = stream->Write(data, datalen, NULL);
   if (hr)
     {
       log_error ("%s:%s: Write failed: hr=%#lx", SRCNAME, __func__, hr);
@@ -97,7 +98,7 @@ int
 sink_file_write (sink_t sink, const void *data, size_t datalen)
 {
   HANDLE hFile = sink->cb_data;
-  DWORD written = NULL;
+  DWORD written = 0;
 
   if (!hFile || hFile == INVALID_HANDLE_VALUE)
     {
@@ -152,7 +153,7 @@ create_mapi_attachment (LPMESSAGE message, sink_t sink)
 
   sink->cb_data = NULL;
   sink->writefnc = NULL;
-  hr = IMessage_CreateAttach (message, NULL, 0, &pos, &att);
+  hr = message->CreateAttach(NULL, 0, &pos, &att);
   if (hr)
     {
       log_error ("%s:%s: can't create attachment: hr=%#lx\n",
@@ -185,7 +186,7 @@ create_mapi_attachment (LPMESSAGE message, sink_t sink)
 
   /* We better insert a short filename. */
   prop.ulPropTag = PR_ATTACH_FILENAME_A;
-  prop.Value.lpszA = MIMEATTACHFILENAME;
+  prop.Value.lpszA = GpgOLStr (MIMEATTACHFILENAME);
   hr = HrSetOneProp ((LPMAPIPROP)att, &prop);
   if (hr)
     {
@@ -205,7 +206,7 @@ create_mapi_attachment (LPMESSAGE message, sink_t sink)
   if (!hr)
     {
       prop.ulPropTag = PR_ATTACH_MIME_TAG_A;
-      prop.Value.lpszA = "multipart/signed";
+      prop.Value.lpszA = GpgOLStr("multipart/signed");
       hr = HrSetOneProp ((LPMAPIPROP)att, &prop);
     }
   if (hr)
@@ -216,8 +217,8 @@ create_mapi_attachment (LPMESSAGE message, sink_t sink)
     }
 
   punk = NULL;
-  hr = IAttach_OpenProperty (att, PR_ATTACH_DATA_BIN, &IID_IStream, 0,
-                             (MAPI_CREATE|MAPI_MODIFY), &punk);
+  hr = att->OpenProperty(PR_ATTACH_DATA_BIN, &IID_IStream, 0,
+                         (MAPI_CREATE|MAPI_MODIFY), &punk);
   if (FAILED (hr))
     {
       log_error ("%s:%s: can't create output stream: hr=%#lx\n",
@@ -229,7 +230,7 @@ create_mapi_attachment (LPMESSAGE message, sink_t sink)
   return att;
 
  failure:
-  IAttach_Release (att);
+  gpgol_release (att);
   return NULL;
 }
 
@@ -252,7 +253,7 @@ write_buffer (sink_t sink, const void *data, size_t datalen)
 int
 write_buffer_for_cb (void *opaque, const void *data, size_t datalen)
 {
-  sink_t sink = opaque;
+  sink_t sink = (sink_t) opaque;
   sink->enc_counter += datalen;
   return write_buffer (sink, data, datalen) ? -1 : datalen;
 }
@@ -318,7 +319,7 @@ write_b64 (sink_t sink, const void *data, size_t datalen)
   log_debug ("  writing base64 of length %d\n", (int)datalen);
   idx = quads = 0;
   outlen = 0;
-  for (p = data; datalen; p++, datalen--)
+  for (p = (const unsigned char*)data; datalen; p++, datalen--)
     {
       inbuf[idx++] = *p;
       if (idx > 2)
@@ -419,7 +420,7 @@ write_qp (sink_t sink, const void *data, size_t datalen)
 
   log_debug ("  writing qp of length %d\n", (int)datalen);
   outidx = 0;
-  for (p = data; datalen; p++, datalen--)
+  for (p = (const unsigned char*) data; datalen; p++, datalen--)
     {
       if ((datalen > 1 && *p == '\r' && p[1] == '\n') || *p == '\n')
         {
@@ -507,7 +508,7 @@ write_plain (sink_t sink, const void *data, size_t datalen)
 
   log_debug ("  writing ascii of length %d\n", (int)datalen);
   outidx = 0;
-  for (p = data; datalen; p++, datalen--)
+  for (p = (const unsigned char*) data; datalen; p++, datalen--)
     {
       if ((datalen > 1 && *p == '\r' && p[1] == '\n') || *p == '\n')
         {
@@ -725,7 +726,7 @@ infer_content_encoding (const void *data, size_t datalen)
   ntotal = datalen;
   len = maxlen = lowbin = highbin = 0;
   need_qp = 0;
-  for (p = data; datalen; p++, datalen--)
+  for (p = (const unsigned char*) data; datalen; p++, datalen--)
     {
       len++;
       if ((*p & 0x80))
@@ -1012,7 +1013,7 @@ delete_all_attachments (LPMESSAGE message, mapi_attach_item_t *table)
             && table[idx].filename
             && !strcmp (table[idx].filename, MIMEATTACHFILENAME))
           continue;
-        hr = IMessage_DeleteAttach (message, table[idx].mapipos, 0, NULL, 0);
+        hr = message->DeleteAttach (table[idx].mapipos, 0, NULL, 0);
         if (hr)
           {
             log_error ("%s:%s: DeleteAttach failed: hr=%#lx\n",
@@ -1033,30 +1034,30 @@ static int
 close_mapi_attachment (LPATTACH *attach, sink_t sink)
 {
   HRESULT hr;
-  LPSTREAM stream = sink? sink->cb_data : NULL;
+  LPSTREAM stream = sink ? (LPSTREAM) sink->cb_data : NULL;
 
   if (!stream)
     {
       log_error ("%s:%s: sink not setup", SRCNAME, __func__);
       return -1;
     }
-  hr = IStream_Commit (stream, 0);
+  hr = stream->Commit (0);
   if (hr)
     {
       log_error ("%s:%s: Commiting output stream failed: hr=%#lx",
                  SRCNAME, __func__, hr);
       return -1;
     }
-  IStream_Release (stream);
+  gpgol_release (stream);
   sink->cb_data = NULL;
-  hr = IAttach_SaveChanges (*attach, 0);
+  hr = (*attach)->SaveChanges (0);
   if (hr)
     {
       log_error ("%s:%s: SaveChanges of the attachment failed: hr=%#lx\n",
                  SRCNAME, __func__, hr);
       return -1;
     }
-  IAttach_Release (*attach);
+  gpgol_release ((*attach));
   *attach = NULL;
   return 0;
 }
@@ -1069,18 +1070,18 @@ close_mapi_attachment (LPATTACH *attach, sink_t sink)
 static void
 cancel_mapi_attachment (LPATTACH *attach, sink_t sink)
 {
-  LPSTREAM stream = sink? sink->cb_data : NULL;
+  LPSTREAM stream = sink ? (LPSTREAM) sink->cb_data : NULL;
 
   if (stream)
     {
-      IStream_Revert (stream);
-      IStream_Release (stream);
+      stream->Revert();
+      gpgol_release (stream);
       sink->cb_data = NULL;
     }
   if (*attach)
     {
       /* Fixme: Should we try to delete it or is there a Revert method? */
-      IAttach_Release (*attach);
+      gpgol_release ((*attach));
       *attach = NULL;
     }
 }
@@ -1097,8 +1098,8 @@ finalize_message (LPMESSAGE message, mapi_attach_item_t *att_table,
 
   /* Set the message class.  */
   prop.ulPropTag = PR_MESSAGE_CLASS_A;
-  prop.Value.lpszA = "IPM.Note.SMIME.MultipartSigned";
-  hr = IMessage_SetProps (message, 1, &prop, NULL);
+  prop.Value.lpszA = GpgOLStr ("IPM.Note.SMIME.MultipartSigned");
+  hr = message->SetProps(1, &prop, NULL);
   if (hr)
     {
       log_error ("%s:%s: error setting the message class: hr=%#lx\n",
@@ -1143,7 +1144,7 @@ static int
 sink_hashing_write (sink_t hashsink, const void *data, size_t datalen)
 {
   int rc;
-  engine_filter_t filter = hashsink->cb_data;
+  engine_filter_t filter = (engine_filter_t) hashsink->cb_data;
 
   if (!filter || !hashsink->extrasink)
     {
@@ -1163,12 +1164,12 @@ sink_hashing_write (sink_t hashsink, const void *data, size_t datalen)
 static int
 collect_signature (void *opaque, const void *data, size_t datalen)
 {
-  struct databuf_s *db = opaque;
+  struct databuf_s *db = (databuf_s *)opaque;
 
   if (db->len + datalen >= db->size)
     {
       db->size += datalen + 1024;
-      db->buf = xrealloc (db->buf, db->size);
+      db->buf = (char*) xrealloc (db->buf, db->size);
     }
   memcpy (db->buf + db->len, data, datalen);
   db->len += datalen;
@@ -1402,10 +1403,10 @@ do_mime_sign (LPMESSAGE message, HWND hwnd, protocol_t protocol,
   {
     HRESULT hr;
     LARGE_INTEGER off;
-    LPSTREAM stream = sink->cb_data;
+    LPSTREAM stream = (LPSTREAM) sink->cb_data;
 
     off.QuadPart = 0;
-    hr = IStream_Seek (stream, off, STREAM_SEEK_SET, NULL);
+    hr = stream->Seek (off, STREAM_SEEK_SET, NULL);
     if (hr)
       {
         log_error ("%s:%s: seeking back to the begin failed: hr=%#lx",
@@ -1417,7 +1418,7 @@ do_mime_sign (LPMESSAGE message, HWND hwnd, protocol_t protocol,
                                protocol, 1, boundary,
                                protocol == PROTOCOL_SMIME? "sha1":"pgp-sha1");
 
-    hr = IStream_Write (stream, top_header, strlen (top_header), NULL);
+    hr = stream->Write (top_header, strlen (top_header), NULL);
     if (hr)
       {
         log_error ("%s:%s: writing fixed micalg failed: hr=%#lx",
@@ -1427,7 +1428,7 @@ do_mime_sign (LPMESSAGE message, HWND hwnd, protocol_t protocol,
 
     /* Better seek again to the end. */
     off.QuadPart = 0;
-    hr = IStream_Seek (stream, off, STREAM_SEEK_END, NULL);
+    hr = stream->Seek (off, STREAM_SEEK_END, NULL);
     if (hr)
       {
         log_error ("%s:%s: seeking back to the end failed: hr=%#lx",
@@ -1491,7 +1492,7 @@ mime_sign (LPMESSAGE message, HWND hwnd, protocol_t protocol,
 int
 sink_encryption_write (sink_t encsink, const void *data, size_t datalen)
 {
-  engine_filter_t filter = encsink->cb_data;
+  engine_filter_t filter = (engine_filter_t) encsink->cb_data;
 
   if (!filter)
     {
@@ -1874,7 +1875,7 @@ mime_sign_encrypt (LPMESSAGE message, HWND hwnd,
   hr = OpenStreamOnFile (MAPIAllocateBuffer, MAPIFreeBuffer,
                          (SOF_UNIQUEFILENAME | STGM_DELETEONRELEASE
                           | STGM_CREATE | STGM_READWRITE),
-                         NULL, "GPG", &tmpstream);
+                         NULL, GpgOLStr("GPG"), &tmpstream);
   if (FAILED (hr))
     {
       log_error ("%s:%s: can't create temp file: hr=%#lx\n",
@@ -1953,7 +1954,7 @@ mime_sign_encrypt (LPMESSAGE message, HWND hwnd,
     char buffer[4096];
 
     off.QuadPart = 0;
-    hr = IStream_Seek (tmpstream, off, STREAM_SEEK_SET, NULL);
+    hr = tmpstream->Seek (off, STREAM_SEEK_SET, NULL);
     if (hr)
       {
         log_error ("%s:%s: seeking back to the begin failed: hr=%#lx",
@@ -1964,7 +1965,7 @@ mime_sign_encrypt (LPMESSAGE message, HWND hwnd,
 
     for (;;)
       {
-        hr = IStream_Read (tmpstream, buffer, sizeof buffer, &nread);
+        hr = tmpstream->Read (buffer, sizeof buffer, &nread);
         if (hr)
           {
             log_error ("%s:%s: IStream::Read failed: hr=%#lx",
@@ -2017,8 +2018,7 @@ mime_sign_encrypt (LPMESSAGE message, HWND hwnd,
     log_debug ("%s:%s: failed rc=%d (%s) <%s>", SRCNAME, __func__, rc,
                gpg_strerror (rc), gpg_strsource (rc));
   engine_cancel (filter);
-  if (tmpstream)
-    IStream_Release (tmpstream);
+  gpgol_release (tmpstream);
   mapi_release_attach_table (att_table);
   xfree (my_sender);
   return result;

commit 318ba6646a5564fdbde2eec027b84f2b3825d6bb
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Oct 20 14:16:48 2016 +0200

    Convert body encoding using mlang
    
    * src/mail.cpp (Mail::update_body): Convert bodies.

diff --git a/src/mail.cpp b/src/mail.cpp
index efe5a29..4a5c67e 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -33,6 +33,7 @@
 #include "parsecontroller.h"
 #include "gpgolstr.h"
 #include "windowmessages.h"
+#include "mlang-charset.h"
 
 #include <gpgme++/tofuinfo.h>
 #include <gpgme++/verificationresult.h>
@@ -555,23 +556,28 @@ Mail::update_body()
   const auto html = m_parser->get_html_body();
   if (!html.empty())
     {
-      if (put_oom_string (m_mailitem, "HTMLBody", html.c_str()))
+      char *converted = ansi_charset_to_utf8 (m_parser->get_html_charset().c_str(),
+                                              html.c_str(), html.size());
+      int ret = put_oom_string (m_mailitem, "HTMLBody", converted ? converted : "");
+      xfree (converted);
+      if (ret)
         {
           log_error ("%s:%s: Failed to modify html body of item.",
                      SRCNAME, __func__);
-          return;
         }
+      return;
     }
-  else
+  const auto body = m_parser->get_body();
+  char *converted = ansi_charset_to_utf8 (m_parser->get_body_charset().c_str(),
+                                          body.c_str(), body.size());
+  int ret = put_oom_string (m_mailitem, "Body", converted ? converted : "");
+  xfree (converted);
+  if (ret)
     {
-      const auto body = m_parser->get_body();
-      if (put_oom_string (m_mailitem, "Body", body.c_str()))
-        {
-          log_error ("%s:%s: Failed to modify body of item.",
-                     SRCNAME, __func__);
-          return;
-        }
+      log_error ("%s:%s: Failed to modify body of item.",
+                 SRCNAME, __func__);
     }
+  return;
 }
 
 void

commit 1c0f6b6ac6281c13bd004ba4118aa88a12c50dc2
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Oct 20 14:14:36 2016 +0200

    Use const input ptr for mlang conversion
    
    * src/mlang-charset.cpp, src/mlang-charset.h (ansi_charset_to_utf8):
    Take input as const.
    
    --
    Internally we cast the constness away anyway but this is just
    because microsoft created bad API it does not actually modify
    the input.

diff --git a/src/mlang-charset.cpp b/src/mlang-charset.cpp
index 128a428..0e60492 100644
--- a/src/mlang-charset.cpp
+++ b/src/mlang-charset.cpp
@@ -30,7 +30,7 @@ DEFINE_GUID (IID_IMultiLanguage, 0x275c23e1,0x3747,0x11d0,0x9f,
 
 #include "mlang-charset.h"
 
-char *ansi_charset_to_utf8 (const char *charset, char *input,
+char *ansi_charset_to_utf8 (const char *charset, const char *input,
                             size_t inlen)
 {
   LPMULTILANGUAGE multilang = NULL;
@@ -79,7 +79,7 @@ char *ansi_charset_to_utf8 (const char *charset, char *input,
                                               mime_info.uiInternetEncoding;
 
   /** Get the size of the result */
-  err = multilang->ConvertStringToUnicode(&mode, enc, input,
+  err = multilang->ConvertStringToUnicode(&mode, enc, const_cast<char*>(input),
                                           &uinlen, NULL, &wlen);
   if (FAILED (err))
     {
@@ -90,8 +90,8 @@ char *ansi_charset_to_utf8 (const char *charset, char *input,
   }
   buf = (wchar_t*) xmalloc(sizeof(wchar_t) * (wlen + 1));
 
-  err = multilang->ConvertStringToUnicode(&mode, enc, input, &uinlen,
-                                          buf, &wlen);
+  err = multilang->ConvertStringToUnicode(&mode, enc, const_cast<char*>(input),
+                                          &uinlen, buf, &wlen);
   gpgol_release (multilang);
   if (FAILED (err))
     {
diff --git a/src/mlang-charset.h b/src/mlang-charset.h
index 470ec02..d912c55 100644
--- a/src/mlang-charset.h
+++ b/src/mlang-charset.h
@@ -36,7 +36,7 @@ extern "C" {
   * @returns NULL on error or an UTF-8 encoded NULL terminated string.
   */
 
-char *ansi_charset_to_utf8 (const char *charset, char *input,
+char *ansi_charset_to_utf8 (const char *charset, const char *input,
                             size_t inlen);
 #ifdef __cplusplus
 }

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

Summary of changes:
 src/Makefile.am                    |  2 +-
 src/mail.cpp                       | 26 ++++++++-----
 src/{mimemaker.c => mimemaker.cpp} | 80 +++++++++++++++++++-------------------
 src/mlang-charset.cpp              |  8 ++--
 src/mlang-charset.h                |  2 +-
 5 files changed, 62 insertions(+), 56 deletions(-)
 rename src/{mimemaker.c => mimemaker.cpp} (96%)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org



From cvs at cvs.gnupg.org  Thu Oct 20 17:04:15 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Thu, 20 Oct 2016 17:04:15 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-255-g71158d8
Message-ID: <E1bxEtH-00005I-Lm@lists.gnupg.org>

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  71158d8d5f823888abc8588caa6497860ce59c06 (commit)
       via  ca9597f080f70a8435daaeb5449bef0462a1402a (commit)
       via  8c7c4faf3de28ca70a60e6b15f51c1b206e0ddd9 (commit)
       via  bf37916a23bd0929fc4a5f28c9a41f43c5a473f6 (commit)
       via  2d794779e0fd9d9a1efc98e7bd77a296a25f4293 (commit)
      from  9a34e2142b426b98c73fd888102ea1596bbce62a (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 71158d8d5f823888abc8588caa6497860ce59c06
Author: Justus Winter <justus at g10code.com>
Date:   Thu Oct 20 16:54:06 2016 +0200

    tests: Simplify test.
    
    * tests/openpgp/quick-key-manipulation.scm: Avoid creating a temporary
    home directory, just make the uids unique.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/openpgp/quick-key-manipulation.scm b/tests/openpgp/quick-key-manipulation.scm
index 8a3e3f1..b6411d0 100755
--- a/tests/openpgp/quick-key-manipulation.scm
+++ b/tests/openpgp/quick-key-manipulation.scm
@@ -33,55 +33,50 @@
 		   `(--with-fingerprint
 		     --list-secret-keys ,(exact id))))))
 
-(define old-home (getenv "GNUPGHOME"))
-(define alpha "Alpha <alpha at example.net>")
-(define bravo "Bravo <bravo at example.net>")
+(define alpha "Alpha <alpha at invalid.example.net>")
+(define bravo "Bravo <bravo at invalid.example.net>")
 
 (define (key-data key)
   (filter (lambda (x) (or (string=? (car x) "pub")
                           (string=? (car x) "sub")))
           (gpg-with-colons `(-k ,key))))
 
-(with-temporary-working-directory
- (file-copy (path-join old-home "gpg.conf") "gpg.conf")
- (file-copy (path-join old-home "gpg-agent.conf") "gpg-agent.conf")
- (setenv "GNUPGHOME" "." #t)
- (setenv "PINENTRY_USER_DATA" "test" #t)
+(setenv "PINENTRY_USER_DATA" "test" #t)
 
- (info "Checking quick key generation...")
- (call-check `(, at GPG --quick-gen-key ,alpha))
+(info "Checking quick key generation...")
+(call-check `(, at GPG --quick-gen-key ,alpha))
 
- (call-check `(, at GPG --check-trustdb)) ; XXX why?
+(call-check `(, at GPG --check-trustdb)) ; XXX why?
 
- (assert (= 1 (count-uids-of-secret-key alpha)))
+(assert (= 1 (count-uids-of-secret-key alpha)))
 
- (info "Checking that we can add a user ID...")
+(info "Checking that we can add a user ID...")
 
- ;; Make sure the key capabilities don't change when we add a user id.
- ;; (See bug #2697.)
- (let ((pre (key-data (exact alpha)))
-       (result (call-check `(, at GPG --quick-adduid ,(exact alpha) ,bravo)))
-       (post (key-data (exact alpha))))
-   (if (not (equal? pre post))
-       (begin
-         (display "Key capabilities changed when adding a user id:")
-         (newline)
-         (display "  Pre: ")
-         (display pre)
-         (newline)
-         (display " Post: ")
-         (display post)
-         (newline)
-         (exit 1))))
+;; Make sure the key capabilities don't change when we add a user id.
+;; (See bug #2697.)
+(let ((pre (key-data (exact alpha)))
+      (result (call-check `(, at GPG --quick-adduid ,(exact alpha) ,bravo)))
+      (post (key-data (exact alpha))))
+  (if (not (equal? pre post))
+      (begin
+	(display "Key capabilities changed when adding a user id:")
+	(newline)
+	(display "  Pre: ")
+	(display pre)
+	(newline)
+	(display " Post: ")
+	(display post)
+	(newline)
+	(exit 1))))
 
- (call-check `(, at GPG --check-trustdb)) ; XXX why?
+(call-check `(, at GPG --check-trustdb)) ; XXX why?
 
- (assert (= 2 (count-uids-of-secret-key alpha)))
- (assert (= 2 (count-uids-of-secret-key bravo)))
+(assert (= 2 (count-uids-of-secret-key alpha)))
+(assert (= 2 (count-uids-of-secret-key bravo)))
 
- (info "Checking that we can revoke a user ID...")
- (call-check `(, at GPG --quick-revuid ,(exact bravo) ,alpha))
+(info "Checking that we can revoke a user ID...")
+(call-check `(, at GPG --quick-revuid ,(exact bravo) ,alpha))
 
- (call-check `(, at GPG --check-trustdb)) ; XXX why?
+(call-check `(, at GPG --check-trustdb)) ; XXX why?
 
- (assert (= 1 (count-uids-of-secret-key bravo))))
+(assert (= 1 (count-uids-of-secret-key bravo)))

commit ca9597f080f70a8435daaeb5449bef0462a1402a
Author: Justus Winter <justus at g10code.com>
Date:   Thu Oct 20 16:50:11 2016 +0200

    tests: Flush stdout in the fake pinentry.
    
    * tests/openpgp/fake-pinentry.c (reply): Flush stdout.
    
    Fixes-commit: 94504b3d5af126abb591dedda1ca0f0970822f55
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/openpgp/fake-pinentry.c b/tests/openpgp/fake-pinentry.c
index 6ef6126..ce89765 100644
--- a/tests/openpgp/fake-pinentry.c
+++ b/tests/openpgp/fake-pinentry.c
@@ -42,6 +42,7 @@ reply (const char *fmt, ...)
   result = vprintf (fmt, ap);
   va_end (ap);
 
+  fflush (stdout);
   return result;
 }
 

commit 8c7c4faf3de28ca70a60e6b15f51c1b206e0ddd9
Author: Justus Winter <justus at g10code.com>
Date:   Thu Oct 20 16:45:18 2016 +0200

    common,w32: Fix setting environment variables on Windows.
    
    * common/sysutils.c (gnupg_setenv): Also update the environment block
    maintained by the C runtime.
    (gnupg_unsetenv): Likewise.
    * tests/gpgscm/ffi.c (do_setenv): Fix error handling.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/common/sysutils.c b/common/sysutils.c
index 2e663bc..85eb203 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -754,38 +754,51 @@ gnupg_setenv (const char *name, const char *value, int overwrite)
   (void)value;
   (void)overwrite;
   return 0;
-#elif defined(HAVE_W32_SYSTEM)
-  if (!overwrite)
-    {
-      char tmpbuf[10];
-      if (GetEnvironmentVariable (name, tmpbuf, sizeof tmpbuf))
-        return 0; /* Exists but overwrite was not requested.  */
-    }
-  if (!SetEnvironmentVariable (name, value))
-    {
-      gpg_err_set_errno (EINVAL); /* (Might also be ENOMEM.) */
-      return -1;
-    }
-  return 0;
-#elif defined(HAVE_SETENV)
-  return setenv (name, value, overwrite);
 #else
-  char *buf;
+#if defined(HAVE_W32_SYSTEM)
+  /*  Windows maintains (at least) two sets of environment variables.
+      One set can be accessed by GetEnvironmentVariable and
+      SetEnvironmentVariable.  This set is inherited by the children.
+      The other set is maintained in the C runtime, and is accessed
+      using getenv and putenv.  We try to keep them in sync by
+      modifying both sets.  */
+  {
+    int exists;
+    char tmpbuf[10];
+    exists = GetEnvironmentVariable (name, tmpbuf, sizeof tmpbuf);
+
+    if ((! exists || overwrite) && !SetEnvironmentVariable (name, value))
+      {
+        gpg_err_set_errno (EINVAL); /* (Might also be ENOMEM.) */
+        return -1;
+      }
+  }
+#endif
 
-  (void)overwrite;
-  if (!name || !value)
+#if defined(HAVE_SETENV)
+  return setenv (name, value, overwrite);
+#else
+  if (! getenv (name) || overwrite)
     {
-      gpg_err_set_errno (EINVAL);
-      return -1;
-    }
-  buf = xtrymalloc (strlen (name) + 1 + strlen (value) + 1);
-  if (!buf)
-    return -1;
-  strcpy (stpcpy (stpcpy (buf, name), "="), value);
+      char *buf;
+
+      (void)overwrite;
+      if (!name || !value)
+        {
+          gpg_err_set_errno (EINVAL);
+          return -1;
+        }
+      buf = xtrymalloc (strlen (name) + 1 + strlen (value) + 1);
+      if (!buf)
+        return -1;
+      strcpy (stpcpy (stpcpy (buf, name), "="), value);
 #if __GNUC__
 # warning no setenv - using putenv but leaking memory.
 #endif
-  return putenv (buf);
+      return putenv (buf);
+    }
+  return 0;
+#endif
 #endif
 }
 
@@ -796,30 +809,40 @@ gnupg_unsetenv (const char *name)
 #ifdef HAVE_W32CE_SYSTEM
   (void)name;
   return 0;
-#elif defined(HAVE_W32_SYSTEM)
+#else
+#if defined(HAVE_W32_SYSTEM)
+  /*  Windows maintains (at least) two sets of environment variables.
+      One set can be accessed by GetEnvironmentVariable and
+      SetEnvironmentVariable.  This set is inherited by the children.
+      The other set is maintained in the C runtime, and is accessed
+      using getenv and putenv.  We try to keep them in sync by
+      modifying both sets.  */
   if (!SetEnvironmentVariable (name, NULL))
     {
       gpg_err_set_errno (EINVAL); /* (Might also be ENOMEM.) */
       return -1;
     }
-  return 0;
-#elif defined(HAVE_UNSETENV)
+#endif
+#if defined(HAVE_UNSETENV)
   return unsetenv (name);
 #else
-  char *buf;
-
-  if (!name)
-    {
-      gpg_err_set_errno (EINVAL);
+  {
+    char *buf;
+
+    if (!name)
+      {
+        gpg_err_set_errno (EINVAL);
+        return -1;
+      }
+    buf = xtrystrdup (name);
+    if (!buf)
       return -1;
-    }
-  buf = xtrystrdup (name);
-  if (!buf)
-    return -1;
 #if __GNUC__
 # warning no unsetenv - trying putenv but leaking memory.
 #endif
-  return putenv (buf);
+    return putenv (buf);
+  }
+#endif
 #endif
 }
 
diff --git a/tests/gpgscm/ffi.c b/tests/gpgscm/ffi.c
index a0fbe2e..8e21ba6 100644
--- a/tests/gpgscm/ffi.c
+++ b/tests/gpgscm/ffi.c
@@ -236,7 +236,9 @@ do_setenv (scheme *sc, pointer args)
   FFI_ARG_OR_RETURN (sc, char *, value, string, args);
   FFI_ARG_OR_RETURN (sc, int, overwrite, bool, args);
   FFI_ARGS_DONE_OR_RETURN (sc, args);
-  FFI_RETURN_ERR (sc, gnupg_setenv (name, value, overwrite));
+  if (gnupg_setenv (name, value, overwrite))
+    FFI_RETURN_ERR (sc, gpg_error_from_syserror ());
+  FFI_RETURN (sc);
 }
 
 static pointer

commit bf37916a23bd0929fc4a5f28c9a41f43c5a473f6
Author: Justus Winter <justus at g10code.com>
Date:   Thu Oct 20 16:41:18 2016 +0200

    tests,w32: Cope with Windows line endings.
    
    * tests/openpgp/issue2015.scm: Rstrip line before comparison.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/openpgp/issue2015.scm b/tests/openpgp/issue2015.scm
index 536cb8f..e51ece4 100755
--- a/tests/openpgp/issue2015.scm
+++ b/tests/openpgp/issue2015.scm
@@ -25,5 +25,6 @@
 
 (let ((response (call-popen `(,(tool 'gpg-connect-agent))
 			    "GET_PASSPHRASE --no-ask some_id X X X")))
-  (unless (string=? response "OK 736F6D655F70617373706872617365\n")
+  (unless (string=? (string-rtrim char-whitespace? response)
+		    "OK 736F6D655F70617373706872617365")
 	  (error "Could not retrieve passphrase from cache:" response)))

commit 2d794779e0fd9d9a1efc98e7bd77a296a25f4293
Author: Justus Winter <justus at g10code.com>
Date:   Thu Oct 20 11:37:26 2016 +0200

    tests: Create and remove socket directories.
    
    * tests/openpgp/defs.scm (start-agent): Move function here and create
    the socket directory prior to starting the agent.
    (stop-agent): Move function here and remove the socket directory.
    * tests/openpgp/finish.scm: Adapt.
    * tests/openpgp/setup.scm: Likewise.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm
index e484e86..48ac46c 100644
--- a/tests/openpgp/defs.scm
+++ b/tests/openpgp/defs.scm
@@ -146,3 +146,20 @@
 (let ((verbose (string->number (getenv "verbose"))))
   (if (number? verbose)
       (*set-verbose!* verbose)))
+
+;; Create the socket dir and start the agent.
+(define (start-agent)
+  (echo "Starting gpg-agent...")
+  (catch (echo "Warning: Creating socket directory failed:" (car *error*))
+	 (call-popen `(,(tool 'gpgconf) --create-socketdir) ""))
+  (call-check `(,(tool 'gpg-connect-agent) --verbose
+		,(string-append "--agent-program=" (tool 'gpg-agent)
+				"|--debug-quick-random")
+		/bye)))
+
+;; Stop the agent and remove the socket dir.
+(define (stop-agent)
+  (echo "Stopping gpg-agent...")
+  (catch (echo "Warning: Removing socket directory failed.")
+	 (call-popen `(,(tool 'gpgconf) --remove-socketdir) ""))
+  (call-check `(,(tool 'gpg-connect-agent) --verbose killagent /bye)))
diff --git a/tests/openpgp/finish.scm b/tests/openpgp/finish.scm
index 48801c8..37845ae 100755
--- a/tests/openpgp/finish.scm
+++ b/tests/openpgp/finish.scm
@@ -19,5 +19,4 @@
 
 (load (with-path "defs.scm"))
 
-(echo "Killing gpg-agent...")
-(call-check `(,(tool 'gpg-connect-agent) --verbose killagent /bye))
+(stop-agent)
diff --git a/tests/openpgp/setup.scm b/tests/openpgp/setup.scm
index 75310d1..99fbdea 100755
--- a/tests/openpgp/setup.scm
+++ b/tests/openpgp/setup.scm
@@ -95,13 +95,7 @@
    (pipe:spawn `(, at GPG --dearmor))
    (pipe:spawn `(, at GPG --yes --import))))
 
-(define (start-agent)
-  (echo "Starting gpg-agent...")
-  (call-check `(,(tool 'gpg-connect-agent) --verbose
-		,(string-append "--agent-program=" (tool 'gpg-agent)
-				"|--debug-quick-random")
-		/bye))
-
+(define (preset-passphrases)
   (info "Preset passphrases")
   ;; one at example.com
   (call-check `(,(tool 'gpg-preset-passphrase)
@@ -119,19 +113,18 @@
 		"A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD"))
   (echo "All set up."))
 
-(define (kill-agent)
-  (call-check `(,(tool 'gpg-connect-agent) --verbose killagent /bye)))
-
 (cond
  ((member "--create-tarball" *args*)
   (with-temporary-working-directory
    (setenv "GNUPGHOME" (getcwd) #t)
    (create-gpghome)
-   (kill-agent)
+   (stop-agent)
    (call-check `(,(tool 'gpgtar) --create --output ,(cadr *args*) "."))))
  ((member "--unpack-tarball" *args*)
   (call-check `(,(tool 'gpgtar) --extract --directory=. ,(cadr *args*)))
-  (start-agent))
+  (start-agent)
+  (preset-passphrases))
  (else
   (create-gpghome)
-  (start-agent)))
+  (start-agent)
+  (preset-passphrases)))

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

Summary of changes:
 common/sysutils.c                        | 101 +++++++++++++++++++------------
 tests/gpgscm/ffi.c                       |   4 +-
 tests/openpgp/defs.scm                   |  17 ++++++
 tests/openpgp/fake-pinentry.c            |   1 +
 tests/openpgp/finish.scm                 |   3 +-
 tests/openpgp/issue2015.scm              |   3 +-
 tests/openpgp/quick-key-manipulation.scm |  67 ++++++++++----------
 tests/openpgp/setup.scm                  |  19 ++----
 8 files changed, 123 insertions(+), 92 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Oct 21 04:00:21 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Fri, 21 Oct 2016 04:00:21 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-256-g1ffd475
Message-ID: <E1bxP8B-00023S-Mo@lists.gnupg.org>

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  1ffd475f99eaff4e40950eda88702f8db9288eb5 (commit)
      from  71158d8d5f823888abc8588caa6497860ce59c06 (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 1ffd475f99eaff4e40950eda88702f8db9288eb5
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Oct 21 10:57:29 2016 +0900

    agent: Fix saving with FORCE=1.
    
    * agent/findkey.c (agent_write_private_key): Recover from an error of
    GPG_ERR_ENOENT when FORCE=1 and it is opened with "rb+".
    
    --
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/agent/findkey.c b/agent/findkey.c
index 23e94f0..162e8c2 100644
--- a/agent/findkey.c
+++ b/agent/findkey.c
@@ -152,17 +152,30 @@ agent_write_private_key (const unsigned char *grip,
   if (!fp)
     {
       gpg_error_t tmperr = gpg_error_from_syserror ();
-      log_error ("can't create '%s': %s\n", fname, gpg_strerror (tmperr));
-      xfree (fname);
-      return tmperr;
-    }
 
-  /* See if an existing key is in extended format.  */
-  if (force)
+      if (force && gpg_err_code (tmperr) == GPG_ERR_ENOENT)
+        {
+          fp = es_fopen (fname, "wbx,mode=-rw");
+          if (!fp)
+            {
+              tmperr = gpg_error_from_syserror ();
+              goto error;
+            }
+        }
+      else
+        {
+        error:
+          log_error ("can't create '%s': %s\n", fname, gpg_strerror (tmperr));
+          xfree (fname);
+          return tmperr;
+        }
+    }
+  else if (force)
     {
       gpg_error_t rc;
       char first;
 
+      /* See if an existing key is in extended format.  */
       if (es_fread (&first, 1, 1, fp) != 1)
         {
           rc = gpg_error_from_syserror ();

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

Summary of changes:
 agent/findkey.c | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Oct 21 05:07:04 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Fri, 21 Oct 2016 05:07:04 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-257-g6e85ac7
Message-ID: <E1bxQAk-0006VX-QA@lists.gnupg.org>

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  6e85ac77af594035137950d801d8a1bacce548a3 (commit)
      from  1ffd475f99eaff4e40950eda88702f8db9288eb5 (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 6e85ac77af594035137950d801d8a1bacce548a3
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Oct 21 12:04:46 2016 +0900

    Fix use cases of snprintf.
    
    * agent/call-pinentry.c, agent/call-scd.c, agent/command.c,
    build-aux/speedo/w32/g4wihelp.c, common/get-passphrase.c,
    dirmngr/dirmngr.c, g10/call-agent.c, g10/cpr.c, g10/keygen.c,
    g10/openfile.c, g10/passphrase.c, scd/app-openpgp.c, scd/scdaemon.c,
    sm/call-agent.c, sm/call-dirmngr.c, sm/certreqgen.c: Fix assuming C99.
    
    --
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c
index 0f24086..46db9e8 100644
--- a/agent/call-pinentry.c
+++ b/agent/call-pinentry.c
@@ -734,8 +734,7 @@ setup_qualitybar (ctrl_t ctrl)
   /* TRANSLATORS: This string is displayed by Pinentry as the label
      for the quality bar.  */
   tmpstr = try_percent_escape (L_("Quality:"), "\t\r\n\f\v");
-  snprintf (line, DIM(line)-1, "SETQUALITYBAR %s", tmpstr? tmpstr:"");
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "SETQUALITYBAR %s", tmpstr? tmpstr:"");
   xfree (tmpstr);
   rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
   if (rc == 103 /*(Old assuan error code)*/
@@ -763,8 +762,7 @@ setup_qualitybar (ctrl_t ctrl)
     }
   tmpstr = try_percent_escape (tooltip, "\t\r\n\f\v");
   xfree (tmpstr2);
-  snprintf (line, DIM(line)-1, "SETQUALITYBAR_TT %s", tmpstr? tmpstr:"");
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "SETQUALITYBAR_TT %s", tmpstr? tmpstr:"");
   xfree (tmpstr);
   rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
   if (rc == 103 /*(Old assuan error code)*/
@@ -887,27 +885,25 @@ agent_askpin (ctrl_t ctrl,
   if (keyinfo && (cache_mode == CACHE_MODE_NORMAL
                   || cache_mode == CACHE_MODE_USER
                   || cache_mode == CACHE_MODE_SSH))
-    snprintf (line, DIM(line)-1, "SETKEYINFO %c/%s",
+    snprintf (line, DIM(line), "SETKEYINFO %c/%s",
 	      cache_mode == CACHE_MODE_USER? 'u' :
 	      cache_mode == CACHE_MODE_SSH? 's' : 'n',
 	      keyinfo);
   else
-    snprintf (line, DIM(line)-1, "SETKEYINFO --clear");
+    snprintf (line, DIM(line), "SETKEYINFO --clear");
 
   rc = assuan_transact (entry_ctx, line,
 			NULL, NULL, NULL, NULL, NULL, NULL);
   if (rc && gpg_err_code (rc) != GPG_ERR_ASS_UNKNOWN_CMD)
     return unlock_pinentry (rc);
 
-  snprintf (line, DIM(line)-1, "SETDESC %s", desc_text);
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "SETDESC %s", desc_text);
   rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
   if (rc)
     return unlock_pinentry (rc);
 
-  snprintf (line, DIM(line)-1, "SETPROMPT %s",
+  snprintf (line, DIM(line), "SETPROMPT %s",
             prompt_text? prompt_text : is_pin? L_("PIN:") : L_("Passphrase:"));
-  line[DIM(line)-1] = 0;
   rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
   if (rc)
     return unlock_pinentry (rc);
@@ -924,8 +920,7 @@ agent_askpin (ctrl_t ctrl,
 
   if (initial_errtext)
     {
-      snprintf (line, DIM(line)-1, "SETERROR %s", initial_errtext);
-      line[DIM(line)-1] = 0;
+      snprintf (line, DIM(line), "SETERROR %s", initial_errtext);
       rc = assuan_transact (entry_ctx, line,
                             NULL, NULL, NULL, NULL, NULL, NULL);
       if (rc)
@@ -934,9 +929,8 @@ agent_askpin (ctrl_t ctrl,
 
   if (pininfo->with_repeat)
     {
-      snprintf (line, DIM(line)-1, "SETREPEATERROR %s",
+      snprintf (line, DIM(line), "SETREPEATERROR %s",
                 L_("does not match - try again"));
-      line[DIM(line)-1] = 0;
       rc = assuan_transact (entry_ctx, line,
                             NULL, NULL, NULL, NULL, NULL, NULL);
       if (rc)
@@ -956,9 +950,8 @@ agent_askpin (ctrl_t ctrl,
           /* TRANSLATORS: The string is appended to an error message in
              the pinentry.  The %s is the actual error message, the
              two %d give the current and maximum number of tries. */
-          snprintf (line, DIM(line)-1, L_("SETERROR %s (try %d of %d)"),
+          snprintf (line, DIM(line), L_("SETERROR %s (try %d of %d)"),
                     errtext, pininfo->failed_tries+1, pininfo->max_tries);
-          line[DIM(line)-1] = 0;
           rc = assuan_transact (entry_ctx, line,
                                 NULL, NULL, NULL, NULL, NULL, NULL);
           if (rc)
@@ -968,8 +961,7 @@ agent_askpin (ctrl_t ctrl,
 
       if (pininfo->with_repeat)
         {
-          snprintf (line, DIM(line)-1, "SETREPEAT %s", L_("Repeat:"));
-          line[DIM(line)-1] = 0;
+          snprintf (line, DIM(line), "SETREPEAT %s", L_("Repeat:"));
           rc = assuan_transact (entry_ctx, line,
                                 NULL, NULL, NULL, NULL, NULL, NULL);
           if (rc)
@@ -1100,12 +1092,12 @@ agent_get_passphrase (ctrl_t ctrl,
   if (keyinfo && (cache_mode == CACHE_MODE_NORMAL
                   || cache_mode == CACHE_MODE_USER
                   || cache_mode == CACHE_MODE_SSH))
-    snprintf (line, DIM(line)-1, "SETKEYINFO %c/%s",
+    snprintf (line, DIM(line), "SETKEYINFO %c/%s",
 	      cache_mode == CACHE_MODE_USER? 'u' :
 	      cache_mode == CACHE_MODE_SSH? 's' : 'n',
 	      keyinfo);
   else
-    snprintf (line, DIM(line)-1, "SETKEYINFO --clear");
+    snprintf (line, DIM(line), "SETKEYINFO --clear");
 
   rc = assuan_transact (entry_ctx, line,
 			NULL, NULL, NULL, NULL, NULL, NULL);
@@ -1114,16 +1106,14 @@ agent_get_passphrase (ctrl_t ctrl,
 
 
   if (desc)
-    snprintf (line, DIM(line)-1, "SETDESC %s", desc);
+    snprintf (line, DIM(line), "SETDESC %s", desc);
   else
-    snprintf (line, DIM(line)-1, "RESET");
-  line[DIM(line)-1] = 0;
+    snprintf (line, DIM(line), "RESET");
   rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
   if (rc)
     return unlock_pinentry (rc);
 
-  snprintf (line, DIM(line)-1, "SETPROMPT %s", prompt);
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "SETPROMPT %s", prompt);
   rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
   if (rc)
     return unlock_pinentry (rc);
@@ -1137,8 +1127,7 @@ agent_get_passphrase (ctrl_t ctrl,
 
   if (errtext)
     {
-      snprintf (line, DIM(line)-1, "SETERROR %s", errtext);
-      line[DIM(line)-1] = 0;
+      snprintf (line, DIM(line), "SETERROR %s", errtext);
       rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
       if (rc)
         return unlock_pinentry (rc);
@@ -1205,10 +1194,9 @@ agent_get_confirmation (ctrl_t ctrl,
     return rc;
 
   if (desc)
-    snprintf (line, DIM(line)-1, "SETDESC %s", desc);
+    snprintf (line, DIM(line), "SETDESC %s", desc);
   else
-    snprintf (line, DIM(line)-1, "RESET");
-  line[DIM(line)-1] = 0;
+    snprintf (line, DIM(line), "RESET");
   rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
   /* Most pinentries out in the wild return the old Assuan error code
      for canceled which gets translated to an assuan Cancel error and
@@ -1221,8 +1209,7 @@ agent_get_confirmation (ctrl_t ctrl,
 
   if (ok)
     {
-      snprintf (line, DIM(line)-1, "SETOK %s", ok);
-      line[DIM(line)-1] = 0;
+      snprintf (line, DIM(line), "SETOK %s", ok);
       rc = assuan_transact (entry_ctx,
                             line, NULL, NULL, NULL, NULL, NULL, NULL);
       if (rc)
@@ -1235,8 +1222,7 @@ agent_get_confirmation (ctrl_t ctrl,
          the standard cancel.  */
       if (with_cancel)
         {
-          snprintf (line, DIM(line)-1, "SETNOTOK %s", notok);
-          line[DIM(line)-1] = 0;
+          snprintf (line, DIM(line), "SETNOTOK %s", notok);
           rc = assuan_transact (entry_ctx,
                                 line, NULL, NULL, NULL, NULL, NULL, NULL);
         }
@@ -1245,8 +1231,7 @@ agent_get_confirmation (ctrl_t ctrl,
 
       if (gpg_err_code (rc) == GPG_ERR_ASS_UNKNOWN_CMD)
 	{
-	  snprintf (line, DIM(line)-1, "SETCANCEL %s", notok);
-	  line[DIM(line)-1] = 0;
+	  snprintf (line, DIM(line), "SETCANCEL %s", notok);
 	  rc = assuan_transact (entry_ctx, line,
                                 NULL, NULL, NULL, NULL, NULL, NULL);
 	}
@@ -1282,10 +1267,9 @@ agent_show_message (ctrl_t ctrl, const char *desc, const char *ok_btn)
     return rc;
 
   if (desc)
-    snprintf (line, DIM(line)-1, "SETDESC %s", desc);
+    snprintf (line, DIM(line), "SETDESC %s", desc);
   else
-    snprintf (line, DIM(line)-1, "RESET");
-  line[DIM(line)-1] = 0;
+    snprintf (line, DIM(line), "RESET");
   rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
   /* Most pinentries out in the wild return the old Assuan error code
      for canceled which gets translated to an assuan Cancel error and
@@ -1298,8 +1282,7 @@ agent_show_message (ctrl_t ctrl, const char *desc, const char *ok_btn)
 
   if (ok_btn)
     {
-      snprintf (line, DIM(line)-1, "SETOK %s", ok_btn);
-      line[DIM(line)-1] = 0;
+      snprintf (line, DIM(line), "SETOK %s", ok_btn);
       rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL,
                             NULL, NULL, NULL);
       if (rc)
@@ -1354,18 +1337,16 @@ agent_popup_message_start (ctrl_t ctrl, const char *desc, const char *ok_btn)
     return rc;
 
   if (desc)
-    snprintf (line, DIM(line)-1, "SETDESC %s", desc);
+    snprintf (line, DIM(line), "SETDESC %s", desc);
   else
-    snprintf (line, DIM(line)-1, "RESET");
-  line[DIM(line)-1] = 0;
+    snprintf (line, DIM(line), "RESET");
   rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
   if (rc)
     return unlock_pinentry (rc);
 
   if (ok_btn)
     {
-      snprintf (line, DIM(line)-1, "SETOK %s", ok_btn);
-      line[DIM(line)-1] = 0;
+      snprintf (line, DIM(line), "SETOK %s", ok_btn);
       rc = assuan_transact (entry_ctx, line, NULL,NULL,NULL,NULL,NULL,NULL);
       if (rc)
         return unlock_pinentry (rc);
@@ -1465,7 +1446,7 @@ agent_clear_passphrase (ctrl_t ctrl,
   if (rc)
     return rc;
 
-  snprintf (line, DIM(line)-1, "CLEARPASSPHRASE %c/%s",
+  snprintf (line, DIM(line), "CLEARPASSPHRASE %c/%s",
 	    cache_mode == CACHE_MODE_USER? 'u' :
 	    cache_mode == CACHE_MODE_SSH? 's' : 'n',
 	    keyinfo);
diff --git a/agent/call-scd.c b/agent/call-scd.c
index 934ab4c..0f7d570 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -946,8 +946,7 @@ agent_card_pkdecrypt (ctrl_t ctrl,
   inqparm.getpin_cb_arg = getpin_cb_arg;
   inqparm.passthru = 0;
   inqparm.any_inq_seen = 0;
-  snprintf (line, DIM(line)-1, "PKDECRYPT %s", keyid);
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "PKDECRYPT %s", keyid);
   rc = assuan_transact (ctrl->scd_local->ctx, line,
                         put_membuf_cb, &data,
                         inq_needpin, &inqparm,
@@ -986,8 +985,7 @@ agent_card_readcert (ctrl_t ctrl,
     return rc;
 
   init_membuf (&data, 1024);
-  snprintf (line, DIM(line)-1, "READCERT %s", id);
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "READCERT %s", id);
   rc = assuan_transact (ctrl->scd_local->ctx, line,
                         put_membuf_cb, &data,
                         NULL, NULL,
@@ -1022,8 +1020,7 @@ agent_card_readkey (ctrl_t ctrl, const char *id, unsigned char **r_buf)
     return rc;
 
   init_membuf (&data, 1024);
-  snprintf (line, DIM(line)-1, "READKEY %s", id);
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "READKEY %s", id);
   rc = assuan_transact (ctrl->scd_local->ctx, line,
                         put_membuf_cb, &data,
                         NULL, NULL,
@@ -1088,8 +1085,7 @@ agent_card_writekey (ctrl_t ctrl,  int force, const char *serialno,
   if (rc)
     return rc;
 
-  snprintf (line, DIM(line)-1, "WRITEKEY %s%s", force ? "--force " : "", id);
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "WRITEKEY %s%s", force ? "--force " : "", id);
   parms.ctx = ctrl->scd_local->ctx;
   parms.getpin_cb = getpin_cb;
   parms.getpin_cb_arg = getpin_cb_arg;
diff --git a/agent/command.c b/agent/command.c
index 7d8b4c46..1a13084 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -369,7 +369,7 @@ agent_inq_pinentry_launched (ctrl_t ctrl, unsigned long pid)
   if (!ctrl || !ctrl->server_local
       || !ctrl->server_local->allow_pinentry_notify)
     return 0;
-  snprintf (line, DIM(line)-1, "PINENTRY_LAUNCHED %lu", pid);
+  snprintf (line, DIM(line), "PINENTRY_LAUNCHED %lu", pid);
   return assuan_inquire (ctrl->server_local->assuan_ctx, line, NULL, NULL, 0);
 }
 
diff --git a/build-aux/speedo/w32/g4wihelp.c b/build-aux/speedo/w32/g4wihelp.c
index d2c93e7..fe903aa 100644
--- a/build-aux/speedo/w32/g4wihelp.c
+++ b/build-aux/speedo/w32/g4wihelp.c
@@ -70,12 +70,12 @@ dummy (HWND hwndParent, int string_size, char *variables,
   // do your stuff here
   {
     char buf[1024];
-    snprintf (buf, sizeof buf - 1, "$R0=%s\r\n$R1=%s\r\n",
+    snprintf (buf, sizeof buf, "$R0=%s\r\n$R1=%s\r\n",
               getuservariable(INST_R0),
               getuservariable(INST_R1));
     MessageBox (g_hwndParent,buf,0,MB_OK);
 
-    snprintf (buf, sizeof buf - 1,
+    snprintf (buf, sizeof buf,
              "autoclose    =%d\r\n"
              "all_user_var =%d\r\n"
              "exec_error   =%d\r\n"
@@ -278,7 +278,7 @@ void
 service_error (const char *str)
 {
   char buf[1024];
-  snprintf (buf, sizeof (buf) - 1, "error: %s: ec=%d\r\n", str,
+  snprintf (buf, sizeof (buf), "error: %s: ec=%d\r\n", str,
 	    GetLastError ());
   MessageBox(g_hwndParent, buf, 0, MB_OK);
 
@@ -575,7 +575,7 @@ service_stop (HWND hwndParent, int string_size, char *variables,
       if (GetTickCount () - start_time > timeout)
 	{
 	  char buf[1024];
-	  snprintf (buf, sizeof (buf) - 1,
+	  snprintf (buf, sizeof (buf),
 		    "time out waiting for service %s to stop\r\n",
 		    service_name);
 	  MessageBox (g_hwndParent, buf, 0, MB_OK);
diff --git a/common/get-passphrase.c b/common/get-passphrase.c
index 68361ec..25c1602 100644
--- a/common/get-passphrase.c
+++ b/common/get-passphrase.c
@@ -181,7 +181,7 @@ gnupg_get_passphrase (const char *cache_id,
     if (!(arg4 = percent_plus_escape (desc_msg)))
       goto no_mem;
 
-  snprintf (line, DIM(line)-1,
+  snprintf (line, DIM(line),
             "GET_PASSPHRASE --data %s--repeat=%d -- %s %s %s %s",
             check_quality? "--check ":"",
             repeat,
@@ -189,7 +189,6 @@ gnupg_get_passphrase (const char *cache_id,
             arg2? arg2:"X",
             arg3? arg3:"X",
             arg4? arg4:"X");
-  line[DIM(line)-1] = 0;
   xfree (arg2);
   xfree (arg3);
   xfree (arg4);
@@ -250,8 +249,7 @@ gnupg_clear_passphrase (const char *cache_id)
   if (err)
     return err;
 
-  snprintf (line, DIM(line)-1, "CLEAR_PASSPHRASE %s", cache_id);
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "CLEAR_PASSPHRASE %s", cache_id);
   return assuan_transact (agent_ctx, line, NULL, NULL,
                           default_inq_cb, NULL, NULL, NULL);
 }
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 271360e..90eb6d4 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -2050,9 +2050,8 @@ handle_connections (assuan_fd_t listen_fd)
 
               memset (&argval, 0, sizeof argval);
               argval.afd = fd;
-              snprintf (threadname, sizeof threadname-1,
+              snprintf (threadname, sizeof threadname,
                         "conn fd=%d", FD2INT(fd));
-              threadname[sizeof threadname -1] = 0;
 
               ret = npth_create (&thread, &tattr,
                                  start_connection_thread, argval.aptr);
diff --git a/g10/call-agent.c b/g10/call-agent.c
index 632cabe..c1ad8dd 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -726,7 +726,7 @@ agent_scd_apdu (const char *hexapdu, unsigned int *r_sw)
 
       init_membuf (&mb, 256);
 
-      snprintf (line, DIM(line)-1, "SCD APDU %s", hexapdu);
+      snprintf (line, DIM(line), "SCD APDU %s", hexapdu);
       err = assuan_transact (agent_ctx, line,
                              put_membuf_cb, &mb, NULL, NULL, NULL, NULL);
       if (!err)
@@ -758,9 +758,8 @@ agent_keytocard (const char *hexgrip, int keyno, int force,
 
   memset (&parm, 0, sizeof parm);
 
-  snprintf (line, DIM(line)-1, "KEYTOCARD %s%s %s OPENPGP.%d %s",
+  snprintf (line, DIM(line), "KEYTOCARD %s%s %s OPENPGP.%d %s",
             force?"--force ": "", hexgrip, serialno, keyno, timestamp);
-  line[DIM(line)-1] = 0;
 
   rc = start_agent (NULL, 1);
   if (rc)
@@ -902,8 +901,7 @@ agent_scd_writecert (const char *certidstr,
 
   memset (&parms, 0, sizeof parms);
 
-  snprintf (line, DIM(line)-1, "SCD WRITECERT %s", certidstr);
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "SCD WRITECERT %s", certidstr);
   dfltparm.ctx = agent_ctx;
   parms.dflt = &dfltparm;
   parms.certdata = certdata;
@@ -956,8 +954,7 @@ agent_scd_writekey (int keyno, const char *serialno,
 
   memset (&parms, 0, sizeof parms);
 
-  snprintf (line, DIM(line)-1, "SCD WRITEKEY --force OPENPGP.%d", keyno);
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "SCD WRITEKEY --force OPENPGP.%d", keyno);
   dfltparm.ctx = agent_ctx;
   parms.dflt = &dfltparm;
   parms.keydata = keydata;
@@ -1019,11 +1016,10 @@ agent_scd_genkey (int keyno, int force, u32 *createtime)
   else
     *tbuf = 0;
 
-  snprintf (line, DIM(line)-1, "SCD GENKEY %s%s %s %d",
+  snprintf (line, DIM(line), "SCD GENKEY %s%s %s %d",
             *tbuf? "--timestamp=":"", tbuf,
             force? "--force":"",
             keyno);
-  line[DIM(line)-1] = 0;
 
   dfltparm.ctx = agent_ctx;
   rc = assuan_transact (agent_ctx, line,
@@ -1151,8 +1147,7 @@ agent_scd_readcert (const char *certidstr,
 
   init_membuf (&data, 2048);
 
-  snprintf (line, DIM(line)-1, "SCD READCERT %s", certidstr);
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "SCD READCERT %s", certidstr);
   rc = assuan_transact (agent_ctx, line,
                         put_membuf_cb, &data,
                         default_inq_cb, &dfltparm,
@@ -1202,8 +1197,7 @@ agent_scd_change_pin (int chvno, const char *serialno)
     return rc;
   dfltparm.ctx = agent_ctx;
 
-  snprintf (line, DIM(line)-1, "SCD PASSWD %s %d", reset, chvno);
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "SCD PASSWD %s %d", reset, chvno);
   rc = assuan_transact (agent_ctx, line,
                         NULL, NULL,
                         default_inq_cb, &dfltparm,
@@ -1230,8 +1224,7 @@ agent_scd_checkpin  (const char *serialno)
     return rc;
   dfltparm.ctx = agent_ctx;
 
-  snprintf (line, DIM(line)-1, "SCD CHECKPIN %s", serialno);
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "SCD CHECKPIN %s", serialno);
   rc = assuan_transact (agent_ctx, line,
                         NULL, NULL,
                         default_inq_cb, &dfltparm,
@@ -1301,7 +1294,7 @@ agent_get_passphrase (const char *cache_id,
     if (!(arg4 = percent_plus_escape (desc_msg)))
       goto no_mem;
 
-  snprintf (line, DIM(line)-1,
+  snprintf (line, DIM(line),
             "GET_PASSPHRASE --data --repeat=%d%s -- %s %s %s %s",
             repeat,
             check? " --check --qualitybar":"",
@@ -1309,7 +1302,6 @@ agent_get_passphrase (const char *cache_id,
             arg2? arg2:"X",
             arg3? arg3:"X",
             arg4? arg4:"X");
-  line[DIM(line)-1] = 0;
   xfree (arg1);
   xfree (arg2);
   xfree (arg3);
@@ -1358,8 +1350,7 @@ agent_clear_passphrase (const char *cache_id)
     return rc;
   dfltparm.ctx = agent_ctx;
 
-  snprintf (line, DIM(line)-1, "CLEAR_PASSPHRASE %s", cache_id);
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "CLEAR_PASSPHRASE %s", cache_id);
   return assuan_transact (agent_ctx, line,
                           NULL, NULL,
                           default_inq_cb, &dfltparm,
@@ -1387,8 +1378,7 @@ gpg_agent_get_confirmation (const char *desc)
   tmp = percent_plus_escape (desc);
   if (!tmp)
     return gpg_error_from_syserror ();
-  snprintf (line, DIM(line)-1, "GET_CONFIRMATION %s", tmp);
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "GET_CONFIRMATION %s", tmp);
   xfree (tmp);
 
   rc = assuan_transact (agent_ctx, line,
@@ -1574,8 +1564,7 @@ agent_get_keyinfo (ctrl_t ctrl, const char *hexkeygrip,
   if (!hexkeygrip || strlen (hexkeygrip) != 40)
     return gpg_error (GPG_ERR_INV_VALUE);
 
-  snprintf (line, DIM(line)-1, "KEYINFO %s", hexkeygrip);
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "KEYINFO %s", hexkeygrip);
 
   err = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL,
                          keyinfo_status_cb, &keyinfo);
@@ -1761,7 +1750,7 @@ agent_readkey (ctrl_t ctrl, int fromcard, const char *hexkeygrip,
   if (err)
     return err;
 
-  snprintf (line, DIM(line)-1, "READKEY %s%s", fromcard? "--card ":"",
+  snprintf (line, DIM(line), "READKEY %s%s", fromcard? "--card ":"",
             hexkeygrip);
 
   init_membuf (&data, 1024);
@@ -1826,16 +1815,14 @@ agent_pksign (ctrl_t ctrl, const char *cache_nonce,
   if (err)
     return err;
 
-  snprintf (line, DIM(line)-1, "SIGKEY %s", keygrip);
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "SIGKEY %s", keygrip);
   err = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
   if (err)
     return err;
 
   if (desc)
     {
-      snprintf (line, DIM(line)-1, "SETKEYDESC %s", desc);
-      line[DIM(line)-1] = 0;
+      snprintf (line, DIM(line), "SETKEYDESC %s", desc);
       err = assuan_transact (agent_ctx, line,
                             NULL, NULL, NULL, NULL, NULL, NULL);
       if (err)
@@ -1966,8 +1953,7 @@ agent_pkdecrypt (ctrl_t ctrl, const char *keygrip, const char *desc,
 
   if (desc)
     {
-      snprintf (line, DIM(line)-1, "SETKEYDESC %s", desc);
-      line[DIM(line)-1] = 0;
+      snprintf (line, DIM(line), "SETKEYDESC %s", desc);
       err = assuan_transact (agent_ctx, line,
                             NULL, NULL, NULL, NULL, NULL, NULL);
       if (err)
@@ -2059,7 +2045,7 @@ agent_keywrap_key (ctrl_t ctrl, int forexport, void **r_kek, size_t *r_keklen)
     return err;
   dfltparm.ctx = agent_ctx;
 
-  snprintf (line, DIM(line)-1, "KEYWRAP_KEY %s",
+  snprintf (line, DIM(line), "KEYWRAP_KEY %s",
             forexport? "--export":"--import");
 
   init_membuf_secure (&data, 64);
@@ -2121,8 +2107,7 @@ agent_import_key (ctrl_t ctrl, const char *desc, char **cache_nonce_addr,
 
   if (desc)
     {
-      snprintf (line, DIM(line)-1, "SETKEYDESC %s", desc);
-      line[DIM(line)-1] = 0;
+      snprintf (line, DIM(line), "SETKEYDESC %s", desc);
       err = assuan_transact (agent_ctx, line,
                             NULL, NULL, NULL, NULL, NULL, NULL);
       if (err)
@@ -2182,14 +2167,14 @@ agent_export_key (ctrl_t ctrl, const char *hexkeygrip, const char *desc,
 
   if (desc)
     {
-      snprintf (line, DIM(line)-1, "SETKEYDESC %s", desc);
+      snprintf (line, DIM(line), "SETKEYDESC %s", desc);
       err = assuan_transact (agent_ctx, line,
                              NULL, NULL, NULL, NULL, NULL, NULL);
       if (err)
         return err;
     }
 
-  snprintf (line, DIM(line)-1, "EXPORT_KEY %s%s%s %s",
+  snprintf (line, DIM(line), "EXPORT_KEY %s%s%s %s",
             openpgp_protected ? "--openpgp ":"",
             cache_nonce_addr && *cache_nonce_addr? "--cache-nonce=":"",
             cache_nonce_addr && *cache_nonce_addr? *cache_nonce_addr:"",
@@ -2241,14 +2226,14 @@ agent_delete_key (ctrl_t ctrl, const char *hexkeygrip, const char *desc,
 
   if (desc)
     {
-      snprintf (line, DIM(line)-1, "SETKEYDESC %s", desc);
+      snprintf (line, DIM(line), "SETKEYDESC %s", desc);
       err = assuan_transact (agent_ctx, line,
                              NULL, NULL, NULL, NULL, NULL, NULL);
       if (err)
         return err;
     }
 
-  snprintf (line, DIM(line)-1, "DELETE_KEY%s %s",
+  snprintf (line, DIM(line), "DELETE_KEY%s %s",
             force? " --force":"", hexkeygrip);
   err = assuan_transact (agent_ctx, line, NULL, NULL,
                          default_inq_cb, &dfltparm,
@@ -2287,7 +2272,7 @@ agent_passwd (ctrl_t ctrl, const char *hexkeygrip, const char *desc, int verify,
 
   if (desc)
     {
-      snprintf (line, DIM(line)-1, "SETKEYDESC %s", desc);
+      snprintf (line, DIM(line), "SETKEYDESC %s", desc);
       err = assuan_transact (agent_ctx, line,
                              NULL, NULL, NULL, NULL, NULL, NULL);
       if (err)
@@ -2295,12 +2280,12 @@ agent_passwd (ctrl_t ctrl, const char *hexkeygrip, const char *desc, int verify,
     }
 
   if (verify)
-    snprintf (line, DIM(line)-1, "PASSWD %s%s --verify %s",
+    snprintf (line, DIM(line), "PASSWD %s%s --verify %s",
               cache_nonce_addr && *cache_nonce_addr? "--cache-nonce=":"",
               cache_nonce_addr && *cache_nonce_addr? *cache_nonce_addr:"",
               hexkeygrip);
   else
-    snprintf (line, DIM(line)-1, "PASSWD %s%s %s%s %s",
+    snprintf (line, DIM(line), "PASSWD %s%s %s%s %s",
               cache_nonce_addr && *cache_nonce_addr? "--cache-nonce=":"",
               cache_nonce_addr && *cache_nonce_addr? *cache_nonce_addr:"",
               passwd_nonce_addr && *passwd_nonce_addr? "--passwd-nonce=":"",
diff --git a/g10/cpr.c b/g10/cpr.c
index 80af2c0..9961f92 100644
--- a/g10/cpr.c
+++ b/g10/cpr.c
@@ -53,9 +53,9 @@ progress_cb (void *ctx, const char *what, int printchar,
   (void)ctx;
 
   if ( printchar == '\n' && !strcmp (what, "primegen") )
-    snprintf (buf, sizeof buf -1, "%.20s X 100 100", what );
+    snprintf (buf, sizeof buf, "%.20s X 100 100", what );
   else
-    snprintf (buf, sizeof buf -1, "%.20s %c %d %d",
+    snprintf (buf, sizeof buf, "%.20s %c %d %d",
               what, printchar=='\n'?'X':printchar, current, total );
   write_status_text (STATUS_PROGRESS, buf);
 }
@@ -356,7 +356,7 @@ write_status_begin_signing (gcry_md_hd_t md)
           ga = map_md_openpgp_to_gcry (i);
           if (ga && gcry_md_is_enabled (md, ga) && buflen+10 < DIM(buf))
             {
-              snprintf (buf+buflen, DIM(buf) - buflen - 1,
+              snprintf (buf+buflen, DIM(buf) - buflen,
                         "%sH%d", buflen? " ":"",i);
               buflen += strlen (buf+buflen);
             }
diff --git a/g10/keygen.c b/g10/keygen.c
index 2115b5a..5ff89f6 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -4877,7 +4877,6 @@ gen_card_key (int algo, int keyno, int is_primary, kbnode_t pub_root,
   gcry_sexp_t s_key;
 
   snprintf (keyid, DIM(keyid), "OPENPGP.%d", keyno);
-  keyid[DIM(keyid)-1] = 0;
 
   if (algo != PUBKEY_ALGO_RSA)
     return gpg_error (GPG_ERR_PUBKEY_ALGO);
diff --git a/g10/openfile.c b/g10/openfile.c
index 006ff35..ad25604 100644
--- a/g10/openfile.c
+++ b/g10/openfile.c
@@ -148,9 +148,9 @@ ask_outfile_name( const char *name, size_t namelen )
   n = strlen(s) + (defname?strlen (defname):0) + 10;
   prompt = xmalloc (n);
   if (defname)
-    snprintf (prompt, n-1, "%s [%s]: ", s, defname );
+    snprintf (prompt, n, "%s [%s]: ", s, defname );
   else
-    snprintf (prompt, n-1, "%s: ", s );
+    snprintf (prompt, n, "%s: ", s );
   tty_enable_completion(NULL);
   fname = cpr_get ("openfile.askoutname", prompt );
   cpr_kill_prompt ();
diff --git a/g10/passphrase.c b/g10/passphrase.c
index be71b68..d75d980 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -347,7 +347,7 @@ passphrase_to_dek (int cipher_algo, STRING2KEY *s2k,
     {
       char buf[50];
 
-      snprintf (buf, sizeof buf -1, "%d %d %d",
+      snprintf (buf, sizeof buf, "%d %d %d",
                 cipher_algo, s2k->mode, s2k->hash_algo );
       write_status_text ( STATUS_NEED_PASSPHRASE_SYM, buf );
     }
@@ -447,7 +447,7 @@ emit_status_need_passphrase (u32 *keyid, u32 *mainkeyid, int pubkey_algo)
   write_status_text (STATUS_USERID_HINT, us);
   xfree (us);
 
-  snprintf (buf, sizeof buf -1, "%08lX%08lX %08lX%08lX %d 0",
+  snprintf (buf, sizeof buf, "%08lX%08lX %08lX%08lX %d 0",
             (ulong)keyid[0],
             (ulong)keyid[1],
             (ulong)(mainkeyid? mainkeyid[0]:keyid[0]),
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 843fdf0..0931095 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -1872,7 +1872,7 @@ verify_a_chv (app_t app,
       prompt_buffer = xtrymalloc (promptsize);
       if (!prompt_buffer)
         return gpg_error_from_syserror ();
-      snprintf (prompt_buffer, promptsize-1, PROMPTSTRING, sigcount);
+      snprintf (prompt_buffer, promptsize, PROMPTSTRING, sigcount);
       prompt = prompt_buffer;
 #undef PROMPTSTRING
     }
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index df1abe8..ab2fadb 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -1292,8 +1292,7 @@ handle_connections (int listen_fd)
               char threadname[50];
 	      npth_t thread;
 
-              snprintf (threadname, sizeof threadname-1, "conn fd=%d", fd);
-              threadname[sizeof threadname -1] = 0;
+              snprintf (threadname, sizeof threadname, "conn fd=%d", fd);
               ctrl->thread_startup.fd = INT2FD (fd);
               ret = npth_create (&thread, &tattr, start_connection_thread, ctrl);
 	      if (ret)
diff --git a/sm/call-agent.c b/sm/call-agent.c
index 3262650..c0a2081 100644
--- a/sm/call-agent.c
+++ b/sm/call-agent.c
@@ -243,16 +243,14 @@ gpgsm_agent_pksign (ctrl_t ctrl, const char *keygrip, const char *desc,
   if (rc)
     return rc;
 
-  snprintf (line, DIM(line)-1, "SIGKEY %s", keygrip);
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "SIGKEY %s", keygrip);
   rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
   if (rc)
     return rc;
 
   if (desc)
     {
-      snprintf (line, DIM(line)-1, "SETKEYDESC %s", desc);
-      line[DIM(line)-1] = 0;
+      snprintf (line, DIM(line), "SETKEYDESC %s", desc);
       rc = assuan_transact (agent_ctx, line,
                             NULL, NULL, NULL, NULL, NULL, NULL);
       if (rc)
@@ -335,8 +333,7 @@ gpgsm_scd_pksign (ctrl_t ctrl, const char *keyid, const char *desc,
 
   init_membuf (&data, 1024);
 
-  snprintf (line, DIM(line)-1, "SCD PKSIGN %s %s", hashopt, keyid);
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "SCD PKSIGN %s %s", hashopt, keyid);
   rc = assuan_transact (agent_ctx, line,
                         put_membuf_cb, &data, default_inq_cb, &inq_parm,
                         NULL, NULL);
@@ -429,16 +426,14 @@ gpgsm_agent_pkdecrypt (ctrl_t ctrl, const char *keygrip, const char *desc,
     return rc;
 
   assert ( DIM(line) >= 50 );
-  snprintf (line, DIM(line)-1, "SETKEY %s", keygrip);
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "SETKEY %s", keygrip);
   rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
   if (rc)
     return rc;
 
   if (desc)
     {
-      snprintf (line, DIM(line)-1, "SETKEYDESC %s", desc);
-      line[DIM(line)-1] = 0;
+      snprintf (line, DIM(line), "SETKEYDESC %s", desc);
       rc = assuan_transact (agent_ctx, line,
                             NULL, NULL, NULL, NULL, NULL, NULL);
       if (rc)
@@ -594,9 +589,8 @@ gpgsm_agent_readkey (ctrl_t ctrl, int fromcard, const char *hexkeygrip,
   if (rc)
     return rc;
 
-  snprintf (line, DIM(line)-1, "%sREADKEY %s",
+  snprintf (line, DIM(line), "%sREADKEY %s",
             fromcard? "SCD ":"", hexkeygrip);
-  line[DIM(line)-1] = 0;
 
   init_membuf (&data, 1024);
   rc = assuan_transact (agent_ctx, line,
@@ -810,8 +804,7 @@ gpgsm_agent_istrusted (ctrl_t ctrl, ksba_cert_t cert, const char *hexfpr,
 
   if (hexfpr)
     {
-      snprintf (line, DIM(line)-1, "ISTRUSTED %s", hexfpr);
-      line[DIM(line)-1] = 0;
+      snprintf (line, DIM(line), "ISTRUSTED %s", hexfpr);
     }
   else
     {
@@ -824,8 +817,7 @@ gpgsm_agent_istrusted (ctrl_t ctrl, ksba_cert_t cert, const char *hexfpr,
           return gpg_error (GPG_ERR_GENERAL);
         }
 
-      snprintf (line, DIM(line)-1, "ISTRUSTED %s", fpr);
-      line[DIM(line)-1] = 0;
+      snprintf (line, DIM(line), "ISTRUSTED %s", fpr);
       xfree (fpr);
     }
 
@@ -868,8 +860,7 @@ gpgsm_agent_marktrusted (ctrl_t ctrl, ksba_cert_t cert)
   xfree (dn);
   if (!dnfmt)
     return gpg_error_from_syserror ();
-  snprintf (line, DIM(line)-1, "MARKTRUSTED %s S %s", fpr, dnfmt);
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "MARKTRUSTED %s S %s", fpr, dnfmt);
   ksba_free (dnfmt);
   xfree (fpr);
 
@@ -895,8 +886,7 @@ gpgsm_agent_havekey (ctrl_t ctrl, const char *hexkeygrip)
   if (!hexkeygrip || strlen (hexkeygrip) != 40)
     return gpg_error (GPG_ERR_INV_VALUE);
 
-  snprintf (line, DIM(line)-1, "HAVEKEY %s", hexkeygrip);
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "HAVEKEY %s", hexkeygrip);
 
   rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
   return rc;
@@ -1045,16 +1035,14 @@ gpgsm_agent_passwd (ctrl_t ctrl, const char *hexkeygrip, const char *desc)
 
   if (desc)
     {
-      snprintf (line, DIM(line)-1, "SETKEYDESC %s", desc);
-      line[DIM(line)-1] = 0;
+      snprintf (line, DIM(line), "SETKEYDESC %s", desc);
       rc = assuan_transact (agent_ctx, line,
                             NULL, NULL, NULL, NULL, NULL, NULL);
       if (rc)
         return rc;
     }
 
-  snprintf (line, DIM(line)-1, "PASSWD %s", hexkeygrip);
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "PASSWD %s", hexkeygrip);
 
   rc = assuan_transact (agent_ctx, line, NULL, NULL,
                         default_inq_cb, &inq_parm, NULL, NULL);
@@ -1078,8 +1066,7 @@ gpgsm_agent_get_confirmation (ctrl_t ctrl, const char *desc)
   inq_parm.ctrl = ctrl;
   inq_parm.ctx = agent_ctx;
 
-  snprintf (line, DIM(line)-1, "GET_CONFIRMATION %s", desc);
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "GET_CONFIRMATION %s", desc);
 
   rc = assuan_transact (agent_ctx, line, NULL, NULL,
                         default_inq_cb, &inq_parm, NULL, NULL);
@@ -1150,8 +1137,7 @@ gpgsm_agent_keyinfo (ctrl_t ctrl, const char *hexkeygrip, char **r_serialno)
   if (!hexkeygrip || strlen (hexkeygrip) != 40)
     return gpg_error (GPG_ERR_INV_VALUE);
 
-  snprintf (line, DIM(line)-1, "KEYINFO %s", hexkeygrip);
-  line[DIM(line)-1] = 0;
+  snprintf (line, DIM(line), "KEYINFO %s", hexkeygrip);
 
   err = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL,
                          keyinfo_status_cb, &serialno);
@@ -1196,7 +1182,7 @@ gpgsm_agent_ask_passphrase (ctrl_t ctrl, const char *desc_msg, int repeat,
   if (desc_msg && *desc_msg && !(arg4 = percent_plus_escape (desc_msg)))
     return gpg_error_from_syserror ();
 
-  snprintf (line, DIM(line)-1, "GET_PASSPHRASE --data%s -- X X X %s",
+  snprintf (line, DIM(line), "GET_PASSPHRASE --data%s -- X X X %s",
             repeat? " --repeat=1 --check --qualitybar":"",
             arg4);
   xfree (arg4);
@@ -1241,7 +1227,7 @@ gpgsm_agent_keywrap_key (ctrl_t ctrl, int forexport,
   inq_parm.ctrl = ctrl;
   inq_parm.ctx = agent_ctx;
 
-  snprintf (line, DIM(line)-1, "KEYWRAP_KEY %s",
+  snprintf (line, DIM(line), "KEYWRAP_KEY %s",
             forexport? "--export":"--import");
 
   init_membuf_secure (&data, 64);
@@ -1335,14 +1321,14 @@ gpgsm_agent_export_key (ctrl_t ctrl, const char *keygrip, const char *desc,
 
   if (desc)
     {
-      snprintf (line, DIM(line)-1, "SETKEYDESC %s", desc);
+      snprintf (line, DIM(line), "SETKEYDESC %s", desc);
       err = assuan_transact (agent_ctx, line,
                              NULL, NULL, NULL, NULL, NULL, NULL);
       if (err)
         return err;
     }
 
-  snprintf (line, DIM(line)-1, "EXPORT_KEY %s", keygrip);
+  snprintf (line, DIM(line), "EXPORT_KEY %s", keygrip);
 
   init_membuf_secure (&data, 1024);
   err = assuan_transact (agent_ctx, line,
diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c
index f561bb0..03c9a68 100644
--- a/sm/call-dirmngr.c
+++ b/sm/call-dirmngr.c
@@ -215,9 +215,8 @@ prepare_dirmngr (ctrl_t ctrl, assuan_context_t ctx, gpg_error_t err)
       char *pass = server->pass ? server->pass : "";
       char *base = server->base ? server->base : "";
 
-      snprintf (line, DIM (line) - 1, "LDAPSERVER %s:%i:%s:%s:%s",
+      snprintf (line, DIM (line), "LDAPSERVER %s:%i:%s:%s:%s",
 		server->host, server->port, user, pass, base);
-      line[DIM (line) - 1] = 0;
 
       assuan_transact (ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
       /* The code below is not required because we don't return an error.  */
@@ -548,10 +547,9 @@ gpgsm_dirmngr_isvalid (ctrl_t ctrl,
                          NULL, NULL, NULL, NULL, NULL, NULL);
       did_options = 1;
     }
-  snprintf (line, DIM(line)-1, "ISVALID%s %s",
+  snprintf (line, DIM(line), "ISVALID%s %s",
             use_ocsp == 2? " --only-ocsp --force-default-responder":"",
             certid);
-  line[DIM(line)-1] = 0;
   xfree (certid);
 
   rc = assuan_transact (dirmngr_ctx, line, NULL, NULL,
@@ -803,9 +801,8 @@ gpgsm_dirmngr_lookup (ctrl_t ctrl, strlist_t names, int cache_only,
 
       return out_of_core ();
     }
-  snprintf (line, DIM(line)-1, "LOOKUP%s %s",
+  snprintf (line, DIM(line), "LOOKUP%s %s",
             cache_only? " --cache-only":"", pattern);
-  line[DIM(line)-1] = 0;
   xfree (pattern);
 
   parm.ctrl = ctrl;
@@ -861,7 +858,7 @@ get_cached_cert (assuan_context_t ctx,
   *r_cert = NULL;
 
   bin2hex (fpr, 20, hexfpr);
-  snprintf (line, DIM(line)-1, "LOOKUP --single --cache-only 0x%s", hexfpr);
+  snprintf (line, DIM(line), "LOOKUP --single --cache-only 0x%s", hexfpr);
 
   init_membuf (&mb, 4096);
   err = assuan_transact (ctx, line, get_cached_cert_data_cb, &mb,
diff --git a/sm/certreqgen.c b/sm/certreqgen.c
index 2c6550c..4d50270 100644
--- a/sm/certreqgen.c
+++ b/sm/certreqgen.c
@@ -719,7 +719,7 @@ proc_parameters (ctrl_t ctrl, struct para_data_s *para,
   else if (!outctrl->dryrun) /* Generate new key.  */
     {
       sprintf (numbuf, "%u", nbits);
-      snprintf ((char*)keyparms, DIM (keyparms)-1,
+      snprintf ((char*)keyparms, DIM (keyparms),
                 "(6:genkey(3:rsa(5:nbits%d:%s)))",
                 (int)strlen (numbuf), numbuf);
       rc = gpgsm_agent_genkey (ctrl, keyparms, &public);

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

Summary of changes:
 agent/call-pinentry.c           | 75 +++++++++++++++--------------------------
 agent/call-scd.c                | 12 +++----
 agent/command.c                 |  2 +-
 build-aux/speedo/w32/g4wihelp.c |  8 ++---
 common/get-passphrase.c         |  6 ++--
 dirmngr/dirmngr.c               |  3 +-
 g10/call-agent.c                | 65 ++++++++++++++---------------------
 g10/cpr.c                       |  6 ++--
 g10/keygen.c                    |  1 -
 g10/openfile.c                  |  4 +--
 g10/passphrase.c                |  4 +--
 scd/app-openpgp.c               |  2 +-
 scd/scdaemon.c                  |  3 +-
 sm/call-agent.c                 | 50 ++++++++++-----------------
 sm/call-dirmngr.c               | 11 +++---
 sm/certreqgen.c                 |  2 +-
 16 files changed, 97 insertions(+), 157 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Oct 21 07:19:31 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Fri, 21 Oct 2016 07:19:31 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-259-gdafce6f
Message-ID: <E1bxSEw-0006xs-92@lists.gnupg.org>

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  dafce6f698bec6e9d4c0125b90754d0687294e86 (commit)
       via  161cb22f13bcd8cbdb08558d9926b2168a8297ac (commit)
      from  6e85ac77af594035137950d801d8a1bacce548a3 (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 dafce6f698bec6e9d4c0125b90754d0687294e86
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Oct 21 14:15:05 2016 +0900

    g10: Don't ask keysize for for non-RSA card.
    
    * g10/card-util.c (card_status): Bug fix for keyno.
    (ask_card_rsa_keysize, do_change_rsa_keysize): Rename.
    (generate_card_keys): Only ask keysize when RSA.
    (card_generate_subkey): Likewise.
    
    --
    
    Co-authored-by: Arnaud Fontaine <arnaud.fontaine at ssi.gouv.fr>
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/g10/card-util.c b/g10/card-util.c
index 2cb44f9..2f3f714 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -476,7 +476,7 @@ card_status (estream_t fp, char *serialno, size_t serialnobuflen)
 
       es_fprintf (fp, "forcepin:%d:::\n", !info.chv1_cached);
       for (i=0; i < DIM (info.key_attr); i++)
-        if (info.key_attr[0].algo == PUBKEY_ALGO_RSA)
+        if (info.key_attr[i].algo == PUBKEY_ALGO_RSA)
           es_fprintf (fp, "keyattr:%d:%d:%u:\n", i+1,
                       info.key_attr[i].algo, info.key_attr[i].nbits);
         else if (info.key_attr[i].algo == PUBKEY_ALGO_ECDH
@@ -1277,7 +1277,7 @@ show_keysize_warning (void)
    select the prompt.  Returns 0 to use the default size (i.e. NBITS)
    or the selected size.  */
 static unsigned int
-ask_card_keysize (int keyno, unsigned int nbits)
+ask_card_rsa_keysize (int keyno, unsigned int nbits)
 {
   unsigned int min_nbits = 1024;
   unsigned int max_nbits = 4096;
@@ -1327,7 +1327,7 @@ ask_card_keysize (int keyno, unsigned int nbits)
 /* Change the size of key KEYNO (0..2) to NBITS and show an error
    message if that fails.  */
 static gpg_error_t
-do_change_keysize (int keyno, unsigned int nbits)
+do_change_rsa_keysize (int keyno, unsigned int nbits)
 {
   gpg_error_t err;
   char args[100];
@@ -1406,15 +1406,18 @@ generate_card_keys (ctrl_t ctrl)
 
       for (keyno = 0; keyno < DIM (info.key_attr); keyno++)
         {
-          nbits = ask_card_keysize (keyno, info.key_attr[keyno].nbits);
-          if (nbits && do_change_keysize (keyno, nbits))
+          if (info.key_attr[keyno].algo == PUBKEY_ALGO_RSA)
             {
-              /* Error: Better read the default key size again.  */
-              agent_release_card_info (&info);
-              if (get_info_for_key_operation (&info))
-                goto leave;
-              /* Ask again for this key size. */
-              keyno--;
+              nbits = ask_card_rsa_keysize (keyno, info.key_attr[keyno].nbits);
+              if (nbits && do_change_rsa_keysize (keyno, nbits))
+                {
+                  /* Error: Better read the default key size again.  */
+                  agent_release_card_info (&info);
+                  if (get_info_for_key_operation (&info))
+                    goto leave;
+                  /* Ask again for this key size. */
+                  keyno--;
+                }
             }
         }
       /* Note that INFO has not be synced.  However we will only use
@@ -1483,18 +1486,21 @@ card_generate_subkey (KBNODE pub_keyblock)
      key size.  */
   if (info.is_v2 && info.extcap.aac)
     {
-      unsigned int nbits;
-
-    ask_again:
-      nbits = ask_card_keysize (keyno-1, info.key_attr[keyno-1].nbits);
-      if (nbits && do_change_keysize (keyno-1, nbits))
+      if (info.key_attr[keyno-1].algo == PUBKEY_ALGO_RSA)
         {
-          /* Error: Better read the default key size again.  */
-          agent_release_card_info (&info);
-          err = get_info_for_key_operation (&info);
-          if (err)
-            goto leave;
-          goto ask_again;
+          unsigned int nbits;
+
+        ask_again:
+          nbits = ask_card_rsa_keysize (keyno-1, info.key_attr[keyno-1].nbits);
+          if (nbits && do_change_rsa_keysize (keyno-1, nbits))
+            {
+              /* Error: Better read the default key size again.  */
+              agent_release_card_info (&info);
+              err = get_info_for_key_operation (&info);
+              if (err)
+                goto leave;
+              goto ask_again;
+            }
         }
       /* Note that INFO has not be synced.  However we will only use
          the serialnumber and thus it won't harm.  */

commit 161cb22f13bcd8cbdb08558d9926b2168a8297ac
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Oct 21 13:59:09 2016 +0900

    g10: Support ECC for gen_card_key.
    
    * g10/keygen.c (gen_card_key): Remove the first argument of ALGO.
    (do_generate_keypair, generate_card_subkeypair): Follow the change.
    
    --
    ALGO is determined by the key attribute of the card.
    
    Co-authored-by: Arnaud Fontaine <arnaud.fontaine at ssi.gouv.fr>
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/g10/keygen.c b/g10/keygen.c
index 5ff89f6..64e0d43 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -154,8 +154,7 @@ static gpg_error_t parse_algo_usage_expire (ctrl_t ctrl, int for_subkey,
 static void do_generate_keypair (ctrl_t ctrl, struct para_data_s *para,
 				 struct output_control_s *outctrl, int card );
 static int write_keyblock (iobuf_t out, kbnode_t node);
-static gpg_error_t gen_card_key (int algo, int keyno, int is_primary,
-                                 kbnode_t pub_root,
+static gpg_error_t gen_card_key (int keyno, int is_primary, kbnode_t pub_root,
                                  u32 *timestamp, u32 expireval);
 
 
@@ -4238,8 +4237,7 @@ do_generate_keypair (ctrl_t ctrl, struct para_data_s *para,
                      get_parameter_passphrase (para),
                      &cache_nonce, NULL);
   else
-    err = gen_card_key (PUBKEY_ALGO_RSA, 1, 1, pub_root,
-                        &timestamp,
+    err = gen_card_key (1, 1, pub_root, &timestamp,
                         get_parameter_u32 (para, pKEYEXPIRE));
 
   /* Get the pointer to the generated public key packet.  */
@@ -4277,8 +4275,7 @@ do_generate_keypair (ctrl_t ctrl, struct para_data_s *para,
 
   if (!err && card && get_parameter (para, pAUTHKEYTYPE))
     {
-      err = gen_card_key (PUBKEY_ALGO_RSA, 3, 0, pub_root,
-                          &timestamp,
+      err = gen_card_key (3, 0, pub_root, &timestamp,
                           get_parameter_u32 (para, pKEYEXPIRE));
       if (!err)
         err = write_keybinding (pub_root, pri_psk, NULL,
@@ -4317,7 +4314,7 @@ do_generate_keypair (ctrl_t ctrl, struct para_data_s *para,
         }
       else
         {
-          err = gen_card_key (PUBKEY_ALGO_RSA, 2, 0, pub_root, &timestamp,
+          err = gen_card_key (2, 0, pub_root, &timestamp,
                               get_parameter_u32 (para, pKEYEXPIRE));
         }
 
@@ -4749,7 +4746,6 @@ generate_card_subkeypair (kbnode_t pub_keyblock,
   gpg_error_t err = 0;
   kbnode_t node;
   PKT_public_key *pri_pk = NULL;
-  int algo;
   unsigned int use;
   u32 expire;
   u32 cur_time;
@@ -4800,7 +4796,6 @@ generate_card_subkeypair (kbnode_t pub_keyblock,
       goto leave;
     }
 
-  algo = PUBKEY_ALGO_RSA;
   expire = ask_expire_interval (0, NULL);
   if (keyno == 1)
     use = PUBKEY_USAGE_SIG;
@@ -4817,7 +4812,7 @@ generate_card_subkeypair (kbnode_t pub_keyblock,
 
   /* Note, that depending on the backend, the card key generation may
      update CUR_TIME.  */
-  err = gen_card_key (algo, keyno, 0, pub_keyblock, &cur_time, expire);
+  err = gen_card_key (keyno, 0, pub_keyblock, &cur_time, expire);
   /* Get the pointer to the generated public subkey packet.  */
   if (!err)
     {
@@ -4865,21 +4860,29 @@ write_keyblock( IOBUF out, KBNODE node )
 
 /* Note that timestamp is an in/out arg. */
 static gpg_error_t
-gen_card_key (int algo, int keyno, int is_primary, kbnode_t pub_root,
+gen_card_key (int keyno, int is_primary, kbnode_t pub_root,
               u32 *timestamp, u32 expireval)
 {
 #ifdef ENABLE_CARD_SUPPORT
   gpg_error_t err;
+  struct agent_card_info_s info;
+  int algo;
   PACKET *pkt;
   PKT_public_key *pk;
   char keyid[10];
   unsigned char *public;
   gcry_sexp_t s_key;
 
-  snprintf (keyid, DIM(keyid), "OPENPGP.%d", keyno);
+  err = agent_scd_getattr ("KEY-ATTR", &info);
+  if (err)
+    {
+      log_error (_("error getting current key info: %s\n"), gpg_strerror (err));
+      return err;
+    }
 
-  if (algo != PUBKEY_ALGO_RSA)
-    return gpg_error (GPG_ERR_PUBKEY_ALGO);
+  algo = info.key_attr[keyno-1].algo;
+
+  snprintf (keyid, DIM(keyid), "OPENPGP.%d", keyno);
 
   pk = xtrycalloc (1, sizeof *pk );
   if (!pk)
@@ -4954,7 +4957,6 @@ gen_card_key (int algo, int keyno, int is_primary, kbnode_t pub_root,
 
   return 0;
 #else
-  (void)algo;
   (void)keyno;
   (void)is_primary;
   (void)pub_root;

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

Summary of changes:
 g10/card-util.c | 50 ++++++++++++++++++++++++++++----------------------
 g10/keygen.c    | 32 +++++++++++++++++---------------
 2 files changed, 45 insertions(+), 37 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Oct 21 09:30:02 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Fri, 21 Oct 2016 09:30:02 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-260-g693e657
Message-ID: <E1bxUHF-0007Mm-C5@lists.gnupg.org>

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  693e657ff04756737dce025203c0deba480ea8de (commit)
      from  dafce6f698bec6e9d4c0125b90754d0687294e86 (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 693e657ff04756737dce025203c0deba480ea8de
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Oct 21 16:27:46 2016 +0900

    scd: Fix segfault changing key attr.
    
    * asc/app-openpgp.c (change_keyattr_from_string): Release after
    allocated.
    --
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 0931095..f909c6f 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -2987,7 +2987,6 @@ change_keyattr_from_string (app_t app,
       size_t oid_len;
 
       oidstr = openpgp_curve_to_oid (string+n, NULL);
-      gcry_mpi_release (oid);
       if (!oidstr)
         {
           err = gpg_error (GPG_ERR_INV_DATA);
@@ -3005,6 +3004,7 @@ change_keyattr_from_string (app_t app,
       string[0] = algo;
       memcpy (string+1, oidbuf+1, oid_len-1);
       err = change_keyattr (app, keyno, string, oid_len, pincb, pincb_arg);
+      gcry_mpi_release (oid);
     }
   else
     err = gpg_error (GPG_ERR_PUBKEY_ALGO);

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

Summary of changes:
 scd/app-openpgp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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



From cvs at cvs.gnupg.org  Fri Oct 21 14:41:54 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Fri, 21 Oct 2016 14:41:54 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-261-gd2653b1
Message-ID: <E1bxZ93-0002zF-Cs@lists.gnupg.org>

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  d2653b1a6db90aed073194a51fd61023d69773ec (commit)
      from  693e657ff04756737dce025203c0deba480ea8de (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 d2653b1a6db90aed073194a51fd61023d69773ec
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Oct 21 21:37:04 2016 +0900

    g10,scd: Fix ECC keygen.
    
    * g10/keygen.c (generate_keypair): For card key generation, fill
    parameters by KEY-ATTR.
    
    * scd/app-openpgp.c (ecc_read_pubkey): OID should be freed at last,
    after its reference by OIDBUF is finished.
    (ecc_writekey): Likewise.
    --
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/g10/call-agent.c b/g10/call-agent.c
index c1ad8dd..e7af001 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -994,9 +994,11 @@ scd_genkey_cb (void *opaque, const char *line)
   return 0;
 }
 
-/* Send a GENKEY command to the SCdaemon.  If CREATETIME is not 0, it
-  will be passed to SCDAEMON so that the key is created with this
-  timestamp.  On success, creation time  is stored back to CREATETIME.  */
+/* Send a GENKEY command to the SCdaemon.  If *CREATETIME is not 0,
+  the value will be passed to SCDAEMON with --timestamp option so that
+  the key is created with this.  Otherwise, timestamp was generated by
+  SCDEAMON.  On success, creation time is stored back to
+  CREATETIME.  */
 int
 agent_scd_genkey (int keyno, int force, u32 *createtime)
 {
diff --git a/g10/keygen.c b/g10/keygen.c
index 64e0d43..a59435d 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -3756,17 +3756,26 @@ generate_keypair (ctrl_t ctrl, int full, const char *fname,
   if (card_serialno)
     {
 #ifdef ENABLE_CARD_SUPPORT
+      gpg_error_t err;
+      struct agent_card_info_s info;
+
+      memset (&info, 0, sizeof (info));
+      err = agent_scd_getattr ("KEY-ATTR", &info);
+      if (err)
+        {
+          log_error (_("error getting current key info: %s\n"), gpg_strerror (err));
+          return;
+        }
+
       r = xcalloc (1, sizeof *r + strlen (card_serialno) );
       r->key = pSERIALNO;
       strcpy( r->u.value, card_serialno);
       r->next = para;
       para = r;
 
-      algo = PUBKEY_ALGO_RSA;
-
       r = xcalloc (1, sizeof *r + 20 );
       r->key = pKEYTYPE;
-      sprintf( r->u.value, "%d", algo );
+      sprintf( r->u.value, "%d", info.key_attr[0].algo );
       r->next = para;
       para = r;
       r = xcalloc (1, sizeof *r + 20 );
@@ -3774,10 +3783,28 @@ generate_keypair (ctrl_t ctrl, int full, const char *fname,
       strcpy (r->u.value, "sign");
       r->next = para;
       para = r;
+      if (info.key_attr[0].algo == PUBKEY_ALGO_RSA)
+        {
+          r = xcalloc (1, sizeof *r + 20 );
+          r->key = pKEYLENGTH;
+          sprintf( r->u.value, "%u", info.key_attr[0].nbits);
+          r->next = para;
+          para = r;
+        }
+      else if (info.key_attr[0].algo == PUBKEY_ALGO_ECDSA
+               || info.key_attr[0].algo == PUBKEY_ALGO_EDDSA
+               || info.key_attr[0].algo == PUBKEY_ALGO_ECDH)
+        {
+          r = xcalloc (1, sizeof *r + strlen (info.key_attr[0].curve));
+          r->key = pKEYCURVE;
+          strcpy (r->u.value, info.key_attr[0].curve);
+          r->next = para;
+          para = r;
+        }
 
       r = xcalloc (1, sizeof *r + 20 );
       r->key = pSUBKEYTYPE;
-      sprintf( r->u.value, "%d", algo );
+      sprintf( r->u.value, "%d", info.key_attr[1].algo );
       r->next = para;
       para = r;
       r = xcalloc (1, sizeof *r + 20 );
@@ -3785,10 +3812,28 @@ generate_keypair (ctrl_t ctrl, int full, const char *fname,
       strcpy (r->u.value, "encrypt");
       r->next = para;
       para = r;
+      if (info.key_attr[1].algo == PUBKEY_ALGO_RSA)
+        {
+          r = xcalloc (1, sizeof *r + 20 );
+          r->key = pSUBKEYLENGTH;
+          sprintf( r->u.value, "%u", info.key_attr[1].nbits);
+          r->next = para;
+          para = r;
+        }
+      else if (info.key_attr[1].algo == PUBKEY_ALGO_ECDSA
+               || info.key_attr[1].algo == PUBKEY_ALGO_EDDSA
+               || info.key_attr[1].algo == PUBKEY_ALGO_ECDH)
+        {
+          r = xcalloc (1, sizeof *r + strlen (info.key_attr[1].curve));
+          r->key = pSUBKEYCURVE;
+          strcpy (r->u.value, info.key_attr[1].curve);
+          r->next = para;
+          para = r;
+        }
 
       r = xcalloc (1, sizeof *r + 20 );
       r->key = pAUTHKEYTYPE;
-      sprintf( r->u.value, "%d", algo );
+      sprintf( r->u.value, "%d", info.key_attr[2].algo );
       r->next = para;
       para = r;
 
@@ -4873,6 +4918,7 @@ gen_card_key (int keyno, int is_primary, kbnode_t pub_root,
   unsigned char *public;
   gcry_sexp_t s_key;
 
+  memset (&info, 0, sizeof (info));
   err = agent_scd_getattr ("KEY-ATTR", &info);
   if (err)
     {
@@ -4931,8 +4977,8 @@ gen_card_key (int keyno, int is_primary, kbnode_t pub_root,
   if (algo == PUBKEY_ALGO_RSA)
     err = key_from_sexp (pk->pkey, s_key, "public-key", "ne");
   else if (algo == PUBKEY_ALGO_ECDSA
-	   || algo == PUBKEY_ALGO_EDDSA
-	   || algo == PUBKEY_ALGO_ECDH )
+           || algo == PUBKEY_ALGO_EDDSA
+           || algo == PUBKEY_ALGO_ECDH )
     err = ecckey_from_sexp (pk->pkey, s_key, algo);
   else
     err = gpg_error (GPG_ERR_PUBKEY_ALGO);
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index f909c6f..e6a7698 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -1312,10 +1312,10 @@ ecc_read_pubkey (app_t app, ctrl_t ctrl, u32 created_at, int keyno,
                  const unsigned char *data, size_t datalen, gcry_sexp_t *r_sexp)
 {
   gpg_error_t err;
-  unsigned char *qbuf;
+  unsigned char *qbuf = NULL;
   const unsigned char *ecc_q;
   size_t ecc_q_len;
-  gcry_mpi_t oid;
+  gcry_mpi_t oid = NULL;
   int n;
   const unsigned char *oidbuf;
   size_t oid_len;
@@ -1338,15 +1338,16 @@ ecc_read_pubkey (app_t app, ctrl_t ctrl, u32 created_at, int keyno,
   if (!oidbuf)
     {
       err = gpg_error_from_syserror ();
-      gcry_mpi_release (oid);
-      return err;
+      goto leave;
     }
-  gcry_mpi_release (oid);
   oid_len = (n+7)/8;
 
   qbuf = xtrymalloc (ecc_q_len + 1);
   if (!qbuf)
-    return gpg_error_from_syserror ();
+    {
+      err = gpg_error_from_syserror ();
+      goto leave;
+    }
 
   if ((app->app_local->keyattr[keyno].ecc.flags & ECC_FLAG_DJB_TWEAK))
     {               /* Prepend 0x40 prefix.  */
@@ -1359,7 +1360,7 @@ ecc_read_pubkey (app_t app, ctrl_t ctrl, u32 created_at, int keyno,
 
   if (ctrl)
     {
-      send_key_data (ctrl, "q", ecc_q, ecc_q_len);
+      send_key_data (ctrl, "q", qbuf, ecc_q_len);
       send_key_data (ctrl, "curve", oidbuf, oid_len);
     }
 
@@ -1399,6 +1400,7 @@ ecc_read_pubkey (app_t app, ctrl_t ctrl, u32 created_at, int keyno,
   curve = openpgp_oid_to_curve (app->app_local->keyattr[keyno].ecc.oid, 1);
   err = gcry_sexp_build (r_sexp, NULL, format, curve, (int)ecc_q_len, qbuf);
  leave:
+  gcry_mpi_release (oid);
   xfree (qbuf);
   return err;
 }
@@ -3344,8 +3346,8 @@ ecc_writekey (app_t app, gpg_error_t (*pincb)(void*, const char *, char **),
   const char *oidstr = NULL;
   int flag_djb_tweak = 0;
   int algo;
-  gcry_mpi_t oid;
-  const unsigned char *oidbuf = NULL;
+  gcry_mpi_t oid = NULL;
+  const unsigned char *oidbuf;
   unsigned int n;
   size_t oid_len;
   unsigned char fprbuf[20];
@@ -3498,10 +3500,8 @@ ecc_writekey (app_t app, gpg_error_t (*pincb)(void*, const char *, char **),
   if (!oidbuf)
     {
       err = gpg_error_from_syserror ();
-      gcry_mpi_release (oid);
       goto leave;
     }
-  gcry_mpi_release (oid);
   oid_len = (n+7)/8;
 
   if (app->app_local->keyattr[keyno].key_type != KEY_TYPE_ECC
@@ -3583,6 +3583,7 @@ ecc_writekey (app_t app, gpg_error_t (*pincb)(void*, const char *, char **),
                    ecc_q, ecc_q_len, "\x03\x01\x08\x07", (size_t)4);
 
  leave:
+  gcry_mpi_release (oid);
   return err;
 }
 

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

Summary of changes:
 g10/call-agent.c  |  8 +++++---
 g10/keygen.c      | 60 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 scd/app-openpgp.c | 23 +++++++++++----------
 3 files changed, 70 insertions(+), 21 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Oct 21 15:02:55 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Fri, 21 Oct 2016 15:02:55 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-262-gf7e5063
Message-ID: <E1bxZTN-0004cd-PN@lists.gnupg.org>

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  f7e50634be71ce3028726f23edf14454109a04a8 (commit)
      from  d2653b1a6db90aed073194a51fd61023d69773ec (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 f7e50634be71ce3028726f23edf14454109a04a8
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Oct 21 14:59:26 2016 +0200

    g10: Write first keybox record in binary mode
    
    * g10/keydb.c (maybe_create_keyring_or_box): Open in binary mode.
    
    --
    This fixes keybox corruption on windows.
    
    Signed-off-by: Andre Heinecke <aheinecke at intevation.de>

diff --git a/g10/keydb.c b/g10/keydb.c
index e49e25f..b959f05 100644
--- a/g10/keydb.c
+++ b/g10/keydb.c
@@ -415,7 +415,7 @@ maybe_create_keyring_or_box (char *filename, int is_box, int force_create)
      that the detection magic will work the next time it is used.  */
   if (is_box)
     {
-      FILE *fp = fopen (filename, "w");
+      FILE *fp = fopen (filename, "wb");
       if (!fp)
         rc = gpg_error_from_syserror ();
       else

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

Summary of changes:
 g10/keydb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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



From cvs at cvs.gnupg.org  Sat Oct 22 01:51:01 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Sat, 22 Oct 2016 01:51:01 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-263-g987bbb2
Message-ID: <E1bxjaZ-0007HW-Tw@lists.gnupg.org>

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  987bbb2276aeb6bee2793e8406e223717b605009 (commit)
      from  f7e50634be71ce3028726f23edf14454109a04a8 (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 987bbb2276aeb6bee2793e8406e223717b605009
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Sat Oct 22 08:45:35 2016 +0900

    g10: More card key generation change.
    
    * g10/keygen.c (gen_card_key): Add back ALGO as the second argument.
    Don't get ALGO by KEY-ATTR by this function.  It's caller to provide
    ALGO.  Don't do that by both of caller and callee.
    (generate_keypair): Only put paramerters needed.  Use parameters
    for ALGO to call gen_card_key.
    (generate_card_subkeypair): Get ALGO and call gen_card_key with it.
    
    --
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/g10/keygen.c b/g10/keygen.c
index a59435d..61e070c 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -152,10 +152,11 @@ static gpg_error_t parse_algo_usage_expire (ctrl_t ctrl, int for_subkey,
                                      u32 *r_expire,
                                      unsigned int *r_nbits, char **r_curve);
 static void do_generate_keypair (ctrl_t ctrl, struct para_data_s *para,
-				 struct output_control_s *outctrl, int card );
+                                 struct output_control_s *outctrl, int card );
 static int write_keyblock (iobuf_t out, kbnode_t node);
-static gpg_error_t gen_card_key (int keyno, int is_primary, kbnode_t pub_root,
-                                 u32 *timestamp, u32 expireval);
+static gpg_error_t gen_card_key (int keyno, int algo, int is_primary,
+                                 kbnode_t pub_root, u32 *timestamp,
+                                 u32 expireval);
 
 
 static void
@@ -255,7 +256,7 @@ keygen_add_key_expire (PKT_signature *sig, void *opaque)
 
       buf[0] = (u >> 24) & 0xff;
       buf[1] = (u >> 16) & 0xff;
-      buf[2] = (u >>	8) & 0xff;
+      buf[2] = (u >>  8) & 0xff;
       buf[3] = u & 0xff;
       build_sig_subpkt (sig, SIGSUBPKT_KEY_EXPIRE, buf, 4);
     }
@@ -3783,24 +3784,6 @@ generate_keypair (ctrl_t ctrl, int full, const char *fname,
       strcpy (r->u.value, "sign");
       r->next = para;
       para = r;
-      if (info.key_attr[0].algo == PUBKEY_ALGO_RSA)
-        {
-          r = xcalloc (1, sizeof *r + 20 );
-          r->key = pKEYLENGTH;
-          sprintf( r->u.value, "%u", info.key_attr[0].nbits);
-          r->next = para;
-          para = r;
-        }
-      else if (info.key_attr[0].algo == PUBKEY_ALGO_ECDSA
-               || info.key_attr[0].algo == PUBKEY_ALGO_EDDSA
-               || info.key_attr[0].algo == PUBKEY_ALGO_ECDH)
-        {
-          r = xcalloc (1, sizeof *r + strlen (info.key_attr[0].curve));
-          r->key = pKEYCURVE;
-          strcpy (r->u.value, info.key_attr[0].curve);
-          r->next = para;
-          para = r;
-        }
 
       r = xcalloc (1, sizeof *r + 20 );
       r->key = pSUBKEYTYPE;
@@ -4282,7 +4265,8 @@ do_generate_keypair (ctrl_t ctrl, struct para_data_s *para,
                      get_parameter_passphrase (para),
                      &cache_nonce, NULL);
   else
-    err = gen_card_key (1, 1, pub_root, &timestamp,
+    err = gen_card_key (1, get_parameter_algo( para, pKEYTYPE, NULL ),
+                        1, pub_root, &timestamp,
                         get_parameter_u32 (para, pKEYEXPIRE));
 
   /* Get the pointer to the generated public key packet.  */
@@ -4320,7 +4304,8 @@ do_generate_keypair (ctrl_t ctrl, struct para_data_s *para,
 
   if (!err && card && get_parameter (para, pAUTHKEYTYPE))
     {
-      err = gen_card_key (3, 0, pub_root, &timestamp,
+      err = gen_card_key (3, get_parameter_algo( para, pAUTHKEYTYPE, NULL ),
+                          0, pub_root, &timestamp,
                           get_parameter_u32 (para, pKEYEXPIRE));
       if (!err)
         err = write_keybinding (pub_root, pri_psk, NULL,
@@ -4359,7 +4344,8 @@ do_generate_keypair (ctrl_t ctrl, struct para_data_s *para,
         }
       else
         {
-          err = gen_card_key (2, 0, pub_root, &timestamp,
+          err = gen_card_key (2, 0, get_parameter_algo (para, pSUBKEYTYPE, NULL),
+                              pub_root, &timestamp,
                               get_parameter_u32 (para, pKEYEXPIRE));
         }
 
@@ -4796,9 +4782,20 @@ generate_card_subkeypair (kbnode_t pub_keyblock,
   u32 cur_time;
   struct para_data_s *para = NULL;
   PKT_public_key *sub_pk = NULL;
+  int algo;
+  struct agent_card_info_s info;
 
   log_assert (keyno >= 1 && keyno <= 3);
 
+  memset (&info, 0, sizeof (info));
+  err = agent_scd_getattr ("KEY-ATTR", &info);
+  if (err)
+    {
+      log_error (_("error getting current key info: %s\n"), gpg_strerror (err));
+      return err;
+    }
+  algo = info.key_attr[keyno-1].algo;
+
   para = xtrycalloc (1, sizeof *para + strlen (serialno) );
   if (!para)
     {
@@ -4857,7 +4854,7 @@ generate_card_subkeypair (kbnode_t pub_keyblock,
 
   /* Note, that depending on the backend, the card key generation may
      update CUR_TIME.  */
-  err = gen_card_key (keyno, 0, pub_keyblock, &cur_time, expire);
+  err = gen_card_key (keyno, algo, 0, pub_keyblock, &cur_time, expire);
   /* Get the pointer to the generated public subkey packet.  */
   if (!err)
     {
@@ -4905,29 +4902,17 @@ write_keyblock( IOBUF out, KBNODE node )
 
 /* Note that timestamp is an in/out arg. */
 static gpg_error_t
-gen_card_key (int keyno, int is_primary, kbnode_t pub_root,
+gen_card_key (int keyno, int algo, int is_primary, kbnode_t pub_root,
               u32 *timestamp, u32 expireval)
 {
 #ifdef ENABLE_CARD_SUPPORT
   gpg_error_t err;
-  struct agent_card_info_s info;
-  int algo;
   PACKET *pkt;
   PKT_public_key *pk;
   char keyid[10];
   unsigned char *public;
   gcry_sexp_t s_key;
 
-  memset (&info, 0, sizeof (info));
-  err = agent_scd_getattr ("KEY-ATTR", &info);
-  if (err)
-    {
-      log_error (_("error getting current key info: %s\n"), gpg_strerror (err));
-      return err;
-    }
-
-  algo = info.key_attr[keyno-1].algo;
-
   snprintf (keyid, DIM(keyid), "OPENPGP.%d", keyno);
 
   pk = xtrycalloc (1, sizeof *pk );

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

Summary of changes:
 g10/keygen.c | 63 +++++++++++++++++++++++-------------------------------------
 1 file changed, 24 insertions(+), 39 deletions(-)


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



From cvs at cvs.gnupg.org  Mon Oct 24 00:54:13 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Mon, 24 Oct 2016 00:54:13 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-264-gacef095
Message-ID: <E1byRej-00020E-2R@lists.gnupg.org>

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  acef0951646b47c87ccc1c616f0105a068e7ed86 (commit)
      from  987bbb2276aeb6bee2793e8406e223717b605009 (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 acef0951646b47c87ccc1c616f0105a068e7ed86
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Oct 24 07:52:40 2016 +0900

    g10: Fix card keygen for decryption.
    
    * g10/keygen.c (do_generate_keypair): Fix arguments.
    
    --
    
    Reported-by: Grumpy
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/g10/keygen.c b/g10/keygen.c
index 61e070c..ed529c7 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -4344,8 +4344,8 @@ do_generate_keypair (ctrl_t ctrl, struct para_data_s *para,
         }
       else
         {
-          err = gen_card_key (2, 0, get_parameter_algo (para, pSUBKEYTYPE, NULL),
-                              pub_root, &timestamp,
+          err = gen_card_key (2, get_parameter_algo (para, pSUBKEYTYPE, NULL),
+                              0, pub_root, &timestamp,
                               get_parameter_u32 (para, pKEYEXPIRE));
         }
 

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

Summary of changes:
 g10/keygen.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


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



From cvs at cvs.gnupg.org  Mon Oct 24 04:37:12 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Mon, 24 Oct 2016 04:37:12 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-266-gb1828c1
Message-ID: <E1byV8V-0003FF-Ah@lists.gnupg.org>

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  b1828c17fc475def1ee9e06f083f513f568c241b (commit)
       via  945e7ab0ddedf5f58afd97d81e101939de5b5d89 (commit)
      from  acef0951646b47c87ccc1c616f0105a068e7ed86 (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 b1828c17fc475def1ee9e06f083f513f568c241b
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Oct 24 11:22:44 2016 +0900

    scd: Use canonical curve name of libgcrypt.
    
    * scd/app-openpgp.c (send_key_attr): Use curve instead of OID.
    (ecdh_params): New.
    (ecc_read_pubkey): Use ecdh_params.  Use curve name.
    (ecc_writekey): Likewise.
    (ecc_curve): Rename from ecc_oid.
    (parse_algorithm_attribute): Use ecc_curve.
    * g10/call-agent.c (learn_status_cb): Use openpgp_is_curve_supported to
    intern the curve name string.
    * g10/card-util.c (card_status): Conver curve name to alias for print.
    --
    Now, sdcaemon answer for KEY-ATTR is in the canonical curve name
    instead of the alias.  Since it is used of key generation for
    card encryption key with backup, it should be canonical name.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/g10/call-agent.c b/g10/call-agent.c
index e7af001..b17a80f 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -624,15 +624,7 @@ learn_status_cb (void *opaque, const char *line)
         parm->key_attr[keyno].nbits = strtoul (line+n+3, NULL, 10);
       else if (algo == PUBKEY_ALGO_ECDH || algo == PUBKEY_ALGO_ECDSA
                || algo == PUBKEY_ALGO_EDDSA)
-        {
-          const char *curve;
-
-          for (i = 0; (curve = openpgp_enum_curves (&i));)
-            if (!strcmp (curve, line+n))
-              break;
-
-          parm->key_attr[keyno].curve = curve;
-        }
+        parm->key_attr[keyno].curve = openpgp_is_curve_supported (line+n, NULL);
     }
   else if (keywordlen == 12 && !memcmp (keyword, "PRIVATE-DO-", 11)
            && strchr("1234", keyword[11]))
diff --git a/g10/card-util.c b/g10/card-util.c
index 2f3f714..b5fe84b 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -568,7 +568,18 @@ card_status (estream_t fp, char *serialno, size_t serialnobuflen)
             else if (info.key_attr[i].algo == PUBKEY_ALGO_ECDH
                      || info.key_attr[i].algo == PUBKEY_ALGO_ECDSA
                      || info.key_attr[i].algo == PUBKEY_ALGO_EDDSA)
-              tty_fprintf (fp, " %s", info.key_attr[i].curve);
+              {
+                const char *curve_for_print = "?";
+
+                if (info.key_attr[i].curve)
+                  {
+                    const char *oid;
+                    oid = openpgp_curve_to_oid (info.key_attr[i].curve, NULL);
+                    if (oid)
+                      curve_for_print = openpgp_oid_to_curve (oid, 0);
+                  }
+                tty_fprintf (fp, " %s", curve_for_print);
+              }
           tty_fprintf (fp, "\n");
         }
       tty_fprintf (fp,    "Max. PIN lengths .: %d %d %d\n",
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index e6a7698..4e042e7 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -228,7 +228,7 @@ struct app_local_s {
         rsa_key_format_t format;
       } rsa;
       struct {
-        const char *oid;
+        const char *curve;
         int flags;
       } ecc;
     };
@@ -913,7 +913,7 @@ send_key_attr (ctrl_t ctrl, app_t app, const char *keyword, int keyno)
                 keyno==1? PUBKEY_ALGO_ECDH :
                 (app->app_local->keyattr[keyno].ecc.flags & ECC_FLAG_DJB_TWEAK)?
                 PUBKEY_ALGO_EDDSA : PUBKEY_ALGO_ECDSA,
-                openpgp_oid_to_curve (app->app_local->keyattr[keyno].ecc.oid, 0));
+                app->app_local->keyattr[keyno].ecc.curve);
     }
   else
     snprintf (buffer, sizeof buffer, "%d 0 0 UNKNOWN", keyno+1);
@@ -1307,6 +1307,29 @@ rsa_read_pubkey (app_t app, ctrl_t ctrl, u32 created_at,  int keyno,
   return err;
 }
 
+
+/* Determine KDF hash algorithm and KEK encryption algorithm by CURVE.  */
+static const unsigned char*
+ecdh_params (const char *curve)
+{
+  unsigned int nbits;
+
+  openpgp_curve_to_oid (curve, &nbits);
+
+  /* See RFC-6637 for those constants.
+         0x03: Number of bytes
+         0x01: Version for this parameter format
+         KDF algo
+        KEK algo
+  */
+  if (nbits <= 256)
+    return (const unsigned char*)"\x03\x01\x08\x07";
+  else if (nbits <= 384)
+    return (const unsigned char*)"\x03\x01\x09\x08";
+  else
+    return (const unsigned char*)"\x03\x01\x0a\x09";
+}
+
 static gpg_error_t
 ecc_read_pubkey (app_t app, ctrl_t ctrl, u32 created_at, int keyno,
                  const unsigned char *data, size_t datalen, gcry_sexp_t *r_sexp)
@@ -1317,11 +1340,12 @@ ecc_read_pubkey (app_t app, ctrl_t ctrl, u32 created_at, int keyno,
   size_t ecc_q_len;
   gcry_mpi_t oid = NULL;
   int n;
+  const char *curve;
+  const char *oidstr;
   const unsigned char *oidbuf;
   size_t oid_len;
   int algo;
   const char *format;
-  const char *curve;
 
   ecc_q = find_tlv (data, datalen, 0x0086, &ecc_q_len);
   if (!ecc_q)
@@ -1330,10 +1354,11 @@ ecc_read_pubkey (app_t app, ctrl_t ctrl, u32 created_at, int keyno,
       return gpg_error (GPG_ERR_CARD);
     }
 
-  err = openpgp_oid_from_str (app->app_local->keyattr[keyno].ecc.oid, &oid);
+  curve = app->app_local->keyattr[keyno].ecc.curve;
+  oidstr = openpgp_curve_to_oid (curve, NULL);
+  err = openpgp_oid_from_str (oidstr, &oid);
   if (err)
     return err;
-
   oidbuf = gcry_mpi_get_opaque (oid, &n);
   if (!oidbuf)
     {
@@ -1367,7 +1392,7 @@ ecc_read_pubkey (app_t app, ctrl_t ctrl, u32 created_at, int keyno,
   if (keyno == 1)
     {
       if (ctrl)
-        send_key_data (ctrl, "kdf", "\x03\x01\x08\x07", (size_t)4);
+        send_key_data (ctrl, "kdf/kek", ecdh_params (curve), (size_t)4);
       algo = PUBKEY_ALGO_ECDH;
     }
   else
@@ -1383,7 +1408,7 @@ ecc_read_pubkey (app_t app, ctrl_t ctrl, u32 created_at, int keyno,
       unsigned char fprbuf[20];
 
       err = store_fpr (app, keyno, created_at, fprbuf, algo, oidbuf, oid_len,
-                       qbuf, ecc_q_len, "\x03\x01\x08\x07", (size_t)4);
+                       qbuf, ecc_q_len, ecdh_params (curve), (size_t)4);
       if (err)
         goto leave;
 
@@ -1397,8 +1422,9 @@ ecc_read_pubkey (app_t app, ctrl_t ctrl, u32 created_at, int keyno,
   else
     format = "(public-key(ecc(curve%s)(flags eddsa)(q%b)))";
 
-  curve = openpgp_oid_to_curve (app->app_local->keyattr[keyno].ecc.oid, 1);
-  err = gcry_sexp_build (r_sexp, NULL, format, curve, (int)ecc_q_len, qbuf);
+  err = gcry_sexp_build (r_sexp, NULL, format,
+                         app->app_local->keyattr[keyno].ecc.curve,
+                         (int)ecc_q_len, qbuf);
  leave:
   gcry_mpi_release (oid);
   xfree (qbuf);
@@ -3342,8 +3368,9 @@ ecc_writekey (app_t app, gpg_error_t (*pincb)(void*, const char *, char **),
   const unsigned char *ecc_q = NULL;
   const unsigned char *ecc_d = NULL;
   size_t ecc_q_len, ecc_d_len;
+  const char *curve = NULL;
   u32 created_at = 0;
-  const char *oidstr = NULL;
+  const char *oidstr;
   int flag_djb_tweak = 0;
   int algo;
   gcry_mpi_t oid = NULL;
@@ -3372,22 +3399,22 @@ ecc_writekey (app_t app, gpg_error_t (*pincb)(void*, const char *, char **),
 
       if (tok && toklen == 5 && !memcmp (tok, "curve", 5))
         {
-          unsigned char *curve;
+          char *curve_name;
 
           if ((err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen)))
             goto leave;
 
-          curve = xtrymalloc (toklen+1);
-          if (!curve)
+          curve_name = xtrymalloc (toklen+1);
+          if (!curve_name)
             {
               err = gpg_error_from_syserror ();
               goto leave;
             }
 
-          memcpy (curve, tok, toklen);
-          curve[toklen] = 0;
-          oidstr = openpgp_curve_to_oid (curve, NULL);
-          xfree (curve);
+          memcpy (curve_name, tok, toklen);
+          curve_name[toklen] = 0;
+          curve = openpgp_is_curve_supported (curve_name, NULL);
+          xfree (curve_name);
         }
       else if (tok && toklen == 5 && !memcmp (tok, "flags", 5))
         {
@@ -3474,7 +3501,7 @@ ecc_writekey (app_t app, gpg_error_t (*pincb)(void*, const char *, char **),
 
   /* Check that we have all parameters and that they match the card
      description. */
-  if (!oidstr)
+  if (!curve)
     {
       log_error (_("unsupported curve\n"));
       err = gpg_error (GPG_ERR_INV_VALUE);
@@ -3493,6 +3520,7 @@ ecc_writekey (app_t app, gpg_error_t (*pincb)(void*, const char *, char **),
   else
     algo = PUBKEY_ALGO_ECDSA;
 
+  oidstr = openpgp_curve_to_oid (curve, NULL);
   err = openpgp_oid_from_str (oidstr, &oid);
   if (err)
     goto leave;
@@ -3505,7 +3533,7 @@ ecc_writekey (app_t app, gpg_error_t (*pincb)(void*, const char *, char **),
   oid_len = (n+7)/8;
 
   if (app->app_local->keyattr[keyno].key_type != KEY_TYPE_ECC
-      || app->app_local->keyattr[keyno].ecc.oid != oidstr
+      || app->app_local->keyattr[keyno].ecc.curve != curve
       || (flag_djb_tweak !=
           (app->app_local->keyattr[keyno].ecc.flags & ECC_FLAG_DJB_TWEAK)))
     {
@@ -3580,7 +3608,7 @@ ecc_writekey (app_t app, gpg_error_t (*pincb)(void*, const char *, char **),
     }
 
   err = store_fpr (app, keyno, created_at, fprbuf, algo, oidbuf, oid_len,
-                   ecc_q, ecc_q_len, "\x03\x01\x08\x07", (size_t)4);
+                   ecc_q, ecc_q_len, ecdh_params (curve), (size_t)4);
 
  leave:
   gcry_mpi_release (oid);
@@ -4578,12 +4606,11 @@ parse_historical (struct app_local_s *apploc,
 
 /*
  * Check if the OID in an DER encoding is available by GnuPG/libgcrypt,
- * and return the constant string in dotted decimal form.
- * Return NULL if not available.
+ * and return the curve name.  Return NULL if not available.
  * The constant string is not allocated dynamically, never free it.
  */
 static const char *
-ecc_oid (unsigned char *buf, size_t buflen)
+ecc_curve (unsigned char *buf, size_t buflen)
 {
   gcry_mpi_t oid;
   char *oidstr;
@@ -4608,7 +4635,7 @@ ecc_oid (unsigned char *buf, size_t buflen)
   if (!oidstr)
     return NULL;
 
-  result = openpgp_curve_to_oid (oidstr, NULL);
+  result = openpgp_oid_to_curve (oidstr, 1);
   xfree (oidstr);
   return result;
 }
@@ -4671,7 +4698,7 @@ parse_algorithm_attribute (app_t app, int keyno)
   else if (*buffer == PUBKEY_ALGO_ECDH || *buffer == PUBKEY_ALGO_ECDSA
            || *buffer == PUBKEY_ALGO_EDDSA)
     {
-      const char *oid;
+      const char *curve;
       int oidlen = buflen - 1;
 
       app->app_local->keyattr[keyno].ecc.flags = 0;
@@ -4683,22 +4710,22 @@ parse_algorithm_attribute (app_t app, int keyno)
             app->app_local->keyattr[keyno].ecc.flags |= ECC_FLAG_PUBKEY;
         }
 
-      oid = ecc_oid (buffer + 1, oidlen);
+      curve = ecc_curve (buffer + 1, oidlen);
 
-      if (!oid)
+      if (!curve)
         log_printhex ("Curve with OID not supported: ", buffer+1, buflen-1);
       else
         {
           app->app_local->keyattr[keyno].key_type = KEY_TYPE_ECC;
-          app->app_local->keyattr[keyno].ecc.oid = oid;
+          app->app_local->keyattr[keyno].ecc.curve = curve;
           if (*buffer == PUBKEY_ALGO_EDDSA
               || (*buffer == PUBKEY_ALGO_ECDH
-                  && !strcmp (app->app_local->keyattr[keyno].ecc.oid,
-                              "1.3.6.1.4.1.3029.1.5.1")))
+                  && !strcmp (app->app_local->keyattr[keyno].ecc.curve,
+                              "Curve25519")))
             app->app_local->keyattr[keyno].ecc.flags |= ECC_FLAG_DJB_TWEAK;
           if (opt.verbose)
             log_printf
-              ("ECC, curve=%s%s\n", app->app_local->keyattr[keyno].ecc.oid,
+              ("ECC, curve=%s%s\n", app->app_local->keyattr[keyno].ecc.curve,
                !(app->app_local->keyattr[keyno].ecc.flags & ECC_FLAG_DJB_TWEAK)?
                "": keyno==1? " (djb-tweak)": " (eddsa)");
         }

commit 945e7ab0ddedf5f58afd97d81e101939de5b5d89
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Oct 24 11:20:14 2016 +0900

    common: Fix openpgp_is_curve_supported.
    
    * common/openpgp-oid.c (openpgp_is_curve_supported): Support both of
    canonical name of the curve and alias.
    
    --
    Only alias (the name for print) was allowed before this change.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/common/openpgp-oid.c b/common/openpgp-oid.c
index af3cbbe..67f23ca 100644
--- a/common/openpgp-oid.c
+++ b/common/openpgp-oid.c
@@ -424,8 +424,8 @@ openpgp_is_curve_supported (const char *name, int *r_algo)
     *r_algo = 0;
   for (idx = 0; idx < DIM (oidtable) && oidtable[idx].name; idx++)
     {
-      if (!strcmp (name, (oidtable[idx].alias? oidtable[idx].alias
-                          /**/               : oidtable[idx].name))
+      if ((!strcmp (name, oidtable[idx].name)
+           || (oidtable[idx].alias && !strcmp (name, (oidtable[idx].alias))))
           && curve_supported_p (oidtable[idx].name))
         {
           if (r_algo)

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

Summary of changes:
 common/openpgp-oid.c |  4 +--
 g10/call-agent.c     | 10 +-----
 g10/card-util.c      | 13 +++++++-
 scd/app-openpgp.c    | 89 ++++++++++++++++++++++++++++++++++------------------
 4 files changed, 73 insertions(+), 43 deletions(-)


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



From cvs at cvs.gnupg.org  Mon Oct 24 12:29:29 2016
From: cvs at cvs.gnupg.org (by Kai Michaelis)
Date: Mon, 24 Oct 2016 12:29:29 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-267-g5e7dfd9
Message-ID: <E1bycVY-0007zR-D1@lists.gnupg.org>

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  5e7dfd979d2d91800d90c3ce9a66755df3217682 (commit)
      from  b1828c17fc475def1ee9e06f083f513f568c241b (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 5e7dfd979d2d91800d90c3ce9a66755df3217682
Author: Kai Michaelis <kai at gnupg.org>
Date:   Mon Oct 24 12:29:05 2016 +0200

    dirmngr: Fix segfault in VERSIONCHECK.
    
    * dirmngr/server.c (cmd_versioncheck): The VERSIONCHECK command crashes
    when called without program version.

diff --git a/dirmngr/server.c b/dirmngr/server.c
index 8590fb1..496ee2d 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -2516,8 +2516,8 @@ cmd_versioncheck (assuan_context_t ctx, char *line)
   char *cmd_fields[2];
 
   ctrl_t ctrl;
-  estream_t swdb;
-  estream_t swdb_sig;
+  estream_t swdb = NULL;
+  estream_t swdb_sig = NULL;
   char* swdb_dir = NULL;
   char* swdb_sig_dir = NULL;
   char* buf = NULL;

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

Summary of changes:
 dirmngr/server.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


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



From cvs at cvs.gnupg.org  Mon Oct 24 13:16:07 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Mon, 24 Oct 2016 13:16:07 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-270-g9d6146d
Message-ID: <E1bydEg-0001zr-M9@lists.gnupg.org>

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  9d6146d6f9870fbfcec15cdc4becaf094d5a90e0 (commit)
       via  8c40b3b98d3ddeda79fde981e6539c5b3b09d9a2 (commit)
       via  fdb653a33ea1a24d1159880624dbbcc0867865b5 (commit)
      from  5e7dfd979d2d91800d90c3ce9a66755df3217682 (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 9d6146d6f9870fbfcec15cdc4becaf094d5a90e0
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Oct 24 13:12:05 2016 +0200

    gpg: Replace two sprintf calls.
    
    * g10/keygen.c (print_status_key_created): Use snprintf for now.
    (ask_expire_interval): Replace xmalloc and sprintf by xasprintf.
    --
    
    Future updates: Replace code like
    
       r = xcalloc (1, sizeof *r + 20 );
       r->key = pKEYLENGTH;
       sprintf( r->u.value, "%u", info.key_attr[0].nbits);
    
    by something like
    
       r = new_r_with_value ("%u", info.key_attr[0].nbits);
       r->key = pKEYLENGTH;
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/keygen.c b/g10/keygen.c
index ed529c7..d98b70b 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -180,8 +180,9 @@ print_status_key_created (int letter, PKT_public_key *pk, const char *handle)
           *p++ = ' ';
           fingerprint_from_pk (pk, array, &n);
           s = array;
+          /* Fixme: Use bin2hex */
           for (i=0; i < n ; i++, s++, p += 2)
-            sprintf (p, "%02X", *s);
+            snprintf (p, 3, "%02X", *s);
         }
     }
   if (*handle)
@@ -2428,13 +2429,7 @@ ask_expire_interval(int object,const char *def_expire)
 	  {
 	    char *prompt;
 
-#define PROMPTSTRING _("Signature is valid for? (%s) ")
-	    /* This will actually end up larger than necessary because
-	       of the 2 bytes for '%s' */
-	    prompt=xmalloc(strlen(PROMPTSTRING)+strlen(def_expire)+1);
-	    sprintf(prompt,PROMPTSTRING,def_expire);
-#undef PROMPTSTRING
-
+	    prompt = xasprintf (_("Signature is valid for? (%s) "), def_expire);
 	    answer = cpr_get("siggen.valid",prompt);
 	    xfree(prompt);
 

commit 8c40b3b98d3ddeda79fde981e6539c5b3b09d9a2
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Oct 24 13:01:06 2016 +0200

    agent: Minor cleanup for recent change in findkey.c
    
    * agent/findkey.c (agent_write_private_key): Avoid label name error.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/agent/findkey.c b/agent/findkey.c
index 162e8c2..c67dc72 100644
--- a/agent/findkey.c
+++ b/agent/findkey.c
@@ -157,14 +157,10 @@ agent_write_private_key (const unsigned char *grip,
         {
           fp = es_fopen (fname, "wbx,mode=-rw");
           if (!fp)
-            {
-              tmperr = gpg_error_from_syserror ();
-              goto error;
-            }
+            tmperr = gpg_error_from_syserror ();
         }
-      else
+      if (!fp)
         {
-        error:
           log_error ("can't create '%s': %s\n", fname, gpg_strerror (tmperr));
           xfree (fname);
           return tmperr;

commit fdb653a33ea1a24d1159880624dbbcc0867865b5
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Oct 24 12:55:21 2016 +0200

    agent: Slightly change structure of cmd_readkey.
    
    * agent/command.c (cmd_readkey): Avoid a leave label in the middle of
    the code.  Remove the special return.
    --
    
    This helps to get better debug output.
    
    The set_error macro which is used by parse_keygrip merely sets the
    error code into the Assuan context.  It is thus no problem anymore to
    call leave_cmd after having used set_error.  This might havve been
    diffferent in the past.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/agent/command.c b/agent/command.c
index 1a13084..999f608 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -391,7 +391,9 @@ progress_cb (ctrl_t ctrl, const char *what, int printchar,
 }
 
 
-/* Helper to print a message while leaving a command.  */
+/* Helper to print a message while leaving a command.  Note that this
+ * function does not call assuan_set_error; the caller may do this
+ * prior to calling us.  */
 static gpg_error_t
 leave_cmd (assuan_context_t ctx, gpg_error_t err)
 {
@@ -1000,17 +1002,19 @@ cmd_readkey (assuan_context_t ctx, char *line)
   unsigned char grip[20];
   gcry_sexp_t s_pkey = NULL;
   unsigned char *pkbuf = NULL;
+  char *serialno = NULL;
   size_t pkbuflen;
+  const char *opt_card;
 
   if (ctrl->restricted)
     return leave_cmd (ctx, gpg_error (GPG_ERR_FORBIDDEN));
 
-  if (has_option_name (line, "--card"))
-    {
-      const char *keyid;
-      char *serialno = NULL;
+  opt_card = has_option_name (line, "--card");
+  line = skip_options (line);
 
-      keyid = skip_options (line);
+  if (opt_card)
+    {
+      const char *keyid = opt_card;
 
       rc = agent_card_getattr (ctrl, "SERIALNO", &serialno);
       if (rc)
@@ -1042,35 +1046,33 @@ cmd_readkey (assuan_context_t ctx, char *line)
         goto leave;
 
       rc = assuan_send_data (ctx, pkbuf, pkbuflen);
-
- leave:
-      xfree (serialno);
-      xfree (pkbuf);
-      gcry_sexp_release (s_pkey);
-      return leave_cmd (ctx, rc);
     }
-
-  rc = parse_keygrip (ctx, line, grip);
-  if (rc)
-    return rc; /* Return immediately as this is already an Assuan error code.*/
-
-  rc = agent_public_key_from_file (ctrl, grip, &s_pkey);
-  if (!rc)
+  else
     {
-      pkbuflen = gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, NULL, 0);
-      assert (pkbuflen);
-      pkbuf = xtrymalloc (pkbuflen);
-      if (!pkbuf)
-        rc = gpg_error_from_syserror ();
-      else
+      rc = parse_keygrip (ctx, line, grip);
+      if (rc)
+        goto leave;
+
+      rc = agent_public_key_from_file (ctrl, grip, &s_pkey);
+      if (!rc)
         {
-          gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, pkbuf, pkbuflen);
-          rc = assuan_send_data (ctx, pkbuf, pkbuflen);
-          xfree (pkbuf);
+          pkbuflen = gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, NULL, 0);
+          log_assert (pkbuflen);
+          pkbuf = xtrymalloc (pkbuflen);
+          if (!pkbuf)
+            rc = gpg_error_from_syserror ();
+          else
+            {
+              gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, pkbuf, pkbuflen);
+              rc = assuan_send_data (ctx, pkbuf, pkbuflen);
+            }
         }
-      gcry_sexp_release (s_pkey);
     }
 
+ leave:
+  xfree (serialno);
+  xfree (pkbuf);
+  gcry_sexp_release (s_pkey);
   return leave_cmd (ctx, rc);
 }
 

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

Summary of changes:
 agent/command.c | 60 +++++++++++++++++++++++++++++----------------------------
 agent/findkey.c |  8 ++------
 g10/keygen.c    | 11 +++--------
 3 files changed, 36 insertions(+), 43 deletions(-)


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



From cvs at cvs.gnupg.org  Mon Oct 24 20:20:54 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Mon, 24 Oct 2016 20:20:54 +0200
Subject: [git] GpgOL - branch, nomapi, updated. gpgol-1.4.0-118-ga206668
Message-ID: <E1byjrk-0003oI-Gd@lists.gnupg.org>

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 "GnuPG extension for MS Outlook".

The branch, nomapi has been updated
       via  a20666844db52b53ea082934a304e7e90f687acc (commit)
      from  d90adfc3d5e7b8aed8040f483a91914771ba2429 (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 a20666844db52b53ea082934a304e7e90f687acc
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Oct 24 20:19:48 2016 +0200

    Clarify and spellfix update_sigstate comments
    
    * src/mail.cpp (Mail::update_sigstate): Clarify comments and
    fix spelling.

diff --git a/src/mail.cpp b/src/mail.cpp
index 4a5c67e..a3c54e9 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -1007,12 +1007,12 @@ Mail::update_sigstate ()
                          SRCNAME, __func__);
               continue;
             }
-          /* GnuPG uses the encrypt cound to determine validity.
+          /* GnuPG uses the encrypt count to determine validity.
              This does not make sense for us. E.g. Drafts may have
              been encrypted and encryption is no communication so
-             it does not track communication.
-             So basically "Our" Tofu validity is then more then 10 messages
-             have been exchanged. */
+             it does not track communication history or consistency.
+             So basically "our" tofu validity is that more then 10 messages
+             have been exchanged. Which was the original code in GnuPG */
           if (!tofu.isNull() && tofu.signCount() <= GPGOL_BASIC_TOFU_TRUST) {
               log_debug ("%s:%s: Tofu signcount too small.",
                          SRCNAME, __func__);

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

Summary of changes:
 src/mail.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org



From cvs at cvs.gnupg.org  Tue Oct 25 09:47:21 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 25 Oct 2016 09:47:21 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-272-gb120f35
Message-ID: <E1bywSC-0006nL-Cb@lists.gnupg.org>

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  b120f358c25cc846ca9d841d47e71ca1a7fe02e4 (commit)
       via  7983f8758703071710c11bf2a255efcd71836b65 (commit)
      from  9d6146d6f9870fbfcec15cdc4becaf094d5a90e0 (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 b120f358c25cc846ca9d841d47e71ca1a7fe02e4
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Oct 25 09:38:01 2016 +0200

    dirmngr: Allow command VERSIONCHECK to handle 3 part version numbers.
    
    * dirmngr/server.c (parse_version_string): Add arg MICRO and set it.
    (cmp_version): Extend to handle the MICRO part.
    (confucius_mktmpdir): Rename to my_mktmpdir.
    (my_mktmpdir): xstrconcat does not fail; use strconcat.
    (fetch_into_tmpdir): Improve error checking.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/dirmngr/server.c b/dirmngr/server.c
index 496ee2d..0ad2713 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -2342,6 +2342,10 @@ cmd_reloaddirmngr (assuan_context_t ctx, char *line)
 
 
 

+/* This function parses the first portion of the version number S and
+ * stores it in *NUMBER.  On success, this function returns a pointer
+ * into S starting with the first character, which is not part of the
+ * initial number portion; on failure, NULL is returned.  */
 static const char*
 parse_version_number (const char *s, int *number)
 {
@@ -2359,8 +2363,16 @@ parse_version_number (const char *s, int *number)
 }
 
 
+/* This function breaks up the complete string-representation of the
+ * version number S, which is of the following struture: <major
+ * number>.<minor number>[.<micro number>]<patch level>.  The major,
+ * minor and micro number components will be stored in *MAJOR, *MINOR
+ * and *MICRO.  If MICRO is not given 0 is used instead.
+ *
+ * On success, the last component, the patch level, will be returned;
+ * on failure, NULL will be returned.  */
 static const char *
-parse_version_string (const char *s, int *major, int *minor)
+parse_version_string (const char *s, int *major, int *minor, int *micro)
 {
   s = parse_version_number (s, major);
   if (!s || *s != '.')
@@ -2369,18 +2381,23 @@ parse_version_string (const char *s, int *major, int *minor)
   s = parse_version_number (s, minor);
   if (!s)
     return NULL;
+  if (*s == '.')
+    {
+      s++;
+      s = parse_version_number (s, micro);
+      if (!s)
+        return NULL;
+    }
+  else
+    micro = 0;
   return s;  /* Patchlevel.  */
 }
 
-/* Class Confucius.
-
-   "Don't worry that other people don't know you;
-   worry that you don't know other people."            Analects--1.16.  */
 
 /* Create temporary directory with mode 0700.  Returns a dynamically
-   allocated string with the filename of the directory.  */
+ * allocated string with the filename of the directory.  */
 static char *
-confucius_mktmpdir (void)
+my_mktmpdir (void)
 {
   char *name, *p;
 
@@ -2388,19 +2405,22 @@ confucius_mktmpdir (void)
   if (!p || !*p)
     p = "/tmp";
   if (p[strlen (p) - 1] == '/')
-    name = xstrconcat (p, "gpg-XXXXXX", NULL);
+    name = strconcat (p, "gpg-XXXXXX", NULL);
   else
-    name = xstrconcat (p, "/", "gpg-XXXXXX", NULL);
+    name = strconcat (p, "/", "gpg-XXXXXX", NULL);
   if (!name || !gnupg_mkdtemp (name))
     {
+      int saveerr = errno;
       log_error (_("can't create temporary directory '%s': %s\n"),
-                 name?name:"", strerror (errno));
+                 name, strerror (saveerr));
+      gpg_err_set_errno (saveerr);
       return NULL;
     }
 
   return name;
 }
 
+
 /* Sets result to -1 if version a is less than b, 0 if the versions are equal
  * and 1 otherwise. Patch levels are compared as strings.  */
 static gpg_error_t
@@ -2408,21 +2428,27 @@ cmp_version (const char *a, const char *b, int *result)
 {
   int a_major, b_major;
   int a_minor, b_minor;
+  int a_micro, b_micro;
   const char *a_patch, *b_patch;
 
   if (!a || !b || !result)
-    return GPG_ERR_EINVAL;
+    return gpg_error (GPG_ERR_EINVAL);
 
-  a_patch = parse_version_string (a, &a_major, &a_minor);
-  b_patch = parse_version_string (b, &b_major, &b_minor);
+  a_patch = parse_version_string (a, &a_major, &a_minor, &a_micro);
+  b_patch = parse_version_string (b, &b_major, &b_minor, &b_micro);
 
   if (!a_patch || !b_patch)
-    return GPG_ERR_EINVAL;
+    return gpg_error (GPG_ERR_EINVAL);
 
   if (a_major == b_major)
     {
       if (a_minor == b_minor)
-        *result = strcmp (a_patch, b_patch);
+        {
+          if (a_micro == b_micro)
+            *result = strcmp (a_patch, b_patch);
+          else
+            *result = a_micro - b_minor;
+        }
       else
         *result = a_minor - b_minor;
     }
@@ -2432,25 +2458,26 @@ cmp_version (const char *a, const char *b, int *result)
   return 0;
 }
 
+
 static gpg_error_t
-fetch_into_tmpdir (ctrl_t ctrl, const char* url, estream_t* strm_out,
-                   char** path)
+fetch_into_tmpdir (ctrl_t ctrl, const char *url, estream_t *strm_out,
+                   char **path)
 {
   gpg_error_t err;
-  char* filename = NULL;
-  char* dirname = NULL;
-  estream_t file;
-  estream_t strm;
-  size_t len = 0;
+  char *filename = NULL;
+  char *dirname = NULL;
+  estream_t file = NULL;
+  estream_t strm = NULL;
+  size_t len, nwritten;
   char buf[1024];
 
   if (!strm_out || !path || !url)
     {
-      err = (GPG_ERR_INV_ARG);
+      err = gpg_error (GPG_ERR_INV_ARG);
       goto leave;
     }
 
-  dirname = confucius_mktmpdir ();
+  dirname = my_mktmpdir ();
   if (!dirname)
     {
       err = gpg_error_from_syserror ();
@@ -2465,39 +2492,60 @@ fetch_into_tmpdir (ctrl_t ctrl, const char* url, estream_t* strm_out,
     }
 
   file = es_fopen (filename, "w+");
+  if (!file)
+    {
+      err = gpg_error_from_syserror ();
+      goto leave;
+    }
 
   if ((err = ks_http_fetch (ctrl, url, &strm)))
     goto leave;
 
-  while (!es_read (strm, buf, sizeof buf, &len))
+  for (;;)
     {
+      if (es_read (strm, buf, sizeof buf, &len))
+        {
+          err = gpg_error_from_syserror ();
+          log_error ("error reading '%s': %s\n",
+                     es_fname_get (strm), gpg_strerror (err));
+          goto leave;
+        }
+
       if (!len)
         break;
-      if ((err = es_write (file, buf, len, NULL)))
+      if (es_write (file, buf, len, &nwritten))
+        {
+          err = gpg_error_from_syserror ();
+          log_error ("error writing '%s': %s\n", filename, gpg_strerror (err));
+          goto leave;
+        }
+      else if (len != nwritten)
         {
-          log_error ("error writing message to pipe: %s\n", gpg_strerror (err));
-          es_free (strm);
+          err = gpg_error (GPG_ERR_EIO);
+          log_error ("error writing '%s': %s\n", filename, "short write");
           goto leave;
         }
     }
 
   es_rewind (file);
-  es_fclose (strm);
   *strm_out = file;
-  err = 0;
+  file = NULL;
 
   if (path)
     {
-    *path = dirname;
-    dirname = NULL;
+      *path = dirname;
+      dirname = NULL;
     }
 
-leave:
+ leave:
+  es_fclose (file);
+  es_fclose (strm);
   xfree (dirname);
   xfree (filename);
   return err;
 }
 
+
 static const char hlp_versioncheck[] =
   "VERSIONCHECK <name> <version>"
   "\n"
@@ -2510,8 +2558,8 @@ cmd_versioncheck (assuan_context_t ctx, char *line)
 {
   gpg_error_t err;
 
-  char* name;
-  char* version;
+  char *name;
+  char *version;
   size_t name_len;
   char *cmd_fields[2];
 

commit 7983f8758703071710c11bf2a255efcd71836b65
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Oct 25 08:59:44 2016 +0200

    common: Use strconcat in gnupg_setenv.
    
    * common/sysutils.c (gnupg_setenv): Replace malloc+stpcpy by
    strconcat.  Indent cpp conditionals.
    (gnupg_unsetenv): Indent cpp conditionals.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/sysutils.c b/common/sysutils.c
index 85eb203..ab2012c 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -754,8 +754,8 @@ gnupg_setenv (const char *name, const char *value, int overwrite)
   (void)value;
   (void)overwrite;
   return 0;
-#else
-#if defined(HAVE_W32_SYSTEM)
+#else /*!W32CE*/
+# ifdef HAVE_W32_SYSTEM
   /*  Windows maintains (at least) two sets of environment variables.
       One set can be accessed by GetEnvironmentVariable and
       SetEnvironmentVariable.  This set is inherited by the children.
@@ -773,11 +773,11 @@ gnupg_setenv (const char *name, const char *value, int overwrite)
         return -1;
       }
   }
-#endif
+# endif /*W32*/
 
-#if defined(HAVE_SETENV)
+# ifdef HAVE_SETENV
   return setenv (name, value, overwrite);
-#else
+# else /*!HAVE_SETENV*/
   if (! getenv (name) || overwrite)
     {
       char *buf;
@@ -788,18 +788,17 @@ gnupg_setenv (const char *name, const char *value, int overwrite)
           gpg_err_set_errno (EINVAL);
           return -1;
         }
-      buf = xtrymalloc (strlen (name) + 1 + strlen (value) + 1);
+      buf = strconcat (name, "=", value, NULL);
       if (!buf)
         return -1;
-      strcpy (stpcpy (stpcpy (buf, name), "="), value);
-#if __GNUC__
-# warning no setenv - using putenv but leaking memory.
-#endif
+# if __GNUC__
+#  warning no setenv - using putenv but leaking memory.
+# endif
       return putenv (buf);
     }
   return 0;
-#endif
-#endif
+# endif /*!HAVE_SETENV*/
+#endif /*!W32CE*/
 }
 
 
@@ -809,8 +808,8 @@ gnupg_unsetenv (const char *name)
 #ifdef HAVE_W32CE_SYSTEM
   (void)name;
   return 0;
-#else
-#if defined(HAVE_W32_SYSTEM)
+#else /*!W32CE*/
+# ifdef HAVE_W32_SYSTEM
   /*  Windows maintains (at least) two sets of environment variables.
       One set can be accessed by GetEnvironmentVariable and
       SetEnvironmentVariable.  This set is inherited by the children.
@@ -822,10 +821,11 @@ gnupg_unsetenv (const char *name)
       gpg_err_set_errno (EINVAL); /* (Might also be ENOMEM.) */
       return -1;
     }
-#endif
-#if defined(HAVE_UNSETENV)
+# endif /*W32*/
+
+# ifdef HAVE_UNSETENV
   return unsetenv (name);
-#else
+# else /*!HAVE_UNSETENV*/
   {
     char *buf;
 
@@ -837,13 +837,13 @@ gnupg_unsetenv (const char *name)
     buf = xtrystrdup (name);
     if (!buf)
       return -1;
-#if __GNUC__
-# warning no unsetenv - trying putenv but leaking memory.
-#endif
+#  if __GNUC__
+#   warning no unsetenv - trying putenv but leaking memory.
+#  endif
     return putenv (buf);
   }
-#endif
-#endif
+# endif /*!HAVE_UNSETENV*/
+#endif /*!W32CE*/
 }
 
 

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

Summary of changes:
 common/sysutils.c |  44 ++++++++++----------
 dirmngr/server.c  | 118 ++++++++++++++++++++++++++++++++++++++----------------
 2 files changed, 105 insertions(+), 57 deletions(-)


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



From cvs at cvs.gnupg.org  Tue Oct 25 17:32:47 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 25 Oct 2016 17:32:47 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.7.1-3-gb8159ea
Message-ID: <E1bz3ib-00020x-Uo@lists.gnupg.org>

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 "GnuPG Made Easy".

The branch, master has been updated
       via  b8159eadb5636cd9d93ee60c41e75d5978927870 (commit)
      from  26cbba3c9cb04a68b95f3a6000ac9bd93fe76dd7 (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 b8159eadb5636cd9d93ee60c41e75d5978927870
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Oct 25 17:27:49 2016 +0200

    core: New API functions gpgme_set_sender, gpgme_get_sender.
    
    * src/context.h (struct gpgme_context): Add field 'sender'.
    * src/gpgme.c: Include mbox-util.h.
    (gpgme_release): Free SENDER.
    (gpgme_set_sender): New.
    (gpgme_get_sender): New.
    * src/gpgme.def, src/libgpgme.vers: Add new functions.
    
    * src/engine-gpg.c (append_args_from_sender): New.
    (gpg_encrypt_sign, gpg_sign): Call append_args_from_sender.
    (gpg_verify): Add arg CTX.  Call append_args_from_sender/
    * src/engine-gpgsm.c (gpgsm_verify): Add dummy arg CTX.
    * src/engine-uiserver.c (uiserver_verify): Ditto.
    * src/engine.c (_gpgme_engine_op_verify): Add arg CTX.
    * src/verify.c (verify_start): Pass CTX to engine function.
    
    * tests/gpg/t-verify.c (main): Add some checks for new functions.
    * tests/run-sign.c (main): Add option --sender.
    * tests/run-verify.c (main): Ditto.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/NEWS b/NEWS
index f5d7ce0..38f38d6 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,12 @@ Noteworthy changes in version 1.7.2 (unreleased)
 ------------------------------------------------
 
 
+ * Interface changes relative to the 1.7.1 release:
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ gpgme_set_sender                NEW.
+ gpgme_get_sender                NEW.
+
+
 Noteworthy changes in version 1.7.1 (2016-10-18)
 ------------------------------------------------
 
diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index cc59888..9fae9aa 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -186,6 +186,7 @@ Context Attributes
 
 * Protocol Selection::            Selecting the protocol used by a context.
 * Crypto Engine::                 Configuring the crypto engine.
+* Setting the Sender::            How to tell the engine the sender.
 * ASCII Armor::                   Requesting @acronym{ASCII} armored output.
 * Text Mode::                     Choosing canonical text mode.
 * Offline Mode::                  Choosing offline mode.
@@ -2366,6 +2367,7 @@ started.  In fact, these references are accessed through the
 @menu
 * Protocol Selection::            Selecting the protocol used by a context.
 * Crypto Engine::                 Configuring the crypto engine.
+* Setting the Sender::            How to tell the engine the sender.
 * ASCII Armor::                   Requesting @acronym{ASCII} armored output.
 * Text Mode::                     Choosing canonical text mode.
 * Offline Mode::                  Choosing offline mode.
@@ -2448,6 +2450,47 @@ successful, or an eror code on failure.
 @end deftypefun
 
 
+ at node Setting the Sender
+ at subsection How to tell the engine the sender.
+ at cindex context, sender
+ at cindex sender
+ at cindex From:
+
+Some engines can make use of the sender?s address, for example to
+figure out the best user id in certain trust models.  For verification
+and signing of mails, it is thus suggested to let the engine know the
+sender ("From:") address.  @acronym{GPGME} provides two functions to
+accomplish that.  Note that the esoteric use of multiple "From:"
+addresses is not supported.
+
+ at deftypefun gpgme_error_t gpgme_set_sender @
+      (@w{gpgme_ctx_t @var{ctx}}, @
+       @w{int @var{address}})
+
+The function @code{gpgme_set_sender} specifies the sender address for
+use in sign and verify operations.  @var{address} is expected to be
+the ``addr-spec'' part of an address but my also be a complete mailbox
+address, in which case this function extracts the ``addr-spec'' from
+it.  Using @code{NULL} for @var{address} clears the sender address.
+
+The function returns 0 on success or an error code on failure.  The
+most likely failure is that no valid ``addr-spec'' was found in
+ at var{address}.
+
+ at end deftypefun
+
+ at deftypefun @w{const char *} gpgme_get_sender @
+      (@w{gpgme_ctx_t @var{ctx}})
+
+The function @code{gpgme_get_sender} returns the current sender
+address from the context, or NULL if none was set.  The returned
+value is valid as long as the @var{ctx} is valid and
+ at code{gpgme_set_sender} has not been called again.
+
+ at end deftypefun
+
+
+
 @c FIXME: Unfortunately, using @acronym here breaks texi2dvi.
 @node ASCII Armor
 @subsection @acronym{ASCII} Armor
diff --git a/src/context.h b/src/context.h
index 4b12c3b..f6c1ad1 100644
--- a/src/context.h
+++ b/src/context.h
@@ -119,16 +119,18 @@ struct gpgme_context
   /* Number of certs to be included.  */
   unsigned int include_certs;
 
-  /* The number of keys in signers.  */
+  /* The actual number of keys in SIGNERS, the allocated size of the
+   * array, and the array with the signing keys.  */
   unsigned int signers_len;
-
-  /* Size of the following array.  */
   unsigned int signers_size;
   gpgme_key_t *signers;
 
   /* The signature notations for this context.  */
   gpgme_sig_notation_t sig_notations;
 
+  /* The sender's addr-spec or NULL.  */
+  char *sender;
+
   /* The locale for the pinentry.  */
   char *lc_ctype;
   char *lc_messages;
diff --git a/src/engine-backend.h b/src/engine-backend.h
index ccab0e3..e02c715 100644
--- a/src/engine-backend.h
+++ b/src/engine-backend.h
@@ -111,7 +111,8 @@ struct engine_ops
 			 gpgme_ctx_t ctx /* FIXME */);
   gpgme_error_t (*trustlist) (void *engine, const char *pattern);
   gpgme_error_t (*verify) (void *engine, gpgme_data_t sig,
-			   gpgme_data_t signed_text, gpgme_data_t plaintext);
+			   gpgme_data_t signed_text, gpgme_data_t plaintext,
+                           gpgme_ctx_t ctx);
   gpgme_error_t  (*getauditlog) (void *engine, gpgme_data_t output,
                                  unsigned int flags);
   gpgme_error_t  (*opassuan_transact) (void *engine,
diff --git a/src/engine-gpg.c b/src/engine-gpg.c
index 4415c94..cb52dea 100644
--- a/src/engine-gpg.c
+++ b/src/engine-gpg.c
@@ -1646,6 +1646,23 @@ append_args_from_signers (engine_gpg_t gpg, gpgme_ctx_t ctx /* FIXME */)
 
 
 static gpgme_error_t
+append_args_from_sender (engine_gpg_t gpg, gpgme_ctx_t ctx)
+{
+  gpgme_error_t err;
+
+  if (ctx->sender && have_gpg_version (gpg, "2.1.15"))
+    {
+      err = add_arg (gpg, "--sender");
+      if (!err)
+        err = add_arg (gpg, ctx->sender);
+    }
+  else
+    err = 0;
+  return err;
+}
+
+
+static gpgme_error_t
 append_args_from_sig_notations (engine_gpg_t gpg, gpgme_ctx_t ctx /* FIXME */)
 {
   gpgme_error_t err = 0;
@@ -1893,6 +1910,9 @@ gpg_encrypt_sign (void *engine, gpgme_key_t recp[],
     err = append_args_from_signers (gpg, ctx);
 
   if (!err)
+    err = append_args_from_sender (gpg, ctx);
+
+  if (!err)
     err = append_args_from_sig_notations (gpg, ctx);
 
   /* Tell the gpg object about the data.  */
@@ -2794,6 +2814,8 @@ gpg_sign (void *engine, gpgme_data_t in, gpgme_data_t out,
   if (!err)
     err = append_args_from_signers (gpg, ctx);
   if (!err)
+    err = append_args_from_sender (gpg, ctx);
+  if (!err)
     err = append_args_from_sig_notations (gpg, ctx);
 
   if (gpgme_data_get_file_name (in))
@@ -2845,12 +2867,15 @@ gpg_trustlist (void *engine, const char *pattern)
 
 static gpgme_error_t
 gpg_verify (void *engine, gpgme_data_t sig, gpgme_data_t signed_text,
-	    gpgme_data_t plaintext)
+	    gpgme_data_t plaintext, gpgme_ctx_t ctx)
 {
   engine_gpg_t gpg = engine;
-  gpgme_error_t err = 0;
+  gpgme_error_t err;
 
-  if (plaintext)
+  err = append_args_from_sender (gpg, ctx);
+  if (err)
+    ;
+  else if (plaintext)
     {
       /* Normal or cleartext signature.  */
       err = add_arg (gpg, "--output");
diff --git a/src/engine-gpgsm.c b/src/engine-gpgsm.c
index e7e2a20..0ce4a6d 100644
--- a/src/engine-gpgsm.c
+++ b/src/engine-gpgsm.c
@@ -1901,11 +1901,13 @@ gpgsm_sign (void *engine, gpgme_data_t in, gpgme_data_t out,
 
 static gpgme_error_t
 gpgsm_verify (void *engine, gpgme_data_t sig, gpgme_data_t signed_text,
-	      gpgme_data_t plaintext)
+	      gpgme_data_t plaintext, gpgme_ctx_t ctx)
 {
   engine_gpgsm_t gpgsm = engine;
   gpgme_error_t err;
 
+  (void)ctx;
+
   if (!gpgsm)
     return gpg_error (GPG_ERR_INV_VALUE);
 
diff --git a/src/engine-uiserver.c b/src/engine-uiserver.c
index 63e77de..76fa4d7 100644
--- a/src/engine-uiserver.c
+++ b/src/engine-uiserver.c
@@ -1243,13 +1243,16 @@ uiserver_sign (void *engine, gpgme_data_t in, gpgme_data_t out,
 /* FIXME: Missing a way to specify --silent.  */
 static gpgme_error_t
 uiserver_verify (void *engine, gpgme_data_t sig, gpgme_data_t signed_text,
-	      gpgme_data_t plaintext)
+                 gpgme_data_t plaintext, gpgme_ctx_t ctx)
 {
   engine_uiserver_t uiserver = engine;
   gpgme_error_t err;
   const char *protocol;
   char *cmd;
 
+  (void)ctx; /* FIXME: We should to add a --sender option to the
+              * UISever protocol.  */
+
   if (!uiserver)
     return gpg_error (GPG_ERR_INV_VALUE);
   if (uiserver->protocol == GPGME_PROTOCOL_DEFAULT)
@@ -1395,6 +1398,6 @@ struct engine_ops _gpgme_engine_ops_uiserver =
     uiserver_cancel,
     NULL,		/* cancel_op */
     NULL,               /* passwd */
-    NULL,                /* set_pinentry_mode */
+    NULL,               /* set_pinentry_mode */
     NULL                /* opspawn */
   };
diff --git a/src/engine.c b/src/engine.c
index a1173a0..f5dfe51 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -902,7 +902,8 @@ _gpgme_engine_op_trustlist (engine_t engine, const char *pattern)
 
 gpgme_error_t
 _gpgme_engine_op_verify (engine_t engine, gpgme_data_t sig,
-			 gpgme_data_t signed_text, gpgme_data_t plaintext)
+			 gpgme_data_t signed_text, gpgme_data_t plaintext,
+                         gpgme_ctx_t ctx)
 {
   if (!engine)
     return gpg_error (GPG_ERR_INV_VALUE);
@@ -910,7 +911,8 @@ _gpgme_engine_op_verify (engine_t engine, gpgme_data_t sig,
   if (!engine->ops->verify)
     return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
 
-  return (*engine->ops->verify) (engine->engine, sig, signed_text, plaintext);
+  return (*engine->ops->verify) (engine->engine, sig, signed_text, plaintext,
+                                 ctx);
 }
 
 
diff --git a/src/engine.h b/src/engine.h
index 4ce2bed..2999ab6 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -152,7 +152,8 @@ gpgme_error_t _gpgme_engine_op_trustlist (engine_t engine,
 					  const char *pattern);
 gpgme_error_t _gpgme_engine_op_verify (engine_t engine, gpgme_data_t sig,
 				       gpgme_data_t signed_text,
-				       gpgme_data_t plaintext);
+				       gpgme_data_t plaintext,
+                                       gpgme_ctx_t ctx);
 
 gpgme_error_t _gpgme_engine_op_getauditlog (engine_t engine,
                                             gpgme_data_t output,
diff --git a/src/gpgme.c b/src/gpgme.c
index d59f808..6d0dbff 100644
--- a/src/gpgme.c
+++ b/src/gpgme.c
@@ -38,6 +38,7 @@
 #include "debug.h"
 #include "priv-io.h"
 #include "sys-util.h"
+#include "mbox-util.h"
 
 

 /* The default locale.  */
@@ -275,12 +276,10 @@ gpgme_release (gpgme_ctx_t ctx)
   _gpgme_release_result (ctx);
   _gpgme_signers_clear (ctx);
   _gpgme_sig_notation_clear (ctx);
-  if (ctx->signers)
-    free (ctx->signers);
-  if (ctx->lc_ctype)
-    free (ctx->lc_ctype);
-  if (ctx->lc_messages)
-    free (ctx->lc_messages);
+  free (ctx->sender);
+  free (ctx->signers);
+  free (ctx->lc_ctype);
+  free (ctx->lc_messages);
   _gpgme_engine_info_release (ctx->engine_info);
   ctx->engine_info = NULL;
   DESTROY_LOCK (ctx->lock);
@@ -459,6 +458,42 @@ gpgme_get_protocol_name (gpgme_protocol_t protocol)
     }
 }
 
+
+/* Store the sender's address in the context.  ADDRESS is addr-spec of
+ * mailbox but my also be a complete mailbox, in which case this
+ * function extracts the addr-spec from it.  Returns 0 on success or
+ * an error code if no valid addr-spec could be extracted from
+ * ADDRESS.  */
+gpgme_error_t
+gpgme_set_sender (gpgme_ctx_t ctx, const char *address)
+{
+  char *p = NULL;
+
+  TRACE_BEG1 (DEBUG_CTX, "gpgme_set_sender", ctx, "sender='%s'",
+              address?address:"(null)");
+
+  if (!ctx || (address && !(p = _gpgme_mailbox_from_userid (address))))
+    return TRACE_ERR (gpg_error (GPG_ERR_INV_VALUE));
+
+  free (ctx->sender);
+  ctx->sender = p;
+  return TRACE_ERR (0);
+}
+
+
+/* Return the sender's address (addr-spec part) from the context or
+ * NULL if none was set.  The returned value is valid as long as the
+ * CTX is valid and gpgme_set_sender has not been used.  */
+const char *
+gpgme_get_sender (gpgme_ctx_t ctx)
+{
+  TRACE1 (DEBUG_CTX, "gpgme_get_sender", ctx, "sender='%s'",
+          ctx?ctx->sender:"");
+
+  return ctx->sender;
+}
+
+
 /* Enable or disable the use of an ascii armor for all output.  */
 void
 gpgme_set_armor (gpgme_ctx_t ctx, int use_armor)
diff --git a/src/gpgme.def b/src/gpgme.def
index c94c960..d633df5 100644
--- a/src/gpgme.def
+++ b/src/gpgme.def
@@ -246,5 +246,8 @@ EXPORTS
 
     gpgme_addrspec_from_uid               @186
 
+    gpgme_set_sender                      @187
+    gpgme_get_sender                      @188
+
 ; END
 
diff --git a/src/gpgme.h.in b/src/gpgme.h.in
index 5c914ae..94ef51d 100644
--- a/src/gpgme.h.in
+++ b/src/gpgme.h.in
@@ -1161,6 +1161,12 @@ gpgme_error_t gpgme_sig_notation_add (gpgme_ctx_t ctx, const char *name,
 /* Get the sig notations for this context.  */
 gpgme_sig_notation_t gpgme_sig_notation_get (gpgme_ctx_t ctx);
 
+/* Store a sender address in the context.  */
+gpgme_error_t gpgme_set_sender (gpgme_ctx_t ctx, const char *address);
+
+/* Get the sender address from the context.  */
+const char *gpgme_get_sender (gpgme_ctx_t ctx);
+
 
 

 /*
diff --git a/src/libgpgme.vers b/src/libgpgme.vers
index d3962db..42f00d5 100644
--- a/src/libgpgme.vers
+++ b/src/libgpgme.vers
@@ -119,6 +119,9 @@ GPGME_1.1 {
     gpgme_op_interact;
 
     gpgme_addrspec_from_uid;
+
+    gpgme_set_sender;
+    gpgme_get_sender;
 };
 
 
diff --git a/src/verify.c b/src/verify.c
index eb1cc10..faa8deb 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -1104,7 +1104,8 @@ verify_start (gpgme_ctx_t ctx, int synchronous, gpgme_data_t sig,
   if (!sig)
     return gpg_error (GPG_ERR_NO_DATA);
 
-  return _gpgme_engine_op_verify (ctx->engine, sig, signed_text, plaintext);
+  return _gpgme_engine_op_verify (ctx->engine, sig, signed_text, plaintext,
+                                  ctx);
 }
 
 
diff --git a/tests/gpg/t-verify.c b/tests/gpg/t-verify.c
index 9842d3a..f955cc9 100644
--- a/tests/gpg/t-verify.c
+++ b/tests/gpg/t-verify.c
@@ -209,6 +209,7 @@ main (int argc, char *argv[])
   gpgme_error_t err;
   gpgme_data_t sig, text;
   gpgme_verify_result_t result;
+  const char *s;
 
   (void)argc;
   (void)argv;
@@ -270,6 +271,54 @@ main (int argc, char *argv[])
       exit (1);
     }
 
+  /* Checking that set/get_sernder works.  */
+  err = gpgme_set_sender (ctx, "foo at example.org");
+  fail_if_err (err);
+  s = gpgme_get_sender (ctx);
+  if (!s || strcmp (s, "foo at example.org"))
+    {
+      fprintf (stderr, "%s:%i: gpgme_{set,get}_sender mismatch\n",
+               __FILE__, __LINE__);
+      exit (1);
+    }
+
+  err = gpgme_set_sender (ctx, "<bar at example.org>");
+  fail_if_err (err);
+  s = gpgme_get_sender (ctx);
+  if (!s || strcmp (s, "bar at example.org"))
+    {
+      fprintf (stderr, "%s:%i: gpgme_{set,get}_sender mismatch\n",
+               __FILE__, __LINE__);
+      exit (1);
+    }
+
+  err = gpgme_set_sender (ctx, "Foo bar (comment) <foo at example.org>");
+  fail_if_err (err);
+  s = gpgme_get_sender (ctx);
+  if (!s || strcmp (s, "foo at example.org"))
+    {
+      fprintf (stderr, "%s:%i: gpgme_{set,get}_sender mismatch\n",
+               __FILE__, __LINE__);
+      exit (1);
+    }
+
+  err = gpgme_set_sender (ctx, "foo");
+  if (gpgme_err_code (err) != GPG_ERR_INV_VALUE)
+    {
+      fprintf (stderr, "%s:%i: gpgme_set_sender didn't detect bogus address\n",
+               __FILE__, __LINE__);
+      exit (1);
+    }
+  /* (the former address should still be there.)  */
+  s = gpgme_get_sender (ctx);
+  if (!s || strcmp (s, "foo at example.org"))
+    {
+      fprintf (stderr, "%s:%i: gpgme_{set,get}_sender mismatch\n",
+               __FILE__, __LINE__);
+      exit (1);
+    }
+
+
   gpgme_data_release (sig);
   gpgme_data_release (text);
   gpgme_release (ctx);
diff --git a/tests/run-sign.c b/tests/run-sign.c
index 70853ed..f790cb6 100644
--- a/tests/run-sign.c
+++ b/tests/run-sign.c
@@ -83,6 +83,7 @@ show_usage (int ex)
          "  --uiserver       use the UI server\n"
          "  --loopback       use a loopback pinentry\n"
          "  --key NAME       use key NAME for signing\n"
+         "  --sender MBOX    use MBOX as sender address\n"
          , stderr);
   exit (ex);
 }
@@ -101,6 +102,7 @@ main (int argc, char **argv)
   gpgme_sign_result_t result;
   int print_status = 0;
   int use_loopback = 0;
+  const char *sender = NULL;
 
   if (argc)
     { argc--; argv++; }
@@ -148,6 +150,14 @@ main (int argc, char **argv)
           key_string = *argv;
           argc--; argv++;
         }
+      else if (!strcmp (*argv, "--sender"))
+        {
+          argc--; argv++;
+          if (!argc)
+            show_usage (1);
+          sender = *argv;
+          argc--; argv++;
+        }
       else if (!strcmp (*argv, "--loopback"))
         {
           use_loopback = 1;
@@ -192,6 +202,12 @@ main (int argc, char **argv)
       gpgme_key_unref (akey);
     }
 
+  if (sender)
+    {
+      err = gpgme_set_sender (ctx, sender);
+      fail_if_err (err);
+    }
+
   err = gpgme_data_new_from_file (&in, *argv, 1);
   if (err)
     {
diff --git a/tests/run-verify.c b/tests/run-verify.c
index ebc20d9..22242c0 100644
--- a/tests/run-verify.c
+++ b/tests/run-verify.c
@@ -221,6 +221,7 @@ show_usage (int ex)
          "  --status         print status lines from the backend\n"
          "  --openpgp        use the OpenPGP protocol (default)\n"
          "  --cms            use the CMS protocol\n"
+         "  --sender MBOX    use MBOX as sender address\n"
          , stderr);
   exit (ex);
 }
@@ -239,6 +240,7 @@ main (int argc, char **argv)
   gpgme_data_t msg = NULL;
   gpgme_verify_result_t result;
   int print_status = 0;
+  const char *sender = NULL;
 
   if (argc)
     { argc--; argv++; }
@@ -273,6 +275,14 @@ main (int argc, char **argv)
           protocol = GPGME_PROTOCOL_CMS;
           argc--; argv++;
         }
+      else if (!strcmp (*argv, "--sender"))
+        {
+          argc--; argv++;
+          if (!argc)
+            show_usage (1);
+          sender = *argv;
+          argc--; argv++;
+        }
       else if (!strncmp (*argv, "--", 2))
         show_usage (1);
 
@@ -313,6 +323,12 @@ main (int argc, char **argv)
     }
   /* gpgme_set_ctx_flag (ctx, "raw-description", "1"); */
 
+  if (sender)
+    {
+      err = gpgme_set_sender (ctx, sender);
+      fail_if_err (err);
+    }
+
   err = gpgme_data_new_from_stream (&sig, fp_sig);
   if (err)
     {

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

Summary of changes:
 NEWS                  |  6 ++++++
 doc/gpgme.texi        | 43 +++++++++++++++++++++++++++++++++++++++++++
 src/context.h         |  8 +++++---
 src/engine-backend.h  |  3 ++-
 src/engine-gpg.c      | 31 ++++++++++++++++++++++++++++---
 src/engine-gpgsm.c    |  4 +++-
 src/engine-uiserver.c |  7 +++++--
 src/engine.c          |  6 ++++--
 src/engine.h          |  3 ++-
 src/gpgme.c           | 47 +++++++++++++++++++++++++++++++++++++++++------
 src/gpgme.def         |  3 +++
 src/gpgme.h.in        |  6 ++++++
 src/libgpgme.vers     |  3 +++
 src/verify.c          |  3 ++-
 tests/gpg/t-verify.c  | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 tests/run-sign.c      | 16 ++++++++++++++++
 tests/run-verify.c    | 16 ++++++++++++++++
 17 files changed, 234 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org



From cvs at cvs.gnupg.org  Tue Oct 25 17:34:39 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Tue, 25 Oct 2016 17:34:39 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-274-g852b8f0
Message-ID: <E1bz3kQ-00023A-1V@lists.gnupg.org>

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  852b8f0b89d447536dfdf6cd4ea91615c75491ce (commit)
       via  f88f11a25665dca7490a09088aa24edf396e4c40 (commit)
      from  b120f358c25cc846ca9d841d47e71ca1a7fe02e4 (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 852b8f0b89d447536dfdf6cd4ea91615c75491ce
Author: Justus Winter <justus at g10code.com>
Date:   Tue Oct 25 17:07:08 2016 +0200

    agent,tests,w32: Fix relaying pinentry user data, fix fake-pinentry.
    
    * agent/call-pinentry.c (start_pinentry): Also send the user data
    using an Assuan 'OPTION' command.
    * tests/openpgp/fake-pinentry.c (get_passphrase): Fix updating
    passphrase file.
    (spacep): Include newline characters.
    (rstrip): New function.
    (main): Handle Windows line endings.  Handle the userdata option, and
    restart with the new options.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c
index 46db9e8..813df9a 100644
--- a/agent/call-pinentry.c
+++ b/agent/call-pinentry.c
@@ -354,6 +354,19 @@ start_pinentry (ctrl_t ctrl)
   if (DBG_IPC)
     log_debug ("connection to PIN entry established\n");
 
+  value = session_env_getenv (ctrl->session_env, "PINENTRY_USER_DATA");
+  if (value != NULL)
+    {
+      char *optstr;
+      if (asprintf (&optstr, "OPTION pinentry-user-data=%s", value) < 0 )
+	return unlock_pinentry (out_of_core ());
+      rc = assuan_transact (entry_ctx, optstr, NULL, NULL, NULL, NULL, NULL,
+			    NULL);
+      xfree (optstr);
+      if (rc && gpg_err_code (rc) != GPG_ERR_UNKNOWN_OPTION)
+        return unlock_pinentry (rc);
+    }
+
   rc = assuan_transact (entry_ctx,
                         opt.no_grab? "OPTION no-grab":"OPTION grab",
                         NULL, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/openpgp/fake-pinentry.c b/tests/openpgp/fake-pinentry.c
index ce89765..90e086c 100644
--- a/tests/openpgp/fake-pinentry.c
+++ b/tests/openpgp/fake-pinentry.c
@@ -18,10 +18,12 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
+#include <unistd.h>
 
 FILE *log_stream;
 
@@ -109,12 +111,39 @@ get_passphrase (const char *fname)
 
   fclose (source);
   fclose (sink);
-  rename (fname_new, fname);
+  if (unlink (fname))
+    {
+      fprintf (stderr, "Failed to remove %s: %s",
+               fname, strerror (errno));
+      exit (1);
+    }
+
+  if (rename (fname_new, fname))
+    {
+      fprintf (stderr, "Failed to rename %s to %s: %s",
+               fname, fname_new, strerror (errno));
+      exit (1);
+    }
   return passphrase;
 }
 
 

-#define spacep(p)   (*(p) == ' ' || *(p) == '\t')
+#define spacep(p)   (*(p) == ' ' || *(p) == '\t' \
+                     || *(p) == '\r' || *(p) == '\n')
+
+/* rstrip line.  */
+void
+rstrip (char *buffer)
+{
+  char *p;
+  for (p = buffer + strlen (buffer) - 1; p >= buffer; p--)
+    {
+      if (! spacep (p))
+        break;
+      *p = 0;
+    }
+}
+
 
 /* Skip over options in LINE.
 
@@ -165,6 +194,8 @@ int
 main (int argc, char **argv)
 {
   char *args;
+  char *option_user_data = NULL;
+  int got_environment_user_data;
   char *logfile;
   char *passphrasefile;
   char *passphrase;
@@ -176,9 +207,11 @@ main (int argc, char **argv)
   setvbuf (stdout, NULL, _IOLBF, BUFSIZ);
 
   args = getenv ("PINENTRY_USER_DATA");
+  got_environment_user_data = args != NULL;
   if (! args)
     args = "";
 
+ restart:
   logfile = option_value (args, "--logfile");
   if (logfile)
     {
@@ -215,9 +248,7 @@ main (int argc, char **argv)
           return 1;
         }
 
-      p = passphrase + strlen (passphrase) - 1;
-      if (*p == '\n')
-        *p = 0;
+      rstrip (passphrase);
     }
   else
     {
@@ -226,12 +257,13 @@ main (int argc, char **argv)
         passphrase = "no PINENTRY_USER_DATA -- using default passphrase";
     }
 
-  reply ("# fake-pinentry started.  Passphrase='%s'.\n", passphrase);
+  reply ("# fake-pinentry(%d) started.  Passphrase='%s'.\n",
+         getpid (), passphrase);
   reply ("OK - what's up?\n");
 
   while (! feof (stdin))
     {
-      char buffer[1024];
+      char buffer[1024], *p;
 
       if (fgets (buffer, sizeof buffer, stdin) == NULL)
 	break;
@@ -239,6 +271,8 @@ main (int argc, char **argv)
       if (log_stream)
         fprintf (log_stream, "< %s", buffer);
 
+      rstrip (buffer);
+
       if (strncmp (buffer, "GETPIN", 6) == 0)
         reply ("D %s\n", passphrase);
       else if (strncmp (buffer, "BYE", 3) == 0)
@@ -246,6 +280,22 @@ main (int argc, char **argv)
 	  reply ("OK\n");
 	  break;
 	}
+#define OPT_USER_DATA	"OPTION pinentry-user-data="
+      else if (strncmp (buffer, OPT_USER_DATA, strlen (OPT_USER_DATA)) == 0)
+        {
+          if (got_environment_user_data)
+            {
+              reply ("OK - I already got the data from the environment.\n");
+              continue;
+            }
+
+          if (log_stream)
+            fclose (log_stream);
+          log_stream = NULL;
+          free (option_user_data);
+          option_user_data = args = strdup (buffer + strlen (OPT_USER_DATA));
+          goto restart;
+        }
 
       reply ("OK\n");
     }
@@ -254,5 +304,6 @@ main (int argc, char **argv)
   if (log_stream)
     fclose (log_stream);
 
+  free (option_user_data);
   return 0;
 }

commit f88f11a25665dca7490a09088aa24edf396e4c40
Author: Justus Winter <justus at g10code.com>
Date:   Tue Oct 25 17:06:05 2016 +0200

    tests: Do not autostart gpg-agents on teardown.
    
    * tests/openpgp/defs.c (stop-agent): Use '--no-autostart' when calling
    gpg-connect-agent.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm
index 48ac46c..c911ea3 100644
--- a/tests/openpgp/defs.scm
+++ b/tests/openpgp/defs.scm
@@ -162,4 +162,5 @@
   (echo "Stopping gpg-agent...")
   (catch (echo "Warning: Removing socket directory failed.")
 	 (call-popen `(,(tool 'gpgconf) --remove-socketdir) ""))
-  (call-check `(,(tool 'gpg-connect-agent) --verbose killagent /bye)))
+  (call-check `(,(tool 'gpg-connect-agent) --verbose --no-autostart
+		killagent /bye)))

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

Summary of changes:
 agent/call-pinentry.c         | 13 +++++++++
 tests/openpgp/defs.scm        |  3 +-
 tests/openpgp/fake-pinentry.c | 65 ++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 73 insertions(+), 8 deletions(-)


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



From cvs at cvs.gnupg.org  Wed Oct 26 07:26:46 2016
From: cvs at cvs.gnupg.org (by Daniel Kahn Gillmor)
Date: Wed, 26 Oct 2016 07:26:46 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-276-g27f6d5b
Message-ID: <E1bzGjh-0005ZM-2Q@lists.gnupg.org>

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  27f6d5b9f4b6057ddeb9ace87a1e7e61ebac63e6 (commit)
       via  3b5f5e0eb02ecbdcf59722755f22a9d2f88de6e6 (commit)
      from  852b8f0b89d447536dfdf6cd4ea91615c75491ce (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 27f6d5b9f4b6057ddeb9ace87a1e7e61ebac63e6
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue Oct 25 23:55:08 2016 -0400

    agent: --supervised mode improvements.
    
    * agent/gpg-agent.c (map_supervised_socket): if the agent is running
      in --supervised mode and is not actually given LISTEN_FDNAMES
      directives, require at least fd 3 to be open for listening.
    --
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 16edae0..8e2d012 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -716,12 +716,19 @@ map_supervised_sockets (gnupg_fd_t *r_fd,
   /* Assign the descriptors to the return values.  */
   if (!fdnames)
     {
+      struct stat statbuf;
       if (fd_count != 1)
         log_error ("no LISTEN_FDNAMES and LISTEN_FDS (%d) != 1"
                    " in --supervised mode."
                    " (ignoring all sockets but the first one)\n",
                    fd_count);
+      if (fstat (3, &statbuf) == -1 && errno ==EBADF)
+        log_fatal ("file descriptor 3 must be valid in --supervised mode (as the "
+                   "agent's standard socket) if LISTEN_FDNAMES is not set\n");
       *r_fd = 3;
+      socket_name = get_socket_name (3);
+      if (!socket_name)
+          log_error ("cannot learn socket name for fd 3\n");
     }
   else if (fd_count != nfdnames)
     {

commit 3b5f5e0eb02ecbdcf59722755f22a9d2f88de6e6
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue Oct 25 23:55:07 2016 -0400

    common: avoid segfault
    
    * common/sysutils.c (gnupg_inotify_watch_socket): return EINVAL if
      socket_name is NULL, rather than segfaulting
    --
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/common/sysutils.c b/common/sysutils.c
index ab2012c..ab3e1d6 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -987,6 +987,9 @@ gnupg_inotify_watch_socket (int *r_fd, const char *socket_name)
 
   *r_fd = -1;
 
+  if (!socket_name)
+    return gpg_error (GPG_ERR_EINVAL);
+
   fname = xtrystrdup (socket_name);
   if (!fname)
     return my_error_from_syserror ();

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

Summary of changes:
 agent/gpg-agent.c | 7 +++++++
 common/sysutils.c | 3 +++
 2 files changed, 10 insertions(+)


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



From cvs at cvs.gnupg.org  Wed Oct 26 07:38:05 2016
From: cvs at cvs.gnupg.org (by Daniel Kahn Gillmor)
Date: Wed, 26 Oct 2016 07:38:05 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-277-g900c18f
Message-ID: <E1bzGud-0006IW-PV@lists.gnupg.org>

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  900c18f0b5f11cf2e9f30df5ec77ac511b533785 (commit)
      from  27f6d5b9f4b6057ddeb9ace87a1e7e61ebac63e6 (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 900c18f0b5f11cf2e9f30df5ec77ac511b533785
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue Oct 25 21:43:57 2016 -0400

    doc: Fix spelling of "internal".
    
    --
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index 7a85b55..bb8281d 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -493,7 +493,7 @@ Note that for OCSP responses the certificate specified using the option
 
 @item /etc/gnupg/extra-certs
 This directory may contain extra certificates which are preloaded
-into the interal cache on startup. Applications using dirmngr (e.g. gpgsm)
+into the internal cache on startup. Applications using dirmngr (e.g. gpgsm)
 can request cached certificates to complete a trust chain.
 This is convenient in cases you have a couple intermediate CA certificates
 or certificates usually used to sign OCSP responses.

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

Summary of changes:
 doc/dirmngr.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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



From cvs at cvs.gnupg.org  Wed Oct 26 10:28:49 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 26 Oct 2016 10:28:49 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-281-gd1ccab5
Message-ID: <E1bzJZs-0005h6-QH@lists.gnupg.org>

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  d1ccab5176d7719328b287544b54b85e0277b146 (commit)
       via  b77f95a4a675fd20f6eeb611f4e7b519eceb4ad3 (commit)
       via  ece13f177d948013b6f3df926406c0cd947abc25 (commit)
       via  21b318452abbfe21c45c2a67dae0e3a81cff1090 (commit)
      from  900c18f0b5f11cf2e9f30df5ec77ac511b533785 (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 d1ccab5176d7719328b287544b54b85e0277b146
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Oct 26 10:24:41 2016 +0200

    dirmngr: Fix hang due to deferred thread initialization.
    
    * dirmngr/dirmngr.c (main): Call ldap_wrapper_launch_thread after
    thread_init.
    --
    
    Fixes-commit: eda17649f8bd3b8ce7bfc00a3c11cbcae63c845d
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 90eb6d4..41e897b 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -983,13 +983,13 @@ main (int argc, char **argv)
           log_debug ("... okay\n");
         }
 
-#if USE_LDAP
-      ldap_wrapper_launch_thread ();
-#endif /*USE_LDAP*/
 
       thread_init ();
       cert_cache_init ();
       crl_cache_init ();
+#if USE_LDAP
+      ldap_wrapper_launch_thread ();
+#endif /*USE_LDAP*/
       start_command_handler (ASSUAN_INVALID_FD);
       shutdown_reaper ();
     }
@@ -1182,13 +1182,12 @@ main (int argc, char **argv)
         }
 #endif
 
-#if USE_LDAP
-      ldap_wrapper_launch_thread ();
-#endif /*USE_LDAP*/
-
       thread_init ();
       cert_cache_init ();
       crl_cache_init ();
+#if USE_LDAP
+      ldap_wrapper_launch_thread ();
+#endif /*USE_LDAP*/
       handle_connections (fd);
       assuan_sock_close (fd);
       shutdown_reaper ();
@@ -1211,12 +1210,12 @@ main (int argc, char **argv)
       memset (&ctrlbuf, 0, sizeof ctrlbuf);
       dirmngr_init_default_ctrl (&ctrlbuf);
 
-#if USE_LDAP
-      ldap_wrapper_launch_thread ();
-#endif /*USE_LDAP*/
       thread_init ();
       cert_cache_init ();
       crl_cache_init ();
+#if USE_LDAP
+      ldap_wrapper_launch_thread ();
+#endif /*USE_LDAP*/
       if (!argc)
         rc = crl_cache_load (&ctrlbuf, NULL);
       else
@@ -1237,12 +1236,12 @@ main (int argc, char **argv)
       memset (&ctrlbuf, 0, sizeof ctrlbuf);
       dirmngr_init_default_ctrl (&ctrlbuf);
 
-#if USE_LDAP
-      ldap_wrapper_launch_thread ();
-#endif /*USE_LDAP*/
       thread_init ();
       cert_cache_init ();
       crl_cache_init ();
+#if USE_LDAP
+      ldap_wrapper_launch_thread ();
+#endif /*USE_LDAP*/
       rc = crl_fetch (&ctrlbuf, argv[0], &reader);
       if (rc)
         log_error (_("fetching CRL from '%s' failed: %s\n"),

commit b77f95a4a675fd20f6eeb611f4e7b519eceb4ad3
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Oct 26 09:10:29 2016 +0200

    agent: Avoid double error message.
    
    * agent/gpg-agent.c (map_supervised_sockets): Shorten error message.
    Remove unneeded diagnostic.
    --
    
    get_socket_name already prints error messages and thus there is not
    need to print another one.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 8e2d012..6f73fc7 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -717,18 +717,17 @@ map_supervised_sockets (gnupg_fd_t *r_fd,
   if (!fdnames)
     {
       struct stat statbuf;
+
       if (fd_count != 1)
         log_error ("no LISTEN_FDNAMES and LISTEN_FDS (%d) != 1"
                    " in --supervised mode."
                    " (ignoring all sockets but the first one)\n",
                    fd_count);
       if (fstat (3, &statbuf) == -1 && errno ==EBADF)
-        log_fatal ("file descriptor 3 must be valid in --supervised mode (as the "
-                   "agent's standard socket) if LISTEN_FDNAMES is not set\n");
+        log_fatal ("file descriptor 3 must be valid in --supervised mode"
+                   " if LISTEN_FDNAMES is not set\n");
       *r_fd = 3;
       socket_name = get_socket_name (3);
-      if (!socket_name)
-          log_error ("cannot learn socket name for fd 3\n");
     }
   else if (fd_count != nfdnames)
     {

commit ece13f177d948013b6f3df926406c0cd947abc25
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Oct 26 09:02:10 2016 +0200

    common: Use GPG_ERR_INV_VALUE instead of GPG_ERR_EINVAL.
    
    * common/sysutils.c (gnupg_inotify_watch_socket): Return
    GPG_ERR_INV_VALUE for a missing socket name and set proper error
    source.
    --
    
    By using a different value we can easier see whether the error is due
    to a system call or from GnuPG code.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/sysutils.c b/common/sysutils.c
index ab3e1d6..3a08df7 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -988,7 +988,7 @@ gnupg_inotify_watch_socket (int *r_fd, const char *socket_name)
   *r_fd = -1;
 
   if (!socket_name)
-    return gpg_error (GPG_ERR_EINVAL);
+    return my_error (GPG_ERR_INV_VALUE);
 
   fname = xtrystrdup (socket_name);
   if (!fname)

commit 21b318452abbfe21c45c2a67dae0e3a81cff1090
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Oct 26 08:34:18 2016 +0200

    tests: Improve portability of fake-pinentry.
    
    * tests/openpgp/fake-pinentry.c: Make all functions static.
    (get_passphrase): s/unlink/remove/ because that is standard C.
    (spacep): Rename to whitespace and change all callers.
    (main): Move macro out of if-then chain.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/tests/openpgp/fake-pinentry.c b/tests/openpgp/fake-pinentry.c
index 90e086c..13dc6d9 100644
--- a/tests/openpgp/fake-pinentry.c
+++ b/tests/openpgp/fake-pinentry.c
@@ -25,9 +25,10 @@
 #include <stdarg.h>
 #include <unistd.h>
 
-FILE *log_stream;
+static FILE *log_stream;
 
-int
+
+static int
 reply (const char *fmt, ...)
 {
   int result;
@@ -48,8 +49,9 @@ reply (const char *fmt, ...)
   return result;
 }
 
+
 /* Return the first line from FNAME, removing it from the file.  */
-char *
+static char *
 get_passphrase (const char *fname)
 {
   char *passphrase = NULL;
@@ -111,7 +113,7 @@ get_passphrase (const char *fname)
 
   fclose (source);
   fclose (sink);
-  if (unlink (fname))
+  if (remove (fname))
     {
       fprintf (stderr, "Failed to remove %s: %s",
                fname, strerror (errno));
@@ -128,17 +130,19 @@ get_passphrase (const char *fname)
 }
 
 

-#define spacep(p)   (*(p) == ' ' || *(p) == '\t' \
-                     || *(p) == '\r' || *(p) == '\n')
+#define whitespacep(p)   (*(p) == ' ' || *(p) == '\t' \
+                          || *(p) == '\r' || *(p) == '\n')
 
 /* rstrip line.  */
-void
+static void
 rstrip (char *buffer)
 {
   char *p;
+  if (!*buffer)
+    return; /* This is to avoid p = buffer - 1 */
   for (p = buffer + strlen (buffer) - 1; p >= buffer; p--)
     {
-      if (! spacep (p))
+      if (! whitespacep (p))
         break;
       *p = 0;
     }
@@ -155,13 +159,13 @@ rstrip (char *buffer)
 char *
 skip_options (const char *line)
 {
-  while (spacep (line))
+  while (whitespacep (line))
     line++;
   while (*line == '-' && line[1] == '-')
     {
-      while (*line && !spacep (line))
+      while (*line && !whitespacep (line))
         line++;
-      while (spacep (line))
+      while (whitespacep (line))
         line++;
     }
   return (char*) line;
@@ -179,12 +183,12 @@ option_value (const char *line, const char *name)
   s = strstr (line, name);
   if (s && s >= skip_options (line))
     return NULL;
-  if (s && (s == line || spacep (s-1))
-      && s[n] && (spacep (s+n) || s[n] == '='))
+  if (s && (s == line || whitespacep (s-1))
+      && s[n] && (whitespacep (s+n) || s[n] == '='))
     {
       s += n + 1;
       s += strspn (s, " ");
-      if (*s && !spacep(s))
+      if (*s && !whitespacep(s))
         return s;
     }
   return NULL;
@@ -207,7 +211,7 @@ main (int argc, char **argv)
   setvbuf (stdout, NULL, _IOLBF, BUFSIZ);
 
   args = getenv ("PINENTRY_USER_DATA");
-  got_environment_user_data = args != NULL;
+  got_environment_user_data = !!args;
   if (! args)
     args = "";
 
@@ -216,7 +220,7 @@ main (int argc, char **argv)
   if (logfile)
     {
       char *p = logfile, more;
-      while (*p && ! spacep (p))
+      while (*p && ! whitespacep (p))
         p++;
       more = !! *p;
       *p = 0;
@@ -234,7 +238,7 @@ main (int argc, char **argv)
   if (passphrasefile)
     {
       char *p = passphrasefile, more;
-      while (*p && ! spacep (p))
+      while (*p && ! whitespacep (p))
         p++;
       more = !! *p;
       *p = 0;
@@ -257,13 +261,13 @@ main (int argc, char **argv)
         passphrase = "no PINENTRY_USER_DATA -- using default passphrase";
     }
 
-  reply ("# fake-pinentry(%d) started.  Passphrase='%s'.\n",
-         getpid (), passphrase);
+  reply ("# fake-pinentry(%u) started.  Passphrase='%s'.\n",
+         (unsigned int)getpid (), passphrase);
   reply ("OK - what's up?\n");
 
   while (! feof (stdin))
     {
-      char buffer[1024], *p;
+      char buffer[1024];
 
       if (fgets (buffer, sizeof buffer, stdin) == NULL)
 	break;
@@ -273,6 +277,8 @@ main (int argc, char **argv)
 
       rstrip (buffer);
 
+#define OPT_USER_DATA	"OPTION pinentry-user-data="
+
       if (strncmp (buffer, "GETPIN", 6) == 0)
         reply ("D %s\n", passphrase);
       else if (strncmp (buffer, "BYE", 3) == 0)
@@ -280,7 +286,6 @@ main (int argc, char **argv)
 	  reply ("OK\n");
 	  break;
 	}
-#define OPT_USER_DATA	"OPTION pinentry-user-data="
       else if (strncmp (buffer, OPT_USER_DATA, strlen (OPT_USER_DATA)) == 0)
         {
           if (got_environment_user_data)
@@ -300,6 +305,8 @@ main (int argc, char **argv)
       reply ("OK\n");
     }
 
+#undef OPT_USER_DATA
+
   reply ("# Connection terminated.\n");
   if (log_stream)
     fclose (log_stream);

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

Summary of changes:
 agent/gpg-agent.c             |  7 +++----
 common/sysutils.c             |  2 +-
 dirmngr/dirmngr.c             | 25 +++++++++++-----------
 tests/openpgp/fake-pinentry.c | 49 ++++++++++++++++++++++++-------------------
 4 files changed, 44 insertions(+), 39 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Oct 27 02:20:26 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Thu, 27 Oct 2016 02:20:26 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-282-g96414ba
Message-ID: <E1bzYQn-0000xn-3U@lists.gnupg.org>

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  96414baf36b8e6385b71847c789d489ebe176a93 (commit)
      from  d1ccab5176d7719328b287544b54b85e0277b146 (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 96414baf36b8e6385b71847c789d489ebe176a93
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Oct 27 09:18:29 2016 +0900

    dirmngr: Fix help string and argument.
    
    * dirmngr/server.c (hlp_versioncheck): Add a newline.
    (cmd_versioncheck): Fix argument.
    
    --
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/dirmngr/server.c b/dirmngr/server.c
index 0ad2713..57273c7 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -2551,7 +2551,7 @@ static const char hlp_versioncheck[] =
   "\n"
   "Checks the internet to find whenever a new program version is available."
   "\n"
-  "<name> program name i.e. \"gnupg\""
+  "<name> program name i.e. \"gnupg\"\n"
   "<version> current version of the program i.e. \"2.0.2\"";
 static gpg_error_t
 cmd_versioncheck (assuan_context_t ctx, char *line)
@@ -2579,7 +2579,7 @@ cmd_versioncheck (assuan_context_t ctx, char *line)
   swdb_sig_path[0] = 0;
   ctrl = assuan_get_pointer (ctx);
 
-  if (split_fields (line, &cmd_fields, 2) != 2)
+  if (split_fields (line, cmd_fields, 2) != 2)
     {
       err = set_error (GPG_ERR_ASS_PARAMETER,
                        "No program name and/or version given");

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

Summary of changes:
 dirmngr/server.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Oct 27 03:18:52 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Thu, 27 Oct 2016 03:18:52 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-283-gbc28f32
Message-ID: <E1bzZLL-0003qM-1N@lists.gnupg.org>

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  bc28f320fa6f5b9fcdb73dba5e6c582daf7992c5 (commit)
      from  96414baf36b8e6385b71847c789d489ebe176a93 (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 bc28f320fa6f5b9fcdb73dba5e6c582daf7992c5
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Oct 27 10:16:48 2016 +0900

    common: Fix gnupg_inotify_has_name.
    
    * common/sysutils.c (gnupg_inotify_has_name): Take care of the
    alignment.
    
    --
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/common/sysutils.c b/common/sysutils.c
index 3a08df7..60483ac 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -1037,40 +1037,48 @@ int
 gnupg_inotify_has_name (int fd, const char *name)
 {
 #if USE_NPTH && HAVE_INOTIFY_INIT
-  union {
-    struct inotify_event ev;
-    char _buf[sizeof (struct inotify_event) + 255 + 1];
-  } buf;
-  struct inotify_event *evp;
+#define BUFSIZE_FOR_INOTIFY (sizeof (struct inotify_event) + 255 + 1)
+  char buf[BUFSIZE_FOR_INOTIFY];
+  char *p;
   int n;
 
-  n = npth_read (fd, &buf, sizeof buf);
+  n = npth_read (fd, buf, sizeof buf);
+  p = buf;
   /* log_debug ("notify read: n=%d\n", n); */
-  evp = &buf.ev;
   while (n >= sizeof (struct inotify_event))
     {
+      struct inotify_event ev;
+      const char *ev_name;
+
+      memcpy (&ev, p, sizeof (struct inotify_event));
+
+      if (ev.len > 255 + 1) /* Something goes wrong, skip this data.  */
+        break;
+
+      ev_name = p + sizeof (struct inotify_event);
+      p += sizeof (struct inotify_event) + ev.len;
+      n -= sizeof (struct inotify_event) + ev.len;
+
       /* log_debug ("             mask=%x len=%u name=(%s)\n", */
-      /*        evp->mask, (unsigned int)evp->len, evp->len? evp->name:""); */
-      if ((evp->mask & IN_UNMOUNT))
+      /*        ev.mask, (unsigned int)ev.len, ev.len? ev.name:""); */
+      if ((ev.mask & IN_UNMOUNT))
         {
           /* log_debug ("             found (dir unmounted)\n"); */
           return 3; /* Directory was unmounted.  */
         }
-      if ((evp->mask & IN_DELETE_SELF))
+      if ((ev.mask & IN_DELETE_SELF))
         {
           /* log_debug ("             found (dir removed)\n"); */
           return 2; /* Directory was removed.  */
         }
-      if ((evp->mask & IN_DELETE))
+      if ((ev.mask & IN_DELETE))
         {
-          if (evp->len >= strlen (name) && !strcmp (evp->name, name))
+          if (ev.len >= strlen (name) && !strcmp (ev_name, name))
             {
               /* log_debug ("             found (file removed)\n"); */
               return 1; /* File was removed.  */
             }
         }
-      n -= sizeof (*evp) + evp->len;
-      evp = (struct inotify_event *)((char*)evp + sizeof (*evp) + evp->len);
     }
 
 #else /*!(USE_NPTH && HAVE_INOTIFY_INIT)*/

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

Summary of changes:
 common/sysutils.c | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Oct 27 03:58:25 2016
From: cvs at cvs.gnupg.org (by Daniel Kahn Gillmor)
Date: Thu, 27 Oct 2016 03:58:25 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-286-g75f8aaf
Message-ID: <E1bzZxc-0005Il-AX@lists.gnupg.org>

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  75f8aaf5bc2dc7fcffe2987a572d489155c91eb9 (commit)
       via  6316b28e896957adb76a61a41d2e1c2a08d9f716 (commit)
       via  6bb6ac56cca8135666387a0b9d88dd6b50311418 (commit)
      from  bc28f320fa6f5b9fcdb73dba5e6c582daf7992c5 (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 75f8aaf5bc2dc7fcffe2987a572d489155c91eb9
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Oct 26 16:37:08 2016 -0400

    dirmngr: Implement --supervised command (for systemd, etc).
    
    * dirmngr/dirmngr.c (main): Add new --supervised command, which is a
    mode designed for running under a process supervision system like
    systemd or runit.
    * doc/dirmngr.texi: document --supervised option.
    
    --
    
    "dirmngr --supervised" is a way to invoke dirmngr such that a system
    supervisor like systemd can provide socket-activated startup, log
    management, and scheduled shutdown.
    
    When running in this mode, dirmngr:
    
     * Does not open its own listening socket; rather, it expects to be
       given a listening socket on file descriptor 3.
    
     * Does not detach from the invoking process, staying in the
       foreground instead.
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index c9e4a05..2903681 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -88,6 +88,7 @@ enum cmd_and_opt_values {
 
   aServer,
   aDaemon,
+  aSupervised,
   aListCRLs,
   aLoadCRL,
   aFetchCRL,
@@ -149,6 +150,7 @@ static ARGPARSE_OPTS opts[] = {
 
   ARGPARSE_c (aServer,   "server",  N_("run in server mode (foreground)") ),
   ARGPARSE_c (aDaemon,   "daemon",  N_("run in daemon mode (background)") ),
+  ARGPARSE_c (aSupervised, "supervised", N_("run under supervision (e.g. systemd)")),
   ARGPARSE_c (aListCRLs, "list-crls", N_("list the contents of the CRL cache")),
   ARGPARSE_c (aLoadCRL,  "load-crl",  N_("|FILE|load CRL from FILE into cache")),
   ARGPARSE_c (aFetchCRL, "fetch-crl", N_("|URL|fetch a CRL from URL")),
@@ -814,6 +816,7 @@ main (int argc, char **argv)
         {
         case aServer:
         case aDaemon:
+        case aSupervised:
         case aShutdown:
         case aFlush:
 	case aListCRLs:
@@ -993,6 +996,43 @@ main (int argc, char **argv)
       start_command_handler (ASSUAN_INVALID_FD);
       shutdown_reaper ();
     }
+  else if (cmd == aSupervised)
+    {
+      /* In supervised mode, we expect file descriptor 3 to be an
+         already opened, listening socket.
+
+         We will also not detach from the controlling process or close
+         stderr; the supervisor should handle all of that.  */
+      struct stat statbuf;
+      if (fstat (3, &statbuf) == -1 && errno ==EBADF)
+        {
+          log_error ("file descriptor 3 must be already open in --supervised mode\n");
+          dirmngr_exit (1);
+        }
+      socket_name = gnupg_get_socket_name (3);
+
+      /* Now start with logging to a file if this is desired. */
+      if (logfile)
+        {
+          log_set_file (logfile);
+          log_set_prefix (NULL, (GPGRT_LOG_WITH_PREFIX
+                                 |GPGRT_LOG_WITH_TIME
+                                 |GPGRT_LOG_WITH_PID));
+          current_logfile = xstrdup (logfile);
+        }
+      else
+        log_set_prefix (NULL, 0);
+
+      thread_init ();
+      cert_cache_init ();
+      crl_cache_init ();
+#if USE_LDAP
+      ldap_wrapper_launch_thread ();
+#endif /*USE_LDAP*/
+      handle_connections (3);
+      assuan_sock_close (3);
+      shutdown_reaper ();
+    }
   else if (cmd == aDaemon)
     {
       assuan_fd_t fd;
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index bb8281d..69d7e5e 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -85,6 +85,13 @@ Run in background daemon mode and listen for commands on a socket.
 Note that this also changes the default home directory and enables the
 internal certificate validation code.  This mode is deprecated.
 
+ at item --supervised
+ at opindex supervised
+Run in the foreground, sending logs to stderr, and listening on file
+descriptor 3, which must already be bound to a listening socket.  This
+is useful when running under systemd or other similar process
+supervision schemes.
+
 @item --list-crls
 @opindex list-crls
 List the contents of the CRL cache on @code{stdout}. This is probably

commit 6316b28e896957adb76a61a41d2e1c2a08d9f716
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Oct 26 16:37:07 2016 -0400

    agent,common: move get_socket_name() into common.
    
    * agent/gpg-agent.c (get_socket_name): move to ...
    * common/sysutils.c (gnupg_get_socket_name): ... here.
    
    --
    This allows us to use the same functionality in dirmngr as well.
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 6f73fc7..7294c69 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -573,52 +573,6 @@ remove_socket (char *name, char *redir_name)
 }
 
 
-/* Return a malloc'ed string that is the path to the passed
- * unix-domain socket (or return NULL if this is not a valid
- * unix-domain socket).  We use a plain int here because it is only
- * used on Linux.
- *
- * FIXME: This function needs to be moved to libassuan.  */
-#ifndef HAVE_W32_SYSTEM
-static char *
-get_socket_name (int fd)
-{
-  struct sockaddr_un un;
-  socklen_t len = sizeof(un);
-  char *name = NULL;
-
-  if (getsockname (fd, (struct sockaddr*)&un, &len) != 0)
-    log_error ("could not getsockname(%d): %s\n", fd,
-               gpg_strerror (gpg_error_from_syserror ()));
-  else if (un.sun_family != AF_UNIX)
-    log_error ("file descriptor %d is not a unix-domain socket\n", fd);
-  else if (len <= offsetof (struct sockaddr_un, sun_path))
-    log_error ("socket name not present for file descriptor %d\n", fd);
-  else if (len > sizeof(un))
-    log_error ("socket name for file descriptor %d was truncated "
-               "(passed %zu bytes, wanted %u)\n", fd, sizeof(un), len);
-  else
-    {
-      size_t namelen = len - offsetof (struct sockaddr_un, sun_path);
-
-      log_debug ("file descriptor %d has path %s (%zu octets)\n", fd,
-                 un.sun_path, namelen);
-      name = xtrymalloc (namelen + 1);
-      if (!name)
-        log_error ("failed to allocate memory for name of fd %d: %s\n",
-                   fd, gpg_strerror (gpg_error_from_syserror ()));
-      else
-        {
-          memcpy (name, un.sun_path, namelen);
-          name[namelen] = 0;
-        }
-    }
-
-  return name;
-}
-#endif /*!HAVE_W32_SYSTEM*/
-
-
 /* Discover which inherited file descriptors correspond to which
  * services/sockets offered by gpg-agent, using the LISTEN_FDS and
  * LISTEN_FDNAMES convention.  The understood labels are "ssh",
@@ -727,7 +681,7 @@ map_supervised_sockets (gnupg_fd_t *r_fd,
         log_fatal ("file descriptor 3 must be valid in --supervised mode"
                    " if LISTEN_FDNAMES is not set\n");
       *r_fd = 3;
-      socket_name = get_socket_name (3);
+      socket_name = gnupg_get_socket_name (3);
     }
   else if (fd_count != nfdnames)
     {
@@ -749,7 +703,7 @@ map_supervised_sockets (gnupg_fd_t *r_fd,
                   fd = 3 + i;
                   if (**tbl[j].fdaddr == -1)
                     {
-                      name = get_socket_name (fd);
+                      name = gnupg_get_socket_name (fd);
                       if (name)
                         {
                           **tbl[j].fdaddr = fd;
diff --git a/common/sysutils.c b/common/sysutils.c
index 60483ac..71200a6 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -62,6 +62,9 @@
 #  include <winsock2.h>
 # endif
 # include <windows.h>
+#else /*!HAVE_W32_SYSTEM*/
+# include <sys/socket.h>
+# include <sys/un.h>
 #endif
 #ifdef HAVE_INOTIFY_INIT
 # include <sys/inotify.h>
@@ -1090,3 +1093,49 @@ gnupg_inotify_has_name (int fd, const char *name)
 
   return 0; /* Not found.  */
 }
+
+
+/* Return a malloc'ed string that is the path to the passed
+ * unix-domain socket (or return NULL if this is not a valid
+ * unix-domain socket).  We use a plain int here because it is only
+ * used on Linux.
+ *
+ * FIXME: This function needs to be moved to libassuan.  */
+#ifndef HAVE_W32_SYSTEM
+char *
+gnupg_get_socket_name (int fd)
+{
+  struct sockaddr_un un;
+  socklen_t len = sizeof(un);
+  char *name = NULL;
+
+  if (getsockname (fd, (struct sockaddr*)&un, &len) != 0)
+    log_error ("could not getsockname(%d): %s\n", fd,
+               gpg_strerror (gpg_error_from_syserror ()));
+  else if (un.sun_family != AF_UNIX)
+    log_error ("file descriptor %d is not a unix-domain socket\n", fd);
+  else if (len <= offsetof (struct sockaddr_un, sun_path))
+    log_error ("socket name not present for file descriptor %d\n", fd);
+  else if (len > sizeof(un))
+    log_error ("socket name for file descriptor %d was truncated "
+               "(passed %zu bytes, wanted %u)\n", fd, sizeof(un), len);
+  else
+    {
+      size_t namelen = len - offsetof (struct sockaddr_un, sun_path);
+
+      log_debug ("file descriptor %d has path %s (%zu octets)\n", fd,
+                 un.sun_path, namelen);
+      name = xtrymalloc (namelen + 1);
+      if (!name)
+        log_error ("failed to allocate memory for name of fd %d: %s\n",
+                   fd, gpg_strerror (gpg_error_from_syserror ()));
+      else
+        {
+          memcpy (name, un.sun_path, namelen);
+          name[namelen] = 0;
+        }
+    }
+
+  return name;
+}
+#endif /*!HAVE_W32_SYSTEM*/
diff --git a/common/sysutils.h b/common/sysutils.h
index ea92e4c..7105107 100644
--- a/common/sysutils.h
+++ b/common/sysutils.h
@@ -66,6 +66,7 @@ char *gnupg_mkdtemp (char *template);
 int  gnupg_setenv (const char *name, const char *value, int overwrite);
 int  gnupg_unsetenv (const char *name);
 char *gnupg_getcwd (void);
+char *gnupg_get_socket_name (int fd);
 
 gpg_error_t gnupg_inotify_watch_socket (int *r_fd, const char *socket_name);
 int gnupg_inotify_has_name (int fd, const char *name);

commit 6bb6ac56cca8135666387a0b9d88dd6b50311418
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Oct 26 16:37:06 2016 -0400

    dirmngr: report actual socket name.
    
    * dirmngr/dirmngr.[ch] (dirmngr_get_current_socket_name): new function
    to report known socket name.
    * dirmngr/server.c (cmd_getinfo): use dirmngr_get_current_socket_name
    to report correct socket name.
    
    --
    
    This fixes the output of 'getinfo socket_name' when dirmngr is invoked
    with --socket-name.
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 41e897b..c9e4a05 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -2074,3 +2074,12 @@ handle_connections (assuan_fd_t listen_fd)
   cleanup ();
   log_info ("%s %s stopped\n", strusage(11), strusage(13));
 }
+
+const char*
+dirmngr_get_current_socket_name (void)
+{
+  if (socket_name)
+    return socket_name;
+  else
+    return dirmngr_socket_name ();
+}
diff --git a/dirmngr/dirmngr.h b/dirmngr/dirmngr.h
index d823519..9e216cd 100644
--- a/dirmngr/dirmngr.h
+++ b/dirmngr/dirmngr.h
@@ -184,6 +184,7 @@ void dirmngr_exit( int );  /* Wrapper for exit() */
 void dirmngr_init_default_ctrl (ctrl_t ctrl);
 void dirmngr_deinit_default_ctrl (ctrl_t ctrl);
 void dirmngr_sighup_action (void);
+const char* dirmngr_get_current_socket_name (void);
 
 
 /*-- Various housekeeping functions.  --*/
diff --git a/dirmngr/server.c b/dirmngr/server.c
index 57273c7..2d4f292 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -2271,7 +2271,7 @@ cmd_getinfo (assuan_context_t ctx, char *line)
     }
   else if (!strcmp (line, "socket_name"))
     {
-      const char *s = dirmngr_socket_name ();
+      const char *s = dirmngr_get_current_socket_name ();
       err = assuan_send_data (ctx, s, strlen (s));
     }
   else if (!strcmp (line, "tor"))

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

Summary of changes:
 agent/gpg-agent.c | 50 ++------------------------------------------------
 common/sysutils.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 common/sysutils.h |  1 +
 dirmngr/dirmngr.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 dirmngr/dirmngr.h |  1 +
 dirmngr/server.c  |  2 +-
 doc/dirmngr.texi  |  7 +++++++
 7 files changed, 110 insertions(+), 49 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Oct 27 06:06:03 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Thu, 27 Oct 2016 06:06:03 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-289-gca0ee4e
Message-ID: <E1bzbx9-0002y7-1d@lists.gnupg.org>

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  ca0ee4e381d0b6a57e4ddc8f4bb2390eb97a2540 (commit)
       via  6bbd97d6c771b2e2c7cfcff6d5a823f0fb44d443 (commit)
       via  b648f28f9f8b889f1217a649ded1d45f261bb2bf (commit)
      from  75f8aaf5bc2dc7fcffe2987a572d489155c91eb9 (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 ca0ee4e381d0b6a57e4ddc8f4bb2390eb97a2540
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Oct 27 12:59:49 2016 +0900

    g10: Fix ECDH, clarifying the format.
    
    * g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Returns error when
    it's short.  Clarify the format.  Handle other prefixes correctly.
    
    --
    With the scdaemon's change, there is no case NBYTES < SECRET_X_SIZE.
    This fixes the break of ECDH with X25519.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/g10/ecdh.c b/g10/ecdh.c
index 886427b..dd47544 100644
--- a/g10/ecdh.c
+++ b/g10/ecdh.c
@@ -135,27 +135,29 @@ pk_ecdh_encrypt_with_shared_point (int is_encrypt, gcry_mpi_t shared_mpi,
     /* Expected size of the x component */
     secret_x_size = (nbits+7)/8;
 
-    if (nbytes > secret_x_size)
+    /* Extract X from the result.  It must be in the format of:
+           04 || X || Y
+           40 || X
+           41 || X
+
+       Since it always comes with the prefix, it's larger than X.  In
+       old experimental version of libgcrypt, there is a case where it
+       returns X with no prefix of 40, so, nbytes == secret_x_size
+       is allowed.  */
+    if (nbytes < secret_x_size)
       {
-        /* Uncompressed format expected, so it must start with 04 */
-        if (secret_x[0] != (byte)0x04)
-          {
-            return gpg_error (GPG_ERR_BAD_DATA);
-          }
+        xfree (secret_x);
+        return gpg_error (GPG_ERR_BAD_DATA);
+      }
 
-        /* Remove the "04" prefix of non-compressed format.  */
-        memmove (secret_x, secret_x+1, secret_x_size);
+    /* Remove the prefix.  */
+    if ((nbytes & 1))
+      memmove (secret_x, secret_x+1, secret_x_size);
+
+    /* Clear the rest of data.  */
+    if (nbytes - secret_x_size)
+      memset (secret_x+secret_x_size, 0, nbytes-secret_x_size);
 
-        /* Zeroize the y component following */
-        if (nbytes > secret_x_size)
-          memset (secret_x+secret_x_size, 0, nbytes-secret_x_size);
-      }
-    else if (nbytes < secret_x_size)
-      {
-        /* Raw share secret (x coordinate), without leading zeros */
-        memmove (secret_x+(secret_x_size - nbytes), secret_x, nbytes);
-        memset (secret_x, 0, secret_x_size - nbytes);
-      }
     if (DBG_CRYPTO)
       log_printhex ("ECDH shared secret X is:", secret_x, secret_x_size );
   }

commit 6bbd97d6c771b2e2c7cfcff6d5a823f0fb44d443
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Oct 27 11:56:18 2016 +0900

    scd: Add 0x41 prefix for x-coordinate only result.
    
    * scd/app-openpgp.c (do_decipher): When it's x-coordinate only, add the
    prefix 0x41.
    
    --
    Card should return fixed size bytes, either in format of
    (04 || X || Y) or (X, x-coordinate only).
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 4e042e7..d75721f 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -4406,20 +4406,29 @@ do_decipher (app_t app, const char *keyidstr,
                          indata, indatalen, le_value, padind,
                          outdata, outdatalen);
   xfree (fixbuf);
-  if (app->app_local->keyattr[1].key_type == KEY_TYPE_ECC
-      && (app->app_local->keyattr[1].ecc.flags & ECC_FLAG_DJB_TWEAK))
-    { /* Add the prefix 0x40 */
-      fixbuf = xtrymalloc (*outdatalen + 1);
-      if (!fixbuf)
-        {
+  if (app->app_local->keyattr[1].key_type == KEY_TYPE_ECC)
+    {
+      unsigned char prefix = 0;
+
+      if (app->app_local->keyattr[1].ecc.flags & ECC_FLAG_DJB_TWEAK)
+        prefix = 0x40;
+      else if ((*outdatalen % 2) == 0) /* No 0x04 -> x-coordinate only */
+        prefix = 0x41;
+
+      if (prefix)
+        { /* Add the prefix */
+          fixbuf = xtrymalloc (*outdatalen + 1);
+          if (!fixbuf)
+            {
+              xfree (*outdata);
+              return gpg_error_from_syserror ();
+            }
+          fixbuf[0] = prefix;
+          memcpy (fixbuf+1, *outdata, *outdatalen);
           xfree (*outdata);
-          return gpg_error_from_syserror ();
+          *outdata = fixbuf;
+          *outdatalen = *outdatalen + 1;
         }
-      fixbuf[0] = 0x40;
-      memcpy (fixbuf+1, *outdata, *outdatalen);
-      xfree (*outdata);
-      *outdata = fixbuf;
-      *outdatalen = *outdatalen + 1;
     }
 
   if (gpg_err_code (rc) == GPG_ERR_CARD /* actual SW is 0x640a */

commit b648f28f9f8b889f1217a649ded1d45f261bb2bf
Author: Arnaud Fontaine <arnaud.fontaine at ssi.gouv.fr>
Date:   Tue Oct 25 13:43:08 2016 +0200

    g10: ECDH shared point format.
    
    * g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Improve handling of
    ECDH shared point format.
    
    --
    This handles the case where the result comes from scdaemon.
    
    Signed-off-by: Arnaud Fontaine <arnaud.fontaine at ssi.gouv.fr>

diff --git a/g10/ecdh.c b/g10/ecdh.c
index af1d844..886427b 100644
--- a/g10/ecdh.c
+++ b/g10/ecdh.c
@@ -132,14 +132,30 @@ pk_ecdh_encrypt_with_shared_point (int is_encrypt, gcry_mpi_t shared_mpi,
         return err;
       }
 
+    /* Expected size of the x component */
     secret_x_size = (nbits+7)/8;
-    log_assert (nbytes >= secret_x_size);
-    if ((nbytes & 1))
-      /* Remove the "04" prefix of non-compressed format.  */
-      memmove (secret_x, secret_x+1, secret_x_size);
-    if (nbytes - secret_x_size)
-      memset (secret_x+secret_x_size, 0, nbytes-secret_x_size);
 
+    if (nbytes > secret_x_size)
+      {
+        /* Uncompressed format expected, so it must start with 04 */
+        if (secret_x[0] != (byte)0x04)
+          {
+            return gpg_error (GPG_ERR_BAD_DATA);
+          }
+
+        /* Remove the "04" prefix of non-compressed format.  */
+        memmove (secret_x, secret_x+1, secret_x_size);
+
+        /* Zeroize the y component following */
+        if (nbytes > secret_x_size)
+          memset (secret_x+secret_x_size, 0, nbytes-secret_x_size);
+      }
+    else if (nbytes < secret_x_size)
+      {
+        /* Raw share secret (x coordinate), without leading zeros */
+        memmove (secret_x+(secret_x_size - nbytes), secret_x, nbytes);
+        memset (secret_x, 0, secret_x_size - nbytes);
+      }
     if (DBG_CRYPTO)
       log_printhex ("ECDH shared secret X is:", secret_x, secret_x_size );
   }
@@ -235,8 +251,8 @@ pk_ecdh_encrypt_with_shared_point (int is_encrypt, gcry_mpi_t shared_mpi,
         return err;
       }
     gcry_md_write(h, "\x00\x00\x00\x01", 4);      /* counter = 1 */
-    gcry_md_write(h, secret_x, secret_x_size);	  /* x of the point X */
-    gcry_md_write(h, message, message_size);/* KDF parameters */
+    gcry_md_write(h, secret_x, secret_x_size);    /* x of the point X */
+    gcry_md_write(h, message, message_size);      /* KDF parameters */
 
     gcry_md_final (h);
 

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

Summary of changes:
 g10/ecdh.c        | 26 ++++++++++++++++++++++----
 scd/app-openpgp.c | 33 +++++++++++++++++++++------------
 2 files changed, 43 insertions(+), 16 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Oct 27 07:52:30 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Thu, 27 Oct 2016 07:52:30 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-290-g8a9341b
Message-ID: <E1bzdc9-0007vQ-6f@lists.gnupg.org>

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  8a9341b42cd1891090d45cc068bff84b2b3edb50 (commit)
      from  ca0ee4e381d0b6a57e4ddc8f4bb2390eb97a2540 (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 8a9341b42cd1891090d45cc068bff84b2b3edb50
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Oct 27 14:49:17 2016 +0900

    dirmngr: Fix error return for ADNS.
    
    * dirmngr/dns-stuff.c (resolve_name_adns): Use RET for return value.
    
    --
    There are cases where libadns returns an error without setting the
    variable ERRNO.
    
    GnuPG-bug-id: 2745
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c
index ac295b0..284ef09 100644
--- a/dirmngr/dns-stuff.c
+++ b/dirmngr/dns-stuff.c
@@ -278,7 +278,7 @@ resolve_name_adns (const char *name, unsigned short port,
   my_protect ();
   if (ret)
     {
-      err = gpg_error_from_syserror ();
+      err = ret;
       log_error ("DNS query failed: %s\n", gpg_strerror (err));
       goto leave;
     }

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

Summary of changes:
 dirmngr/dns-stuff.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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



From cvs at cvs.gnupg.org  Thu Oct 27 08:04:54 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Thu, 27 Oct 2016 08:04:54 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-291-g6f1d812
Message-ID: <E1bzdo8-0000Cz-T7@lists.gnupg.org>

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  6f1d8123d61b3efac94b4c61ee75bd947790ba42 (commit)
      from  8a9341b42cd1891090d45cc068bff84b2b3edb50 (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 6f1d8123d61b3efac94b4c61ee75bd947790ba42
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Oct 27 15:01:42 2016 +0900

    dirmngr: More ADNS error fix.
    
    * dirmngr/dns-stuff.c (get_dns_cert, getsrv, get_dns_cname): Fix return
    value.
    
    --
    GnuPG-bug-id: 2745
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c
index 284ef09..28a500c 100644
--- a/dirmngr/dns-stuff.c
+++ b/dirmngr/dns-stuff.c
@@ -682,8 +682,8 @@ get_dns_cert (const char *name, int want_certtype,
   my_protect ();
   if (ret)
     {
-      err = gpg_error_from_syserror ();
-      /* log_error ("DNS query failed: %s\n", strerror (errno)); */
+      err = ret;
+      /* log_error ("DNS query failed: %s\n", strerror (err)); */
       adns_finish (state);
       return err;
     }
@@ -1036,7 +1036,7 @@ getsrv (const char *name,struct srventry **list)
     my_protect ();
     if (rc)
       {
-        log_error ("DNS query failed: %s\n", strerror (errno));
+        log_error ("DNS query failed: %s\n", strerror (rc));
         adns_finish (state);
         return -1;
       }
@@ -1281,7 +1281,7 @@ get_dns_cname (const char *name, char **r_cname)
     my_protect ();
     if (rc)
       {
-        err = gpg_error_from_syserror ();
+        err = rc;
         log_error ("DNS query failed: %s\n", gpg_strerror (err));
         adns_finish (state);
         return err;

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

Summary of changes:
 dirmngr/dns-stuff.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Oct 27 09:02:23 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Thu, 27 Oct 2016 09:02:23 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-292-g8b3d0d1
Message-ID: <E1bzehl-0002q0-Jk@lists.gnupg.org>

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  8b3d0d1a36cab83dafb98ccb7895144edb95e298 (commit)
      from  6f1d8123d61b3efac94b4c61ee75bd947790ba42 (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 8b3d0d1a36cab83dafb98ccb7895144edb95e298
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Oct 27 15:37:47 2016 +0900

    common: Fix gnupg_inotify_has_name, differently.
    
    * common/sysutils.c (gnupg_inotify_has_name): Use void * to stop the
    warning.
    
    --
    According to the man page of inotify(7), it is aligned by null bytes.
    So, bc28f320fa6f5b9fcdb73dba5e6c582daf7992c5 is reverted.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/common/sysutils.c b/common/sysutils.c
index 71200a6..0f87a42 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -1041,47 +1041,41 @@ gnupg_inotify_has_name (int fd, const char *name)
 {
 #if USE_NPTH && HAVE_INOTIFY_INIT
 #define BUFSIZE_FOR_INOTIFY (sizeof (struct inotify_event) + 255 + 1)
-  char buf[BUFSIZE_FOR_INOTIFY];
-  char *p;
+  union {
+    struct inotify_event ev;
+    char _buf[sizeof (struct inotify_event) + 255 + 1];
+  } buf;
+  struct inotify_event *evp;
   int n;
 
-  n = npth_read (fd, buf, sizeof buf);
-  p = buf;
+  n = npth_read (fd, &buf, sizeof buf);
   /* log_debug ("notify read: n=%d\n", n); */
+  evp = &buf.ev;
   while (n >= sizeof (struct inotify_event))
     {
-      struct inotify_event ev;
-      const char *ev_name;
-
-      memcpy (&ev, p, sizeof (struct inotify_event));
-
-      if (ev.len > 255 + 1) /* Something goes wrong, skip this data.  */
-        break;
-
-      ev_name = p + sizeof (struct inotify_event);
-      p += sizeof (struct inotify_event) + ev.len;
-      n -= sizeof (struct inotify_event) + ev.len;
-
       /* log_debug ("             mask=%x len=%u name=(%s)\n", */
-      /*        ev.mask, (unsigned int)ev.len, ev.len? ev.name:""); */
-      if ((ev.mask & IN_UNMOUNT))
+      /*        evp->mask, (unsigned int)evp->len, evp->len? evp->name:""); */
+      if ((evp->mask & IN_UNMOUNT))
         {
           /* log_debug ("             found (dir unmounted)\n"); */
           return 3; /* Directory was unmounted.  */
         }
-      if ((ev.mask & IN_DELETE_SELF))
+      if ((evp->mask & IN_DELETE_SELF))
         {
           /* log_debug ("             found (dir removed)\n"); */
           return 2; /* Directory was removed.  */
         }
-      if ((ev.mask & IN_DELETE))
+      if ((evp->mask & IN_DELETE))
         {
-          if (ev.len >= strlen (name) && !strcmp (ev_name, name))
+          if (evp->len >= strlen (name) && !strcmp (evp->name, name))
             {
               /* log_debug ("             found (file removed)\n"); */
               return 1; /* File was removed.  */
             }
         }
+      n -= sizeof (*evp) + evp->len;
+      evp = (struct inotify_event *)(void *)
+        ((char *)evp + sizeof (*evp) + evp->len);
     }
 
 #else /*!(USE_NPTH && HAVE_INOTIFY_INIT)*/

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

Summary of changes:
 common/sysutils.c | 36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Oct 27 09:13:25 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Thu, 27 Oct 2016 09:13:25 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-293-ga15ed5a
Message-ID: <E1bzesR-0003CR-HV@lists.gnupg.org>

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  a15ed5a1fd5307b3ec1822daf3b138b187db0b5e (commit)
      from  8b3d0d1a36cab83dafb98ccb7895144edb95e298 (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 a15ed5a1fd5307b3ec1822daf3b138b187db0b5e
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Oct 27 08:44:19 2016 +0200

    gpg: Convey --quick option to dirmngr for --auto-key-retrieve.
    
    * g10/call-dirmngr.c (gpg_dirmngr_ks_get): Add arg 'quick'.
    (gpg_dirmngr_wkd_get): Ditto.
    * g10/keyserver.c (keyserver_get): Add arg 'quick'.
    (keyserver_get_chunk): Add arg 'quick'.
    (keyserver_import_fprint): Ditto.  Change callers to pass 0 for it.
    (keyserver_import_keyid): Ditto.
    (keyserver_import_wkd): Ditto.
    * g10/mainproc.c (check_sig_and_print): Call the 3 fucntions with
    QUICK set.
    --
    
    Note that this option has not yet been implemented by dirmngr.
    Dirmngr will simply ignore it for now.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/call-dirmngr.c b/g10/call-dirmngr.c
index 75a7f46..f739833 100644
--- a/g10/call-dirmngr.c
+++ b/g10/call-dirmngr.c
@@ -600,6 +600,8 @@ ks_get_data_cb (void *opaque, const void *data, size_t datalen)
    don't need to escape the patterns before sending them to the
    server.
 
+   If QUICK is set the dirmngr is advised to use a shorter timeout.
+
    If R_SOURCE is not NULL the source of the data is stored as a
    malloced string there.  If a source is not known NULL is stored.
 
@@ -609,7 +611,7 @@ ks_get_data_cb (void *opaque, const void *data, size_t datalen)
    are able to ask for (1000-10-1)/(2+8+1) = 90 keys at once.  */
 gpg_error_t
 gpg_dirmngr_ks_get (ctrl_t ctrl, char **pattern,
-                    keyserver_spec_t override_keyserver,
+                    keyserver_spec_t override_keyserver, int quick,
                     estream_t *r_fp, char **r_source)
 {
   gpg_error_t err;
@@ -655,7 +657,7 @@ gpg_dirmngr_ks_get (ctrl_t ctrl, char **pattern,
 
   /* Lump all patterns into one string.  */
   init_membuf (&mb, 1024);
-  put_membuf_str (&mb, "KS_GET --");
+  put_membuf_str (&mb, quick? "KS_GET --quick --" : "KS_GET --");
   for (idx=0; pattern[idx]; idx++)
     {
       put_membuf (&mb, " ", 1); /* Append Delimiter.  */
@@ -1289,11 +1291,11 @@ gpg_dirmngr_get_pka (ctrl_t ctrl, const char *userid,
 
 

 /* Ask the dirmngr to retrieve a key via the Web Key Directory
- * protocol.  On success a new estream with the key is stored at
- * R_KEY.
+ * protocol.  If QUICK is set the dirmngr is advised to use a shorter
+ * timeout.  On success a new estream with the key is stored at R_KEY.
  */
 gpg_error_t
-gpg_dirmngr_wkd_get (ctrl_t ctrl, const char *name, estream_t *r_key)
+gpg_dirmngr_wkd_get (ctrl_t ctrl, const char *name, int quick, estream_t *r_key)
 {
   gpg_error_t err;
   assuan_context_t ctx;
@@ -1306,7 +1308,7 @@ gpg_dirmngr_wkd_get (ctrl_t ctrl, const char *name, estream_t *r_key)
   if (err)
     return err;
 
-  line = es_bsprintf ("WKD_GET -- %s", name);
+  line = es_bsprintf ("WKD_GET%s -- %s", quick?" --quick":"", name);
   if (!line)
     {
       err = gpg_error_from_syserror ();
diff --git a/g10/call-dirmngr.h b/g10/call-dirmngr.h
index 4dc1e30..f154598 100644
--- a/g10/call-dirmngr.h
+++ b/g10/call-dirmngr.h
@@ -26,7 +26,7 @@ gpg_error_t gpg_dirmngr_ks_search (ctrl_t ctrl, const char *searchstr,
                                    gpg_error_t (*cb)(void*, int, char *),
                                    void *cb_value);
 gpg_error_t gpg_dirmngr_ks_get (ctrl_t ctrl, char *pattern[],
-                                keyserver_spec_t override_keyserver,
+                                keyserver_spec_t override_keyserver, int quick,
                                 estream_t *r_fp, char **r_source);
 gpg_error_t gpg_dirmngr_ks_fetch (ctrl_t ctrl,
                                   const char *url, estream_t *r_fp);
@@ -40,7 +40,7 @@ gpg_error_t gpg_dirmngr_dns_cert (ctrl_t ctrl,
 gpg_error_t gpg_dirmngr_get_pka (ctrl_t ctrl, const char *userid,
                                  unsigned char **r_fpr, size_t *r_fprlen,
                                  char **r_url);
-gpg_error_t gpg_dirmngr_wkd_get (ctrl_t ctrl, const char *name,
+gpg_error_t gpg_dirmngr_wkd_get (ctrl_t ctrl, const char *name, int quick,
                                  estream_t *r_key);
 
 
diff --git a/g10/card-util.c b/g10/card-util.c
index b5fe84b..b322a86 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -758,7 +758,7 @@ fetch_url (ctrl_t ctrl)
         }
       else if (info.fpr1valid)
 	{
-          rc = keyserver_import_fprint (ctrl, info.fpr1, 20, opt.keyserver);
+          rc = keyserver_import_fprint (ctrl, info.fpr1, 20, opt.keyserver, 0);
 	}
     }
 
diff --git a/g10/getkey.c b/g10/getkey.c
index 8b17598..7b1c22b 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -1333,7 +1333,7 @@ get_pubkey_byname (ctrl_t ctrl, GETKEY_CTX * retctx, PKT_public_key * pk,
 	    case AKL_WKD:
 	      mechanism = "WKD";
 	      glo_ctrl.in_auto_key_retrieve++;
-	      rc = keyserver_import_wkd (ctrl, name, &fpr, &fpr_len);
+	      rc = keyserver_import_wkd (ctrl, name, 0, &fpr, &fpr_len);
 	      glo_ctrl.in_auto_key_retrieve--;
 	      break;
 
diff --git a/g10/gpgv.c b/g10/gpgv.c
index 2f34e72..01138a0 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -358,21 +358,23 @@ keyserver_any_configured (ctrl_t ctrl)
 }
 
 int
-keyserver_import_keyid (u32 *keyid, void *dummy)
+keyserver_import_keyid (u32 *keyid, void *dummy, int quick)
 {
   (void)keyid;
   (void)dummy;
+  (void)quick;
   return -1;
 }
 
 int
 keyserver_import_fprint (ctrl_t ctrl, const byte *fprint,size_t fprint_len,
-			 struct keyserver_spec *keyserver)
+			 struct keyserver_spec *keyserver, int quick)
 {
   (void)ctrl;
   (void)fprint;
   (void)fprint_len;
   (void)keyserver;
+  (void)quick;
   return -1;
 }
 
@@ -392,11 +394,12 @@ keyserver_import_pka (const char *name,unsigned char *fpr)
 }
 
 gpg_error_t
-keyserver_import_wkd (ctrl_t ctrl, const char *name,
+keyserver_import_wkd (ctrl_t ctrl, const char *name, int quick,
                       unsigned char **fpr, size_t *fpr_len)
 {
   (void)ctrl;
   (void)name;
+  (void)quick;
   (void)fpr;
   (void)fpr_len;
   return GPG_ERR_BUG;
diff --git a/g10/import.c b/g10/import.c
index 8d06457..d65a7ae 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -2954,7 +2954,7 @@ revocation_present (ctrl_t ctrl, kbnode_t keyblock)
 			      keyserver_import_fprint (ctrl,
                                                        sig->revkey[idx].fpr,
                                                        MAX_FINGERPRINT_LEN,
-                                                       opt.keyserver);
+                                                       opt.keyserver, 0);
 
 			      /* Do we have it now? */
 			      rc=get_pubkey_byfprint_fast (NULL,
diff --git a/g10/keyserver-internal.h b/g10/keyserver-internal.h
index f57dcaa..6988ae0 100644
--- a/g10/keyserver-internal.h
+++ b/g10/keyserver-internal.h
@@ -35,9 +35,9 @@ int keyserver_any_configured (ctrl_t ctrl);
 int keyserver_export (ctrl_t ctrl, strlist_t users);
 int keyserver_import (ctrl_t ctrl, strlist_t users);
 int keyserver_import_fprint (ctrl_t ctrl, const byte *fprint,size_t fprint_len,
-                             struct keyserver_spec *keyserver);
+                             struct keyserver_spec *keyserver, int quick);
 int keyserver_import_keyid (ctrl_t ctrl, u32 *keyid,
-                            struct keyserver_spec *keyserver);
+                            struct keyserver_spec *keyserver, int quick);
 gpg_error_t keyserver_refresh (ctrl_t ctrl, strlist_t users);
 gpg_error_t keyserver_search (ctrl_t ctrl, strlist_t tokens);
 int keyserver_fetch (ctrl_t ctrl, strlist_t urilist);
@@ -45,7 +45,7 @@ int keyserver_import_cert (ctrl_t ctrl, const char *name, int dane_mode,
                            unsigned char **fpr,size_t *fpr_len);
 gpg_error_t keyserver_import_pka (ctrl_t ctrl, const char *name,
                                   unsigned char **fpr,size_t *fpr_len);
-gpg_error_t keyserver_import_wkd (ctrl_t ctrl, const char *name,
+gpg_error_t keyserver_import_wkd (ctrl_t ctrl, const char *name, int quick,
                                   unsigned char **fpr, size_t *fpr_len);
 int keyserver_import_name (ctrl_t ctrl,
                            const char *name,unsigned char **fpr,size_t *fpr_len,
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 4239469..d98351c 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -108,6 +108,7 @@ static struct parse_options keyserver_opts[]=
 static gpg_error_t keyserver_get (ctrl_t ctrl,
                                   KEYDB_SEARCH_DESC *desc, int ndesc,
                                   struct keyserver_spec *override_keyserver,
+                                  int quick,
                                   unsigned char **r_fpr, size_t *r_fprlen);
 static gpg_error_t keyserver_put (ctrl_t ctrl, strlist_t keyspecs);
 
@@ -793,7 +794,7 @@ show_prompt (ctrl_t ctrl, KEYDB_SEARCH_DESC *desc, int numdesc,
           }
         for (idx = 0; idx < numidx; idx++)
           selarray[idx] = desc[numarray[idx]-1];
-        err = keyserver_get (ctrl, selarray, numidx, NULL, NULL, NULL);
+        err = keyserver_get (ctrl, selarray, numidx, NULL, 0, NULL, NULL);
         xfree (selarray);
       }
     }
@@ -1125,7 +1126,7 @@ keyserver_import (ctrl_t ctrl, strlist_t users)
     }
 
   if(count>0)
-    rc=keyserver_get (ctrl, desc, count, NULL, NULL, NULL);
+    rc = keyserver_get (ctrl, desc, count, NULL, 0, NULL, NULL);
 
   xfree(desc);
 
@@ -1154,13 +1155,13 @@ keyserver_import_name (ctrl_t ctrl, const char *name,
   desc.mode = KEYDB_SEARCH_MODE_EXACT;
   desc.u.name = name;
 
-  return keyserver_get (ctrl, &desc, 1, keyserver, fpr, fprlen);
+  return keyserver_get (ctrl, &desc, 1, keyserver, 0, fpr, fprlen);
 }
 
 
 int
 keyserver_import_fprint (ctrl_t ctrl, const byte *fprint,size_t fprint_len,
-			 struct keyserver_spec *keyserver)
+			 struct keyserver_spec *keyserver, int quick)
 {
   KEYDB_SEARCH_DESC desc;
 
@@ -1177,12 +1178,12 @@ keyserver_import_fprint (ctrl_t ctrl, const byte *fprint,size_t fprint_len,
 
   /* TODO: Warn here if the fingerprint we got doesn't match the one
      we asked for? */
-  return keyserver_get (ctrl, &desc, 1, keyserver, NULL, NULL);
+  return keyserver_get (ctrl, &desc, 1, keyserver, quick, NULL, NULL);
 }
 
 int
 keyserver_import_keyid (ctrl_t ctrl,
-                        u32 *keyid,struct keyserver_spec *keyserver)
+                        u32 *keyid,struct keyserver_spec *keyserver, int quick)
 {
   KEYDB_SEARCH_DESC desc;
 
@@ -1192,7 +1193,7 @@ keyserver_import_keyid (ctrl_t ctrl,
   desc.u.kid[0]=keyid[0];
   desc.u.kid[1]=keyid[1];
 
-  return keyserver_get (ctrl, &desc,1, keyserver, NULL, NULL);
+  return keyserver_get (ctrl, &desc, 1, keyserver, quick, NULL, NULL);
 }
 
 /* code mostly stolen from do_export_stream */
@@ -1422,7 +1423,7 @@ keyserver_refresh (ctrl_t ctrl, strlist_t users)
 	      /* We use the keyserver structure we parsed out before.
 		 Note that a preferred keyserver without a scheme://
 		 will be interpreted as hkp:// */
-	      err = keyserver_get (ctrl, &desc[i], 1, keyserver, NULL, NULL);
+	      err = keyserver_get (ctrl, &desc[i], 1, keyserver, 0, NULL, NULL);
 	      if (err)
 		log_info(_("WARNING: unable to refresh key %s"
 			   " via %s: %s\n"),keystr_from_desc(&desc[i]),
@@ -1456,7 +1457,7 @@ keyserver_refresh (ctrl_t ctrl, strlist_t users)
             }
           xfree (tmpuri);
 
-          err = keyserver_get (ctrl, desc, numdesc, NULL, NULL, NULL);
+          err = keyserver_get (ctrl, desc, numdesc, NULL, 0, NULL, NULL);
         }
     }
 
@@ -1581,6 +1582,7 @@ keyserver_get_chunk (ctrl_t ctrl, KEYDB_SEARCH_DESC *desc, int ndesc,
                      int *r_ndesc_used,
                      import_stats_t stats_handle,
                      struct keyserver_spec *override_keyserver,
+                     int quick,
                      unsigned char **r_fpr, size_t *r_fprlen)
 
 {
@@ -1604,11 +1606,11 @@ keyserver_get_chunk (ctrl_t ctrl, KEYDB_SEARCH_DESC *desc, int ndesc,
 
   /* Note that we break the loop as soon as our estimation of the to
      be used line length reaches the limit.  But we do this only if we
-     have processed at leas one search requests so that an overlong
+     have processed at least one search requests so that an overlong
      single request will be rejected only later by gpg_dirmngr_ks_get
      but we are sure that R_NDESC_USED has been updated.  This avoids
      a possible indefinite loop.  */
-  linelen = 9; /* "KS_GET --" */
+  linelen = 17; /* "KS_GET --quick --" */
   for (npat=idx=0; idx < ndesc; idx++)
     {
       int quiet = 0;
@@ -1712,7 +1714,7 @@ keyserver_get_chunk (ctrl_t ctrl, KEYDB_SEARCH_DESC *desc, int ndesc,
      this is different from NPAT.  */
   *r_ndesc_used = idx;
 
-  err = gpg_dirmngr_ks_get (ctrl, pattern, override_keyserver,
+  err = gpg_dirmngr_ks_get (ctrl, pattern, override_keyserver, quick,
                             &datastream, &source);
   for (idx=0; idx < npat; idx++)
     xfree (pattern[idx]);
@@ -1755,10 +1757,11 @@ keyserver_get_chunk (ctrl_t ctrl, KEYDB_SEARCH_DESC *desc, int ndesc,
    (DESC,NDESC).  Allowed search modes are keyid, fingerprint, and
    exact searches.  OVERRIDE_KEYSERVER gives an optional override
    keyserver. If (R_FPR,R_FPRLEN) are not NULL, they may return the
-   fingerprint of a single imported key.  */
+   fingerprint of a single imported key.  If QUICK is set, dirmngr is
+   advised to use a shorter timeout. */
 static gpg_error_t
 keyserver_get (ctrl_t ctrl, KEYDB_SEARCH_DESC *desc, int ndesc,
-               struct keyserver_spec *override_keyserver,
+               struct keyserver_spec *override_keyserver, int quick,
                unsigned char **r_fpr, size_t *r_fprlen)
 {
   gpg_error_t err;
@@ -1771,7 +1774,7 @@ keyserver_get (ctrl_t ctrl, KEYDB_SEARCH_DESC *desc, int ndesc,
   for (;;)
     {
       err = keyserver_get_chunk (ctrl, desc, ndesc, &ndesc_used, stats_handle,
-                                 override_keyserver, r_fpr, r_fprlen);
+                                 override_keyserver, quick, r_fpr, r_fprlen);
       if (!err)
         any_good = 1;
       if (err || ndesc_used >= ndesc)
@@ -1946,7 +1949,7 @@ keyserver_import_cert (ctrl_t ctrl, const char *name, int dane_mode,
 	  spec = parse_keyserver_uri (url, 1);
 	  if(spec)
 	    {
-	      err = keyserver_import_fprint (ctrl, *fpr,*fpr_len,spec);
+	      err = keyserver_import_fprint (ctrl, *fpr, *fpr_len, spec, 0);
 	      free_keyserver_spec(spec);
 	    }
 	}
@@ -1955,7 +1958,8 @@ keyserver_import_cert (ctrl_t ctrl, const char *name, int dane_mode,
 	  /* If only a fingerprint is provided, try and fetch it from
 	     the configured keyserver. */
 
-	  err = keyserver_import_fprint (ctrl, *fpr,*fpr_len,opt.keyserver);
+	  err = keyserver_import_fprint (ctrl,
+                                         *fpr, *fpr_len, opt.keyserver, 0);
 	}
       else
 	log_info(_("no keyserver known\n"));
@@ -1989,7 +1993,7 @@ keyserver_import_pka (ctrl_t ctrl, const char *name,
       spec = parse_keyserver_uri (url, 1);
       if (spec)
 	{
-	  err = keyserver_import_fprint (ctrl, *fpr, *fpr_len, spec);
+	  err = keyserver_import_fprint (ctrl, *fpr, *fpr_len, spec, 0);
 	  free_keyserver_spec (spec);
 	}
     }
@@ -2008,7 +2012,7 @@ keyserver_import_pka (ctrl_t ctrl, const char *name,
 
 /* Import a key using the Web Key Directory protocol.  */
 gpg_error_t
-keyserver_import_wkd (ctrl_t ctrl, const char *name,
+keyserver_import_wkd (ctrl_t ctrl, const char *name, int quick,
                       unsigned char **fpr, size_t *fpr_len)
 {
   gpg_error_t err;
@@ -2026,7 +2030,7 @@ keyserver_import_wkd (ctrl_t ctrl, const char *name,
       return err;
     }
 
-  err = gpg_dirmngr_wkd_get (ctrl, mbox, &key);
+  err = gpg_dirmngr_wkd_get (ctrl, mbox, quick, &key);
   if (err)
     ;
   else if (key)
diff --git a/g10/mainproc.c b/g10/mainproc.c
index f0527bc..fbcf316 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -1803,7 +1803,7 @@ check_sig_and_print (CTX c, kbnode_t node)
                   free_public_key (pk);
                   pk = NULL;
                   glo_ctrl.in_auto_key_retrieve++;
-                  res = keyserver_import_keyid (c->ctrl, sig->keyid,spec);
+                  res = keyserver_import_keyid (c->ctrl, sig->keyid,spec, 1);
                   glo_ctrl.in_auto_key_retrieve--;
                   if (!res)
                     rc = do_check_sig (c, node, NULL,
@@ -1838,7 +1838,7 @@ check_sig_and_print (CTX c, kbnode_t node)
               free_public_key (pk);
               pk = NULL;
               glo_ctrl.in_auto_key_retrieve++;
-              res = keyserver_import_keyid (c->ctrl, sig->keyid, spec);
+              res = keyserver_import_keyid (c->ctrl, sig->keyid, spec, 1);
               glo_ctrl.in_auto_key_retrieve--;
               free_keyserver_spec (spec);
               if (!res)
@@ -1847,12 +1847,11 @@ check_sig_and_print (CTX c, kbnode_t node)
         }
     }
 
-  /* If the above methods didn't work, our next try is to use locate
+  /* If the above methods didn't work, our next try is to locate
    * the key via its fingerprint from a keyserver.  This requires
    * that the signers fingerprint is encoded in the signature.  We
    * favor this over the WKD method (to be tried next), because an
-   * arbitrary keyserver is less subject to web bug like
-   * monitoring.  */
+   * arbitrary keyserver is less subject to web bug like monitoring.  */
   if (gpg_err_code (rc) == GPG_ERR_NO_PUBKEY
       && opt.flags.rfc4880bis
       && (opt.keyserver_options.options&KEYSERVER_AUTO_KEY_RETRIEVE)
@@ -1869,7 +1868,7 @@ check_sig_and_print (CTX c, kbnode_t node)
           free_public_key (pk);
           pk = NULL;
           glo_ctrl.in_auto_key_retrieve++;
-          res = keyserver_import_fprint (c->ctrl, p+1, n-1, opt.keyserver);
+          res = keyserver_import_fprint (c->ctrl, p+1, n-1, opt.keyserver, 1);
           glo_ctrl.in_auto_key_retrieve--;
           if (!res)
             rc = do_check_sig (c, node, NULL, &is_expkey, &is_revkey, &pk);
@@ -1889,7 +1888,7 @@ check_sig_and_print (CTX c, kbnode_t node)
       free_public_key (pk);
       pk = NULL;
       glo_ctrl.in_auto_key_retrieve++;
-      res = keyserver_import_wkd (c->ctrl, sig->signers_uid, NULL, NULL);
+      res = keyserver_import_wkd (c->ctrl, sig->signers_uid, 1, NULL, NULL);
       glo_ctrl.in_auto_key_retrieve--;
       /* Fixme: If the fingerprint is embedded in the signature,
        * compare it to the fingerprint of the returned key.  */
@@ -1908,7 +1907,7 @@ check_sig_and_print (CTX c, kbnode_t node)
       free_public_key (pk);
       pk = NULL;
       glo_ctrl.in_auto_key_retrieve++;
-      res = keyserver_import_keyid (c->ctrl, sig->keyid, opt.keyserver );
+      res = keyserver_import_keyid (c->ctrl, sig->keyid, opt.keyserver, 1);
       glo_ctrl.in_auto_key_retrieve--;
       if (!res)
         rc = do_check_sig (c, node, NULL, &is_expkey, &is_revkey, &pk);
diff --git a/g10/test-stubs.c b/g10/test-stubs.c
index 55351b8..c717cff 100644
--- a/g10/test-stubs.c
+++ b/g10/test-stubs.c
@@ -169,21 +169,23 @@ keyserver_any_configured (ctrl_t ctrl)
 }
 
 int
-keyserver_import_keyid (u32 *keyid, void *dummy)
+keyserver_import_keyid (u32 *keyid, void *dummy, int quick)
 {
   (void)keyid;
   (void)dummy;
+  (void)quick;
   return -1;
 }
 
 int
 keyserver_import_fprint (ctrl_t ctrl, const byte *fprint,size_t fprint_len,
-			 struct keyserver_spec *keyserver)
+			 struct keyserver_spec *keyserver, int quick)
 {
   (void)ctrl;
   (void)fprint;
   (void)fprint_len;
   (void)keyserver;
+  (void)quick;
   return -1;
 }
 
@@ -203,11 +205,12 @@ keyserver_import_pka (const char *name,unsigned char *fpr)
 }
 
 gpg_error_t
-keyserver_import_wkd (ctrl_t ctrl, const char *name,
+keyserver_import_wkd (ctrl_t ctrl, const char *name, int quick,
                       unsigned char **fpr, size_t *fpr_len)
 {
   (void)ctrl;
   (void)name;
+  (void)quick;
   (void)fpr;
   (void)fpr_len;
   return GPG_ERR_BUG;

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

Summary of changes:
 g10/call-dirmngr.c       | 14 ++++++++------
 g10/call-dirmngr.h       |  4 ++--
 g10/card-util.c          |  2 +-
 g10/getkey.c             |  2 +-
 g10/gpgv.c               |  9 ++++++---
 g10/import.c             |  2 +-
 g10/keyserver-internal.h |  6 +++---
 g10/keyserver.c          | 44 ++++++++++++++++++++++++--------------------
 g10/mainproc.c           | 15 +++++++--------
 g10/test-stubs.c         |  9 ++++++---
 10 files changed, 59 insertions(+), 48 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Oct 27 09:29:41 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Thu, 27 Oct 2016 09:29:41 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-294-g45dfc02
Message-ID: <E1bzf8B-0003ry-M9@lists.gnupg.org>

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  45dfc02b47f798f5a3b9973ca6a9f5a907d7e665 (commit)
      from  a15ed5a1fd5307b3ec1822daf3b138b187db0b5e (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 45dfc02b47f798f5a3b9973ca6a9f5a907d7e665
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Oct 27 16:22:26 2016 +0900

    dirmngr: ADNS error handling fix.
    
    * dirmngr/dns-stuff.c (resolve_name_adns, get_dns_cert, get_dns_cname):
    Use gpg_error and gpg_err_code_from_errno to compose the error value.
    
    --
    This fixes commits 6f1d8123d61b3efac94b4c61ee75bd947790ba42.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c
index 28a500c..4bd3a87 100644
--- a/dirmngr/dns-stuff.c
+++ b/dirmngr/dns-stuff.c
@@ -278,7 +278,7 @@ resolve_name_adns (const char *name, unsigned short port,
   my_protect ();
   if (ret)
     {
-      err = ret;
+      err = gpg_error (gpg_err_code_from_errno (ret));
       log_error ("DNS query failed: %s\n", gpg_strerror (err));
       goto leave;
     }
@@ -682,8 +682,8 @@ get_dns_cert (const char *name, int want_certtype,
   my_protect ();
   if (ret)
     {
-      err = ret;
-      /* log_error ("DNS query failed: %s\n", strerror (err)); */
+      err = gpg_error (gpg_err_code_from_errno (ret));
+      /* log_error ("DNS query failed: %s\n", gpg_strerror (err)); */
       adns_finish (state);
       return err;
     }
@@ -1281,7 +1281,7 @@ get_dns_cname (const char *name, char **r_cname)
     my_protect ();
     if (rc)
       {
-        err = rc;
+        err = gpg_error (gpg_err_code_from_errno (rc));
         log_error ("DNS query failed: %s\n", gpg_strerror (err));
         adns_finish (state);
         return err;

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

Summary of changes:
 dirmngr/dns-stuff.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Oct 27 09:31:14 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Thu, 27 Oct 2016 09:31:14 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-296-gcf20b23
Message-ID: <E1bzf9h-0004OD-4j@lists.gnupg.org>

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  cf20b23c146c9e499263654644035796475de097 (commit)
       via  a9c8b5fbe7ae241bf45bdee15884abc7891aedf9 (commit)
      from  45dfc02b47f798f5a3b9973ca6a9f5a907d7e665 (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 cf20b23c146c9e499263654644035796475de097
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Oct 27 09:27:03 2016 +0200

    dirmngr: Do not implement --supervised in Windows.
    
    * dirmngr/dirmngr.c (opts) [W32]: Remove --supervised.
    (main) [W32]: Ditto.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 2903681..07cbed9 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -150,7 +150,9 @@ static ARGPARSE_OPTS opts[] = {
 
   ARGPARSE_c (aServer,   "server",  N_("run in server mode (foreground)") ),
   ARGPARSE_c (aDaemon,   "daemon",  N_("run in daemon mode (background)") ),
-  ARGPARSE_c (aSupervised, "supervised", N_("run under supervision (e.g. systemd)")),
+#ifndef HAVE_W32_SYSTEM
+  ARGPARSE_c (aSupervised,  "supervised", N_("run in supervised mode")),
+#endif
   ARGPARSE_c (aListCRLs, "list-crls", N_("list the contents of the CRL cache")),
   ARGPARSE_c (aLoadCRL,  "load-crl",  N_("|FILE|load CRL from FILE into cache")),
   ARGPARSE_c (aFetchCRL, "fetch-crl", N_("|URL|fetch a CRL from URL")),
@@ -996,6 +998,7 @@ main (int argc, char **argv)
       start_command_handler (ASSUAN_INVALID_FD);
       shutdown_reaper ();
     }
+#ifndef HAVE_W32_SYSTEM
   else if (cmd == aSupervised)
     {
       /* In supervised mode, we expect file descriptor 3 to be an
@@ -1004,9 +1007,9 @@ main (int argc, char **argv)
          We will also not detach from the controlling process or close
          stderr; the supervisor should handle all of that.  */
       struct stat statbuf;
-      if (fstat (3, &statbuf) == -1 && errno ==EBADF)
+      if (fstat (3, &statbuf) == -1 && errno == EBADF)
         {
-          log_error ("file descriptor 3 must be already open in --supervised mode\n");
+          log_error ("file descriptor 3 must be validin --supervised mode\n");
           dirmngr_exit (1);
         }
       socket_name = gnupg_get_socket_name (3);
@@ -1033,6 +1036,7 @@ main (int argc, char **argv)
       assuan_sock_close (3);
       shutdown_reaper ();
     }
+#endif /*HAVE_W32_SYSTEM*/
   else if (cmd == aDaemon)
     {
       assuan_fd_t fd;
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index 69d7e5e..6620a87 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -90,7 +90,7 @@ internal certificate validation code.  This mode is deprecated.
 Run in the foreground, sending logs to stderr, and listening on file
 descriptor 3, which must already be bound to a listening socket.  This
 is useful when running under systemd or other similar process
-supervision schemes.
+supervision schemes.  This option is not supported on Windows.
 
 @item --list-crls
 @opindex list-crls

commit a9c8b5fbe7ae241bf45bdee15884abc7891aedf9
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Oct 27 09:13:36 2016 +0200

    common: Remove debug output from gnupg_get_socket_name.
    
    * common/sysutils.c (gnupg_get_socket_name): Remove debug message and
    use my_error_from_syserror.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/sysutils.c b/common/sysutils.c
index 0f87a42..6eea90e 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -1105,7 +1105,7 @@ gnupg_get_socket_name (int fd)
 
   if (getsockname (fd, (struct sockaddr*)&un, &len) != 0)
     log_error ("could not getsockname(%d): %s\n", fd,
-               gpg_strerror (gpg_error_from_syserror ()));
+               gpg_strerror (my_error_from_syserror ()));
   else if (un.sun_family != AF_UNIX)
     log_error ("file descriptor %d is not a unix-domain socket\n", fd);
   else if (len <= offsetof (struct sockaddr_un, sun_path))
@@ -1117,12 +1117,12 @@ gnupg_get_socket_name (int fd)
     {
       size_t namelen = len - offsetof (struct sockaddr_un, sun_path);
 
-      log_debug ("file descriptor %d has path %s (%zu octets)\n", fd,
-                 un.sun_path, namelen);
+      /* log_debug ("file descriptor %d has path %s (%zu octets)\n", fd, */
+      /*            un.sun_path, namelen); */
       name = xtrymalloc (namelen + 1);
       if (!name)
         log_error ("failed to allocate memory for name of fd %d: %s\n",
-                   fd, gpg_strerror (gpg_error_from_syserror ()));
+                   fd, gpg_strerror (my_error_from_syserror ()));
       else
         {
           memcpy (name, un.sun_path, namelen);

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

Summary of changes:
 common/sysutils.c |  8 ++++----
 dirmngr/dirmngr.c | 10 +++++++---
 doc/dirmngr.texi  |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Oct 27 11:38:34 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Thu, 27 Oct 2016 11:38:34 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. e0feb17332088cd2ae85554ed7fb24fda2c14c29
Message-ID: <E1bzh8u-0001gW-QI@lists.gnupg.org>

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 GnuPG website and other docs".

The branch, master has been updated
       via  e0feb17332088cd2ae85554ed7fb24fda2c14c29 (commit)
       via  d6c737316888389beeb39c52b7aeadc7bf62c468 (commit)
      from  165f0ecebc8a68bff30d5255962a3b44d8113940 (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 e0feb17332088cd2ae85554ed7fb24fda2c14c29
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Oct 27 11:33:51 2016 +0200

    swdb: Do not copy FTP base macros to swdb.lst

diff --git a/web/Makefile b/web/Makefile
index 16a3099..17bf6e7 100644
--- a/web/Makefile
+++ b/web/Makefile
@@ -2,7 +2,11 @@
 all: swdb.lst.sig
 
 swdb.lst: swdb.mac
-	awk '/^#\+macro:/ {print $$2, $$3}' swdb.mac >swdb.lst
+	awk '                                \
+	     ! /^#\+macro:/ {next}           \
+	     $$2 ~ /ftp_.*/ {next}           \
+	                    {print $$2, $$3} \
+	    ' swdb.mac >swdb.lst
 
 swdb.lst.sig: swdb.lst
 	gpg -sbu 0x249B39D24F25E3B6 swdb.lst

commit d6c737316888389beeb39c52b7aeadc7bf62c468
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Oct 27 11:32:01 2016 +0200

    css: Do not indent h3 parts, resize buttons.

diff --git a/web/share/site.css b/web/share/site.css
index 26aea64..46a6350 100644
--- a/web/share/site.css
+++ b/web/share/site.css
@@ -397,7 +397,7 @@ div.outline-text-3 {
 
 div.outline-text-3,
 div > h3 {
-  margin-left: 1em;
+  /*margin-left: 1em;*/
 }
 
 h2,
@@ -685,8 +685,9 @@ h2.footnotes {
     overflow: hidden;
     display: inline-block;
     background-image: linear-gradient(#28A0E5, #015E94);
-    border: 0px none;
-    padding: 1px;
+/*    border: 0px none; */
+    padding-left: 10px;
+    padding-right: 10px;
     text-decoration: none;
     border-radius: 5px;
     box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.2);
@@ -704,7 +705,9 @@ h2.footnotes {
     overflow: hidden;
     display: inline-block;
     background-image: linear-gradient(#28A0E5, #015E94);
-    border: 0px none;
+/*    border: 0px none;*/
+    padding-left: 10px;
+    padding-right: 10px;
     text-decoration: none;
     border-radius: 4px;
     box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.2);

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

Summary of changes:
 web/Makefile       |  6 +++++-
 web/share/site.css | 11 +++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org



From cvs at cvs.gnupg.org  Thu Oct 27 17:28:54 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Thu, 27 Oct 2016 17:28:54 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. 38594d8b830c4201f8b6fb79805153173520f233
Message-ID: <E1bzmbx-0000HV-1O@lists.gnupg.org>

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 GnuPG website and other docs".

The branch, master has been updated
       via  38594d8b830c4201f8b6fb79805153173520f233 (commit)
      from  e0feb17332088cd2ae85554ed7fb24fda2c14c29 (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 38594d8b830c4201f8b6fb79805153173520f233
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Oct 27 12:17:40 2016 +0200

    blog: Add blog entry about WKD
    
    --
    This entry explains how to set up a WKD without a WKS

diff --git a/misc/blog.gnupg.org/20161027-hosting-a-web-key-directory.org b/misc/blog.gnupg.org/20161027-hosting-a-web-key-directory.org
new file mode 100644
index 0000000..66593de
--- /dev/null
+++ b/misc/blog.gnupg.org/20161027-hosting-a-web-key-directory.org
@@ -0,0 +1,94 @@
+# How to host your own Web Key Directory
+#+STARTUP: showall
+#+AUTHOR: Andre
+#+DATE: October 27, 2016
+
+** Hosting a Web Key Directory
+
+    With the improvements in GnuPG for Key Discovery
+    (see: [[https://www.gnupg.org/blog/20160830-web-key-service.html][Key Discovery Made Simple]]) you may want to provide the
+    OpenPGP keys for your domain. The Web Key Service (WKS) describes
+    a protocol for Mail Service Providers or large organisations to
+    maintain a Web Key Directory (WKD) for their users.
+
+    A Web Key Directory is a static collection of keys provided under
+    well known URLs under your domain. This directory can also be
+    manually generated without using the Web Key Service protocol.
+
+
+    By providing a Web Key Directory other people (or their Mail Software)
+    can obtain the OpenPGP keys for your domain with a simple query like:
+
+    : $ gpg --auto-key-locate wkd --locate-keys <mail address>
+
+    In this note, I explain how to do that.
+
+
+    Note: An updated version of this article may be available in the
+    [[https://wiki.gnupg.org/WKD#Hosting%20a%20Web%20Key%20Directory][GnuPG Wiki]]
+
+*** Requirements
+
+    - A web server that provides https with a trusted certificate for
+      your domain.
+    - A client machine with Python and PyME installed (debian package
+      python-pyme)
+    - The script:
+      [[https://hg.intevation.de/gnupg/wkd-tools/raw-file/default/generate-openpgpkey-hu][generate-openpgpkey-hu]]
+      (in the [[https://hg.intevation.de/gnupg/wkd-tools/][Mercurial repository "wkd-tools"]])
+
+*** Setup
+
+    You can either export all the keys in your keyring that belong to
+    a domain or provide an explicit keyring containing just those keys
+    that you want to publish.
+
+    The call:
+
+    : $ ./generate-openpgpkey-hu example.com hu
+
+
+    Will create a directory called hu containing all the keys with
+    user ids that include @example.com.
+
+    If there are multiple valid keys for a user in your keyring this
+    command will error out. In that case you can prepare a keyring
+    with only the keys that you want to publish. For example:
+
+    : $ gpg --export 94A5C9A03C2FE5CA3B095D8E1FDF723CF462B6B1 | \
+    : >   gpg --no-default-keyring --keyring ./wkd-keyring.gpg --import
+
+    And then provide that keyring to generate-openpgpkey-hu:
+
+    : ./generate-openpgpkey-hu example.com hu wkd-keyring.gpg
+
+*** Publishing
+
+    The hu directory has to be published on your server as
+
+    : https://example.com/.well-known/openpgpkey/hu/
+
+    Create the directory structure  and set the
+    permissions accordingly.
+
+    This example [[https://hg.intevation.de/gnupg/wkd-tools/raw-file/default/Makefile.example][Makefile]] automates the hu directory generation and
+    publishing. Edit the variables at the top of the makefile to set
+    =RSYNC_TARGET= The =KEYRING= variable is optional and can be left
+    empty.
+
+    That's it. You can now test your setup by calling:
+
+    : $ gpg --auto-key-locate wkd --locate-keys <mail address>
+
+    you should see something like this:
+
+#+begin_example
+gpg: key AC12F94881D28CB7: public key "testuser10 at test.gnupg.org" imported
+gpg: Total number processed: 1
+gpg:               imported: 1
+gpg: automatically retrieved 'testuser10 at test.gnupg.org' via WKD
+pub   ed25519 2016-07-15 [SC]
+      5506894357DC548CC65B0BCFAC12F94881D28CB7
+uid           [ unknown] testuser10 at test.gnupg.org
+sub   cv25519 2016-07-15 [E]
+#+end_example

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

Summary of changes:
 .../20161027-hosting-a-web-key-directory.org       | 94 ++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 misc/blog.gnupg.org/20161027-hosting-a-web-key-directory.org


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org



From cvs at cvs.gnupg.org  Thu Oct 27 17:52:17 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Thu, 27 Oct 2016 17:52:17 +0200
Subject: [git] GpgOL - branch, nomapi, updated. gpgol-1.4.0-121-g2b376a4
Message-ID: <E1bzmyZ-0001rA-2g@lists.gnupg.org>

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 "GnuPG extension for MS Outlook".

The branch, nomapi has been updated
       via  2b376a48241aaef927ab1ffd6e7d213480d6751e (commit)
       via  2ff3d5e90c146c4056ab9b2c38c0157caa92b7ff (commit)
       via  09284b0ab35a701c078147c2f6c2fb017c96cbfb (commit)
      from  a20666844db52b53ea082934a304e7e90f687acc (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 2b376a48241aaef927ab1ffd6e7d213480d6751e
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Oct 27 17:48:06 2016 +0200

    Implement encryption without MAPI data
    
    * src/attachment.cpp (Attachment::get_data_string): New helper.
    * src/attachment.h: Declare get_data_string.
    * src/mail.cpp, src/mail.h (Mail::remove_attachments)
    (Mail::add_attachments, get_string, Mail::get_body)
    (Mail::get_html_body, Mail::get_recipients): New.
    * src/mailitem-events.cpp (request_send): Comment out for now.
    (EVENT_SINK_INVOKE): Encrypt in send event.
    * src/mimemaker.cpp (sink_data_write): New to work with GpgME::Data.
    (encrypt_sign_mail): New works based on Objects.
    
    --
    This still uses the engine style encryption. In this first impl
    only encryption is supported. Can do both inline and MIME.

diff --git a/src/attachment.cpp b/src/attachment.cpp
index fc528c7..dc9d633 100644
--- a/src/attachment.cpp
+++ b/src/attachment.cpp
@@ -56,3 +56,21 @@ Attachment::get_data()
 {
   return m_data;
 }
+
+const std::string &
+Attachment::get_data_string()
+{
+  if (!m_data_string.empty())
+    {
+      return m_data_string;
+    }
+  char buf[4096];
+  m_data.seek (0, SEEK_SET);
+  size_t nread;
+  m_data_string = std::string();
+  while ((nread = m_data.read (buf, 4096)) > 0)
+    {
+      m_data_string += std::string(buf, nread);
+    }
+  return m_data_string;
+}
diff --git a/src/attachment.h b/src/attachment.h
index 47c536e..af45e75 100644
--- a/src/attachment.h
+++ b/src/attachment.h
@@ -41,10 +41,16 @@ public:
   /* get the underlying data structure */
   GpgME::Data& get_data();
 
+  /* get the data as string. resets the seek pointer
+     of data. The string data is cached after this
+     function is called once. */
+  const std::string & get_data_string();
+
 private:
   GpgME::Data m_data;
   std::string m_utf8DisplayName;
   attachtype_t m_type;
+  std::string m_data_string;
 };
 
 #endif // ATTACHMENT_H
diff --git a/src/mail.cpp b/src/mail.cpp
index a3c54e9..b6a3cf8 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -34,6 +34,7 @@
 #include "gpgolstr.h"
 #include "windowmessages.h"
 #include "mlang-charset.h"
+#include "mimemaker.h"
 
 #include <gpgme++/tofuinfo.h>
 #include <gpgme++/verificationresult.h>
@@ -417,11 +418,52 @@ copy_attachment_to_file (std::shared_ptr<Attachment> att, HANDLE hFile)
   return 0;
 }
 
-/** Helper to update the attachments of a mail object in oom.
+int
+Mail::remove_attachments()
+{
+  LPDISPATCH attachments = get_oom_object (m_mailitem, "Attachments");
+  if (!attachments)
+    {
+      log_debug ("%s:%s: Failed to get attachments.",
+                 SRCNAME, __func__);
+      return 0;
+    }
+
+  int count = get_oom_int (attachments, "Count");
+  if (count < 1)
+    {
+      gpgol_release (attachments);
+      return 0;
+    }
+  for (int i = 1; i <= count; i++)
+    {
+      VARIANT aVariant[1];
+      DISPPARAMS dispparams;
+
+      dispparams.rgvarg = aVariant;
+      dispparams.rgvarg[0].vt = VT_INT;
+      dispparams.rgvarg[0].intVal = i;
+      dispparams.cArgs = 1;
+      dispparams.cNamedArgs = 0;
+
+      if (invoke_oom_method_with_parms (attachments, "Remove",
+                                        NULL, &dispparams))
+        {
+          log_error ("%s:%s: Failed to remove attachments.",
+                     SRCNAME, __func__);
+          gpgol_release (attachments);
+          return 1;
+        }
+    }
+  gpgol_release (attachments);
+
+  return 0;
+}
+
+/** Update the attachments of a mail object in oom.
   does not modify the underlying mapi structure. */
-static int
-add_attachments(LPDISPATCH mail,
-                std::vector<std::shared_ptr<Attachment> > attachments)
+int
+Mail::add_attachments(std::vector<std::shared_ptr<Attachment> > attachments)
 {
   int err = 0;
   for (auto att: attachments)
@@ -436,7 +478,7 @@ add_attachments(LPDISPATCH mail,
                      SRCNAME, __func__, att->get_display_name().c_str());
           err = 1;
         }
-      if (add_oom_attachment (mail, wchar_file, wchar_name))
+      if (add_oom_attachment (m_mailitem, wchar_file, wchar_name))
         {
           log_error ("%s:%s: Failed to add attachment: %s",
                      SRCNAME, __func__, att->get_display_name().c_str());
@@ -601,7 +643,7 @@ Mail::parsing_done()
   TRACEPOINT;
 
   /* Update attachments */
-  if (add_attachments (m_mailitem, m_parser->get_attachments()))
+  if (add_attachments (m_parser->get_attachments()))
     {
       log_error ("%s:%s: Failed to update attachments.",
                  SRCNAME, __func__);
@@ -634,28 +676,8 @@ Mail::encrypt_sign ()
       return err;
     }
   flags = get_gpgol_draft_info_flags (message);
-  if (flags == 3)
-    {
-      log_debug ("%s:%s: Sign / Encrypting message",
-                 SRCNAME, __func__);
-      err = message_sign_encrypt (message, proto,
-                                  NULL, get_sender ());
-    }
-  else if (flags == 2)
-    {
-      err = message_sign (message, proto,
-                          NULL, get_sender ());
-    }
-  else if (flags == 1)
-    {
-      err = message_encrypt (message, proto,
-                             NULL, get_sender ());
-    }
-  else
-    {
-      log_debug ("%s:%s: Unknown flags for crypto: %i",
-                 SRCNAME, __func__, flags);
-    }
+  err = encrypt_sign_mail (this, (flags & 1), (flags & 2), proto,
+                           NULL);
   log_debug ("%s:%s: Status: %i",
              SRCNAME, __func__, err);
   gpgol_release (message);
@@ -768,6 +790,7 @@ int
 Mail::revert_all_mails ()
 {
   int err = 0;
+#if 0
   std::map<LPDISPATCH, Mail *>::iterator it;
   for (it = g_mail_map.begin(); it != g_mail_map.end(); ++it)
     {
@@ -785,6 +808,7 @@ Mail::revert_all_mails ()
           continue;
         }
     }
+#endif
   return err;
 }
 
@@ -873,10 +897,45 @@ Mail::is_smime ()
   return m_is_smime;
 }
 
+static std::string
+get_string (LPDISPATCH item, const char *str)
+{
+  char *buf = get_oom_string (item, str);
+  if (!buf)
+    return std::string();
+  std::string ret = buf;
+  xfree (buf);
+  return ret;
+}
+
 std::string
-Mail::get_subject()
+Mail::get_subject() const
 {
-  return std::string(get_oom_string (m_mailitem, "Subject"));
+  return get_string (m_mailitem, "Subject");
+}
+
+std::string
+Mail::get_body() const
+{
+  return get_string (m_mailitem, "Body");
+}
+
+std::string
+Mail::get_html_body() const
+{
+  return get_string (m_mailitem, "HTMLBody");
+}
+
+char **
+Mail::get_recipients() const
+{
+  LPDISPATCH recipients = get_oom_object (m_mailitem, "Recipients");
+  if (!recipients)
+    {
+      TRACEPOINT;
+      return nullptr;
+    }
+  return get_oom_recipients (recipients);
 }
 
 int
diff --git a/src/mail.h b/src/mail.h
index 83c10ab..9b28f05 100644
--- a/src/mail.h
+++ b/src/mail.h
@@ -31,6 +31,7 @@
 #include <future>
 
 class ParseController;
+class Attachment;
 
 /** @brief Data wrapper around a mailitem.
  *
@@ -163,7 +164,7 @@ public:
   /** @brief get the subject string (UTF-8 encoded).
     *
     * @returns the subject or an empty string. */
-  std::string get_subject ();
+  std::string get_subject () const;
 
   /** @brief Is this a crypto mail handled by gpgol.
   *
@@ -243,6 +244,23 @@ public:
   /** Remove all categories of this mail */
   void remove_categories ();
 
+  /** Get the body of the mail */
+  std::string get_body () const;
+
+  /** Get the html of the mail */
+  std::string get_html_body () const;
+
+  /** Get the recipients recipients is a null
+      terminated array of strings. Needs to be freed
+      by the caller. */
+  char ** get_recipients () const;
+
+  /** Add attachments to this mail returns 0 on success */
+  int add_attachments (std::vector <std::shared_ptr <Attachment> >attachments);
+
+  /** Remove all attachments of this mail. returns 0 on success. */
+  int remove_attachments ();
+
 private:
   void update_categories ();
   void update_body ();
diff --git a/src/mailitem-events.cpp b/src/mailitem-events.cpp
index e4442cc..446e616 100644
--- a/src/mailitem-events.cpp
+++ b/src/mailitem-events.cpp
@@ -95,6 +95,7 @@ MailItemEvents::~MailItemEvents()
     gpgol_release (m_object);
 }
 
+/*
 static DWORD WINAPI
 request_send (LPVOID arg)
 {
@@ -110,6 +111,7 @@ request_send (LPVOID arg)
     }
   return 0;
 }
+*/
 
 static DWORD WINAPI
 request_decrypt (LPVOID arg)
@@ -253,19 +255,18 @@ EVENT_SINK_INVOKE(MailItemEvents)
                         SRCNAME, __func__);
              break;
            }
+          m_mail->update_sender ();
+          m_mail->encrypt_sign ();
           if (m_mail->crypto_successful ())
             {
                log_debug ("%s:%s: Passing send event for message %p.",
                           SRCNAME, __func__, m_object);
-               m_send_seen = false;
                break;
             }
-          m_mail->update_sender ();
-          m_send_seen = true;
-          log_debug ("%s:%s: Message %p cancelling send to let us do crypto.",
+          log_debug ("%s:%s: Message %p cancelling send because crypto failed.",
                      SRCNAME, __func__, m_object);
           *(parms->rgvarg[0].pboolVal) = VARIANT_TRUE;
-          invoke_oom_method (m_object, "Save", NULL);
+          //invoke_oom_method (m_object, "Save", NULL);
 
           return S_OK;
         }
@@ -312,27 +313,12 @@ EVENT_SINK_INVOKE(MailItemEvents)
         }
       case AfterWrite:
         {
-          if (m_send_seen)
-            {
-              m_send_seen = false;
-              m_mail->encrypt_sign ();
-              if (m_mail->crypto_successful ())
-                {
-                  /* We can't trigger a Send event in the current state.
-                     Appearently Outlook locks some methods in some events.
-                     So we Create a new thread that will sleep a bit before
-                     it requests to send the item again. */
-                  HANDLE thread = CreateThread (NULL, 0, request_send,
-                                                (LPVOID) m_object, 0, NULL);
-                  CloseHandle (thread);
-                }
-              return S_OK;
-            }
-          else if (m_decrypt_after_write)
+          if (m_decrypt_after_write)
             {
               char *uuid = strdup (m_mail->get_uuid ().c_str());
               HANDLE thread = CreateThread (NULL, 0, request_decrypt,
                                             (LPVOID) uuid, 0, NULL);
+              log_debug ("Requesting decrypt again for uuid: %s", uuid);
               CloseHandle (thread);
             }
           break;
diff --git a/src/mimemaker.cpp b/src/mimemaker.cpp
index 56c9d9a..58934e6 100644
--- a/src/mimemaker.cpp
+++ b/src/mimemaker.cpp
@@ -42,6 +42,8 @@
 #include "mimemaker.h"
 #include "oomhelp.h"
 #include "gpgolstr.h"
+#include "mail.h"
+#include "attachment.h"
 
 static const unsigned char oid_mimetag[] =
     {0x2A, 0x86, 0x48, 0x86, 0xf7, 0x14, 0x03, 0x0a, 0x04};
@@ -116,6 +118,27 @@ sink_file_write (sink_t sink, const void *data, size_t datalen)
   return 0;
 }
 
+/* Write method used with a sink_t object that contains a GpgME::Data object.  */
+int
+sink_data_write (sink_t sink, const void *data, size_t datalen)
+{
+  auto d = static_cast<GpgME::Data*>(sink->cb_data);
+
+  if (!d)
+    {
+      log_error ("%s:%s: sink not setup for writing", SRCNAME, __func__);
+      return -1;
+    }
+  if (!data)
+    return 0;  /* Flush - nothing to do here.  */
+
+  if (d->write(data, datalen) != datalen)
+    {
+      log_error ("%s:%s: Failed to write data", SRCNAME, __func__);
+      return -1;
+    }
+  return 0;
+}
 
 /* Make sure that PROTOCOL is usable or return a suitable protocol.
    On error PROTOCOL_UNKNOWN is returned.  */
@@ -2099,3 +2122,209 @@ done:
   xfree (orig);
   return err;
 }
+
+
+int
+encrypt_sign_mail (Mail *mail, bool encrypt, bool sign, protocol_t protocol,
+                   HWND hwnd)
+{
+  if (!mail || (!encrypt && !sign))
+    {
+      TRACEPOINT;
+      return 1;
+    }
+
+  const auto body = mail->get_body();
+  /* TODO get attachments here, too */
+  if (body.empty())
+    {
+      log_debug ("%s:%s: No body",
+                 SRCNAME, __func__);
+      return 1;
+    }
+
+  /* Crate an attachment as container for the data. */
+  auto attach = std::shared_ptr<Attachment> (new Attachment());
+
+  //struct sink_s tmpsinkmem;
+  //sink_t tmpsink = &tmpsinkmem;
+
+  struct sink_s sinkmem;
+  sink_t sink = &sinkmem;
+  memset (sink, 0, sizeof *sink);
+  sink->cb_data = &(attach->get_data ());
+  sink->writefnc = sink_data_write;
+
+
+  /* Prepare the engine.  We do this early as it is quite common
+     that some recipients are not available and thus the encryption
+     will fail early.  This is also required to allow the UIserver to
+     figure out the protocol to use if we have not forced one.  */
+  engine_filter_t filter = NULL;
+  if (engine_create_filter (&filter, write_buffer_for_cb, sink))
+    {
+      log_debug ("%s:%s: Failed to create filter",
+                 SRCNAME, __func__);
+      return 1;
+    }
+
+  /* Session number */
+  int session_number = engine_new_session_number ();
+  engine_set_session_number (filter, session_number);
+
+  /* Set the subject for the dialog */
+  std::string subject = mail->get_subject();
+  engine_set_session_title (filter, mail->get_subject().c_str());
+
+  const char *sender = mail->get_sender();
+
+  struct sink_s encsinkmem;
+  sink_t encsink = &encsinkmem;
+  memset (encsink, 0, sizeof *encsink);
+  encsink->cb_data = filter;
+  encsink->writefnc = sink_encryption_write;
+
+  if (encrypt)
+    {
+      const auto recipients = mail->get_recipients();
+      int rc = engine_encrypt_prepare (filter, hwnd, protocol,
+                                  sign ? ENGINE_FLAG_SIGN_FOLLOWS : 0,
+                                  sender, recipients, &protocol);
+      for (int i = 0; recipients && recipients[i]; i++)
+        xfree (recipients[i]);
+      xfree (recipients);
+      if (rc)
+        {
+          log_error ("%s:%s: Failed to prepare encrypt",
+                     SRCNAME, __func__);
+          if (recipients)
+            {
+            }
+          return 1;
+        }
+      if (engine_encrypt_start (filter, 0))
+        {
+          log_error ("%s:%s: Failed to start encrypt",
+                     SRCNAME, __func__);
+          return 1;
+        }
+    }
+
+  /* Check the selected protocol */
+  protocol = check_protocol (protocol);
+  if (protocol == PROTOCOL_UNKNOWN)
+    {
+      log_error ("%s:%s: Protocol unkown",
+                 SRCNAME, __func__);
+      return 1;
+    }
+
+  int n_att_usable = 0;
+  bool inline_pgp = opt.inline_pgp && !n_att_usable;
+
+  /* Write the top header.  */
+  char boundary[BOUNDARYSIZE+1];
+  if (!inline_pgp && create_top_encryption_header (sink, protocol, boundary))
+    {
+      log_error ("%s:%s: Failed to write top header",
+                 SRCNAME, __func__);
+      return 1;
+    }
+
+  char inner_boundary[BOUNDARYSIZE+1];
+  if (!inline_pgp && ((body.size() && n_att_usable) || n_att_usable > 1))
+    {
+      /* A body and at least one attachment or more than one attachment  */
+      generate_boundary (inner_boundary);
+      if (write_multistring (encsink,
+                             "Content-Type: multipart/mixed;\r\n",
+                             "\tboundary=\"", inner_boundary, "\"\r\n",
+                             NULL))
+        {
+          log_error ("%s:%s: Failed to write boundary",
+                     SRCNAME, __func__);
+          return 1;
+        }
+    }
+  else
+    {
+      /* Only one part */
+      *inner_boundary = 0;
+    }
+
+  TRACEPOINT;
+  if (!body.empty())
+    {
+      if (write_part (encsink, body.c_str(), body.size(),
+                      *inner_boundary ? inner_boundary : NULL, NULL, 1))
+        {
+          log_error ("%s:%s: Failed to write body",
+                     SRCNAME, __func__);
+          return 1;
+        }
+    }
+
+  // TODO attachments
+  /* Finish the possible multipart/mixed. */
+  if (!inline_pgp && *inner_boundary &&
+      write_boundary (encsink, inner_boundary, 1))
+    {
+      log_error ("%s:%s: Failed to write boundary",
+                 SRCNAME, __func__);
+      return 1;
+    }
+
+  /* Flush the sink and wait for the encryption to get
+     ready.  */
+  if (write_buffer (encsink, NULL, 0))
+    {
+      log_error ("%s:%s: Failed to flush tmpsink",
+                 SRCNAME, __func__);
+      return 1;
+    }
+
+  log_debug ("%s:%s: Waiting for crypto",
+             SRCNAME, __func__);
+  if (engine_wait (filter))
+    {
+      log_error ("%s:%s: Failed to wait for engine",
+                 SRCNAME, __func__);
+      return 1;
+    }
+  log_debug ("%s:%s: Wait done",
+             SRCNAME, __func__);
+
+  if (inline_pgp)
+    {
+      return put_oom_string (mail->item (), "Body",
+                             attach->get_data_string ().c_str ());
+    }
+  if (put_oom_string (mail->item (), "Body", ""))
+    {
+      log_error ("%s:%s: Failed to update body",
+                 SRCNAME, __func__);
+      return 1;
+    }
+  if (mail->remove_attachments ())
+    {
+      log_error ("%s:%s: Failed to remove attachments",
+                 SRCNAME, __func__);
+      return 1;
+    }
+  attach->set_display_name("gpgol.dat");
+  std::vector<std::shared_ptr <Attachment> > attachments;
+  attachments.push_back (attach);
+  if (mail->add_attachments (attachments))
+    {
+      log_error ("%s:%s: Failed to add attachments",
+                 SRCNAME, __func__);
+      return 1;
+    }
+  if (put_oom_string (mail->item(), "MessageClass", "IPM.Note.SMIME.MultipartSigned"))
+    {
+      log_error ("%s:%s: Failed to change message class",
+                 SRCNAME, __func__);
+      return 1;
+    }
+  return 0;
+}
diff --git a/src/mimemaker.h b/src/mimemaker.h
index f483120..c2ce42b 100644
--- a/src/mimemaker.h
+++ b/src/mimemaker.h
@@ -69,5 +69,9 @@ int restore_msg_from_moss (LPMESSAGE message, LPDISPATCH moss_att,
 
 #ifdef __cplusplus
 }
+
+class Mail;
+int encrypt_sign_mail (Mail *, bool encrypt, bool sign, protocol_t protocol,
+                       HWND hwnd);
 #endif
 #endif /*MIMEMAKER_H*/

commit 2ff3d5e90c146c4056ab9b2c38c0157caa92b7ff
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Oct 27 17:42:03 2016 +0200

    Add options for inline pgp and recpt. autoresolve
    
    * src/addin-options.cpp (set_labels)
    (enable_disable_opts, options_window_proc): Handle
    new checkboxes.
    * src/common_indep.h: Extend opts.
    * src/main.c: Load / Save opts.
    * src/dialogs.rc: Update Layout.
    * src/dialogs.h: Add new ID's
    
    --
    Recipient autoresolution is something for the future. Mostly
    inline-pgp needed now.

diff --git a/src/addin-options.cpp b/src/addin-options.cpp
index 365a7f8..2e9ac64 100644
--- a/src/addin-options.cpp
+++ b/src/addin-options.cpp
@@ -42,6 +42,10 @@ set_labels (HWND dlg)
     { IDC_G_SEND,           N_("Message sending")},
     { IDC_ENCRYPT_DEFAULT,  N_("&Encrypt new messages by default")},
     { IDC_SIGN_DEFAULT,     N_("&Sign new messages by default")},
+    { IDC_INLINE_PGP,       N_("&Send OpenPGP mails without "
+                               "attachments as inline-pgp")},
+    { IDC_AUTORRESOLVE,     N_("&Select certificates automatically (OpenPGP only)")},
+
 
     { IDC_GPG_OPTIONS,      N_("Debug...")},
     { IDC_GPG_CONF,         N_("Configure GnuPG")},
@@ -62,6 +66,12 @@ enable_disable_opts (HWND hDlg)
   BOOL enable = opt.mime_ui ? TRUE : FALSE;
   EnableWindow (GetDlgItem (hDlg, IDC_ENCRYPT_DEFAULT), enable);
   EnableWindow (GetDlgItem (hDlg, IDC_SIGN_DEFAULT), enable);
+  char *uiserver = get_uiserver_name ();
+  if (!uiserver && !opt.enable_smime)
+    {
+      EnableWindow (GetDlgItem (hDlg, IDC_AUTORRESOLVE), FALSE);
+    }
+  xfree (uiserver);
 }
 
 static INT_PTR CALLBACK
@@ -82,6 +92,10 @@ options_window_proc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
           SendDlgItemMessage (hDlg, IDC_MIME_UI, BM_SETCHECK,
                               !!opt.mime_ui, 0L);
 #endif
+          SendDlgItemMessage (hDlg, IDC_INLINE_PGP, BM_SETCHECK,
+                              !!opt.inline_pgp, 0L);
+          SendDlgItemMessage (hDlg, IDC_AUTORRESOLVE, BM_SETCHECK,
+                              !!opt.autoresolve, 0L);
           enable_disable_opts (hDlg);
           set_labels (hDlg);
           ShowWindow (GetDlgItem (hDlg, IDC_GPG_OPTIONS),
@@ -116,6 +130,12 @@ options_window_proc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
                                 MB_ICONINFORMATION|MB_OK);
                   }
 #endif
+                opt.inline_pgp = !!SendDlgItemMessage
+                  (hDlg, IDC_INLINE_PGP, BM_GETCHECK, 0, 0L);
+
+                opt.autoresolve = !!SendDlgItemMessage
+                  (hDlg, IDC_AUTORRESOLVE, BM_GETCHECK, 0, 0L);
+
                 write_options ();
                 EndDialog (hDlg, TRUE);
                 break;
diff --git a/src/common_indep.h b/src/common_indep.h
index 57b7888..b1dcb4c 100644
--- a/src/common_indep.h
+++ b/src/common_indep.h
@@ -192,6 +192,8 @@ struct
   int prefer_html;           /* Prefer html in html/text alternatives. */
   int body_as_attachment;    /* Present encrypted message as attachment.  */
   int mime_ui;               /* Only for Addin. Use the PGP/MIME ui */
+  int inline_pgp;            /* Only for Addin. Use Inline PGP by default. */
+  int autoresolve;           /* Autresolve keys with --locate-keys. */
 
   /* The compatibility flags. */
   struct
diff --git a/src/dialogs.h b/src/dialogs.h
index 34da890..daf8873 100644
--- a/src/dialogs.h
+++ b/src/dialogs.h
@@ -102,6 +102,8 @@
 #define IDC_GPG4WIN_STRING              0x5131
 #define IDC_START_CERTMAN               0x5132
 #define IDC_MIME_UI                     0x5133
+#define IDC_INLINE_PGP                  0x5134
+#define IDC_AUTORRESOLVE                0x5135
 
 /* Ids for PNG Images */
 #define IDI_ENCRYPT_16_PNG              0x6000
diff --git a/src/dialogs.rc b/src/dialogs.rc
index d1d4abc..50b3ec3 100644
--- a/src/dialogs.rc
+++ b/src/dialogs.rc
@@ -297,7 +297,7 @@ BEGIN
                     198, 96, 50, 14
 END
 
-IDD_ADDIN_OPTIONS DIALOGEX DISCARDABLE  300, 300, 266, 150
+IDD_ADDIN_OPTIONS DIALOGEX DISCARDABLE  300, 300, 266, 170
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT | DS_SETFONT
 CAPTION "GpgOL"
 FONT 8, "MS Shell Dlg"
@@ -321,7 +321,7 @@ BEGIN
 
     /* Send options box.  */
     GROUPBOX        "send-options", IDC_G_SEND,
-                    9, 50, 250, 38
+                    9, 50, 250, 60
 
     CONTROL         "encrypt-by-default", IDC_ENCRYPT_DEFAULT,
                     "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
@@ -331,19 +331,27 @@ BEGIN
                     "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
                     24, 71, 215, 10
 
+    CONTROL         "inline-pgp", IDC_INLINE_PGP,
+                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
+                    24, 82, 215, 10
+
+    CONTROL         "autoresolve", IDC_AUTORRESOLVE,
+                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
+                    24, 82, 215, 10
+
     /* Stuff at the lower left corner.  */
     LTEXT           "GpgOL by Gpg4win", IDC_GPG4WIN_STRING,
-                      8, 124, 100, 8
+                      8, 144, 100, 8
     LTEXT           "Version x ", IDC_VERSION_INFO,
-                      8, 135, 100, 9
+                      8, 155, 100, 9
 
     PUSHBUTTON      "advanced", IDC_GPG_OPTIONS,
-                    180, 100, 70, 14
+                    180, 120, 70, 14
 
     PUSHBUTTON      "gpgconf", IDC_GPG_CONF,
-                    180, 115, 70, 14
+                    180, 135, 70, 14
 
     DEFPUSHBUTTON   "&OK", IDOK,
-                    180, 130, 70, 14
+                    180, 150, 70, 14
 
 END
diff --git a/src/main.c b/src/main.c
index 5d73a62..a580b11 100644
--- a/src/main.c
+++ b/src/main.c
@@ -393,6 +393,10 @@ read_options (void)
   opt.mime_ui = val == NULL || *val != '1'? 0 : 1;
   xfree (val); val = NULL;
 #endif
+
+  load_extension_value ("inlinePGP", &val);
+  opt.inline_pgp = val == NULL || *val != '1'? 0 : 1;
+  xfree (val); val = NULL;
   /* Note, that on purpose these flags are only Registry changeable.
      The format of the entry is a string of of "0" and "1" digits; see
      the switch below for a description. */
@@ -470,6 +474,7 @@ write_options (void)
     {"announceNumber",           1, opt.announce_number, NULL},
     {"bodyAsAttachment",         0, opt.body_as_attachment, NULL},
     {"mimeUI", MIME_UI_DEFAULT, opt.mime_ui, NULL},
+    {"inlinePGP",                0, opt.inline_pgp, NULL},
     {NULL, 0, 0, NULL}
   };
   char buf[32];

commit 09284b0ab35a701c078147c2f6c2fb017c96cbfb
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 26 13:43:17 2016 +0200

    Ensure that the moss attachment stays hidden
    
    * src/mapihelp.cpp (mapi_mark_or_create_moss_attach): Hide attachment.

diff --git a/src/mapihelp.cpp b/src/mapihelp.cpp
index 61768f2..d4407e4 100644
--- a/src/mapihelp.cpp
+++ b/src/mapihelp.cpp
@@ -3531,6 +3531,22 @@ mapi_mark_or_create_moss_attach (LPMESSAGE message, msgtype_t msgtype)
     {
       /* Found existing moss attachment */
       mapi_release_attach_table (table);
+      /* Remark to ensure that it is hidden. As our revert
+         code must unhide it so that it is not stored in winmail.dat
+         but used as the mosstmpl. */
+      mapi_attach_item_t *item = table - 1 + (part2 ? part2 : part1);
+      LPATTACH att;
+      if (message->OpenAttach (item->mapipos, NULL, MAPI_BEST_ACCESS, &att) != S_OK)
+        {
+          log_error ("%s:%s: can't open attachment at %d",
+                     SRCNAME, __func__, item->mapipos);
+          return -1;
+        }
+      if (!mapi_test_attach_hidden (att))
+        {
+          mapi_set_attach_hidden (att);
+        }
+      gpgol_release (att);
       if (part2)
         return part2;
       return part1;

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

Summary of changes:
 src/addin-options.cpp   |  20 +++++
 src/attachment.cpp      |  18 ++++
 src/attachment.h        |   6 ++
 src/common_indep.h      |   2 +
 src/dialogs.h           |   2 +
 src/dialogs.rc          |  22 +++--
 src/mail.cpp            | 119 ++++++++++++++++++-------
 src/mail.h              |  20 ++++-
 src/mailitem-events.cpp |  30 ++-----
 src/main.c              |   5 ++
 src/mapihelp.cpp        |  16 ++++
 src/mimemaker.cpp       | 229 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/mimemaker.h         |   4 +
 13 files changed, 433 insertions(+), 60 deletions(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org



From cvs at cvs.gnupg.org  Thu Oct 27 18:51:06 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Thu, 27 Oct 2016 18:51:06 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-299-g8ea72a7
Message-ID: <E1bzntV-0004VJ-U2@lists.gnupg.org>

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  8ea72a776a88f3c851e812d258355be80caa1bc1 (commit)
       via  445f0c13d751f6dee9d70ef0785866ab2a7ea120 (commit)
       via  66a0091d74768ab3a4a5342d3645e1834c59045a (commit)
      from  cf20b23c146c9e499263654644035796475de097 (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 8ea72a776a88f3c851e812d258355be80caa1bc1
Author: Justus Winter <justus at g10code.com>
Date:   Thu Oct 27 15:31:30 2016 +0200

    g10: Fix iteration over getkey results.
    
    * g10/getkey.c (getkey_next): Return the public key in PK even if
    RET_KEYBLOCK is NULL.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/g10/getkey.c b/g10/getkey.c
index 325f00b..5ef5fc3 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -1930,7 +1930,7 @@ getkey_byname (ctrl_t ctrl, getkey_ctx_t *retctx, PKT_public_key *pk,
  * If PK is not NULL, the public key of the next result is returned in
  * *PK.  Note: The self-signed data has already been merged into the
  * public key using merge_selfsigs.  Free *PK by calling
- * release_public_key_parts (or, if PK was allocated using xfree, you
+ * release_public_key_parts (or, if PK was allocated using xmalloc, you
  * can use free_public_key, which calls release_public_key_parts(PK)
  * and then xfree(PK)).
  *
@@ -1954,8 +1954,11 @@ getkey_next (getkey_ctx_t ctx, PKT_public_key *pk, kbnode_t *ret_keyblock)
   keydb_disable_caching (ctx->kr_handle);
 
   rc = lookup (ctx, ret_keyblock, &found_key, ctx->want_secret);
-  if (!rc && pk && ret_keyblock)
-    pk_from_block (pk, *ret_keyblock, found_key);
+  if (!rc && pk)
+    {
+      log_assert (found_key);
+      pk_from_block (pk, NULL, found_key);
+    }
 
   return rc;
 }

commit 445f0c13d751f6dee9d70ef0785866ab2a7ea120
Author: Justus Winter <justus at g10code.com>
Date:   Thu Oct 27 14:58:01 2016 +0200

    Fix typos.
    
    --
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 7bcda50..969d898 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -1127,7 +1127,7 @@ confirm_flag_from_sshcontrol (const char *hexgrip)
 
 /* Open the ssh control file for reading.  This is a public version of
    open_control_file.  The caller must use ssh_close_control_file to
-   release the retruned handle.  */
+   release the returned handle.  */
 ssh_control_file_t
 ssh_open_control_file (void)
 {
diff --git a/build-aux/speedo/w32/exdll.h b/build-aux/speedo/w32/exdll.h
index e5ba3bb..bb13ae0 100644
--- a/build-aux/speedo/w32/exdll.h
+++ b/build-aux/speedo/w32/exdll.h
@@ -23,7 +23,7 @@
  * 3. This notice may not be removed or altered from any source
  *    distribution.
  ************************************************************
- * 2005-11-14 wk  Applied license text to orginal exdll.h file from
+ * 2005-11-14 wk  Applied license text to original exdll.h file from
  *                NSIS 2.0.4 and did some formatting changes.
  */
 
diff --git a/build-aux/speedo/w32/g4wihelp.c b/build-aux/speedo/w32/g4wihelp.c
index fe903aa..012e4af 100644
--- a/build-aux/speedo/w32/g4wihelp.c
+++ b/build-aux/speedo/w32/g4wihelp.c
@@ -23,7 +23,7 @@
  ************************************************************
  * The code for the splash screen has been taken from the Splash
  * plugin of the NSIS 2.04 distribution.  That code comes without
- * explicit copyright notices in tyhe source files or author names, it
+ * explicit copyright notices in the source files or author names, it
  * seems that it has been written by Justin Frankel; not sure about
  * the year, though. [wk 2005-11-28]
  *
diff --git a/common/convert.c b/common/convert.c
index 30e5a60..4611e77 100644
--- a/common/convert.c
+++ b/common/convert.c
@@ -176,7 +176,7 @@ bin2hexcolon (const void *buffer, size_t length, char *stringbuf)
    store that at BUFFER.  HEXSTRING is either delimited by end of
    string or a white space character.  The function makes sure that
    the resulting string in BUFFER is terminated by a Nul byte.  Note
-   that the retruned string may include embedded Nul bytes; the extra
+   that the returned string may include embedded Nul bytes; the extra
    Nul byte at the end is used to make sure tha the result can always
    be used as a C-string.
 
diff --git a/common/get-passphrase.c b/common/get-passphrase.c
index 25c1602..8c7496c 100644
--- a/common/get-passphrase.c
+++ b/common/get-passphrase.c
@@ -136,7 +136,7 @@ default_inq_cb (void *opaque, const char *line)
    PROMPT is the prompt string to label the entry box, it may be NULL
    for a default one.  DESC_MSG is a longer description to be
    displayed above the entry box, if may be NULL for a default one.
-   If USE_SECMEM is true, the returned passphrase is retruned in
+   If USE_SECMEM is true, the returned passphrase is returned in
    secure memory.  The length of all these strings is limited; they
    need to fit in their encoded form into a standard Assuan line (i.e
    less then about 950 characters).  All strings shall be UTF-8.  */
diff --git a/common/session-env.c b/common/session-env.c
index 8c3dbb5..20b7c06 100644
--- a/common/session-env.c
+++ b/common/session-env.c
@@ -372,7 +372,7 @@ session_env_getenv_or_default (session_env_t se, const char *name,
 
 /* List the entire environment stored in SE.  The caller initially
    needs to set the value of ITERATOR to 0 and then call this function
-   until it returns NULL.  The value is retruned at R_VALUE.  If
+   until it returns NULL.  The value is returned at R_VALUE.  If
    R_DEFAULT is not NULL, the default flag is stored on return.  The
    default flag indicates that the value has been taken from the
    process' environment.  The caller must not change the returned
diff --git a/dirmngr/server.c b/dirmngr/server.c
index 2d4f292..4e6f426 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -1367,7 +1367,7 @@ lookup_cert_by_pattern (assuan_context_t ctx, char *line,
         }
     }
 
-  /* First look through the internal cache.  The certifcates retruned
+  /* First look through the internal cache.  The certifcates returned
      here are not counted towards the truncation limit.  */
   if (single && !cache_only)
     ; /* Do not read from the local cache in this case.  */
diff --git a/g10/getkey.c b/g10/getkey.c
index 22842fe..325f00b 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -1935,7 +1935,7 @@ getkey_byname (ctrl_t ctrl, getkey_ctx_t *retctx, PKT_public_key *pk,
  * and then xfree(PK)).
  *
  * RET_KEYBLOCK can be given as NULL; if it is not NULL it the entire
- * found keyblock wis retruned hich must be released with
+ * found keyblock is returned which must be released with
  * release_kbnode.  If the function returns an error NULL is stored at
  * RET_KEYBLOCK.
  *
diff --git a/g10/import.c b/g10/import.c
index d65a7ae..88ee162 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -82,7 +82,7 @@ struct import_stats_s
  *
  * FIXME: We should put this into the CTRL object but that requires a
  * lot more changes right now.  For now we use save and restore
- * fucntion to temporary change them.
+ * function to temporary change them.
  */
 /* Definition of the import filters.  */
 struct import_filter_s
diff --git a/g10/mainproc.c b/g10/mainproc.c
index fbcf316..5dc7c33 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -2246,7 +2246,7 @@ proc_tree (CTX c, kbnode_t node)
 
   /* We must skip our special plaintext marker packets here because
      they may be the root packet.  These packets are only used in
-     addtional checks and skipping them here doesn't matter.  */
+     additional checks and skipping them here doesn't matter.  */
   while (node
          && node->pkt->pkttype == PKT_GPG_CONTROL
           && node->pkt->pkt.gpg_control->control == CTRLPKT_PLAINTEXT_MARK)
diff --git a/g10/pkclist.c b/g10/pkclist.c
index 823d670..da4cc06 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -451,8 +451,8 @@ do_we_trust( PKT_public_key *pk, unsigned int trustlevel )
       return 1; /* yes */
 
     case TRUST_NEVER:
-      /* This is retruned can be returned by TOFU, which can return
-         negative assertions.  */
+      /* This can be returned by TOFU, which can return negative
+         assertions.  */
       log_info(_("%s: This key is bad!  It has been marked as untrusted!\n"),
                keystr_from_pk(pk));
       return 0; /* no */
diff --git a/g13/sh-cmd.c b/g13/sh-cmd.c
index 6a4a7d8..d9a0f6c 100644
--- a/g13/sh-cmd.c
+++ b/g13/sh-cmd.c
@@ -162,7 +162,7 @@ static const char hlp_finddevice[] =
   "\n"
   "Find the device matching NAME.  NAME be any identifier from\n"
   "g13tab permissible for the user.  The corresponding block\n"
-  "device is retruned using a status line.";
+  "device is returned using a status line.";
 static gpg_error_t
 cmd_finddevice (assuan_context_t ctx, char *line)
 {
diff --git a/scd/apdu.c b/scd/apdu.c
index c139d76..5b7290e 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -692,7 +692,7 @@ ct_get_status (int slot, unsigned int *status)
 }
 
 /* Actually send the APDU of length APDULEN to SLOT and return a
-   maximum of *BUFLEN data in BUFFER, the actual retruned size will be
+   maximum of *BUFLEN data in BUFFER, the actual returned size will be
    set to BUFLEN.  Returns: CT API error code. */
 static int
 ct_send_apdu (int slot, unsigned char *apdu, size_t apdulen,

commit 66a0091d74768ab3a4a5342d3645e1834c59045a
Author: Justus Winter <justus at g10code.com>
Date:   Thu Oct 27 14:43:29 2016 +0200

    g10: Assert preconditions.
    
    * g10/getkey.c (get_pubkey_byname): Assert preconditions.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/g10/getkey.c b/g10/getkey.c
index 7b1c22b..22842fe 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -1203,6 +1203,9 @@ get_pubkey_byname (ctrl_t ctrl, GETKEY_CTX * retctx, PKT_public_key * pk,
   int nodefault = 0;
   int anylocalfirst = 0;
 
+  /* If RETCTX is not NULL, then RET_KDBHD must be NULL.  */
+  log_assert (retctx == NULL || ret_kdbhd == NULL);
+
   if (retctx)
     *retctx = NULL;
 

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

Summary of changes:
 agent/command-ssh.c             |  2 +-
 build-aux/speedo/w32/exdll.h    |  2 +-
 build-aux/speedo/w32/g4wihelp.c |  2 +-
 common/convert.c                |  2 +-
 common/get-passphrase.c         |  2 +-
 common/session-env.c            |  2 +-
 dirmngr/server.c                |  2 +-
 g10/getkey.c                    | 14 ++++++++++----
 g10/import.c                    |  2 +-
 g10/mainproc.c                  |  2 +-
 g10/pkclist.c                   |  4 ++--
 g13/sh-cmd.c                    |  2 +-
 scd/apdu.c                      |  2 +-
 13 files changed, 23 insertions(+), 17 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Oct 27 20:01:10 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Thu, 27 Oct 2016 20:01:10 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-301-g8fced66
Message-ID: <E1bzozJ-0007XG-1F@lists.gnupg.org>

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  8fced66be35db5ac2a6bfdb9bccb2c0e582d8256 (commit)
       via  ece9ade4b44fb3d5d120cfd32b23632e5efd2134 (commit)
      from  8ea72a776a88f3c851e812d258355be80caa1bc1 (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 8fced66be35db5ac2a6bfdb9bccb2c0e582d8256
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Oct 27 19:51:56 2016 +0200

    gpg: Verify multiple detached signatures with different hash algos.
    
    * g10/mainproc.c (proc_tree): Loose check.  Enable all algos.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/mainproc.c b/g10/mainproc.c
index 5dc7c33..ce4c595 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -2359,11 +2359,16 @@ proc_tree (CTX c, kbnode_t node)
           for (; n1; (n1 = find_next_kbnode(n1, PKT_SIGNATURE)))
             {
               /* We can't currently handle multiple signatures of
-                 different classes or digests (we'd pretty much have
-                 to run a different hash context for each), but if
-                 they are all the same, make an exception. */
+               * different classes (we'd pretty much have to run a
+               * different hash context for each), but if they are all
+               * the same and it is detached signature, we make an
+               * exception.  Note that the old code also disallowed
+               * multiple signatures if the digest algorithms are
+               * different.  We softened this restriction only for
+               * detached signatures, to be on the safe side. */
               if (n1->pkt->pkt.signature->sig_class != class
-                  || n1->pkt->pkt.signature->digest_algo != hash)
+                  || (c->any.data
+                      && n1->pkt->pkt.signature->digest_algo != hash))
                 {
                   multiple_ok = 0;
                   log_info (_("WARNING: multiple signatures detected.  "
@@ -2385,6 +2390,17 @@ proc_tree (CTX c, kbnode_t node)
           if (rc)
             goto detached_hash_err;
 
+          if (multiple_ok)
+            {
+              /* If we have and want to handle multiple signatures we
+               * need to enable all hash algorithms for the context.  */
+              for (n1 = node; (n1 = find_next_kbnode (n1, PKT_SIGNATURE)); )
+                if (!openpgp_md_test_algo (n1->pkt->pkt.signature->digest_algo))
+                  gcry_md_enable (c->mfx.md,
+                                  map_md_openpgp_to_gcry
+                                  (n1->pkt->pkt.signature->digest_algo));
+            }
+
           if (RFC2440 || RFC4880)
             ; /* Strict RFC mode.  */
           else if (sig->digest_algo == DIGEST_ALGO_SHA1
@@ -2392,7 +2408,9 @@ proc_tree (CTX c, kbnode_t node)
                    && sig->sig_class == 0x01)
             {
               /* Enable a workaround for a pgp5 bug when the detached
-               * signature has been created in textmode.  */
+               * signature has been created in textmode.  Note that we
+               * do not implement this for multiple signatures with
+               * different hash algorithms. */
               rc = gcry_md_open (&c->mfx.md2, sig->digest_algo, 0);
               if (rc)
                 goto detached_hash_err;

commit ece9ade4b44fb3d5d120cfd32b23632e5efd2134
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Oct 27 11:45:01 2016 +0200

    common: Add GNUPG_MODULE_NAME_GPGV.
    
    * common/util.h (GNUPG_MODULE_NAME_GPGV): New.
    * common/homedir.c (gnupg_module_name): Implement.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/homedir.c b/common/homedir.c
index 574561a..13ed44c 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -953,6 +953,13 @@ gnupg_module_name (int which)
       X(bindir, GPG_NAME);
 #endif
 
+    case GNUPG_MODULE_NAME_GPGV:
+#if USE_GPG2_HACK
+      X(bindir, GPG_NAME "v2");
+#else
+      X(bindir, GPG_NAME "v");
+#endif
+
     case GNUPG_MODULE_NAME_CONNECT_AGENT:
       X(bindir, "gpg-connect-agent");
 
diff --git a/common/util.h b/common/util.h
index f293234..8a6732f 100644
--- a/common/util.h
+++ b/common/util.h
@@ -244,6 +244,7 @@ char *_gnupg_socketdir_internal (int skip_checks, unsigned *r_info);
 #define GNUPG_MODULE_NAME_CONNECT_AGENT 9
 #define GNUPG_MODULE_NAME_GPGCONF       10
 #define GNUPG_MODULE_NAME_DIRMNGR_LDAP  11
+#define GNUPG_MODULE_NAME_GPGV          12
 const char *gnupg_module_name (int which);
 void gnupg_module_name_flush_some (void);
 

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

Summary of changes:
 common/homedir.c |  7 +++++++
 common/util.h    |  1 +
 g10/mainproc.c   | 28 +++++++++++++++++++++++-----
 3 files changed, 31 insertions(+), 5 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Oct 27 20:39:35 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Thu, 27 Oct 2016 20:39:35 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-302-g5a1f6a0
Message-ID: <E1bzpaU-0000XH-1n@lists.gnupg.org>

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  5a1f6a0062488aaf345b1c73ba98a540e673d619 (commit)
      from  8fced66be35db5ac2a6bfdb9bccb2c0e582d8256 (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 5a1f6a0062488aaf345b1c73ba98a540e673d619
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Oct 27 20:35:28 2016 +0200

    dirmngr: Fix signature checking.
    
    * dirmngr/server.c: Include cpparray.h.
    (verify_swdb_parm_s): New.
    (verify_swdb_status_cb): New.
    (cmd_versioncheck): Use gpgv to correclty verify the signature.
    Rename some variable to comply with GNU standards.
    --
    
    Relying on the return code of gpg is not a robust way to check
    signatures.  We better use our dedicated tool.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/dirmngr/server.c b/dirmngr/server.c
index 4e6f426..e3fe1a4 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -54,6 +54,7 @@
 #include "mbox-util.h"
 #include "zb32.h"
 #include "server-help.h"
+#include "ccparray.h"
 #include "../common/exectool.h"
 
 /* To avoid DoS attacks we limit the size of a certificate to
@@ -2546,6 +2547,29 @@ fetch_into_tmpdir (ctrl_t ctrl, const char *url, estream_t *strm_out,
 }
 
 
+struct verify_swdb_parm_s
+{
+  time_t sigtime;
+  int anyvalid;
+};
+
+static void
+verify_swdb_status_cb (void *opaque, const char *keyword, char *args)
+{
+  struct verify_swdb_parm_s *parm = opaque;
+
+  /* We care only about the first valid signature.  */
+  if (!strcmp (keyword, "VALIDSIG") && !parm->anyvalid)
+    {
+      char *fields[3];
+
+      parm->anyvalid = 1;
+      if (split_fields (args, fields, DIM (fields)) >= 3)
+        parm->sigtime = parse_timestamp (fields[2], NULL);
+    }
+}
+
+
 static const char hlp_versioncheck[] =
   "VERSIONCHECK <name> <version>"
   "\n"
@@ -2570,13 +2594,17 @@ cmd_versioncheck (assuan_context_t ctx, char *line)
   char* swdb_sig_dir = NULL;
   char* buf = NULL;
   size_t len = 0;
-  const char *argv[8];
-  char keyring_path[128];
-  char swdb_path[128];
-  char swdb_sig_path[128];
+  ccparray_t ccp;
+  const char **argv = NULL;
+  char keyring_name[128];
+  char swdb_name[128];
+  char swdb_sig_name[128];
+
+  struct verify_swdb_parm_s verify_swdb_parm = { (time_t)(-1), 0 };
+
 
-  swdb_path[0] = 0;
-  swdb_sig_path[0] = 0;
+  swdb_name[0] = 0;
+  swdb_sig_name[0] = 0;
   ctrl = assuan_get_pointer (ctx);
 
   if (split_fields (line, cmd_fields, 2) != 2)
@@ -2594,29 +2622,51 @@ cmd_versioncheck (assuan_context_t ctx, char *line)
                                 &swdb, &swdb_dir)))
     goto out;
 
-  snprintf (swdb_path, sizeof swdb_path, "%s%s%s", swdb_dir, DIRSEP_S, "file");
+  snprintf (swdb_name, sizeof swdb_name, "%s%s%s", swdb_dir, DIRSEP_S, "file");
 
   if ((err = fetch_into_tmpdir (ctrl, "https://versions.gnupg.org/swdb.lst.sig",
                                 &swdb_sig, &swdb_sig_dir)))
     goto out;
 
-  snprintf (keyring_path, sizeof keyring_path, "%s%s%s", gnupg_datadir (),
+  snprintf (keyring_name, sizeof keyring_name, "%s%s%s", gnupg_datadir (),
            DIRSEP_S, "distsigkey.gpg");
-  snprintf (swdb_sig_path, sizeof swdb_sig_path, "%s%s%s", swdb_sig_dir,
+  snprintf (swdb_sig_name, sizeof swdb_sig_name, "%s%s%s", swdb_sig_dir,
            DIRSEP_S, "file");
 
-  argv[0] = "--batch";
-  argv[1] = "--no-default-keyring";
-  argv[2] = "--keyring";
-  argv[3] = keyring_path;
-  argv[4] = "--verify";
-  argv[5] = swdb_sig_path;
-  argv[6] = "-";
-  argv[7] = NULL;
-
-  if ((err = gnupg_exec_tool_stream (gnupg_module_name (GNUPG_MODULE_NAME_GPG),
-                                     argv, swdb, NULL, NULL, NULL, NULL)))
+  ccparray_init (&ccp, 0);
+  ccparray_put (&ccp, "--status-fd=2");
+  ccparray_put (&ccp, "--keyring");
+  ccparray_put (&ccp, keyring_name);
+  ccparray_put (&ccp, "--");
+  ccparray_put (&ccp, swdb_sig_name);
+  ccparray_put (&ccp, "-");
+  ccparray_put (&ccp, NULL);
+  argv = ccparray_get (&ccp, NULL);
+  if (!argv)
+    {
+      err = gpg_error_from_syserror ();
+      goto out;
+    }
+
+  if ((err = gnupg_exec_tool_stream (gnupg_module_name (GNUPG_MODULE_NAME_GPGV),
+                                     argv, swdb, NULL, NULL,
+                                     verify_swdb_status_cb, &verify_swdb_parm)))
     goto out;
+  if (verify_swdb_parm.sigtime == (time_t)(-1))
+    {
+      if (verify_swdb_parm.anyvalid)
+        err = gpg_error (GPG_ERR_BAD_SIGNATURE);
+      else
+        err = gpg_error (GPG_ERR_INV_TIME);
+      goto out;
+    }
+
+  {
+    gnupg_isotime_t tbuf;
+
+    epoch2isotime (tbuf, verify_swdb_parm.sigtime);
+    log_debug ("swdb created: %s\n", tbuf);
+  }
 
   es_fseek (swdb, 0, SEEK_SET);
 
@@ -2652,22 +2702,23 @@ cmd_versioncheck (assuan_context_t ctx, char *line)
 
   err = assuan_send_data (ctx, "NOT_FOUND", strlen ("NOT_FOUND"));
 
-  out:
+ out:
   es_fclose (swdb);
   es_fclose (swdb_sig);
   xfree (buf);
 
-  if (strlen (swdb_path) > 0)
-    unlink (swdb_path);
+  if (strlen (swdb_name) > 0)
+    remove (swdb_name);
   if (swdb_dir)
     rmdir (swdb_dir);
   xfree (swdb_dir);
 
-  if (strlen (swdb_sig_path) > 0)
-    unlink (swdb_sig_path);
+  if (strlen (swdb_sig_name) > 0)
+    remove (swdb_sig_name);
   if (swdb_sig_dir)
     rmdir (swdb_sig_dir);
   xfree (swdb_sig_dir);
+  xfree (argv);
 
   return leave_cmd (ctx, err);
 }

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

Summary of changes:
 dirmngr/server.c | 101 +++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 76 insertions(+), 25 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Oct 28 10:51:46 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Fri, 28 Oct 2016 10:51:46 +0200
Subject: [git] GpgOL - branch, nomapi, updated. gpgol-1.4.0-123-g5579c4b
Message-ID: <E1c02tB-0006kr-0E@lists.gnupg.org>

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 "GnuPG extension for MS Outlook".

The branch, nomapi has been updated
       via  5579c4b4f4edf53c00078d3ac671386ac65492c5 (commit)
       via  7c189012f464ac448583f8921649a943ebc6cd15 (commit)
      from  2b376a48241aaef927ab1ffd6e7d213480d6751e (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 5579c4b4f4edf53c00078d3ac671386ac65492c5
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Oct 28 10:46:39 2016 +0200

    Remove AfterWrite Windowmessage hack
    
    * src/mailitem-events.cpp (EVENT_SINK_INVOKE): Call save in
    the send event to trigger the write and then send the mail.
    (request_send): Removed.
    * src/Windowmessages.cpp (request_send_mail): Removed.
    src/Windowmessages.h (REQUEST_SEND_MAIL): Removed.
    
    --
    The old code was written under the bad assumption that
    after write we could not send the mail directly.
    
    This should fix the reported crashes when sending mails:
    
    GnuPG-Bug-Id: 2335

diff --git a/src/mailitem-events.cpp b/src/mailitem-events.cpp
index e4442cc..a3e569c 100644
--- a/src/mailitem-events.cpp
+++ b/src/mailitem-events.cpp
@@ -96,22 +96,6 @@ MailItemEvents::~MailItemEvents()
 }
 
 static DWORD WINAPI
-request_send (LPVOID arg)
-{
-  log_debug ("%s:%s: requesting send for: %p",
-             SRCNAME, __func__, arg);
-  if (do_in_ui_thread (REQUEST_SEND_MAIL, arg))
-    {
-      MessageBox (NULL,
-                  "Error while requesting send of message.\n"
-                  "Please press the send button again.",
-                  _("GpgOL"),
-                  MB_ICONINFORMATION|MB_OK);
-    }
-  return 0;
-}
-
-static DWORD WINAPI
 request_decrypt (LPVOID arg)
 {
   log_debug ("%s:%s: requesting decrypt again for: %p",
@@ -234,25 +218,28 @@ EVENT_SINK_INVOKE(MailItemEvents)
         {
           /* This is the only event where we can cancel the send of an
              mailitem. But it is too early for us to encrypt as the MAPI
-             structures are not yet filled (and we don't seem to have a way
-             to trigger this and it is likely to be impossible)
-
-             So the first send event is canceled but we save that we have
-             seen it in m_send_seen. We then trigger a Save of that item.
-             The Save causes the Item to be written and we have a chance
-             to Encrypt it in the AfterWrite event.
+             structures are not yet filled. Crypto based on the
+             Outlook Object Model data did not work as the messages
+             were only sent out empty. See 2b376a48 for a try of
+             this.
 
-             If this encryption is successful and we see a send again
-             we let it pass as then the encrypted data is sent.
+             The we store send_seend and invoke a save which will result
+             in an error but only after triggering all the behavior
+             we need -> filling mapi structures and invoking the
+             AfterWrite handler where we encrypt.
 
-             The value of m_send_seen is set to false in this case as
-             we consumed the original send that we canceled. */
+             If this encryption is successful and we pass the send
+             as then the encrypted data is sent.
+           */
           if (parms->cArgs != 1 || parms->rgvarg[0].vt != (VT_BOOL | VT_BYREF))
            {
              log_debug ("%s:%s: Uncancellable send event.",
                         SRCNAME, __func__);
              break;
            }
+          m_mail->update_sender ();
+          m_send_seen = true;
+          invoke_oom_method (m_object, "Save", NULL);
           if (m_mail->crypto_successful ())
             {
                log_debug ("%s:%s: Passing send event for message %p.",
@@ -260,13 +247,12 @@ EVENT_SINK_INVOKE(MailItemEvents)
                m_send_seen = false;
                break;
             }
-          m_mail->update_sender ();
-          m_send_seen = true;
-          log_debug ("%s:%s: Message %p cancelling send to let us do crypto.",
-                     SRCNAME, __func__, m_object);
-          *(parms->rgvarg[0].pboolVal) = VARIANT_TRUE;
-          invoke_oom_method (m_object, "Save", NULL);
-
+          else
+            {
+              log_debug ("%s:%s: Message %p cancelling send crypto failed.",
+                         SRCNAME, __func__, m_object);
+              *(parms->rgvarg[0].pboolVal) = VARIANT_TRUE;
+            }
           return S_OK;
         }
       case Write:
@@ -316,16 +302,6 @@ EVENT_SINK_INVOKE(MailItemEvents)
             {
               m_send_seen = false;
               m_mail->encrypt_sign ();
-              if (m_mail->crypto_successful ())
-                {
-                  /* We can't trigger a Send event in the current state.
-                     Appearently Outlook locks some methods in some events.
-                     So we Create a new thread that will sleep a bit before
-                     it requests to send the item again. */
-                  HANDLE thread = CreateThread (NULL, 0, request_send,
-                                                (LPVOID) m_object, 0, NULL);
-                  CloseHandle (thread);
-                }
               return S_OK;
             }
           else if (m_decrypt_after_write)
diff --git a/src/windowmessages.cpp b/src/windowmessages.cpp
index d7e9fdc..2c6e7ea 100644
--- a/src/windowmessages.cpp
+++ b/src/windowmessages.cpp
@@ -32,20 +32,6 @@
 /* Singleton window */
 static HWND g_responder_window = NULL;
 
-static int
-request_send_mail (LPDISPATCH mailitem)
-{
-  if (invoke_oom_method (mailitem, "Send", NULL))
-    {
-      log_debug ("%s:%s: Failed to resend message.",
-                 SRCNAME, __func__);
-      return -1;
-    }
-  log_debug ("%s:%s: Message %p sent.",
-             SRCNAME, __func__, mailitem);
-  return 0;
-}
-
 LONG_PTR WINAPI
 gpgol_window_proc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
@@ -56,11 +42,6 @@ gpgol_window_proc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                  SRCNAME, __func__, ctx->wmsg_type);
       switch (ctx->wmsg_type)
         {
-          case (REQUEST_SEND_MAIL):
-            {
-              ctx->err = request_send_mail ((LPDISPATCH) ctx->data);
-              break;
-            }
           case (PARSING_DONE):
             {
               auto mail = (Mail*) ctx->data;
diff --git a/src/windowmessages.h b/src/windowmessages.h
index 3ebefec..d9580e2 100644
--- a/src/windowmessages.h
+++ b/src/windowmessages.h
@@ -38,8 +38,6 @@
 typedef enum _gpgol_wmsg_type
 {
   UNKNOWN = 0,
-  REQUEST_SEND_MAIL = 1, /* Request to send a mail.
-                            Data should be LPMAILITEM */
   PARSING_DONE = 2, /* A mail was parsed. Data should be a pointer
                       to the mail object. */
   REQUEST_DECRYPT = 3

commit 7c189012f464ac448583f8921649a943ebc6cd15
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Oct 28 10:34:48 2016 +0200

    Revert "Implement encryption without MAPI data"
    
    This reverts commit 2b376a48241aaef927ab1ffd6e7d213480d6751e.
    
    --
    While the mails were correctly formatted in the sent mail folder
    this didn't work. Outlook always sent out the mails empty without
    attachments.

diff --git a/src/attachment.cpp b/src/attachment.cpp
index dc9d633..fc528c7 100644
--- a/src/attachment.cpp
+++ b/src/attachment.cpp
@@ -56,21 +56,3 @@ Attachment::get_data()
 {
   return m_data;
 }
-
-const std::string &
-Attachment::get_data_string()
-{
-  if (!m_data_string.empty())
-    {
-      return m_data_string;
-    }
-  char buf[4096];
-  m_data.seek (0, SEEK_SET);
-  size_t nread;
-  m_data_string = std::string();
-  while ((nread = m_data.read (buf, 4096)) > 0)
-    {
-      m_data_string += std::string(buf, nread);
-    }
-  return m_data_string;
-}
diff --git a/src/attachment.h b/src/attachment.h
index af45e75..47c536e 100644
--- a/src/attachment.h
+++ b/src/attachment.h
@@ -41,16 +41,10 @@ public:
   /* get the underlying data structure */
   GpgME::Data& get_data();
 
-  /* get the data as string. resets the seek pointer
-     of data. The string data is cached after this
-     function is called once. */
-  const std::string & get_data_string();
-
 private:
   GpgME::Data m_data;
   std::string m_utf8DisplayName;
   attachtype_t m_type;
-  std::string m_data_string;
 };
 
 #endif // ATTACHMENT_H
diff --git a/src/mail.cpp b/src/mail.cpp
index b6a3cf8..a3c54e9 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -34,7 +34,6 @@
 #include "gpgolstr.h"
 #include "windowmessages.h"
 #include "mlang-charset.h"
-#include "mimemaker.h"
 
 #include <gpgme++/tofuinfo.h>
 #include <gpgme++/verificationresult.h>
@@ -418,52 +417,11 @@ copy_attachment_to_file (std::shared_ptr<Attachment> att, HANDLE hFile)
   return 0;
 }
 
-int
-Mail::remove_attachments()
-{
-  LPDISPATCH attachments = get_oom_object (m_mailitem, "Attachments");
-  if (!attachments)
-    {
-      log_debug ("%s:%s: Failed to get attachments.",
-                 SRCNAME, __func__);
-      return 0;
-    }
-
-  int count = get_oom_int (attachments, "Count");
-  if (count < 1)
-    {
-      gpgol_release (attachments);
-      return 0;
-    }
-  for (int i = 1; i <= count; i++)
-    {
-      VARIANT aVariant[1];
-      DISPPARAMS dispparams;
-
-      dispparams.rgvarg = aVariant;
-      dispparams.rgvarg[0].vt = VT_INT;
-      dispparams.rgvarg[0].intVal = i;
-      dispparams.cArgs = 1;
-      dispparams.cNamedArgs = 0;
-
-      if (invoke_oom_method_with_parms (attachments, "Remove",
-                                        NULL, &dispparams))
-        {
-          log_error ("%s:%s: Failed to remove attachments.",
-                     SRCNAME, __func__);
-          gpgol_release (attachments);
-          return 1;
-        }
-    }
-  gpgol_release (attachments);
-
-  return 0;
-}
-
-/** Update the attachments of a mail object in oom.
+/** Helper to update the attachments of a mail object in oom.
   does not modify the underlying mapi structure. */
-int
-Mail::add_attachments(std::vector<std::shared_ptr<Attachment> > attachments)
+static int
+add_attachments(LPDISPATCH mail,
+                std::vector<std::shared_ptr<Attachment> > attachments)
 {
   int err = 0;
   for (auto att: attachments)
@@ -478,7 +436,7 @@ Mail::add_attachments(std::vector<std::shared_ptr<Attachment> > attachments)
                      SRCNAME, __func__, att->get_display_name().c_str());
           err = 1;
         }
-      if (add_oom_attachment (m_mailitem, wchar_file, wchar_name))
+      if (add_oom_attachment (mail, wchar_file, wchar_name))
         {
           log_error ("%s:%s: Failed to add attachment: %s",
                      SRCNAME, __func__, att->get_display_name().c_str());
@@ -643,7 +601,7 @@ Mail::parsing_done()
   TRACEPOINT;
 
   /* Update attachments */
-  if (add_attachments (m_parser->get_attachments()))
+  if (add_attachments (m_mailitem, m_parser->get_attachments()))
     {
       log_error ("%s:%s: Failed to update attachments.",
                  SRCNAME, __func__);
@@ -676,8 +634,28 @@ Mail::encrypt_sign ()
       return err;
     }
   flags = get_gpgol_draft_info_flags (message);
-  err = encrypt_sign_mail (this, (flags & 1), (flags & 2), proto,
-                           NULL);
+  if (flags == 3)
+    {
+      log_debug ("%s:%s: Sign / Encrypting message",
+                 SRCNAME, __func__);
+      err = message_sign_encrypt (message, proto,
+                                  NULL, get_sender ());
+    }
+  else if (flags == 2)
+    {
+      err = message_sign (message, proto,
+                          NULL, get_sender ());
+    }
+  else if (flags == 1)
+    {
+      err = message_encrypt (message, proto,
+                             NULL, get_sender ());
+    }
+  else
+    {
+      log_debug ("%s:%s: Unknown flags for crypto: %i",
+                 SRCNAME, __func__, flags);
+    }
   log_debug ("%s:%s: Status: %i",
              SRCNAME, __func__, err);
   gpgol_release (message);
@@ -790,7 +768,6 @@ int
 Mail::revert_all_mails ()
 {
   int err = 0;
-#if 0
   std::map<LPDISPATCH, Mail *>::iterator it;
   for (it = g_mail_map.begin(); it != g_mail_map.end(); ++it)
     {
@@ -808,7 +785,6 @@ Mail::revert_all_mails ()
           continue;
         }
     }
-#endif
   return err;
 }
 
@@ -897,45 +873,10 @@ Mail::is_smime ()
   return m_is_smime;
 }
 
-static std::string
-get_string (LPDISPATCH item, const char *str)
-{
-  char *buf = get_oom_string (item, str);
-  if (!buf)
-    return std::string();
-  std::string ret = buf;
-  xfree (buf);
-  return ret;
-}
-
 std::string
-Mail::get_subject() const
+Mail::get_subject()
 {
-  return get_string (m_mailitem, "Subject");
-}
-
-std::string
-Mail::get_body() const
-{
-  return get_string (m_mailitem, "Body");
-}
-
-std::string
-Mail::get_html_body() const
-{
-  return get_string (m_mailitem, "HTMLBody");
-}
-
-char **
-Mail::get_recipients() const
-{
-  LPDISPATCH recipients = get_oom_object (m_mailitem, "Recipients");
-  if (!recipients)
-    {
-      TRACEPOINT;
-      return nullptr;
-    }
-  return get_oom_recipients (recipients);
+  return std::string(get_oom_string (m_mailitem, "Subject"));
 }
 
 int
diff --git a/src/mail.h b/src/mail.h
index 9b28f05..83c10ab 100644
--- a/src/mail.h
+++ b/src/mail.h
@@ -31,7 +31,6 @@
 #include <future>
 
 class ParseController;
-class Attachment;
 
 /** @brief Data wrapper around a mailitem.
  *
@@ -164,7 +163,7 @@ public:
   /** @brief get the subject string (UTF-8 encoded).
     *
     * @returns the subject or an empty string. */
-  std::string get_subject () const;
+  std::string get_subject ();
 
   /** @brief Is this a crypto mail handled by gpgol.
   *
@@ -244,23 +243,6 @@ public:
   /** Remove all categories of this mail */
   void remove_categories ();
 
-  /** Get the body of the mail */
-  std::string get_body () const;
-
-  /** Get the html of the mail */
-  std::string get_html_body () const;
-
-  /** Get the recipients recipients is a null
-      terminated array of strings. Needs to be freed
-      by the caller. */
-  char ** get_recipients () const;
-
-  /** Add attachments to this mail returns 0 on success */
-  int add_attachments (std::vector <std::shared_ptr <Attachment> >attachments);
-
-  /** Remove all attachments of this mail. returns 0 on success. */
-  int remove_attachments ();
-
 private:
   void update_categories ();
   void update_body ();
diff --git a/src/mailitem-events.cpp b/src/mailitem-events.cpp
index 446e616..e4442cc 100644
--- a/src/mailitem-events.cpp
+++ b/src/mailitem-events.cpp
@@ -95,7 +95,6 @@ MailItemEvents::~MailItemEvents()
     gpgol_release (m_object);
 }
 
-/*
 static DWORD WINAPI
 request_send (LPVOID arg)
 {
@@ -111,7 +110,6 @@ request_send (LPVOID arg)
     }
   return 0;
 }
-*/
 
 static DWORD WINAPI
 request_decrypt (LPVOID arg)
@@ -255,18 +253,19 @@ EVENT_SINK_INVOKE(MailItemEvents)
                         SRCNAME, __func__);
              break;
            }
-          m_mail->update_sender ();
-          m_mail->encrypt_sign ();
           if (m_mail->crypto_successful ())
             {
                log_debug ("%s:%s: Passing send event for message %p.",
                           SRCNAME, __func__, m_object);
+               m_send_seen = false;
                break;
             }
-          log_debug ("%s:%s: Message %p cancelling send because crypto failed.",
+          m_mail->update_sender ();
+          m_send_seen = true;
+          log_debug ("%s:%s: Message %p cancelling send to let us do crypto.",
                      SRCNAME, __func__, m_object);
           *(parms->rgvarg[0].pboolVal) = VARIANT_TRUE;
-          //invoke_oom_method (m_object, "Save", NULL);
+          invoke_oom_method (m_object, "Save", NULL);
 
           return S_OK;
         }
@@ -313,12 +312,27 @@ EVENT_SINK_INVOKE(MailItemEvents)
         }
       case AfterWrite:
         {
-          if (m_decrypt_after_write)
+          if (m_send_seen)
+            {
+              m_send_seen = false;
+              m_mail->encrypt_sign ();
+              if (m_mail->crypto_successful ())
+                {
+                  /* We can't trigger a Send event in the current state.
+                     Appearently Outlook locks some methods in some events.
+                     So we Create a new thread that will sleep a bit before
+                     it requests to send the item again. */
+                  HANDLE thread = CreateThread (NULL, 0, request_send,
+                                                (LPVOID) m_object, 0, NULL);
+                  CloseHandle (thread);
+                }
+              return S_OK;
+            }
+          else if (m_decrypt_after_write)
             {
               char *uuid = strdup (m_mail->get_uuid ().c_str());
               HANDLE thread = CreateThread (NULL, 0, request_decrypt,
                                             (LPVOID) uuid, 0, NULL);
-              log_debug ("Requesting decrypt again for uuid: %s", uuid);
               CloseHandle (thread);
             }
           break;
diff --git a/src/mimemaker.cpp b/src/mimemaker.cpp
index 58934e6..56c9d9a 100644
--- a/src/mimemaker.cpp
+++ b/src/mimemaker.cpp
@@ -42,8 +42,6 @@
 #include "mimemaker.h"
 #include "oomhelp.h"
 #include "gpgolstr.h"
-#include "mail.h"
-#include "attachment.h"
 
 static const unsigned char oid_mimetag[] =
     {0x2A, 0x86, 0x48, 0x86, 0xf7, 0x14, 0x03, 0x0a, 0x04};
@@ -118,27 +116,6 @@ sink_file_write (sink_t sink, const void *data, size_t datalen)
   return 0;
 }
 
-/* Write method used with a sink_t object that contains a GpgME::Data object.  */
-int
-sink_data_write (sink_t sink, const void *data, size_t datalen)
-{
-  auto d = static_cast<GpgME::Data*>(sink->cb_data);
-
-  if (!d)
-    {
-      log_error ("%s:%s: sink not setup for writing", SRCNAME, __func__);
-      return -1;
-    }
-  if (!data)
-    return 0;  /* Flush - nothing to do here.  */
-
-  if (d->write(data, datalen) != datalen)
-    {
-      log_error ("%s:%s: Failed to write data", SRCNAME, __func__);
-      return -1;
-    }
-  return 0;
-}
 
 /* Make sure that PROTOCOL is usable or return a suitable protocol.
    On error PROTOCOL_UNKNOWN is returned.  */
@@ -2122,209 +2099,3 @@ done:
   xfree (orig);
   return err;
 }
-
-
-int
-encrypt_sign_mail (Mail *mail, bool encrypt, bool sign, protocol_t protocol,
-                   HWND hwnd)
-{
-  if (!mail || (!encrypt && !sign))
-    {
-      TRACEPOINT;
-      return 1;
-    }
-
-  const auto body = mail->get_body();
-  /* TODO get attachments here, too */
-  if (body.empty())
-    {
-      log_debug ("%s:%s: No body",
-                 SRCNAME, __func__);
-      return 1;
-    }
-
-  /* Crate an attachment as container for the data. */
-  auto attach = std::shared_ptr<Attachment> (new Attachment());
-
-  //struct sink_s tmpsinkmem;
-  //sink_t tmpsink = &tmpsinkmem;
-
-  struct sink_s sinkmem;
-  sink_t sink = &sinkmem;
-  memset (sink, 0, sizeof *sink);
-  sink->cb_data = &(attach->get_data ());
-  sink->writefnc = sink_data_write;
-
-
-  /* Prepare the engine.  We do this early as it is quite common
-     that some recipients are not available and thus the encryption
-     will fail early.  This is also required to allow the UIserver to
-     figure out the protocol to use if we have not forced one.  */
-  engine_filter_t filter = NULL;
-  if (engine_create_filter (&filter, write_buffer_for_cb, sink))
-    {
-      log_debug ("%s:%s: Failed to create filter",
-                 SRCNAME, __func__);
-      return 1;
-    }
-
-  /* Session number */
-  int session_number = engine_new_session_number ();
-  engine_set_session_number (filter, session_number);
-
-  /* Set the subject for the dialog */
-  std::string subject = mail->get_subject();
-  engine_set_session_title (filter, mail->get_subject().c_str());
-
-  const char *sender = mail->get_sender();
-
-  struct sink_s encsinkmem;
-  sink_t encsink = &encsinkmem;
-  memset (encsink, 0, sizeof *encsink);
-  encsink->cb_data = filter;
-  encsink->writefnc = sink_encryption_write;
-
-  if (encrypt)
-    {
-      const auto recipients = mail->get_recipients();
-      int rc = engine_encrypt_prepare (filter, hwnd, protocol,
-                                  sign ? ENGINE_FLAG_SIGN_FOLLOWS : 0,
-                                  sender, recipients, &protocol);
-      for (int i = 0; recipients && recipients[i]; i++)
-        xfree (recipients[i]);
-      xfree (recipients);
-      if (rc)
-        {
-          log_error ("%s:%s: Failed to prepare encrypt",
-                     SRCNAME, __func__);
-          if (recipients)
-            {
-            }
-          return 1;
-        }
-      if (engine_encrypt_start (filter, 0))
-        {
-          log_error ("%s:%s: Failed to start encrypt",
-                     SRCNAME, __func__);
-          return 1;
-        }
-    }
-
-  /* Check the selected protocol */
-  protocol = check_protocol (protocol);
-  if (protocol == PROTOCOL_UNKNOWN)
-    {
-      log_error ("%s:%s: Protocol unkown",
-                 SRCNAME, __func__);
-      return 1;
-    }
-
-  int n_att_usable = 0;
-  bool inline_pgp = opt.inline_pgp && !n_att_usable;
-
-  /* Write the top header.  */
-  char boundary[BOUNDARYSIZE+1];
-  if (!inline_pgp && create_top_encryption_header (sink, protocol, boundary))
-    {
-      log_error ("%s:%s: Failed to write top header",
-                 SRCNAME, __func__);
-      return 1;
-    }
-
-  char inner_boundary[BOUNDARYSIZE+1];
-  if (!inline_pgp && ((body.size() && n_att_usable) || n_att_usable > 1))
-    {
-      /* A body and at least one attachment or more than one attachment  */
-      generate_boundary (inner_boundary);
-      if (write_multistring (encsink,
-                             "Content-Type: multipart/mixed;\r\n",
-                             "\tboundary=\"", inner_boundary, "\"\r\n",
-                             NULL))
-        {
-          log_error ("%s:%s: Failed to write boundary",
-                     SRCNAME, __func__);
-          return 1;
-        }
-    }
-  else
-    {
-      /* Only one part */
-      *inner_boundary = 0;
-    }
-
-  TRACEPOINT;
-  if (!body.empty())
-    {
-      if (write_part (encsink, body.c_str(), body.size(),
-                      *inner_boundary ? inner_boundary : NULL, NULL, 1))
-        {
-          log_error ("%s:%s: Failed to write body",
-                     SRCNAME, __func__);
-          return 1;
-        }
-    }
-
-  // TODO attachments
-  /* Finish the possible multipart/mixed. */
-  if (!inline_pgp && *inner_boundary &&
-      write_boundary (encsink, inner_boundary, 1))
-    {
-      log_error ("%s:%s: Failed to write boundary",
-                 SRCNAME, __func__);
-      return 1;
-    }
-
-  /* Flush the sink and wait for the encryption to get
-     ready.  */
-  if (write_buffer (encsink, NULL, 0))
-    {
-      log_error ("%s:%s: Failed to flush tmpsink",
-                 SRCNAME, __func__);
-      return 1;
-    }
-
-  log_debug ("%s:%s: Waiting for crypto",
-             SRCNAME, __func__);
-  if (engine_wait (filter))
-    {
-      log_error ("%s:%s: Failed to wait for engine",
-                 SRCNAME, __func__);
-      return 1;
-    }
-  log_debug ("%s:%s: Wait done",
-             SRCNAME, __func__);
-
-  if (inline_pgp)
-    {
-      return put_oom_string (mail->item (), "Body",
-                             attach->get_data_string ().c_str ());
-    }
-  if (put_oom_string (mail->item (), "Body", ""))
-    {
-      log_error ("%s:%s: Failed to update body",
-                 SRCNAME, __func__);
-      return 1;
-    }
-  if (mail->remove_attachments ())
-    {
-      log_error ("%s:%s: Failed to remove attachments",
-                 SRCNAME, __func__);
-      return 1;
-    }
-  attach->set_display_name("gpgol.dat");
-  std::vector<std::shared_ptr <Attachment> > attachments;
-  attachments.push_back (attach);
-  if (mail->add_attachments (attachments))
-    {
-      log_error ("%s:%s: Failed to add attachments",
-                 SRCNAME, __func__);
-      return 1;
-    }
-  if (put_oom_string (mail->item(), "MessageClass", "IPM.Note.SMIME.MultipartSigned"))
-    {
-      log_error ("%s:%s: Failed to change message class",
-                 SRCNAME, __func__);
-      return 1;
-    }
-  return 0;
-}
diff --git a/src/mimemaker.h b/src/mimemaker.h
index c2ce42b..f483120 100644
--- a/src/mimemaker.h
+++ b/src/mimemaker.h
@@ -69,9 +69,5 @@ int restore_msg_from_moss (LPMESSAGE message, LPDISPATCH moss_att,
 
 #ifdef __cplusplus
 }
-
-class Mail;
-int encrypt_sign_mail (Mail *, bool encrypt, bool sign, protocol_t protocol,
-                       HWND hwnd);
 #endif
 #endif /*MIMEMAKER_H*/

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

Summary of changes:
 src/attachment.cpp      |  18 ----
 src/attachment.h        |   6 --
 src/mail.cpp            | 119 +++++++------------------
 src/mail.h              |  20 +----
 src/mailitem-events.cpp |  64 ++++++--------
 src/mimemaker.cpp       | 229 ------------------------------------------------
 src/mimemaker.h         |   4 -
 src/windowmessages.cpp  |  19 ----
 src/windowmessages.h    |   2 -
 9 files changed, 58 insertions(+), 423 deletions(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org



From cvs at cvs.gnupg.org  Fri Oct 28 16:47:26 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Fri, 28 Oct 2016 16:47:26 +0200
Subject: [git] GpgOL - branch, nomapi, updated. gpgol-1.4.0-128-g1d734d5
Message-ID: <E1c08RM-0007MX-Ot@lists.gnupg.org>

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 "GnuPG extension for MS Outlook".

The branch, nomapi has been updated
       via  1d734d5938224e02236245223cf925a61563e2fc (commit)
       via  0431a7025858e1a52f681ae3f2d5e38c00dea26e (commit)
       via  a8a71cbbee57cb732f29fc85b88b0c304514b075 (commit)
       via  43352f377a9ca283428a709a1d6e4d39bee57911 (commit)
       via  2b1d0ffeb16a4ac4b8e63ed9bef2302e10dd850f (commit)
      from  5579c4b4f4edf53c00078d3ac671386ac65492c5 (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 1d734d5938224e02236245223cf925a61563e2fc
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Oct 28 16:44:14 2016 +0200

    Follow Outlook preference in alt. text/html mails
    
    * src/gpgoladdin.cpp (check_html_preferred): New. Read Outlook's
    setting.
    (GpgolAddin::OnStartupComplete): Check html state
    * src/mail.cpp (Mail::decrypt_verify): Use plain placeholder
    if html disabled.
    (Mail::update_body): Use correct parts.
    * src/main.cpp (read_options): Don't read preferHTML.
    (write_options): Don't write preferHTML.
    * src/parsecontroller.cpp: Add plain text template.
    (format_error): Use it.
    (ParseController::parse): Use it.

diff --git a/src/gpgoladdin.cpp b/src/gpgoladdin.cpp
index ac3b216..a9623cd 100644
--- a/src/gpgoladdin.cpp
+++ b/src/gpgoladdin.cpp
@@ -317,6 +317,50 @@ GpgolAddin::OnAddInsUpdate (SAFEARRAY** custom)
   return S_OK;
 }
 
+static void
+check_html_preferred()
+{
+  /* Check if HTML Mail should be enabled. */
+  HKEY h;
+  std::string path = "Software\\Microsoft\\Office\\";
+  path += std::to_string (g_ol_version_major);
+  path += ".0\\Outlook\\Options\\Mail";
+  opt.prefer_html = 1;
+  int err = RegOpenKeyEx (HKEY_CURRENT_USER, path.c_str() , 0, KEY_READ, &h);
+  if (err != ERROR_SUCCESS)
+    {
+      log_debug ("%s:%s: no mail options under %s",
+                 SRCNAME, __func__, path.c_str());
+      return;
+    }
+  else
+    {
+      DWORD type;
+      err = RegQueryValueEx (h, "ReadAsPlain", NULL, &type, NULL, NULL);
+      if (err != ERROR_SUCCESS || type != REG_DWORD)
+        {
+          log_debug ("%s:%s: No type or key for ReadAsPlain",
+                     SRCNAME, __func__);
+          return;
+        }
+      else
+        {
+          DWORD data;
+          DWORD size = sizeof (DWORD);
+          err = RegQueryValueEx (h, "ReadAsPlain", NULL, NULL, (LPBYTE)&data,
+                                 &size);
+          if (err != ERROR_SUCCESS)
+            {
+              log_debug ("%s:%s: Failed to find out ReadAsPlain",
+                         SRCNAME, __func__);
+              return;
+            }
+          opt.prefer_html = data ? 0 : 1;
+          return;
+        }
+    }
+}
+
 STDMETHODIMP
 GpgolAddin::OnStartupComplete (SAFEARRAY** custom)
 {
@@ -343,6 +387,7 @@ GpgolAddin::OnStartupComplete (SAFEARRAY** custom)
   ensure_category_exists (m_application, verifyCategory, 5);
   install_forms ();
   m_applicationEventSink = install_ApplicationEvents_sink(m_application);
+  check_html_preferred ();
   return S_OK;
 }
 
diff --git a/src/mail.cpp b/src/mail.cpp
index 41490cc..c03cb3b 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -496,7 +496,8 @@ Mail::decrypt_verify()
   m_processed = true;
   /* Insert placeholder */
   char *placeholder_buf;
-  if (gpgrt_asprintf (&placeholder_buf, decrypt_template,
+  if (gpgrt_asprintf (&placeholder_buf, opt.prefer_html ? decrypt_template_html :
+                      decrypt_template,
                       is_smime() ? "S/MIME" : "OpenPGP",
                       _("Encrypted message"),
                       _("Please wait while the message is being decrypted / verified...")) == -1)
@@ -506,10 +507,21 @@ Mail::decrypt_verify()
       return 1;
     }
 
-  if (put_oom_string (m_mailitem, "HTMLBody", placeholder_buf))
+  if (opt.prefer_html)
     {
-      log_error ("%s:%s: Failed to modify html body of item.",
-                 SRCNAME, __func__);
+      if (put_oom_string (m_mailitem, "HTMLBody", placeholder_buf))
+        {
+          log_error ("%s:%s: Failed to modify html body of item.",
+                     SRCNAME, __func__);
+        }
+    }
+  else
+    {
+      if (put_oom_string (m_mailitem, "Body", placeholder_buf))
+        {
+          log_error ("%s:%s: Failed to modify body of item.",
+                     SRCNAME, __func__);
+        }
     }
   xfree (placeholder_buf);
 
@@ -545,16 +557,28 @@ Mail::update_body()
   const auto error = m_parser->get_formatted_error ();
   if (!error.empty())
     {
-      if (put_oom_string (m_mailitem, "HTMLBody",
-                          error.c_str ()))
+      if (opt.prefer_html)
         {
-          log_error ("%s:%s: Failed to modify html body of item.",
-                     SRCNAME, __func__);
+          if (put_oom_string (m_mailitem, "HTMLBody",
+                              error.c_str ()))
+            {
+              log_error ("%s:%s: Failed to modify html body of item.",
+                         SRCNAME, __func__);
+            }
+        }
+      else
+        {
+          if (put_oom_string (m_mailitem, "Body",
+                              error.c_str ()))
+            {
+              log_error ("%s:%s: Failed to modify html body of item.",
+                         SRCNAME, __func__);
+            }
         }
       return;
     }
   const auto html = m_parser->get_html_body();
-  if (!html.empty())
+  if (opt.prefer_html && !html.empty())
     {
       char *converted = ansi_charset_to_utf8 (m_parser->get_html_charset().c_str(),
                                               html.c_str(), html.size());
diff --git a/src/main.c b/src/main.c
index a580b11..ba379a2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -366,10 +366,6 @@ read_options (void)
   set_default_key (val);
   xfree (val); val = NULL;
 
-  load_extension_value ("preferHtml", &val);
-  opt.prefer_html = val == NULL || *val != '1'? 0 : 1;
-  xfree (val); val = NULL;
-
   load_extension_value ("gitCommit", &val);
   opt.git_commit = val? strtoul (val, NULL, 16) : 0;
   xfree (val); val = NULL;
@@ -468,7 +464,6 @@ write_options (void)
     {"logFile",                  2, 0, (char*) get_log_file ()},
     {"defaultKey",               2, 0, opt.default_key},
     {"enableDefaultKey",         0, opt.enable_default_key, NULL},
-    {"preferHtml",               0, opt.prefer_html, NULL},
     {"gitCommit",                4, opt.git_commit, NULL},
     {"formsRevision",            1, opt.forms_revision, NULL},
     {"announceNumber",           1, opt.announce_number, NULL},
diff --git a/src/parsecontroller.cpp b/src/parsecontroller.cpp
index 104c3d4..6c47595 100644
--- a/src/parsecontroller.cpp
+++ b/src/parsecontroller.cpp
@@ -41,7 +41,7 @@
 
 
 
-const char decrypt_template[] = {
+const char decrypt_template_html[] = {
 "<html><head></head><body>"
 "<table border=\"0\" width=\"100%%\" cellspacing=\"1\" cellpadding=\"1\" bgcolor=\"#0069cc\">"
 "<tr>"
@@ -54,6 +54,8 @@ const char decrypt_template[] = {
 "</td></tr>"
 "</table></body></html>"};
 
+const char decrypt_template[] = {"%s %s\n\n%s"};
+
 using namespace GpgME;
 
 static bool
@@ -171,7 +173,8 @@ format_error(GpgME::DecryptionResult result, Protocol protocol)
       msg = _("Could not decrypt the data.");
     }
 
-  if (gpgrt_asprintf (&buf, decrypt_template,
+  if (gpgrt_asprintf (&buf, opt.prefer_html ? decrypt_template_html :
+                      decrypt_template,
                       protocol == OpenPGP ? "OpenPGP" : "S/MIME",
                       _("Encrypted message (decryption not possible)"),
                       msg.c_str()) == -1)
@@ -210,7 +213,8 @@ ParseController::parse()
                  SRCNAME, __func__);
       char *buf;
       const char *proto = protocol == OpenPGP ? "OpenPGP" : "S/MIME";
-      if (gpgrt_asprintf (&buf, decrypt_template,
+      if (gpgrt_asprintf (&buf, opt.prefer_html ? decrypt_template_html :
+                          decrypt_template,
                           proto,
                           _("Encrypted message (decryption not possible)"),
                           _("Failed to find GnuPG please ensure that GnuPG or "
diff --git a/src/parsecontroller.h b/src/parsecontroller.h
index 1dd036b..19d622f 100644
--- a/src/parsecontroller.h
+++ b/src/parsecontroller.h
@@ -45,6 +45,7 @@ class MimeDataProvider;
 
 /* A template for decryption errors / status message. */
 extern const char decrypt_template[];
+extern const char decrypt_template_html[];
 
 class ParseController
 {

commit 0431a7025858e1a52f681ae3f2d5e38c00dea26e
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Oct 28 16:43:13 2016 +0200

    Don't confuse Outlook and GpgME Versions
    
    * src/gpgoladdin.cpp (GpgolAddin::OnStartupComplete): Print
    out proper version in debug output.

diff --git a/src/gpgoladdin.cpp b/src/gpgoladdin.cpp
index 6ea357f..ac3b216 100644
--- a/src/gpgoladdin.cpp
+++ b/src/gpgoladdin.cpp
@@ -245,8 +245,6 @@ GpgolAddin::OnConnection (LPDISPATCH Application, ext_ConnectMode ConnectMode,
 
   log_debug ("%s:%s: this is GpgOL %s\n",
              SRCNAME, __func__, PACKAGE_VERSION);
-  log_debug ("%s:%s:   in Outlook %s\n",
-             SRCNAME, __func__, gpgme_check_version (NULL));
 
   can_unload = false;
   m_application = Application;
@@ -256,6 +254,8 @@ GpgolAddin::OnConnection (LPDISPATCH Application, ext_ConnectMode ConnectMode,
   version = get_oom_string (Application, "Version");
 
   log_debug ("%s:%s:   using GPGME %s\n",
+             SRCNAME, __func__, gpgme_check_version (NULL));
+  log_debug ("%s:%s:   in Outlook %s\n",
              SRCNAME, __func__, version);
 
   g_ol_version_major = atoi (version);

commit a8a71cbbee57cb732f29fc85b88b0c304514b075
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Oct 28 15:38:14 2016 +0200

    Add int / string property accessor setters
    
    * src/oomhelp.cpp (put_pa_string, put_pa_int): New.
    (put_pa_variant): Generic version of put_pa_string.
    * src/oomhelp.h: Update accordingly.

diff --git a/src/oomhelp.cpp b/src/oomhelp.cpp
index e232f03..9591f97 100644
--- a/src/oomhelp.cpp
+++ b/src/oomhelp.cpp
@@ -812,7 +812,7 @@ get_oom_context_window (LPDISPATCH context)
 }
 
 int
-put_pa_string (LPDISPATCH pDisp, const char *dasl_id, const char *value)
+put_pa_variant (LPDISPATCH pDisp, const char *dasl_id, VARIANT *value)
 {
   LPDISPATCH propertyAccessor;
   VARIANT cVariant[2];
@@ -853,11 +853,13 @@ put_pa_string (LPDISPATCH pDisp, const char *dasl_id, const char *value)
   xfree (w_property);
 
   /* Variant 0 carries the data. */
-  wchar_t *w_value = utf8_to_wchar (value);
-  BSTR b_value = SysAllocString(w_value);
   VariantInit (&cVariant[0]);
-  cVariant[0].vt = VT_BSTR;
-  cVariant[0].bstrVal = b_value;
+  if (VariantCopy (&cVariant[0], value))
+    {
+      log_error ("%s:%s: Falied to copy value.",
+                 SRCNAME, __func__);
+      return -1;
+    }
 
   /* Variant 1 is the DASL as found out by experiments. */
   VariantInit (&cVariant[1]);
@@ -889,6 +891,32 @@ put_pa_string (LPDISPATCH pDisp, const char *dasl_id, const char *value)
   return 0;
 }
 
+int
+put_pa_string (LPDISPATCH pDisp, const char *dasl_id, const char *value)
+{
+  wchar_t *w_value = utf8_to_wchar (value);
+  BSTR b_value = SysAllocString(w_value);
+  VARIANT var;
+  VariantInit (&var);
+  var.vt = VT_BSTR;
+  var.bstrVal = b_value;
+  int ret = put_pa_variant (pDisp, dasl_id, &var);
+  VariantClear (&var);
+  return ret;
+}
+
+int
+put_pa_int (LPDISPATCH pDisp, const char *dasl_id, int value)
+{
+  VARIANT var;
+  VariantInit (&var);
+  var.vt = VT_INT;
+  var.intVal = value;
+  int ret = put_pa_variant (pDisp, dasl_id, &var);
+  VariantClear (&var);
+  return ret;
+}
+
 /* Get a MAPI property through OOM using the PropertyAccessor
  * interface and the DASL Uid. Returns -1 on error.
  * Variant has to be cleared with VariantClear.
diff --git a/src/oomhelp.h b/src/oomhelp.h
index e9ab03a..f04487b 100644
--- a/src/oomhelp.h
+++ b/src/oomhelp.h
@@ -187,6 +187,12 @@ get_pa_int (LPDISPATCH pDisp, const char *property, int *rInt);
 int
 put_pa_string (LPDISPATCH pDisp, const char *dasl_id, const char *value);
 
+int
+put_pa_variant (LPDISPATCH pDisp, const char *dasl_id, VARIANT *value);
+
+int
+put_pa_int (LPDISPATCH pDisp, const char *dasl_id, int value);
+
 /* Look up a variant with the propertyAccessor interface */
 int
 get_pa_variant (LPDISPATCH pDisp, const char *dasl_id, VARIANT *rVariant);

commit 43352f377a9ca283428a709a1d6e4d39bee57911
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Oct 28 11:35:18 2016 +0200

    Pass Mail object to mimemaker
    
    --
    Changelog ommitet because of trivial changes.
    
    Passing the Mail object will allow us to modify / read our central
    Data structure in the old mimemaker code.

diff --git a/src/mail.cpp b/src/mail.cpp
index 0bc5899..41490cc 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -639,17 +639,17 @@ Mail::encrypt_sign ()
       log_debug ("%s:%s: Sign / Encrypting message",
                  SRCNAME, __func__);
       err = message_sign_encrypt (message, proto,
-                                  NULL, get_sender ());
+                                  NULL, get_sender (), this);
     }
   else if (flags == 2)
     {
       err = message_sign (message, proto,
-                          NULL, get_sender ());
+                          NULL, get_sender (), this);
     }
   else if (flags == 1)
     {
       err = message_encrypt (message, proto,
-                             NULL, get_sender ());
+                             NULL, get_sender (), this);
     }
   else
     {
diff --git a/src/message.cpp b/src/message.cpp
index d04e919..cd99913 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -1083,7 +1083,7 @@ release_recipient_array (char **recipients)
 
 static int
 sign_encrypt (LPMESSAGE message, protocol_t protocol, HWND hwnd, int signflag,
-              const char *sender)
+              const char *sender, Mail* mail)
 {
   gpg_error_t err;
   char **recipients;
@@ -1100,10 +1100,10 @@ sign_encrypt (LPMESSAGE message, protocol_t protocol, HWND hwnd, int signflag,
     {
       if (signflag)
         err = mime_sign_encrypt (message, hwnd, protocol, recipients,
-                                 sender);
+                                 sender, mail);
       else
         err = mime_encrypt (message, hwnd, protocol, recipients,
-                            sender);
+                            sender, mail);
       if (gpg_err_code (err) == GPG_ERR_NO_DATA)
         {
           MessageBox (hwnd, _("Encrypting or signing an empty message "
@@ -1127,11 +1127,11 @@ sign_encrypt (LPMESSAGE message, protocol_t protocol, HWND hwnd, int signflag,
 /* Sign the MESSAGE.  */
 int 
 message_sign (LPMESSAGE message, protocol_t protocol, HWND hwnd,
-              const char *sender)
+              const char *sender, Mail *mail)
 {
   gpg_error_t err;
 
-  err = mime_sign (message, hwnd, protocol, sender);
+  err = mime_sign (message, hwnd, protocol, sender, mail);
   if (gpg_err_code (err) == GPG_ERR_NO_DATA)
     {
       MessageBox (hwnd, _("Encrypting or signing an empty message "
@@ -1154,18 +1154,18 @@ message_sign (LPMESSAGE message, protocol_t protocol, HWND hwnd,
 /* Encrypt the MESSAGE.  */
 int 
 message_encrypt (LPMESSAGE message, protocol_t protocol, HWND hwnd,
-                 const char *sender)
+                 const char *sender, Mail *mail)
 {
-  return sign_encrypt (message, protocol, hwnd, 0, sender);
+  return sign_encrypt (message, protocol, hwnd, 0, sender, mail);
 }
 
 
 /* Sign+Encrypt the MESSAGE.  */
 int 
 message_sign_encrypt (LPMESSAGE message, protocol_t protocol, HWND hwnd,
-                      const char *sender)
+                      const char *sender, Mail *mail)
 {
-  return sign_encrypt (message, protocol, hwnd, 1, sender);
+  return sign_encrypt (message, protocol, hwnd, 1, sender, mail);
 }
 
 
diff --git a/src/message.h b/src/message.h
index cd743bb..5b5b616 100644
--- a/src/message.h
+++ b/src/message.h
@@ -23,6 +23,8 @@
 #include "myexchext.h"
 #include "mapihelp.h"
 
+class Mail;
+
 int message_incoming_handler (LPMESSAGE message, HWND hwnd, bool force);
 bool message_display_handler (LPMESSAGE message, LPDISPATCH inspector, 
                               HWND hwnd);
@@ -35,11 +37,11 @@ int message_verify (LPMESSAGE message, msgtype_t msgtype, int force,
 int message_decrypt (LPMESSAGE message, msgtype_t msgtype, int force, 
                      HWND hwnd);
 int message_sign (LPMESSAGE message, protocol_t protocol, HWND hwnd,
-                  const char *sender = NULL);
+                  const char *sender = NULL, Mail *mail = NULL);
 int message_encrypt (LPMESSAGE message, protocol_t protocol, HWND hwnd,
-                     const char *sender = NULL);
+                     const char *sender = NULL, Mail *mail = NULL);
 int message_sign_encrypt (LPMESSAGE message, protocol_t protocol, HWND hwnd,
-                          const char *sender = NULL);
+                          const char *sender = NULL, Mail *mail = NULL);
 
 
 #endif /*MESSAGE_H*/
diff --git a/src/mimemaker.cpp b/src/mimemaker.cpp
index 56c9d9a..39a6a38 100644
--- a/src/mimemaker.cpp
+++ b/src/mimemaker.cpp
@@ -1469,7 +1469,7 @@ do_mime_sign (LPMESSAGE message, HWND hwnd, protocol_t protocol,
    it. */
 int
 mime_sign (LPMESSAGE message, HWND hwnd, protocol_t protocol,
-           const char *sender)
+           const char *sender, Mail *)
 {
   int result = -1;
   mapi_attach_item_t *att_table;
@@ -1660,7 +1660,7 @@ create_top_encryption_header (sink_t sink, protocol_t protocol, char *boundary)
 int
 mime_encrypt (LPMESSAGE message, HWND hwnd,
               protocol_t protocol, char **recipients,
-              const char *sender)
+              const char *sender, Mail*)
 {
   int result = -1;
   int rc;
@@ -1813,7 +1813,7 @@ mime_encrypt (LPMESSAGE message, HWND hwnd,
 int
 mime_sign_encrypt (LPMESSAGE message, HWND hwnd,
                    protocol_t protocol, char **recipients,
-                   const char *sender)
+                   const char *sender, Mail*)
 {
   int result = -1;
   int rc = 0;
diff --git a/src/mimemaker.h b/src/mimemaker.h
index f483120..ee2d83b 100644
--- a/src/mimemaker.h
+++ b/src/mimemaker.h
@@ -19,6 +19,8 @@
 
 #ifndef MIMEMAKER_H
 #define MIMEMAKER_H
+
+class Mail;
 #ifdef __cplusplus
 extern "C" {
 #if 0
@@ -45,13 +47,13 @@ struct sink_s
 };
 
 int mime_sign (LPMESSAGE message, HWND hwnd, protocol_t protocol,
-               const char *sender);
+               const char *sender, Mail* mail);
 int mime_encrypt (LPMESSAGE message, HWND hwnd,
                   protocol_t protocol, char **recipients,
-                  const char *sender);
+                  const char *sender, Mail* mail);
 int mime_sign_encrypt (LPMESSAGE message, HWND hwnd,
                        protocol_t protocol, char **recipients,
-                       const char *sender);
+                       const char *sender, Mail* mail);
 int sink_std_write (sink_t sink, const void *data, size_t datalen);
 int sink_file_write (sink_t sink, const void *data, size_t datalen);
 int sink_encryption_write (sink_t encsink, const void *data, size_t datalen);

commit 2b1d0ffeb16a4ac4b8e63ed9bef2302e10dd850f
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Oct 28 11:23:54 2016 +0200

    Add some helper functions to Mail object
    
    * src/mail.cpp, src/mail.h (Mail::remove_attachments)
    (Mail::add_attachments, get_string, Mail::get_body)
    (Mail::get_html_body, Mail::get_recipients): New.
    
    --
    These helpers can be usefull even if we still use MAPI
    to encrypt.

diff --git a/src/mail.cpp b/src/mail.cpp
index a3c54e9..0bc5899 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -873,10 +873,45 @@ Mail::is_smime ()
   return m_is_smime;
 }
 
+static std::string
+get_string (LPDISPATCH item, const char *str)
+{
+  char *buf = get_oom_string (item, str);
+  if (!buf)
+    return std::string();
+  std::string ret = buf;
+  xfree (buf);
+  return ret;
+}
+
+std::string
+Mail::get_subject() const
+{
+  return get_string (m_mailitem, "Subject");
+}
+
+std::string
+Mail::get_body() const
+{
+  return get_string (m_mailitem, "Body");
+}
+
 std::string
-Mail::get_subject()
+Mail::get_html_body() const
+{
+  return get_string (m_mailitem, "HTMLBody");
+}
+
+char **
+Mail::get_recipients() const
 {
-  return std::string(get_oom_string (m_mailitem, "Subject"));
+  LPDISPATCH recipients = get_oom_object (m_mailitem, "Recipients");
+  if (!recipients)
+    {
+      TRACEPOINT;
+      return nullptr;
+    }
+  return get_oom_recipients (recipients);
 }
 
 int
diff --git a/src/mail.h b/src/mail.h
index 83c10ab..d150acc 100644
--- a/src/mail.h
+++ b/src/mail.h
@@ -163,7 +163,7 @@ public:
   /** @brief get the subject string (UTF-8 encoded).
     *
     * @returns the subject or an empty string. */
-  std::string get_subject ();
+  std::string get_subject () const;
 
   /** @brief Is this a crypto mail handled by gpgol.
   *
@@ -243,6 +243,17 @@ public:
   /** Remove all categories of this mail */
   void remove_categories ();
 
+  /** Get the body of the mail */
+  std::string get_body () const;
+
+  /** Get the html of the mail */
+  std::string get_html_body () const;
+
+  /** Get the recipients recipients is a null
+      terminated array of strings. Needs to be freed
+      by the caller. */
+  char ** get_recipients () const;
+
 private:
   void update_categories ();
   void update_body ();

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

Summary of changes:
 src/gpgoladdin.cpp      | 49 ++++++++++++++++++++++++++--
 src/mail.cpp            | 87 +++++++++++++++++++++++++++++++++++++++++--------
 src/mail.h              | 13 +++++++-
 src/main.c              |  5 ---
 src/message.cpp         | 18 +++++-----
 src/message.h           |  8 +++--
 src/mimemaker.cpp       |  6 ++--
 src/mimemaker.h         |  8 +++--
 src/oomhelp.cpp         | 38 ++++++++++++++++++---
 src/oomhelp.h           |  6 ++++
 src/parsecontroller.cpp | 10 ++++--
 src/parsecontroller.h   |  1 +
 12 files changed, 201 insertions(+), 48 deletions(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org



From cvs at cvs.gnupg.org  Fri Oct 28 21:07:01 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 28 Oct 2016 21:07:01 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-303-gb6f08db
Message-ID: <E1c0CUZ-0001cz-SN@lists.gnupg.org>

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  b6f08dbb0b45059cdbbb5d9be9725e437f42a8cc (commit)
      from  5a1f6a0062488aaf345b1c73ba98a540e673d619 (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 b6f08dbb0b45059cdbbb5d9be9725e437f42a8cc
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Oct 28 21:01:23 2016 +0200

    gpg: Enable the Issuer Fingerprint from rfc4880bis
    
    * g10/build-packet.c (build_sig_subpkt_from_sig): Always write the new
    Issuer Fingerprint sub-packet.
    * g10/mainproc.c (check_sig_and_print): Always consider that
    sub-packet.
    --
    
    The specs for this sub-packet have been pushed to the OpenPGP WG's
    repo today.
    
    See-also: https://mailarchive.ietf.org/arch/msg/\
    	openpgp/GvPo2eSL9GW9WcGhOocY7KBa9FY
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/build-packet.c b/g10/build-packet.c
index 86d42ef..0115d64 100644
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@@ -1002,17 +1002,12 @@ build_sig_subpkt_from_sig (PKT_signature *sig, PKT_public_key *pksk)
         build_sig_subpkt (sig, SIGSUBPKT_ISSUER, buf, 8);
       }
 
-    /* For a future v5 keys we write the ISSUER_FPR subpacket.  We
-     * also write that for a v4 key is experimental support for
-     * RFC4880bis is requested.  */
-    if (pksk->version > 4 || opt.flags.rfc4880bis)
+    /* Write the new ISSUER_FPR subpacket.  */
+    fingerprint_from_pk (pksk, buf+1, &fprlen);
+    if (fprlen == 20)
       {
-        fingerprint_from_pk (pksk, buf+1, &fprlen);
-        if (fprlen == 20)
-          {
-            buf[0] = pksk->version;
-            build_sig_subpkt (sig, SIGSUBPKT_ISSUER_FPR, buf, 21);
-          }
+        buf[0] = pksk->version;
+        build_sig_subpkt (sig, SIGSUBPKT_ISSUER_FPR, buf, 21);
       }
 
     /* Write the timestamp.  */
diff --git a/g10/mainproc.c b/g10/mainproc.c
index ce4c595..63f7260 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -1748,7 +1748,7 @@ check_sig_and_print (CTX c, kbnode_t node)
     write_status_text (STATUS_NEWSIG, NULL);
 
   astr = openpgp_pk_algo_name ( sig->pubkey_algo );
-  if (opt.flags.rfc4880bis && (issuer_fpr = issuer_fpr_string (sig)))
+  if ((issuer_fpr = issuer_fpr_string (sig)))
     {
       log_info (_("Signature made %s\n"), asctimestamp(sig->timestamp));
       log_info (_("               using %s key %s\n"),
@@ -1853,7 +1853,6 @@ check_sig_and_print (CTX c, kbnode_t node)
    * favor this over the WKD method (to be tried next), because an
    * arbitrary keyserver is less subject to web bug like monitoring.  */
   if (gpg_err_code (rc) == GPG_ERR_NO_PUBKEY
-      && opt.flags.rfc4880bis
       && (opt.keyserver_options.options&KEYSERVER_AUTO_KEY_RETRIEVE)
       && keyserver_any_configured (c->ctrl))
     {

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

Summary of changes:
 g10/build-packet.c | 15 +++++----------
 g10/mainproc.c     |  3 +--
 2 files changed, 6 insertions(+), 12 deletions(-)


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



From cvs at cvs.gnupg.org  Sun Oct 30 19:06:14 2016
From: cvs at cvs.gnupg.org (by Neal H. Walfield)
Date: Sun, 30 Oct 2016 19:06:14 +0100
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-305-geec365a
Message-ID: <E1c0uUs-0005QW-0E@lists.gnupg.org>

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  eec365a02bd35d2d5c9e4d2c8d18bcd9180cf859 (commit)
       via  614ca00676bb8ca12b5107fec0e4ef8818445254 (commit)
      from  b6f08dbb0b45059cdbbb5d9be9725e437f42a8cc (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 eec365a02bd35d2d5c9e4d2c8d18bcd9180cf859
Author: Neal H. Walfield <neal at g10code.com>
Date:   Sun Oct 30 11:03:51 2016 -0700

    g10: Avoid reading in keys when possible.
    
    * g10/tofu.c (build_conflict_set): If CONFLICT_SET contains a single
    element, don't bother to check for cross sigs.  Add parameter PK.
    Update callers.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>

diff --git a/g10/tofu.c b/g10/tofu.c
index 6156bcc..a0f80b3 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -1821,7 +1821,9 @@ ask_about_binding (ctrl_t ctrl,
    email> (including the binding itself, which will be first in the
    list).  For each returned key also sets BINDING_NEW, etc.  */
 static strlist_t
-build_conflict_set (tofu_dbs_t dbs, const char *fingerprint, const char *email)
+build_conflict_set (tofu_dbs_t dbs,
+                    PKT_public_key *pk, const char *fingerprint,
+                    const char *email)
 {
   gpg_error_t rc;
   char *sqerr;
@@ -1898,6 +1900,18 @@ build_conflict_set (tofu_dbs_t dbs, const char *fingerprint, const char *email)
 
   /* Eliminate false conflicts.  */
 
+  if (conflict_set_count == 1)
+    /* We only have a single key.  There are no false conflicts to
+       eliminate.  But, we do need to set the flags.  */
+    {
+      if (pk->has_expired)
+        conflict_set->flags |= BINDING_EXPIRED;
+      if (pk->flags.revoked)
+        conflict_set->flags |= BINDING_REVOKED;
+
+      return conflict_set;
+    }
+
   /* If two keys have cross signatures, then they are controlled by
    * the same person and thus are not in conflict.  */
   kb_all = xcalloc (sizeof (kb_all[0]), conflict_set_count);
@@ -2267,7 +2281,7 @@ get_trust (ctrl_t ctrl, PKT_public_key *pk,
 
 
   /* Look for conflicts.  This is needed in all 3 cases.  */
-  conflict_set = build_conflict_set (dbs, fingerprint, email);
+  conflict_set = build_conflict_set (dbs, pk, fingerprint, email);
   conflict_set_count = strlist_length (conflict_set);
   if (conflict_set_count == 0)
     {

commit 614ca00676bb8ca12b5107fec0e4ef8818445254
Author: Neal H. Walfield <neal at g10code.com>
Date:   Sun Oct 30 10:54:21 2016 -0700

    g10: Fix bit setting.
    
    * g10/tofu.c (build_conflict_set): Fix bit setting.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>
    Fixes-commit: 1f1f56e606c1cb28eec68c60bd8bcb7ab30805de

diff --git a/g10/tofu.c b/g10/tofu.c
index d437c5a..6156bcc 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -1963,9 +1963,9 @@ build_conflict_set (tofu_dbs_t dbs, const char *fingerprint, const char *email)
       /* The binding is always expired/revoked if the key is
        * expired/revoked.  */
       if (binding_pk->has_expired)
-        iter->flags &= BINDING_EXPIRED;
+        iter->flags |= BINDING_EXPIRED;
       if (binding_pk->flags.revoked)
-        iter->flags &= BINDING_REVOKED;
+        iter->flags |= BINDING_REVOKED;
 
       /* The binding is also expired/revoked if the user id is
        * expired/revoked.  */
@@ -1986,9 +1986,9 @@ build_conflict_set (tofu_dbs_t dbs, const char *fingerprint, const char *email)
               found_user_id = 1;
 
               if (user_id2->is_revoked)
-                iter->flags &= BINDING_REVOKED;
+                iter->flags |= BINDING_REVOKED;
               if (user_id2->is_expired)
-                iter->flags &= BINDING_EXPIRED;
+                iter->flags |= BINDING_EXPIRED;
             }
 
           xfree (email2);

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

Summary of changes:
 g10/tofu.c | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)


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



From cvs at cvs.gnupg.org  Mon Oct 31 03:16:17 2016
From: cvs at cvs.gnupg.org (by Neal H. Walfield)
Date: Mon, 31 Oct 2016 03:16:17 +0100
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-306-g7a634e4
Message-ID: <E1c1296-00020F-10@lists.gnupg.org>

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  7a634e48b13c5d5d295b8fed9b429e1b2109a333 (commit)
      from  eec365a02bd35d2d5c9e4d2c8d18bcd9180cf859 (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 7a634e48b13c5d5d295b8fed9b429e1b2109a333
Author: Neal H. Walfield <neal at g10code.com>
Date:   Sun Oct 30 19:02:36 2016 -0700

    g10: Avoid gratuitious SQLite aborts and starving writers.
    
    * g10/tofu.c: Include <time.h>, <utime.h>, <fcntl.h> and <unistd.h>.
    (tofu_dbs_s): Add fields want_lock_file and want_lock_file_ctime.
    (begin_transaction): Only yield if DBS->WANT_LOCK_FILE_CTIME has
    changed since we took the lock.  Don't use gpgrt_yield to yield, but
    sleep for 100ms.  After taking the batch lock, update
    DBS->WANT_LOCK_FILE_CTIME.  Also take the batch lock the first time we
    take the real lock.  When taking the real lock, use immediate not
    deferred mode to avoid gratuitious aborts.
    (end_transaction): When dropping the outermost real lock, drop the
    batch lock.
    (busy_handler): New function.
    (opendbs): Set the busy handler to it when opening the DB.  Initialize
    CTRL->TOFU.DBS->WANT_LOCK_FILE.
    (tofu_closedbs): Free DBS->WANT_LOCK_FILE.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>
    
    By default, SQLite defers transactions until they are actually needed.
    A consequence of this is that if we have two readers and both decide
    to do a write, then one has to abort.  To avoid this problem, we can
    make the outermost transaction an immediate transaction.  This has the
    disadvantage that we only allow a single reader at a time, but at
    least we don't have gratuitous aborts anymore.
    
    A second problem is that SQLite apparently doesn't actually create a
    queue of waiters.  The result is that doing a sched_yield between
    dropping and retaking the batch transaction is not enough to allow the
    other process to make progress.  Instead, we need to wait a
    while (emperically: 100ms seems reasonable).  To avoid waiting when
    there is no contention, we use a new file's timestamp to signal that
    there is a waiter.

diff --git a/g10/tofu.c b/g10/tofu.c
index a0f80b3..8280321 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -28,6 +28,10 @@
 #include <sys/stat.h>
 #include <stdarg.h>
 #include <sqlite3.h>
+#include <time.h>
+#include <utime.h>
+#include <fcntl.h>
+#include <unistd.h>
 
 #include "gpg.h"
 #include "types.h"
@@ -65,6 +69,8 @@
 struct tofu_dbs_s
 {
   sqlite3 *db;
+  char *want_lock_file;
+  time_t want_lock_file_ctime;
 
   struct
   {
@@ -185,21 +191,39 @@ begin_transaction (ctrl_t ctrl, int only_batch)
       /* And some time has gone by since it was started.  */
       && dbs->batch_update_started != gnupg_get_time ())
     {
+      struct stat statbuf;
+      struct timespec ts;
+
       /* If we are in a batch update, then batch updates better have
          been enabled.  */
       log_assert (ctrl->tofu.batch_updated_wanted);
 
-      end_transaction (ctrl, 2);
-
-      /* Yield to allow another process a chance to run.  */
-      gpgrt_yield ();
+      /* Check if another process wants to run.  (We just ignore any
+       * stat failure.  A waiter might have to wait a bit longer, but
+       * otherwise there should be no impact.)  */
+      if (stat (dbs->want_lock_file, &statbuf) == 0
+          && statbuf.st_ctime != dbs->want_lock_file_ctime)
+        {
+          end_transaction (ctrl, 2);
+
+          /* Yield to allow another process a chance to run.  Note:
+           * testing suggests that anything less than a 100ms tends to
+           * not result in the other process getting the lock.  */
+          memset (&ts, 0, sizeof (ts));
+          ts.tv_nsec = 100 * 1000 * 1000;
+          nanosleep (&ts, &ts);
+        }
+      else
+        dbs->batch_update_started = gnupg_get_time ();
     }
 
-  if (/* Batch mode is enabled.  */
-      ctrl->tofu.batch_updated_wanted
-      /* But we don't have an open batch transaction.  */
-      && !dbs->in_batch_transaction)
+  if (/* We don't have an open batch transaction.  */
+      !dbs->in_batch_transaction
+      && (/* Batch mode is enabled or we are starting a new transaction.  */
+          ctrl->tofu.batch_updated_wanted || dbs->in_transaction == 0))
     {
+      struct stat statbuf;
+
       /* We are in batch mode, but we don't have an open batch
        * transaction.  Since the batch save point must be the outer
        * save point, it must be taken before the inner save point.  */
@@ -207,7 +231,7 @@ begin_transaction (ctrl_t ctrl, int only_batch)
 
       rc = gpgsql_stepx (dbs->db, &dbs->s.savepoint_batch,
                           NULL, NULL, &err,
-                          "savepoint batch;", GPGSQL_ARG_END);
+                          "begin immediate transaction;", GPGSQL_ARG_END);
       if (rc)
         {
           log_error (_("error beginning transaction on TOFU database: %s\n"),
@@ -218,12 +242,15 @@ begin_transaction (ctrl_t ctrl, int only_batch)
 
       dbs->in_batch_transaction = 1;
       dbs->batch_update_started = gnupg_get_time ();
+
+      if (stat (dbs->want_lock_file, &statbuf) == 0)
+        dbs->want_lock_file_ctime = statbuf.st_ctime;
     }
 
   if (only_batch)
     return 0;
 
-  log_assert(dbs->in_transaction >= 0);
+  log_assert (dbs->in_transaction >= 0);
   dbs->in_transaction ++;
 
   rc = gpgsql_exec_printf (dbs->db, NULL, NULL, &err,
@@ -252,14 +279,15 @@ end_transaction (ctrl_t ctrl, int only_batch)
   int rc;
   char *err = NULL;
 
-  if (only_batch)
+  if (only_batch || (! only_batch && dbs->in_transaction == 1))
     {
       if (!dbs)
         return 0;  /* Shortcut to allow for easier cleanup code.  */
 
       /* If we are releasing the batch transaction, then we better not
          be in a normal transaction.  */
-      log_assert (dbs->in_transaction == 0);
+      if (only_batch)
+        log_assert (dbs->in_transaction == 0);
 
       if (/* Batch mode disabled?  */
           (!ctrl->tofu.batch_updated_wanted || only_batch == 2)
@@ -269,10 +297,11 @@ end_transaction (ctrl_t ctrl, int only_batch)
           /* The batch transaction is still in open, but we've left
            * batch mode.  */
           dbs->in_batch_transaction = 0;
+          dbs->in_transaction = 0;
 
           rc = gpgsql_stepx (dbs->db, &dbs->s.savepoint_batch_commit,
                              NULL, NULL, &err,
-                             "release batch;", GPGSQL_ARG_END);
+                             "commit transaction;", GPGSQL_ARG_END);
           if (rc)
             {
               log_error (_("error committing transaction on TOFU database: %s\n"),
@@ -284,7 +313,8 @@ end_transaction (ctrl_t ctrl, int only_batch)
           return 0;
         }
 
-      return 0;
+      if (only_batch)
+        return 0;
     }
 
   log_assert (dbs);
@@ -689,6 +719,36 @@ initdb (sqlite3 *db)
     }
 }
 
+static int
+busy_handler (void *cookie, int call_count)
+{
+  ctrl_t ctrl = cookie;
+  tofu_dbs_t dbs = ctrl->tofu.dbs;
+
+  (void) call_count;
+
+  /* Update the lock file time stamp so that the current owner knows
+     that we want the lock.  */
+  if (dbs)
+    {
+      /* Note: we don't fail if we can't create the lock file: this
+         process will have to wait a bit longer, but otherwise nothing
+         horrible should happen.  */
+
+      int fd = open (dbs->want_lock_file, O_CREAT);
+      if (fd == -1)
+        log_debug ("TOFU: Error opening '%s': %s\n",
+                   dbs->want_lock_file, strerror (errno));
+      else
+        {
+          utime (dbs->want_lock_file, NULL);
+          close (fd);
+        }
+    }
+
+  /* Call again.  */
+  return 1;
+}
 
 /* Create a new DB handle.  Returns NULL on error.  */
 /* FIXME: Change to return an error code for better reporting by the
@@ -713,12 +773,14 @@ opendbs (ctrl_t ctrl)
           sqlite3_close (db);
           db = NULL;
         }
-      xfree (filename);
 
       /* If a DB is locked wait up to 5 seconds for the lock to be cleared
          before failing.  */
       if (db)
-        sqlite3_busy_timeout (db, 5 * 1000);
+        {
+          sqlite3_busy_timeout (db, 5 * 1000);
+          sqlite3_busy_handler (db, busy_handler, ctrl);
+        }
 
       if (db && initdb (db))
         {
@@ -730,7 +792,10 @@ opendbs (ctrl_t ctrl)
         {
           ctrl->tofu.dbs = xmalloc_clear (sizeof *ctrl->tofu.dbs);
           ctrl->tofu.dbs->db = db;
+          ctrl->tofu.dbs->want_lock_file = xasprintf ("%s-want-lock", filename);
         }
+
+      xfree (filename);
     }
   else
     log_assert (ctrl->tofu.dbs->db);
@@ -761,6 +826,7 @@ tofu_closedbs (ctrl_t ctrl)
     sqlite3_finalize (*statements);
 
   sqlite3_close (dbs->db);
+  xfree (dbs->want_lock_file);
   xfree (dbs);
   ctrl->tofu.dbs = NULL;
 }

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

Summary of changes:
 g10/tofu.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 82 insertions(+), 16 deletions(-)


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



From cvs at cvs.gnupg.org  Mon Oct 31 11:23:25 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Mon, 31 Oct 2016 11:23:25 +0100
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-307-g3b6b8fe
Message-ID: <E1c19kW-0005yI-5N@lists.gnupg.org>

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  3b6b8fe32af7568ff51066d4c2e3679df6dea86f (commit)
      from  7a634e48b13c5d5d295b8fed9b429e1b2109a333 (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 3b6b8fe32af7568ff51066d4c2e3679df6dea86f
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Oct 31 11:17:16 2016 +0100

    w32: Fix PKG_CONFIG_LIBDIR in --build-w32
    
    * autogen.sh: Point pkg-config to the right location.
    
    --
    PKG_CONFIG_LIBDIR is located to usually be /usr/lib/pkgconfig so
    in our case it should also point directly to the pkgconfig location
    and not the prefix. This fixes gnutls and sqlite detection.
    
    Signed-off-by: Andre Heinecke <aheinecke at intevation.de>

diff --git a/autogen.sh b/autogen.sh
index 10cc203..92c6df8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -311,7 +311,7 @@ if [ "$myhost" = "w32" ]; then
     $tsdir/configure --enable-maintainer-mode ${SILENT} \
              --prefix=${w32root}  \
              --host=${host} --build=${build} SYSROOT=${w32root} \
-             PKG_CONFIG_LIBDIR=${w32root} \
+             PKG_CONFIG_LIBDIR=${w32root}/lib/pkgconfig \
              ${configure_opts} ${extraoptions} "$@"
     rc=$?
     exit $rc

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

Summary of changes:
 autogen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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



From cvs at cvs.gnupg.org  Mon Oct 31 12:29:05 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Mon, 31 Oct 2016 12:29:05 +0100
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.15-308-gad491ce
Message-ID: <E1c1Am3-0000Gj-ER@lists.gnupg.org>

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  ad491ceec6145b3781a05dc7b4a36052abeeb4b4 (commit)
      from  3b6b8fe32af7568ff51066d4c2e3679df6dea86f (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 ad491ceec6145b3781a05dc7b4a36052abeeb4b4
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Oct 31 12:20:33 2016 +0100

    common: New function gnupg_usleep.
    
    * configure.ac (HAVE_NANOSLEEP): Test for nanosleep.
    * common/sysutils.c: Always include time.h.
    (gnupg_usleep): New.
    --
    
    This function has been compiled from nPth and Libassuan.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/sysutils.c b/common/sysutils.c
index 6eea90e..28d4cde 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -49,8 +49,8 @@
 # include <asm/sysinfo.h>
 # include <asm/unistd.h>
 #endif
+#include <time.h>
 #ifdef HAVE_SETRLIMIT
-# include <time.h>
 # include <sys/time.h>
 # include <sys/resource.h>
 #endif
@@ -307,6 +307,50 @@ gnupg_sleep (unsigned int seconds)
 }
 
 
+/* Wrapper around the platforms usleep function.  This one won't wake
+ * up before the sleep time has really elapsed.  When build with nPth
+ * it merely calls npth_usleep and thus suspends only the current
+ * thread. */
+void
+gnupg_usleep (unsigned int usecs)
+{
+#if defined(USE_NPTH)
+
+  npth_usleep (usecs);
+
+#elif defined(HAVE_W32_SYSTEM)
+
+  Sleep ((usecs + 999) / 1000);
+
+#elif defined(HAVE_NANOSLEEP)
+
+  if (usecs)
+    {
+      struct timespec req;
+      struct timespec rem;
+
+      req.tv_sec = 0;
+      req.tv_nsec = usecs * 1000;
+
+      while (nanosleep (&req, &rem) < 0 && errno == EINTR)
+        req = rem;
+    }
+
+#else /*Standard Unix*/
+
+  if (usecs)
+    {
+      struct timeval tv;
+
+      tv.tv_sec  = usecs / 1000000;
+      tv.tv_usec = usecs % 1000000;
+      select (0, NULL, NULL, NULL, &tv);
+    }
+
+#endif
+}
+
+
 /* This function is a NOP for POSIX systems but required under Windows
    as the file handles as returned by OS calls (like CreateFile) are
    different from the libc file descriptors (like open). This function
diff --git a/common/sysutils.h b/common/sysutils.h
index 7105107..5467b4c 100644
--- a/common/sysutils.h
+++ b/common/sysutils.h
@@ -54,6 +54,7 @@ const unsigned char *get_session_marker (size_t *rlen);
 unsigned int get_uint_nonce (void);
 /*int check_permissions (const char *path,int extension,int checkonly);*/
 void gnupg_sleep (unsigned int seconds);
+void gnupg_usleep (unsigned int usecs);
 int translate_sys2libc_fd (gnupg_fd_t fd, int for_write);
 int translate_sys2libc_fd_int (int fd, int for_write);
 FILE *gnupg_tmpfile (void);
diff --git a/configure.ac b/configure.ac
index 91ef5c9..c211979 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1387,6 +1387,16 @@ AC_CHECK_FUNCS([memicmp stpcpy strsep strlwr strtoul memmove stricmp strtol \
                 flockfile funlockfile getpwnam getpwuid \
                 getenv inet_pton strpbrk])
 
+# On some systems (e.g. Solaris) nanosleep requires linking to librl.
+# Given that we use nanosleep only as an optimization over a select
+# based wait function we want it only if it is available in libc.
+_save_libs="$LIBS"
+AC_SEARCH_LIBS([nanosleep], [],
+               [AC_DEFINE(HAVE_NANOSLEEP,1,
+                [Define to 1 if you have the `nanosleep' function in libc.])])
+LIBS="$_save_libs"
+
+
 # See whether libc supports the Linux inotify interface
 case "${host}" in
     *-*-linux*)

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

Summary of changes:
 common/sysutils.c | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 common/sysutils.h |  1 +
 configure.ac      | 10 ++++++++++
 3 files changed, 56 insertions(+), 1 deletion(-)


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