From cvs at cvs.gnupg.org  Mon May  2 09:00:15 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Mon, 02 May 2016 09:00:15 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.11-165-g6677d8b
Message-ID: <E1ax7ov-0007PK-0W@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  6677d8b61446eb5760a30a2488c992d6e895a9ed (commit)
      from  35f4b6aafdf1889ed1ae569af5852f47738fe993 (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 6677d8b61446eb5760a30a2488c992d6e895a9ed
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon May 2 15:56:02 2016 +0900

    scd: More fix of error return path.
    
    * scd/command.c (open_card): Return GPG_ERR_ENODEV on the failure of
    apdu_connect.
    
    --
    
    GnuPG-bug-id: 2306
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/scd/command.c b/scd/command.c
index 4e80d76..72ff132 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -469,8 +469,8 @@ open_card (ctrl_t ctrl, const char *apptype)
           else if (sw == SW_HOST_CARD_INACTIVE)
             err = gpg_error (GPG_ERR_CARD_RESET);
           else
-            err = gpg_error (GPG_ERR_CARD);
-	}
+            err = gpg_error (GPG_ERR_ENODEV);
+        }
       else
         err = select_application (ctrl, slot, apptype, &ctrl->app_ctx);
     }

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

Summary of changes:
 scd/command.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 May  2 13:19:29 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Mon, 02 May 2016 13:19:29 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.11-168-g5cef611
Message-ID: <E1axBrn-0006ZO-CX@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  5cef6118580fe658a27d32e85696d88775ad417a (commit)
       via  d73e83c3b678add11a5754e199e528aeb39ec8ce (commit)
       via  c88efcc2cc7fde25fdba36a349f670f741fd4e9a (commit)
      from  6677d8b61446eb5760a30a2488c992d6e895a9ed (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 5cef6118580fe658a27d32e85696d88775ad417a
Author: Werner Koch <wk at gnupg.org>
Date:   Mon May 2 13:17:08 2016 +0200

    gpg: Improve line wrapping for a tofu message.
    
    * g10/tofu.c (time_ago_str): Mark non-breakable spaces.
    (show_statistics): Remove marks.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/tofu.c b/g10/tofu.c
index 20fc612..e163928 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -2232,7 +2232,8 @@ get_trust (struct dbs *dbs, const char *fingerprint, const char *email,
 
 /* Return a malloced string of the form
  *    "7 months, 1 day, 5 minutes, 0 seconds"
- * The caller must free that string.
+ * The caller should replace all '~' in the returned string by a space
+ * and also free the returned string.
  *
  * This is actually a bad hack which may not work correctly with all
  * languages.
@@ -2306,7 +2307,9 @@ time_ago_str (long long int t)
 
   if (years)
     {
-      es_fprintf (fp, ngettext("%d year", "%d years", years), years);
+      /* TRANSLATORS: The tilde ('~') is used here to indicate a
+       * non-breakable space  */
+      es_fprintf (fp, ngettext("%d~year", "%d~years", years), years);
       count ++;
       first = i;
     }
@@ -2315,7 +2318,7 @@ time_ago_str (long long int t)
     {
       if (count)
         es_fprintf (fp, ", ");
-      es_fprintf (fp, ngettext("%d month", "%d months", months), months);
+      es_fprintf (fp, ngettext("%d~month", "%d~months", months), months);
       count ++;
       first = i;
     }
@@ -2324,7 +2327,7 @@ time_ago_str (long long int t)
     {
       if (count)
         es_fprintf (fp, ", ");
-      es_fprintf (fp, ngettext("%d day", "%d days", days), days);
+      es_fprintf (fp, ngettext("%d~day", "%d~days", days), days);
       count ++;
       first = i;
     }
@@ -2333,7 +2336,7 @@ time_ago_str (long long int t)
     {
       if (count)
         es_fprintf (fp, ", ");
-      es_fprintf (fp, ngettext("%d hour", "%d hours", hours), hours);
+      es_fprintf (fp, ngettext("%d~hour", "%d~hours", hours), hours);
       count ++;
       first = i;
     }
@@ -2342,7 +2345,7 @@ time_ago_str (long long int t)
     {
       if (count)
         es_fprintf (fp, ", ");
-      es_fprintf (fp, ngettext("%d minute", "%d minutes", minutes), minutes);
+      es_fprintf (fp, ngettext("%d~minute", "%d~minutes", minutes), minutes);
       count ++;
       first = i;
     }
@@ -2351,7 +2354,7 @@ time_ago_str (long long int t)
     {
       if (count)
         es_fprintf (fp, ", ");
-      es_fprintf (fp, ngettext("%d second", "%d seconds", seconds), seconds);
+      es_fprintf (fp, ngettext("%d~second", "%d~seconds", seconds), seconds);
     }
 
   es_fputc (0, fp);
@@ -2485,12 +2488,15 @@ show_statistics (struct dbs *dbs, const char *fingerprint,
             }
 
           {
-            char *tmpmsg;
+            char *tmpmsg, *p;
             es_fputc (0, fp);
             if (es_fclose_snatch (fp, (void **) &tmpmsg, NULL))
               log_fatal ("error snatching memory stream\n");
             msg = format_text (tmpmsg, 0, 72, 80);
             es_free (tmpmsg);
+            for (p=msg; *p; p++)
+              if (*p == '~')
+                *p = ' ';
           }
 
 	  log_string (GPGRT_LOG_INFO, msg);

commit d73e83c3b678add11a5754e199e528aeb39ec8ce
Author: Werner Koch <wk at gnupg.org>
Date:   Mon May 2 09:48:19 2016 +0200

    gpg: Re-format some tofu messages.
    
    * common/status.h (STATUS_TOFU_USER, STATUS_TOFU_STATS)
    (STATUS_TOFU_STATS_SHORT, STATUS_TOFU_STATS_LONG): New.
    * g10/tofu.c (NO_WARNING_THRESHOLD): New.
    (record_binding, tofu_register): Take care of --dry-run.
    (show_statistics): Print STATUS_TOFU_USER.  Reformat some messages.
    Fix the ngettext/strcmp thing.  Use log_string instead of log_info.
    Use NO_WARNING_THRESHOLD constant.
    (get_trust): Use format_text and print a compact fingerprint.
    
    --
    
    The use of log_string makes long messages better readable; instead of
    
      gpg: Warning: if you think you've seen more[...]
      key, then this key might be a forgery!  Car[...]
      address for small variations.  If the key i[...]
    
    we now have
    
      gpg: Warning: if you think you've seen more[...]
           key, then this key might be a forgery![...]
           address for small variations.  If the [...]
    
    We also put the key information after the message and not between the
    user id and the last used info like here:
    
      gpg: Verified 7 messages signed by "Werner Koch <werner at eifzilla.de>"
           in the past 4 days, 16 hours.
           The most recent message was verified 3 days, 13 hours ago.
           (key: 8061 5870 F5BA D690 3336  [...] 1E42 B367, policy: auto)
    
    This also makes the key info a separate translatable string.
    
    Further a compact version of the fingerprint (hex w/o spaces) is
    printed in some messages.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/status.h b/common/status.h
index e50827f..730a75c 100644
--- a/common/status.h
+++ b/common/status.h
@@ -133,6 +133,11 @@ enum
     STATUS_PKA_TRUST_BAD,
     STATUS_PKA_TRUST_GOOD,
 
+    STATUS_TOFU_USER,
+    STATUS_TOFU_STATS,
+    STATUS_TOFU_STATS_SHORT,
+    STATUS_TOFU_STATS_LONG,
+
     STATUS_TRUNCATED,
     STATUS_MOUNTPOINT,
 
diff --git a/g10/tofu.c b/g10/tofu.c
index e3218b9..20fc612 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -40,12 +40,16 @@
 #include "trustdb.h"
 #include "mkdir_p.h"
 #include "sqlite.h"
+#include "status.h"
 
 #include "tofu.h"
 
 
 #define CONTROL_L ('L' - 'A' + 1)
 
+/* Number of signed messages required to not show extra warnings.  */
+#define NO_WARNING_THRESHOLD 10
+
 
 #define DEBUG_TOFU_CACHE 0
 #if DEBUG_TOFU_CACHE
@@ -1205,7 +1209,7 @@ record_binding (struct dbs *dbs, const char *fingerprint, const char *email,
 	{
 	  log_debug ("TOFU: Error reading from binding database"
 		     " (reading policy for <%s, %s>): %s\n",
-		     fingerprint_pp, email, err);
+		     fingerprint, email, err);
 	  sqlite3_free (err);
 	}
     }
@@ -1215,12 +1219,12 @@ record_binding (struct dbs *dbs, const char *fingerprint, const char *email,
       if (policy_old != TOFU_POLICY_NONE)
 	log_debug ("Changing TOFU trust policy for binding <%s, %s>"
 		   " from %s to %s.\n",
-		   fingerprint_pp, email,
+		   fingerprint, email,
 		   tofu_policy_str (policy_old),
 		   tofu_policy_str (policy));
       else
 	log_debug ("Set TOFU trust policy for binding <%s, %s> to %s.\n",
-		   fingerprint_pp, email,
+		   fingerprint, email,
 		   tofu_policy_str (policy));
     }
 
@@ -1228,6 +1232,12 @@ record_binding (struct dbs *dbs, const char *fingerprint, const char *email,
     /* Nothing to do.  */
     goto out;
 
+  if (opt.dry_run)
+    {
+      log_info ("TOFU database update skipped due to --dry-run\n");
+      goto out;
+    }
+
   rc = sqlite3_stepx
     (db_email->db, &db_email->s.record_binding_update, NULL, NULL, &err,
      "insert or replace into bindings\n"
@@ -1246,7 +1256,7 @@ record_binding (struct dbs *dbs, const char *fingerprint, const char *email,
     {
       log_error (_("error updating TOFU database: %s\n"), err);
       print_further_info (" insert bindings <%s, %s> = %s",
-                          fingerprint_pp, email, tofu_policy_str (policy));
+                          fingerprint, email, tofu_policy_str (policy));
       sqlite3_free (err);
       goto out;
     }
@@ -1273,7 +1283,7 @@ record_binding (struct dbs *dbs, const char *fingerprint, const char *email,
 	{
 	  log_error (_("error updating TOFU database: %s\n"), err);
           print_further_info ("insert bindings <%s, %s>",
-                              fingerprint_pp, email);
+                              fingerprint, email);
 	  sqlite3_free (err);
 	  goto out;
 	}
@@ -1680,7 +1690,7 @@ get_trust (struct dbs *dbs, const char *fingerprint, const char *email,
       policy = opt.tofu_default_policy;
       if (DBG_TRUST)
 	log_debug ("TOFU: binding <%s, %s>'s policy is auto (default: %s).\n",
-		   fingerprint_pp, email,
+		   fingerprint, email,
 		   tofu_policy_str (opt.tofu_default_policy));
     }
   switch (policy)
@@ -1693,7 +1703,7 @@ get_trust (struct dbs *dbs, const char *fingerprint, const char *email,
 	 We don't need to ask the user anything.  */
       if (DBG_TRUST)
 	log_debug ("TOFU: Known binding <%s, %s>'s policy: %s\n",
-		   fingerprint_pp, email, tofu_policy_str (policy));
+		   fingerprint, email, tofu_policy_str (policy));
       trust_level = tofu_policy_to_trust_level (policy);
       goto out;
 
@@ -1771,7 +1781,7 @@ get_trust (struct dbs *dbs, const char *fingerprint, const char *email,
 
       if (DBG_TRUST)
 	log_debug ("TOFU: New binding <%s, %s>, no conflict.\n",
-		   email, fingerprint_pp);
+		   email, fingerprint);
 
       if (record_binding (dbs, fingerprint, email, user_id,
 			  TOFU_POLICY_AUTO, 0) != 0)
@@ -1828,8 +1838,6 @@ get_trust (struct dbs *dbs, const char *fingerprint, const char *email,
       ((policy == TOFU_POLICY_NONE && bindings_with_this_email_count > 0)
        || (policy == TOFU_POLICY_ASK && conflict));
     estream_t fp;
-    char *binding;
-    int binding_shown;
     strlist_t other_user_ids = NULL;
     struct signature_stats *stats = NULL;
     struct signature_stats *stats_iter = NULL;
@@ -1838,43 +1846,65 @@ get_trust (struct dbs *dbs, const char *fingerprint, const char *email,
 
     fp = es_fopenmem (0, "rw,samethread");
     if (! fp)
-      log_fatal ("Error creating memory stream\n");
+      log_fatal ("error creating memory stream: %s\n",
+                 gpg_strerror (gpg_error_from_syserror()));
 
-    binding = xasprintf ("<%s, %s>", fingerprint_pp, email);
-    binding_shown = 0;
+    /* Format the first part of the message.  */
+    {
+      estream_t fp1;
+      char *binding = xasprintf ("<%s, %s>", fingerprint, email);
+      int binding_shown = 0;
+      char *tmpstr, *text;
 
-    if (policy == TOFU_POLICY_NONE)
-      {
-	es_fprintf (fp, _("The binding %s is NOT known."), binding);
-        es_fputs ("  ", fp);
-	binding_shown = 1;
-      }
-    else if (policy == TOFU_POLICY_ASK
-	     /* If there the conflict is with itself, then don't
-		display this message.  */
-	     && conflict && strcmp (conflict, fingerprint) != 0)
-      {
-        char *conflict_pp = format_hexfingerprint (conflict, NULL, 0);
-	es_fprintf (fp,
-		    _("The key %s raised a conflict with this binding (%s)."
-                      "  Since this binding's policy was 'auto', it was "
-                      "changed to 'ask'."),
-		    conflict_pp, binding);
-        es_fputs ("  ", fp);
-        xfree (conflict_pp);
-	binding_shown = 1;
-      }
-    /* TRANSLATORS: The %s%s is replaced by either a fingerprint and a
-       blank or by two empty strings.  */
-    es_fprintf (fp,
-		_("Please indicate whether you believe the binding %s%s"
-		  "is legitimate (the key belongs to the stated owner) "
-		  "or a forgery (bad)."),
-		binding_shown ? "" : binding,
-		binding_shown ? "" : " ");
-    es_fputs ("\n\n", fp);
-
-    xfree (binding);
+      fp1 = es_fopenmem (0, "rw,samethread");
+      if (!fp1)
+        log_fatal ("error creating memory stream: %s\n",
+                   gpg_strerror (gpg_error_from_syserror()));
+
+      if (policy == TOFU_POLICY_NONE)
+        {
+          es_fprintf (fp1, _("The binding %s is NOT known."), binding);
+          es_fputs ("  ", fp1);
+          binding_shown = 1;
+        }
+      else if (policy == TOFU_POLICY_ASK
+               /* If there the conflict is with itself, then don't
+                  display this message.  */
+               && conflict && strcmp (conflict, fingerprint) != 0)
+        {
+          es_fprintf (fp1,
+                      _("The key with fingerprint %s raised a conflict "
+                        "with the binding %s."
+                        "  Since this binding's policy was 'auto', it was "
+                        "changed to 'ask'."),
+                      conflict, binding);
+          es_fputs ("  ", fp1);
+          binding_shown = 1;
+        }
+
+      /* TRANSLATORS: The %s%s is replaced by either a fingerprint and a
+         blank or by two empty strings.  */
+      es_fprintf (fp1,
+                  _("Please indicate whether you believe the binding %s%s"
+                    "is legitimate (the key belongs to the stated owner) "
+                    "or a forgery (bad)."),
+                  binding_shown ? "" : binding,
+                  binding_shown ? "" : " ");
+      es_fputc ('\n', fp1);
+
+      xfree (binding);
+
+      es_fputc (0, fp1);
+      if (es_fclose_snatch (fp1, (void **)&tmpstr, NULL))
+        log_fatal ("error snatching memory stream\n");
+      text = format_text (tmpstr, 0, 72, 80);
+      es_free (tmpstr);
+
+      es_fputs (text, fp);
+      xfree (text);
+    }
+
+    es_fputc ('\n', fp);
 
     /* Find other user ids associated with this key and whether the
        bindings are marked as good or bad.  */
@@ -2370,6 +2400,9 @@ show_statistics (struct dbs *dbs, const char *fingerprint,
       goto out;
     }
 
+  write_status_text_and_buffer (STATUS_TOFU_USER, fingerprint,
+                                email, strlen (email), 0);
+
   if (! strlist)
     log_info (_("Have never verified a message signed by key %s!\n"),
               fingerprint_pp);
@@ -2396,8 +2429,8 @@ show_statistics (struct dbs *dbs, const char *fingerprint,
 	}
 
       if (messages == -1 || first_seen_ago == 0)
-        log_info (_("Failed to collect signature statistics"
-                    " for \"%s\" (key %s)\n"),
+        log_info (_("Failed to collect signature statistics for \"%s\"\n"
+                    "(key %s)\n"),
                   user_id, fingerprint_pp);
       else
 	{
@@ -2407,55 +2440,67 @@ show_statistics (struct dbs *dbs, const char *fingerprint,
 
 	  fp = es_fopenmem (0, "rw,samethread");
 	  if (! fp)
-	    log_fatal ("error creating memory stream\n");
+            log_fatal ("error creating memory stream: %s\n",
+                       gpg_strerror (gpg_error_from_syserror()));
 
 	  if (messages == 0)
-            es_fprintf (fp,
-                        _("Verified 0 messages signed by \"%s\""
-                          " (key: %s, policy: %s)."),
-                        user_id, fingerprint_pp, tofu_policy_str (policy));
+            {
+              es_fprintf (fp, _("Verified %ld messages signed by \"%s\"."),
+                          0L, user_id);
+              es_fputc ('\n', fp);
+            }
 	  else
 	    {
-              char *first_seen_ago_str =
-                time_ago_str (first_seen_ago);
-              char *most_recent_seen_ago_str =
-                time_ago_str (most_recent_seen_ago);
+              char *first_seen_ago_str = time_ago_str (first_seen_ago);
 
               /* TRANSLATORS: The final %s is replaced by a string like
                  "7 months, 1 day, 5 minutes, 0 seconds". */
-	      es_fprintf (fp, ngettext("Verified %ld message signed by \"%s\""
-                                       " (key: %s, policy: %s) in the past %s.",
-                                       "Verified %ld messages signed by \"%s\""
-                                       " (key: %s, policy: %s) in the past %s.",
-                                       messages),
-			  messages, user_id,
-			  fingerprint_pp, tofu_policy_str (policy),
-                          first_seen_ago_str);
+	      es_fprintf (fp,
+                          ngettext("Verified %ld message signed by \"%s\"\n"
+                                   "in the past %s.",
+                                   "Verified %ld messages signed by \"%s\"\n"
+                                   "in the past %s.",
+                                   messages),
+			  messages, user_id, first_seen_ago_str);
 
               if (messages > 1)
                 {
+                  char *tmpstr = time_ago_str (most_recent_seen_ago);
                   es_fputs ("  ", fp);
-                  es_fprintf (fp,
-                              _("The most recent message was verified %s ago."),
-                              most_recent_seen_ago_str);
+                  es_fprintf (fp, _("The most recent message was"
+                                    " verified %s ago."), tmpstr);
+                  xfree (tmpstr);
                 }
-
               xfree (first_seen_ago_str);
-              xfree (most_recent_seen_ago_str);
+
+              if (opt.verbose)
+                {
+                  es_fputs ("  ", fp);
+                  es_fputc ('(', fp);
+                  es_fprintf (fp, _("policy: %s"), tofu_policy_str (policy));
+                  es_fputs (")\n", fp);
+                }
+              else
+                es_fputs ("\n", fp);
             }
 
-	  es_fputc (0, fp);
-	  if (es_fclose_snatch (fp, (void **) &msg, NULL))
-	    log_fatal ("error snatching memory stream\n");
+          {
+            char *tmpmsg;
+            es_fputc (0, fp);
+            if (es_fclose_snatch (fp, (void **) &tmpmsg, NULL))
+              log_fatal ("error snatching memory stream\n");
+            msg = format_text (tmpmsg, 0, 72, 80);
+            es_free (tmpmsg);
+          }
 
-	  log_info ("%s\n", msg);
+	  log_string (GPGRT_LOG_INFO, msg);
           xfree (msg);
 
-	  if (policy == TOFU_POLICY_AUTO && messages < 10)
+	  if (policy == TOFU_POLICY_AUTO && messages < NO_WARNING_THRESHOLD)
 	    {
 	      char *set_policy_command;
 	      char *text;
-              char *tmp;
+              char *tmpmsg;
 
 	      if (messages == 0)
 		log_info (_("Warning: we've have yet to see"
@@ -2465,34 +2510,29 @@ show_statistics (struct dbs *dbs, const char *fingerprint,
                             " single message signed by this key!\n"));
 
 	      set_policy_command =
-		xasprintf ("gpg --tofu-policy bad \"%s\"", fingerprint);
-	      /* TRANSLATORS: translate the below text.  We don't
-		 directly internationalize that text so that we can
-		 tweak it without breaking translations.  */
-	      text = ngettext("TOFU: few signatures %d message %s",
-                              "TOFU: few signatures %d messages %s", 1);
-	      if (strcmp (text, "TOFU: few signatures %d message %s") == 0)
-                {
-                  text =
-                    (messages == 1?
-                     "Warning: if you think you've seen more than %d message "
-                     "signed by this key, then this key might be a forgery!  "
-                     "Carefully examine the email address for small variations "
-                     "(e.g., additional white space).  If the key is suspect, "
-                     "then use '%s' to mark it as being bad.\n"
-                     :
-                     "Warning: if you think you've seen more than %d messages "
-                     "signed by this key, then this key might be a forgery!  "
-                     "Carefully examine the email address for small variations "
-                     "(e.g., additional white space).  If the key is suspect, "
-                     "then use '%s' to mark it as being bad.\n");
-                }
-
-              tmp = xasprintf (text, messages, set_policy_command);
-              text = format_text (tmp, 0, 72, 80);
-              xfree (tmp);
-	      log_info ("%s", text);
+		xasprintf ("gpg --tofu-policy bad %s", fingerprint);
+
+              tmpmsg = xasprintf
+                (ngettext
+                 ("Warning: if you think you've seen more than %ld message "
+                  "signed by this key, then this key might be a forgery!  "
+                  "Carefully examine the email address for small "
+                  "variations.  If the key is suspect, then use\n"
+                  "  %s\n"
+                  "to mark it as being bad.\n",
+                  "Warning: if you think you've seen more than %ld messages "
+                  "signed by this key, then this key might be a forgery!  "
+                      "Carefully examine the email address for small "
+                  "variations.  If the key is suspect, then use\n"
+                  "  %s\n"
+                  "to mark it as being bad.\n",
+                  messages),
+                  messages, set_policy_command);
+              text = format_text (tmpmsg, 0, 72, 80);
+              xfree (tmpmsg);
+	      log_string (GPGRT_LOG_INFO, text);
               xfree (text);
+
 	      es_free (set_policy_command);
 	    }
 	}
@@ -2634,26 +2674,30 @@ tofu_register (PKT_public_key *pk, const char *user_id,
        because <fingerprint, email, sig_time, sig_digest> is the
        primary key!  */
     log_debug ("SIGNATURES DB contains duplicate records"
-	       " <key: %s, %s, time: 0x%lx, sig: %s, %s>."
+	       " <%s, %s, 0x%lx, %s, %s>."
 	       "  Please report.\n",
-	       fingerprint_pp, email, (unsigned long) sig_time,
+	       fingerprint, email, (unsigned long) sig_time,
 	       sig_digest, origin);
   else if (c == 1)
     {
       already_verified = 1;
       if (DBG_TRUST)
 	log_debug ("Already observed the signature"
-		   " <key: %s, %s, time: 0x%lx, sig: %s, %s>\n",
-		   fingerprint_pp, email, (unsigned long) sig_time,
+		   " <%s, %s, 0x%lx, %s, %s>\n",
+		   fingerprint, email, (unsigned long) sig_time,
 		   sig_digest, origin);
     }
+  else if (opt.dry_run)
+    {
+      log_info ("TOFU database update skipped due to --dry-run\n");
+    }
   else
     /* This is the first time that we've seen this signature.
        Record it.  */
     {
       if (DBG_TRUST)
 	log_debug ("TOFU: Saving signature <%s, %s, %s>\n",
-		   fingerprint_pp, email, sig_digest);
+		   fingerprint, email, sig_digest);
 
       log_assert (c == 0);
 

commit c88efcc2cc7fde25fdba36a349f670f741fd4e9a
Author: Werner Koch <wk at gnupg.org>
Date:   Sun May 1 20:04:39 2016 +0200

    doc: Add a comment about the goals of the agent.
    
    --

diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 5a387d4..d890036 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -54,6 +54,32 @@ The agent is automatically started on demand by @command{gpg},
 Thus there is no reason to start it manually.  In case you want to use
 the included Secure Shell Agent you may start the agent using:
 
+ at c From dkg on gnupg-devel on 2016-04-21:
+ at c
+ at c Here's an attempt at writing a short description of the goals of an
+ at c isolated cryptographic agent:
+ at c
+ at c   A cryptographic agent should control access to secret key material.
+ at c   The agent permits use of the secret key material by a supplicant
+ at c   without providing a copy of the secret key material to the supplicant.
+ at c
+ at c   An isolated cryptographic agent separates the request for use of
+ at c   secret key material from permission for use of secret key material.
+ at c   That is, the system or process requesting use of the key (the
+ at c   "supplicant") can be denied use of the key by the owner/operator of
+ at c   the agent (the "owner"), which the supplicant has no control over.
+ at c
+ at c   One way of enforcing this split is a per-key or per-session
+ at c   passphrase, known only by the owner, which must be supplied to the
+ at c   agent to permit the use of the secret key material.  Another way is
+ at c   with an out-of-band permission mechanism (e.g. a button or GUI
+ at c   interface that the owner has access to, but the supplicant does not).
+ at c
+ at c   The rationale for this separation is that it allows access to the
+ at c   secret key to be tightly controled and audited, and it doesn't permit
+ at c   the the supplicant to either copy the key or to override the owner's
+ at c   intentions.
+
 @example
 gpg-connect-agent /bye
 @end example

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

Summary of changes:
 common/status.h    |   5 +
 doc/gpg-agent.texi |  26 +++++
 g10/tofu.c         | 278 +++++++++++++++++++++++++++++++----------------------
 3 files changed, 195 insertions(+), 114 deletions(-)


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



From cvs at cvs.gnupg.org  Tue May  3 11:27:27 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 03 May 2016 11:27:27 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.11-171-g33aacc3
Message-ID: <E1axWat-0002KQ-UQ@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  33aacc3d4bbd6a82d7e7ceca058970879741b7da (commit)
       via  83865be35cff5355a5c4575cc3b50609819b0baa (commit)
       via  ae1889320b822d48f7118a29391605e9ac992701 (commit)
      from  5cef6118580fe658a27d32e85696d88775ad417a (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 33aacc3d4bbd6a82d7e7ceca058970879741b7da
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 3 11:26:06 2016 +0200

    tests: Silence output of some tests.
    
    * common/t-exechelp.c (print_open_fds): Silence non-verbose output.
    (test_close_all_fds): Ditto.
    * common/t-session-env.c (show_stdnames): Indent output.
    * g10/test.c (TEST): Silence non-verbose okay output.
    (exit_tests): Ditto.
    * tools/gpg-zip.in (tar_verbose_opt): Add option --quiet.
    * tests/openpgp/gpgtar.test (GPGZIP): Pass option --quiet.
    * tests/openpgp/mds.test: Indent MD5 notice.
    * tests/openpgp/version.test: Indent --version output.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/t-exechelp.c b/common/t-exechelp.c
index 19079d3..3a47dc8 100644
--- a/common/t-exechelp.c
+++ b/common/t-exechelp.c
@@ -35,18 +35,18 @@ print_open_fds (int *array)
 {
   int n;
 
+  if (!verbose)
+    return;
+
   for (n=0; array[n] != -1; n++)
     ;
   printf ("open file descriptors: %d", n);
-  if (verbose)
-    {
-      putchar (' ');
-      putchar (' ');
-      putchar ('(');
-      for (n=0; array[n] != -1; n++)
-        printf ("%d%s", array[n], array[n+1] == -1?"":" ");
-      putchar (')');
-    }
+  putchar (' ');
+  putchar (' ');
+  putchar ('(');
+  for (n=0; array[n] != -1; n++)
+    printf ("%d%s", array[n], array[n+1] == -1?"":" ");
+  putchar (')');
   putchar ('\n');
 }
 
@@ -84,7 +84,8 @@ test_close_all_fds (void)
   system (buffer);
 #endif
 
-  printf ("max. file descriptors: %d\n", max_fd);
+  if (verbose)
+    printf ("max. file descriptors: %d\n", max_fd);
   array = xget_all_open_fds ();
   print_open_fds (array);
   for (initial_count=n=0; array[n] != -1; n++)
diff --git a/common/t-session-env.c b/common/t-session-env.c
index 46c6552..c5c7b0e 100644
--- a/common/t-session-env.c
+++ b/common/t-session-env.c
@@ -55,13 +55,24 @@ show_stdnames (void)
 {
   const char *name, *assname;
   int iterator = 0;
+  int count;
 
-  printf ("Known envvars:");
+  printf ("    > Known envvars:");
+  count = 20;
   while ((name = session_env_list_stdenvnames (&iterator, &assname)))
     {
+      if (count > 60)
+        {
+          printf ("\n    >");
+          count = 7;
+        }
       printf ( " %s", name);
+      count += strlen (name) + 1;
       if (assname)
-        printf ( "(%s)", assname);
+        {
+          printf ( "(%s)", assname);
+          count += strlen (assname) + 2;
+        }
     }
   putchar('\n');
 }
diff --git a/g10/test.c b/g10/test.c
index 39d5945..e9e2074 100644
--- a/g10/test.c
+++ b/g10/test.c
@@ -74,10 +74,13 @@ static int verbose;
 						\
     if (test_result == expected_result)		\
       {						\
-        printf (" ok.\n");			\
+        if (verbose) printf (" ok.\n");         \
       }						\
     else					\
       {						\
+        if (!verbose)                           \
+          printf ("%d. Checking %s...",         \
+                  tests, (description) ?: "");  \
 	printf (" failed.\n");			\
 	printf ("  %s == %s failed.\n",		\
 		STRINGIFY(test),		\
@@ -125,7 +128,8 @@ exit_tests (int force)
 {
   if (tests_failed == 0)
     {
-      printf ("All %d tests passed.\n", tests);
+      if (verbose)
+        printf ("All %d tests passed.\n", tests);
       exit (!!force);
     }
   else
diff --git a/tests/openpgp/gpgtar.test b/tests/openpgp/gpgtar.test
index 63bed70..2f33f75 100755
--- a/tests/openpgp/gpgtar.test
+++ b/tests/openpgp/gpgtar.test
@@ -68,7 +68,7 @@ do_test()
         awk '{print $NF}' "$FILELIST" | grep "^${F}$" >/dev/null
     done
 
-    $TOOL --gpg "$GPG"  --gpg-args "$GPGARGS" $EXTRACT_FLAGS \
+    $TOOL --gpg "$GPG"  --gpg-args "$GPGARGS" $EXTRACT_FLAGS --quiet \
           --tar-args --directory="${TESTDIR}" \
           "${TESTDIR}/test.tar.pgp"
     for F in $TESTFILES
diff --git a/tests/openpgp/mds.test b/tests/openpgp/mds.test
index 944f535..bb73312 100755
--- a/tests/openpgp/mds.test
+++ b/tests/openpgp/mds.test
@@ -26,7 +26,7 @@ cat /dev/null | $GPG --with-colons --print-mds >y
 if have_hash_algo "MD5"; then
   test_one ":1:"    "D41D8CD98F00B204E9800998ECF8427E"
 else
-  echo "Hash algorithm MD5 is not installed (not an error)"
+  echo "    > Hash algorithm MD5 is not installed (not an error)"
 fi
 # SHA-1
 test_one ":2:"    "DA39A3EE5E6B4B0D3255BFEF95601890AFD80709"
diff --git a/tests/openpgp/version.test b/tests/openpgp/version.test
index be565fb..9d265ad 100755
--- a/tests/openpgp/version.test
+++ b/tests/openpgp/version.test
@@ -105,6 +105,6 @@ $GPG_PRESET_PASSPHRASE --preset -P abc A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD
 
 
 info "Printing the GPG version"
-$GPG --version
+$GPG --version | awk '{print "    > " $0}'
 
 #fixme: check that the output is as expected
diff --git a/tools/gpg-zip.in b/tools/gpg-zip.in
index a6b4238..48c4766 100644
--- a/tools/gpg-zip.in
+++ b/tools/gpg-zip.in
@@ -34,6 +34,8 @@ Usage: gpg-zip [--help] [--version] [--encrypt] [--decrypt] [--symmetric]
 
 Encrypt or sign files into an archive."
 
+tar_verbose_opt="v"
+
 while test $# -gt 0 ; do
   case $1 in
     -h | --help | --h*)
@@ -113,6 +115,10 @@ while test $# -gt 0 ; do
       shift
       shift
       ;;
+    --quiet)
+      tar_verbose_opt=""
+      shift
+      ;;
     --)
       shift
       break
@@ -135,7 +141,7 @@ elif test x$list = xyes ; then
    cat "$1" | $GPG $gpg_args | $TAR $tar_args -tf -
 elif test x$unpack = xyes ; then
 #   echo "cat \"$1\" | $GPG $gpg_args | $TAR $tar_args -xvf -" 1>&2
-   cat "$1" | $GPG $gpg_args | $TAR $tar_args -xvf -
+   cat "$1" | $GPG $gpg_args | $TAR $tar_args -x${tar_verbose_opt}f -
 else
    echo "$usage" 1>&2
    exit 1

commit 83865be35cff5355a5c4575cc3b50609819b0baa
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 3 10:26:55 2016 +0200

    gpg: Emit status lines TOFU_STATS and TOFU_STATS_LONG.
    
    * g10/tofu.c (NO_WARNING_THRESHOLD): Rename to BASIC_TRUST_THRESHOLD.
    (FULL_TRUST_THRESHOLD): New.
    (write_stats_status): New.
    (show_statistics): Call new function.  Print TOFU_STATS_LONG.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/doc/DETAILS b/doc/DETAILS
index 7d5a5a8..5ceab68 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -668,10 +668,54 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB:
        - shell :: The standard X.509 model.
        - chain :: The chain model.
        - steed :: The STEED model.
+       - tofu  :: The TOFU model
 
     Note that the term =TRUST_= in the status names is used for
     historic reasons; we now speak of validity.
 
+*** TOFU_USER <fingerprint_in_hex> <mbox>
+
+    This status identifies the key and the userid for all following
+    Tofu information.  The fingerprint is the fingerprint of the
+    primary key and the mbox is in general the mailbox part of the
+    userid encoded in UTF-8 and percent escaped.
+
+*** TOFU_STATS <validity> <sign-count> 0 [<policy> [<tm1> <tm2>]]
+
+    Statistics for the current user id.
+
+    Values for VALIDITY are:
+    - 0 :: conflict
+    - 1 :: key without history
+    - 2 :: key with too little history
+    - 3 :: key with enough history for basic trust
+    - 4 :: key with a lot of history
+
+    Values for POLICY are:
+    - none    :: No Policy set
+    - auto    :: Policy is "auto"
+    - good    :: Policy is "good"
+    - bad     :: Policy is "bad"
+    - ask     :: Policy is "ask"
+    - unknown :: Policy is not known.
+
+    TM1 gives the number of seconds since the the first messages was
+    verified.  TM2 gives the number of seconds since the most recent
+    message was verified.
+
+*** TOFU_STATS_SHORT <long_string>
+
+    Information about the TOFU binding for the signature.
+    Example: "15 signatures verified. 10 messages encrypted"
+
+*** TOFU_STATS_LONG <long_string>
+
+    Information about the TOFU binding for the signature in verbose
+    format.  The LONG_STRING is percent escaped.
+    Example: 'Verified 9 messages signed by "Werner Koch
+    (dist sig)" in the past 3 minutes, 40 seconds.  The most
+    recent message was verified 4 seconds ago.'
+
 *** PKA_TRUST_
     This is is one:
 
diff --git a/g10/tofu.c b/g10/tofu.c
index ed8bbbe..5213e03 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -47,8 +47,12 @@
 
 #define CONTROL_L ('L' - 'A' + 1)
 
-/* Number of signed messages required to not show extra warnings.  */
-#define NO_WARNING_THRESHOLD 10
+/* Number of signed messages required to indicate that enough history
+ * is available for basic trust.  */
+#define BASIC_TRUST_THRESHOLD  10
+/* Number of signed messages required to indicate that a lot of
+ * history is available.  */
+#define FULL_TRUST_THRESHOLD  100
 
 
 #define DEBUG_TOFU_CACHE 0
@@ -2365,6 +2369,40 @@ time_ago_str (long long int t)
 }
 
 
+/* Write TOFU_STATS status line.  */
+static void
+write_stats_status (long messages, enum tofu_policy policy,
+                    long first_seen_ago, long most_recent_seen_ago)
+{
+  char numbuf1[35];
+  char numbuf2[35];
+  char numbuf3[35];
+  const char *validity;
+
+  if (messages < 1)
+    validity = "1"; /* Key without history.  */
+  else if (messages < BASIC_TRUST_THRESHOLD)
+    validity = "2"; /* Key with too little history.  */
+  else if (messages < FULL_TRUST_THRESHOLD)
+    validity = "3"; /* Key with enough history for basic trust.  */
+  else
+    validity = "4"; /* Key with a lot of history.  */
+
+  snprintf (numbuf1, sizeof numbuf1, " %ld", messages);
+  *numbuf2 = *numbuf3 = 0;
+  if (first_seen_ago >= 0 && most_recent_seen_ago >= 0)
+    {
+      snprintf (numbuf2, sizeof numbuf2, " %ld", first_seen_ago);
+      snprintf (numbuf3, sizeof numbuf3, " %ld", most_recent_seen_ago);
+    }
+
+  write_status_strings (STATUS_TOFU_STATS,
+                        validity, numbuf1, " 0",
+                        " ", tofu_policy_str (policy),
+                        numbuf2, numbuf3,
+                        NULL);
+}
+
 static void
 show_statistics (struct dbs *dbs, const char *fingerprint,
 		 const char *email, const char *user_id,
@@ -2407,8 +2445,11 @@ show_statistics (struct dbs *dbs, const char *fingerprint,
                                 email, strlen (email), 0);
 
   if (! strlist)
-    log_info (_("Have never verified a message signed by key %s!\n"),
-              fingerprint_pp);
+    {
+      log_info (_("Have never verified a message signed by key %s!\n"),
+                fingerprint_pp);
+      write_stats_status (0,  TOFU_POLICY_NONE, -1, -1);
+    }
   else
     {
       signed long messages;
@@ -2432,15 +2473,21 @@ show_statistics (struct dbs *dbs, const char *fingerprint,
 	}
 
       if (messages == -1 || first_seen_ago == 0)
-        log_info (_("Failed to collect signature statistics for \"%s\"\n"
-                    "(key %s)\n"),
-                  user_id, fingerprint_pp);
+        {
+          write_stats_status (0, TOFU_POLICY_NONE, -1, -1);
+          log_info (_("Failed to collect signature statistics for \"%s\"\n"
+                      "(key %s)\n"),
+                    user_id, fingerprint_pp);
+        }
       else
 	{
 	  enum tofu_policy policy = get_policy (dbs, fingerprint, email, NULL);
 	  estream_t fp;
 	  char *msg;
 
+          write_stats_status (messages, policy,
+                              first_seen_ago, most_recent_seen_ago);
+
 	  fp = es_fopenmem (0, "rw,samethread");
 	  if (! fp)
             log_fatal ("error creating memory stream: %s\n",
@@ -2497,12 +2544,18 @@ show_statistics (struct dbs *dbs, const char *fingerprint,
             for (p=msg; *p; p++)
               if (*p == '~')
                 *p = ' ';
+
+            /* Print a status line but suppress the trailing LF.
+             * Spaces are not percent escaped. */
+            if (*msg)
+              write_status_buffer (STATUS_TOFU_STATS_LONG,
+                                   msg, strlen (msg)-1, -1);
           }
 
 	  log_string (GPGRT_LOG_INFO, msg);
           xfree (msg);
 
-	  if (policy == TOFU_POLICY_AUTO && messages < NO_WARNING_THRESHOLD)
+	  if (policy == TOFU_POLICY_AUTO && messages < BASIC_TRUST_THRESHOLD)
 	    {
 	      char *set_policy_command;
 	      char *text;

commit ae1889320b822d48f7118a29391605e9ac992701
Author: Werner Koch <wk at gnupg.org>
Date:   Mon May 2 19:10:59 2016 +0200

    gpg: Extend TRUST_foo status lines with the trust model.
    
    * g10/trustdb.h (TRUST_FLAG_TOFU_BASED): New.
    * g10/trustdb.c (trust_model_string): Lowercase the strings.  Add arg
    "model" and change callers to call with OPT.TRUST_MODEL.
    * g10/tofu.c (tofu_wot_trust_combine): Set TRUST_FLAG_TOFU_BASED.
    * g10/pkclist.c (write_trust_status): New.
    (check_signatures_trust): Call new function.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/pkclist.c b/g10/pkclist.c
index b659cb8..de8897a 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -505,6 +505,22 @@ do_we_trust_pre( PKT_public_key *pk, unsigned int trustlevel )
 }
 
 
+/* Write a TRUST_foo status line inclduing the validation model.  */
+static void
+write_trust_status (int statuscode, int trustlevel)
+{
+  int tm;
+
+  /* For the combined tofu+pgp method, we return the trust model which
+   * was responsible for the trustlevel.  */
+  if (opt.trust_model == TM_TOFU_PGP)
+    tm = (trustlevel & TRUST_FLAG_TOFU_BASED)? TM_TOFU : TM_PGP;
+  else
+    tm = opt.trust_model;
+  write_status_strings (statuscode, "0 ", trust_model_string (tm), NULL);
+}
+
+
 /****************
  * Check whether we can trust this signature.
  * Returns an error code if we should not trust this signature.
@@ -626,7 +642,7 @@ check_signatures_trust( PKT_signature *sig )
       /* fall thru */
     case TRUST_UNKNOWN:
     case TRUST_UNDEFINED:
-      write_status( STATUS_TRUST_UNDEFINED );
+      write_trust_status (STATUS_TRUST_UNDEFINED, trustlevel);
       log_info(_("WARNING: This key is not certified with"
                  " a trusted signature!\n"));
       log_info(_("         There is no indication that the "
@@ -636,7 +652,7 @@ check_signatures_trust( PKT_signature *sig )
 
     case TRUST_NEVER:
       /* currently we won't get that status */
-      write_status( STATUS_TRUST_NEVER );
+      write_trust_status (STATUS_TRUST_NEVER, trustlevel);
       log_info(_("WARNING: We do NOT trust this key!\n"));
       log_info(_("         The signature is probably a FORGERY.\n"));
       if (opt.with_fingerprint)
@@ -645,7 +661,7 @@ check_signatures_trust( PKT_signature *sig )
       break;
 
     case TRUST_MARGINAL:
-      write_status( STATUS_TRUST_MARGINAL );
+      write_trust_status (STATUS_TRUST_MARGINAL, trustlevel);
       log_info(_("WARNING: This key is not certified with"
                  " sufficiently trusted signatures!\n"));
       log_info(_("         It is not certain that the"
@@ -654,13 +670,13 @@ check_signatures_trust( PKT_signature *sig )
       break;
 
     case TRUST_FULLY:
-      write_status( STATUS_TRUST_FULLY );
+      write_trust_status (STATUS_TRUST_FULLY, trustlevel);
       if (opt.with_fingerprint)
         print_fingerprint (NULL, pk, 1);
       break;
 
     case TRUST_ULTIMATE:
-      write_status( STATUS_TRUST_ULTIMATE );
+      write_trust_status (STATUS_TRUST_ULTIMATE, trustlevel);
       if (opt.with_fingerprint)
         print_fingerprint (NULL, pk, 1);
       break;
diff --git a/g10/tofu.c b/g10/tofu.c
index e163928..ed8bbbe 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -2795,17 +2795,30 @@ tofu_wot_trust_combine (int tofu_base, int wot_base)
 
   /* Now we only have positive or neutral trust policies.  We take
      the max.  */
-  if (tofu == TRUST_ULTIMATE || wot == TRUST_ULTIMATE)
+  if (tofu == TRUST_ULTIMATE)
+    return upper | TRUST_ULTIMATE | TRUST_FLAG_TOFU_BASED;
+  if (wot == TRUST_ULTIMATE)
     return upper | TRUST_ULTIMATE;
-  if (tofu == TRUST_FULLY || wot == TRUST_FULLY)
+
+  if (tofu == TRUST_FULLY)
+    return upper | TRUST_FULLY | TRUST_FLAG_TOFU_BASED;
+  if (wot == TRUST_FULLY)
     return upper | TRUST_FULLY;
-  if (tofu == TRUST_MARGINAL || wot == TRUST_MARGINAL)
+
+  if (tofu == TRUST_MARGINAL)
+    return upper | TRUST_MARGINAL | TRUST_FLAG_TOFU_BASED;
+  if (wot == TRUST_MARGINAL)
     return upper | TRUST_MARGINAL;
-  if (tofu == TRUST_UNDEFINED || wot == TRUST_UNDEFINED)
+
+  if (tofu == TRUST_UNDEFINED)
+    return upper | TRUST_UNDEFINED | TRUST_FLAG_TOFU_BASED;
+  if (wot == TRUST_UNDEFINED)
     return upper | TRUST_UNDEFINED;
+
   return upper | TRUST_UNKNOWN;
 }
 
+
 /* Return the validity (TRUST_NEVER, etc.) of the binding
    <FINGERPRINT, USER_ID>.
 
diff --git a/g10/trustdb.c b/g10/trustdb.c
index 1bdc430..195a006 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -378,16 +378,16 @@ do_sync(void)
       }
 }
 
-static const char *
-trust_model_string(void)
+const char *
+trust_model_string (int model)
 {
-  switch(opt.trust_model)
+  switch (model)
     {
     case TM_CLASSIC:  return "classic";
-    case TM_PGP:      return "PGP";
+    case TM_PGP:      return "pgp";
     case TM_EXTERNAL: return "external";
-    case TM_TOFU:     return "TOFU";
-    case TM_TOFU_PGP: return "TOFU+PGP";
+    case TM_TOFU:     return "tofu";
+    case TM_TOFU_PGP: return "tofu+pgp";
     case TM_ALWAYS:   return "always";
     case TM_DIRECT:   return "direct";
     default:          return "unknown";
@@ -470,7 +470,8 @@ init_trustdb ()
 	}
 
       if(opt.verbose)
-	log_info(_("using %s trust model\n"),trust_model_string());
+	log_info(_("using %s trust model\n"),
+                 trust_model_string (opt.trust_model));
     }
 
   if (opt.trust_model==TM_PGP || opt.trust_model==TM_CLASSIC
@@ -522,7 +523,7 @@ check_trustdb ()
     }
   else
     log_info (_("no need for a trustdb check with '%s' trust model\n"),
-	      trust_model_string());
+	      trust_model_string(opt.trust_model));
 }
 
 
@@ -538,7 +539,7 @@ update_trustdb()
     validate_keys (1);
   else
     log_info (_("no need for a trustdb update with '%s' trust model\n"),
-	      trust_model_string());
+	      trust_model_string(opt.trust_model));
 }
 
 void
@@ -1963,7 +1964,8 @@ validate_keys (int interactive)
 
   if (!opt.quiet)
     log_info ("marginals needed: %d  completes needed: %d  trust model: %s\n",
-              opt.marginals_needed, opt.completes_needed, trust_model_string());
+              opt.marginals_needed, opt.completes_needed,
+              trust_model_string (opt.trust_model));
 
   for (depth=0; depth < opt.max_cert_depth; depth++)
     {
diff --git a/g10/trustdb.h b/g10/trustdb.h
index 718f779..7e1307d 100644
--- a/g10/trustdb.h
+++ b/g10/trustdb.h
@@ -21,7 +21,7 @@
 #ifndef G10_TRUSTDB_H
 #define G10_TRUSTDB_H
 
-/* Trust values must be sorted in ascending order */
+/* Trust values must be sorted in ascending order! */
 #define TRUST_MASK	 15
 #define TRUST_UNKNOWN	  0  /* o: not yet calculated/assigned */
 #define TRUST_EXPIRED	  1  /* e: calculation may be invalid */
@@ -30,11 +30,13 @@
 #define TRUST_MARGINAL	  4  /* m: marginally trusted */
 #define TRUST_FULLY	  5  /* f: fully trusted      */
 #define TRUST_ULTIMATE	  6  /* u: ultimately trusted */
-/* trust values not covered by the mask */
-#define TRUST_FLAG_REVOKED 32 /* r: revoked */
-#define TRUST_FLAG_SUB_REVOKED 64 /* r: revoked but for subkeys */
-#define TRUST_FLAG_DISABLED 128 /* d: key/uid disabled */
+/* Trust values not covered by the mask. */
+#define TRUST_FLAG_REVOKED        32 /* r: revoked */
+#define TRUST_FLAG_SUB_REVOKED    64 /* r: revoked but for subkeys */
+#define TRUST_FLAG_DISABLED      128 /* d: key/uid disabled */
 #define TRUST_FLAG_PENDING_CHECK 256 /* a check-trustdb is pending */
+#define TRUST_FLAG_TOFU_BASED    512 /* The trust value is based on
+                                      * the TOFU information.  */
 
 /* Private value used in tofu.c - must be different from the trust
    values.  */
@@ -117,6 +119,7 @@ void check_trustdb (void);
 void update_trustdb (void);
 int setup_trustdb( int level, const char *dbname );
 void how_to_fix_the_trustdb (void);
+const char *trust_model_string (int model);
 void init_trustdb( void );
 void tdb_check_trustdb_stale (void);
 void sync_trustdb( void );

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

Summary of changes:
 common/t-exechelp.c        | 21 +++++------
 common/t-session-env.c     | 15 ++++++--
 doc/DETAILS                | 44 +++++++++++++++++++++++
 g10/pkclist.c              | 26 +++++++++++---
 g10/test.c                 |  8 +++--
 g10/tofu.c                 | 90 +++++++++++++++++++++++++++++++++++++++-------
 g10/trustdb.c              | 22 ++++++------
 g10/trustdb.h              | 13 ++++---
 tests/openpgp/gpgtar.test  |  2 +-
 tests/openpgp/mds.test     |  2 +-
 tests/openpgp/version.test |  2 +-
 tools/gpg-zip.in           |  8 ++++-
 12 files changed, 203 insertions(+), 50 deletions(-)


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



From cvs at cvs.gnupg.org  Tue May  3 16:08:04 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 03 May 2016 16:08:04 +0200
Subject: [git] KSBA - branch, master, updated. libksba-1.3.3-7-g3f74c2c
Message-ID: <E1axayQ-0002bK-Fr@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  3f74c2cc0068d0b3584627af73c8c42ce720a826 (commit)
       via  6be61daac047d8e6aa941eb103f8e71a1d4e3c75 (commit)
       via  a7eed17a0b2a1c09ef986f3b4b323cd31cea2b64 (commit)
      from  3d968bbffc3a0acda890e342fbbfa5b34a26085e (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 3f74c2cc0068d0b3584627af73c8c42ce720a826
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 3 16:06:52 2016 +0200

    Fix an undefined return value in ksba_cert_get_digest_algo.
    
    * src/cert.c (ksba_cert_get_digest_algo): Set ALGO in the error case.
    * tests/cert-basic.c (one_file): Take care of printf which does not
    handle NULL for %s
    --
    
    GnuPG-bug-id: 2343
    Reported-by: Pascal Cuoq

diff --git a/src/cert.c b/src/cert.c
index f3ff6a1..dc97f83 100644
--- a/src/cert.c
+++ b/src/cert.c
@@ -464,7 +464,10 @@ ksba_cert_get_digest_algo (ksba_cert_t cert)
 
   n = _ksba_asn_find_node (cert->root, "Certificate.signatureAlgorithm");
   if (!n || n->off == -1)
-    err = gpg_error (GPG_ERR_UNKNOWN_ALGORITHM);
+    {
+      algo = NULL;
+      err = gpg_error (GPG_ERR_UNKNOWN_ALGORITHM);
+    }
   else
     err = _ksba_parse_algorithm_identifier (cert->image + n->off,
                                             n->nhdr + n->len, &nread, &algo);
diff --git a/tests/cert-basic.c b/tests/cert-basic.c
index 91b394e..4d460bc 100644
--- a/tests/cert-basic.c
+++ b/tests/cert-basic.c
@@ -448,7 +448,8 @@ one_file (const char *fname)
 
   oid = ksba_cert_get_digest_algo (cert);
   s = get_oid_desc (oid);
-  printf ("  hash algo.: %s%s%s%s\n", oid, s?" (":"",s?s:"",s?")":"");
+  printf ("  hash algo.: %s%s%s%s\n",
+          oid?oid:"(null)", s?" (":"",s?s:"",s?")":"");
 
   /* Under Windows the _ksba_keyinfo_from_sexp are not exported.  */
 #ifndef __WIN32

commit 6be61daac047d8e6aa941eb103f8e71a1d4e3c75
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 3 16:01:09 2016 +0200

    Fix an OOB read access in _ksba_dn_to_str.
    
    * src/dn.c (append_utf8_value): Use a straightforward check to fix an
    off-by-one.
    --
    
    The old fix for the problem from April 2015 had an off-by-one in the
    bad encoding handing.
    
    Fixes-commit: 243d12fdec66a4360fbb3e307a046b39b5b4ffc3
    GnuPG-bug-id: 2344
    Reported-by: Pascal Cuoq
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/dn.c b/src/dn.c
index d207bf0..cea18a1 100644
--- a/src/dn.c
+++ b/src/dn.c
@@ -332,11 +332,8 @@ append_utf8_value (const unsigned char *value, size_t length,
         }
       else
         {
-          if (n+nmore > length)
-            nmore = length - n; /* Oops, encoding to short */
-
           tmp[0] = *s++; n++;
-          for (i=1; i <= nmore; i++)
+          for (i=1; n < length && i <= nmore; i++)
             {
               if ( (*s & 0xc0) != 0x80)
                 break; /* Invalid encoding - let the next cycle detect this. */

commit a7eed17a0b2a1c09ef986f3b4b323cd31cea2b64
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 3 14:10:04 2016 +0200

    Fix possible read access beyond the buffer.
    
    * src/ber-help.c (_ksba_ber_parse_tl): Add extra sanity check.
    * src/cert.c (ksba_cert_get_cert_policies): Check TLV given length
    against buffer length.
    (ksba_cert_get_ext_key_usages): Ditto.
    * src/ocsp.c (parse_asntime_into_isotime): Ditto.
    --
    
    The returned length of the object from _ksba_ber_parse_tl (ti.length)
    was not always checked against the actual buffer length, thus leading
    to a read access after the end of the buffer and thus a segv.
    
    GnuPG-bug-id: 2344
    Reported-by: Pascal Cuoq
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/ber-help.c b/src/ber-help.c
index f6a6692..87109f3 100644
--- a/src/ber-help.c
+++ b/src/ber-help.c
@@ -285,9 +285,15 @@ _ksba_ber_parse_tl (unsigned char const **buffer, size_t *size,
           ti->buf[ti->nhdr++] = c;
           len |= c & 0xff;
         }
+      /* Sanity check for the length: This is done so that we can take
+       * the value for malloc plus some additional bytes without
+       * risking an overflow.  */
+      if (len > (1 << 30))
+        return gpg_error (GPG_ERR_BAD_BER);
       ti->length = len;
     }
 
+
   /* Without this kludge some example certs can't be parsed */
   if (ti->class == CLASS_UNIVERSAL && !ti->tag)
     ti->length = 0;
diff --git a/src/cert.c b/src/cert.c
index 7f19dc1..f3ff6a1 100644
--- a/src/cert.c
+++ b/src/cert.c
@@ -1335,9 +1335,15 @@ ksba_cert_get_cert_policies (ksba_cert_t cert, char **r_policies)
                   err = gpg_error (GPG_ERR_NOT_DER_ENCODED);
                   goto leave;
                 }
+              if (ti.length > derlen)
+                {
+                  err = gpg_error (GPG_ERR_BAD_BER);
+                  goto leave;
+                }
               if (!ti.length)
                 {
-                  err = gpg_error (GPG_ERR_INV_CERT_OBJ); /* no empty inner SEQ */
+                  /* We do not accept an empty inner SEQ */
+                  err = gpg_error (GPG_ERR_INV_CERT_OBJ);
                   goto leave;
                 }
               if (ti.nhdr+ti.length > seqlen)
@@ -1356,6 +1362,11 @@ ksba_cert_get_cert_policies (ksba_cert_t cert, char **r_policies)
                   err = gpg_error (GPG_ERR_INV_CERT_OBJ);
                   goto leave;
                 }
+              if (ti.length > derlen)
+                {
+                  err = gpg_error (GPG_ERR_BAD_BER);
+                  goto leave;
+                }
               if (ti.nhdr+ti.length > seqseqlen)
                 {
                   err = gpg_error (GPG_ERR_BAD_BER);
@@ -1458,6 +1469,16 @@ ksba_cert_get_ext_key_usages (ksba_cert_t cert, char **result)
                   err = gpg_error (GPG_ERR_INV_CERT_OBJ);
                   goto leave;
                 }
+              if (ti.ndef)
+                {
+                  err = gpg_error (GPG_ERR_NOT_DER_ENCODED);
+                  goto leave;
+                }
+              if (ti.length > derlen)
+                {
+                  err = gpg_error (GPG_ERR_BAD_BER);
+                  goto leave;
+                }
 
               suboid = ksba_oid_to_str (der, ti.length);
               if (!suboid)
diff --git a/src/name.c b/src/name.c
index c734199..371fc41 100644
--- a/src/name.c
+++ b/src/name.c
@@ -113,7 +113,7 @@ _ksba_name_new_from_der (ksba_name_t *r_name,
 
   *r_name = NULL;
 
-  /* count and check for encoding errors - we won;t do this again
+  /* Count and check for encoding errors - we won't do this again
      during the second pass */
   der = image;
   derlen = imagelen;
diff --git a/src/ocsp.c b/src/ocsp.c
index 85679bb..c053b18 100644
--- a/src/ocsp.c
+++ b/src/ocsp.c
@@ -231,6 +231,8 @@ parse_asntime_into_isotime (unsigned char const **buf, size_t *len,
               && (ti.tag == TYPE_UTC_TIME || ti.tag == TYPE_GENERALIZED_TIME)
               && !ti.is_constructed) )
     err = gpg_error (GPG_ERR_INV_OBJ);
+  else if (ti.length > *len)
+    err = gpg_error (GPG_ERR_INV_BER);
   else if (!(err = _ksba_asntime_to_iso (*buf, ti.length,
                                          ti.tag == TYPE_UTC_TIME, isotime)))
     parse_skip (buf, len, &ti);

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

Summary of changes:
 src/ber-help.c     |  6 ++++++
 src/cert.c         | 28 ++++++++++++++++++++++++++--
 src/dn.c           |  5 +----
 src/name.c         |  2 +-
 src/ocsp.c         |  2 ++
 tests/cert-basic.c |  3 ++-
 6 files changed, 38 insertions(+), 8 deletions(-)


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  Tue May  3 18:34:23 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 03 May 2016 18:34:23 +0200
Subject: [git] KSBA - branch, master, updated. libksba-1.3.3-11-gba090d9
Message-ID: <E1axdG1-0006S3-KX@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  ba090d96be474658dec13a3e2aa912022a3ef72f (commit)
       via  3a92e8c8939767d19aaa48f051d721d582ab0eff (commit)
       via  8290fabdb260e228c3b89706c88caf90da77358b (commit)
       via  ec820ebbb05cbc0d5ee00f086364ecaf3efa54cb (commit)
      from  3f74c2cc0068d0b3584627af73c8c42ce720a826 (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 ba090d96be474658dec13a3e2aa912022a3ef72f
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 3 18:31:37 2016 +0200

    Post release updates
    
    --

diff --git a/NEWS b/NEWS
index 3b9abb0..9dca760 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 1.3.5 (unreleased) [C19/A11/R_]
+------------------------------------------------
+
+
 Noteworthy changes in version 1.3.4 (2016-05-03) [C19/A11/R4]
 ------------------------------------------------
 
diff --git a/configure.ac b/configure.ac
index 7cdcf19..d678ce4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ min_automake_version="1.14"
 m4_define([mym4_package],[libksba])
 m4_define([mym4_major], [1])
 m4_define([mym4_minor], [3])
-m4_define([mym4_micro], [4])
+m4_define([mym4_micro], [5])
 
 # Below is m4 magic to extract and compute the git revision number,
 # the decimalized short revision number, a beta version string and a

commit 3a92e8c8939767d19aaa48f051d721d582ab0eff
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 3 18:19:48 2016 +0200

    Release 1.3.4.
    
    * configure.ac: Set LT version to C19/A11/R5.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/NEWS b/NEWS
index cc25641..3b9abb0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,15 @@
-Noteworthy changes in version 1.3.4 (unreleased) [C19/A11/R ]
+Noteworthy changes in version 1.3.4 (2016-05-03) [C19/A11/R4]
 ------------------------------------------------
 
+ * Fixed two OOB read access bugs which could be used to force a DoS.
+
+ * Fixed a crash due to faulty curve OID lookup code.
+
+ * Synced the list of supported curves with those of Libgcrypt.
+
+ * New configure option --enable-build-timestamp; a build timestamp is
+   not anymore used by default.
+
 
 Noteworthy changes in version 1.3.3 (2015-04-10) [C19/A11/R4]
 ------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 0ea5225..7cdcf19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,7 @@ AC_INIT([mym4_package],[mym4_version], [http://bugs.gnupg.org])
 # Please remember to document interface changes in the NEWS file.
 LIBKSBA_LT_CURRENT=19
 LIBKSBA_LT_AGE=11
-LIBKSBA_LT_REVISION=4
+LIBKSBA_LT_REVISION=5
 #-------------------
 # If the API is changed in an incompatible way: increment the next counter.
 KSBA_CONFIG_API_VERSION=1

commit 8290fabdb260e228c3b89706c88caf90da77358b
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 3 18:22:19 2016 +0200

    Update config.{guess,sub} to 2016-04-02 and 2016-03-30.
    
    * build-aux/config.guess: Update.
    * build-aux/config.sub: Update.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/build-aux/config.guess b/build-aux/config.guess
index dbfb978..0967f2a 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2015-01-01'
+timestamp='2016-04-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@ timestamp='2015-01-01'
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
 # Please send patches to <config-patches at gnu.org>.
 
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2016 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -168,20 +168,27 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
 	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+	    /sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || \
+	    echo unknown)`
 	case "${UNAME_MACHINE_ARCH}" in
 	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
 	    sh5el) machine=sh5le-unknown ;;
+	    earmv*)
+		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
+		machine=${arch}${endian}-unknown
+		;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
 	# to ELF recently, or will in the future.
 	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+	    arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
@@ -197,6 +204,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		os=netbsd
 		;;
 	esac
+	# Determine ABI tags.
+	case "${UNAME_MACHINE_ARCH}" in
+	    earm*)
+		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+		;;
+	esac
 	# The OS release
 	# Debian GNU/NetBSD machines have a different userland, and
 	# thus, need a distinct triplet. However, they do not need
@@ -207,13 +221,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		release='-gnu'
 		;;
 	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
 		;;
 	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
+	echo "${machine}-${os}${release}${abi}"
 	exit ;;
     *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -223,6 +237,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit ;;
+    *:LibertyBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
@@ -235,6 +253,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
+    *:Sortix:*:*)
+	echo ${UNAME_MACHINE}-unknown-sortix
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -251,42 +272,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
 	case "$ALPHA_CPU_TYPE" in
 	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
+		UNAME_MACHINE=alphaev5 ;;
 	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
+		UNAME_MACHINE=alphaev56 ;;
 	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
+		UNAME_MACHINE=alphapca56 ;;
 	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
+		UNAME_MACHINE=alphapca57 ;;
 	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
+		UNAME_MACHINE=alphaev6 ;;
 	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
+		UNAME_MACHINE=alphaev67 ;;
 	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
+		UNAME_MACHINE=alphaev69 ;;
 	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
+		UNAME_MACHINE=alphaev7 ;;
 	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
+		UNAME_MACHINE=alphaev79 ;;
 	esac
 	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
 	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
 	exitcode=$?
 	trap '' 0
@@ -359,16 +380,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
-	SUN_ARCH="i386"
+	SUN_ARCH=i386
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
-		SUN_ARCH="x86_64"
+		SUN_ARCH=x86_64
 	    fi
 	fi
 	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -393,7 +414,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
 		echo m68k-sun-sunos${UNAME_RELEASE}
@@ -618,13 +639,13 @@ EOF
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
 		      532)                      # CPU_PA_RISC2_0
 			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			  32) HP_ARCH=hppa2.0n ;;
+			  64) HP_ARCH=hppa2.0w ;;
+			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
 			esac ;;
 		    esac
 		fi
@@ -663,11 +684,11 @@ EOF
 		    exit (0);
 		}
 EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
+	if [ ${HP_ARCH} = hppa2.0w ]
 	then
 	    eval $set_cc_for_build
 
@@ -680,12 +701,12 @@ EOF
 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 	    # => hppa64-hp-hpux11.23
 
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
 		grep -q __LP64__
 	    then
-		HP_ARCH="hppa2.0w"
+		HP_ARCH=hppa2.0w
 	    else
-		HP_ARCH="hppa64"
+		HP_ARCH=hppa64
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -790,14 +811,14 @@ EOF
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
 	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
 	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@@ -879,7 +900,7 @@ EOF
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
@@ -902,7 +923,7 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arc:Linux:*:* | arceb:Linux:*:*)
@@ -933,6 +954,9 @@ EOF
     crisv32:Linux:*:*)
 	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
+    e2k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     frv:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
@@ -945,6 +969,9 @@ EOF
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
+    k1om:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
@@ -1021,7 +1048,7 @@ EOF
 	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -1100,7 +1127,7 @@ EOF
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
 	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
+	# prints for the "djgpp" host, or else GDB configure will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
 	exit ;;
@@ -1249,6 +1276,9 @@ EOF
     SX-8R:SUPER-UX:*:*)
 	echo sx8r-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-ACE:SUPER-UX:*:*)
+	echo sxace-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1262,9 +1292,9 @@ EOF
 	    UNAME_PROCESSOR=powerpc
 	fi
 	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		    grep IS_64BIT_ARCH >/dev/null
 		then
 		    case $UNAME_PROCESSOR in
@@ -1286,7 +1316,7 @@ EOF
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
+	if test "$UNAME_PROCESSOR" = x86; then
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
@@ -1317,7 +1347,7 @@ EOF
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	if test "$cputype" = "386"; then
+	if test "$cputype" = 386; then
 	    UNAME_MACHINE=i386
 	else
 	    UNAME_MACHINE="$cputype"
@@ -1359,7 +1389,7 @@ EOF
 	echo i386-pc-xenix
 	exit ;;
     i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
 	exit ;;
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
@@ -1370,6 +1400,9 @@ EOF
     x86_64:VMkernel:*:*)
 	echo ${UNAME_MACHINE}-unknown-esx
 	exit ;;
+    amd64:Isilon\ OneFS:*:*)
+	echo x86_64-unknown-onefs
+	exit ;;
 esac
 
 cat >&2 <<EOF
@@ -1379,9 +1412,9 @@ This script, last modified $timestamp, has failed to recognize
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
diff --git a/build-aux/config.sub b/build-aux/config.sub
index 6d2e94c..8d39c4b 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2015-01-01'
+timestamp='2016-03-30'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ timestamp='2015-01-01'
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -53,8 +53,7 @@ timestamp='2015-01-01'
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
 
 Canonicalize a configuration name.
 
@@ -68,7 +67,7 @@ Report bugs and patches to <config-patches at gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2016 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -117,7 +116,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
@@ -255,11 +254,12 @@ case $basic_machine in
 	| arc | arceb \
 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 	| avr | avr32 \
+	| ba \
 	| be32 | be64 \
 	| bfin \
 	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
+	| e2k | epiphany \
 	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
@@ -305,7 +305,7 @@ case $basic_machine in
 	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -376,12 +376,13 @@ case $basic_machine in
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| ba-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
+	| e2k-* | elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
@@ -428,12 +429,13 @@ case $basic_machine in
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
+	| riscv32-* | riscv64-* \
 	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tile*-* \
@@ -518,6 +520,9 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-aros
 		;;
+	asmjs)
+		basic_machine=asmjs-unknown
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -1373,11 +1378,11 @@ case $os in
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
 	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
+	      | -aos* | -aros* | -cloudabi* | -sortix* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
@@ -1393,7 +1398,8 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+	      | -onefs* | -tirtos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1525,6 +1531,8 @@ case $os in
 		;;
 	-nacl*)
 		;;
+	-ios)
+		;;
 	-none)
 		;;
 	*)

commit ec820ebbb05cbc0d5ee00f086364ecaf3efa54cb
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 3 18:10:34 2016 +0200

    Create an SWDB file during "make distcheck"
    
    * Makefile.am (distcheck-hook): New.
    --
    
    The SWDB file is used to update the swdb.mac file from the
    gnupg-doc repo which is the source for
    https://gnupg.org/swdb.lst
    https://gnupg.org/swdb.lst.sig
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/Makefile.am b/Makefile.am
index 0f492aa..f16e128 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,6 +41,20 @@ SUBDIRS = m4 gl src ${tests} doc
 
 dist-hook: gen-ChangeLog
 
+distcheck-hook:
+	set -e; ( \
+	pref="#+macro: $$(echo $(PACKAGE_NAME)|tr '-' '_')_" ;\
+	reldate="$$(date -u +%Y-%m-%d)" ;\
+        echo "$${pref}ver  $(PACKAGE_VERSION)"  ;\
+        echo "$${pref}date $${reldate}" ;\
+        list='$(DIST_ARCHIVES)'; for i in $$list; do \
+	  case "$$i" in *.tar.bz2) \
+            echo "$${pref}size $$(wc -c <$$i|awk '{print int($$1/1024)}')k" ;\
+	    echo "$${pref}sha1 $$(sha1sum <$$i|cut -d' ' -f1)" ;\
+	    echo "$${pref}sha2 $$(sha256sum <$$i|cut -d' ' -f1)" ;;\
+	  esac;\
+	done ) | tee $(distdir).swdb
+
 
 gen_start_date = 2011-12-01T00:00:00
 .PHONY: gen-ChangeLog

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

Summary of changes:
 Makefile.am            |  14 +++++
 NEWS                   |  15 +++++-
 build-aux/config.guess | 143 ++++++++++++++++++++++++++++++-------------------
 build-aux/config.sub   |  36 ++++++++-----
 configure.ac           |   4 +-
 5 files changed, 140 insertions(+), 72 deletions(-)


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  Tue May  3 18:37:17 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 03 May 2016 18:37:17 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. 5a3aa6fd8951ae82ad9925bd0a1ad0d5763ad727
Message-ID: <E1axdIp-0006Tl-36@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  5a3aa6fd8951ae82ad9925bd0a1ad0d5763ad727 (commit)
      from  51b7dbe7b6f6585ef617c3c61ffa77960ebb49aa (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 5a3aa6fd8951ae82ad9925bd0a1ad0d5763ad727
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 3 18:36:12 2016 +0200

    swdb: Release libksba 1.3.4

diff --git a/web/swdb.mac b/web/swdb.mac
index 2f81afc..1d10a8b 100644
--- a/web/swdb.mac
+++ b/web/swdb.mac
@@ -92,10 +92,11 @@
 #
 # LIBKSBA
 #
-#+macro: libksba_ver  1.3.3
-#+macro: libksba_date 2015-04-10
+#+macro: libksba_ver  1.3.4
+#+macro: libksba_date 2016-05-03
 #+macro: libksba_size 604k
-#+macro: libksba_sha1 86fe0436f3c8c394d32e142ee410a9f9560173fb
+#+macro: libksba_sha1 bc84945400bd1cabfd7b8ba4e20e71082f32bcc9
+#+macro: libksba_sha2 f6c2883cebec5608692d8730843d87f237c0964d923bbe7aa89c05f20558ad4f
 
 
 #

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

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


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



From cvs at cvs.gnupg.org  Tue May  3 18:49:28 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 03 May 2016 18:49:28 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. 32c316720a85742cffe6eb7ddf66213b8a710f7b
Message-ID: <E1axdUc-0006rk-LC@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  32c316720a85742cffe6eb7ddf66213b8a710f7b (commit)
      from  5a3aa6fd8951ae82ad9925bd0a1ad0d5763ad727 (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 32c316720a85742cffe6eb7ddf66213b8a710f7b
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 3 18:43:44 2016 +0200

    web: Typo fix.

diff --git a/web/download/cvs_access.org b/web/download/cvs_access.org
index 62ffe9c..ac2323b 100644
--- a/web/download/cvs_access.org
+++ b/web/download/cvs_access.org
@@ -4,8 +4,8 @@
 
 * GIT Access
 
-  The GnuPG development is tracked using the GIT disributed revision
-  control system.  A Public read-only GIT repository for GnuPG and
+  The GnuPG development is tracked using the GIT distributed revision
+  control system.  A public read-only GIT repository for GnuPG and
   related projects is available.
 
   This service is provided to help you in hunting bugs and not to

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

Summary of changes:
 web/download/cvs_access.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


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



From cvs at cvs.gnupg.org  Wed May  4 12:24:27 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Wed, 04 May 2016 12:24:27 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.11-182-g2b78223
Message-ID: <E1axtxZ-0002Gt-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 "The GNU Privacy Guard".

The branch, master has been updated
       via  2b78223d7587c68e2e27a3d7b365219228da7947 (commit)
       via  5ec76fd0c300b52366cf8d1407fe1c8de3a8a9d4 (commit)
       via  3f58fc64666101e160e9b13fedb6cdaebeb91a7a (commit)
      from  6bbab4d1135bd4b17dbf884c13a0706f57e8ff1e (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 2b78223d7587c68e2e27a3d7b365219228da7947
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed May 4 12:22:38 2016 +0200

    speedo,w32: Install sqlite
    
    * build-aux/speedo/w32/inst.nsi (-sqlite, -un.sqlite): New.

diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi
index d062345..6b4d023 100644
--- a/build-aux/speedo/w32/inst.nsi
+++ b/build-aux/speedo/w32/inst.nsi
@@ -790,6 +790,11 @@ Section "-gpgme" SEC_gpgme
   File include/gpgme.h
 SectionEnd
 
+Section "-sqlite" SEC_sqlite
+  SetOutPath "$INSTDIR\bin"
+  File bin/libsqlite3-0.dll
+SectionEnd
+
 !ifdef WITH_GUI
 Section "-libiconv" SEC_libiconv
   SetOutPath "$INSTDIR\bin"
@@ -1363,6 +1368,10 @@ Section "-un.gnupg"
   RMDir "$INSTDIR\share\locale"
 SectionEnd
 
+Section "-un.sqlite"
+  Delete "$INSTDIR\bin\libsqlite3-0.dll"
+SectionEnd
+
 Section "-un.gnupginst"
   # Delete standard stuff.
   Delete "$INSTDIR\README.txt"

commit 5ec76fd0c300b52366cf8d1407fe1c8de3a8a9d4
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed May 4 12:00:56 2016 +0200

    speedo,w32: Fix uninstallation
    
    * build-aux/speedo/w32/inst.nsi (-un.gnupg): Delete distsigkey and
    dirmngr-conf.skel

diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi
index 1944379..d062345 100644
--- a/build-aux/speedo/w32/inst.nsi
+++ b/build-aux/speedo/w32/inst.nsi
@@ -1271,6 +1271,8 @@ Section "-un.gnupg"
   Delete "$INSTDIR\bin\gpg-connect-agent.exe"
   Delete "$INSTDIR\bin\gpgtar.exe"
 
+  Delete "$INSTDIR\share\gnupg\dirmngr-conf.skel"
+  Delete "$INSTDIR\share\gnupg\distsigkey.gpg"
   Delete "$INSTDIR\share\gnupg\gpg-conf.skel"
   RMDir  "$INSTDIR\share\gnupg"
 

commit 3f58fc64666101e160e9b13fedb6cdaebeb91a7a
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed May 4 11:24:18 2016 +0200

    speedo,w32: Install localisation
    
    * build-aux/speedo/w32/inst.nsi (-libgpg-error, GnuPG): Install l10n.
    (-un.libgpg-error, -un.gnupg): Uninstall l10n files.

diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi
index 3a2d582..1944379 100644
--- a/build-aux/speedo/w32/inst.nsi
+++ b/build-aux/speedo/w32/inst.nsi
@@ -608,6 +608,63 @@ Section "GnuPG" SEC_gnupg
   File "share/gnupg/gpg-conf.skel"
   File "share/gnupg/dirmngr-conf.skel"
   File "share/gnupg/distsigkey.gpg"
+
+  SetOutPath "$INSTDIR\share\locale\ca\LC_MESSAGES"
+  File share/locale/ca/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\cs\LC_MESSAGES"
+  File share/locale/cs/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\da\LC_MESSAGES"
+  File share/locale/da/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
+  File share/locale/de/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\el\LC_MESSAGES"
+  File share/locale/el/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\en at boldquot\LC_MESSAGES"
+  File share/locale/en at boldquot/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\en at quot\LC_MESSAGES"
+  File share/locale/en at quot/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\eo\LC_MESSAGES"
+  File share/locale/eo/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\es\LC_MESSAGES"
+  File share/locale/es/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\et\LC_MESSAGES"
+  File share/locale/et/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\fi\LC_MESSAGES"
+  File share/locale/fi/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\fr\LC_MESSAGES"
+  File share/locale/fr/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\gl\LC_MESSAGES"
+  File share/locale/gl/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\hu\LC_MESSAGES"
+  File share/locale/hu/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\id\LC_MESSAGES"
+  File share/locale/id/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\it\LC_MESSAGES"
+  File share/locale/it/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\ja\LC_MESSAGES"
+  File share/locale/ja/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\nb\LC_MESSAGES"
+  File share/locale/nb/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\pl\LC_MESSAGES"
+  File share/locale/pl/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\pt\LC_MESSAGES"
+  File share/locale/pt/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\ro\LC_MESSAGES"
+  File share/locale/ro/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\ru\LC_MESSAGES"
+  File share/locale/ru/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\sk\LC_MESSAGES"
+  File share/locale/sk/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\sv\LC_MESSAGES"
+  File share/locale/sv/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\tr\LC_MESSAGES"
+  File share/locale/tr/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\uk\LC_MESSAGES"
+  File share/locale/uk/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\zh_CN\LC_MESSAGES"
+  File share/locale/zh_CN/LC_MESSAGES/gnupg2.mo
+  SetOutPath "$INSTDIR\share\locale\zh_TW\LC_MESSAGES"
+  File share/locale/zh_TW/LC_MESSAGES/gnupg2.mo
 SectionEnd
 
 
@@ -631,6 +688,44 @@ Section "-libgpg-error" SEC_libgpg_error
   File /oname=libgpg-error.imp lib/libgpg-error.dll.a
   SetOutPath "$INSTDIR\include"
   File include/gpg-error.h
+  SetOutPath "$INSTDIR\share\locale\cs\LC_MESSAGES"
+  File share/locale/cs/LC_MESSAGES/libgpg-error.mo
+  SetOutPath "$INSTDIR\share\locale\da\LC_MESSAGES"
+  File share/locale/da/LC_MESSAGES/libgpg-error.mo
+  SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
+  File share/locale/de/LC_MESSAGES/libgpg-error.mo
+  SetOutPath "$INSTDIR\share\locale\eo\LC_MESSAGES"
+  File share/locale/eo/LC_MESSAGES/libgpg-error.mo
+  SetOutPath "$INSTDIR\share\locale\fr\LC_MESSAGES"
+  File share/locale/fr/LC_MESSAGES/libgpg-error.mo
+  SetOutPath "$INSTDIR\share\locale\hu\LC_MESSAGES"
+  File share/locale/hu/LC_MESSAGES/libgpg-error.mo
+  SetOutPath "$INSTDIR\share\locale\it\LC_MESSAGES"
+  File share/locale/it/LC_MESSAGES/libgpg-error.mo
+  SetOutPath "$INSTDIR\share\locale\ja\LC_MESSAGES"
+  File share/locale/ja/LC_MESSAGES/libgpg-error.mo
+  SetOutPath "$INSTDIR\share\locale\nl\LC_MESSAGES"
+  File share/locale/nl/LC_MESSAGES/libgpg-error.mo
+  SetOutPath "$INSTDIR\share\locale\pl\LC_MESSAGES"
+  File share/locale/pl/LC_MESSAGES/libgpg-error.mo
+  SetOutPath "$INSTDIR\share\locale\pt\LC_MESSAGES"
+  File share/locale/pt/LC_MESSAGES/libgpg-error.mo
+  SetOutPath "$INSTDIR\share\locale\ro\LC_MESSAGES"
+  File share/locale/ro/LC_MESSAGES/libgpg-error.mo
+  SetOutPath "$INSTDIR\share\locale\ru\LC_MESSAGES"
+  File share/locale/ru/LC_MESSAGES/libgpg-error.mo
+  SetOutPath "$INSTDIR\share\locale\sr\LC_MESSAGES"
+  File share/locale/sr/LC_MESSAGES/libgpg-error.mo
+  SetOutPath "$INSTDIR\share\locale\sv\LC_MESSAGES"
+  File share/locale/sv/LC_MESSAGES/libgpg-error.mo
+  SetOutPath "$INSTDIR\share\locale\uk\LC_MESSAGES"
+  File share/locale/uk/LC_MESSAGES/libgpg-error.mo
+  SetOutPath "$INSTDIR\share\locale\vi\LC_MESSAGES"
+  File share/locale/vi/LC_MESSAGES/libgpg-error.mo
+  SetOutPath "$INSTDIR\share\locale\zh_CN\LC_MESSAGES"
+  File share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo
+  SetOutPath "$INSTDIR\share\locale\zh_TW\LC_MESSAGES"
+  File share/locale/zh_TW/LC_MESSAGES/libgpg-error.mo
 SectionEnd
 
 Section "-zlib" SEC_zlib
@@ -1105,6 +1200,64 @@ Section "-un.libgpg-error"
   Delete "$INSTDIR\bin\libgpg-error-0.dll"
   Delete "$INSTDIR\lib\libgpg-error.imp"
   Delete "$INSTDIR\include\gpg-error.h"
+  Delete "$INSTDIR\share\locale\cs\LC_MESSAGES\libgpg-error.mo"
+  RMDir "$INSTDIR\share\locale\cs\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\cs"
+  Delete "$INSTDIR\share\locale\da\LC_MESSAGES\libgpg-error.mo"
+  RMDir "$INSTDIR\share\locale\da\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\da"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libgpg-error.mo"
+  RMDir "$INSTDIR\share\locale\de\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\de"
+  Delete "$INSTDIR\share\locale\eo\LC_MESSAGES\libgpg-error.mo"
+  RMDir "$INSTDIR\share\locale\eo\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\eo"
+  Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\libgpg-error.mo"
+  RMDir "$INSTDIR\share\locale\fr\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\fr"
+  Delete "$INSTDIR\share\locale\hu\LC_MESSAGES\libgpg-error.mo"
+  RMDir "$INSTDIR\share\locale\hu\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\hu"
+  Delete "$INSTDIR\share\locale\it\LC_MESSAGES\libgpg-error.mo"
+  RMDir "$INSTDIR\share\locale\it\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\it"
+  Delete "$INSTDIR\share\locale\ja\LC_MESSAGES\libgpg-error.mo"
+  RMDir "$INSTDIR\share\locale\ja\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ja"
+  Delete "$INSTDIR\share\locale\nl\LC_MESSAGES\libgpg-error.mo"
+  RMDir "$INSTDIR\share\locale\nl\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\nl"
+  Delete "$INSTDIR\share\locale\pl\LC_MESSAGES\libgpg-error.mo"
+  RMDir "$INSTDIR\share\locale\pl\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\pl"
+  Delete "$INSTDIR\share\locale\pt\LC_MESSAGES\libgpg-error.mo"
+  RMDir "$INSTDIR\share\locale\pt\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\pt"
+  Delete "$INSTDIR\share\locale\ro\LC_MESSAGES\libgpg-error.mo"
+  RMDir "$INSTDIR\share\locale\ro\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ro"
+  Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\libgpg-error.mo"
+  RMDir "$INSTDIR\share\locale\ru\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ru"
+  Delete "$INSTDIR\share\locale\sr\LC_MESSAGES\libgpg-error.mo"
+  RMDir "$INSTDIR\share\locale\sr\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\sr"
+  Delete "$INSTDIR\share\locale\sv\LC_MESSAGES\libgpg-error.mo"
+  RMDir "$INSTDIR\share\locale\sv\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\sv"
+  Delete "$INSTDIR\share\locale\uk\LC_MESSAGES\libgpg-error.mo"
+  RMDir "$INSTDIR\share\locale\uk\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\uk"
+  Delete "$INSTDIR\share\locale\vi\LC_MESSAGES\libgpg-error.mo"
+  RMDir "$INSTDIR\share\locale\vi\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\vi"
+  Delete "$INSTDIR\share\locale\zh_CN\LC_MESSAGES\libgpg-error.mo"
+  RMDir "$INSTDIR\share\locale\zh_CN\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\zh_CN"
+  Delete "$INSTDIR\share\locale\zh_TW\LC_MESSAGES\libgpg-error.mo"
+  RMDir "$INSTDIR\share\locale\zh_TW\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\zh_TW"
+  RMDir "$INSTDIR\share\locale"
 SectionEnd
 
 Section "-un.gnupg"
@@ -1120,6 +1273,92 @@ Section "-un.gnupg"
 
   Delete "$INSTDIR\share\gnupg\gpg-conf.skel"
   RMDir  "$INSTDIR\share\gnupg"
+
+  Delete "$INSTDIR\share\locale\ca\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\ca\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ca"
+  Delete "$INSTDIR\share\locale\cs\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\cs\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\cs"
+  Delete "$INSTDIR\share\locale\da\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\da\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\da"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\de\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\de"
+  Delete "$INSTDIR\share\locale\el\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\el\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\el"
+  Delete "$INSTDIR\share\locale\en at boldquot\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\en at boldquot\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\en at boldquot"
+  Delete "$INSTDIR\share\locale\en at quot\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\en at quot\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\en at quot"
+  Delete "$INSTDIR\share\locale\eo\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\eo\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\eo"
+  Delete "$INSTDIR\share\locale\es\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\es\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\es"
+  Delete "$INSTDIR\share\locale\et\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\et\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\et"
+  Delete "$INSTDIR\share\locale\fi\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\fi\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\fi"
+  Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\fr\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\fr"
+  Delete "$INSTDIR\share\locale\gl\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\gl\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\gl"
+  Delete "$INSTDIR\share\locale\hu\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\hu\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\hu"
+  Delete "$INSTDIR\share\locale\id\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\id\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\id"
+  Delete "$INSTDIR\share\locale\it\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\it\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\it"
+  Delete "$INSTDIR\share\locale\ja\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\ja\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ja"
+  Delete "$INSTDIR\share\locale\nb\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\nb\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\nb"
+  Delete "$INSTDIR\share\locale\pl\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\pl\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\pl"
+  Delete "$INSTDIR\share\locale\pt\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\pt\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\pt"
+  Delete "$INSTDIR\share\locale\ro\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\ro\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ro"
+  Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\ru\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ru"
+  Delete "$INSTDIR\share\locale\sk\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\sk\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\sk"
+  Delete "$INSTDIR\share\locale\sv\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\sv\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\sv"
+  Delete "$INSTDIR\share\locale\tr\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\tr\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\tr"
+  Delete "$INSTDIR\share\locale\uk\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\uk\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\uk"
+  Delete "$INSTDIR\share\locale\zh_CN\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\zh_CN\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\zh_CN"
+  Delete "$INSTDIR\share\locale\zh_TW\LC_MESSAGES\gnupg2.mo"
+  RMDir "$INSTDIR\share\locale\zh_TW\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\zh_TW"
+  RMDir "$INSTDIR\share\locale"
 SectionEnd
 
 Section "-un.gnupginst"

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

Summary of changes:
 build-aux/speedo/w32/inst.nsi | 250 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 250 insertions(+)


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



From cvs at cvs.gnupg.org  Wed May  4 15:09:31 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 04 May 2016 15:09:31 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.11-186-gfb1e9df
Message-ID: <E1axwXK-00076p-1r@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  fb1e9df48465c2f77a65dddd257572fdc79d9450 (commit)
       via  920b1421b35d1404b8360bd8feac0be659840543 (commit)
       via  edce430b039b313cc2d79402a7bd21347490c3be (commit)
       via  9ea258fa5b45bb5454ee3f5906df5d5eebdec0dd (commit)
      from  2b78223d7587c68e2e27a3d7b365219228da7947 (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 fb1e9df48465c2f77a65dddd257572fdc79d9450
Author: Werner Koch <wk at gnupg.org>
Date:   Wed May 4 15:08:17 2016 +0200

    speedo,w32: Remove the installation directory page.
    
    * build-aux/speedo/w32/inst.nsi (MUI_PAGE_DIRECTORY): Remove.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi
index 6b4d023..2c671c2 100644
--- a/build-aux/speedo/w32/inst.nsi
+++ b/build-aux/speedo/w32/inst.nsi
@@ -156,10 +156,10 @@ VIAddVersionKey "FileVersion" "${PROD_VERSION}"
 !insertmacro MUI_PAGE_LICENSE "${TOP_SRCDIR}/COPYING"
 
 !define MUI_PAGE_CUSTOMFUNCTION_SHOW PrintNonAdminWarning
+!define MUI_PAGE_CUSTOMFUNCTION_LEAVE CheckExistingVersion
 !insertmacro MUI_PAGE_COMPONENTS
 
-!define MUI_PAGE_CUSTOMFUNCTION_LEAVE CheckExistingVersion
-!insertmacro MUI_PAGE_DIRECTORY
+# We don't have MUI_PAGE_DIRECTORY
 
 !ifdef HAVE_STARTMENU
 
@@ -260,11 +260,11 @@ LangString T_RunKeyManager ${LANG_GERMAN} \
    "Die Schl?sselverwaltung aufrufen"
 
 LangString T_MoreInfo ${LANG_ENGLISH} \
-   "Click here for GnuPG's website"
+   "Click here to see how to help the GnuPG Project"
 LangString T_MoreInfo ${LANG_GERMAN} \
-   "Hier klicken um zur GnuPG Homepage zu gelangen"
-LangString T_MoreInfoURL ${LANG_ENGLISH} "https://gnupg.org"
-LangString T_MoreInfoURL ${LANG_GERMAN}  "https://gnupg.org"
+   "Hier klicken um dem GnuPG Projekt zu zu helfen"
+LangString T_MoreInfoURL ${LANG_ENGLISH} "https://gnupg.org/donate"
+LangString T_MoreInfoURL ${LANG_GERMAN}  "https://gnupg.org/donate"
 
 LangString T_ShowReadme ${LANG_ENGLISH} \
    "Show the README file"
@@ -319,8 +319,8 @@ FunctionEnd
 
 
 # Check whether GnuPG has already been installed.  This is called as
-# a leave function from the directory page.  A call to abort will get
-# back to the directory selection.
+# a leave function from the components page.  A call to abort will get
+# back to the components selection.
 Function CheckExistingVersion
   ClearErrors
   FileOpen $0 "$INSTDIR\VERSION" r

commit 920b1421b35d1404b8360bd8feac0be659840543
Author: Werner Koch <wk at gnupg.org>
Date:   Wed May 4 14:40:16 2016 +0200

    gpg: Fix const char pointer mismatch with gettext.
    
    * g10/tofu.c (get_trust): Use const char *.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/tofu.c b/g10/tofu.c
index 5213e03..e591aa5 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -2101,7 +2101,8 @@ get_trust (struct dbs *dbs, const char *fingerprint, const char *email,
 	/* TRANSLATORS: Please translate the text found in the source
 	   file below.  We don't directly internationalize that text
 	   so that we can tweak it without breaking translations.  */
-	char *text = _("TOFU detected a binding conflict");
+	const char *text = _("TOFU detected a binding conflict");
+        char *textbuf;
 	if (strcmp (text, "TOFU detected a binding conflict") == 0)
 	  /* No translation.  Use the English text.  */
 	  text =
@@ -2111,9 +2112,9 @@ get_trust (struct dbs *dbs, const char *fingerprint, const char *email,
 	    "Alternatively, a new key may indicate a man-in-the-middle "
 	    "attack!  Before accepting this key, you should talk to or "
 	    "call the person to make sure this new key is legitimate.";
-        text = format_text (text, 0, 72, 80);
+        textbuf = format_text (text, 0, 72, 80);
 	es_fprintf (fp, "\n%s\n", text);
-        xfree (text);
+        xfree (textbuf);
       }
 
     es_fputc ('\n', fp);

commit edce430b039b313cc2d79402a7bd21347490c3be
Author: Werner Koch <wk at gnupg.org>
Date:   Wed May 4 14:39:20 2016 +0200

    speedo: Build sqlite with static-libgcc.
    
    * build-aux/speedo/patches/sqlite.patch: New.
    * Makefile.am (EXTRA_DIST): Add file.
    --
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/Makefile.am b/Makefile.am
index 5527e24..bf12302 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,8 @@ EXTRA_DIST = build-aux/config.rpath build-aux/potomo autogen.sh autogen.rc \
              build-aux/speedo/w32/gnupg-logo-164x314.bmp    \
              build-aux/speedo/patches/atk-1.32.0.patch	    \
              build-aux/speedo/patches/libiconv-1.14.patch   \
-             build-aux/speedo/patches/pango-1.29.4.patch
+             build-aux/speedo/patches/pango-1.29.4.patch    \
+             build-aux/speedo/patches/sqlite.patch
 
 
 DISTCLEANFILES = g10defs.h
diff --git a/build-aux/speedo/patches/sqlite.patch b/build-aux/speedo/patches/sqlite.patch
new file mode 100755
index 0000000..f81a414
--- /dev/null
+++ b/build-aux/speedo/patches/sqlite.patch
@@ -0,0 +1,42 @@
+#! /bin/sh
+grep static-libgcc Makefile.am >/dev/null && exit 0
+patch -p0 -l -f $* < $0
+exit $?
+
+Use -static-libgcc to avoid linking to libgcc_s_sjlj-1.dll.
+
+Since gcc 4.8 there is a regression in that plain C programs may link
+to libgcc_s.a which has a dependency on libgcc_s_sjlj.dll.  This is
+for example triggered by using long long arithmetic on a 32 bit
+Windows (e.g symbol __udivdi3).
+
+As usual the gcc maintainers don't care about backward compatibility
+and declare that as some kind of compatibility fix and not as
+regression from 4.7 and all earlier versions.
+
+Note that we ignore this patch if it seems to be already applied
+upstream.
+
+--- Makefile.am~	2016-04-18 20:56:32.000000000 +0200
++++ Makefile.am	2016-05-04 12:08:53.254035717 +0200
+@@ -3,7 +3,7 @@
+
+ lib_LTLIBRARIES = libsqlite3.la
+ libsqlite3_la_SOURCES = sqlite3.c
+-libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
++libsqlite3_la_LDFLAGS = -XCClinker -static-libgcc -no-undefined -version-info 8:6:8
+
+ bin_PROGRAMS = sqlite3
+ sqlite3_SOURCES = shell.c sqlite3.h
+
+--- Makefile.in~	2016-04-18 20:56:36.000000000 +0200
++++ Makefile.in	2016-05-04 12:13:36.570020590 +0200
+@@ -365,7 +365,7 @@
+ AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ @JSON1_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE
+ lib_LTLIBRARIES = libsqlite3.la
+ libsqlite3_la_SOURCES = sqlite3.c
+-libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
++libsqlite3_la_LDFLAGS = -XCClinker -static-libgcc -no-undefined -version-info 8:6:8
+ sqlite3_SOURCES = shell.c sqlite3.h
+ EXTRA_sqlite3_SOURCES = sqlite3.c
+ sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@

commit 9ea258fa5b45bb5454ee3f5906df5d5eebdec0dd
Author: Werner Koch <wk at gnupg.org>
Date:   Wed May 4 14:31:46 2016 +0200

    speedo: Also try patch files w/o version number.
    
    * build-aux/speedo.mk (SPKG_template): Try such a patch file.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index 2812773..d286655 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -866,9 +866,13 @@ $(stampdir)/stamp-$(1)-00-unpack: $(stampdir)/stamp-directories
                  | sed -e 's,\.tar.*$$$$,,'`;		\
 	   mv $$$${base} $(1);				\
 	   patch="$(patdir)/$(1)-$$$${base#$(1)-}.patch";\
+	   patchx="$(patdir)/$(1).patch";               \
 	   if [ -x "$$$${patch}" ]; then  		\
              echo "speedo: applying patch $$$${patch}"; \
              cd $(1); "$$$${patch}"; 	 		\
+	   elif [ -x "$$$${patchx}" ]; then  		\
+             echo "speedo: applying patch $$$${patchx}";\
+             cd $(1); "$$$${patchx}"; 	 		\
 	   elif [ -f "$$$${patch}" ]; then  		\
              echo "speedo: warning: $$$${patch} is not executable"; \
 	   fi;						\

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

Summary of changes:
 Makefile.am                           |  3 ++-
 build-aux/speedo.mk                   |  4 ++++
 build-aux/speedo/patches/sqlite.patch | 42 +++++++++++++++++++++++++++++++++++
 build-aux/speedo/w32/inst.nsi         | 16 ++++++-------
 g10/tofu.c                            |  7 +++---
 5 files changed, 60 insertions(+), 12 deletions(-)
 create mode 100755 build-aux/speedo/patches/sqlite.patch


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



From cvs at cvs.gnupg.org  Wed May  4 16:50:11 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 04 May 2016 16:50:11 +0200
Subject: [git] GnuPG - branch, STABLE-BRANCH-2-2,
 updated. gnupg-2.1.11-188-gc3db6f5
Message-ID: <E1axy6i-0002Ui-Rn@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, STABLE-BRANCH-2-2 has been updated
       via  c3db6f58f7b0f02e10c3bf9fb53333026909b08f (commit)
       via  00df5b1236cac5c7a48638a4613278c5aab486f8 (commit)
       via  fb1e9df48465c2f77a65dddd257572fdc79d9450 (commit)
       via  920b1421b35d1404b8360bd8feac0be659840543 (commit)
       via  edce430b039b313cc2d79402a7bd21347490c3be (commit)
       via  9ea258fa5b45bb5454ee3f5906df5d5eebdec0dd (commit)
       via  2b78223d7587c68e2e27a3d7b365219228da7947 (commit)
       via  5ec76fd0c300b52366cf8d1407fe1c8de3a8a9d4 (commit)
       via  3f58fc64666101e160e9b13fedb6cdaebeb91a7a (commit)
       via  6bbab4d1135bd4b17dbf884c13a0706f57e8ff1e (commit)
       via  d696eb396a9c88319358da4333feb653994d5408 (commit)
       via  4fd13ab78dd228d8ff85659cddc2076af8728ebe (commit)
       via  75f31cdd42eed3555952ac478055d52af841f702 (commit)
       via  d00625dae60f26617d2e1bd4f22c6b35a4e92c91 (commit)
       via  04cc7c3786d91881f83a72799dab058476602a31 (commit)
       via  3ef0938cfd8637e9801369f142eb8dd564f2ca61 (commit)
       via  9e28617e260261de3972c20698b5a01561330e1c (commit)
       via  33aacc3d4bbd6a82d7e7ceca058970879741b7da (commit)
       via  83865be35cff5355a5c4575cc3b50609819b0baa (commit)
       via  ae1889320b822d48f7118a29391605e9ac992701 (commit)
       via  5cef6118580fe658a27d32e85696d88775ad417a (commit)
       via  d73e83c3b678add11a5754e199e528aeb39ec8ce (commit)
       via  c88efcc2cc7fde25fdba36a349f670f741fd4e9a (commit)
       via  6677d8b61446eb5760a30a2488c992d6e895a9ed (commit)
       via  35f4b6aafdf1889ed1ae569af5852f47738fe993 (commit)
       via  dcad99c98616a6031ddfde313c920339e4012378 (commit)
       via  300b227cf457deb918f25bcece0d734b61ae1348 (commit)
       via  64bfeafa52a5ed3fa82bdc0ce7ef0edddeef188c (commit)
       via  9740dff9f4d18ba764dc7173d4902e94e3f0c2e8 (commit)
       via  cb4fee8bb645745ff199f7428e19226d5bc63dab (commit)
       via  508b0deb70d39d388149be9a63fab24cc956a239 (commit)
       via  87de9e19edf0311ca0342e15ef44ebe40e32861e (commit)
       via  c83c6f212e9bc98a9ea8dd8102bc16edd1a03050 (commit)
       via  c3aeda82b8d00b87a5af72b4075c487c10dfdf6b (commit)
       via  fd765df6a7883c3d841abeb657330a1aab4b7756 (commit)
       via  07dbd061bd6c1f131f1d609b412675a128c5fe99 (commit)
       via  b7fa4960c292ef1a290d32b7f46bb741bbfc0923 (commit)
       via  2502a76d8edbca035fd2a1879f2132c36b51e2c1 (commit)
       via  8776abbe02935e720018f3ef6ffd48f21435ff8b (commit)
       via  b8cb0973bcbe201a1e32a326dd97c3e72778b9d8 (commit)
       via  12af2630cf4d1a39179179925fac8f2cce7504ff (commit)
       via  c6d1f2f08c68efe7e80887219064a8ce6365128f (commit)
       via  95303ee11df12f284e98d02dba993eda9e425383 (commit)
       via  342cc488890241b41e49f50886617115342721d6 (commit)
       via  0c35e09278514f1e3377a4b0a9b1f44dd39b1bf4 (commit)
       via  d81de224ecd542922dda649a492dd9550509d7bc (commit)
       via  bd4d65615b3a5360d455b99e77bd113ad90f1539 (commit)
       via  f8adf1a3234655877a4f985d627d98567507002c (commit)
       via  defbc70b4a16264e067daf76678ecfb9d030dee4 (commit)
       via  2385b9f1ddc4938e45c01a12a804f4b77d253305 (commit)
       via  d02de6c0a4a55a2720cfa5caddcbfc4ce988a2ec (commit)
       via  085b19fc9aa7f2f9b82a97824b117e71390964ec (commit)
       via  6272f24312f2efe8707a7712858c85cd5a42e6fa (commit)
       via  a0642856b25622c81d3464979c47ff2a30af58fa (commit)
       via  d1507b4f95eb7bb2478f7549510ddcb114e6f285 (commit)
       via  8c3fb2360f154a971d2a390e4937acb22a44a8c2 (commit)
       via  6df75ec70afeb1a5ad9a00557e1245e1514c37b5 (commit)
       via  94504b3d5af126abb591dedda1ca0f0970822f55 (commit)
       via  4159567f7ed7a1139fdc3a6c92988e1648ad84ab (commit)
       via  100b413d7f69f6f091fd98185df4d579ce6ce0ce (commit)
       via  7faf131c8b8710419df3dc13a1228d1977c55f53 (commit)
       via  22b869adca877ff0826707109e7f7b391eb44441 (commit)
       via  02cf1357dd5ee34a57371f55b9d312b8b9e3a7e8 (commit)
       via  71040f48ef6bf88e88cb05c2aee8a77d682b2a33 (commit)
       via  02ef6bb105bb2793115ea5e7868d722bf0aea0a1 (commit)
       via  76ca869197e304daa5a8dd96ea43113ec7b28354 (commit)
       via  9354293b8c9f234939bc04182f15e2fe512e914e (commit)
       via  f45ed07a0fffa3adbc75b9d5726108a066927599 (commit)
       via  4dc4fb1c14b3096bb1cdc5923c0d1eb419036805 (commit)
       via  4b5341dc333983a15f649601fdddc42ba9161433 (commit)
       via  7b58a1118d98543ed6854447d7b403877638ba54 (commit)
       via  96bcd4220f1f1313afe12097d8dc62342ac8de0d (commit)
       via  c6ed863491ec3a1e0fcf9cbe2c93c87468306c29 (commit)
       via  abb352de51bc964c06007fce43ed6f6caea87c15 (commit)
       via  dd5902cc45bae7582f8a0bc91a0a7f4d8ae45d8c (commit)
       via  42d4c2762f7ae5b009b62963e6595bdec9df6859 (commit)
       via  6060ea898fda499211c9d5030fff41d58f899fb0 (commit)
       via  b74185b6eaeaae4754726ff203e11977777f568c (commit)
       via  e7171f559590422cc52dbcb8d78d94569b31012f (commit)
       via  8be9dab2dd2f83ca922c01542c63b404e34bdfd9 (commit)
       via  e2c5781788f765815532410a77077ddbb72513e9 (commit)
       via  fc30c079a348436868968850dabf653b91f82419 (commit)
       via  7f919063d3e426104fe58ae779a9a066140014c1 (commit)
       via  af9a4afbf0b518c8acff98e50135b2beb6c722c3 (commit)
       via  1aad5c6277ea3852ff57bbf680f61c9136ce4d5c (commit)
       via  1dc7f55a4095ee42ce2d8c3eb41b7162edf2ca2e (commit)
       via  8588c2dbc4c4d1b53796f3dbe8489b932dca7a60 (commit)
       via  b752d2c93778e6a1c1de3eddf8fc725b0ddd354e (commit)
       via  60b34f96f4f390670462d719c0d797e622cee4d4 (commit)
       via  834b84c0ee4990393daa5e44afbab5b0aaed0758 (commit)
       via  4f578cb2fc192f44070bb0d18dffaa3863ed0d92 (commit)
       via  b17577eac6b7599a4bab6fd3ecb04715aa01367c (commit)
       via  eea139c56ef55081d8cd8df2a35ce507386e0f17 (commit)
       via  53ed98eda77ff2dcf390cebd0cec9f2665661863 (commit)
       via  a68ca5a90457ac97eee4efd7fdea596d27c54697 (commit)
       via  7a32f87cccddb40521bfdd4eb2d0dc9c88fb3fe5 (commit)
       via  e997552161b2dd8aabf350adee14e208e1545aef (commit)
       via  1e4b7823008daea1a22a6f0f9b379fdec37a4cd4 (commit)
       via  40f6529ceeea806fc011135a9fa3a3590a9534ac (commit)
       via  8daf9a027f5b9ef31f9bf8a39a9a91739246e493 (commit)
       via  9f0ba5089e664447c36cee3d9249f95e4ea39957 (commit)
       via  a883d4c0f8125e809c144ec69e76c9f522102d8f (commit)
       via  d040628ddf2c09ddc9581ff365680a568ad24278 (commit)
       via  605276ef8cd449bfd574ae6c498fa5d7d265c5c7 (commit)
       via  24e0f1d56e6f56e7fb52b5c6bdb100131e12dfe3 (commit)
       via  1463f9b9624fae97cc89df3aa4546655ee893f7c (commit)
       via  7eac4942b537c4b3710d34e6adb9c5d36338f38b (commit)
       via  2fdb950471bd36f046672254ff26ca94797cc9f1 (commit)
       via  1a624586149f9e34206e5d5e1ba0b7d2b7004c80 (commit)
       via  fd2d00ccf558b1ac1184967d8702ef01cd60bf60 (commit)
       via  1cdb744d91ab33563fc0b3156fb05694caa55278 (commit)
       via  50995d26083576ebee064136c13a4ee74cbadca7 (commit)
       via  e77c85577d1bdd77ad3b81907145fd68f2653c01 (commit)
       via  9a1778abcae0a7afe33be8e02b6d9a909463cd54 (commit)
       via  3a1d142f9b71721a631cf2037665e9def60aa384 (commit)
       via  2de0d41219a522e01f050d475b3ddecb9173fc7d (commit)
       via  87515e39295e4b7eaec1641c38e1ac32e8d39a91 (commit)
       via  960f5e26f2cda3ac6e6b30548fa808a690c39ffc (commit)
       via  105a5629c7e938ec7b3c9c338ebe7bdfee4cfdad (commit)
       via  b7b4a1bdd9da28827980c64c623bcb0654736828 (commit)
       via  c9636a1acc952eb8e1355089bc2e229dece98165 (commit)
       via  512bc72e1f8544341529174142273d857f45540c (commit)
       via  75861b663bbb37214143c2ff7b1b4d1d10ba2657 (commit)
       via  14d27b2cadf9b0bb413f2b8bad2d81c1d370c2e7 (commit)
       via  f57a91afb69c58f9d8d9632801650f28c7dc1e0d (commit)
       via  33ac735a781325c4d47cdf6216813866ab93562e (commit)
       via  8066f8a3470f9d2f3682a28641a7b09eca29a105 (commit)
       via  903466e124841cb29f518afa6b7706d490737ac3 (commit)
       via  f7968db30b0e0ccae038e354568accb0a05d877c (commit)
       via  f26867928c451443769fecc41c3283e077e8c49f (commit)
       via  ede0061febe5b2edde6a1a79d599e3c7c0faed5a (commit)
       via  01dcc2cf2f2f00235ffa7d0718ecb468370980cc (commit)
       via  785a7f463ec4e937304ce1263c5e6a46e8079137 (commit)
       via  629284120ff359b98a178b6cddf0e005e5f4db1a (commit)
       via  5ba4f6047b84e4cfdb3e6bc88e574ca7a455da81 (commit)
       via  9f4a8d4ea173b4b4cb4d4f06b4004d43e2f4b97a (commit)
       via  54acc87c1e0b100accbfd02cfce59a897f2f0ce1 (commit)
       via  709e2a7e9a3197e8ded4be0b05c138e8d5adbca6 (commit)
       via  5d8f7b16c8490d6951772fa98c1f075a952cc571 (commit)
       via  dd670366d7aedb07e9420d1f8575197acfae1914 (commit)
       via  8857590006266da200427f2d4f9e8c27fbc89ed9 (commit)
       via  f5a4b6a3a39a2b78d33769184d6133d5e256e02c (commit)
       via  b0125ae9850973b89010517b1dbce04125a51d51 (commit)
       via  661ba477e01b796db161fa612b46c353393c6b10 (commit)
       via  2d1d795481bc011447284f8ce0a3ae96a08daf17 (commit)
       via  44cdb9d73f1a0b7d2c8483a119b9c4d6caabc1ec (commit)
       via  5fbd80579aea0f75ca1d2700515c5b8747a75c7d (commit)
       via  ac5aea95455372145f3f06df2b4c1584d759d660 (commit)
       via  10671c3a4c18ea26035a5819a9f2b8fd6c7e41ea (commit)
       via  bf9d1248c80205795e26156f67aff0b3f796cfce (commit)
       via  c45633a571bf663bc7f3610fc481acded6acfc19 (commit)
       via  7e7f35a2d7d40267a4dd30791df77420efeebfa7 (commit)
       via  813df2fe6656e55bea4d0be07cc964a140218412 (commit)
       via  e1ceff16765b0342531709cf97d03ef0158c29d5 (commit)
       via  44b02e1beb4f38f26551d932827d5317fddd27c2 (commit)
       via  2f02ed75a9671a7aae36968d5a1618f71b491325 (commit)
       via  a1c11283af759c1045a8bb75815db325f415ded4 (commit)
       via  ea9cfcfbf76de232221f31787c53d5f46361a9f0 (commit)
       via  6fbe12a51e8fe2649ffe5a8a02aa93026a8f02cd (commit)
       via  772f6b29b557e4e80353bc48e34d7214be895f33 (commit)
       via  9b28b82e7c40d1eacc446d5932cd613c56378ed8 (commit)
       via  9663b088480cef6734a3c5892d5ddbbd60ecc1a4 (commit)
       via  5cdde08ea869ef02111f618ad782d392a296eb7f (commit)
       via  c0268c449d0f3d23be5ec7b92fe92e7e078166cf (commit)
       via  ad43dc6cfc2b610a4e34fe55811bd937f9c3238b (commit)
       via  86f3bb144ad75461eb9b7ac1e59046ac75efccac (commit)
       via  b0e6ab1109d05fc664f46e17d721fe9b01d38115 (commit)
       via  13f745b50dc7031755faadb2d3476a6b6aafc739 (commit)
       via  59fc3507d18072833559f227ecab8aa00cad9466 (commit)
       via  82d12156ef5f948d44934ed44d79d24cc9e94366 (commit)
       via  4f152f3276b6d40d2568a27e74903dd18b41d752 (commit)
       via  dc1dbc43a6bfb2f3e6a1cc2ca089e0318b3af0ed (commit)
       via  3087197008d2b12bf9f0d7d1f2aca500db816e7c (commit)
       via  6390beca54f55e8d36ff767b99ae9ff68b15f10e (commit)
       via  c5d7045dafcfb569c11c90c04ea7a75328c80084 (commit)
       via  d19d6e1856c9a1acbf48e8b2e39b3d9171aa9f7f (commit)
       via  81494fd30d3815502247a721f50d9eadf86a73fa (commit)
       via  d711f5c7697cd4bc5dc6d9fd01706cabc771dad2 (commit)
       via  acac103ba5772ae738ce5409d17feab80596cde6 (commit)
       via  d9f9b3be036747c9f55060aed47896f951bfb853 (commit)
       via  75311cfe18071b94c66121a9785b133b6df345a3 (commit)
       via  3d952a2fe5da9d84c20d3debdcc1e425b08781c6 (commit)
       via  1b90b52a56b4f808ad29a7ef79aeafc03c7424b4 (commit)
       via  ab7d41b69ce569270b25bc69f88b8b420465366c (commit)
       via  4d67144142f04184b835e50314eb21b882b9e00a (commit)
       via  f099042d82ed49be0ed546a751e26a10c4e01a47 (commit)
       via  d0d97089706286fafd3c8ff56f3b5bf7ac07c6e0 (commit)
      from  167558a67e6d931a186ed35cc61902cc1463cc2f (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 c3db6f58f7b0f02e10c3bf9fb53333026909b08f
Author: Werner Koch <wk at gnupg.org>
Date:   Wed May 4 16:49:19 2016 +0200

    Post release updates.
    
    --

diff --git a/NEWS b/NEWS
index 4aa7a01..230c14e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 2.1.13 (unreleased)
+-------------------------------------------------
+
+
 Noteworthy changes in version 2.1.12 (2016-05-04)
 -------------------------------------------------
 
diff --git a/configure.ac b/configure.ac
index 6aeca17..6458f1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ min_automake_version="1.14"
 m4_define([mym4_package],[gnupg])
 m4_define([mym4_major], [2])
 m4_define([mym4_minor], [1])
-m4_define([mym4_micro], [12])
+m4_define([mym4_micro], [13])
 
 # To start a new development series, i.e a new major or minor number
 # you need to mark an arbitrary commit before the first beta release

commit 00df5b1236cac5c7a48638a4613278c5aab486f8
Author: Werner Koch <wk at gnupg.org>
Date:   Wed May 4 15:59:11 2016 +0200

    Release 2.1.12

diff --git a/NEWS b/NEWS
index 49414e6..4aa7a01 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,55 @@
-Noteworthy changes in version 2.1.12 (unreleased)
+Noteworthy changes in version 2.1.12 (2016-05-04)
 -------------------------------------------------
 
+ * gpg: New --edit-key sub-command "change-usage" for testing
+   purposes.
+
+ * gpg: Out of order key-signatures are now systematically detected
+   and fixed by --edit-key.
+
+ * gpg: Improved detection of non-armored messages.
+
+ * gpg: Removed the extra prompt needed to create Curve25519 keys.
+
+ * gpg: Improved user ID selection for --quick-sign-key.
+
+ * gpg: Use the root CAs provided by the system with --fetch-key.
+
+ * gpg: Add support for the experimental Web Key Directory key
+   location service.
+
+ * gpg: Improve formatting of Tofu messages and emit new Tofu specific
+   status lines.
+
+ * gpgsm: Add option --pinentry-mode to support a loopback pinentry.
+
+ * gpgsm: A new pubring.kbx is now created with the header blob so
+   that gpg can detect that the keybox format needs to be used.
+
+ * agent: Add read support for the new private key protection format
+   openpgp-s2k-ocb-aes.
+
+ * agent: Add read support for the new extended private key format.
+
+ * agent: Default to --allow-loopback-pinentry and add option
+   --no-allow-loopback-pinentry.
+
+ * scd: Changed to use the new libusb 1.0 API for the internal CCID
+   driver.
+
+ * dirmngr: The dirmngr-client does now auto-detect the PEM format.
+
+ * g13: Add experimental support for dm-crypt.
+
+ * w32: Tofu support is now available with the Speedo build method.
+
+ * w32: Removed the need for libiconv.dll.
+
+ * The man pages for gpg and gpgv are now installed under the correct
+   name (gpg2 or gpg - depending on a configure option).
+
+ * Lots of internal cleanups and bug fixes.
+
 
 Noteworthy changes in version 2.1.11 (2016-01-26)
 -------------------------------------------------

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

Summary of changes:
 Makefile.am                                        |    6 +-
 NEWS                                               |   55 +-
 agent/Makefile.am                                  |    2 +-
 agent/agent.h                                      |    2 +-
 agent/command-ssh.c                                |    2 +-
 agent/command.c                                    |   83 +-
 agent/cvt-openpgp.c                                |    2 +-
 agent/findkey.c                                    |  163 +-
 agent/genkey.c                                     |    2 +-
 agent/gpg-agent.c                                  |   16 +-
 agent/keyformat.txt                                |  201 +-
 agent/protect-tool.c                               |  117 +-
 agent/protect.c                                    |  436 +-
 agent/t-protect.c                                  |    2 +-
 autogen.rc                                         |    2 +-
 build-aux/config.guess                             |  143 +-
 build-aux/config.sub                               |   36 +-
 build-aux/speedo.mk                                |   15 +-
 build-aux/speedo/patches/sqlite.patch              |   42 +
 build-aux/speedo/w32/inst.nsi                      |  288 +-
 build-aux/speedo/w32/pkg-copyright.txt             |   26 +-
 common/Makefile.am                                 |    8 +-
 common/README                                      |   12 +-
 common/argparse.c                                  |    8 +-
 common/exechelp-posix.c                            |  129 +-
 common/exechelp-w32.c                              |  177 +-
 common/exechelp-w32ce.c                            |   18 +
 common/exechelp.h                                  |    9 +
 common/exectool.c                                  |   27 +-
 common/homedir.c                                   |   10 +-
 common/iobuf.c                                     |   71 +-
 common/iobuf.h                                     |    9 +-
 common/logging.c                                   |   50 +-
 common/logging.h                                   |   21 +-
 common/miscellaneous.c                             |   11 +
 common/openpgpdefs.h                               |   28 +
 common/private-keys.c                              |  750 ++++
 common/private-keys.h                              |  109 +
 common/server-help.c                               |  137 +
 common/server-help.h                               |   62 +
 common/sexp-parse.h                                |    2 +-
 common/simple-pwquery.c                            |   95 +-
 common/status.h                                    |    5 +
 common/strlist.c                                   |   31 +-
 common/strlist.h                                   |    3 +
 common/sysutils.c                                  |   73 +-
 common/sysutils.h                                  |    1 +
 common/t-exechelp.c                                |   21 +-
 common/t-private-keys.c                            |  541 +++
 common/t-session-env.c                             |   15 +-
 common/utf8conv.c                                  |   16 +-
 common/util.h                                      |    6 +
 configure.ac                                       |   98 +-
 dirmngr/Makefile.am                                |    6 +-
 dirmngr/dirmngr-client.c                           |   43 +-
 dirmngr/dns-stuff.c                                |   24 +-
 dirmngr/http.c                                     |   40 +-
 dirmngr/http.h                                     |    9 +-
 dirmngr/ks-engine-hkp.c                            |    2 +-
 dirmngr/ks-engine-http.c                           |   14 +-
 dirmngr/server.c                                   |  151 +-
 dirmngr/t-http.c                                   |    2 +-
 doc/DETAILS                                        |   44 +
 doc/HACKING                                        |   32 +-
 doc/Makefile.am                                    |   42 +-
 doc/TRANSLATE                                      |    2 +-
 doc/debugging.texi                                 |   27 +-
 doc/gnupg-module-overview.svg                      |  892 +++++
 doc/gpg-agent.texi                                 |   44 +-
 doc/gpg.texi                                       |   94 +-
 doc/gpgsm.texi                                     |   32 +-
 doc/gpgv.texi                                      |   24 +-
 doc/help.ru.txt                                    |  333 +-
 doc/help.txt                                       |    6 +-
 doc/mkdefsinc.c                                    |   27 +-
 g10/Makefile.am                                    |  106 +-
 g10/armor.c                                        |   88 +-
 g10/build-packet.c                                 |  446 ++-
 g10/call-agent.c                                   |    5 +-
 g10/call-dirmngr.c                                 |   66 +-
 g10/call-dirmngr.h                                 |    2 +
 g10/card-util.c                                    |   12 +-
 g10/cipher.c                                       |    5 +-
 g10/compress.c                                     |    1 -
 g10/dearmor.c                                      |    1 -
 g10/decrypt-data.c                                 |   15 +-
 g10/decrypt.c                                      |    1 -
 g10/dek.h                                          |    6 +
 g10/delkey.c                                       |    1 -
 g10/ecdh.c                                         |   11 +-
 g10/encrypt.c                                      |  168 +-
 g10/export.c                                       |    5 +-
 g10/free-packet.c                                  |    3 +-
 g10/getkey.c                                       |   75 +-
 g10/gpg.c                                          |   13 +-
 g10/gpgcompose.c                                   | 3038 ++++++++++++++
 g10/gpgv.c                                         |   11 +
 g10/import.c                                       |   23 +-
 g10/kbnode.c                                       |    1 -
 g10/keydb.c                                        |   11 +-
 g10/keydb.h                                        |   40 +-
 g10/keyedit.c                                      |  944 ++++-
 g10/keygen.c                                       |  156 +-
 g10/keyid.c                                        |   67 +-
 g10/keylist.c                                      |   47 +-
 g10/keyring.c                                      |   17 +-
 g10/keyserver-internal.h                           |    2 +
 g10/keyserver.c                                    |   36 +-
 g10/main.h                                         |   19 +-
 g10/mainproc.c                                     |    9 +-
 g10/mdfilter.c                                     |    1 -
 g10/migrate.c                                      |    2 +-
 g10/misc.c                                         |    2 -
 g10/openfile.c                                     |    1 -
 g10/options.h                                      |    2 +
 g10/packet.h                                       |  260 +-
 g10/parse-packet.c                                 |   13 +-
 g10/passphrase.c                                   |    3 +-
 g10/pkclist.c                                      |   27 +-
 g10/pkglue.c                                       |    5 +-
 g10/plaintext.c                                    |    3 +-
 g10/progress.c                                     |    7 +-
 g10/pubkey-enc.c                                   |    5 +-
 g10/revoke.c                                       |    1 -
 g10/seckey-cert.c                                  |    1 -
 g10/server.c                                       |   35 +-
 g10/seskey.c                                       |   45 +-
 g10/sig-check.c                                    |  408 +-
 g10/sign.c                                         |   11 +-
 g10/skclist.c                                      |    1 -
 g10/sqlite.c                                       |    5 +-
 g10/t-stutter-data.asc                             |    1 +
 g10/t-stutter.c                                    |  610 +++
 g10/tdbdump.c                                      |    1 -
 g10/tdbio.c                                        |  129 +-
 g10/test-stubs.c                                   |   11 +
 g10/test.c                                         |    8 +-
 g10/textfilter.c                                   |    3 +-
 g10/tofu.c                                         |  656 +--
 g10/trust.c                                        |   11 +-
 g10/trustdb.c                                      |   50 +-
 g10/trustdb.h                                      |   13 +-
 g10/verify.c                                       |    1 -
 g13/Makefile.am                                    |   38 +-
 g13/backend.c                                      |  155 +-
 g13/backend.h                                      |   11 +-
 g13/be-dmcrypt.c                                   |   99 +
 g13/{be-truecrypt.h => be-dmcrypt.h}               |   19 +-
 g13/call-syshelp.c                                 |  488 +++
 g13/call-syshelp.h                                 |   36 +
 g13/create.c                                       |  100 +-
 g13/create.h                                       |    6 +-
 g13/g13-syshelp.c                                  |  753 ++++
 g13/g13-syshelp.h                                  |   95 +
 g13/g13.c                                          |  103 +-
 g13/g13.h                                          |   10 +-
 g13/{utils.c => g13tuple.c}                        |  171 +-
 g13/{utils.h => g13tuple.h}                        |   17 +-
 g13/keyblob.c                                      |  229 ++
 g13/keyblob.h                                      |   48 +-
 g13/mount.c                                        |  275 +-
 g13/mount.h                                        |    2 -
 g13/mountinfo.c                                    |    2 +-
 g13/server.c                                       |   98 +-
 g13/sh-blockdev.c                                  |  152 +
 g13/sh-cmd.c                                       |  780 ++++
 g13/sh-dmcrypt.c                                   |  943 +++++
 g13/suspend.c                                      |  143 +
 g13/{be-truecrypt.h => suspend.h}                  |   16 +-
 g13/t-g13tuple.c                                   |  223 ++
 kbx/keybox-file.c                                  |    2 +-
 po/ca.po                                           |  220 +-
 po/cs.po                                           |  243 +-
 po/da.po                                           |  229 +-
 po/de.po                                           |  303 +-
 po/el.po                                           |  220 +-
 po/eo.po                                           |  217 +-
 po/es.po                                           |  232 +-
 po/et.po                                           |  220 +-
 po/fi.po                                           |  225 +-
 po/fr.po                                           |  229 +-
 po/gl.po                                           |  220 +-
 po/hu.po                                           |  220 +-
 po/id.po                                           |  220 +-
 po/it.po                                           |  220 +-
 po/ja.po                                           |  219 +-
 po/nb.po                                           |  215 +-
 po/pl.po                                           |  243 +-
 po/pt.po                                           |  220 +-
 po/ro.po                                           |  227 +-
 po/ru.po                                           |  734 ++--
 po/sk.po                                           |  224 +-
 po/sv.po                                           |  230 +-
 po/tr.po                                           |  229 +-
 po/uk.po                                           |  247 +-
 po/zh_CN.po                                        |  215 +-
 po/zh_TW.po                                        |  219 +-
 scd/Makefile.am                                    |    2 +-
 scd/ccid-driver.c                                  |  355 +-
 scd/command.c                                      |   52 +-
 sm/Makefile.am                                     |    3 +-
 sm/call-agent.c                                    |   85 +-
 sm/gpgsm.c                                         |   25 +-
 sm/gpgsm.h                                         |    3 +-
 sm/keydb.c                                         |   12 +
 sm/passphrase.c                                    |   90 +
 scd/atr.h => sm/passphrase.h                       |   16 +-
 sm/server.c                                        |   33 +-
 tests/migrations/Makefile.am                       |   57 +
 ...3FDB8809B17C5547779F9D205C45F47CE0217CE.key.asc |   27 +
 ...3D8AF79796EE107D645A2787A9D9252F924E6F.key.asc} |    2 +-
 ...B5ABF3EF9EB8D96B91A0B8C2C4401C91C834C34.key.asc |   20 +
 .../pubring.kbx.asc                                |   39 +
 .../trustdb.gpg.asc                                |   31 +
 tests/migrations/extended-private-key-format.test  |   57 +
 .../from-classic.gpghome/pubring.gpg.asc           |   54 +
 .../from-classic.gpghome/secring.gpg.asc           |   68 +
 .../from-classic.gpghome/trustdb.gpg.asc           |   31 +
 tests/migrations/from-classic.test                 |   77 +
 tests/openpgp/Makefile.am                          |   15 +-
 tests/openpgp/default-key.test                     |    8 +-
 tests/openpgp/defs.inc                             |    4 +-
 tests/openpgp/fake-pinentry.c                      |   67 +
 tests/openpgp/gpg-agent.conf.tmpl                  |    1 -
 tests/openpgp/gpgtar.test                          |   14 +-
 tests/openpgp/mds.test                             |    2 +-
 tests/openpgp/mkdemodirs                           |    2 +-
 tests/openpgp/plain-largeo.asc                     | 4205 ++++++++++++++++++++
 tests/openpgp/signdemokey                          |    2 +-
 tests/openpgp/use-exact-key.test                   |    4 +-
 tests/openpgp/version.test                         |    8 +-
 tools/gpg-zip.in                                   |    8 +-
 tools/gpgconf-comp.c                               |    4 +-
 tools/gpgparsemail.c                               |   41 +-
 tools/gpgtar.c                                     |    1 -
 tools/mk-tdata.c                                   |    6 +
 236 files changed, 25782 insertions(+), 5070 deletions(-)
 create mode 100755 build-aux/speedo/patches/sqlite.patch
 create mode 100644 common/private-keys.c
 create mode 100644 common/private-keys.h
 create mode 100644 common/server-help.c
 create mode 100644 common/server-help.h
 create mode 100644 common/t-private-keys.c
 create mode 100644 doc/gnupg-module-overview.svg
 create mode 100644 g10/gpgcompose.c
 create mode 100644 g10/t-stutter-data.asc
 create mode 100644 g10/t-stutter.c
 create mode 100644 g13/be-dmcrypt.c
 copy g13/{be-truecrypt.h => be-dmcrypt.h} (50%)
 create mode 100644 g13/call-syshelp.c
 create mode 100644 g13/call-syshelp.h
 create mode 100644 g13/g13-syshelp.c
 create mode 100644 g13/g13-syshelp.h
 rename g13/{utils.c => g13tuple.c} (51%)
 rename g13/{utils.h => g13tuple.h} (74%)
 create mode 100644 g13/keyblob.c
 create mode 100644 g13/sh-blockdev.c
 create mode 100644 g13/sh-cmd.c
 create mode 100644 g13/sh-dmcrypt.c
 create mode 100644 g13/suspend.c
 copy g13/{be-truecrypt.h => suspend.h} (69%)
 create mode 100644 g13/t-g13tuple.c
 create mode 100644 sm/passphrase.c
 copy scd/atr.h => sm/passphrase.h (71%)
 create mode 100644 tests/migrations/Makefile.am
 create mode 100644 tests/migrations/extended-private-key-format.gpghome/private-keys-v1.d/13FDB8809B17C5547779F9D205C45F47CE0217CE.key.asc
 copy tests/{openpgp/privkeys/343D8AF79796EE107D645A2787A9D9252F924E6F.asc => migrations/extended-private-key-format.gpghome/private-keys-v1.d/343D8AF79796EE107D645A2787A9D9252F924E6F.key.asc} (95%)
 create mode 100644 tests/migrations/extended-private-key-format.gpghome/private-keys-v1.d/8B5ABF3EF9EB8D96B91A0B8C2C4401C91C834C34.key.asc
 create mode 100644 tests/migrations/extended-private-key-format.gpghome/pubring.kbx.asc
 create mode 100644 tests/migrations/extended-private-key-format.gpghome/trustdb.gpg.asc
 create mode 100755 tests/migrations/extended-private-key-format.test
 create mode 100644 tests/migrations/from-classic.gpghome/pubring.gpg.asc
 create mode 100644 tests/migrations/from-classic.gpghome/secring.gpg.asc
 create mode 100644 tests/migrations/from-classic.gpghome/trustdb.gpg.asc
 create mode 100755 tests/migrations/from-classic.test
 create mode 100644 tests/openpgp/fake-pinentry.c
 create mode 100644 tests/openpgp/plain-largeo.asc


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



From cvs at cvs.gnupg.org  Wed May  4 16:51:51 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 04 May 2016 16:51:51 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.12-1-gc3db6f5
Message-ID: <E1axy8K-0002Wx-1Q@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  c3db6f58f7b0f02e10c3bf9fb53333026909b08f (commit)
       via  00df5b1236cac5c7a48638a4613278c5aab486f8 (commit)
      from  fb1e9df48465c2f77a65dddd257572fdc79d9450 (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         | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac |  2 +-
 2 files changed, 55 insertions(+), 2 deletions(-)


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



From cvs at cvs.gnupg.org  Wed May  4 17:38:16 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 04 May 2016 17:38:16 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. 70ce98d57b8cc02f1bec2c9169dd3c57a292a1e5
Message-ID: <E1axyrE-0004xh-LQ@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  70ce98d57b8cc02f1bec2c9169dd3c57a292a1e5 (commit)
      from  32c316720a85742cffe6eb7ddf66213b8a710f7b (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 70ce98d57b8cc02f1bec2c9169dd3c57a292a1e5
Author: Werner Koch <wk at gnupg.org>
Date:   Wed May 4 17:23:21 2016 +0200

    web: Release info for GnuPG 2.1.12

diff --git a/tools/getkey.sh b/tools/getkey.sh
index 3432b5a..4794788 100755
--- a/tools/getkey.sh
+++ b/tools/getkey.sh
@@ -20,7 +20,7 @@ Options:
         --verbose  Run in verbose mode
         --test     Run in test environment
 EOF
-    exit $1
+    exit "$1"
 }
 
 
diff --git a/tools/mkkudos.sh b/tools/mkkudos.sh
index 2678bdb..032958f 100755
--- a/tools/mkkudos.sh
+++ b/tools/mkkudos.sh
@@ -36,7 +36,7 @@ Options:
         --verbose  Run in verbose mode
         --test     Run in test environment
 EOF
-    exit $1
+    exit "$1"
 }
 
 
@@ -179,7 +179,7 @@ for file in "$htdocs/donate/"kudos-????.html "$htdocs/donate/"kudos.html \
    fi
    [ $verbose = yes ] && echo "processing $file" >&2
    [ -f "$file.tmp" ] && rm "$file.tmp"
-   awk -F: -v year=$year -v donors="$donors" -v dontable="$dontable" \
+   awk -F: -v year="$year" -v donors="$donors" -v dontable="$dontable" \
            -v monyear="$monyear" -v thisyear="$thisyear" \
            -v euro="$euro" -v euroyr="$euroyr" \
            -v nyr="$nyr" -v goal="$goal" -v percent="$percent" \
diff --git a/web/index.org b/web/index.org
index 575d010..f2dcf63 100644
--- a/web/index.org
+++ b/web/index.org
@@ -23,16 +23,18 @@ be freely used, modified and distributed under the terms of the
 
 GnuPG comes in three flavours:
 
- - {{{gnupg_ver}}} is the /stable/ version suggested for most users,
-
  - {{{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 which is currently mostly
+   used.
+
  - and {{{gnupg1_ver}}} is the /classic/ portable version.
 
 Project [[https://www.gpg4win.org][Gpg4win]] provides a Windows version of GnuPG /stable/. It is
 nicely integrated into an installer and features several frontends as
-well as English and German manuals.
+well as English and German manuals.  A simple Windows installer for the
+/modern/ version is available at our [[file:download/index.org][download]] page.
 
 * Reconquer your privacy
 
@@ -64,6 +66,11 @@ The latest release news:\\
 # GnuPG's latest news are available as [[http://feedvalidator.org/check.cgi?url%3Dhttps://www.gnupg.org/news.en.rss][RSS 2.0 compliant]] feed.  Just
 # point or paste the [[news.en.rss][RSS file]] into your aggregator.
 
+** GnuPG 2.1.12 released (2016-05-04)
+
+A new version of the /modern/ branch of GnuPG has been released.
+Read the full [[https://lists.gnupg.org/pipermail/gnupg-announce/2016q2/000387.html][announcement mail]] for details.
+
 ** Libgcrypt 1.7.0 released (2016-04-15)
 
 We are pleased to announce the availability of Libgcrypt version
diff --git a/web/share/site.css b/web/share/site.css
index 7e9a033..16989b9 100644
--- a/web/share/site.css
+++ b/web/share/site.css
@@ -279,7 +279,7 @@ nav ul li:hover ul.sub-menu {
     z-index: 99;
     border-radius: 0px;
     position: absolute;
-    top: 39px;
+    top: 37px;
     left: 0;
 }
 nav ul ul li {
diff --git a/web/swdb.mac b/web/swdb.mac
index 1d10a8b..f4bda88 100644
--- a/web/swdb.mac
+++ b/web/swdb.mac
@@ -21,18 +21,19 @@
 #
 # GnuPG-2.1
 #
-#+macro: gnupg21_ver  2.1.11
-#+macro: gnupg21_date 2016-01-26
+#+macro: gnupg21_ver  2.1.12
+#+macro: gnupg21_date 2016-05-04
 #+macro: gnupg21_branch  STABLE-BRANCH-2-2
-#+macro: gnupg21_size 5101k
-#+macro: gnupg21_sha1 4af2032a60ff22e322b1c5b270d6d2228f59a3a3
-#+macro: gnupg21_sha2 b7b0fb2c8c5d47d7ec916d4a1097c0ddcb94a12bb1c0ac424ad86b1ee316b61a
-#
-#+macro: gnupg21_w32_ver  2.1.11_20160209
-#+macro: gnupg21_w32_date 2016-02-09
-#+macro: gnupg21_w32_size 2630k
-#+macro: gnupg21_w32_sha1 89bd31652d370ba69ac27b42b4d474d7edd9e0ea
-#+macro: gnupg21_w32_sha2 1e92b39ef4f4cdf3b1849b6f824dd8f160276aa5c9718be35f8a7bd190bf6154
+#+macro: gnupg21_size 5381k
+#+macro: gnupg21_sha1 3b01a35ac04277ea31cc01b4ac4e230e54b5480c
+#+macro: gnupg21_sha2 ac34929d2400a58a349963865442ee6cdd75e500a8d5df083d29835e88bfc506
+#
+#+macro: gnupg21_w32_ver  2.1.12_20160504
+#+macro: gnupg21_w32_date 2016-05-04
+#+macro: gnupg21_w32_size 3477k
+#+macro: gnupg21_w32_sha1 0195d8b551e35b958f5efb4b678c3a178ba1ecb7
+#+macro: gnupg21_w32_sha2 68fadfb85068605d6248076977af30b1adbcee98bb6235e5f30eeb8934f02481
+
 
 
 #

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

Summary of changes:
 tools/getkey.sh    |  2 +-
 tools/mkkudos.sh   |  4 ++--
 web/index.org      | 13 ++++++++++---
 web/share/site.css |  2 +-
 web/swdb.mac       | 23 ++++++++++++-----------
 5 files changed, 26 insertions(+), 18 deletions(-)


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



From cvs at cvs.gnupg.org  Wed May  4 17:40:56 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 04 May 2016 17:40:56 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. bf4a2f6e4c1f7378105b79354e48ed8e91ecd14d
Message-ID: <E1axytp-00050F-0T@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  bf4a2f6e4c1f7378105b79354e48ed8e91ecd14d (commit)
      from  70ce98d57b8cc02f1bec2c9169dd3c57a292a1e5 (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 bf4a2f6e4c1f7378105b79354e48ed8e91ecd14d
Author: Werner Koch <wk at gnupg.org>
Date:   Wed May 4 17:40:09 2016 +0200

    drafts: Commit collected changes.

diff --git a/misc/id/common/reference.I-D.irtf-cfrg-eddsa.xml b/misc/id/common/reference.I-D.irtf-cfrg-eddsa.xml
new file mode 100644
index 0000000..7f9f6b6
--- /dev/null
+++ b/misc/id/common/reference.I-D.irtf-cfrg-eddsa.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<reference anchor='I-D.irtf-cfrg-eddsa'>
+<front>
+<title>Edwards-curve Digital Signature Algorithm (EdDSA)</title>
+
+<author initials='S' surname='Josefsson' fullname='Simon Josefsson'>
+    <organization />
+</author>
+
+<author initials='I' surname='Liusvaara' fullname='Ilari Liusvaara'>
+    <organization />
+</author>
+
+<date month='January' day='19' year='2016' />
+
+<abstract><t>The elliptic curve signature scheme Edwards-curve Digital Signature Algorithm (EdDSA) is described.  The algorithm is instantiated with recommended parameters for the Curve25519 and Curve448 curves.  An example implementation and test vectors are provided.</t></abstract>
+
+</front>
+
+<seriesInfo name='Internet-Draft' value='draft-irtf-cfrg-eddsa-02' />
+<format type='TXT'
+        target='http://www.ietf.org/internet-drafts/draft-irtf-cfrg-eddsa-02.txt' />
+</reference>
diff --git a/misc/id/common/reference.RFC.0822.xml b/misc/id/common/reference.RFC.0822.xml
new file mode 100644
index 0000000..e88b0e3
--- /dev/null
+++ b/misc/id/common/reference.RFC.0822.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<reference  anchor='RFC0822' target='http://www.rfc-editor.org/info/rfc822'>
+<front>
+<title>STANDARD FOR THE FORMAT OF ARPA INTERNET TEXT MESSAGES</title>
+<author initials='D.' surname='Crocker' fullname='D. Crocker'><organization /></author>
+<date year='1982' month='August' />
+<abstract><t>This document revises the specifications in RFC 733, in order to serve the needs of the larger and more complex ARPA Internet.  Some of RFC 733's features failed to gain adequate acceptance.  In order to simplify the standard and the software that follows it, these features have been removed.  A different addressing scheme is used, to handle the case of internetwork mail; and the concept of re-transmission has been introduced.  Obsoletes RFC 733, NIC 41952.</t></abstract>
+</front>
+<seriesInfo name='STD' value='11'/>
+<seriesInfo name='RFC' value='822'/>
+<seriesInfo name='DOI' value='10.17487/RFC0822'/>
+</reference>
diff --git a/misc/id/common/reference.RFC.5785.xml b/misc/id/common/reference.RFC.5785.xml
new file mode 100644
index 0000000..4cf6c83
--- /dev/null
+++ b/misc/id/common/reference.RFC.5785.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<reference  anchor='RFC5785' target='http://www.rfc-editor.org/info/rfc5785'>
+<front>
+<title>Defining Well-Known Uniform Resource Identifiers (URIs)</title>
+<author initials='M.' surname='Nottingham' fullname='M. Nottingham'><organization /></author>
+<author initials='E.' surname='Hammer-Lahav' fullname='E. Hammer-Lahav'><organization /></author>
+<date year='2010' month='April' />
+<abstract><t>This memo defines a path prefix for &quot;well-known locations&quot;, &quot;/.well-known/&quot;, in selected Uniform Resource Identifier (URI) schemes.   [STANDARDS-TRACK]</t></abstract>
+</front>
+<seriesInfo name='RFC' value='5785'/>
+<seriesInfo name='DOI' value='10.17487/RFC5785'/>
+</reference>
diff --git a/misc/id/common/reference.RFC.6189.xml b/misc/id/common/reference.RFC.6189.xml
new file mode 100644
index 0000000..6268e1a
--- /dev/null
+++ b/misc/id/common/reference.RFC.6189.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<reference  anchor='RFC6189' target='http://www.rfc-editor.org/info/rfc6189'>
+<front>
+<title>ZRTP: Media Path Key Agreement for Unicast Secure RTP</title>
+<author initials='P.' surname='Zimmermann' fullname='P. Zimmermann'><organization /></author>
+<author initials='A.' surname='Johnston' fullname='A. Johnston' role='editor'><organization /></author>
+<author initials='J.' surname='Callas' fullname='J. Callas'><organization /></author>
+<date year='2011' month='April' />
+<abstract><t>This document defines ZRTP, a protocol for media path Diffie-Hellman exchange to agree on a session key and parameters for establishing unicast Secure Real-time Transport Protocol (SRTP) sessions for Voice over IP (VoIP) applications.  The ZRTP protocol is media path keying because it is multiplexed on the same port as RTP and does not require support in the signaling protocol.  ZRTP does not assume a Public Key Infrastructure (PKI) or require the complexity of certificates in end devices.  For the media session, ZRTP provides confidentiality, protection against man-in-the-middle (MiTM) attacks, and, in cases where the signaling protocol provides end-to-end integrity protection, authentication.  ZRTP can utilize a Session Description Protocol (SDP) attribute to provide discovery and authentication through the signaling channel.  To provide best effort SRTP, ZRTP utilizes normal RTP/AVP (Audio-Visual Profile) profiles. ZRTP secures media sessions that include a voice media stream and can also secure media sessions that do not include voice by using an optional digital signature.  This document is not an Internet  Standards Track specification; it is published for informational purposes.</t></abstract>
+</front>
+<seriesInfo name='RFC' value='6189'/>
+<seriesInfo name='DOI' value='10.17487/RFC6189'/>
+</reference>
diff --git a/misc/id/common/reference.RFC.7748.xml b/misc/id/common/reference.RFC.7748.xml
new file mode 100644
index 0000000..d82a086
--- /dev/null
+++ b/misc/id/common/reference.RFC.7748.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<reference  anchor='RFC7748' target='http://www.rfc-editor.org/info/rfc7748'>
+<front>
+<title>Elliptic Curves for Security</title>
+<author initials='A.' surname='Langley' fullname='A. Langley'><organization /></author>
+<author initials='M.' surname='Hamburg' fullname='M. Hamburg'><organization /></author>
+<author initials='S.' surname='Turner' fullname='S. Turner'><organization /></author>
+<date year='2016' month='January' />
+<abstract><t>This memo specifies two elliptic curves over prime fields that offer a high level of practical security in cryptographic applications, including Transport Layer Security (TLS).  These curves are intended to operate at the ~128-bit and ~224-bit security level, respectively, and are generated deterministically based on a list of required properties.</t></abstract>
+</front>
+<seriesInfo name='RFC' value='7748'/>
+<seriesInfo name='DOI' value='10.17487/RFC7748'/>
+</reference>
diff --git a/misc/id/eddsa-for-openpgp/back.mkd b/misc/id/eddsa-for-openpgp/back.mkd
index 77a16ca..e00e12f 100644
--- a/misc/id/eddsa-for-openpgp/back.mkd
+++ b/misc/id/eddsa-for-openpgp/back.mkd
@@ -74,4 +74,4 @@ other values might also be interesting for other ECC specifications:
 
 # Changes since -03
 
-  - xxxx
+  - Changed reference for EdDSA to CFRG draft.
diff --git a/misc/id/eddsa-for-openpgp/draft-koch-eddsa-for-openpgp-04.txt b/misc/id/eddsa-for-openpgp/draft-koch-eddsa-for-openpgp-04.txt
new file mode 100644
index 0000000..e26533d
--- /dev/null
+++ b/misc/id/eddsa-for-openpgp/draft-koch-eddsa-for-openpgp-04.txt
@@ -0,0 +1,448 @@
+
+
+
+
+Network Working Group                                            W. Koch
+Internet-Draft                                                  g10 Code
+Updates: 4880 (if approved)                            February 28, 2016
+Intended status: Informational
+Expires: August 31, 2016
+
+
+                           EdDSA for OpenPGP
+                    draft-koch-eddsa-for-openpgp-04
+
+Abstract
+
+   This specification extends OpenPGP with the EdDSA public key
+   algorithm and describes the use of curve Ed25519.
+
+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 August 31, 2016.
+
+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 August 31, 2016                [Page 1]
+

+Internet-Draft              EdDSA for OpenPGP              February 2016
+
+
+Table of Contents
+
+   1.  Introduction  . . . . . . . . . . . . . . . . . . . . . . . .   2
+   2.  Supported Curves  . . . . . . . . . . . . . . . . . . . . . .   2
+   3.  Point Format  . . . . . . . . . . . . . . . . . . . . . . . .   3
+   4.  Encoding of Public and Private Keys . . . . . . . . . . . . .   3
+   5.  Message Encoding  . . . . . . . . . . . . . . . . . . . . . .   4
+   6.  Curve OID . . . . . . . . . . . . . . . . . . . . . . . . . .   4
+   7.  Security Considerations . . . . . . . . . . . . . . . . . . .   5
+   8.  IANA Considerations . . . . . . . . . . . . . . . . . . . . .   5
+   9.  Acknowledgments . . . . . . . . . . . . . . . . . . . . . . .   5
+   10. References  . . . . . . . . . . . . . . . . . . . . . . . . .   5
+     10.1.  Normative References . . . . . . . . . . . . . . . . . .   5
+     10.2.  Informative References . . . . . . . . . . . . . . . . .   6
+   Appendix A.  Test vectors . . . . . . . . . . . . . . . . . . . .   6
+     A.1.  Sample key  . . . . . . . . . . . . . . . . . . . . . . .   6
+     A.2.  Sample signature  . . . . . . . . . . . . . . . . . . . .   7
+   Appendix B.  Point compression flag bytes . . . . . . . . . . . .   7
+   Appendix C.  Changes since -03  . . . . . . . . . . . . . . . . .   8
+   Author's Address  . . . . . . . . . . . . . . . . . . . . . . . .   8
+
+1.  Introduction
+
+   The OpenPGP specification in [RFC4880] defines the RSA, Elgamal, and
+   DSA public key algorithms.  [RFC6637] adds support for Elliptic Curve
+   Cryptography and specifies the ECDSA and ECDH algorithms.  Due to
+   patent reasons no point compression was defined.
+
+   This document specifies how to use the EdDSA public key signature
+   algorithm [I-D.irtf-cfrg-eddsa] with the OpenPGP standard.  It
+   defines a new signature algorithm named EdDSA and specifies how to
+   use the Ed25519 curve with EdDSA.  This algorithm uses a custom point
+   compression method.  There are three main advantages of the EdDSA
+   algorithm: It does not require the use of a unique random number for
+   each signature, there are no padding or truncation issues as with
+   ECDSA, and it is more resilient to side-channel attacks.
+
+   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].
+
+2.  Supported Curves
+
+   This document references the Curve "Ed25519" which is the Edwards
+   form of "Curve25519" ([RFC7748]) and originally specified in the same
+   paper as the "EdDSA" algorithm ([ED25519]).  For the full
+   specification see [I-D.irtf-cfrg-eddsa].
+
+
+
+
+Koch                     Expires August 31, 2016                [Page 2]
+

+Internet-Draft              EdDSA for OpenPGP              February 2016
+
+
+   Other curves may be used by using a specific OID for the curve and
+   its EdDSA parameters.
+
+   The following public key algorithm IDs are added to expand section
+   9.1 of [RFC4880], "Public-Key Algorithms":
+
+                  +-------+-----------------------------+
+                  | ID    | Description of Algorithm    |
+                  +-------+-----------------------------+
+                  | TBD1  | EdDSA public key algorithm  |
+                  +-------+-----------------------------+
+
+   Compliant applications MUST support EdDSA with the curve Ed25519.
+   Applications MAY support other curves as long as a dedicated OID for
+   using that curve with EdDSA is used.
+
+3.  Point Format
+
+   The EdDSA algorithm defines a specific point compression format.  To
+   indicate the use of this compression format and to make sure that the
+   key can be represented in the Multiprecision Integer (MPI) format of
+   [RFC4880] the octet string specifying the point is prefixed with the
+   octet 0x40.  This encoding is an extension of the encoding given in
+   [RFC6637] which uses 0x04 to indicate an uncompressed point.
+
+   For example, the length of a public key for the curve Ed25519 is 263
+   bit: 7 bit to represent the 0x40 prefix octet and 32 octets for the
+   native value of the public key.
+
+4.  Encoding of Public and Private Keys
+
+   The following algorithm specific packets are added to Section 5.5.2
+   of [RFC4880], "Public-Key Packet Formats", to support EdDSA.
+
+   Algorithm-Specific Fields for EdDSA keys:
+
+   o  a variable length field containing a curve OID, formatted as
+      follows:
+
+      *  a one-octet size of the following field; values 0 and 0xFF are
+         reserved for future extensions,
+
+      *  octets representing a curve OID, defined in Section 6.
+
+   o  MPI of an EC point representing a public key Q as described under
+      Point Format above.
+
+
+
+
+
+Koch                     Expires August 31, 2016                [Page 3]
+

+Internet-Draft              EdDSA for OpenPGP              February 2016
+
+
+   The following algorithm specific packets are added to Section 5.5.3
+   of [RFC4880], "Secret-Key Packet Formats", to support EdDSA.
+
+   Algorithm-Specific Fields for EdDSA keys:
+
+   o  an MPI of an integer representing the secret key, which is a
+      scalar of the public EC point.
+
+   The version 4 packet format MUST be used.
+
+5.  Message Encoding
+
+   Section 5.2.3 of [RFC4880], "Version 4 Signature Packet Format"
+   specifies formats.  To support EdDSA no change is required, the MPIs
+   representing the R and S value are encoded as MPIs in the same way as
+   done for the DSA and ECDSA algorithms; in particular the Algorithm-
+   Specific Fields for an EdDSA signature are:
+
+    - MPI of EdDSA value r.
+
+    - MPI of EdDSA value s.
+
+   Note that the compressed version of R and S as specified for EdDSA
+   ([I-D.irtf-cfrg-eddsa]) is used.
+
+   The version 3 signature format MUST NOT be used with EdDSA.
+
+   Although that algorithm allows arbitrary data as input, its use with
+   OpenPGP requires that a digest of the message is used as input.  See
+   section 5.2.4 of [RFC4880], "Computing Signatures" for details.
+   Truncation of the resulting digest is never applied; the resulting
+   digest value is used verbatim as input to the EdDSA algorithm.
+
+6.  Curve OID
+
+   The EdDSA key parameter curve OID is an array of octets that defines
+   a named curve.  The table below specifies the exact sequence of bytes
+   for each named curve referenced in this document:
+
+   +------------------------+------+------------------------+----------+
+   | OID                    | Len  | Encoding in hex format | Name     |
+   +------------------------+------+------------------------+----------+
+   | 1.3.6.1.4.1.11591.15.1 | 9    | 2B 06 01 04 01 DA 47   | Ed25519  |
+   |                        |      | 0F 01                  |          |
+   +------------------------+------+------------------------+----------+
+
+   See [RFC6637] for a description of the OID encoding given in the
+   second and third columns.
+
+
+
+Koch                     Expires August 31, 2016                [Page 4]
+

+Internet-Draft              EdDSA for OpenPGP              February 2016
+
+
+7.  Security Considerations
+
+   The security considerations of [RFC4880] apply accordingly.
+
+   Although technically possible the use of EdDSA with digest algorithms
+   weaker than SHA-256 (e.g.  SHA-1) is not suggested.
+
+8.  IANA Considerations
+
+   IANA is requested to assign an algorithm number from the OpenPGP
+   Public-Key Algorithms range, or the "namespace" in the terminology of
+   [RFC5226], that was created by [RFC4880].  See section 2.
+
+           +-------+-----------------------------+------------+
+           | ID    | Algorithm                   | Reference  |
+           +-------+-----------------------------+------------+
+           | TBD1  | EdDSA public key algorithm  | This doc   |
+           +-------+-----------------------------+------------+
+
+   [Notes to RFC-Editor: Please remove the table above on publication.
+   It is desirable not to reuse old or reserved algorithms because some
+   existing tools might print a wrong description.  A higher number is
+   also an indication for a newer algorithm.  As of now 22 is the next
+   free number.]
+
+9.  Acknowledgments
+
+   The author would like to acknowledge the help of the individuals who
+   kindly voiced their opinions on the IETF OpenPGP and GnuPG mailing
+   lists, in particular, the help of Andrey Jivsov, Jon Callas, and
+   NIIBE Yutaka.
+
+10.  References
+
+10.1.  Normative References
+
+   [I-D.irtf-cfrg-eddsa]
+              Josefsson, S. and I. Liusvaara, "Edwards-curve Digital
+              Signature Algorithm (EdDSA)", draft-irtf-cfrg-eddsa-02
+              (work in progress), January 2016.
+
+   [RFC2119]  Bradner, S., "Key words for use in RFCs to Indicate
+              Requirement Levels", BCP 14, RFC 2119, March 1997.
+
+   [RFC4880]  Callas, J., Donnerhacke, L., Finney, H., Shaw, D., and R.
+              Thayer, "OpenPGP Message Format", RFC 4880, November 2007.
+
+
+
+
+
+Koch                     Expires August 31, 2016                [Page 5]
+

+Internet-Draft              EdDSA for OpenPGP              February 2016
+
+
+   [RFC5226]  Narten, T. and H. Alvestrand, "Guidelines for Writing an
+              IANA Considerations Section in RFCs", BCP 26, RFC 5226,
+              May 2008.
+
+   [RFC6637]  Jivsov, A., "Elliptic Curve Cryptography (ECC) in
+              OpenPGP", RFC 6637, June 2012.
+
+10.2.  Informative References
+
+   [ED25519]  Bernstein, D., Duif, N., Lange, T., Schwabe, P., and B.
+              Yang, "High-speed high-security signatures", Journal of
+              Cryptographic Engineering Volume 2, Issue 2, pp. 77-89,
+              September 2011,
+              <http://dx.doi.org/10.1007/s13389-012-0027-1>.
+
+   [RFC7748]  Langley, A., Hamburg, M., and S. Turner, "Elliptic Curves
+              for Security", RFC 7748, DOI 10.17487/RFC7748, January
+              2016, <http://www.rfc-editor.org/info/rfc7748>.
+
+Appendix A.  Test vectors
+
+   For help implementing this specification a non-normative example is
+   given.  This example assumes that the algorithm id for EdDSA (TBD1)
+   will be 22.
+
+A.1.  Sample key
+
+   The secret key used for this example is:
+
+   D: 1a8b1ff05ded48e18bf50166c664ab023ea70003d78d9e41f5758a91d850f8d2
+
+   Note that this is the raw secret key used as input to the EdDSA
+   signing operation.  The key was created on 2014-08-19 14:28:27 and
+   thus the fingerprint of the OpenPGP key is:
+
+      C959 BDBA FA32 A2F8 9A15  3B67 8CFD E121 9796 5A9A
+
+   The algorithm specific input parameters without the MPI length
+   headers are:
+
+   oid: 2b06010401da470f01
+
+   q: 403f098994bdd916ed4053197934e4a87c80733a1280d62f8010992e43ee3b2406
+
+   The entire public key packet is thus:
+
+
+
+
+
+
+Koch                     Expires August 31, 2016                [Page 6]
+

+Internet-Draft              EdDSA for OpenPGP              February 2016
+
+
+      98 33 04 53 f3 5f 0b 16  09 2b 06 01 04 01 da 47
+      0f 01 01 07 40 3f 09 89  94 bd d9 16 ed 40 53 19
+      79 34 e4 a8 7c 80 73 3a  12 80 d6 2f 80 10 99 2e
+      43 ee 3b 24 06
+
+A.2.  Sample signature
+
+   The signature is created using the sample key over the input data
+   "OpenPGP" on 2015-09-16 12:24:53 and thus the input to the hash
+   function is:
+
+   m: 4f70656e504750040016080006050255f95f9504ff0000000c
+
+   Using the SHA-256 hash algorithm yields the digest:
+
+   d: f6220a3f757814f4c2176ffbb68b00249cd4ccdc059c4b34ad871f30b1740280
+
+   Which is fed into the EdDSA signature function and yields this
+   signature:
+
+   r: 56f90cca98e2102637bd983fdb16c131dfd27ed82bf4dde5606e0d756aed3366
+
+   s: d09c4fa11527f038e0f57f2201d82f2ea2c9033265fa6ceb489e854bae61b404
+
+   The entire signature packet is thus:
+
+      88 5e 04 00 16 08 00 06  05 02 55 f9 5f 95 00 0a
+      09 10 8c fd e1 21 97 96  5a 9a f6 22 01 00 56 f9
+      0c ca 98 e2 10 26 37 bd  98 3f db 16 c1 31 df d2
+      7e d8 2b f4 dd e5 60 6e  0d 75 6a ed 33 66 01 00
+      d0 9c 4f a1 15 27 f0 38  e0 f5 7f 22 01 d8 2f 2e
+      a2 c9 03 32 65 fa 6c eb  48 9e 85 4b ae 61 b4 04
+
+Appendix B.  Point compression flag bytes
+
+   This specification introduces the new flag byte 0x40 to indicate the
+   point compression format.  The value has been chosen so that the high
+   bit is not cleared and thus to avoid accidental sign extension.  Two
+   other values might also be interesting for other ECC specifications:
+
+     Flag  Description
+     ----  -----------
+     0x04  Standard flag for uncompressed format
+     0x40  Native point format of the curve follows
+     0x41  Only X coordinate follows.
+     0x42  Only Y coordinate follows.
+
+
+
+
+
+Koch                     Expires August 31, 2016                [Page 7]
+

+Internet-Draft              EdDSA for OpenPGP              February 2016
+
+
+Appendix C.  Changes since -03
+
+   o  Changed reference for EdDSA to CFRG draft.
+
+Author's Address
+
+   Werner Koch
+   g10 Code
+
+   Email: wk at gnupg.org
+   URI:   https://g10code.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Koch                     Expires August 31, 2016                [Page 8]
diff --git a/misc/id/eddsa-for-openpgp/middle.mkd b/misc/id/eddsa-for-openpgp/middle.mkd
index 2dfeb92..0d9a002 100644
--- a/misc/id/eddsa-for-openpgp/middle.mkd
+++ b/misc/id/eddsa-for-openpgp/middle.mkd
@@ -6,7 +6,7 @@ Elliptic Curve Cryptography and specifies the ECDSA and ECDH
 algorithms.  Due to patent reasons no point compression was defined.
 
 This document specifies how to use the EdDSA public key signature
-algorithm [](#I-D.josefsson-eddsa-ed25519) with the OpenPGP standard.
+algorithm [](#I-D.irtf-cfrg-eddsa) with the OpenPGP standard.
 It defines a new signature algorithm named EdDSA and specifies how to
 use the Ed25519 curve with EdDSA.  This algorithm uses a custom point
 compression method.  There are three main advantages of the EdDSA
@@ -22,9 +22,9 @@ document are to be interpreted as described in [](#RFC2119).
 # Supported Curves
 
 This document references the Curve "Ed25519" which is the Edwards form
-of "Curve25519" and specified in the same paper as the "EdDSA"
-algorithm ([](#ED25519)).  For the full specification see
-[](#I-D.josefsson-eddsa-ed25519).
+of "Curve25519" ([](#RFC7748)) and originally specified in the same
+paper as the "EdDSA" algorithm ([](#ED25519)).  For the full
+specification see [](#I-D.irtf-cfrg-eddsa).
 
 Other curves may be used by using a specific OID for the curve and its
 EdDSA parameters.
@@ -95,7 +95,7 @@ Algorithm-Specific Fields for an EdDSA signature are:
      - MPI of EdDSA value s.
 
 Note that the compressed version of R and S as specified for EdDSA
-([](#I-D.josefsson-eddsa-ed25519)) is used.
+([](#I-D.irtf-cfrg-eddsa)) is used.
 
 The version 3 signature format MUST NOT be used with EdDSA.
 
diff --git a/misc/id/eddsa-for-openpgp/template.xml b/misc/id/eddsa-for-openpgp/template.xml
index d27accc..484e6cb 100644
--- a/misc/id/eddsa-for-openpgp/template.xml
+++ b/misc/id/eddsa-for-openpgp/template.xml
@@ -8,9 +8,10 @@
   <!ENTITY rfc.4880       PUBLIC '' '../common/reference.RFC.4880.xml'>
   <!ENTITY rfc.5226       PUBLIC '' '../common/reference.RFC.5226.xml'>
   <!ENTITY rfc.6637       PUBLIC '' '../common/reference.RFC.6637.xml'>
+  <!ENTITY rfc.7748       PUBLIC '' '../common/reference.RFC.7748.xml'>
   <!ENTITY ed25519        PUBLIC '' '../common/reference.ED25519.xml'>
-  <!ENTITY eddsaed25519
-           PUBLIC '' '../common/reference.I-D.josefsson-eddsa-ed25519.xml'>
+  <!ENTITY eddsa
+           PUBLIC '' '../common/reference.I-D.irtf-cfrg-eddsa.xml'>
 
 ]>
 
@@ -36,7 +37,7 @@
       </address>
     </author>
 
-    <date month="Foo" year="2015" />
+    <date month="February" year="2016" />
     <area>Security</area>
 
     <abstract>
@@ -50,7 +51,7 @@
 
   <back>
     <references title="Normative References">
-      &eddsaed25519;
+      &eddsa;
       &rfc.4880;
       &rfc.6637;
       &rfc.5226;
@@ -58,6 +59,7 @@
     </references>
     <references title="Informative References">
       &ed25519;
+      &rfc.7748;
     </references>
     &pandocBack;
   </back>

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

Summary of changes:
 misc/id/common/reference.I-D.irtf-cfrg-eddsa.xml   | 24 ++++++
 misc/id/common/reference.RFC.0822.xml              | 13 ++++
 misc/id/common/reference.RFC.5785.xml              | 13 ++++
 misc/id/common/reference.RFC.6189.xml              | 14 ++++
 misc/id/common/reference.RFC.7748.xml              | 14 ++++
 misc/id/eddsa-for-openpgp/back.mkd                 |  2 +-
 ...-03.txt => draft-koch-eddsa-for-openpgp-04.txt} | 88 +++++++++++-----------
 misc/id/eddsa-for-openpgp/middle.mkd               | 10 +--
 misc/id/eddsa-for-openpgp/template.xml             | 10 ++-
 9 files changed, 134 insertions(+), 54 deletions(-)
 create mode 100644 misc/id/common/reference.I-D.irtf-cfrg-eddsa.xml
 create mode 100644 misc/id/common/reference.RFC.0822.xml
 create mode 100644 misc/id/common/reference.RFC.5785.xml
 create mode 100644 misc/id/common/reference.RFC.6189.xml
 create mode 100644 misc/id/common/reference.RFC.7748.xml
 copy misc/id/eddsa-for-openpgp/{draft-koch-eddsa-for-openpgp-03.txt => draft-koch-eddsa-for-openpgp-04.txt} (84%)


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



From cvs at cvs.gnupg.org  Fri May  6 06:24:35 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Fri, 06 May 2016 06:24:35 +0200
Subject: [git] GCRYPT - branch, master, updated. libgcrypt-1.7.0-4-gc7430aa
Message-ID: <E1ayXIM-0005l0-3l@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  c7430aa752232aa690c5d8f16575a345442ad8d7 (commit)
      from  ee5a32226a7ca4ab067864e06623fc11a1768900 (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 c7430aa752232aa690c5d8f16575a345442ad8d7
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri May 6 13:21:17 2016 +0900

    ecc: Fix ecc_verify for cofactor support.
    
    * cipher/ecc.c (ecc_verify): Fix the argument for cofactor "h".
    
    --
    
    Thanks to onitake.
    GnuPG-bug-id: 2347
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/cipher/ecc.c b/cipher/ecc.c
index a437a1f..b09902e 100644
--- a/cipher/ecc.c
+++ b/cipher/ecc.c
@@ -1071,7 +1071,7 @@ ecc_verify (gcry_sexp_t s_sig, gcry_sexp_t s_data, gcry_sexp_t s_keyparms)
   if ((ctx.flags & PUBKEY_FLAG_PARAM))
     rc = sexp_extract_param (s_keyparms, NULL, "-p?a?b?g?n?h?/q",
                              &pk.E.p, &pk.E.a, &pk.E.b, &mpi_g, &pk.E.n,
-                             &pk.E.n, &mpi_q, NULL);
+                             &pk.E.h, &mpi_q, NULL);
   else
     rc = sexp_extract_param (s_keyparms, NULL, "/q",
                              &mpi_q, NULL);

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

Summary of changes:
 cipher/ecc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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



From cvs at cvs.gnupg.org  Fri May  6 10:03:58 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 06 May 2016 10:03:58 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. 7703092b35dbd0084c26d277bb03cb7e21889add
Message-ID: <E1ayaie-0004Kp-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 GnuPG website and other docs".

The branch, master has been updated
       via  7703092b35dbd0084c26d277bb03cb7e21889add (commit)
      from  bf4a2f6e4c1f7378105b79354e48ed8e91ecd14d (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 7703092b35dbd0084c26d277bb03cb7e21889add
Author: Werner Koch <wk at gnupg.org>
Date:   Fri May 6 09:51:55 2016 +0200

    drafts: Released first version of openpgp-webkey-service.

diff --git a/misc/id/openpgp-webkey-service/abstract.mkd b/misc/id/openpgp-webkey-service/abstract.mkd
new file mode 100644
index 0000000..d8596be
--- /dev/null
+++ b/misc/id/openpgp-webkey-service/abstract.mkd
@@ -0,0 +1,4 @@
+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.
diff --git a/misc/id/openpgp-webkey-service/back.mkd b/misc/id/openpgp-webkey-service/back.mkd
new file mode 100644
index 0000000..78d234b
--- /dev/null
+++ b/misc/id/openpgp-webkey-service/back.mkd
@@ -0,0 +1,23 @@
+# Test Vectors
+
+For help implementing this specification a non-normative example is
+given:
+
+## Sample key
+
+  TODO
+
+## Software Notes
+
+   GnuPG supports the key discovery described in this document since
+   version 2.1.12.  To use it, the new method "wkd" needs to be used
+   with the --auto-key-locate option.
+
+# Changes
+
+  - This is the initial draft.
+
+## TODO
+
+  - What about authenticated submission?
+  - Describe how to handle a key with several User IDs.
diff --git a/misc/id/openpgp-webkey-service/draft-koch-openpgp-webkey-service-00.txt b/misc/id/openpgp-webkey-service/draft-koch-openpgp-webkey-service-00.txt
new file mode 100644
index 0000000..4f271fc
--- /dev/null
+++ b/misc/id/openpgp-webkey-service/draft-koch-openpgp-webkey-service-00.txt
@@ -0,0 +1,560 @@
+
+
+
+
+Network Working Group                                            W. Koch
+Internet-Draft                                             GnuPG Project
+Intended status: Informational                               May 6, 2016
+Expires: November 7, 2016
+
+
+                        OpenPGP Web Key Service
+                  draft-koch-openpgp-webkey-service-00
+
+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 November 7, 2016.
+
+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 November 7, 2016                [Page 1]
+

+Internet-Draft           OpenPGP Web Key Service                May 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 . . . . . . . . . . . . . . . .   7
+     4.5.  Policy Flags  . . . . . . . . . . . . . . . . . . . . . .   8
+   5.  Security Considerations . . . . . . . . . . . . . . . . . . .   8
+   6.  IANA Considerations . . . . . . . . . . . . . . . . . . . . .   9
+     6.1.  Well-Known URI  . . . . . . . . . . . . . . . . . . . . .   9
+   7.  Normative References  . . . . . . . . . . . . . . . . . . . .   9
+   Appendix A.  Test Vectors . . . . . . . . . . . . . . . . . . . .   9
+     A.1.  Sample key  . . . . . . . . . . . . . . . . . . . . . . .  10
+     A.2.  Software Notes  . . . . . . . . . . . . . . . . . . . . .  10
+   Appendix B.  Changes  . . . . . . . . . . . . . . . . . . . . . .  10
+     B.1.  TODO  . . . . . . . . . . . . . . . . . . . . . . . . . .  10
+   Author's Address  . . . . . . . . . . . . . . . . . . . . . . . .  10
+
+1.  Introduction
+
+   This memo describes a method to associate OpenPGP keys with a mail
+   address and now 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 November 7, 2016                [Page 2]
+

+Internet-Draft           OpenPGP Web Key Service                May 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 messages 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 unnecessary 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 November 7, 2016                [Page 3]
+

+Internet-Draft           OpenPGP Web Key Service                May 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/", the "domain-part" again, 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/example.org/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.  The server MUST also accept a HEAD method so that a
+   client may only check for the existence of a key.
+
+   The server SHOULD return "application/pgp-key" as the content-type
+   for the data but clients MUST also accept "application/octet-string"
+   as 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
+
+   2.  She sends her key using SMTP (or any other transport mechanism)
+       to the provider using the submission address.  The content-type
+
+
+
+Koch                    Expires November 7, 2016                [Page 4]
+

+Internet-Draft           OpenPGP Web Key Service                May 2016
+
+
+       SHOULD be "application/pgp-key" and the key being a binary
+       attachment (which is then likely base64 encoded).  Note that the
+       OpenPGP ASCII armor is not used.
+
+   3.  The provider checks that the received key has a User ID which
+
+       *  matches an account name of the provider,
+
+       *  and that the from address matches that account.
+
+   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.  Also 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 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
+
+
+
+Koch                    Expires November 7, 2016                [Page 5]
+

+Internet-Draft           OpenPGP Web Key Service                May 2016
+
+
+   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
+   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.
+
+   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 ([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 SHOULD 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 ([RFC3156], 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:
+
+   "type"  The value must be "confirmation-request".
+
+   "from"  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.
+
+
+
+Koch                    Expires November 7, 2016                [Page 6]
+

+Internet-Draft           OpenPGP Web Key Service                May 2016
+
+
+   "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 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 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.
+
+   In other cases the confirmation request is legitimate and the MUA
+   shall silently send a response as described in the next section.
+
+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 SHOULD be encrypted.  The PGP/MIME
+   Combined format MUST be used for encryption and signing ([RFC3156],
+   section 6.2).  The encryption key can be taken from the Web Key
+   Directory.
+
+   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:
+
+
+
+
+Koch                    Expires November 7, 2016                [Page 7]
+

+Internet-Draft           OpenPGP Web Key Service                May 2016
+
+
+   "type"  The value must be "confirmation-response".
+
+   "from"  The value must match the mailbox part of the "From:" address
+      of this response.
+
+   "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, 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.  Clients MUST use case-insensitive matching.
+
+   Currently defined keywords are:
+
+   "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.
+
+   More keywords will be defined in updates to this I-D.  There is no
+   registry yet 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 web service is required for each domain name.
+
+
+
+
+
+
+Koch                    Expires November 7, 2016                [Page 8]
+

+Internet-Draft           OpenPGP Web Key Service                May 2016
+
+
+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.  Normative References
+
+   [RFC0822]  Crocker, D., "STANDARD FOR THE FORMAT OF ARPA INTERNET
+              TEXT MESSAGES", STD 11, RFC 822, DOI 10.17487/RFC0822,
+              August 1982, <http://www.rfc-editor.org/info/rfc822>.
+
+   [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.
+
+   [RFC5226]  Narten, T. and H. Alvestrand, "Guidelines for Writing an
+              IANA Considerations Section in RFCs", BCP 26, RFC 5226,
+              May 2008.
+
+   [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.  Test Vectors
+
+   For help implementing this specification a non-normative example is
+   given:
+
+
+
+
+
+Koch                    Expires November 7, 2016                [Page 9]
+

+Internet-Draft           OpenPGP Web Key Service                May 2016
+
+
+A.1.  Sample key
+
+   TODO
+
+A.2.  Software Notes
+
+   GnuPG supports the key discovery described in this document since
+   version 2.1.12.  To use it, the new method "wkd" needs to be used
+   with the --auto-key-locate option.
+
+Appendix B.  Changes
+
+   o  This is the initial draft.
+
+B.1.  TODO
+
+   o  What about authenticated submission?
+
+   o  Describe how to handle a key with several User IDs.
+
+Author's Address
+
+   Werner Koch
+   GnuPG Project
+
+   Email: wk at gnupg.org
+   URI:   https://gnupg.org
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Koch                    Expires November 7, 2016               [Page 10]
diff --git a/misc/id/openpgp-webkey-service/middle.mkd b/misc/id/openpgp-webkey-service/middle.mkd
new file mode 100644
index 0000000..3f0e63f
--- /dev/null
+++ b/misc/id/openpgp-webkey-service/middle.mkd
@@ -0,0 +1,336 @@
+# Introduction
+
+This memo describes a method to associate OpenPGP keys with a mail
+address and now 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.
+
+# 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).
+
+
+# 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 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
+
+ - sending an initial unencrypted messages with the public key
+   attached,
+ - 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 unnecessary 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.
+
+## 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.
+
+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/", the "domain-part" again, 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/example.org/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.  The server MUST also accept a HEAD method so that a
+client may only check for the existence of a key.
+
+The server SHOULD return "application/pgp-key" as the content-type for
+the data but clients MUST also accept "application/octet-string" as
+content-type.  The server MUST NOT return an ASCII armored version of
+the key.
+
+
+# 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
+
+2. She sends her key using SMTP (or any other transport mechanism) to
+   the provider using the submission address.  The content-type SHOULD
+   be "application/pgp-key" and the key being a binary attachment
+   (which is then likely base64 encoded).  Note that the OpenPGP ASCII
+   armor is not used.
+
+3. The provider checks that the received key has a User ID which
+    - matches an account name of the provider,
+    - and that the from address matches that account.
+
+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.  Also 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
+   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.
+
+## 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
+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
+
+## 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.
+
+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 ([](#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.
+
+## 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
+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 ([](#RFC3156),
+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:
+
+"type"
+  : The value must be "confirmation-request".
+
+"from"
+  : 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.
+
+"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 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 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.
+
+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
+
+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 SHOULD be encrypted.  The PGP/MIME Combined
+format MUST be used for encryption and signing ([](#RFC3156),
+section 6.2).  The encryption key can be taken from the Web Key
+Directory.
+
+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".
+
+"from"
+  : The value must match the mailbox part of the "From:" address of
+    this response.
+
+"nonce"
+  : The value is the value of the "nonce" parameter from the
+    confirmation request.
+
+
+## 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, 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.  Clients MUST use case-insensitive matching.
+
+Currently defined keywords are:
+
+"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.
+
+More keywords will be defined in updates to this I-D.  There is no
+registry yet 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.
+
+
+# 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 web service is required for each domain name.
+
+
+# IANA Considerations
+
+## 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
diff --git a/misc/id/openpgp-webkey-service/template.xml b/misc/id/openpgp-webkey-service/template.xml
new file mode 100644
index 0000000..c14ef88
--- /dev/null
+++ b/misc/id/openpgp-webkey-service/template.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" ?>
+<!DOCTYPE rfc SYSTEM 'rfc2629.dtd' [
+  <!ENTITY pandocAbstract PUBLIC '' 'abstract.xml'>
+  <!ENTITY pandocMiddle   PUBLIC '' 'middle.xml'>
+  <!ENTITY pandocBack     PUBLIC '' 'back.xml'>
+  <!ENTITY rfc.0822       PUBLIC '' '../common/reference.RFC.0822.xml'>
+  <!ENTITY rfc.2119       PUBLIC '' '../common/reference.RFC.2119.xml'>
+  <!ENTITY rfc.3156       PUBLIC '' '../common/reference.RFC.3156.xml'>
+  <!ENTITY rfc.4880       PUBLIC '' '../common/reference.RFC.4880.xml'>
+  <!ENTITY rfc.5226       PUBLIC '' '../common/reference.RFC.5226.xml'>
+  <!ENTITY rfc.5785       PUBLIC '' '../common/reference.RFC.5785.xml'>
+  <!ENTITY rfc.6189       PUBLIC '' '../common/reference.RFC.6189.xml'>
+]>
+
+<rfc ipr="trust200902" category="info"
+     docName="draft-koch-openpgp-webkey-service-00">
+
+<?rfc toc="yes"?>
+<?rfc symrefs="yes"?>
+<?rfc sortrefs="yes"?>
+<?rfc subcompact="no"?>
+<?rfc compact="yes"?>
+<?rfc comments="yes"?>
+
+
+  <front>
+    <title>OpenPGP Web Key Service</title>
+    <author initials="W." surname="Koch"
+            fullname="Werner Koch">
+      <organization>GnuPG Project</organization>
+      <address>
+        <email>wk at gnupg.org</email>
+        <uri>https://gnupg.org</uri>
+      </address>
+    </author>
+
+    <date month="May" year="2016" />
+    <area>Security</area>
+
+    <abstract>
+      &pandocAbstract;
+    </abstract>
+  </front>
+
+  <middle>
+    &pandocMiddle;
+  </middle>
+
+  <back>
+    <references title="Normative References">
+      &rfc.2119;
+      &rfc.3156;
+      &rfc.4880;
+      &rfc.5226;
+      &rfc.5785;
+      &rfc.0822;
+      &rfc.6189;
+    </references>
+    &pandocBack;
+  </back>
+</rfc>

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

Summary of changes:
 misc/id/openpgp-webkey-service/abstract.mkd        |   4 +
 misc/id/openpgp-webkey-service/back.mkd            |  23 +
 .../draft-koch-openpgp-webkey-service-00.txt       | 560 +++++++++++++++++++++
 misc/id/openpgp-webkey-service/middle.mkd          | 336 +++++++++++++
 .../template.xml                                   |  35 +-
 5 files changed, 938 insertions(+), 20 deletions(-)
 create mode 100644 misc/id/openpgp-webkey-service/abstract.mkd
 create mode 100644 misc/id/openpgp-webkey-service/back.mkd
 create mode 100644 misc/id/openpgp-webkey-service/draft-koch-openpgp-webkey-service-00.txt
 create mode 100644 misc/id/openpgp-webkey-service/middle.mkd
 copy misc/id/{eddsa-for-openpgp => openpgp-webkey-service}/template.xml (57%)


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



From cvs at cvs.gnupg.org  Fri May  6 10:04:38 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 06 May 2016 10:04:38 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. 5e326105a760d04f8db6f9e94e54b8ee0d15537e
Message-ID: <E1ayajI-0004MB-LH@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  5e326105a760d04f8db6f9e94e54b8ee0d15537e (commit)
      from  7703092b35dbd0084c26d277bb03cb7e21889add (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 5e326105a760d04f8db6f9e94e54b8ee0d15537e
Author: Werner Koch <wk at gnupg.org>
Date:   Fri May 6 10:03:50 2016 +0200

    drafts: Fixes some nits in openpgp-webkey-service.

diff --git a/misc/id/openpgp-webkey-service/middle.mkd b/misc/id/openpgp-webkey-service/middle.mkd
index 3f0e63f..f306322 100644
--- a/misc/id/openpgp-webkey-service/middle.mkd
+++ b/misc/id/openpgp-webkey-service/middle.mkd
@@ -186,7 +186,7 @@ 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 ([](#RFC3156),
-section 4).  The message MUST not be signed (because the
+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.
@@ -255,7 +255,7 @@ 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
+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
diff --git a/misc/id/openpgp-webkey-service/template.xml b/misc/id/openpgp-webkey-service/template.xml
index c14ef88..1c6d3fc 100644
--- a/misc/id/openpgp-webkey-service/template.xml
+++ b/misc/id/openpgp-webkey-service/template.xml
@@ -3,7 +3,6 @@
   <!ENTITY pandocAbstract PUBLIC '' 'abstract.xml'>
   <!ENTITY pandocMiddle   PUBLIC '' 'middle.xml'>
   <!ENTITY pandocBack     PUBLIC '' 'back.xml'>
-  <!ENTITY rfc.0822       PUBLIC '' '../common/reference.RFC.0822.xml'>
   <!ENTITY rfc.2119       PUBLIC '' '../common/reference.RFC.2119.xml'>
   <!ENTITY rfc.3156       PUBLIC '' '../common/reference.RFC.3156.xml'>
   <!ENTITY rfc.4880       PUBLIC '' '../common/reference.RFC.4880.xml'>
@@ -51,9 +50,7 @@
       &rfc.2119;
       &rfc.3156;
       &rfc.4880;
-      &rfc.5226;
       &rfc.5785;
-      &rfc.0822;
       &rfc.6189;
     </references>
     &pandocBack;

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

Summary of changes:
 misc/id/openpgp-webkey-service/middle.mkd   | 4 ++--
 misc/id/openpgp-webkey-service/template.xml | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)


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



From cvs at cvs.gnupg.org  Fri May  6 14:49:37 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Fri, 06 May 2016 14:49:37 +0200
Subject: [git] GPGME - branch, gpgmepp, updated. gpgme-1.6.0-54-ga579be8
Message-ID: <E1ayfB4-00043A-Qg@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, gpgmepp has been updated
       via  a579be82c84f0b9732ee3d52ff2142a3decf95d7 (commit)
       via  11ff8d5964bf66f905818514f6a51fc881ea1a56 (commit)
       via  20b02a7dd49c7ede148245d8a5319b2ba9ce7673 (commit)
       via  cd267791e9bd73505a2a1ea90c85df988e153c19 (commit)
       via  3fad1216770f446a89801d842aa8667356a5ec95 (commit)
      from  5489532ad6ccf3a9b59405686b8a17352f1ecf06 (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 a579be82c84f0b9732ee3d52ff2142a3decf95d7
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri May 6 14:47:24 2016 +0200

    Use common error message style for qt lang checks
    
    * configure.ac: Use common error highliting for qt lang options.

diff --git a/configure.ac b/configure.ac
index 798a396..87b9e97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -308,14 +308,17 @@ if test "$found" = "1"; then
     enabled_languages=$(echo $enabled_languages | sed 's/qt//')
     LIST_MEMBER("cpp", $enabled_languages)
     if test "$found" = "0"; then
-        AC_MSG_ERROR([qt binding depends on cpp language binding])
+        AC_MSG_ERROR([[
+***
+*** Qt language binding depends on cpp binding.
+***]])
     fi
     FIND_QT
     if test "$have_qt5_libs" != "yes"; then
         if test "$explicit_languages" = "1"; then
         AC_MSG_ERROR([[
 ***
-*** Qt5 (Qt5Core) is required for qt binding.
+*** Qt5 (Qt5Core) is required for Qt binding.
 ***]])
         else
            AC_MSG_WARN([[

commit 11ff8d5964bf66f905818514f6a51fc881ea1a56
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri May 6 14:41:22 2016 +0200

    Qt: Fix license mentioned in README
    
    * lang/qt/README: License is GPLv2+ and not LGPL.
    --
    The only part under lgpl is the QByteArray dataprovider.

diff --git a/lang/qt/README b/lang/qt/README
index a6b133f..f624f60 100644
--- a/lang/qt/README
+++ b/lang/qt/README
@@ -2,20 +2,30 @@ Qt API bindings/wrapper for gpgme
 ----------------------------------------
 Based on KF5gpgmepp QGpgme and libkleo/backends/qgpgme
 
-QGpgme is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library 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 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,
+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 Library General Public License for more details.
+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 Library General Public License
-along with GPGME++; see the file COPYING.LIB.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
+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.
 
 Overview
 --------

commit 20b02a7dd49c7ede148245d8a5319b2ba9ce7673
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri May 6 14:20:45 2016 +0200

    Qt: Fix library name in Copyright headers
    
    --
    Files are not part of libkleopatra anymore.

diff --git a/lang/qt/src/abstractimportjob.h b/lang/qt/src/abstractimportjob.h
index 662fed8..33f6a2a 100644
--- a/lang/qt/src/abstractimportjob.h
+++ b/lang/qt/src/abstractimportjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2009 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/adduseridjob.h b/lang/qt/src/adduseridjob.h
index 8ffd962..1b5676f 100644
--- a/lang/qt/src/adduseridjob.h
+++ b/lang/qt/src/adduseridjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/changeexpiryjob.h b/lang/qt/src/changeexpiryjob.h
index f1a3881..7902cb8 100644
--- a/lang/qt/src/changeexpiryjob.h
+++ b/lang/qt/src/changeexpiryjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/changeownertrustjob.h b/lang/qt/src/changeownertrustjob.h
index f42fa05..75c1163 100644
--- a/lang/qt/src/changeownertrustjob.h
+++ b/lang/qt/src/changeownertrustjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/changepasswdjob.h b/lang/qt/src/changepasswdjob.h
index eb9ab0f..7290898 100644
--- a/lang/qt/src/changepasswdjob.h
+++ b/lang/qt/src/changepasswdjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2010 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/cryptoconfig.h b/lang/qt/src/cryptoconfig.h
index 1ab2ccf..858dbb7 100644
--- a/lang/qt/src/cryptoconfig.h
+++ b/lang/qt/src/cryptoconfig.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/decryptjob.h b/lang/qt/src/decryptjob.h
index 2aa4661..c4fc86f 100644
--- a/lang/qt/src/decryptjob.h
+++ b/lang/qt/src/decryptjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004, 2007 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/decryptverifyjob.h b/lang/qt/src/decryptverifyjob.h
index 501df83..97af008 100644
--- a/lang/qt/src/decryptverifyjob.h
+++ b/lang/qt/src/decryptverifyjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004, 2007 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/deletejob.h b/lang/qt/src/deletejob.h
index 5249960..1f4e8cf 100644
--- a/lang/qt/src/deletejob.h
+++ b/lang/qt/src/deletejob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/downloadjob.h b/lang/qt/src/downloadjob.h
index 757d76e..09eecf6 100644
--- a/lang/qt/src/downloadjob.h
+++ b/lang/qt/src/downloadjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/encryptjob.h b/lang/qt/src/encryptjob.h
index 6c4ae5c..060ff8d 100644
--- a/lang/qt/src/encryptjob.h
+++ b/lang/qt/src/encryptjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004, 2007 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/exportjob.h b/lang/qt/src/exportjob.h
index 2cc3d06..df21f03 100644
--- a/lang/qt/src/exportjob.h
+++ b/lang/qt/src/exportjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/hierarchicalkeylistjob.h b/lang/qt/src/hierarchicalkeylistjob.h
index 63aea6b..7cc519a 100644
--- a/lang/qt/src/hierarchicalkeylistjob.h
+++ b/lang/qt/src/hierarchicalkeylistjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/importfromkeyserverjob.h b/lang/qt/src/importfromkeyserverjob.h
index 873ce51..7ab13cb 100644
--- a/lang/qt/src/importfromkeyserverjob.h
+++ b/lang/qt/src/importfromkeyserverjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/importjob.h b/lang/qt/src/importjob.h
index e72ef4c..d9f60d1 100644
--- a/lang/qt/src/importjob.h
+++ b/lang/qt/src/importjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/job.cpp b/lang/qt/src/job.cpp
index abbe16f..7ca1df9 100644
--- a/lang/qt/src/job.cpp
+++ b/lang/qt/src/job.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2005 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/job.h b/lang/qt/src/job.h
index 0882539..5767729 100644
--- a/lang/qt/src/job.h
+++ b/lang/qt/src/job.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/keygenerationjob.h b/lang/qt/src/keygenerationjob.h
index 43e0941..90f29bf 100644
--- a/lang/qt/src/keygenerationjob.h
+++ b/lang/qt/src/keygenerationjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/keylistjob.h b/lang/qt/src/keylistjob.h
index 76f9a85..6e62c4f 100644
--- a/lang/qt/src/keylistjob.h
+++ b/lang/qt/src/keylistjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/listallkeysjob.h b/lang/qt/src/listallkeysjob.h
index c662c04..9d4711d 100644
--- a/lang/qt/src/listallkeysjob.h
+++ b/lang/qt/src/listallkeysjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/multideletejob.h b/lang/qt/src/multideletejob.h
index a142f32..fca73d0 100644
--- a/lang/qt/src/multideletejob.h
+++ b/lang/qt/src/multideletejob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmeadduseridjob.cpp b/lang/qt/src/qgpgmeadduseridjob.cpp
index b1d5c5c..aa873f4 100644
--- a/lang/qt/src/qgpgmeadduseridjob.cpp
+++ b/lang/qt/src/qgpgmeadduseridjob.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmeadduseridjob.h b/lang/qt/src/qgpgmeadduseridjob.h
index ce26ad4..f77b3c8 100644
--- a/lang/qt/src/qgpgmeadduseridjob.h
+++ b/lang/qt/src/qgpgmeadduseridjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmebackend.cpp b/lang/qt/src/qgpgmebackend.cpp
index abecde2..27cd178 100644
--- a/lang/qt/src/qgpgmebackend.cpp
+++ b/lang/qt/src/qgpgmebackend.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2005 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmebackend.h b/lang/qt/src/qgpgmebackend.h
index 16b70cf..3b03633 100644
--- a/lang/qt/src/qgpgmebackend.h
+++ b/lang/qt/src/qgpgmebackend.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2005 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmechangeexpiryjob.cpp b/lang/qt/src/qgpgmechangeexpiryjob.cpp
index 81a49fd..e0c6c4d 100644
--- a/lang/qt/src/qgpgmechangeexpiryjob.cpp
+++ b/lang/qt/src/qgpgmechangeexpiryjob.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmechangeexpiryjob.h b/lang/qt/src/qgpgmechangeexpiryjob.h
index 3ba140b..fab1259 100644
--- a/lang/qt/src/qgpgmechangeexpiryjob.h
+++ b/lang/qt/src/qgpgmechangeexpiryjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmechangeownertrustjob.cpp b/lang/qt/src/qgpgmechangeownertrustjob.cpp
index c3220ee..2f055f1 100644
--- a/lang/qt/src/qgpgmechangeownertrustjob.cpp
+++ b/lang/qt/src/qgpgmechangeownertrustjob.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmechangeownertrustjob.h b/lang/qt/src/qgpgmechangeownertrustjob.h
index 4cf4f72..7ff03a3 100644
--- a/lang/qt/src/qgpgmechangeownertrustjob.h
+++ b/lang/qt/src/qgpgmechangeownertrustjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmechangepasswdjob.cpp b/lang/qt/src/qgpgmechangepasswdjob.cpp
index 618ed1d..675eee6 100644
--- a/lang/qt/src/qgpgmechangepasswdjob.cpp
+++ b/lang/qt/src/qgpgmechangepasswdjob.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2010 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmechangepasswdjob.h b/lang/qt/src/qgpgmechangepasswdjob.h
index b799c20..1531e76 100644
--- a/lang/qt/src/qgpgmechangepasswdjob.h
+++ b/lang/qt/src/qgpgmechangepasswdjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2010 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmedecryptjob.cpp b/lang/qt/src/qgpgmedecryptjob.cpp
index 8233f8d..7116449 100644
--- a/lang/qt/src/qgpgmedecryptjob.cpp
+++ b/lang/qt/src/qgpgmedecryptjob.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmedecryptjob.h b/lang/qt/src/qgpgmedecryptjob.h
index e87120b..e7ed04f 100644
--- a/lang/qt/src/qgpgmedecryptjob.h
+++ b/lang/qt/src/qgpgmedecryptjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmedecryptverifyjob.cpp b/lang/qt/src/qgpgmedecryptverifyjob.cpp
index 8f9026d..d46a9b5 100644
--- a/lang/qt/src/qgpgmedecryptverifyjob.cpp
+++ b/lang/qt/src/qgpgmedecryptverifyjob.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmedecryptverifyjob.h b/lang/qt/src/qgpgmedecryptverifyjob.h
index 0e67de5..4a209b9 100644
--- a/lang/qt/src/qgpgmedecryptverifyjob.h
+++ b/lang/qt/src/qgpgmedecryptverifyjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmedeletejob.cpp b/lang/qt/src/qgpgmedeletejob.cpp
index 4de3a17..323aec4 100644
--- a/lang/qt/src/qgpgmedeletejob.cpp
+++ b/lang/qt/src/qgpgmedeletejob.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmedeletejob.h b/lang/qt/src/qgpgmedeletejob.h
index dea2d85..a2b0d10 100644
--- a/lang/qt/src/qgpgmedeletejob.h
+++ b/lang/qt/src/qgpgmedeletejob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmedownloadjob.cpp b/lang/qt/src/qgpgmedownloadjob.cpp
index 59cf378..48cc907 100644
--- a/lang/qt/src/qgpgmedownloadjob.cpp
+++ b/lang/qt/src/qgpgmedownloadjob.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmedownloadjob.h b/lang/qt/src/qgpgmedownloadjob.h
index 979481e..b1120d1 100644
--- a/lang/qt/src/qgpgmedownloadjob.h
+++ b/lang/qt/src/qgpgmedownloadjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmeencryptjob.cpp b/lang/qt/src/qgpgmeencryptjob.cpp
index eb4bd44..8d0bfd4 100644
--- a/lang/qt/src/qgpgmeencryptjob.cpp
+++ b/lang/qt/src/qgpgmeencryptjob.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2007,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmeencryptjob.h b/lang/qt/src/qgpgmeencryptjob.h
index ea0cd42..fc6ad5f 100644
--- a/lang/qt/src/qgpgmeencryptjob.h
+++ b/lang/qt/src/qgpgmeencryptjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2007,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmeexportjob.cpp b/lang/qt/src/qgpgmeexportjob.cpp
index dec9817..dfc5fc9 100644
--- a/lang/qt/src/qgpgmeexportjob.cpp
+++ b/lang/qt/src/qgpgmeexportjob.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmeexportjob.h b/lang/qt/src/qgpgmeexportjob.h
index 9404d87..703687c 100644
--- a/lang/qt/src/qgpgmeexportjob.h
+++ b/lang/qt/src/qgpgmeexportjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmeimportfromkeyserverjob.cpp b/lang/qt/src/qgpgmeimportfromkeyserverjob.cpp
index 2753b0b..0f19679 100644
--- a/lang/qt/src/qgpgmeimportfromkeyserverjob.cpp
+++ b/lang/qt/src/qgpgmeimportfromkeyserverjob.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmeimportfromkeyserverjob.h b/lang/qt/src/qgpgmeimportfromkeyserverjob.h
index 8c93a41..f50dae0 100644
--- a/lang/qt/src/qgpgmeimportfromkeyserverjob.h
+++ b/lang/qt/src/qgpgmeimportfromkeyserverjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmeimportjob.cpp b/lang/qt/src/qgpgmeimportjob.cpp
index 891c0f6..f125b12 100644
--- a/lang/qt/src/qgpgmeimportjob.cpp
+++ b/lang/qt/src/qgpgmeimportjob.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmeimportjob.h b/lang/qt/src/qgpgmeimportjob.h
index 3858197..5a55fc9 100644
--- a/lang/qt/src/qgpgmeimportjob.h
+++ b/lang/qt/src/qgpgmeimportjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmekeygenerationjob.cpp b/lang/qt/src/qgpgmekeygenerationjob.cpp
index d286ed5..cba6b76 100644
--- a/lang/qt/src/qgpgmekeygenerationjob.cpp
+++ b/lang/qt/src/qgpgmekeygenerationjob.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2004 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmekeygenerationjob.h b/lang/qt/src/qgpgmekeygenerationjob.h
index 520ad4c..fb09b03 100644
--- a/lang/qt/src/qgpgmekeygenerationjob.h
+++ b/lang/qt/src/qgpgmekeygenerationjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmekeylistjob.cpp b/lang/qt/src/qgpgmekeylistjob.cpp
index a9cc5e1..49a3c03 100644
--- a/lang/qt/src/qgpgmekeylistjob.cpp
+++ b/lang/qt/src/qgpgmekeylistjob.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmekeylistjob.h b/lang/qt/src/qgpgmekeylistjob.h
index fd881d9..292f2bb 100644
--- a/lang/qt/src/qgpgmekeylistjob.h
+++ b/lang/qt/src/qgpgmekeylistjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmelistallkeysjob.cpp b/lang/qt/src/qgpgmelistallkeysjob.cpp
index 260e9d1..fd8bfc3 100644
--- a/lang/qt/src/qgpgmelistallkeysjob.cpp
+++ b/lang/qt/src/qgpgmelistallkeysjob.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmelistallkeysjob.h b/lang/qt/src/qgpgmelistallkeysjob.h
index 50747f4..310eabd 100644
--- a/lang/qt/src/qgpgmelistallkeysjob.h
+++ b/lang/qt/src/qgpgmelistallkeysjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmenewcryptoconfig.cpp b/lang/qt/src/qgpgmenewcryptoconfig.cpp
index 965069c..7303f10 100644
--- a/lang/qt/src/qgpgmenewcryptoconfig.cpp
+++ b/lang/qt/src/qgpgmenewcryptoconfig.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2010 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmenewcryptoconfig.h b/lang/qt/src/qgpgmenewcryptoconfig.h
index 03915d4..81b4cb4 100644
--- a/lang/qt/src/qgpgmenewcryptoconfig.h
+++ b/lang/qt/src/qgpgmenewcryptoconfig.h
@@ -5,12 +5,12 @@
     Copyright (c) 2010 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmerefreshkeysjob.cpp b/lang/qt/src/qgpgmerefreshkeysjob.cpp
index 67b0a14..53a9d2c 100644
--- a/lang/qt/src/qgpgmerefreshkeysjob.cpp
+++ b/lang/qt/src/qgpgmerefreshkeysjob.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2004 Klar?vdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmerefreshkeysjob.h b/lang/qt/src/qgpgmerefreshkeysjob.h
index bf4fbb2..da928f3 100644
--- a/lang/qt/src/qgpgmerefreshkeysjob.h
+++ b/lang/qt/src/qgpgmerefreshkeysjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmesecretkeyexportjob.cpp b/lang/qt/src/qgpgmesecretkeyexportjob.cpp
index 3c330b0..f4ec698 100644
--- a/lang/qt/src/qgpgmesecretkeyexportjob.cpp
+++ b/lang/qt/src/qgpgmesecretkeyexportjob.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2004 Klar?vdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmesecretkeyexportjob.h b/lang/qt/src/qgpgmesecretkeyexportjob.h
index 13b2e0d..c58e853 100644
--- a/lang/qt/src/qgpgmesecretkeyexportjob.h
+++ b/lang/qt/src/qgpgmesecretkeyexportjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmesignencryptjob.cpp b/lang/qt/src/qgpgmesignencryptjob.cpp
index e601e6d..d19ab0f 100644
--- a/lang/qt/src/qgpgmesignencryptjob.cpp
+++ b/lang/qt/src/qgpgmesignencryptjob.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2004, 2007 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmesignencryptjob.h b/lang/qt/src/qgpgmesignencryptjob.h
index bfdcbb6..bf1439c 100644
--- a/lang/qt/src/qgpgmesignencryptjob.h
+++ b/lang/qt/src/qgpgmesignencryptjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2007,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmesignjob.cpp b/lang/qt/src/qgpgmesignjob.cpp
index 9d41dff..4e2312b 100644
--- a/lang/qt/src/qgpgmesignjob.cpp
+++ b/lang/qt/src/qgpgmesignjob.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2007,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmesignjob.h b/lang/qt/src/qgpgmesignjob.h
index 95f117c..8ad35ed 100644
--- a/lang/qt/src/qgpgmesignjob.h
+++ b/lang/qt/src/qgpgmesignjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2007,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmesignkeyjob.cpp b/lang/qt/src/qgpgmesignkeyjob.cpp
index 4478851..9a12f61 100644
--- a/lang/qt/src/qgpgmesignkeyjob.cpp
+++ b/lang/qt/src/qgpgmesignkeyjob.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmesignkeyjob.h b/lang/qt/src/qgpgmesignkeyjob.h
index aa3592a..6b610ac 100644
--- a/lang/qt/src/qgpgmesignkeyjob.h
+++ b/lang/qt/src/qgpgmesignkeyjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmeverifydetachedjob.cpp b/lang/qt/src/qgpgmeverifydetachedjob.cpp
index 49e4064..8efef05 100644
--- a/lang/qt/src/qgpgmeverifydetachedjob.cpp
+++ b/lang/qt/src/qgpgmeverifydetachedjob.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2007,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmeverifydetachedjob.h b/lang/qt/src/qgpgmeverifydetachedjob.h
index 6312d0a..6f6257c 100644
--- a/lang/qt/src/qgpgmeverifydetachedjob.h
+++ b/lang/qt/src/qgpgmeverifydetachedjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2007,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmeverifyopaquejob.cpp b/lang/qt/src/qgpgmeverifyopaquejob.cpp
index 95d55f6..b513f82 100644
--- a/lang/qt/src/qgpgmeverifyopaquejob.cpp
+++ b/lang/qt/src/qgpgmeverifyopaquejob.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2007,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/qgpgmeverifyopaquejob.h b/lang/qt/src/qgpgmeverifyopaquejob.h
index 434c329..2374cee 100644
--- a/lang/qt/src/qgpgmeverifyopaquejob.h
+++ b/lang/qt/src/qgpgmeverifyopaquejob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004,2007,2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/refreshkeysjob.h b/lang/qt/src/refreshkeysjob.h
index ca2ee5c..d0bc51f 100644
--- a/lang/qt/src/refreshkeysjob.h
+++ b/lang/qt/src/refreshkeysjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/signencryptjob.h b/lang/qt/src/signencryptjob.h
index 19eadf1..4818d2a 100644
--- a/lang/qt/src/signencryptjob.h
+++ b/lang/qt/src/signencryptjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004, 2007 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/signjob.h b/lang/qt/src/signjob.h
index 1a5e97b..cf5c628 100644
--- a/lang/qt/src/signjob.h
+++ b/lang/qt/src/signjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004, 2007 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/signkeyjob.h b/lang/qt/src/signkeyjob.h
index 9786897..b5efc01 100644
--- a/lang/qt/src/signkeyjob.h
+++ b/lang/qt/src/signkeyjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/specialjob.h b/lang/qt/src/specialjob.h
index c0076c2..788371e 100644
--- a/lang/qt/src/specialjob.h
+++ b/lang/qt/src/specialjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/threadedjobmixin.cpp b/lang/qt/src/threadedjobmixin.cpp
index efe9668..cd6ab5f 100644
--- a/lang/qt/src/threadedjobmixin.cpp
+++ b/lang/qt/src/threadedjobmixin.cpp
@@ -5,12 +5,12 @@
     Copyright (c) 2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/threadedjobmixin.h b/lang/qt/src/threadedjobmixin.h
index c6c9685..62d7f1c 100644
--- a/lang/qt/src/threadedjobmixin.h
+++ b/lang/qt/src/threadedjobmixin.h
@@ -5,12 +5,12 @@
     Copyright (c) 2008 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/verifydetachedjob.h b/lang/qt/src/verifydetachedjob.h
index 6c237ab..fc5bc69 100644
--- a/lang/qt/src/verifydetachedjob.h
+++ b/lang/qt/src/verifydetachedjob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004, 2007 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.
diff --git a/lang/qt/src/verifyopaquejob.h b/lang/qt/src/verifyopaquejob.h
index ae9bc89..f064049 100644
--- a/lang/qt/src/verifyopaquejob.h
+++ b/lang/qt/src/verifyopaquejob.h
@@ -5,12 +5,12 @@
     Copyright (c) 2004, 2007 Klar?lvdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
-    Libkleopatra is free software; you can redistribute it and/or
+    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.
 
-    Libkleopatra is distributed in the hope that it will be useful,
+    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.

commit cd267791e9bd73505a2a1ea90c85df988e153c19
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri May 6 14:17:15 2016 +0200

    Add maybe mode for langs and default to it
    
    * configure.ac (languages): Warn and disable langs for which
    requirements are not met.
    
    --
    If the languages are explicitly enabled on the command line
    missing dependencies for them will still lead to errors.

diff --git a/configure.ac b/configure.ac
index 2dcec49..798a396 100644
--- a/configure.ac
+++ b/configure.ac
@@ -255,45 +255,83 @@ AC_ARG_ENABLE([languages],
                              [enabled_languages=`echo $enableval | \
                              tr ',:' '  ' | tr '[A-Z]' '[a-z]' | \
                              sed 's/c++/cpp/'`],
-                             [enabled_languages="$default_languages"])
+                             [enabled_languages="maybe"])
 if test "x$enabled_languages" = "x" \
    -o "$enabled_languages" = "no"; then
    enabled_languages=
 fi
+
+# If languages are explicitly set missing requirements
+# for the languages are treated as errors otherwise
+# there will be a warning.
+explicit_languages=1
+if test "x$enabled_languages" = "xmaybe"; then
+    explicit_languages=0
+    enabled_languages="$default_languages"
+fi
+
 for language in $enabled_languages; do
     LIST_MEMBER($language, $available_languages)
     if test "$found" = "0"; then
        AC_MSG_ERROR([unsupported language binding specified])
     fi
 done
+
+
+
 # Enable C++ 11 if cpp language is requested
 LIST_MEMBER("cpp", $enabled_languages)
 if test "$found" = "1"; then
     AX_CXX_COMPILE_STDCXX(11, noext, optional)
+    if test "$HAVE_CXX11" != "1"; then
+        if test "$explicit_languages" = "1"; then
+            AC_MSG_ERROR([[
+***
+*** A compiler with c++11 support is required for the c++ binding.
+***]])
+        else
+            enabled_languages=$(echo $enabled_languages | sed 's/cpp//')
+            enabled_languages=$(echo $enabled_languages | sed 's/qt//')
+            AC_MSG_WARN([[
+***
+*** No c++11 support detected. C++ and Qt bindings will be disabled.
+***]])
+        fi
+    fi
 fi
 
 # Check that if qt is enabled cpp also is enabled
 LIST_MEMBER("qt", $enabled_languages)
 if test "$found" = "1"; then
-   LIST_MEMBER("cpp", $enabled_languages)
-   if test "$found" = "0"; then
-      AC_MSG_ERROR([qt binding depends on cpp language binding])
-   fi
-   FIND_QT
-   if test "$have_qt5_libs" != "yes"; then
-       AC_MSG_ERROR([[
-   ***
-   *** Qt5 (Qt5Core) is required for qt binding.
-   ***]])
-   fi
-
-   AC_CHECK_PROGS([DOXYGEN], [doxygen])
-   if test -z "$DOXYGEN";
-       then AC_MSG_WARN([Doxygen not found - Qt binding doc will not be built.])
-   fi
-   # Make sure that qt comes after cpp
-   enabled_languages=`echo $enabled_languages | sed 's/qt//'`
-   enabled_languages=`echo $enabled_languages qt`
+    # We need to ensure that in the langauge order qt comes after cpp
+    # so we remove qt first and explicitly add it as last list member.
+    enabled_languages=$(echo $enabled_languages | sed 's/qt//')
+    LIST_MEMBER("cpp", $enabled_languages)
+    if test "$found" = "0"; then
+        AC_MSG_ERROR([qt binding depends on cpp language binding])
+    fi
+    FIND_QT
+    if test "$have_qt5_libs" != "yes"; then
+        if test "$explicit_languages" = "1"; then
+        AC_MSG_ERROR([[
+***
+*** Qt5 (Qt5Core) is required for qt binding.
+***]])
+        else
+           AC_MSG_WARN([[
+***
+*** Qt5 (Qt5Core) not found Qt Binding will be disabled.
+***]])
+        fi
+    else
+        enabled_languages=`echo $enabled_languages qt`
+
+        AC_CHECK_PROGS([DOXYGEN], [doxygen])
+        if test -z "$DOXYGEN";
+            # This is not highlighted becase it's not really important.
+            then AC_MSG_WARN([Doxygen not found - Qt binding doc will not be built.])
+        fi
+    fi
 fi
 AM_CONDITIONAL([HAVE_DOXYGEN],
                [test -n "$DOXYGEN"])

commit 3fad1216770f446a89801d842aa8667356a5ec95
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri May 6 13:19:18 2016 +0200

    Cpp: Handle PINENTRY_LAUNCHED status line
    
    * lang/cpp/src/editinteractor.cpp (EditInteractor::needsNoResponse):
    Add GPGME_STATUS_PINENTRY_LAUNCHED.
    
    --
    PINENTRY_LAUNCHED needs no response in any Job. This fixes
    Jobs which errored out on unknown status lines.

diff --git a/lang/cpp/src/editinteractor.cpp b/lang/cpp/src/editinteractor.cpp
index edb1ac8..c05ccd6 100644
--- a/lang/cpp/src/editinteractor.cpp
+++ b/lang/cpp/src/editinteractor.cpp
@@ -210,6 +210,7 @@ bool EditInteractor::needsNoResponse(unsigned int status) const
     case GPGME_STATUS_USERID_HINT:
     case GPGME_STATUS_SIGEXPIRED:
     case GPGME_STATUS_KEYEXPIRED:
+    case GPGME_STATUS_PINENTRY_LAUNCHED:
         return true;
     default:
         return false;

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

Summary of changes:
 configure.ac                                 | 81 +++++++++++++++++++++-------
 lang/cpp/src/editinteractor.cpp              |  1 +
 lang/qt/README                               | 32 +++++++----
 lang/qt/src/abstractimportjob.h              |  4 +-
 lang/qt/src/adduseridjob.h                   |  4 +-
 lang/qt/src/changeexpiryjob.h                |  4 +-
 lang/qt/src/changeownertrustjob.h            |  4 +-
 lang/qt/src/changepasswdjob.h                |  4 +-
 lang/qt/src/cryptoconfig.h                   |  4 +-
 lang/qt/src/decryptjob.h                     |  4 +-
 lang/qt/src/decryptverifyjob.h               |  4 +-
 lang/qt/src/deletejob.h                      |  4 +-
 lang/qt/src/downloadjob.h                    |  4 +-
 lang/qt/src/encryptjob.h                     |  4 +-
 lang/qt/src/exportjob.h                      |  4 +-
 lang/qt/src/hierarchicalkeylistjob.h         |  4 +-
 lang/qt/src/importfromkeyserverjob.h         |  4 +-
 lang/qt/src/importjob.h                      |  4 +-
 lang/qt/src/job.cpp                          |  4 +-
 lang/qt/src/job.h                            |  4 +-
 lang/qt/src/keygenerationjob.h               |  4 +-
 lang/qt/src/keylistjob.h                     |  4 +-
 lang/qt/src/listallkeysjob.h                 |  4 +-
 lang/qt/src/multideletejob.h                 |  4 +-
 lang/qt/src/qgpgmeadduseridjob.cpp           |  4 +-
 lang/qt/src/qgpgmeadduseridjob.h             |  4 +-
 lang/qt/src/qgpgmebackend.cpp                |  4 +-
 lang/qt/src/qgpgmebackend.h                  |  4 +-
 lang/qt/src/qgpgmechangeexpiryjob.cpp        |  4 +-
 lang/qt/src/qgpgmechangeexpiryjob.h          |  4 +-
 lang/qt/src/qgpgmechangeownertrustjob.cpp    |  4 +-
 lang/qt/src/qgpgmechangeownertrustjob.h      |  4 +-
 lang/qt/src/qgpgmechangepasswdjob.cpp        |  4 +-
 lang/qt/src/qgpgmechangepasswdjob.h          |  4 +-
 lang/qt/src/qgpgmedecryptjob.cpp             |  4 +-
 lang/qt/src/qgpgmedecryptjob.h               |  4 +-
 lang/qt/src/qgpgmedecryptverifyjob.cpp       |  4 +-
 lang/qt/src/qgpgmedecryptverifyjob.h         |  4 +-
 lang/qt/src/qgpgmedeletejob.cpp              |  4 +-
 lang/qt/src/qgpgmedeletejob.h                |  4 +-
 lang/qt/src/qgpgmedownloadjob.cpp            |  4 +-
 lang/qt/src/qgpgmedownloadjob.h              |  4 +-
 lang/qt/src/qgpgmeencryptjob.cpp             |  4 +-
 lang/qt/src/qgpgmeencryptjob.h               |  4 +-
 lang/qt/src/qgpgmeexportjob.cpp              |  4 +-
 lang/qt/src/qgpgmeexportjob.h                |  4 +-
 lang/qt/src/qgpgmeimportfromkeyserverjob.cpp |  4 +-
 lang/qt/src/qgpgmeimportfromkeyserverjob.h   |  4 +-
 lang/qt/src/qgpgmeimportjob.cpp              |  4 +-
 lang/qt/src/qgpgmeimportjob.h                |  4 +-
 lang/qt/src/qgpgmekeygenerationjob.cpp       |  4 +-
 lang/qt/src/qgpgmekeygenerationjob.h         |  4 +-
 lang/qt/src/qgpgmekeylistjob.cpp             |  4 +-
 lang/qt/src/qgpgmekeylistjob.h               |  4 +-
 lang/qt/src/qgpgmelistallkeysjob.cpp         |  4 +-
 lang/qt/src/qgpgmelistallkeysjob.h           |  4 +-
 lang/qt/src/qgpgmenewcryptoconfig.cpp        |  4 +-
 lang/qt/src/qgpgmenewcryptoconfig.h          |  4 +-
 lang/qt/src/qgpgmerefreshkeysjob.cpp         |  4 +-
 lang/qt/src/qgpgmerefreshkeysjob.h           |  4 +-
 lang/qt/src/qgpgmesecretkeyexportjob.cpp     |  4 +-
 lang/qt/src/qgpgmesecretkeyexportjob.h       |  4 +-
 lang/qt/src/qgpgmesignencryptjob.cpp         |  4 +-
 lang/qt/src/qgpgmesignencryptjob.h           |  4 +-
 lang/qt/src/qgpgmesignjob.cpp                |  4 +-
 lang/qt/src/qgpgmesignjob.h                  |  4 +-
 lang/qt/src/qgpgmesignkeyjob.cpp             |  4 +-
 lang/qt/src/qgpgmesignkeyjob.h               |  4 +-
 lang/qt/src/qgpgmeverifydetachedjob.cpp      |  4 +-
 lang/qt/src/qgpgmeverifydetachedjob.h        |  4 +-
 lang/qt/src/qgpgmeverifyopaquejob.cpp        |  4 +-
 lang/qt/src/qgpgmeverifyopaquejob.h          |  4 +-
 lang/qt/src/refreshkeysjob.h                 |  4 +-
 lang/qt/src/signencryptjob.h                 |  4 +-
 lang/qt/src/signjob.h                        |  4 +-
 lang/qt/src/signkeyjob.h                     |  4 +-
 lang/qt/src/specialjob.h                     |  4 +-
 lang/qt/src/threadedjobmixin.cpp             |  4 +-
 lang/qt/src/threadedjobmixin.h               |  4 +-
 lang/qt/src/verifydetachedjob.h              |  4 +-
 lang/qt/src/verifyopaquejob.h                |  4 +-
 81 files changed, 239 insertions(+), 187 deletions(-)


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



From cvs at cvs.gnupg.org  Fri May  6 16:11:16 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 06 May 2016 16:11:16 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. adce0202b12c680ee3e64e2f51760608b53d5657
Message-ID: <E1aygS6-0006fr-CF@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  adce0202b12c680ee3e64e2f51760608b53d5657 (commit)
      from  5e326105a760d04f8db6f9e94e54b8ee0d15537e (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 adce0202b12c680ee3e64e2f51760608b53d5657
Author: Werner Koch <wk at gnupg.org>
Date:   Fri May 6 16:10:24 2016 +0200

    drafts: Fix content-type contradiction in openpgp-webkey-service.
    
    Reported-by: Damien Goutte-Gattat

diff --git a/misc/id/openpgp-webkey-service/middle.mkd b/misc/id/openpgp-webkey-service/middle.mkd
index f306322..2de39e9 100644
--- a/misc/id/openpgp-webkey-service/middle.mkd
+++ b/misc/id/openpgp-webkey-service/middle.mkd
@@ -93,10 +93,10 @@ 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 check for the existence of a key.
 
-The server SHOULD return "application/pgp-key" as the content-type for
-the data but clients MUST also accept "application/octet-string" as
-content-type.  The server MUST NOT return an ASCII armored version of
-the key.
+The server SHOULD return "application/octet-string" as the
+content-type for the data but clients MAY also accept any other
+appropriate content-type.  The server MUST NOT return an ASCII armored
+version of the key.
 
 
 # Web Key Directory Update Protocol
@@ -119,10 +119,8 @@ Directory, she performs the following steps:
       https://example.org/.well-known/openpgpkey/submission-address
 
 2. She sends her key using SMTP (or any other transport mechanism) to
-   the provider using the submission address.  The content-type SHOULD
-   be "application/pgp-key" and the key being a binary attachment
-   (which is then likely base64 encoded).  Note that the OpenPGP ASCII
-   armor is not used.
+   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,

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

Summary of changes:
 misc/id/openpgp-webkey-service/middle.mkd | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)


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



From cvs at cvs.gnupg.org  Sat May  7 09:09:57 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Sat, 07 May 2016 09:09:57 +0200
Subject: [git] GPG-ERROR - branch, master,
 updated. libgpg-error-1.22-2-gdfcd58f
Message-ID: <E1aywLu-0004L9-Au@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  dfcd58fd3f58e548062b91bd6e20e27cbf4da18d (commit)
      from  c780f657c03baf93c3a38f029f9b1a5d135a9ce4 (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 dfcd58fd3f58e548062b91bd6e20e27cbf4da18d
Author: Werner Koch <wk at gnupg.org>
Date:   Sat May 7 09:09:04 2016 +0200

    syscfg: Add a powerpc and a tilgegx architecture.
    
    * src/syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h: New.
    * src/syscfg/lock-obj-pub.tilegx-unknown-linux-gnu.h: New.
    * src/Makefile.am (lock_obj_pub): Add them.
    --
    
    Debian-bug-id: 823630, 823631
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/Makefile.am b/src/Makefile.am
index 1d88608..5623aff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -63,6 +63,7 @@ lock_obj_pub = \
         syscfg/lock-obj-pub.powerpc-unknown-linux-gnu.h     \
         syscfg/lock-obj-pub.powerpc64-unknown-linux-gnu.h   \
 	syscfg/lock-obj-pub.powerpc64le-unknown-linux-gnu.h \
+	syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h  \
         syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h           \
         syscfg/lock-obj-pub.sh4-unknown-linux-gnu.h         \
         syscfg/lock-obj-pub.sparc-unknown-linux-gnu.h       \
@@ -71,6 +72,7 @@ lock_obj_pub = \
         syscfg/lock-obj-pub.x86_64-pc-linux-gnu.h           \
         syscfg/lock-obj-pub.x86_64-pc-linux-gnux32.h        \
         syscfg/lock-obj-pub.x86_64-pc-linux-musl.h          \
+	syscfg/lock-obj-pub.tilegx-unknown-linux-gnu.h      \
 	syscfg/lock-obj-pub.mingw32.h
 
 
diff --git a/src/syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h b/src/syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h
new file mode 100644
index 0000000..c53413b
--- /dev/null
+++ b/src/syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h
@@ -0,0 +1,23 @@
+## lock-obj-pub.powerpc-unknown-linux-gnuspe.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[24];
+    long _x_align;
+    long *_xp_align;
+  } u;
+} gpgrt_lock_t;
+
+#define GPGRT_LOCK_INITIALIZER {1,{{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.tilegx-unknown-linux-gnu.h b/src/syscfg/lock-obj-pub.tilegx-unknown-linux-gnu.h
new file mode 100644
index 0000000..b99ea32
--- /dev/null
+++ b/src/syscfg/lock-obj-pub.tilegx-unknown-linux-gnu.h
@@ -0,0 +1,25 @@
+## lock-obj-pub.tilegx-unknown-linux-gnu.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[40];
+    long _x_align;
+    long *_xp_align;
+  } u;
+} gpgrt_lock_t;
+
+#define GPGRT_LOCK_INITIALIZER {1,{{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:
 src/Makefile.am                                                         | 2 ++
 ...wn-linux-gnueabihf.h => lock-obj-pub.powerpc-unknown-linux-gnuspe.h} | 2 +-
 ...ub.s390x-ibm-linux-gnu.h => lock-obj-pub.tilegx-unknown-linux-gnu.h} | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
 copy src/syscfg/{lock-obj-pub.arm-unknown-linux-gnueabihf.h => lock-obj-pub.powerpc-unknown-linux-gnuspe.h} (90%)
 copy src/syscfg/{lock-obj-pub.s390x-ibm-linux-gnu.h => lock-obj-pub.tilegx-unknown-linux-gnu.h} (93%)


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



From cvs at cvs.gnupg.org  Mon May  9 08:06:05 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Mon, 09 May 2016 08:06:05 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.12-2-gff870d5
Message-ID: <E1azeJA-0006Oe-BV@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  ff870d59f067d3c5415e231c02a50d5dceac7e48 (commit)
      from  c3db6f58f7b0f02e10c3bf9fb53333026909b08f (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 ff870d59f067d3c5415e231c02a50d5dceac7e48
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon May 9 15:05:29 2016 +0900

    po: Update Japanese translation.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/po/ja.po b/po/ja.po
index e138ede..feae081 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,13 +4,13 @@
 # IIDA Yosiaki <iida at gnu.org>, 1999, 2000, 2002, 2003, 2004.
 # Yoshihiro Kajiki <kajiki at ylug.org>, 1999.
 # Takashi P.KATOH, 2002.
-# NIIBE Yutaka <gniibe at fsij.org>, 2013, 2014, 2015.
+# NIIBE Yutaka <gniibe at fsij.org>, 2013, 2014, 2015, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 2.1.10\n"
+"Project-Id-Version: gnupg 2.1.12\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2015-12-21 21:21+0900\n"
+"PO-Revision-Date: 2016-05-09 14:44+0900\n"
 "Last-Translator: NIIBE Yutaka <gniibe at fsij.org>\n"
 "Language-Team: none\n"
 "Language: ja\n"
@@ -361,10 +361,8 @@ msgstr "?????????\"trusted\"???????????
 msgid "allow presetting passphrase"
 msgstr "???????????????"
 
-#, fuzzy
-#| msgid "allow caller to override the pinentry"
 msgid "disallow caller to override the pinentry"
-msgstr "pinentry??????????????????"
+msgstr "pinentry???????????????????"
 
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "Emacs?????????????????????"
@@ -449,10 +447,9 @@ msgstr "??????'%s'????????: %s\n"
 msgid "directory '%s' created\n"
 msgstr "??????'%s'????????\n"
 
-#, fuzzy, c-format
-#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+#, c-format
 msgid "can't set permissions of '%s': %s\n"
-msgstr "??: '%s'???????? \"%s\"\n"
+msgstr "'%s'???????????: %s\n"
 
 #, c-format
 msgid "stat() failed for '%s': %s\n"
@@ -709,10 +706,9 @@ msgstr "??????????????: %s\n"
 msgid "error forking process: %s\n"
 msgstr "????fork???: %s\n"
 
-#, fuzzy, c-format
-#| msgid "waiting for process %d to terminate failed: %s\n"
+#, c-format
 msgid "waiting for processes to terminate failed: %s\n"
-msgstr "????%d????????: %s\n"
+msgstr "????????????: %s\n"
 
 #, c-format
 msgid "error running '%s': probably not installed\n"
@@ -750,10 +746,9 @@ msgstr "?????????\n"
 msgid "problem with the agent\n"
 msgstr "?????????\n"
 
-#, fuzzy, c-format
-#| msgid "problem with the agent: %s\n"
+#, c-format
 msgid "problem with the agent (unexpected response \"%s\")\n"
-msgstr "?????????: %s\n"
+msgstr "????????? (??????? \"%s\")\n"
 
 #, c-format
 msgid "can't disable core dumps: %s\n"
@@ -1154,10 +1149,9 @@ msgstr ""
 "?????quoted printable?????????????????MTA???????"
 "???\n"
 
-#, fuzzy, c-format
-#| msgid "not human readable"
+#, c-format
 msgid "[ not human readable (%zu bytes: %s%s) ]"
-msgstr "????????"
+msgstr "[ ???????? (%zu???: %s%s) ]"
 
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1174,18 +1168,12 @@ msgstr "???????????????'@'????????
 msgid "a notation value must not use any control characters\n"
 msgstr "????????????????????\n"
 
-#, fuzzy
-#| msgid "a notation name must not contain more than one '@' character\n"
 msgid "a notation name may not contain an '=' character\n"
-msgstr "???????????????'@'????????????\n"
+msgstr "????????'='?????????????\n"
 
-#, fuzzy
-#| msgid ""
-#| "a notation name must have only printable characters or spaces, and end "
-#| "with an '='\n"
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr ""
-"?????????????????????'='?????????????\n"
+"?????????????????????????????\n"
 
 msgid "WARNING: invalid notation data found\n"
 msgstr "*??*: ???????????\n"
@@ -1197,19 +1185,17 @@ msgstr "????%s???????????????????
 msgid "Enter passphrase: "
 msgstr "?????????: "
 
-#, fuzzy, c-format
-#| msgid "error creating keyring '%s': %s\n"
+#, c-format
 msgid "error getting version from '%s': %s\n"
-msgstr "????'%s'??????: %s\n"
+msgstr "%s'????????????: %s\n"
 
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
-msgstr ""
+msgstr "???'%s'??????????(%s < %s)"
 
-#, fuzzy, c-format
-#| msgid "WARNING: %s overrides %s\n"
+#, c-format
 msgid "WARNING: %s\n"
-msgstr "*??*: %s?%s????\n"
+msgstr "*??*: %s\n"
 
 #, c-format
 msgid "OpenPGP card not available: %s\n"
@@ -1692,24 +1678,18 @@ msgstr "[???ID????????]"
 msgid "(check argument of option '%s')\n"
 msgstr "(?????'%s'??????????)\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Warning: value '%s' for option '%s' should be a long key ID or a "
-#| "fingerprint\n"
+#, c-format
 msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
 msgstr ""
-"??: ?'%s'(?????'%s'????)????ID???????????????"
-"???\n"
+"??: '%s'????ID??????????????????\n"
 
-#, fuzzy, c-format
-#| msgid "error closing %s: %s\n"
+#, c-format
 msgid "error looking up: %s\n"
-msgstr "'%s'?????????: %s\n"
+msgstr "??????: %s\n"
 
-#, fuzzy, c-format
-#| msgid "error searching the keyring: %s\n"
+#, c-format
 msgid "Warning: %s appears in the keyring %d times\n"
-msgstr "?????????: %s\n"
+msgstr "??: %s??????%d??????\n"
 
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
@@ -1726,19 +1706,17 @@ msgstr "???????????????"
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "???\"%s\"????????: %s\n"
 
-#, fuzzy, c-format
-#| msgid "using \"%s\" as default secret key\n"
+#, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
-msgstr "????????????\"%s\"?????\n"
+msgstr "??: ???????????? '%s' ??????: %s\n"
 
-#, fuzzy, c-format
-#| msgid "using \"%s\" as default secret key\n"
+#, c-format
 msgid "using \"%s\" as default secret key for signing\n"
-msgstr "????????????\"%s\"?????\n"
+msgstr "????????????????\"%s\"?????\n"
 
 #, c-format
 msgid "all values passed to '%s' ignored\n"
-msgstr ""
+msgstr "'%s'??????????????????\n"
 
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
@@ -1859,10 +1837,8 @@ msgstr "???????????????"
 msgid "run in server mode"
 msgstr "??????????"
 
-#, fuzzy
-#| msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
 msgid "|VALUE|set the TOFU policy for a key"
-msgstr "|VALUE|TOFU???????????(good, unknown, bad, ask, auto)"
+msgstr "|VALUE|TOFU???????????"
 
 msgid "create ascii armored output"
 msgstr "ASCII????????"
@@ -2333,10 +2309,9 @@ msgstr "????????????????: %s\n"
 msgid "key export failed: %s\n"
 msgstr "???????????????: %s\n"
 
-#, fuzzy, c-format
-#| msgid "key export failed: %s\n"
+#, c-format
 msgid "export as ssh key failed: %s\n"
-msgstr "???????????????: %s\n"
+msgstr "ssh??????????????????: %s\n"
 
 #, c-format
 msgid "keyserver search failed: %s\n"
@@ -2811,56 +2786,47 @@ msgstr "[??]"
 msgid "[self-signature]"
 msgstr "[????]"
 
-#, fuzzy, c-format
-#| msgid "key %s: unsupported public key algorithm\n"
+#, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-msgstr "?%s: ????????????????????\n"
+msgstr "??????????????????(%d)???????????: %s.\n"
 
-#, fuzzy, c-format
-#| msgid "card does not support digest algorithm %s\n"
+#, c-format
 msgid ""
 "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-msgstr "????????????????? %s ???????????\n"
+msgstr "?????????????????????(%d)???????????: %s.\n"
 
-#, fuzzy
-#| msgid "Good signature from"
 msgid " (reordered signatures follow)"
-msgstr "?????"
+msgstr "(?????????????)"
 
-#, fuzzy, c-format
-#| msgid "key %s: %s\n"
+#, c-format
 msgid "key %s:\n"
-msgstr "?  %s: %s\n"
+msgstr "?  %s:\n"
 
-#, fuzzy, c-format
-#| msgid "User ID \"%s\": %d signature removed\n"
+#, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
-msgstr[0] "???ID \"%s\": %d ???????????\n"
+msgstr[0] "%d????????????????\n"
 
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to a missing key\n"
+#, c-format
 msgid "%d signature not checked due to a missing key\n"
 msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "??????1???????????\n"
+msgstr[0] "??????%d???????????\n"
 
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
+#, c-format
 msgid "%d bad signature\n"
 msgid_plural "%d bad signatures\n"
-msgstr[0] "?????%d?\n"
+msgstr[0] "%d???????\n"
 
-#, fuzzy, c-format
-#| msgid "Good signature from"
+#, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
-msgstr[0] "?????"
+msgstr[0] "%d???????\n"
 
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
 "all signatures.\n"
-msgstr ""
+msgstr "??: ????????????????????'%s'???????????????????\n"
 
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3296,10 +3262,9 @@ msgstr "\"%s\"?????????????????\n"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" ???????????????????????\n"
 
-#, fuzzy, c-format
-#| msgid "read error in '%s': %s\n"
+#, c-format
 msgid "Invalid user ID '%s': %s\n"
-msgstr "'%s'????????: %s\n"
+msgstr "??????ID '%s': %s\n"
 
 msgid "No matching user IDs."
 msgstr "????????ID???????"
@@ -3426,8 +3391,7 @@ msgstr "??????????????? (y/N/q)"
 msgid "Really delete this self-signature? (y/N)"
 msgstr "????????????????? (y/N)"
 
-#, fuzzy, c-format
-#| msgid "Deleted %d signature.\n"
+#, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "%d????????????\n"
@@ -3442,8 +3406,7 @@ msgstr "??"
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "???ID \"%s\" ?????????????: %s\n"
 
-#, fuzzy, c-format
-#| msgid "User ID \"%s\": %d signature removed\n"
+#, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "???ID \"%s\": %d ???????????\n"
@@ -4066,23 +4029,20 @@ msgstr "???????????: "
 msgid "Signature notation: "
 msgstr "????: "
 
-#, fuzzy, c-format
-#| msgid "%d good signatures\n"
+#, c-format
 msgid "%d good signature\n"
 msgid_plural "%d good signatures\n"
 msgstr[0] "?????%d?\n"
 
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
+#, c-format
 msgid "%d signature not checked due to an error\n"
 msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "??????1???????????\n"
+msgstr[0] "??????%d???????????\n"
 
-#, fuzzy, c-format
-#| msgid "Warning: %lu key(s) skipped due to their large size\n"
+#, c-format
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
-msgstr[0] "*??*: %lu ???????????????????\n"
+msgstr[0] "*??*: %lu?????????????????????\n"
 
 msgid "Keyring"
 msgstr "????"
@@ -4115,23 +4075,20 @@ msgstr "   ????????? ="
 msgid "caching keyring '%s'\n"
 msgstr "????'%s'?????????\n"
 
-#, fuzzy, c-format
-#| msgid "%lu keys cached so far (%lu signatures)\n"
+#, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
-msgstr[0] "%lu??????????? (%lu????)\n"
+msgstr[0] "????%lu????????????? (%lu????)\n"
 
-#, fuzzy, c-format
-#| msgid "flush the cache"
+#, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
-msgstr[0] "??????????????"
+msgstr[0] "%lu?????????????"
 
-#, fuzzy, c-format
-#| msgid "1 bad signature\n"
+#, c-format
 msgid " (%lu signature)\n"
 msgid_plural " (%lu signatures)\n"
-msgstr[0] "?????1?\n"
+msgstr[0] " (%lu???????)\n"
 
 #, c-format
 msgid "%s: keyring created\n"
@@ -4172,8 +4129,7 @@ msgstr "??????????????? (us %d!=handler %d)\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\"?ID???????: ???????\n"
 
-#, fuzzy, c-format
-#| msgid "refreshing %d keys from %s\n"
+#, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "%d????%s????\n"
@@ -4200,10 +4156,8 @@ msgstr "?%s?%s?????%s???\n"
 msgid "requesting key %s from %s\n"
 msgstr "?%s?%s???\n"
 
-#, fuzzy
-#| msgid "invalid keyserver options\n"
 msgid "no keyserver known\n"
-msgstr "???????????????\n"
+msgstr "???????????\n"
 
 #, c-format
 msgid "sending key %s to %s\n"
@@ -4414,18 +4368,16 @@ msgstr "*??*: ????????????? %s ??????
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "??: ?????? %s ??????????????\n"
 
-#, fuzzy, c-format
-#| msgid "%s:%u: read error: %s\n"
+#, c-format
 msgid "(reported error: %s)\n"
-msgstr "%s:%u: ???????: %s\n"
+msgstr "(????????: %s)\n"
 
-#, fuzzy, c-format
-#| msgid "read error in '%s': %s\n"
+#, c-format
 msgid "(reported error: %s <%s>)\n"
-msgstr "'%s'????????: %s\n"
+msgstr "(????????: %s <%s>)\n"
 
 msgid "(further info: "
-msgstr ""
+msgstr "(???????: "
 
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
@@ -4814,10 +4766,9 @@ msgstr "%s: ????: ??????????\n"
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ????: ??????????\n"
 
-#, fuzzy, c-format
-#| msgid "can't connect to '%s': %s\n"
+#, c-format
 msgid "can't encrypt to '%s'\n"
-msgstr "'%s'????????: %s\n"
+msgstr "'%s'?????????\n"
 
 #, c-format
 msgid "option '%s' given, but no valid default keys given\n"
@@ -4959,13 +4910,10 @@ msgid ""
 "declare that a key shall not anymore be used.  It is not possible\n"
 "to retract such a revocation certificate once it has been published."
 msgstr ""
+"?????? \"??????\" ??????????????????\n"
+"??????????????????????????????????\n"
+"?????????????"
 
-#, fuzzy
-#| msgid ""
-#| "Use it to revoke this key in case of a compromise or loss of\n"
-#| "the secret key.  However, if the secret key is still accessible,\n"
-#| "it is better to generate a new revocation certificate and give\n"
-#| "a reason for the revocation."
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -4975,26 +4923,21 @@ msgid ""
 msgstr ""
 "???????????????????????????????????\n"
 "???????????????????????????????????\n"
-"??????????????????"
+"??????????????????????GnuPG??????"
+"gpg???? \"--gen-revoke\"???????????"
 
-#, fuzzy
-#| msgid ""
-#| "To avoid an accidental use of this file, a colon has been inserted\n"
-#| "before the 5 dashes below.  Remove this colon with a text editor\n"
-#| "before making use of this revocation certificate."
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
 "before importing and publishing this revocation certificate."
 msgstr ""
-"????????????????????????????5??????????"
-"??????\n"
-"??????????????????????????????????????"
+"????????????????????????????5??????\n"
+"??????????????????????????????????\n"
+"???????????????????????"
 
-#, fuzzy, c-format
-#| msgid "Revocation certificate created.\n"
+#, c-format
 msgid "revocation certificate stored as '%s.rev'\n"
-msgstr "?????????\n"
+msgstr "?????? '%s.rev' ????????\n"
 
 #, c-format
 msgid "secret key \"%s\" not found\n"
@@ -5088,34 +5031,28 @@ msgstr "???%s???????\n"
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "*??*: ?????????????%s?????\n"
 
-#, fuzzy, c-format
-#| msgid "public key %s is %lu second newer than the signature\n"
+#, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgid_plural "public key %s is %lu seconds newer than the signature\n"
-msgstr[0] "???%s???????%lu????????\n"
+msgstr[0] "???%s???????%lu?????????\n"
 
-#, fuzzy, c-format
-#| msgid "public key %s is %lu second newer than the signature\n"
+#, c-format
 msgid "public key %s is %lu day newer than the signature\n"
 msgid_plural "public key %s is %lu days newer than the signature\n"
-msgstr[0] "???%s???????%lu????????\n"
+msgstr[0] "???%s???????%lu?????????\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "key %s was created %lu second in the future (time warp or clock problem)\n"
+#, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgid_plural ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
-msgstr[0] "?%s?%lu????????? (??????????????)\n"
+msgstr[0] "?%s?%lu?????????? (??????????????)\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "key %s was created %lu second in the future (time warp or clock problem)\n"
+#, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
 "key %s was created %lu days in the future (time warp or clock problem)\n"
-msgstr[0] "?%s?%lu????????? (??????????????)\n"
+msgstr[0] "?%s?%lu?????????? (??????????????)\n"
 
 #, c-format
 msgid "Note: signature key %s expired %s\n"
@@ -5334,204 +5271,194 @@ msgstr "%d??????????????????????\n"
 msgid "input line longer than %d characters\n"
 msgstr "???????%d?????????\n"
 
-#, fuzzy, c-format
-#| msgid "error sending standard options: %s\n"
+#, c-format
 msgid "error beginning transaction on TOFU database: %s\n"
-msgstr "?????????????: %s\n"
+msgstr "TOFU????????????????????: %s\n"
 
 #, c-format
 msgid "error committing transaction on TOFU database: %s\n"
-msgstr ""
+msgstr "TOFU???????????????????????: %s\n"
 
 #, c-format
 msgid "error rolling back transaction on TOFU database: %s\n"
-msgstr ""
+msgstr "TOFU??????????????????????????: %s\n"
 
-#, fuzzy, c-format
-#| msgid "unsupported algorithm: %s"
+#, c-format
 msgid "unsupported TOFU database version: %s\n"
-msgstr "????????????????: %s"
+msgstr "??????????TOFU???????????: %s\n"
 
-#, fuzzy, c-format
-#| msgid "error sending data: %s\n"
+#, c-format
 msgid "error reading TOFU database: %s\n"
-msgstr "????????: %s\n"
+msgstr "TOFU??????????????: %s\n"
 
-#, fuzzy, c-format
-#| msgid "error writing base64 encoding: %s\n"
+#, c-format
 msgid "error determining TOFU database's version: %s\n"
-msgstr "base64????????????????: %s\n"
+msgstr "TOFU?????????????????: %s\n"
 
-#, fuzzy, c-format
-#| msgid "error initializing reader object: %s\n"
+#, c-format
 msgid "error initializing TOFU database: %s\n"
-msgstr "?????????????????: %s\n"
+msgstr "TOFU?????????????: %s\n"
 
-#, fuzzy, c-format
-#| msgid "error opening '%s': %s\n"
+#, c-format
 msgid "error opening TOFU database '%s': %s\n"
-msgstr "'%s'????????: %s\n"
+msgstr "TOFU??????????????? '%s': %s\n"
 
 msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
-msgstr ""
+msgstr "??: tofu.db ? tofu.d ???????????????????\n"
 
 msgid "Using split format for TOFU database\n"
-msgstr ""
+msgstr "TOFU??????????????????\n"
 
-#, fuzzy, c-format
-#| msgid "error sending data: %s\n"
+#, c-format
 msgid "error updating TOFU database: %s\n"
-msgstr "????????: %s\n"
+msgstr "TOFU????????????: %s\n"
 
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "???%s????????: %s\n"
 
-#, fuzzy, c-format
-#| msgid "error setting OCSP target: %s\n"
+#, c-format
 msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "OCSP???????????: %s\n"
+msgstr "TOFU??????????????????: %s\n"
 
 #, c-format
 msgid "The binding %s is NOT known."
-msgstr ""
+msgstr "%s??????????????"
 
 #, c-format
 msgid ""
 "The key with fingerprint %s raised a conflict with the binding %s.  Since "
 "this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
+"???????????%s????????%s??????????????????????"
+"'auto'??????'ask'?????????"
 
 #, c-format
 msgid ""
 "Please indicate whether you believe the binding %s%sis legitimate (the key "
 "belongs to the stated owner) or a forgery (bad)."
 msgstr ""
+"???????%s%s???(??????????????)?????????(??)???????????"
 
-#, fuzzy, c-format
-#| msgid "error getting responder ID: %s\n"
+#, c-format
 msgid "error gathering other user IDs: %s\n"
-msgstr "??ID??????: %s\n"
+msgstr "??????ID??????: %s\n"
 
 msgid "Known user IDs associated with this key:\n"
-msgstr ""
+msgstr "????????????????????ID:\n"
 
-#, fuzzy, c-format
-#| msgid "validity: %s"
+#, c-format
 msgid "policy: %s"
-msgstr "???: %s"
+msgstr "????: %s"
 
-#, fuzzy, c-format
-#| msgid "error getting stored flags: %s\n"
+#, c-format
 msgid "error gathering signature stats: %s\n"
-msgstr "??????????????: %s\n"
+msgstr "???????????: %s\n"
 
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] ""
+"?????????\"%s\"?%d????????????:\n"
 
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
-msgstr ""
+msgstr "???????????\"%s\"?????:\n"
 
-#, fuzzy
-#| msgid "list keys"
 msgid "this key"
-msgstr "????"
+msgstr "???"
 
 #, c-format
 msgid "%ld message signed in the future."
 msgid_plural "%ld messages signed in the future."
-msgstr[0] ""
+msgstr[0] "%ld???????????????????"
 
-#, fuzzy, c-format
-#| msgid "print message digests"
+#, c-format
 msgid "%ld message signed"
 msgid_plural "%ld messages signed"
-msgstr[0] "???????????????"
+msgstr[0] "%ld??????????????"
 
 #, c-format
 msgid " over the past %ld day."
 msgid_plural " over the past %ld days."
-msgstr[0] ""
+msgstr[0] "??%ld???"
 
 #, c-format
 msgid " over the past %ld week."
 msgid_plural " over the past %ld weeks."
-msgstr[0] ""
+msgstr[0] "??%ld????"
 
 #, c-format
 msgid " over the past %ld month."
 msgid_plural " over the past %ld months."
-msgstr[0] ""
+msgstr[0] "??%ld???"
 
 #. TRANSLATORS: Please translate the text found in the source
 #. file below.  We don't directly internationalize that text
 #. so that we can tweak it without breaking translations.
 msgid "TOFU detected a binding conflict"
-msgstr ""
+msgstr "TOFU??????????????????"
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. version of the hotkey) for each of the five choices.  If
 #. there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
-msgstr ""
+msgstr "gGaAuUrRbB"
 
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
-msgstr ""
+msgstr "(G)ood-?, (A)ccept once-?????, (U)nknown-??, (R)eject once-?????, (B)ad-??? "
 
-#, fuzzy, c-format
-#| msgid "error creating a pipe: %s\n"
+#, c-format
 msgid "error changing TOFU policy: %s\n"
-msgstr "?????????: %s\n"
+msgstr "TOFU??????????: %s\n"
 
 #. TRANSLATORS: The tilde ('~') is used here to indicate a
 #. * non-breakable space
 #, c-format
 msgid "%d~year"
 msgid_plural "%d~years"
-msgstr[0] ""
+msgstr[0] "%d~?"
 
 #, c-format
 msgid "%d~month"
 msgid_plural "%d~months"
-msgstr[0] ""
+msgstr[0] "%d~?"
 
 #, c-format
 msgid "%d~day"
 msgid_plural "%d~days"
-msgstr[0] ""
+msgstr[0] "%d~?"
 
 #, c-format
 msgid "%d~hour"
 msgid_plural "%d~hours"
-msgstr[0] ""
+msgstr[0] "%d~??"
 
 #, c-format
 msgid "%d~minute"
 msgid_plural "%d~minutes"
-msgstr[0] ""
+msgstr[0] "%d~?"
 
 #, c-format
 msgid "%d~second"
 msgid_plural "%d~seconds"
-msgstr[0] ""
+msgstr[0] "%d~?"
 
 #, c-format
 msgid "Have never verified a message signed by key %s!\n"
-msgstr ""
+msgstr "?%s???????????????????????????!\n"
 
 #, c-format
 msgid ""
 "Failed to collect signature statistics for \"%s\"\n"
 "(key %s)\n"
 msgstr ""
+"\"%s\"????????????????????\n"
+"(? %s)\n"
 
-#, fuzzy, c-format
-#| msgid "print message digests"
+#, c-format
 msgid "Verified %ld messages signed by \"%s\"."
-msgstr "???????????????"
+msgstr "%ld??????????????(\"%s\"????????)?"
 
 #, c-format
 msgid ""
@@ -5541,16 +5468,17 @@ msgid_plural ""
 "Verified %ld messages signed by \"%s\"\n"
 "in the past %s."
 msgstr[0] ""
+"??????%ld???????(\"%s\"???????????? %s)?"
 
 #, c-format
 msgid "The most recent message was verified %s ago."
-msgstr ""
+msgstr "?????????????%s??????????"
 
 msgid "Warning: we've have yet to see a message signed by this key!\n"
-msgstr ""
+msgstr "??: ???????????????????????????!\n"
 
 msgid "Warning: we've only seen a single message signed by this key!\n"
-msgstr ""
+msgstr "??: ???????????????????????????????!\n"
 
 #, c-format
 msgid ""
@@ -5566,11 +5494,15 @@ msgid_plural ""
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
+"??: ???????????????%ld????????????"
+"??????????! ?????????????????????"
+"??????????????????????????\n"
+"  %s\n"
+"??????????????\n"
 
-#, fuzzy, c-format
-#| msgid "error sending data: %s\n"
+#, c-format
 msgid "error opening TOFU database: %s\n"
-msgstr "????????: %s\n"
+msgstr "TOFU???????????????: %s\n"
 
 #, c-format
 msgid "'%s' is not a valid long keyID\n"
@@ -5635,17 +5567,15 @@ msgstr "--check-trustdb?????????\n"
 msgid "checking the trustdb\n"
 msgstr "???????????\n"
 
-#, fuzzy, c-format
-#| msgid "%lu keys processed so far\n"
+#, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
-msgstr[0] "????%lu??????\n"
+msgstr[0] "%d??????"
 
-#, fuzzy, c-format
-#| msgid "%d keys processed (%d validity counts cleared)\n"
+#, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
-msgstr[0] "%d?????? (??%d??????????)\n"
+msgstr[0] " (??%d??????????)\n"
 
 msgid "no ultimately trusted keys found\n"
 msgstr "?????????????????\n"
@@ -5849,8 +5779,7 @@ msgstr "?????CHV????????????\n"
 msgid "card is permanently locked!\n"
 msgstr "???????????????!\n"
 
-#, fuzzy, c-format
-#| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+#, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
 "%d Admin PIN attempts remaining before card is permanently locked\n"
@@ -5931,8 +5860,7 @@ msgstr "????????????? ...\n"
 msgid "generating key failed\n"
 msgstr "???????????\n"
 
-#, fuzzy, c-format
-#| msgid "key generation completed (%d seconds)\n"
+#, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "??????????? (%d?)\n"
@@ -8029,10 +7957,8 @@ msgstr "|N|N?????????????????"
 msgid "do not allow the reuse of old passphrases"
 msgstr "?????????????????????"
 
-#, fuzzy
-#| msgid "|N|set LDAP timeout to N seconds"
 msgid "|N|set the Pinentry timeout to N seconds"
-msgstr "|N|LDAP????????N????"
+msgstr "|N|Pinentry????????N????"
 
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|????????????NAME????"
@@ -8324,12 +8250,6 @@ msgstr ""
 #~ msgid "you found a bug ... (%s:%d)\n"
 #~ msgstr "????????????? ... (%s:%d)\n"
 
-#, fuzzy
-#~| msgid "%d user IDs without valid self-signatures detected\n"
-#~ msgid "%d user ID without valid self-signature detected\n"
-#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
-#~ msgstr[0] "?????????????ID?%d???\n"
-
 #~ msgid "moving a key signature to the correct place\n"
 #~ msgstr "????????????????\n"
 

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

Summary of changes:
 po/ja.po | 410 +++++++++++++++++++++++++--------------------------------------
 1 file changed, 165 insertions(+), 245 deletions(-)


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



From cvs at cvs.gnupg.org  Mon May  9 21:17:34 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Mon, 09 May 2016 21:17:34 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.12-4-g693838f
Message-ID: <E1azqf7-0001y7-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 "The GNU Privacy Guard".

The branch, master has been updated
       via  693838f0125d5d0c963fa3771b1bd117702af697 (commit)
       via  d33b35f7481caa0dcb25f9fa7d6c5bb27895297a (commit)
      from  ff870d59f067d3c5415e231c02a50d5dceac7e48 (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 693838f0125d5d0c963fa3771b1bd117702af697
Author: Werner Koch <wk at gnupg.org>
Date:   Mon May 9 21:07:40 2016 +0200

    gpg: Fix buglet in the check_all_keysigs function.
    
    * g10/keyedit.c (sig_comparison): Actually compare the pubkey
    algorithms.
    --
    
    This fixes two bugs: The first was a typo which led to us comparing A
    with A.  The second problem was the use of an assert at a place where
    this can't be asserted: Two signature may have different algorithms;
    they won't verify but after all it is about corrupted signatures.
    
    Reported-by: Guilhem Moulin <guilhem at fripost.org>
    GnuPG-bug-id: 2236
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/keyedit.c b/g10/keyedit.c
index 7ddf342..200a1ab 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -350,8 +350,9 @@ sig_comparison (const void *av, const void *bv)
     return 1;
 
   ndataa = pubkey_get_nsig (a->pubkey_algo);
-  ndatab = pubkey_get_nsig (a->pubkey_algo);
-  log_assert (ndataa == ndatab);
+  ndatab = pubkey_get_nsig (b->pubkey_algo);
+  if (ndataa != ndatab)
+    return (ndataa < ndatab)? -1 : 1;
 
   for (i = 0; i < ndataa; i ++)
     {

commit d33b35f7481caa0dcb25f9fa7d6c5bb27895297a
Author: Werner Koch <wk at gnupg.org>
Date:   Mon May 9 20:57:20 2016 +0200

    gpg: Request a "save" after cmd "check" fixed something.
    
    * g10/keyedit.c (keyedit_menu) <cmdCHECK>: Set modified.
    --
    
    Reported-by: Guilhem Moulin <guilhem at fripost.org>
    GnuPG-bug-id: 2236
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/keyedit.c b/g10/keyedit.c
index 5461864..7ddf342 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -2206,8 +2206,9 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,
 	  break;
 
 	case cmdCHECK:
-	  check_all_keysigs (keyblock, count_selected_uids (keyblock),
-                             !strcmp (arg_string, "selfsig"));
+	  if (check_all_keysigs (keyblock, count_selected_uids (keyblock),
+                                 !strcmp (arg_string, "selfsig")))
+            modified = 1;
 	  break;
 
 	case cmdSIGN:

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

Summary of changes:
 g10/keyedit.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)


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



From cvs at cvs.gnupg.org  Tue May 10 08:30:29 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 10 May 2016 08:30:29 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. 8bdcda7bd619f8faca93eaafa77afc2df3c94664
Message-ID: <E1b01AH-0005AX-CW@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  8bdcda7bd619f8faca93eaafa77afc2df3c94664 (commit)
      from  adce0202b12c680ee3e64e2f51760608b53d5657 (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 8bdcda7bd619f8faca93eaafa77afc2df3c94664
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 10 08:29:25 2016 +0200

    drafts: Typo fixes for openpgp-webkey-services.
    
    Reported-by: Bernhard Reiter <bernhard at intevation.de>

diff --git a/misc/id/openpgp-webkey-service/middle.mkd b/misc/id/openpgp-webkey-service/middle.mkd
index 2de39e9..4dbca42 100644
--- a/misc/id/openpgp-webkey-service/middle.mkd
+++ b/misc/id/openpgp-webkey-service/middle.mkd
@@ -1,7 +1,7 @@
 # Introduction
 
 This memo describes a method to associate OpenPGP keys with a mail
-address and now to look them up using a web service with a well-known
+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.
 
@@ -32,7 +32,7 @@ due to the use of a wrong key.
 
 Methods to overcome this problem are
 
- - sending an initial unencrypted messages with the public key
+ - sending an initial unencrypted message with the public key
    attached,
  - using the OpenPGP DANE protocol to lookup the recipients key via
    the DNS.
@@ -48,7 +48,7 @@ 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 unnecessary identifies the local-part of the recipients mail
+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

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

Summary of changes:
 misc/id/openpgp-webkey-service/middle.mkd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


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



From cvs at cvs.gnupg.org  Tue May 10 08:42:47 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 10 May 2016 08:42:47 +0200
Subject: [git] GpgEX - branch, master, updated. gpgex-1.0.4-2-g689b4d2
Message-ID: <E1b01MB-0006QI-39@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 the Windows Explorer".

The branch, master has been updated
       via  689b4d294bf2a9c54e445e6775df9f634d84df1f (commit)
      from  7c7b69f19935e6b6927069f9f78515311071a0ec (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 689b4d294bf2a9c54e445e6775df9f634d84df1f
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 10 08:41:53 2016 +0200

    po: Fix Russian translation
    
    --
    GnuPG-bug-id: 2279

diff --git a/po/ru.po b/po/ru.po
index 13982d7..eb2ec5b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GpgEX\n"
 "Report-Msgid-Bugs-To: http://bugs.gnupg.org\n"
-"PO-Revision-Date: 2013-06-26 16:31+0200\n"
+"PO-Revision-Date: 2016-05-10 08:40+0200\n"
 "Last-Translator: Sergei Smirnov <moscow at hro.org>\n"
 "Language-Team: Sergei Smirnov <moscow at hro.org>\n"
 "Language: \n"
@@ -47,7 +47,7 @@ msgid "Verify"
 msgstr "?????????"
 
 msgid "Sign and encrypt"
-msgstr "????????? ? ???????????"
+msgstr "????????? ? ???????????"
 
 msgid "Encrypt"
 msgstr "???????????"

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

Summary of changes:
 po/ru.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GnupG extension for the Windows Explorer
http://git.gnupg.org



From cvs at cvs.gnupg.org  Tue May 10 10:29:25 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 10 May 2016 10:29:25 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-14-gfc38c15
Message-ID: <E1b031N-0005ly-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  fc38c15136c87ce971a8381fa87399088dd5a3cc (commit)
      from  e79199468ac54ce4fe919603ff7bada97267174f (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 fc38c15136c87ce971a8381fa87399088dd5a3cc
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 10 10:27:54 2016 +0200

    Allow cc to detect missing cases in a switch.
    
    * src/delete.c (delete_status_handler): Remove default case from a
    switch so that cc can check the use of all enum values.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/delete.c b/src/delete.c
index d20a5bf..d7fdf50 100644
--- a/src/delete.c
+++ b/src/delete.c
@@ -64,9 +64,9 @@ delete_status_handler (void *priv, gpgme_status_code_t code, char *args)
 	case DELETE_Ambiguous_Specification:
 	  return gpg_error (GPG_ERR_AMBIGUOUS_NAME);
 
-	default:
-	  return gpg_error (GPG_ERR_GENERAL);
 	}
+
+      return gpg_error (GPG_ERR_GENERAL);
     }
   else if (code == GPGME_STATUS_ERROR)
     {

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

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


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



From cvs at cvs.gnupg.org  Tue May 10 11:21:26 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 10 May 2016 11:21:26 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.12-5-gac9ff64
Message-ID: <E1b03pi-0000vz-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  ac9ff644b12c4dfa55d466af8ae6af54d1646893 (commit)
      from  693838f0125d5d0c963fa3771b1bd117702af697 (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 ac9ff644b12c4dfa55d466af8ae6af54d1646893
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 10 11:01:42 2016 +0200

    gpg: Allow unattended deletion of secret keys.
    
    * agent/command.c (cmd_delete_key): Make the --force option depend on
    --disallow-loopback-passphrase.
    * g10/call-agent.c (agent_delete_key): Add arg FORCE.
    * g10/delkey.c (do_delete_key): Pass opt.answer_yes to
    agent_delete_key.
    --
    
    Unless the agent has been configured with
    --disallow-loopback-passpharse an unattended deletion of a secret key
    is now possible with gpg by using --batch _and_ --yes.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/agent/command.c b/agent/command.c
index c94fdd3..dfbb831 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -2333,8 +2333,9 @@ cmd_export_key (assuan_context_t ctx, char *line)
 static const char hlp_delete_key[] =
   "DELETE_KEY [--force] <hexstring_with_keygrip>\n"
   "\n"
-  "Delete a secret key from the key store.\n"
-  "Unless --force is used the agent asks the user for confirmation.\n";
+  "Delete a secret key from the key store.  If --force is used\n"
+  "and a loopback pinentry is allowed, the agent will not ask\n"
+  "the user for confirmation.";
 static gpg_error_t
 cmd_delete_key (assuan_context_t ctx, char *line)
 {
@@ -2349,6 +2350,11 @@ cmd_delete_key (assuan_context_t ctx, char *line)
   force = has_option (line, "--force");
   line = skip_options (line);
 
+  /* If the use of a loopback pinentry has been disabled, we assume
+   * that a silent deletion of keys shall also not be allowed.  */
+  if (!opt.allow_loopback_pinentry)
+    force = 0;
+
   err = parse_keygrip (ctx, line, grip);
   if (err)
     goto leave;
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 2989d3b..b45874d 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -337,6 +337,10 @@ internal cache of @command{gpg-agent} with passphrases.
 Disallow or allow clients to use the loopback pinentry features; see
 the option @option{pinentry-mode} for details.  Allow is the default.
 
+The @option{--force} option of the Assuan command @command{DELETE_KEY}
+is also controlled by this option: The option is ignored if a loopback
+pinentry is disallowed.
+
 @item --no-allow-external-cache
 @opindex no-allow-external-cache
 Tell Pinentry not to enable features which use an external cache for
@@ -820,8 +824,17 @@ fi
 @section Agent's Assuan Protocol
 
 Note: this section does only document the protocol, which is used by
-GnuPG components; it does not deal with the ssh-agent protocol.
+GnuPG components; it does not deal with the ssh-agent protocol.  To
+see the full specification of each command, use
+
+ at example
+  gpg-connect-agent 'help COMMAND' /bye
+ at end example
 
+ at noindent
+or just 'help' to list all available commands.
+
+ at noindent
 The @command{gpg-agent} daemon is started on demand by the GnuPG
 components.
 
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 3cad361..a09e610 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -376,13 +376,20 @@ safeguard against accidental deletion of multiple keys.
 
 @item --delete-secret-keys @code{name}
 @opindex delete-secret-keys
-Remove key from the secret keyring. In batch mode the key
-must be specified by fingerprint.
+gRemove key from the secret keyring. In batch mode the key must be
+specified by fingerprint.  The option @option{--yes} can be used to
+advice gpg-agent not to request a confirmation.  This extra
+pre-caution is done because @command{gpg} can't be sure that the
+secret key (as controlled by gpg-agent) is only used for the given
+OpenPGP public key.
+
 
 @item --delete-secret-and-public-key @code{name}
 @opindex delete-secret-and-public-key
 Same as @option{--delete-key}, but if a secret key exists, it will be
 removed first. In batch mode the key must be specified by fingerprint.
+The option @option{--yes} can be used to advice gpg-agent not to
+request a confirmation.
 
 @item --export
 @opindex export
diff --git a/g10/call-agent.c b/g10/call-agent.c
index c5bd694..d8c6ded 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -2349,9 +2349,11 @@ agent_export_key (ctrl_t ctrl, const char *hexkeygrip, const char *desc,
 

 /* Ask the agent to delete the key identified by HEXKEYGRIP.  If DESC
    is not NULL, display DESC instead of the default description
-   message.  */
+   message.  If FORCE is true the agent is advised not to ask for
+   confirmation. */
 gpg_error_t
-agent_delete_key (ctrl_t ctrl, const char *hexkeygrip, const char *desc)
+agent_delete_key (ctrl_t ctrl, const char *hexkeygrip, const char *desc,
+                  int force)
 {
   gpg_error_t err;
   char line[ASSUAN_LINELENGTH];
@@ -2376,7 +2378,8 @@ agent_delete_key (ctrl_t ctrl, const char *hexkeygrip, const char *desc)
         return err;
     }
 
-  snprintf (line, DIM(line)-1, "DELETE_KEY %s", hexkeygrip);
+  snprintf (line, DIM(line)-1, "DELETE_KEY%s %s",
+            force? " --force":"", hexkeygrip);
   err = assuan_transact (agent_ctx, line, NULL, NULL,
                          default_inq_cb, &dfltparm,
                          NULL, NULL);
diff --git a/g10/call-agent.h b/g10/call-agent.h
index 208b75b..06a19d4 100644
--- a/g10/call-agent.h
+++ b/g10/call-agent.h
@@ -196,7 +196,7 @@ gpg_error_t agent_export_key (ctrl_t ctrl, const char *keygrip,
 
 /* Delete a key from the agent.  */
 gpg_error_t agent_delete_key (ctrl_t ctrl, const char *hexkeygrip,
-                              const char *desc);
+                              const char *desc, int force);
 
 /* Change the passphrase of a key.  */
 gpg_error_t agent_passwd (ctrl_t ctrl, const char *hexkeygrip, const char *desc,
diff --git a/g10/delkey.c b/g10/delkey.c
index f76277c..966c571 100644
--- a/g10/delkey.c
+++ b/g10/delkey.c
@@ -184,8 +184,14 @@ do_delete_key( const char *username, int secret, int force, int *r_sec_avail )
               prompt = gpg_format_keydesc (node->pkt->pkt.public_key,
                                            FORMAT_KEYDESC_DELKEY, 1);
               err = hexkeygrip_from_pk (node->pkt->pkt.public_key, &hexgrip);
+              /* NB: We require --yes to advise the agent not to
+               * request a confirmation.  The rationale for this extra
+               * pre-caution is that since 2.1 the secret key may also
+               * be used for other protocols and thus deleting it from
+               * the gpg would also delete the key for other tools. */
               if (!err)
-                err = agent_delete_key (NULL, hexgrip, prompt);
+                err = agent_delete_key (NULL, hexgrip, prompt,
+                                        opt.answer_yes);
               xfree (prompt);
               xfree (hexgrip);
               if (err)

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

Summary of changes:
 agent/command.c    | 10 ++++++++--
 doc/gpg-agent.texi | 15 ++++++++++++++-
 doc/gpg.texi       | 11 +++++++++--
 g10/call-agent.c   |  9 ++++++---
 g10/call-agent.h   |  2 +-
 g10/delkey.c       |  8 +++++++-
 6 files changed, 45 insertions(+), 10 deletions(-)


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



From cvs at cvs.gnupg.org  Tue May 10 14:34:33 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Tue, 10 May 2016 14:34:33 +0200
Subject: [git] GPGME - branch, gpgmepp, updated. gpgme-1.6.0-59-gb7d5c2c
Message-ID: <E1b06qb-00051I-DR@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, gpgmepp has been updated
       via  b7d5c2cced796d4092a9f424368fc999165f9d13 (commit)
       via  56c4d9ea9520c95612e525b2fa1359db6fa88f4a (commit)
       via  97225bb01cd2ffa1d84c7fedbc577275de4a4893 (commit)
       via  740f92a7b83389ee9bde98b7bd25556793500b8b (commit)
       via  0e3195948ddaba3af07d2415bb496491076edc17 (commit)
      from  a579be82c84f0b9732ee3d52ff2142a3decf95d7 (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 b7d5c2cced796d4092a9f424368fc999165f9d13
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue May 10 14:32:22 2016 +0200

    Qt: Fix unkonwn doxygen keyword warnings
    
    --
    Reimp is not a keqword and we inherit documentation anyway.

diff --git a/lang/qt/src/dataprovider.h b/lang/qt/src/dataprovider.h
index 672980a..337f264 100644
--- a/lang/qt/src/dataprovider.h
+++ b/lang/qt/src/dataprovider.h
@@ -50,18 +50,13 @@ public:
 private:
     // these shall only be accessed through the dataprovider
     // interface, where they're public:
-    /*! \reimp */
     bool isSupported(Operation) const
     {
         return true;
     }
-    /*! \reimp */
     ssize_t read(void *buffer, size_t bufSize);
-    /*! \reimp */
     ssize_t write(const void *buffer, size_t bufSize);
-    /*! \reimp */
     off_t seek(off_t offset, int whence);
-    /*! \reimp */
     void release();
 
 private:
@@ -83,15 +78,10 @@ public:
 private:
     // these shall only be accessed through the dataprovider
     // interface, where they're public:
-    /*! \reimp */
     bool isSupported(Operation) const;
-    /*! \reimp */
     ssize_t read(void *buffer, size_t bufSize);
-    /*! \reimp */
     ssize_t write(const void *buffer, size_t bufSize);
-    /*! \reimp */
     off_t seek(off_t offset, int whence);
-    /*! \reimp */
     void release();
 
 private:
diff --git a/lang/qt/src/hierarchicalkeylistjob.h b/lang/qt/src/hierarchicalkeylistjob.h
index 7cc519a..2ec187d 100644
--- a/lang/qt/src/hierarchicalkeylistjob.h
+++ b/lang/qt/src/hierarchicalkeylistjob.h
@@ -101,7 +101,7 @@ public:
 private Q_SLOTS:
     void slotResult(const GpgME::KeyListResult &);
     void slotNextKey(const GpgME::Key &key);
-    /*! \reimp from Job */
+    /* from Job */
     void slotCancel() Q_DECL_OVERRIDE;
 
 private:
diff --git a/lang/qt/src/multideletejob.h b/lang/qt/src/multideletejob.h
index fca73d0..8915cd1 100644
--- a/lang/qt/src/multideletejob.h
+++ b/lang/qt/src/multideletejob.h
@@ -82,7 +82,7 @@ public:
     */
     GpgME::Error start(const std::vector<GpgME::Key> &keys, bool allowSecretKeyDeletion = false);
 
-    /*! \reimp from Job */
+    /* from Job */
     void slotCancel() Q_DECL_OVERRIDE;
 
 Q_SIGNALS:
diff --git a/lang/qt/src/qgpgmeadduseridjob.h b/lang/qt/src/qgpgmeadduseridjob.h
index f77b3c8..294eb6c 100644
--- a/lang/qt/src/qgpgmeadduseridjob.h
+++ b/lang/qt/src/qgpgmeadduseridjob.h
@@ -57,7 +57,7 @@ public:
     explicit QGpgMEAddUserIDJob(GpgME::Context *context);
     ~QGpgMEAddUserIDJob();
 
-    /*! \reimp from AddUserIDJob */
+    /* from AddUserIDJob */
     GpgME::Error start(const GpgME::Key &key, const QString &name, const QString &email, const QString &comment) Q_DECL_OVERRIDE;
 };
 }
diff --git a/lang/qt/src/qgpgmechangeexpiryjob.h b/lang/qt/src/qgpgmechangeexpiryjob.h
index fab1259..4abdf78 100644
--- a/lang/qt/src/qgpgmechangeexpiryjob.h
+++ b/lang/qt/src/qgpgmechangeexpiryjob.h
@@ -57,7 +57,7 @@ public:
     explicit QGpgMEChangeExpiryJob(GpgME::Context *context);
     ~QGpgMEChangeExpiryJob();
 
-    /*! \reimp from ChangeExpiryJob */
+    /* from ChangeExpiryJob */
     GpgME::Error start(const GpgME::Key &key, const QDateTime &expiry) Q_DECL_OVERRIDE;
 };
 
diff --git a/lang/qt/src/qgpgmechangeownertrustjob.h b/lang/qt/src/qgpgmechangeownertrustjob.h
index 7ff03a3..7740616 100644
--- a/lang/qt/src/qgpgmechangeownertrustjob.h
+++ b/lang/qt/src/qgpgmechangeownertrustjob.h
@@ -57,7 +57,7 @@ public:
     explicit QGpgMEChangeOwnerTrustJob(GpgME::Context *context);
     ~QGpgMEChangeOwnerTrustJob();
 
-    /*! \reimp from ChangeOwnerTrustJob */
+    /* from ChangeOwnerTrustJob */
     GpgME::Error start(const GpgME::Key &key, GpgME::Key::OwnerTrust trust) Q_DECL_OVERRIDE;
 };
 }
diff --git a/lang/qt/src/qgpgmechangepasswdjob.h b/lang/qt/src/qgpgmechangepasswdjob.h
index 1531e76..e37789e 100644
--- a/lang/qt/src/qgpgmechangepasswdjob.h
+++ b/lang/qt/src/qgpgmechangepasswdjob.h
@@ -57,7 +57,7 @@ public:
     explicit QGpgMEChangePasswdJob(GpgME::Context *context);
     ~QGpgMEChangePasswdJob();
 
-    /*! \reimp from ChangePasswdJob */
+    /* from ChangePasswdJob */
     GpgME::Error start(const GpgME::Key &key) Q_DECL_OVERRIDE;
 };
 
diff --git a/lang/qt/src/qgpgmedecryptjob.h b/lang/qt/src/qgpgmedecryptjob.h
index e7ed04f..5335e84 100644
--- a/lang/qt/src/qgpgmedecryptjob.h
+++ b/lang/qt/src/qgpgmedecryptjob.h
@@ -63,17 +63,17 @@ public:
     explicit QGpgMEDecryptJob(GpgME::Context *context);
     ~QGpgMEDecryptJob();
 
-    /*! \reimp from DecryptJob */
+    /* from DecryptJob */
     GpgME::Error start(const QByteArray &cipherText) Q_DECL_OVERRIDE;
 
-    /*! \reimp from DecryptJob */
+    /* from DecryptJob */
     void start(const std::shared_ptr<QIODevice> &cipherText, const std::shared_ptr<QIODevice> &plainText) Q_DECL_OVERRIDE;
 
-    /*! \reimp from DecryptJob */
+    /* from DecryptJob */
     GpgME::DecryptionResult exec(const QByteArray &cipherText,
                                  QByteArray &plainText) Q_DECL_OVERRIDE;
 
-    /*! \reimp from ThreadedJobMixin */
+    /* from ThreadedJobMixin */
     void resultHook(const result_type &r) Q_DECL_OVERRIDE;
 
 private:
diff --git a/lang/qt/src/qgpgmedecryptverifyjob.h b/lang/qt/src/qgpgmedecryptverifyjob.h
index 4a209b9..de2bce7 100644
--- a/lang/qt/src/qgpgmedecryptverifyjob.h
+++ b/lang/qt/src/qgpgmedecryptverifyjob.h
@@ -68,17 +68,17 @@ public:
     explicit QGpgMEDecryptVerifyJob(GpgME::Context *context);
     ~QGpgMEDecryptVerifyJob();
 
-    /*! \reimp from DecryptVerifyJob */
+    /* from DecryptVerifyJob */
     GpgME::Error start(const QByteArray &cipherText) Q_DECL_OVERRIDE;
 
-    /*! \reimp from DecryptVerifyJob */
+    /* from DecryptVerifyJob */
     void start(const std::shared_ptr<QIODevice> &cipherText, const std::shared_ptr<QIODevice> &plainText) Q_DECL_OVERRIDE;
 
-    /*! \reimp from DecryptVerifyJob */
+    /* from DecryptVerifyJob */
     std::pair<GpgME::DecryptionResult, GpgME::VerificationResult>
     exec(const QByteArray &cipherText, QByteArray &plainText) Q_DECL_OVERRIDE;
 
-    /*! \reimp from ThreadedJobMixin */
+    /* from ThreadedJobMixin */
     void resultHook(const result_type &r) Q_DECL_OVERRIDE;
 
 private:
diff --git a/lang/qt/src/qgpgmedeletejob.h b/lang/qt/src/qgpgmedeletejob.h
index a2b0d10..992442f 100644
--- a/lang/qt/src/qgpgmedeletejob.h
+++ b/lang/qt/src/qgpgmedeletejob.h
@@ -62,7 +62,7 @@ public:
     explicit QGpgMEDeleteJob(GpgME::Context *context);
     ~QGpgMEDeleteJob();
 
-    /*! \reimp from DeleteJob */
+    /* from DeleteJob */
     GpgME::Error start(const GpgME::Key &key, bool allowSecretKeyDeletion) Q_DECL_OVERRIDE;
 };
 
diff --git a/lang/qt/src/qgpgmedownloadjob.h b/lang/qt/src/qgpgmedownloadjob.h
index b1120d1..4091190 100644
--- a/lang/qt/src/qgpgmedownloadjob.h
+++ b/lang/qt/src/qgpgmedownloadjob.h
@@ -57,10 +57,10 @@ public:
     explicit QGpgMEDownloadJob(GpgME::Context *context);
     ~QGpgMEDownloadJob();
 
-    /*! \reimp from DownloadJob */
+    /* from DownloadJob */
     GpgME::Error start(const QStringList &fingerprints) Q_DECL_OVERRIDE;
 
-    /*! \reimp from DownloadJob */
+    /* from DownloadJob */
     GpgME::Error start(const QByteArray &fingerprint, const std::shared_ptr<QIODevice> &keyData) Q_DECL_OVERRIDE;
 };
 
diff --git a/lang/qt/src/qgpgmeencryptjob.h b/lang/qt/src/qgpgmeencryptjob.h
index fc6ad5f..d35a41b 100644
--- a/lang/qt/src/qgpgmeencryptjob.h
+++ b/lang/qt/src/qgpgmeencryptjob.h
@@ -68,25 +68,25 @@ public:
     explicit QGpgMEEncryptJob(GpgME::Context *context);
     ~QGpgMEEncryptJob();
 
-    /*! \reimp from EncryptJob */
+    /* from EncryptJob */
     GpgME::Error start(const std::vector<GpgME::Key> &recipients,
                        const QByteArray &plainText, bool alwaysTrust) Q_DECL_OVERRIDE;
 
-    /*! \reimp from EncryptJob */
+    /* from EncryptJob */
     void start(const std::vector<GpgME::Key> &recipients,
                const std::shared_ptr<QIODevice> &plainText,
                const std::shared_ptr<QIODevice> &cipherText,
                bool alwaysTrust) Q_DECL_OVERRIDE;
 
-    /*! \reimp from EncryptJob */
+    /* from EncryptJob */
     GpgME::EncryptionResult exec(const std::vector<GpgME::Key> &recipients,
                                  const QByteArray &plainText, bool alwaysTrust,
                                  QByteArray &cipherText) Q_DECL_OVERRIDE;
 
-    /*! \reimp from EncryptJob */
+    /* from EncryptJob */
     void setOutputIsBase64Encoded(bool on) Q_DECL_OVERRIDE;
 
-    /*! \reimp from ThreadedJobMixin */
+    /* from ThreadedJobMixin */
     void resultHook(const result_type &r) Q_DECL_OVERRIDE;
 
 private:
diff --git a/lang/qt/src/qgpgmeexportjob.h b/lang/qt/src/qgpgmeexportjob.h
index 703687c..7561054 100644
--- a/lang/qt/src/qgpgmeexportjob.h
+++ b/lang/qt/src/qgpgmeexportjob.h
@@ -57,7 +57,7 @@ public:
     explicit QGpgMEExportJob(GpgME::Context *context);
     ~QGpgMEExportJob();
 
-    /*! \reimp from ExportJob */
+    /* from ExportJob */
     GpgME::Error start(const QStringList &patterns) Q_DECL_OVERRIDE;
 };
 
diff --git a/lang/qt/src/qgpgmeimportfromkeyserverjob.h b/lang/qt/src/qgpgmeimportfromkeyserverjob.h
index f50dae0..8c9f944 100644
--- a/lang/qt/src/qgpgmeimportfromkeyserverjob.h
+++ b/lang/qt/src/qgpgmeimportfromkeyserverjob.h
@@ -63,13 +63,13 @@ public:
     explicit QGpgMEImportFromKeyserverJob(GpgME::Context *context);
     ~QGpgMEImportFromKeyserverJob();
 
-    /*! \reimp from ImportFromKeyserverJob */
+    /* from ImportFromKeyserverJob */
     GpgME::Error start(const std::vector<GpgME::Key> &keys) Q_DECL_OVERRIDE;
 
-    /*! \reimp from ImportFromKeyserverJob */
+    /* from ImportFromKeyserverJob */
     GpgME::ImportResult exec(const std::vector<GpgME::Key> &keys) Q_DECL_OVERRIDE;
 
-    /*! \reimp from ThreadedJobMixin */
+    /* from ThreadedJobMixin */
     void resultHook(const result_type &r) Q_DECL_OVERRIDE;
 
 private:
diff --git a/lang/qt/src/qgpgmeimportjob.h b/lang/qt/src/qgpgmeimportjob.h
index 5a55fc9..424cb50 100644
--- a/lang/qt/src/qgpgmeimportjob.h
+++ b/lang/qt/src/qgpgmeimportjob.h
@@ -63,13 +63,13 @@ public:
     explicit QGpgMEImportJob(GpgME::Context *context);
     ~QGpgMEImportJob();
 
-    /*! \reimp from ImportJob */
+    /* from ImportJob */
     GpgME::Error start(const QByteArray &keyData) Q_DECL_OVERRIDE;
 
-    /*! \reimp from ImportJob */
+    /* from ImportJob */
     GpgME::ImportResult exec(const QByteArray &keyData) Q_DECL_OVERRIDE;
 
-    /*! \reimp from ThreadedJobMixin */
+    /* from ThreadedJobMixin */
     void resultHook(const result_type &r) Q_DECL_OVERRIDE;
 
 private:
diff --git a/lang/qt/src/qgpgmekeygenerationjob.h b/lang/qt/src/qgpgmekeygenerationjob.h
index fb09b03..808b714 100644
--- a/lang/qt/src/qgpgmekeygenerationjob.h
+++ b/lang/qt/src/qgpgmekeygenerationjob.h
@@ -63,7 +63,7 @@ public:
     explicit QGpgMEKeyGenerationJob(GpgME::Context *context);
     ~QGpgMEKeyGenerationJob();
 
-    /*! \reimp from KeygenerationJob */
+    /* from KeygenerationJob */
     GpgME::Error start(const QString &parameters) Q_DECL_OVERRIDE;
 };
 
diff --git a/lang/qt/src/qgpgmekeylistjob.h b/lang/qt/src/qgpgmekeylistjob.h
index 292f2bb..cbe1e94 100644
--- a/lang/qt/src/qgpgmekeylistjob.h
+++ b/lang/qt/src/qgpgmekeylistjob.h
@@ -68,13 +68,13 @@ public:
     explicit QGpgMEKeyListJob(GpgME::Context *context);
     ~QGpgMEKeyListJob();
 
-    /*! \reimp from KeyListJob */
+    /* from KeyListJob */
     GpgME::Error start(const QStringList &patterns, bool secretOnly) Q_DECL_OVERRIDE;
 
-    /*! \reimp from KeyListJob */
+    /* from KeyListJob */
     GpgME::KeyListResult exec(const QStringList &patterns, bool secretOnly, std::vector<GpgME::Key> &keys) Q_DECL_OVERRIDE;
 
-    /*! \reimp from ThreadedJobMixin */
+    /* from ThreadedJobMixin */
     void resultHook(const result_type &result) Q_DECL_OVERRIDE;
 
 private:
diff --git a/lang/qt/src/qgpgmelistallkeysjob.h b/lang/qt/src/qgpgmelistallkeysjob.h
index 310eabd..1fc69d4 100644
--- a/lang/qt/src/qgpgmelistallkeysjob.h
+++ b/lang/qt/src/qgpgmelistallkeysjob.h
@@ -68,13 +68,13 @@ public:
     explicit QGpgMEListAllKeysJob(GpgME::Context *context);
     ~QGpgMEListAllKeysJob();
 
-    /*! \reimp from ListAllKeysJob */
+    /* from ListAllKeysJob */
     GpgME::Error start(bool mergeKeys) Q_DECL_OVERRIDE;
 
-    /*! \reimp from ListAllKeysJob */
+    /* from ListAllKeysJob */
     GpgME::KeyListResult exec(std::vector<GpgME::Key> &pub, std::vector<GpgME::Key> &sec, bool mergeKeys) Q_DECL_OVERRIDE;
 
-    /*! \reimp from ThreadedJobMixin */
+    /* from ThreadedJobMixin */
     void resultHook(const result_type &result) Q_DECL_OVERRIDE;
 
 private:
diff --git a/lang/qt/src/qgpgmerefreshkeysjob.h b/lang/qt/src/qgpgmerefreshkeysjob.h
index da928f3..2a54e38 100644
--- a/lang/qt/src/qgpgmerefreshkeysjob.h
+++ b/lang/qt/src/qgpgmerefreshkeysjob.h
@@ -54,11 +54,11 @@ public:
     QGpgMERefreshKeysJob();
     ~QGpgMERefreshKeysJob();
 
-    /*! \reimp from RefreshKeysJob */
+    /* from RefreshKeysJob */
     GpgME::Error start(const QStringList &patterns) Q_DECL_OVERRIDE;
 
 private Q_SLOTS:
-    /*! \reimp from Job */
+    /* from Job */
     void slotCancel() Q_DECL_OVERRIDE;
 
     void slotStatus(QProcess *, const QString &, const QStringList &);
diff --git a/lang/qt/src/qgpgmesecretkeyexportjob.h b/lang/qt/src/qgpgmesecretkeyexportjob.h
index c58e853..ad53f99 100644
--- a/lang/qt/src/qgpgmesecretkeyexportjob.h
+++ b/lang/qt/src/qgpgmesecretkeyexportjob.h
@@ -57,11 +57,11 @@ public:
     QGpgMESecretKeyExportJob(bool armour, const QString &charset);
     ~QGpgMESecretKeyExportJob();
 
-    /*! \reimp from ExportJob */
+    /* from ExportJob */
     GpgME::Error start(const QStringList &patterns) Q_DECL_OVERRIDE;
 
 private Q_SLOTS:
-    /*! \reimp from Job */
+    /* from Job */
     void slotCancel() Q_DECL_OVERRIDE;
 
     void slotStdout();
diff --git a/lang/qt/src/qgpgmesignencryptjob.h b/lang/qt/src/qgpgmesignencryptjob.h
index bf1439c..49177d3 100644
--- a/lang/qt/src/qgpgmesignencryptjob.h
+++ b/lang/qt/src/qgpgmesignencryptjob.h
@@ -75,12 +75,12 @@ public:
     explicit QGpgMESignEncryptJob(GpgME::Context *context);
     ~QGpgMESignEncryptJob();
 
-    /*! \reimp from SignEncryptJob */
+    /* from SignEncryptJob */
     GpgME::Error start(const std::vector<GpgME::Key> &signers,
                        const std::vector<GpgME::Key> &recipients,
                        const QByteArray &plainText, bool alwaysTrust) Q_DECL_OVERRIDE;
 
-    /*! \reimp from SignEncryptJob */
+    /* from SignEncryptJob */
     void start(const std::vector<GpgME::Key> &signers,
                const std::vector<GpgME::Key> &recipients,
                const std::shared_ptr<QIODevice> &plainText,
@@ -93,10 +93,10 @@ public:
          const QByteArray &plainText, bool alwaysTrust,
          QByteArray &cipherText) Q_DECL_OVERRIDE;
 
-    /*! \reimp from SignEncryptJob */
+    /* from SignEncryptJob */
     void setOutputIsBase64Encoded(bool on) Q_DECL_OVERRIDE;
 
-    /*! \reimp from ThreadedJobMixin */
+    /* from ThreadedJobMixin */
     void resultHook(const result_type &r) Q_DECL_OVERRIDE;
 
 private:
diff --git a/lang/qt/src/qgpgmesignjob.h b/lang/qt/src/qgpgmesignjob.h
index 8ad35ed..1d4a174 100644
--- a/lang/qt/src/qgpgmesignjob.h
+++ b/lang/qt/src/qgpgmesignjob.h
@@ -68,27 +68,27 @@ public:
     explicit QGpgMESignJob(GpgME::Context *context);
     ~QGpgMESignJob();
 
-    /*! \reimp from SignJob */
+    /* from SignJob */
     GpgME::Error start(const std::vector<GpgME::Key> &signers,
                        const QByteArray &plainText,
                        GpgME::SignatureMode mode) Q_DECL_OVERRIDE;
 
-    /*! \reimp from SignJob */
+    /* from SignJob */
     void start(const std::vector<GpgME::Key> &signers,
                const std::shared_ptr<QIODevice> &plainText,
                const std::shared_ptr<QIODevice> &signature,
                GpgME::SignatureMode mode) Q_DECL_OVERRIDE;
 
-    /*! \reimp from SignJob */
+    /* from SignJob */
     GpgME::SigningResult exec(const std::vector<GpgME::Key> &signers,
                               const QByteArray &plainText,
                               GpgME::SignatureMode mode,
                               QByteArray &signature) Q_DECL_OVERRIDE;
 
-    /*! \reimp from SignJob */
+    /* from SignJob */
     void setOutputIsBase64Encoded(bool on) Q_DECL_OVERRIDE;
 
-    /*! \reimp from ThreadedJobMixin */
+    /* from ThreadedJobMixin */
     void resultHook(const result_type &r) Q_DECL_OVERRIDE;
 
 private:
diff --git a/lang/qt/src/qgpgmesignkeyjob.h b/lang/qt/src/qgpgmesignkeyjob.h
index 6b610ac..6cdb7db 100644
--- a/lang/qt/src/qgpgmesignkeyjob.h
+++ b/lang/qt/src/qgpgmesignkeyjob.h
@@ -63,22 +63,22 @@ public:
     explicit QGpgMESignKeyJob(GpgME::Context *context);
     ~QGpgMESignKeyJob();
 
-    /*! \reimp from SignKeyJob */
+    /* from SignKeyJob */
     GpgME::Error start(const GpgME::Key &key) Q_DECL_OVERRIDE;
 
-    /*! \reimp from SignKeyJob */
+    /* from SignKeyJob */
     void setUserIDsToSign(const std::vector<unsigned int> &idsToSign) Q_DECL_OVERRIDE;
 
-    /*! \reimp from SignKeyJob */
+    /* from SignKeyJob */
     void setCheckLevel(unsigned int checkLevel) Q_DECL_OVERRIDE;
 
-    /*! \reimp from SignKeyJob */
+    /* from SignKeyJob */
     void setExportable(bool exportable) Q_DECL_OVERRIDE;
 
-    /*! \reimp from SignKeyJob */
+    /* from SignKeyJob */
     void setSigningKey(const GpgME::Key &key) Q_DECL_OVERRIDE;
 
-    /*! \reimp from SignKeyJob */
+    /* from SignKeyJob */
     void setNonRevocable(bool nonRevocable) Q_DECL_OVERRIDE;
 
 private:
diff --git a/lang/qt/src/qgpgmeverifydetachedjob.h b/lang/qt/src/qgpgmeverifydetachedjob.h
index 6f6257c..051caf0 100644
--- a/lang/qt/src/qgpgmeverifydetachedjob.h
+++ b/lang/qt/src/qgpgmeverifydetachedjob.h
@@ -63,17 +63,17 @@ public:
     explicit QGpgMEVerifyDetachedJob(GpgME::Context *context);
     ~QGpgMEVerifyDetachedJob();
 
-    /*! \reimp from VerifyDetachedJob */
+    /* from VerifyDetachedJob */
     GpgME::Error start(const QByteArray &signature, const QByteArray &signedData) Q_DECL_OVERRIDE;
 
-    /*! \reimp from VerifyDetachedJob */
+    /* from VerifyDetachedJob */
     void start(const std::shared_ptr<QIODevice> &signature, const std::shared_ptr<QIODevice> &signedData) Q_DECL_OVERRIDE;
 
-    /*! \reimp from VerifyDetachedJob */
+    /* from VerifyDetachedJob */
     GpgME::VerificationResult exec(const QByteArray &signature,
                                    const QByteArray &signedData) Q_DECL_OVERRIDE;
 
-    /*! \reimp from ThreadedJobMixin */
+    /* from ThreadedJobMixin */
     void resultHook(const result_type &r) Q_DECL_OVERRIDE;
 
 private:
diff --git a/lang/qt/src/qgpgmeverifyopaquejob.h b/lang/qt/src/qgpgmeverifyopaquejob.h
index 2374cee..87c94a3 100644
--- a/lang/qt/src/qgpgmeverifyopaquejob.h
+++ b/lang/qt/src/qgpgmeverifyopaquejob.h
@@ -63,16 +63,16 @@ public:
     explicit QGpgMEVerifyOpaqueJob(GpgME::Context *context);
     ~QGpgMEVerifyOpaqueJob();
 
-    /*! \reimp from VerifyOpaqueJob */
+    /* from VerifyOpaqueJob */
     GpgME::Error start(const QByteArray &signedData) Q_DECL_OVERRIDE;
 
-    /*! \reimp from VerifyOpaqueJob */
+    /* from VerifyOpaqueJob */
     void start(const std::shared_ptr<QIODevice> &signedData, const std::shared_ptr<QIODevice> &plainText) Q_DECL_OVERRIDE;
 
-    /*! \reimp form VerifyOpaqueJob */
+    /* form VerifyOpaqueJob */
     GpgME::VerificationResult exec(const QByteArray &signedData, QByteArray &plainData) Q_DECL_OVERRIDE;
 
-    /*! \reimp from ThreadedJobMixin */
+    /* from ThreadedJobMixin */
     void resultHook(const result_type &r) Q_DECL_OVERRIDE;
 
 private:

commit 56c4d9ea9520c95612e525b2fa1359db6fa88f4a
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue May 10 14:05:10 2016 +0200

    Qt: Make Protocol class public API
    
    * lang/qt/src/Makefile.am (qgpgme_headers): Add protocol.h
    (private_qgpgme_headers): Add protocol_p.h
    * lang/qt/src/protocol.h: New. From QGpgMEBackend.
    * lang/qt/src/protocol_p.h: New. From QGpgMEBackend.
    * lang/qt/src/qgpgmebackend.h,
    lang/qt/src/qgpgmebackend.cpp (Protocol): Removed.
    
    --
    The backend class does not make much sense anymore as we
    only have the GpgME backend obviously. It's purpose was
    for Libkleo's Backend abstraction.

diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am
index 30c24b9..7de3ef6 100644
--- a/lang/qt/src/Makefile.am
+++ b/lang/qt/src/Makefile.am
@@ -49,6 +49,7 @@ qgpgme_headers= \
     hierarchicalkeylistjob.h \
     job.h \
     multideletejob.h \
+    protocol.h \
     qgpgme_export.h \
     qgpgmenewcryptoconfig.h \
     signjob.h \
@@ -67,6 +68,7 @@ qgpgme_headers= \
 private_qgpgme_headers = \
     qgpgme_export.h \
     abstractimportjob.h \
+    protocol_p.h \
     qgpgmeadduseridjob.h \
     qgpgmebackend.h \
     qgpgmechangeexpiryjob.h \
diff --git a/lang/qt/src/qgpgmebackend.h b/lang/qt/src/protocol.h
similarity index 77%
copy from lang/qt/src/qgpgmebackend.h
copy to lang/qt/src/protocol.h
index 3b03633..5162fe6 100644
--- a/lang/qt/src/qgpgmebackend.h
+++ b/lang/qt/src/protocol.h
@@ -1,5 +1,5 @@
 /*
-    qgpgmebackend.h
+    protocol.h
 
     This file is part of qgpgme, the Qt API binding for gpgme
     Copyright (c) 2004,2005 Klar?lvdalens Datakonsult AB
@@ -30,14 +30,15 @@
     you do not wish to do so, delete this exception statement from
     your version.
 */
-
-#ifndef __QGPGME_QGPGMEBACKEND_H__
-#define __QGPGME_QGPGMEBACKEND_H__
+#ifndef __QGPGME_PROTOCOL_H__
+#define __QGPGME_PROTOCOL_H__
 
 #include <QString>
+#include <QVariant>
 
-namespace QGpgME
-{
+#include "qgpgme_export.h"
+
+namespace QGpgME {
 class CryptoConfig;
 class KeyListJob;
 class ListAllKeysJob;
@@ -61,72 +62,8 @@ class ChangeOwnerTrustJob;
 class ChangePasswdJob;
 class AddUserIDJob;
 class SpecialJob;
-}
 
-class QString;
-class QVariant;
-template <typename T_Key, typename T_Value> class QMap;
-
-namespace QGpgME
-{
-class CryptoConfig;
-class Protocol;
-
-/** Obtain a reference to the OpenPGP Protocol.
- *
- * The reference is to a static object.
- * @returns Refrence to the OpenPGP Protocol.
- */
-Protocol *openpgp();
-
-/** Obtain a reference to the smime Protocol.
- *
- * The reference is to a static object.
- * @returns Refrence to the smime Protocol.
- */
-Protocol *smime();
-
-class QGpgMEBackend
-{
-public:
-    QGpgMEBackend();
-    ~QGpgMEBackend();
-
-    QString name() const;
-    QString displayName() const;
-
-    CryptoConfig *config() const;
-
-    Protocol *openpgp() const;
-    Protocol *smime() const;
-    Protocol *protocol(const char *name) const;
-
-    static const char OpenPGP[];
-    static const char SMIME[];
-
-    bool checkForOpenPGP(QString *reason = Q_NULLPTR) const;
-    bool checkForSMIME(QString *reason = Q_NULLPTR) const;
-    bool checkForProtocol(const char *name, QString *reason) const;
-
-    bool supportsOpenPGP() const
-    {
-        return true;
-    }
-    bool supportsSMIME() const
-    {
-        return true;
-    }
-    bool supportsProtocol(const char *name) const;
-
-    const char *enumerateProtocols(int i) const;
-
-private:
-    mutable QGpgME::CryptoConfig *mCryptoConfig;
-    mutable Protocol *mOpenPGPProtocol;
-    mutable Protocol *mSMIMEProtocol;
-};
-
-class Protocol
+class QGPGME_EXPORT Protocol
 {
 public:
     virtual ~Protocol() {}
@@ -161,6 +98,26 @@ public:
     virtual SpecialJob           *specialJob(const char *type, const QMap<QString, QVariant> &args) const = 0;
 };
 
-}
+/** Obtain a reference to the OpenPGP Protocol.
+ *
+ * The reference is to a static object.
+ * @returns Refrence to the OpenPGP Protocol.
+ */
+QGPGME_EXPORT Protocol *openpgp();
+
+/** Obtain a reference to the smime Protocol.
+ *
+ * The reference is to a static object.
+ * @returns Refrence to the smime Protocol.
+ */
+QGPGME_EXPORT Protocol *smime();
+
+/** Obtain a reference to a cryptoConfig object.
+ *
+ * The reference is to a static object.
+ * @returns reference to cryptoConfig object.
+ */
+QGPGME_EXPORT CryptoConfig *cryptoConfig();
 
-#endif // __QGPGME_QGPGMEBACKEND_H__
+}
+#endif
diff --git a/lang/qt/src/qgpgmebackend.cpp b/lang/qt/src/protocol_p.h
similarity index 74%
copy from lang/qt/src/qgpgmebackend.cpp
copy to lang/qt/src/protocol_p.h
index 27cd178..d6c5625 100644
--- a/lang/qt/src/qgpgmebackend.cpp
+++ b/lang/qt/src/protocol_p.h
@@ -1,5 +1,5 @@
 /*
-    qgpgmebackend.cpp
+    protocol_p.h
 
     This file is part of qgpgme, the Qt API binding for gpgme
     Copyright (c) 2004,2005 Klar?lvdalens Datakonsult AB
@@ -30,9 +30,8 @@
     you do not wish to do so, delete this exception statement from
     your version.
 */
-
-#include "qgpgmebackend.h"
-
+#ifndef __QGPGME_PROTOCOL_P_H__
+#define __QGPGME_PROTOCOL_P_H__
 #include "qgpgmenewcryptoconfig.h"
 
 #include "qgpgmekeygenerationjob.h"
@@ -58,15 +57,6 @@
 #include "qgpgmechangepasswdjob.h"
 #include "qgpgmeadduseridjob.h"
 
-#include "error.h"
-#include "engineinfo.h"
-
-#include <QFile>
-#include <QString>
-
-const char QGpgME::QGpgMEBackend::OpenPGP[] = "OpenPGP";
-const char QGpgME::QGpgMEBackend::SMIME[] = "SMIME";
-
 namespace
 {
 
@@ -378,150 +368,4 @@ public:
 };
 
 }
-
-QGpgME::QGpgMEBackend::QGpgMEBackend()
-    : mCryptoConfig(0),
-      mOpenPGPProtocol(0),
-      mSMIMEProtocol(0)
-{
-    GpgME::initializeLibrary();
-}
-
-QGpgME::QGpgMEBackend::~QGpgMEBackend()
-{
-    delete mCryptoConfig; mCryptoConfig = 0;
-    delete mOpenPGPProtocol; mOpenPGPProtocol = 0;
-    delete mSMIMEProtocol; mSMIMEProtocol = 0;
-}
-
-QString QGpgME::QGpgMEBackend::name() const
-{
-    return QStringLiteral("gpgme");
-}
-
-QString QGpgME::QGpgMEBackend::displayName() const
-{
-    return QStringLiteral("GpgME");
-}
-
-QGpgME::CryptoConfig *QGpgME::QGpgMEBackend::config() const
-{
-    if (!mCryptoConfig) {
-        if (GpgME::hasFeature(GpgME::GpgConfEngineFeature, 0)) {
-            mCryptoConfig = new QGpgMENewCryptoConfig;
-        }
-    }
-    return mCryptoConfig;
-}
-
-static bool check(GpgME::Protocol proto, QString *reason)
-{
-    if (!GpgME::checkEngine(proto)) {
-        return true;
-    }
-    if (!reason) {
-        return false;
-    }
-    // error, check why:
-#if 0
-Port away from localised string or delete.
-    const GpgME::EngineInfo ei = GpgME::engineInfo(proto);
-    if (ei.isNull()) {
-        *reason = i18n("GPGME was compiled without support for %1.", proto == GpgME::CMS ? QLatin1String("S/MIME") : QLatin1String("OpenPGP"));
-    } else if (ei.fileName() && !ei.version()) {
-        *reason = i18n("Engine %1 is not installed properly.", QFile::decodeName(ei.fileName()));
-    } else if (ei.fileName() && ei.version() && ei.requiredVersion())
-        *reason = i18n("Engine %1 version %2 installed, "
-                       "but at least version %3 is required.",
-                       QFile::decodeName(ei.fileName()), QLatin1String(ei.version()), QLatin1String(ei.requiredVersion()));
-    else {
-        *reason = i18n("Unknown problem with engine for protocol %1.", proto == GpgME::CMS ? QLatin1String("S/MIME") : QLatin1String("OpenPGP"));
-    }
 #endif
-    return false;
-}
-
-bool QGpgME::QGpgMEBackend::checkForOpenPGP(QString *reason) const
-{
-    return check(GpgME::OpenPGP, reason);
-}
-
-bool QGpgME::QGpgMEBackend::checkForSMIME(QString *reason) const
-{
-    return check(GpgME::CMS, reason);
-}
-
-bool QGpgME::QGpgMEBackend::checkForProtocol(const char *name, QString *reason) const
-{
-    if (qstricmp(name, OpenPGP) == 0) {
-        return check(GpgME::OpenPGP, reason);
-    }
-    if (qstricmp(name, SMIME) == 0) {
-        return check(GpgME::CMS, reason);
-    }
-    if (reason) {
-        *reason = QStringLiteral("Unsupported protocol \"%1\"").arg(QLatin1String(name));
-    }
-    return false;
-}
-
-QGpgME::Protocol *QGpgME::QGpgMEBackend::openpgp() const
-{
-    if (!mOpenPGPProtocol)
-        if (checkForOpenPGP()) {
-            mOpenPGPProtocol = new ::Protocol(GpgME::OpenPGP);
-        }
-    return mOpenPGPProtocol;
-}
-
-QGpgME::Protocol *QGpgME::QGpgMEBackend::smime() const
-{
-    if (!mSMIMEProtocol)
-        if (checkForSMIME()) {
-            mSMIMEProtocol = new ::Protocol(GpgME::CMS);
-        }
-    return mSMIMEProtocol;
-}
-
-QGpgME::Protocol *QGpgME::QGpgMEBackend::protocol(const char *name) const
-{
-    if (qstricmp(name, OpenPGP) == 0) {
-        return openpgp();
-    }
-    if (qstricmp(name, SMIME) == 0) {
-        return smime();
-    }
-    return 0;
-}
-
-bool QGpgME::QGpgMEBackend::supportsProtocol(const char *name) const
-{
-    return qstricmp(name, OpenPGP) == 0 || qstricmp(name, SMIME) == 0;
-}
-
-const char *QGpgME::QGpgMEBackend::enumerateProtocols(int i) const
-{
-    switch (i) {
-    case 0: return OpenPGP;
-    case 1: return SMIME;
-    default: return 0;
-    }
-}
-
-static QGpgME::QGpgMEBackend *gpgmeBackend;
-
-QGpgME::Protocol *QGpgME::openpgp()
-{
-    if (!gpgmeBackend) {
-        gpgmeBackend = new QGpgME::QGpgMEBackend();
-    }
-    return gpgmeBackend->openpgp();
-}
-
-QGpgME::Protocol *QGpgME::smime()
-{
-    if (!gpgmeBackend) {
-        gpgmeBackend = new QGpgME::QGpgMEBackend();
-    }
-    return gpgmeBackend->smime();
-}
diff --git a/lang/qt/src/qgpgmebackend.cpp b/lang/qt/src/qgpgmebackend.cpp
index 27cd178..797e58a 100644
--- a/lang/qt/src/qgpgmebackend.cpp
+++ b/lang/qt/src/qgpgmebackend.cpp
@@ -33,351 +33,18 @@
 
 #include "qgpgmebackend.h"
 
-#include "qgpgmenewcryptoconfig.h"
-
-#include "qgpgmekeygenerationjob.h"
-#include "qgpgmekeylistjob.h"
-#include "qgpgmelistallkeysjob.h"
-#include "qgpgmedecryptjob.h"
-#include "qgpgmedecryptverifyjob.h"
-#include "qgpgmerefreshkeysjob.h"
-#include "qgpgmedeletejob.h"
-#include "qgpgmesecretkeyexportjob.h"
-#include "qgpgmedownloadjob.h"
-#include "qgpgmesignencryptjob.h"
-#include "qgpgmeencryptjob.h"
-#include "qgpgmesignjob.h"
-#include "qgpgmesignkeyjob.h"
-#include "qgpgmeexportjob.h"
-#include "qgpgmeverifydetachedjob.h"
-#include "qgpgmeimportjob.h"
-#include "qgpgmeimportfromkeyserverjob.h"
-#include "qgpgmeverifyopaquejob.h"
-#include "qgpgmechangeexpiryjob.h"
-#include "qgpgmechangeownertrustjob.h"
-#include "qgpgmechangepasswdjob.h"
-#include "qgpgmeadduseridjob.h"
 
 #include "error.h"
 #include "engineinfo.h"
 
+#include "protocol_p.h"
+
 #include <QFile>
 #include <QString>
 
 const char QGpgME::QGpgMEBackend::OpenPGP[] = "OpenPGP";
 const char QGpgME::QGpgMEBackend::SMIME[] = "SMIME";
 
-namespace
-{
-
-class Protocol : public QGpgME::Protocol
-{
-    GpgME::Protocol mProtocol;
-public:
-    explicit Protocol(GpgME::Protocol proto) : mProtocol(proto) {}
-
-    QString name() const Q_DECL_OVERRIDE
-    {
-        switch (mProtocol) {
-        case GpgME::OpenPGP: return QStringLiteral("OpenPGP");
-        case GpgME::CMS:     return QStringLiteral("SMIME");
-        default:             return QString();
-        }
-    }
-
-    QString displayName() const Q_DECL_OVERRIDE
-    {
-        // ah (2.4.16): Where is this used and isn't this inverted
-        // with name
-        switch (mProtocol) {
-        case GpgME::OpenPGP: return QStringLiteral("gpg");
-        case GpgME::CMS:     return QStringLiteral("gpgsm");
-        default:             return QStringLiteral("unknown");
-        }
-    }
-
-    QGpgME::SpecialJob *specialJob(const char *, const QMap<QString, QVariant> &) const Q_DECL_OVERRIDE
-    {
-        return 0;
-    }
-
-    QGpgME::KeyListJob *keyListJob(bool remote, bool includeSigs, bool validate) const Q_DECL_OVERRIDE
-    {
-        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
-        if (!context) {
-            return 0;
-        }
-
-        unsigned int mode = context->keyListMode();
-        if (remote) {
-            mode |= GpgME::Extern;
-            mode &= ~GpgME::Local;
-        } else {
-            mode |= GpgME::Local;
-            mode &= ~GpgME::Extern;
-        }
-        if (includeSigs) {
-            mode |= GpgME::Signatures;
-        }
-        if (validate) {
-            mode |= GpgME::Validate;
-        }
-        context->setKeyListMode(mode);
-        return new QGpgME::QGpgMEKeyListJob(context);
-    }
-
-    QGpgME::ListAllKeysJob *listAllKeysJob(bool includeSigs, bool validate) const Q_DECL_OVERRIDE
-    {
-        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
-        if (!context) {
-            return 0;
-        }
-
-        unsigned int mode = context->keyListMode();
-        mode |= GpgME::Local;
-        mode &= ~GpgME::Extern;
-        if (includeSigs) {
-            mode |= GpgME::Signatures;
-        }
-        if (validate) {
-            mode |= GpgME::Validate;
-            /* Setting the context to offline mode disables CRL / OCSP checks in
-               this Job. Otherwise we would try to fetch the CRL's for all CMS
-               keys in the users keyring because GpgME::Validate includes remote
-               resources by default in the validity check.
-               This setting only has any effect if gpgsm >= 2.1.6 is used.
-               */
-            context->setOffline(true);
-        }
-        context->setKeyListMode(mode);
-        return new QGpgME::QGpgMEListAllKeysJob(context);
-    }
-
-    QGpgME::EncryptJob *encryptJob(bool armor, bool textmode) const Q_DECL_OVERRIDE
-    {
-        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
-        if (!context) {
-            return 0;
-        }
-
-        context->setArmor(armor);
-        context->setTextMode(textmode);
-        return new QGpgME::QGpgMEEncryptJob(context);
-    }
-
-    QGpgME::DecryptJob *decryptJob() const Q_DECL_OVERRIDE
-    {
-        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
-        if (!context) {
-            return 0;
-        }
-        return new QGpgME::QGpgMEDecryptJob(context);
-    }
-
-    QGpgME::SignJob *signJob(bool armor, bool textMode) const Q_DECL_OVERRIDE
-    {
-        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
-        if (!context) {
-            return 0;
-        }
-
-        context->setArmor(armor);
-        context->setTextMode(textMode);
-        return new QGpgME::QGpgMESignJob(context);
-    }
-
-    QGpgME::VerifyDetachedJob *verifyDetachedJob(bool textMode) const Q_DECL_OVERRIDE
-    {
-        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
-        if (!context) {
-            return 0;
-        }
-
-        context->setTextMode(textMode);
-        return new QGpgME::QGpgMEVerifyDetachedJob(context);
-    }
-
-    QGpgME::VerifyOpaqueJob *verifyOpaqueJob(bool textMode) const Q_DECL_OVERRIDE
-    {
-        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
-        if (!context) {
-            return 0;
-        }
-
-        context->setTextMode(textMode);
-        return new QGpgME::QGpgMEVerifyOpaqueJob(context);
-    }
-
-    QGpgME::KeyGenerationJob *keyGenerationJob() const Q_DECL_OVERRIDE
-    {
-        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
-        if (!context) {
-            return 0;
-        }
-        return new QGpgME::QGpgMEKeyGenerationJob(context);
-    }
-
-    QGpgME::ImportJob *importJob() const Q_DECL_OVERRIDE
-    {
-        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
-        if (!context) {
-            return 0;
-        }
-        return new QGpgME::QGpgMEImportJob(context);
-    }
-
-    QGpgME::ImportFromKeyserverJob *importFromKeyserverJob() const Q_DECL_OVERRIDE
-    {
-        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
-        if (!context) {
-            return 0;
-        }
-        return new QGpgME::QGpgMEImportFromKeyserverJob(context);
-    }
-
-    QGpgME::ExportJob *publicKeyExportJob(bool armor) const Q_DECL_OVERRIDE
-    {
-        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
-        if (!context) {
-            return 0;
-        }
-
-        context->setArmor(armor);
-        return new QGpgME::QGpgMEExportJob(context);
-    }
-
-    QGpgME::ExportJob *secretKeyExportJob(bool armor, const QString &charset) const Q_DECL_OVERRIDE
-    {
-        if (mProtocol != GpgME::CMS) { // fixme: add support for gpg, too
-            return 0;
-        }
-
-        // this operation is not supported by gpgme, so we have to call gpgsm ourselves:
-        return new QGpgME::QGpgMESecretKeyExportJob(armor, charset);
-    }
-
-    QGpgME::RefreshKeysJob *refreshKeysJob() const Q_DECL_OVERRIDE
-    {
-        if (mProtocol != GpgME::CMS) { // fixme: add support for gpg, too
-            return 0;
-        }
-
-        // this operation is not supported by gpgme, so we have to call gpgsm ourselves:
-        return new QGpgME::QGpgMERefreshKeysJob();
-    }
-
-    QGpgME::DownloadJob *downloadJob(bool armor) const Q_DECL_OVERRIDE
-    {
-        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
-        if (!context) {
-            return 0;
-        }
-
-        context->setArmor(armor);
-        // this is the hackish interface for downloading from keyserers currently:
-        context->setKeyListMode(GpgME::Extern);
-        return new QGpgME::QGpgMEDownloadJob(context);
-    }
-
-    QGpgME::DeleteJob *deleteJob() const Q_DECL_OVERRIDE
-    {
-        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
-        if (!context) {
-            return 0;
-        }
-        return new QGpgME::QGpgMEDeleteJob(context);
-    }
-
-    QGpgME::SignEncryptJob *signEncryptJob(bool armor, bool textMode) const Q_DECL_OVERRIDE
-    {
-        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
-        if (!context) {
-            return 0;
-        }
-
-        context->setArmor(armor);
-        context->setTextMode(textMode);
-        return new QGpgME::QGpgMESignEncryptJob(context);
-    }
-
-    QGpgME::DecryptVerifyJob *decryptVerifyJob(bool textMode) const Q_DECL_OVERRIDE
-    {
-        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
-        if (!context) {
-            return 0;
-        }
-
-        context->setTextMode(textMode);
-        return new QGpgME::QGpgMEDecryptVerifyJob(context);
-    }
-
-    QGpgME::ChangeExpiryJob *changeExpiryJob() const Q_DECL_OVERRIDE
-    {
-        if (mProtocol != GpgME::OpenPGP) {
-            return 0;    // only supported by gpg
-        }
-
-        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
-        if (!context) {
-            return 0;
-        }
-        return new QGpgME::QGpgMEChangeExpiryJob(context);
-    }
-
-    QGpgME::ChangePasswdJob *changePasswdJob() const Q_DECL_OVERRIDE
-    {
-        if (!GpgME::hasFeature(GpgME::PasswdFeature, 0)) {
-            return 0;
-        }
-        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
-        if (!context) {
-            return 0;
-        }
-        return new QGpgME::QGpgMEChangePasswdJob(context);
-    }
-
-    QGpgME::SignKeyJob *signKeyJob() const Q_DECL_OVERRIDE
-    {
-        if (mProtocol != GpgME::OpenPGP) {
-            return 0;    // only supported by gpg
-        }
-
-        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
-        if (!context) {
-            return 0;
-        }
-        return new QGpgME::QGpgMESignKeyJob(context);
-    }
-
-    QGpgME::ChangeOwnerTrustJob *changeOwnerTrustJob() const Q_DECL_OVERRIDE
-    {
-        if (mProtocol != GpgME::OpenPGP) {
-            return 0;    // only supported by gpg
-        }
-
-        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
-        if (!context) {
-            return 0;
-        }
-        return new QGpgME::QGpgMEChangeOwnerTrustJob(context);
-    }
-
-    QGpgME::AddUserIDJob *addUserIDJob() const Q_DECL_OVERRIDE
-    {
-        if (mProtocol != GpgME::OpenPGP) {
-            return 0;    // only supported by gpg
-        }
-
-        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
-        if (!context) {
-            return 0;
-        }
-        return new QGpgME::QGpgMEAddUserIDJob(context);
-    }
-
-};
-
-}
 
 QGpgME::QGpgMEBackend::QGpgMEBackend()
     : mCryptoConfig(0),
@@ -510,6 +177,15 @@ const char *QGpgME::QGpgMEBackend::enumerateProtocols(int i) const
 
 static QGpgME::QGpgMEBackend *gpgmeBackend;
 
+QGpgME::CryptoConfig *QGpgME::cryptoConfig()
+{
+    if (!gpgmeBackend) {
+        gpgmeBackend = new QGpgME::QGpgMEBackend();
+    }
+    return gpgmeBackend->config();
+
+}
+
 QGpgME::Protocol *QGpgME::openpgp()
 {
     if (!gpgmeBackend) {
diff --git a/lang/qt/src/qgpgmebackend.h b/lang/qt/src/qgpgmebackend.h
index 3b03633..cca8b71 100644
--- a/lang/qt/src/qgpgmebackend.h
+++ b/lang/qt/src/qgpgmebackend.h
@@ -36,35 +36,9 @@
 
 #include <QString>
 
-namespace QGpgME
-{
-class CryptoConfig;
-class KeyListJob;
-class ListAllKeysJob;
-class KeyGenerationJob;
-class ImportJob;
-class ImportFromKeyserverJob;
-class ExportJob;
-class DownloadJob;
-class DeleteJob;
-class EncryptJob;
-class DecryptJob;
-class SignJob;
-class SignKeyJob;
-class VerifyDetachedJob;
-class VerifyOpaqueJob;
-class SignEncryptJob;
-class DecryptVerifyJob;
-class RefreshKeysJob;
-class ChangeExpiryJob;
-class ChangeOwnerTrustJob;
-class ChangePasswdJob;
-class AddUserIDJob;
-class SpecialJob;
-}
+#include "protocol.h"
 
 class QString;
-class QVariant;
 template <typename T_Key, typename T_Value> class QMap;
 
 namespace QGpgME
@@ -72,19 +46,6 @@ namespace QGpgME
 class CryptoConfig;
 class Protocol;
 
-/** Obtain a reference to the OpenPGP Protocol.
- *
- * The reference is to a static object.
- * @returns Refrence to the OpenPGP Protocol.
- */
-Protocol *openpgp();
-
-/** Obtain a reference to the smime Protocol.
- *
- * The reference is to a static object.
- * @returns Refrence to the smime Protocol.
- */
-Protocol *smime();
 
 class QGpgMEBackend
 {
@@ -126,41 +87,6 @@ private:
     mutable Protocol *mSMIMEProtocol;
 };
 
-class Protocol
-{
-public:
-    virtual ~Protocol() {}
-
-    virtual QString name() const = 0;
-
-    virtual QString displayName() const = 0;
-
-    virtual KeyListJob           *keyListJob(bool remote = false, bool includeSigs = false, bool validate = false) const = 0;
-    virtual ListAllKeysJob       *listAllKeysJob(bool includeSigs = false, bool validate = false) const = 0;
-    virtual EncryptJob           *encryptJob(bool armor = false, bool textmode = false) const = 0;
-    virtual DecryptJob           *decryptJob() const = 0;
-    virtual SignJob              *signJob(bool armor = false, bool textMode = false) const = 0;
-    virtual VerifyDetachedJob    *verifyDetachedJob(bool textmode = false) const = 0;
-    virtual VerifyOpaqueJob      *verifyOpaqueJob(bool textmode = false) const = 0;
-    virtual KeyGenerationJob     *keyGenerationJob() const = 0;
-    virtual ImportJob            *importJob() const = 0;
-    virtual ImportFromKeyserverJob *importFromKeyserverJob() const = 0;
-    virtual ExportJob            *publicKeyExportJob(bool armor = false) const = 0;
-    // @param charset the encoding of the passphrase in the exported file
-    virtual ExportJob            *secretKeyExportJob(bool armor = false, const QString &charset = QString()) const = 0;
-    virtual DownloadJob          *downloadJob(bool armor = false) const = 0;
-    virtual DeleteJob            *deleteJob() const = 0;
-    virtual SignEncryptJob       *signEncryptJob(bool armor = false, bool textMode = false) const = 0;
-    virtual DecryptVerifyJob     *decryptVerifyJob(bool textmode = false) const = 0;
-    virtual RefreshKeysJob       *refreshKeysJob() const = 0;
-    virtual ChangeExpiryJob      *changeExpiryJob() const = 0;
-    virtual SignKeyJob           *signKeyJob() const = 0;
-    virtual ChangePasswdJob      *changePasswdJob() const = 0;
-    virtual ChangeOwnerTrustJob  *changeOwnerTrustJob() const = 0;
-    virtual AddUserIDJob         *addUserIDJob() const = 0;
-    virtual SpecialJob           *specialJob(const char *type, const QMap<QString, QVariant> &args) const = 0;
-};
-
 }
 
 #endif // __QGPGME_QGPGMEBACKEND_H__

commit 97225bb01cd2ffa1d84c7fedbc577275de4a4893
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue May 10 12:52:43 2016 +0200

    Qt: Make doxygen quieter
    
    * lang/qt/doc/Doxyfile.in: Quiet and no undocumented warnings.

diff --git a/lang/qt/doc/Doxyfile.in b/lang/qt/doc/Doxyfile.in
index b3b2fda..ef0a5c0 100644
--- a/lang/qt/doc/Doxyfile.in
+++ b/lang/qt/doc/Doxyfile.in
@@ -693,7 +693,7 @@ CITE_BIB_FILES         =
 # messages are off.
 # The default value is: NO.
 
-QUIET                  = NO
+QUIET                  = YES
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
 # generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
@@ -709,7 +709,7 @@ WARNINGS               = YES
 # will automatically be disabled.
 # The default value is: YES.
 
-WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_UNDOCUMENTED   = NO
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
 # potential errors in the documentation, such as not documenting some parameters

commit 740f92a7b83389ee9bde98b7bd25556793500b8b
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue May 10 12:47:53 2016 +0200

    Qt: Only install public headers
    
    * lang/qt/src/Makefile.am: Do not install all headers.
    --
    The qgpgme classes hide the implementation and thus make it
    easier to change it without ABI breaks. They should not
    be installed.

diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am
index 6435983..30c24b9 100644
--- a/lang/qt/src/Makefile.am
+++ b/lang/qt/src/Makefile.am
@@ -35,29 +35,38 @@ qgpgme_sources = \
     qgpgmeverifyopaquejob.cpp threadedjobmixin.cpp \
     gpgme_backend_debug.cpp
 
-qgpgme_headers = \
-    qgpgme_export.h \
-    abstractimportjob.h \
+qgpgme_headers= \
     adduseridjob.h \
     changeexpiryjob.h \
     changeownertrustjob.h \
     changepasswdjob.h \
-    cryptoconfig.h \
     dataprovider.h \
     decryptjob.h \
     decryptverifyjob.h \
-    deletejob.h \
     downloadjob.h \
     encryptjob.h \
     exportjob.h \
     hierarchicalkeylistjob.h \
+    job.h \
+    multideletejob.h \
+    qgpgme_export.h \
+    qgpgmenewcryptoconfig.h \
+    signjob.h \
+    signkeyjob.h \
+    signencryptjob.h \
+    verifyopaquejob.h \
+    refreshkeysjob.h \
+    cryptoconfig.h \
+    deletejob.h \
     importfromkeyserverjob.h \
     importjob.h \
-    job.h \
     keygenerationjob.h \
     keylistjob.h \
-    listallkeysjob.h \
-    multideletejob.h \
+    listallkeysjob.h
+
+private_qgpgme_headers = \
+    qgpgme_export.h \
+    abstractimportjob.h \
     qgpgmeadduseridjob.h \
     qgpgmebackend.h \
     qgpgmechangeexpiryjob.h \
@@ -74,7 +83,6 @@ qgpgme_headers = \
     qgpgmekeygenerationjob.h \
     qgpgmekeylistjob.h \
     qgpgmelistallkeysjob.h \
-    qgpgmenewcryptoconfig.h \
     qgpgmerefreshkeysjob.h \
     qgpgmesecretkeyexportjob.h \
     qgpgmesignencryptjob.h \
@@ -82,14 +90,8 @@ qgpgme_headers = \
     qgpgmesignkeyjob.h \
     qgpgmeverifydetachedjob.h \
     qgpgmeverifyopaquejob.h \
-    refreshkeysjob.h \
-    signencryptjob.h \
-    signjob.h \
-    signkeyjob.h \
     specialjob.h \
-    threadedjobmixin.h \
-    verifydetachedjob.h \
-    verifyopaquejob.h
+    threadedjobmixin.h
 
 qgpgme_moc_sources = \
     abstractimportjob.moc \
@@ -144,7 +146,7 @@ qgpgme_moc_sources = \
 qgpgmeincludedir = $(includedir)/qgpgme
 qgpgmeinclude_HEADERS = $(qgpgme_headers)
 
-libqgpgme_la_SOURCES = $(qgpgme_sources) $(qgpgme_headers)
+libqgpgme_la_SOURCES = $(qgpgme_sources) $(qgpgme_headers) $(private_qgpgme_headers)
 
 AM_CPPFLAGS = @GPGME_QT_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \
               -DBUILDING_QGPGME -I$(top_srcdir)/lang/cpp/src

commit 0e3195948ddaba3af07d2415bb496491076edc17
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri May 6 16:33:49 2016 +0200

    Qt: Add test for async keylisting
    
    * src/lang/qt/tests/t-keylist.cpp(KeyListTest::testKeyListAsync): New.

diff --git a/lang/qt/tests/t-keylist.cpp b/lang/qt/tests/t-keylist.cpp
index 8aa5999..f5c7f13 100644
--- a/lang/qt/tests/t-keylist.cpp
+++ b/lang/qt/tests/t-keylist.cpp
@@ -1,15 +1,20 @@
 #include <QDebug>
 #include <QTest>
+#include <QSignalSpy>
 #include "keylistjob.h"
 #include "qgpgmebackend.h"
 #include "keylistresult.h"
 
 using namespace QGpgME;
+using namespace GpgME;
 
 class KeyListTest : public QObject
 {
     Q_OBJECT
 
+Q_SIGNALS:
+    void asyncDone();
+
 private Q_SLOTS:
 
     void testSingleKeyListSync()
@@ -24,6 +29,19 @@ private Q_SLOTS:
         Q_ASSERT (kId == QStringLiteral("2D727CC768697734"));
     }
 
+    void testKeyListAsync()
+    {
+        KeyListJob *job = openpgp()->keyListJob();
+        connect(job, &KeyListJob::result, job, [this, job](KeyListResult, std::vector<Key> keys, QString, Error)
+        {
+            Q_ASSERT(keys.size() == 1);
+            Q_EMIT asyncDone();
+        });
+        job->start(QStringList() << "alfa at example.net");
+        QSignalSpy spy (this, &KeyListTest::asyncDone);
+        Q_ASSERT(spy.wait());
+    }
+
     void initTestCase()
     {
         const QString gpgHome = qgetenv("GNUPGHOME");

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

Summary of changes:
 lang/qt/doc/Doxyfile.in                         |   4 +-
 lang/qt/src/Makefile.am                         |  38 +--
 lang/qt/src/dataprovider.h                      |  10 -
 lang/qt/src/hierarchicalkeylistjob.h            |   2 +-
 lang/qt/src/multideletejob.h                    |   2 +-
 lang/qt/src/{qgpgmebackend.h => protocol.h}     | 103 ++-----
 lang/qt/src/{qgpgmebackend.cpp => protocol_p.h} | 162 +----------
 lang/qt/src/qgpgmeadduseridjob.h                |   2 +-
 lang/qt/src/qgpgmebackend.cpp                   | 346 +-----------------------
 lang/qt/src/qgpgmebackend.h                     |  76 +-----
 lang/qt/src/qgpgmechangeexpiryjob.h             |   2 +-
 lang/qt/src/qgpgmechangeownertrustjob.h         |   2 +-
 lang/qt/src/qgpgmechangepasswdjob.h             |   2 +-
 lang/qt/src/qgpgmedecryptjob.h                  |   8 +-
 lang/qt/src/qgpgmedecryptverifyjob.h            |   8 +-
 lang/qt/src/qgpgmedeletejob.h                   |   2 +-
 lang/qt/src/qgpgmedownloadjob.h                 |   4 +-
 lang/qt/src/qgpgmeencryptjob.h                  |  10 +-
 lang/qt/src/qgpgmeexportjob.h                   |   2 +-
 lang/qt/src/qgpgmeimportfromkeyserverjob.h      |   6 +-
 lang/qt/src/qgpgmeimportjob.h                   |   6 +-
 lang/qt/src/qgpgmekeygenerationjob.h            |   2 +-
 lang/qt/src/qgpgmekeylistjob.h                  |   6 +-
 lang/qt/src/qgpgmelistallkeysjob.h              |   6 +-
 lang/qt/src/qgpgmerefreshkeysjob.h              |   4 +-
 lang/qt/src/qgpgmesecretkeyexportjob.h          |   4 +-
 lang/qt/src/qgpgmesignencryptjob.h              |   8 +-
 lang/qt/src/qgpgmesignjob.h                     |  10 +-
 lang/qt/src/qgpgmesignkeyjob.h                  |  12 +-
 lang/qt/src/qgpgmeverifydetachedjob.h           |   8 +-
 lang/qt/src/qgpgmeverifyopaquejob.h             |   8 +-
 lang/qt/tests/t-keylist.cpp                     |  18 ++
 32 files changed, 149 insertions(+), 734 deletions(-)
 copy lang/qt/src/{qgpgmebackend.h => protocol.h} (77%)
 copy lang/qt/src/{qgpgmebackend.cpp => protocol_p.h} (74%)


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



From cvs at cvs.gnupg.org  Tue May 10 15:09:41 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Tue, 10 May 2016 15:09:41 +0200
Subject: [git] GPGME - branch, gpgmepp, updated. gpgme-1.6.0-60-gc303292
Message-ID: <E1b07Ob-0007Jb-89@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, gpgmepp has been updated
       via  c303292aca26c43b6efe98719edb3ff7b2d6665d (commit)
      from  b7d5c2cced796d4092a9f424368fc999165f9d13 (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 c303292aca26c43b6efe98719edb3ff7b2d6665d
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue May 10 15:05:11 2016 +0200

    Qt / Cpp: Fix make dist
    
    * lang/cpp/src/Makefile.am (EXTRA_DIST): Fix typo.
    (private_gpgmepp_headers): New. Private headers.
    (libgpgmepp_la_SOURCES): Add private headers.
    * lang/qt/src/Makefile.am (t_keylist_SOURCES): Remove non existent
    header.

diff --git a/lang/cpp/src/Makefile.am b/lang/cpp/src/Makefile.am
index e56b818..24e0461 100644
--- a/lang/cpp/src/Makefile.am
+++ b/lang/cpp/src/Makefile.am
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA
 
-EXTRA_DIST = GpgmeppConfig.cmake.in.in GpgmeConfigVersion.cmake.in
+EXTRA_DIST = GpgmeppConfig.cmake.in.in GpgmeppConfigVersion.cmake.in
 
 lib_LTLIBRARIES = libgpgmepp.la
 
@@ -45,6 +45,9 @@ gpgmepp_headers = \
     notation.h result.h scdgetinfoassuantransaction.h signingresult.h \
     trustitem.h verificationresult.h vfsmountresult.h gpgmepp_export.h
 
+private_gpgmepp_headers = \
+    result_p.h context_p.h util.h callbacks.h data_p.h
+
 interface_headers= \
     interfaces/assuantransaction.h interfaces/dataprovider.h \
     interfaces/passphraseprovider.h interfaces/progressprovider.h
@@ -54,7 +57,7 @@ gpgmeppinclude_HEADERS = $(gpgmepp_headers)
 nobase_gpgmeppinclude_HEADERS = $(interface_headers)
 
 libgpgmepp_la_SOURCES = $(main_sources) $(gpgmepp_headers) context_vanilla.cpp \
-                        $(interface_headers)
+                        $(interface_headers) $(private_gpgmepp_headers)
 
 AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ -DBUILDING_GPGMEPP
 
diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
index def50c8..6da9d29 100644
--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
@@ -46,7 +46,7 @@ check-local: ./pubring-stamp
 # add this dependency:
 initial.test : check-local
 
-t_keylist_SOURCES = t-keylist.cpp t-keylist.h
+t_keylist_SOURCES = t-keylist.cpp
 
 nodist_t_keylist_SOURCES = $(moc_files)
 

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

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


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



From cvs at cvs.gnupg.org  Tue May 10 16:45:16 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Tue, 10 May 2016 16:45:16 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-62-g34e5c5b
Message-ID: <E1b08t6-00043n-7S@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  34e5c5b33de3608bedc2826be27a06e6eec0ea44 (commit)
       via  c303292aca26c43b6efe98719edb3ff7b2d6665d (commit)
       via  b7d5c2cced796d4092a9f424368fc999165f9d13 (commit)
       via  56c4d9ea9520c95612e525b2fa1359db6fa88f4a (commit)
       via  97225bb01cd2ffa1d84c7fedbc577275de4a4893 (commit)
       via  740f92a7b83389ee9bde98b7bd25556793500b8b (commit)
       via  0e3195948ddaba3af07d2415bb496491076edc17 (commit)
       via  a579be82c84f0b9732ee3d52ff2142a3decf95d7 (commit)
       via  11ff8d5964bf66f905818514f6a51fc881ea1a56 (commit)
       via  20b02a7dd49c7ede148245d8a5319b2ba9ce7673 (commit)
       via  cd267791e9bd73505a2a1ea90c85df988e153c19 (commit)
       via  3fad1216770f446a89801d842aa8667356a5ec95 (commit)
       via  5489532ad6ccf3a9b59405686b8a17352f1ecf06 (commit)
       via  d949d711dc1d944a9d627d39a89af74943a5a8c1 (commit)
       via  6dba47c3a2c32d7c1e1d91a96030f99f606433ea (commit)
       via  8e7074dbb8093cc342e330bcd6b172b4f769a0c6 (commit)
       via  d2b55101195efe9702e855a48fc6e21839fb98cc (commit)
       via  a1e95f36ce1895cd9894f6d3ca76640c42c2f9fc (commit)
       via  d9f7a18ed88127e7f05d770d55118d1e928f3b3f (commit)
       via  afd8fad6e275e2f74b2ad045dce05d826986e2ec (commit)
       via  e18256fc5f613da9406da60c3ef2f84f2be04ef0 (commit)
       via  d293bd32293929eeb3f6ec35f916a4678fb51729 (commit)
       via  1bb162a54ba480413c4da07f2578efe6860494c0 (commit)
       via  691950e18cf08a3f9bbc2004501834cd47bea579 (commit)
       via  cc68ff5f7210ac879fbdf719fcd5944f9ae5602b (commit)
       via  f98898ab1a6952e0c3a5d235963a27eba2e19e46 (commit)
       via  c07aaef6eb8a9b5e623479f27d562fd1570bf4bb (commit)
       via  0991485170ca4ef90fd566540522027d0fc59a72 (commit)
       via  faf987dd62893955251378a2a715edd2892a540c (commit)
       via  b7b9e38399a572cb61a297db552026eac5b2a5e1 (commit)
       via  0cc9006dbc59d87c6bcda88b36d59dcb69ac35cb (commit)
       via  3e38cc6fc67c420dec3e9e8afd072b4c8a157c85 (commit)
       via  7071b2a9c00b85d434d01b6166269ebf48b01b81 (commit)
       via  63c115b067400e1b02c7d849c99f54dc9f394d68 (commit)
       via  576be46f34b42e896a5e3be65560a4b518a758be (commit)
       via  a440050fc2c11e4867da9d4707616fa23ac52141 (commit)
       via  226e51052ae73efa8d9f30729b28de68d35231af (commit)
       via  8347f3d5fc3e476aa767fbbaf09a1310a6154280 (commit)
       via  58ed9c17f00f420035ecc6973a6c6ed948757a9a (commit)
       via  a06603d75e80aba58df58f9a41770c56b6a1f0b8 (commit)
       via  77c3fb450c7adf36804a55d76ff49a06a71d22a0 (commit)
       via  98e5b672422ca1e38ca38ff0357cee6cc936aee0 (commit)
       via  c5291a88913ace8f2115021b69c7aeb59b4f79d4 (commit)
       via  a313b3e28cc42785365822519b25d6a87dfdf0c9 (commit)
       via  7286fc7f3d51d475f82c7c9821d031290f5b0066 (commit)
       via  f5fd787b5b45cb14d539b5c26f44066eb9ac0f75 (commit)
       via  433bb8e84b2d1e50b5c5b9f7f2006b60cd7d7785 (commit)
       via  0855a1296a1908016f011eb5e6552854ac53e63a (commit)
      from  fc38c15136c87ce971a8381fa87399088dd5a3cc (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 34e5c5b33de3608bedc2826be27a06e6eec0ea44
Merge: fc38c15 c303292
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue May 10 16:43:36 2016 +0200

    Merge branch 'gpgmepp'


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

Summary of changes:
 acinclude.m4                                       |   16 +
 configure.ac                                       |  144 +-
 lang/Makefile.am                                   |    2 +-
 lang/README                                        |    2 +
 lang/{cl => cpp}/Makefile.am                       |   14 +-
 lang/cpp/README                                    |   60 +
 lang/cpp/src/GpgmeppConfig.cmake.in.in             |  108 +
 .../src/GpgmeppConfigVersion.cmake.in}             |   22 +-
 lang/cpp/src/Makefile.am                           |   93 +
 lang/cpp/src/assuanresult.cpp                      |   90 +
 lang/cpp/src/assuanresult.h                        |   79 +
 lang/cpp/src/callbacks.cpp                         |  149 ++
 lang/cpp/src/callbacks.h                           |   45 +
 lang/cpp/src/configuration.cpp                     |  934 ++++++++
 lang/cpp/src/configuration.h                       |  290 +++
 lang/cpp/src/context.cpp                           | 1494 +++++++++++++
 lang/cpp/src/context.h                             |  353 +++
 lang/cpp/src/context_glib.cpp                      |   35 +
 lang/cpp/src/context_p.h                           |   84 +
 lang/cpp/src/context_qt.cpp                        |   35 +
 lang/cpp/src/context_vanilla.cpp                   |   33 +
 lang/cpp/src/data.cpp                              |  208 ++
 lang/cpp/src/data.h                                |  123 +
 lang/cpp/src/data_p.h                              |   40 +
 lang/cpp/src/decryptionresult.cpp                  |  240 ++
 lang/cpp/src/decryptionresult.h                    |  130 ++
 lang/cpp/src/defaultassuantransaction.cpp          |   78 +
 lang/cpp/src/defaultassuantransaction.h            |   65 +
 lang/cpp/src/editinteractor.cpp                    |  344 +++
 lang/cpp/src/editinteractor.h                      |   68 +
 lang/cpp/src/encryptionresult.cpp                  |  159 ++
 lang/cpp/src/encryptionresult.h                    |  113 +
 lang/cpp/src/engineinfo.cpp                        |   83 +
 lang/cpp/src/engineinfo.h                          |   70 +
 lang/cpp/src/error.h                               |   78 +
 lang/cpp/src/eventloopinteractor.cpp               |  199 ++
 lang/cpp/src/eventloopinteractor.h                 |  156 ++
 lang/cpp/src/exception.cpp                         |   58 +
 lang/cpp/src/exception.h                           |   68 +
 lang/cpp/src/global.h                              |  206 ++
 lang/cpp/src/gpgadduserideditinteractor.cpp        |  189 ++
 lang/cpp/src/gpgadduserideditinteractor.h          |   67 +
 lang/cpp/src/gpgagentgetinfoassuantransaction.cpp  |  119 +
 lang/cpp/src/gpgagentgetinfoassuantransaction.h    |   73 +
 lang/cpp/src/gpgmefw.h                             |   70 +
 lang/cpp/src/gpgmepp_export.h                      |   53 +
 lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp    |  141 ++
 lang/cpp/src/gpgsetexpirytimeeditinteractor.h      |   49 +
 lang/cpp/src/gpgsetownertrusteditinteractor.cpp    |  151 ++
 lang/cpp/src/gpgsetownertrusteditinteractor.h      |   50 +
 lang/cpp/src/gpgsignkeyeditinteractor.cpp          |  318 +++
 lang/cpp/src/gpgsignkeyeditinteractor.h            |   64 +
 lang/cpp/src/importresult.cpp                      |  215 ++
 lang/cpp/src/importresult.h                        |  134 ++
 lang/cpp/src/interfaces/assuantransaction.h        |   49 +
 lang/cpp/src/interfaces/dataprovider.h             |   53 +
 lang/cpp/src/interfaces/passphraseprovider.h       |   40 +
 lang/cpp/src/interfaces/progressprovider.h         |   40 +
 lang/cpp/src/key.cpp                               |  828 +++++++
 lang/cpp/src/key.h                                 |  380 ++++
 lang/cpp/src/keygenerationresult.cpp               |   92 +
 lang/cpp/src/keygenerationresult.h                 |   82 +
 lang/cpp/src/keylistresult.cpp                     |  107 +
 lang/cpp/src/keylistresult.h                       |   81 +
 lang/cpp/src/notation.h                            |   84 +
 lang/cpp/src/result.h                              |   58 +
 lang/cpp/src/result_p.h                            |   43 +
 lang/cpp/src/scdgetinfoassuantransaction.cpp       |  156 ++
 lang/cpp/src/scdgetinfoassuantransaction.h         |   76 +
 lang/cpp/src/signingresult.cpp                     |  265 +++
 lang/cpp/src/signingresult.h                       |  162 ++
 lang/cpp/src/trustitem.cpp                         |  114 +
 lang/cpp/src/trustitem.h                           |   81 +
 lang/cpp/src/util.h                                |  146 ++
 lang/cpp/src/verificationresult.cpp                |  557 +++++
 lang/cpp/src/verificationresult.h                  |  173 ++
 lang/cpp/src/vfsmountresult.cpp                    |   90 +
 lang/cpp/src/vfsmountresult.h                      |   76 +
 lang/{cl => qt}/Makefile.am                        |   14 +-
 lang/qt/README                                     |   40 +
 lang/qt/doc/Doxyfile.in                            | 2352 ++++++++++++++++++++
 {tests/opassuan => lang/qt/doc}/Makefile.am        |   24 +-
 lang/qt/src/Makefile.am                            |  195 ++
 lang/qt/src/QGpgmeConfig.cmake.in.in               |  107 +
 .../src/QGpgmeConfigVersion.cmake.in}              |   22 +-
 lang/qt/src/abstractimportjob.h                    |   62 +
 lang/qt/src/adduseridjob.h                         |   84 +
 lang/qt/src/changeexpiryjob.h                      |   84 +
 lang/qt/src/changeownertrustjob.h                  |   81 +
 lang/qt/src/changepasswdjob.h                      |   82 +
 lang/qt/src/cryptoconfig.h                         |  399 ++++
 lang/qt/src/dataprovider.cpp                       |  282 +++
 lang/qt/src/dataprovider.h                         |   95 +
 lang/qt/src/decryptjob.h                           |  100 +
 lang/qt/src/decryptverifyjob.h                     |  105 +
 lang/qt/src/deletejob.h                            |   82 +
 lang/qt/src/downloadjob.h                          |  103 +
 lang/qt/src/encryptjob.h                           |  119 +
 lang/qt/src/exportjob.h                            |   86 +
 lang/qt/src/gpgme_backend_debug.cpp                |   10 +
 lang/qt/src/gpgme_backend_debug.h                  |   11 +
 lang/qt/src/hierarchicalkeylistjob.h               |  125 ++
 lang/qt/src/importfromkeyserverjob.h               |   83 +
 lang/qt/src/importjob.h                            |   82 +
 lang/qt/src/job.cpp                                |  150 ++
 lang/qt/src/job.h                                  |   92 +
 lang/qt/src/keygenerationjob.h                     |   84 +
 lang/qt/src/keylistjob.h                           |  105 +
 lang/qt/src/listallkeysjob.h                       |  103 +
 lang/qt/src/multideletejob.h                       |  107 +
 lang/qt/src/protocol.h                             |  123 +
 lang/qt/src/protocol_p.h                           |  371 +++
 lang/qt/src/qgpgme_export.h                        |   53 +
 lang/qt/src/qgpgmeadduseridjob.cpp                 |   82 +
 lang/qt/src/qgpgmeadduseridjob.h                   |   65 +
 lang/qt/src/qgpgmebackend.cpp                      |  203 ++
 lang/qt/src/qgpgmebackend.h                        |   92 +
 lang/qt/src/qgpgmechangeexpiryjob.cpp              |   81 +
 lang/qt/src/qgpgmechangeexpiryjob.h                |   66 +
 lang/qt/src/qgpgmechangeownertrustjob.cpp          |   77 +
 lang/qt/src/qgpgmechangeownertrustjob.h            |   65 +
 lang/qt/src/qgpgmechangepasswdjob.cpp              |   79 +
 lang/qt/src/qgpgmechangepasswdjob.h                |   66 +
 lang/qt/src/qgpgmedecryptjob.cpp                   |  128 ++
 lang/qt/src/qgpgmedecryptjob.h                     |   84 +
 lang/qt/src/qgpgmedecryptverifyjob.cpp             |  135 ++
 lang/qt/src/qgpgmedecryptverifyjob.h               |   89 +
 lang/qt/src/qgpgmedeletejob.cpp                    |   65 +
 lang/qt/src/qgpgmedeletejob.h                      |   71 +
 lang/qt/src/qgpgmedownloadjob.cpp                  |  100 +
 lang/qt/src/qgpgmedownloadjob.h                    |   69 +
 lang/qt/src/qgpgmeencryptjob.cpp                   |  160 ++
 lang/qt/src/qgpgmeencryptjob.h                     |   99 +
 lang/qt/src/qgpgmeexportjob.cpp                    |   76 +
 lang/qt/src/qgpgmeexportjob.h                      |   66 +
 lang/qt/src/qgpgmeimportfromkeyserverjob.cpp       |   82 +
 lang/qt/src/qgpgmeimportfromkeyserverjob.h         |   81 +
 lang/qt/src/qgpgmeimportjob.cpp                    |   85 +
 lang/qt/src/qgpgmeimportjob.h                      |   81 +
 lang/qt/src/qgpgmekeygenerationjob.cpp             |   71 +
 lang/qt/src/qgpgmekeygenerationjob.h               |   72 +
 lang/qt/src/qgpgmekeylistjob.cpp                   |  167 ++
 lang/qt/src/qgpgmekeylistjob.h                     |   87 +
 lang/qt/src/qgpgmelistallkeysjob.cpp               |  168 ++
 lang/qt/src/qgpgmelistallkeysjob.h                 |   86 +
 lang/qt/src/qgpgmenewcryptoconfig.cpp              |  738 ++++++
 lang/qt/src/qgpgmenewcryptoconfig.h                |  189 ++
 lang/qt/src/qgpgmerefreshkeysjob.cpp               |  225 ++
 lang/qt/src/qgpgmerefreshkeysjob.h                 |   79 +
 lang/qt/src/qgpgmesecretkeyexportjob.cpp           |  142 ++
 lang/qt/src/qgpgmesecretkeyexportjob.h             |   81 +
 lang/qt/src/qgpgmesignencryptjob.cpp               |  159 ++
 lang/qt/src/qgpgmesignencryptjob.h                 |  109 +
 lang/qt/src/qgpgmesignjob.cpp                      |  163 ++
 lang/qt/src/qgpgmesignjob.h                        |  101 +
 lang/qt/src/qgpgmesignkeyjob.cpp                   |  127 ++
 lang/qt/src/qgpgmesignkeyjob.h                     |   94 +
 lang/qt/src/qgpgmeverifydetachedjob.cpp            |  118 +
 lang/qt/src/qgpgmeverifydetachedjob.h              |   85 +
 lang/qt/src/qgpgmeverifyopaquejob.cpp              |  125 ++
 lang/qt/src/qgpgmeverifyopaquejob.h                |   84 +
 lang/qt/src/refreshkeysjob.h                       |   93 +
 lang/qt/src/signencryptjob.h                       |  135 ++
 lang/qt/src/signjob.h                              |  122 +
 lang/qt/src/signkeyjob.h                           |  117 +
 lang/qt/src/specialjob.h                           |   90 +
 lang/qt/src/threadedjobmixin.cpp                   |  110 +
 lang/qt/src/threadedjobmixin.h                     |  272 +++
 lang/qt/src/verifydetachedjob.h                    |   98 +
 lang/qt/src/verifyopaquejob.h                      |  101 +
 lang/qt/tests/Makefile.am                          |   72 +
 lang/qt/tests/initial.test                         |    2 +
 lang/qt/tests/t-keylist.cpp                        |   54 +
 m4/ax_cxx_compile_stdcxx.m4                        |  562 +++++
 m4/qt.m4                                           |   56 +
 src/Makefile.am                                    |   33 +-
 src/kdpipeiodevice.cpp                             |  951 --------
 src/kdpipeiodevice.h                               |   73 -
 src/kdpipeiodevice.moc                             |  183 --
 src/w32-qt-io.cpp                                  |  700 ------
 180 files changed, 25545 insertions(+), 2007 deletions(-)
 copy lang/{cl => cpp}/Makefile.am (70%)
 create mode 100644 lang/cpp/README
 create mode 100644 lang/cpp/src/GpgmeppConfig.cmake.in.in
 copy lang/{cl/Makefile.am => cpp/src/GpgmeppConfigVersion.cmake.in} (57%)
 create mode 100644 lang/cpp/src/Makefile.am
 create mode 100644 lang/cpp/src/assuanresult.cpp
 create mode 100644 lang/cpp/src/assuanresult.h
 create mode 100644 lang/cpp/src/callbacks.cpp
 create mode 100644 lang/cpp/src/callbacks.h
 create mode 100644 lang/cpp/src/configuration.cpp
 create mode 100644 lang/cpp/src/configuration.h
 create mode 100644 lang/cpp/src/context.cpp
 create mode 100644 lang/cpp/src/context.h
 create mode 100644 lang/cpp/src/context_glib.cpp
 create mode 100644 lang/cpp/src/context_p.h
 create mode 100644 lang/cpp/src/context_qt.cpp
 create mode 100644 lang/cpp/src/context_vanilla.cpp
 create mode 100644 lang/cpp/src/data.cpp
 create mode 100644 lang/cpp/src/data.h
 create mode 100644 lang/cpp/src/data_p.h
 create mode 100644 lang/cpp/src/decryptionresult.cpp
 create mode 100644 lang/cpp/src/decryptionresult.h
 create mode 100644 lang/cpp/src/defaultassuantransaction.cpp
 create mode 100644 lang/cpp/src/defaultassuantransaction.h
 create mode 100644 lang/cpp/src/editinteractor.cpp
 create mode 100644 lang/cpp/src/editinteractor.h
 create mode 100644 lang/cpp/src/encryptionresult.cpp
 create mode 100644 lang/cpp/src/encryptionresult.h
 create mode 100644 lang/cpp/src/engineinfo.cpp
 create mode 100644 lang/cpp/src/engineinfo.h
 create mode 100644 lang/cpp/src/error.h
 create mode 100644 lang/cpp/src/eventloopinteractor.cpp
 create mode 100644 lang/cpp/src/eventloopinteractor.h
 create mode 100644 lang/cpp/src/exception.cpp
 create mode 100644 lang/cpp/src/exception.h
 create mode 100644 lang/cpp/src/global.h
 create mode 100644 lang/cpp/src/gpgadduserideditinteractor.cpp
 create mode 100644 lang/cpp/src/gpgadduserideditinteractor.h
 create mode 100644 lang/cpp/src/gpgagentgetinfoassuantransaction.cpp
 create mode 100644 lang/cpp/src/gpgagentgetinfoassuantransaction.h
 create mode 100644 lang/cpp/src/gpgmefw.h
 create mode 100644 lang/cpp/src/gpgmepp_export.h
 create mode 100644 lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp
 create mode 100644 lang/cpp/src/gpgsetexpirytimeeditinteractor.h
 create mode 100644 lang/cpp/src/gpgsetownertrusteditinteractor.cpp
 create mode 100644 lang/cpp/src/gpgsetownertrusteditinteractor.h
 create mode 100644 lang/cpp/src/gpgsignkeyeditinteractor.cpp
 create mode 100644 lang/cpp/src/gpgsignkeyeditinteractor.h
 create mode 100644 lang/cpp/src/importresult.cpp
 create mode 100644 lang/cpp/src/importresult.h
 create mode 100644 lang/cpp/src/interfaces/assuantransaction.h
 create mode 100644 lang/cpp/src/interfaces/dataprovider.h
 create mode 100644 lang/cpp/src/interfaces/passphraseprovider.h
 create mode 100644 lang/cpp/src/interfaces/progressprovider.h
 create mode 100644 lang/cpp/src/key.cpp
 create mode 100644 lang/cpp/src/key.h
 create mode 100644 lang/cpp/src/keygenerationresult.cpp
 create mode 100644 lang/cpp/src/keygenerationresult.h
 create mode 100644 lang/cpp/src/keylistresult.cpp
 create mode 100644 lang/cpp/src/keylistresult.h
 create mode 100644 lang/cpp/src/notation.h
 create mode 100644 lang/cpp/src/result.h
 create mode 100644 lang/cpp/src/result_p.h
 create mode 100644 lang/cpp/src/scdgetinfoassuantransaction.cpp
 create mode 100644 lang/cpp/src/scdgetinfoassuantransaction.h
 create mode 100644 lang/cpp/src/signingresult.cpp
 create mode 100644 lang/cpp/src/signingresult.h
 create mode 100644 lang/cpp/src/trustitem.cpp
 create mode 100644 lang/cpp/src/trustitem.h
 create mode 100644 lang/cpp/src/util.h
 create mode 100644 lang/cpp/src/verificationresult.cpp
 create mode 100644 lang/cpp/src/verificationresult.h
 create mode 100644 lang/cpp/src/vfsmountresult.cpp
 create mode 100644 lang/cpp/src/vfsmountresult.h
 copy lang/{cl => qt}/Makefile.am (70%)
 create mode 100644 lang/qt/README
 create mode 100644 lang/qt/doc/Doxyfile.in
 copy {tests/opassuan => lang/qt/doc}/Makefile.am (72%)
 create mode 100644 lang/qt/src/Makefile.am
 create mode 100644 lang/qt/src/QGpgmeConfig.cmake.in.in
 copy lang/{cl/Makefile.am => qt/src/QGpgmeConfigVersion.cmake.in} (57%)
 create mode 100644 lang/qt/src/abstractimportjob.h
 create mode 100644 lang/qt/src/adduseridjob.h
 create mode 100644 lang/qt/src/changeexpiryjob.h
 create mode 100644 lang/qt/src/changeownertrustjob.h
 create mode 100644 lang/qt/src/changepasswdjob.h
 create mode 100644 lang/qt/src/cryptoconfig.h
 create mode 100644 lang/qt/src/dataprovider.cpp
 create mode 100644 lang/qt/src/dataprovider.h
 create mode 100644 lang/qt/src/decryptjob.h
 create mode 100644 lang/qt/src/decryptverifyjob.h
 create mode 100644 lang/qt/src/deletejob.h
 create mode 100644 lang/qt/src/downloadjob.h
 create mode 100644 lang/qt/src/encryptjob.h
 create mode 100644 lang/qt/src/exportjob.h
 create mode 100644 lang/qt/src/gpgme_backend_debug.cpp
 create mode 100644 lang/qt/src/gpgme_backend_debug.h
 create mode 100644 lang/qt/src/hierarchicalkeylistjob.h
 create mode 100644 lang/qt/src/importfromkeyserverjob.h
 create mode 100644 lang/qt/src/importjob.h
 create mode 100644 lang/qt/src/job.cpp
 create mode 100644 lang/qt/src/job.h
 create mode 100644 lang/qt/src/keygenerationjob.h
 create mode 100644 lang/qt/src/keylistjob.h
 create mode 100644 lang/qt/src/listallkeysjob.h
 create mode 100644 lang/qt/src/multideletejob.h
 create mode 100644 lang/qt/src/protocol.h
 create mode 100644 lang/qt/src/protocol_p.h
 create mode 100644 lang/qt/src/qgpgme_export.h
 create mode 100644 lang/qt/src/qgpgmeadduseridjob.cpp
 create mode 100644 lang/qt/src/qgpgmeadduseridjob.h
 create mode 100644 lang/qt/src/qgpgmebackend.cpp
 create mode 100644 lang/qt/src/qgpgmebackend.h
 create mode 100644 lang/qt/src/qgpgmechangeexpiryjob.cpp
 create mode 100644 lang/qt/src/qgpgmechangeexpiryjob.h
 create mode 100644 lang/qt/src/qgpgmechangeownertrustjob.cpp
 create mode 100644 lang/qt/src/qgpgmechangeownertrustjob.h
 create mode 100644 lang/qt/src/qgpgmechangepasswdjob.cpp
 create mode 100644 lang/qt/src/qgpgmechangepasswdjob.h
 create mode 100644 lang/qt/src/qgpgmedecryptjob.cpp
 create mode 100644 lang/qt/src/qgpgmedecryptjob.h
 create mode 100644 lang/qt/src/qgpgmedecryptverifyjob.cpp
 create mode 100644 lang/qt/src/qgpgmedecryptverifyjob.h
 create mode 100644 lang/qt/src/qgpgmedeletejob.cpp
 create mode 100644 lang/qt/src/qgpgmedeletejob.h
 create mode 100644 lang/qt/src/qgpgmedownloadjob.cpp
 create mode 100644 lang/qt/src/qgpgmedownloadjob.h
 create mode 100644 lang/qt/src/qgpgmeencryptjob.cpp
 create mode 100644 lang/qt/src/qgpgmeencryptjob.h
 create mode 100644 lang/qt/src/qgpgmeexportjob.cpp
 create mode 100644 lang/qt/src/qgpgmeexportjob.h
 create mode 100644 lang/qt/src/qgpgmeimportfromkeyserverjob.cpp
 create mode 100644 lang/qt/src/qgpgmeimportfromkeyserverjob.h
 create mode 100644 lang/qt/src/qgpgmeimportjob.cpp
 create mode 100644 lang/qt/src/qgpgmeimportjob.h
 create mode 100644 lang/qt/src/qgpgmekeygenerationjob.cpp
 create mode 100644 lang/qt/src/qgpgmekeygenerationjob.h
 create mode 100644 lang/qt/src/qgpgmekeylistjob.cpp
 create mode 100644 lang/qt/src/qgpgmekeylistjob.h
 create mode 100644 lang/qt/src/qgpgmelistallkeysjob.cpp
 create mode 100644 lang/qt/src/qgpgmelistallkeysjob.h
 create mode 100644 lang/qt/src/qgpgmenewcryptoconfig.cpp
 create mode 100644 lang/qt/src/qgpgmenewcryptoconfig.h
 create mode 100644 lang/qt/src/qgpgmerefreshkeysjob.cpp
 create mode 100644 lang/qt/src/qgpgmerefreshkeysjob.h
 create mode 100644 lang/qt/src/qgpgmesecretkeyexportjob.cpp
 create mode 100644 lang/qt/src/qgpgmesecretkeyexportjob.h
 create mode 100644 lang/qt/src/qgpgmesignencryptjob.cpp
 create mode 100644 lang/qt/src/qgpgmesignencryptjob.h
 create mode 100644 lang/qt/src/qgpgmesignjob.cpp
 create mode 100644 lang/qt/src/qgpgmesignjob.h
 create mode 100644 lang/qt/src/qgpgmesignkeyjob.cpp
 create mode 100644 lang/qt/src/qgpgmesignkeyjob.h
 create mode 100644 lang/qt/src/qgpgmeverifydetachedjob.cpp
 create mode 100644 lang/qt/src/qgpgmeverifydetachedjob.h
 create mode 100644 lang/qt/src/qgpgmeverifyopaquejob.cpp
 create mode 100644 lang/qt/src/qgpgmeverifyopaquejob.h
 create mode 100644 lang/qt/src/refreshkeysjob.h
 create mode 100644 lang/qt/src/signencryptjob.h
 create mode 100644 lang/qt/src/signjob.h
 create mode 100644 lang/qt/src/signkeyjob.h
 create mode 100644 lang/qt/src/specialjob.h
 create mode 100644 lang/qt/src/threadedjobmixin.cpp
 create mode 100644 lang/qt/src/threadedjobmixin.h
 create mode 100644 lang/qt/src/verifydetachedjob.h
 create mode 100644 lang/qt/src/verifyopaquejob.h
 create mode 100644 lang/qt/tests/Makefile.am
 create mode 100755 lang/qt/tests/initial.test
 create mode 100644 lang/qt/tests/t-keylist.cpp
 create mode 100644 m4/ax_cxx_compile_stdcxx.m4
 create mode 100644 m4/qt.m4
 delete mode 100644 src/kdpipeiodevice.cpp
 delete mode 100644 src/kdpipeiodevice.h
 delete mode 100644 src/kdpipeiodevice.moc
 delete mode 100644 src/w32-qt-io.cpp


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



From cvs at cvs.gnupg.org  Wed May 11 12:38:48 2016
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Wed, 11 May 2016 12:38:48 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.12-6-g83a90a9
Message-ID: <E1b0RW8-0000IR-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  83a90a916e8e2f8e44c3b11d11e1dd75f65a87fb (commit)
      from  ac9ff644b12c4dfa55d466af8ae6af54d1646893 (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 83a90a916e8e2f8e44c3b11d11e1dd75f65a87fb
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Wed May 11 19:27:03 2016 +0900

    g10: Fix signature checking.
    
    * g10/sig-check.c (check_signature_over_key_or_uid): Fix call to
    walk_kbnode.
    
    --
    
    Thanks to Vincent Brillault (Feandil).
    
    GnuPG-bug-id: 2351
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/g10/sig-check.c b/g10/sig-check.c
index 290f19a..7000b48 100644
--- a/g10/sig-check.c
+++ b/g10/sig-check.c
@@ -797,15 +797,20 @@ check_signature_over_key_or_uid (PKT_public_key *signer,
             *is_selfsig = 1;
         }
       else
-        /* See if one of the subkeys was the signer (although this is
-           extremely unlikely).  */
         {
           kbnode_t ctx = NULL;
           kbnode_t n;
 
-          while ((n = walk_kbnode (kb, &ctx, PKT_PUBLIC_SUBKEY)))
+          /* See if one of the subkeys was the signer (although this
+             is extremely unlikely).  */
+          while ((n = walk_kbnode (kb, &ctx, 0)))
             {
-              PKT_public_key *subk = n->pkt->pkt.public_key;
+              PKT_public_key *subk;
+
+              if (n->pkt->pkttype != PKT_PUBLIC_SUBKEY)
+                continue;
+
+              subk = n->pkt->pkt.public_key;
               if (sig->keyid[0] == subk->keyid[0]
                   && sig->keyid[1] == subk->keyid[1])
                 /* Issued by a subkey.  */

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

Summary of changes:
 g10/sig-check.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)


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



From cvs at cvs.gnupg.org  Wed May 11 12:41:43 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 11 May 2016 12:41:43 +0200
Subject: [git] KSBA - branch, master, updated. libksba-1.3.4-2-g2a9fc56
Message-ID: <E1b0RYw-0000VZ-6N@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  2a9fc5654df497b91ab9b64e946c1e19371888e5 (commit)
      from  ba090d96be474658dec13a3e2aa912022a3ef72f (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 2a9fc5654df497b91ab9b64e946c1e19371888e5
Author: Werner Koch <wk at gnupg.org>
Date:   Wed May 11 12:40:12 2016 +0200

    Make sure that ASN.1 data is stored in an all-initialized buffer.
    
    * src/ber-decoder.c (decoder_next): Clear the image buffer.
    --
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/ber-decoder.c b/src/ber-decoder.c
index 9e70d92..dde73fd 100644
--- a/src/ber-decoder.c
+++ b/src/ber-decoder.c
@@ -857,12 +857,17 @@ decoder_next (BerDecoder d)
       if (!d->image.buf)
         {
           /* We need some extra bytes to store the stuff we read ahead
-             at the end of the module which is later pushed back. */
+           * at the end of the module which is later pushed back.  We
+           * also clear the buffer because there is no guarantee that
+           * we will copy data to all bytes of the buffer: A broken
+           * ASN.1 encoding may thus lead to access of uninitialized
+           * data even if we make sure that that access is not our of
+           * bounds. */
           d->image.used = 0;
           d->image.length = ti.length + 100;
           if (d->image.length < ti.length)
             return gpg_error (GPG_ERR_BAD_BER);
-          d->image.buf = xtrymalloc (d->image.length);
+          d->image.buf = xtrycalloc (1, d->image.length);
           if (!d->image.buf)
             return gpg_error (GPG_ERR_ENOMEM);
         }
@@ -1133,7 +1138,7 @@ _ksba_ber_decoder_dump (BerDecoder d, FILE *fp)
               p = ksba_oid_to_str (buf, n);
               break;
             default:
-              for (i=0; i < n && i < 20; i++)
+              for (i=0; i < n && (d->debug || i < 20); i++)
                 fprintf (fp,"%02x", buf[i]);
               if (i < n)
                 fputs ("..more..", fp);

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

Summary of changes:
 src/ber-decoder.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)


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  Wed May 11 13:55:31 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Wed, 11 May 2016 13:55:31 +0200
Subject: [git] GPGME - branch, justus/pyme3, created. gpgme-1.6.0-36-gbbeee5e
Message-ID: <E1b0SiL-0003rv-8g@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, justus/pyme3 has been created
        at  bbeee5e1a060f2d1e37a08220eb552cf4673a058 (commit)

- Log -----------------------------------------------------------------
commit bbeee5e1a060f2d1e37a08220eb552cf4673a058
Author: Justus Winter <justus at gnupg.org>
Date:   Wed May 11 13:51:40 2016 +0200

    python: Fix simple example.
    
    * lang/python/examples/simple.py: Flush stdout, encode name as
    UTF-8 before passing it to GPGME.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/examples/simple.py b/lang/python/examples/simple.py
index 5693d40..739291e 100755
--- a/lang/python/examples/simple.py
+++ b/lang/python/examples/simple.py
@@ -36,8 +36,9 @@ c.set_armor(1)
 # Set up the recipients.
 
 sys.stdout.write("Enter name of your recipient: ")
+sys.stdout.flush()
 name = sys.stdin.readline().strip()
-c.op_keylist_start(name, 0)
+c.op_keylist_start(name.encode(), 0)
 r = c.op_keylist_next()
 
 if r == None:

commit a29babd07cf9f9625d2b5aa2eb6b7bc9d1828359
Author: Justus Winter <justus at gnupg.org>
Date:   Wed May 11 11:42:00 2016 +0200

    python: Integrate into the build system.
    
    * configure.ac: Make Python bindings configurable, add new Makefile.
    * lang/python/Makefile.am: New file.
    * lang/python/setup.py: Integrate into the build system.
    * m4/ax_pkg_swig.m4: New file from the autoconf archive.
    * m4/m4_ax_swig_python.m4: Likewise.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/configure.ac b/configure.ac
index 55c388e..96df059 100644
--- a/configure.ac
+++ b/configure.ac
@@ -587,6 +587,32 @@ AC_SUBST(emacs_local_vars_begin, [['Local][ ][Variables:']])
 AC_SUBST(emacs_local_vars_read_only, ['buffer-read-only: t'])
 AC_SUBST(emacs_local_vars_end, ['End:'])
 
+# Bindings.
+AC_ARG_ENABLE([python],
+              AC_HELP_STRING([--enable-python],
+                             [build the Python3 bindings]),
+              [enable_python=$enableval],
+	      [enable_python=auto])
+AX_PKG_SWIG
+if test -z "$SWIG"; then
+  if test $enable_python = yes; then
+    die=yes
+    AC_MSG_NOTICE([[
+***
+*** You need SWIG to build the Python bindings.
+***]])
+  else
+    enable_python=no
+  fi
+else
+  if test $enable_python = auto; then
+    enable_python=yes
+  fi
+fi
+if test $enable_python = yes; then
+  AM_PATH_PYTHON([3.2])
+  AX_SWIG_PYTHON
+fi
 
 # Last check.
 die=no
@@ -632,7 +658,8 @@ AC_CONFIG_FILES(Makefile src/Makefile
                 src/versioninfo.rc
                 src/gpgme.h)
 AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)
-AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd])
+AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd
+                 lang/python/Makefile])
 AC_OUTPUT
 
 echo "
@@ -644,6 +671,8 @@ echo "
         UI Server:       $uiserver
         FD Passing:      $use_descriptor_passing
         GPGME Pthread:   $have_pthread
+
+        Python bindings: $enable_python
 "
 if test "x${gpg_config_script_warn}" != x; then
 cat <<G10EOF
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
new file mode 100644
index 0000000..a1a2bc9
--- /dev/null
+++ b/lang/python/Makefile.am
@@ -0,0 +1,53 @@
+# Makefile.am for the Python bindings.
+# Copyright (C) 2016 g10 Code GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME 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.
+#
+# GPGME 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 program; if not, see <http://www.gnu.org/licenses/>.
+
+EXTRA_DIST = README.rst
+
+# Cleanup gpgme.h from deprecated functions and typedefs.
+gpgme.h: ../../src/gpgme.h
+	$(PYTHON) $(srcdir)/gpgme-h-clean.py $< >$@
+
+# For VPATH builds we need to copy some files because Python's
+# distutils are not VPATH-aware.
+copystamp: $(srcdir)/pyme $(srcdir)/helpers.c $(srcdir)/helpers.h
+	if test "$(srcdir)" != "$(builddir)" ; then cp -a $^ . ; fi
+	touch $@
+
+gpgme_wrap.c pyme/pygpgme.py: gpgme.i gpgme.h copystamp
+	$(SWIG) -python -py3 $(SWIGOPT) \
+	  -o $(builddir)/gpgme_wrap.c -outdir $(builddir)/pyme \
+	  $<
+
+all-local: gpgme_wrap.c pyme/pygpgme.py copystamp
+	$(PYTHON) $(srcdir)/setup.py build --verbose
+
+clean-local:
+	rm -rf -- build gpgme.h gpgme_wrap.c pyme/pygpgme.py copystamp
+	if test "$(srcdir)" != "$(builddir)" ; then \
+	  rm -rf pyme helpers.c helpers.h ; \
+	fi
+
+install-exec-local:
+	$(PYTHON) $(srcdir)/setup.py install \
+	  --prefix $(DESTDIR)$(prefix) \
+	  --record $(DESTDIR)$(pythondir)/pyme/install_files.txt \
+	  --verbose
+
+uninstall-local:
+	xargs <$(DESTDIR)$(pythondir)/pyme/install_files.txt -- rm -rf --
+	rm -rf -- $(DESTDIR)$(pythondir)/pyme
diff --git a/lang/python/setup.py b/lang/python/setup.py
index 562c08f..f3d9143 100755
--- a/lang/python/setup.py
+++ b/lang/python/setup.py
@@ -22,31 +22,23 @@
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 # END OF COPYRIGHT #
 
-
 from distutils.core import setup, Extension
-from distutils.command.build_ext import build_ext
 import os, os.path, sys
 import subprocess
 
-sys.path.append("pyme")
-import version
+sys.path.insert(0, os.path.dirname(__file__))
+import pyme.version
 
 def getconfig(what):
-    try:
-        process = subprocess.Popen(["gpgme-config", "--%s" % what],
-                                   stdout=subprocess.PIPE)
-        confdata = process.communicate()[0]
-    except OSError as e:
-         if e.errno == os.errno.ENOENT:
-             raise RuntimeError("Could not call gpgme-config, perhaps install libgpgme-dev")
-         else:
-             raise
+    confdata = subprocess.Popen(["../../src/gpgme-config", "--%s" % what],
+                                stdout=subprocess.PIPE).communicate()[0]
     return [x for x in confdata.decode('utf-8').split() if x != '']
 
 include_dirs = [os.getcwd()]
 define_macros = []
-library_dirs = []
+library_dirs = ["../../src/.libs"] # XXX uses libtool internals
 libs = getconfig('libs')
+
 for item in getconfig('cflags'):
     if item.startswith("-I"):
         include_dirs.append(item[2:])
@@ -82,16 +74,6 @@ if uname_s.startswith("MINGW32"):
                library_dirs.append(os.path.join(tgt, item))
                break
 
-try:
-    subprocess.call("swig")
-except OSError as e:
-    if e.errno == os.errno.ENOENT:
-        raise RuntimeError("Could not call swig, perhaps install swig.")
-    else:
-        raise
-
-subprocess.call(["make swig"], shell=True)
-
 swige = Extension("pyme._pygpgme", ["gpgme_wrap.c", "helpers.c"],
                   include_dirs = include_dirs,
                   define_macros = define_macros,
@@ -99,15 +81,15 @@ swige = Extension("pyme._pygpgme", ["gpgme_wrap.c", "helpers.c"],
                   extra_link_args = libs)
 
 setup(name = "pyme",
-      version = version.versionstr,
-      description = version.description,
-      author = version.author,
-      author_email = version.author_email,
-      url = version.homepage,
+      version=pyme.version.versionstr,
+      description=pyme.version.description,
+      author=pyme.version.author,
+      author_email=pyme.version.author_email,
+      url=pyme.version.homepage,
       ext_modules=[swige],
       packages = ['pyme', 'pyme.constants', 'pyme.constants.data',
                   'pyme.constants.keylist', 'pyme.constants.sig'],
-      license = version.copyright + \
+      license=pyme.version.copyright + \
                 ", Licensed under the GPL version 2 and the LGPL version 2.1"
 )
 
diff --git a/m4/ax_pkg_swig.m4 b/m4/ax_pkg_swig.m4
new file mode 100644
index 0000000..d836eec
--- /dev/null
+++ b/m4/ax_pkg_swig.m4
@@ -0,0 +1,135 @@
+# ===========================================================================
+#        http://www.gnu.org/software/autoconf-archive/ax_pkg_swig.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PKG_SWIG([major.minor.micro], [action-if-found], [action-if-not-found])
+#
+# DESCRIPTION
+#
+#   This macro searches for a SWIG installation on your system. If found,
+#   then SWIG is AC_SUBST'd; if not found, then $SWIG is empty.  If SWIG is
+#   found, then SWIG_LIB is set to the SWIG library path, and AC_SUBST'd.
+#
+#   You can use the optional first argument to check if the version of the
+#   available SWIG is greater than or equal to the value of the argument. It
+#   should have the format: N[.N[.N]] (N is a number between 0 and 999. Only
+#   the first N is mandatory.) If the version argument is given (e.g.
+#   1.3.17), AX_PKG_SWIG checks that the swig package is this version number
+#   or higher.
+#
+#   As usual, action-if-found is executed if SWIG is found, otherwise
+#   action-if-not-found is executed.
+#
+#   In configure.in, use as:
+#
+#     AX_PKG_SWIG(1.3.17, [], [ AC_MSG_ERROR([SWIG is required to build..]) ])
+#     AX_SWIG_ENABLE_CXX
+#     AX_SWIG_MULTI_MODULE_SUPPORT
+#     AX_SWIG_PYTHON
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Sebastian Huber <sebastian-huber at web.de>
+#   Copyright (c) 2008 Alan W. Irwin
+#   Copyright (c) 2008 Rafael Laboissiere <rafael at laboissiere.net>
+#   Copyright (c) 2008 Andrew Collier
+#   Copyright (c) 2011 Murray Cumming <murrayc at openismus.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 11
+
+AC_DEFUN([AX_PKG_SWIG],[
+        # Ubuntu has swig 2.0 as /usr/bin/swig2.0
+        AC_PATH_PROGS([SWIG],[swig swig2.0])
+        if test -z "$SWIG" ; then
+                m4_ifval([$3],[$3],[:])
+        elif test -n "$1" ; then
+                AC_MSG_CHECKING([SWIG version])
+                [swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`]
+                AC_MSG_RESULT([$swig_version])
+                if test -n "$swig_version" ; then
+                        # Calculate the required version number components
+                        [required=$1]
+                        [required_major=`echo $required | sed 's/[^0-9].*//'`]
+                        if test -z "$required_major" ; then
+                                [required_major=0]
+                        fi
+                        [required=`echo $required | sed 's/[0-9]*[^0-9]//'`]
+                        [required_minor=`echo $required | sed 's/[^0-9].*//'`]
+                        if test -z "$required_minor" ; then
+                                [required_minor=0]
+                        fi
+                        [required=`echo $required | sed 's/[0-9]*[^0-9]//'`]
+                        [required_patch=`echo $required | sed 's/[^0-9].*//'`]
+                        if test -z "$required_patch" ; then
+                                [required_patch=0]
+                        fi
+                        # Calculate the available version number components
+                        [available=$swig_version]
+                        [available_major=`echo $available | sed 's/[^0-9].*//'`]
+                        if test -z "$available_major" ; then
+                                [available_major=0]
+                        fi
+                        [available=`echo $available | sed 's/[0-9]*[^0-9]//'`]
+                        [available_minor=`echo $available | sed 's/[^0-9].*//'`]
+                        if test -z "$available_minor" ; then
+                                [available_minor=0]
+                        fi
+                        [available=`echo $available | sed 's/[0-9]*[^0-9]//'`]
+                        [available_patch=`echo $available | sed 's/[^0-9].*//'`]
+                        if test -z "$available_patch" ; then
+                                [available_patch=0]
+                        fi
+                        # Convert the version tuple into a single number for easier comparison.
+                        # Using base 100 should be safe since SWIG internally uses BCD values
+                        # to encode its version number.
+                        required_swig_vernum=`expr $required_major \* 10000 \
+                            \+ $required_minor \* 100 \+ $required_patch`
+                        available_swig_vernum=`expr $available_major \* 10000 \
+                            \+ $available_minor \* 100 \+ $available_patch`
+
+                        if test $available_swig_vernum -lt $required_swig_vernum; then
+                                AC_MSG_WARN([SWIG version >= $1 is required.  You have $swig_version.])
+                                SWIG=''
+                                m4_ifval([$3],[$3],[])
+                        else
+                                AC_MSG_CHECKING([for SWIG library])
+                                SWIG_LIB=`$SWIG -swiglib`
+                                AC_MSG_RESULT([$SWIG_LIB])
+                                m4_ifval([$2],[$2],[])
+                        fi
+                else
+                        AC_MSG_WARN([cannot determine SWIG version])
+                        SWIG=''
+                        m4_ifval([$3],[$3],[])
+                fi
+        fi
+        AC_SUBST([SWIG_LIB])
+])
diff --git a/m4/m4_ax_swig_python.m4 b/m4/m4_ax_swig_python.m4
new file mode 100644
index 0000000..bf22558
--- /dev/null
+++ b/m4/m4_ax_swig_python.m4
@@ -0,0 +1,64 @@
+# ===========================================================================
+#      http://www.gnu.org/software/autoconf-archive/ax_swig_python.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_SWIG_PYTHON([use-shadow-classes = {no, yes}])
+#
+# DESCRIPTION
+#
+#   Checks for Python and provides the $(AX_SWIG_PYTHON_CPPFLAGS), and
+#   $(AX_SWIG_PYTHON_OPT) output variables.
+#
+#   $(AX_SWIG_PYTHON_OPT) contains all necessary SWIG options to generate
+#   code for Python. Shadow classes are enabled unless the value of the
+#   optional first argument is exactly 'no'. If you need multi module
+#   support (provided by the AX_SWIG_MULTI_MODULE_SUPPORT macro) use
+#   $(AX_SWIG_PYTHON_LIBS) to link against the appropriate library. It
+#   contains the SWIG Python runtime library that is needed by the type
+#   check system for example.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Sebastian Huber <sebastian-huber at web.de>
+#   Copyright (c) 2008 Alan W. Irwin
+#   Copyright (c) 2008 Rafael Laboissiere <rafael at laboissiere.net>
+#   Copyright (c) 2008 Andrew Collier
+#
+#   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 10
+
+AU_ALIAS([SWIG_PYTHON], [AX_SWIG_PYTHON])
+AC_DEFUN([AX_SWIG_PYTHON],[
+        AC_REQUIRE([AX_PKG_SWIG])
+        AC_REQUIRE([AX_PYTHON_DEVEL])
+        test "x$1" != "xno" || swig_shadow=" -noproxy"
+        AC_SUBST([AX_SWIG_PYTHON_OPT],[-python$swig_shadow])
+        AC_SUBST([AX_SWIG_PYTHON_CPPFLAGS],[$PYTHON_CPPFLAGS])
+])

commit 11392a80d9a85bcd8718b105e6d58038e61beaac
Author: Justus Winter <justus at gnupg.org>
Date:   Tue May 10 14:45:44 2016 +0200

    python: PEP8 fixes.
    
    Cherry picked from 0267c151.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/examples/delkey.py b/lang/python/examples/delkey.py
index dfcc5ea..600e0c0 100755
--- a/lang/python/examples/delkey.py
+++ b/lang/python/examples/delkey.py
@@ -2,10 +2,10 @@
 # $Id$
 # Copyright (C) 2004,2008 Igor Belyi <belyi at users.sourceforge.net>
 #
-#    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 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
@@ -14,7 +14,8 @@
 #
 #    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+#    02111-1307 USA
 
 # Sample of key deletion
 # It deletes keys for joe at example.org generated by genkey.pl script
@@ -23,9 +24,10 @@ from pyme import core
 
 core.check_version(None)
 
-# Note that we need to collect all keys out of the iterator return by c.op_keylist_all()
-# method before starting to delete them. If you delete a key in the middle of iteration
-# c.op_keylist_next() will raise INV_VALUE exception
+# Note that we need to collect all keys out of the iterator return by
+# c.op_keylist_all() method before starting to delete them. If you
+# delete a key in the middle of iteration c.op_keylist_next() will
+# raise INV_VALUE exception
 
 c = core.Context()
 # 0 in keylist means to list not only public but secret keys as well.
diff --git a/lang/python/examples/encrypt-to-all.py b/lang/python/examples/encrypt-to-all.py
index c890df4..672e661 100755
--- a/lang/python/examples/encrypt-to-all.py
+++ b/lang/python/examples/encrypt-to-all.py
@@ -3,10 +3,10 @@
 # Copyright (C) 2008 Igor Belyi <belyi at users.sourceforge.net>
 # Copyright (C) 2002 John Goerzen <jgoerzen at complete.org>
 #
-#    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 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
@@ -15,7 +15,8 @@
 #
 #    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+#    02111-1307 USA
 
 """
 This program will try to encrypt a simple message to each key on your
@@ -46,11 +47,11 @@ for key in c.op_keylist_all(None, 0):
         valid = 0
         for subkey in key.subkeys:
             keyid = subkey.keyid
-            if keyid == None:
+            if keyid is None:
                 break
             can_encrypt = subkey.can_encrypt
             valid += can_encrypt
-            print("     Subkey %s: encryption %s" % \
+            print("     Subkey %s: encryption %s" %
                   (keyid, can_encrypt and "enabled" or "disabled"))
     except UnicodeEncodeError as e:
         print(e)
@@ -64,5 +65,3 @@ passno = 0
 
 print("Encrypting to %d recipients" % len(names))
 print(sendto(names))
-
-
diff --git a/lang/python/examples/exportimport.py b/lang/python/examples/exportimport.py
index 54204fb..6c7d5b8 100755
--- a/lang/python/examples/exportimport.py
+++ b/lang/python/examples/exportimport.py
@@ -2,10 +2,10 @@
 # $Id$
 # Copyright (C) 2004,2008 Igor Belyi <belyi at users.sourceforge.net>
 #
-#    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 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
@@ -14,7 +14,8 @@
 #
 #    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+#    02111-1307 USA
 
 # Sample of export and import of keys
 # It uses keys for joe at example.org generated by genkey.pl script
@@ -33,7 +34,7 @@ print(" - Export %s's public keys - " % user)
 c.op_export(user, 0, expkey)
 
 # print out exported data to see how it looks in armor.
-expkey.seek(0,0)
+expkey.seek(0, 0)
 expstring = expkey.read()
 if expstring:
     print(expstring)
@@ -46,10 +47,10 @@ else:
 # Note that since joe's key has private part as well we can only delete
 # both of them. As a side effect joe won't have private key for this
 # exported public one. If it's Ok with you uncomment the next 4 lines.
-#print " - Delete %s's public keys - " % user
-#for thekey in [x for x in c.op_keylist_all(user, 0)]:
-#    if not thekey.secret:
-#        c.op_delete(thekey, 1)
+# print " - Delete %s's public keys - " % user
+# for thekey in [x for x in c.op_keylist_all(user, 0)]:
+#     if not thekey.secret:
+#         c.op_delete(thekey, 1)
 
 
 # initialize import data from a string as if it was read from a file.
@@ -63,11 +64,11 @@ result = c.op_import_result()
 if result:
     print(" - Result of the import - ")
     for k in dir(result):
-        if not k in result.__dict__ and not k.startswith("_"):
+        if k not in result.__dict__ and not k.startswith("_"):
             if k == "imports":
                 print(k, ":")
                 for impkey in result.__getattr__(k):
-                    print("    fpr=%s result=%d status=%x" % \
+                    print("    fpr=%s result=%d status=%x" %
                           (impkey.fpr, impkey.result, impkey.status))
             else:
                 print(k, ":", result.__getattr__(k))
diff --git a/lang/python/examples/inter-edit.py b/lang/python/examples/inter-edit.py
index f97232b..32f8edd 100644
--- a/lang/python/examples/inter-edit.py
+++ b/lang/python/examples/inter-edit.py
@@ -14,9 +14,11 @@
 #
 #    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+#    02111-1307 USA
 
-import os, sys
+import os
+import sys
 from pyme import core
 from pyme.core import Data, Context
 from pyme.constants import status
@@ -29,12 +31,13 @@ for name in dir(status):
     if not name.startswith('__') and name != "util":
         stat2str[getattr(status, name)] = name
 
+
 # Print the output received since the last prompt before giving the new prompt
 def edit_fnc(stat, args, helper):
     global stat_strings
     try:
         while True:
-            helper["data"].seek(helper["skip"],0)
+            helper["data"].seek(helper["skip"], 0)
             data = helper["data"].read()
             helper["skip"] += len(data)
             print(data)
@@ -53,5 +56,5 @@ else:
     helper = {"skip": 0, "data": out}
     c.op_edit(key, edit_fnc, helper, out)
     print("[-- Final output --]")
-    out.seek(helper["skip"],0)
+    out.seek(helper["skip"], 0)
     print(out.read())

commit aade53a12b9716997684b872bc2ac87229f73fb3
Author: Justus Winter <justus at gnupg.org>
Date:   Tue May 10 13:30:30 2016 +0200

    python: Delete trailing whitespace.
    
    --
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/README.rst b/lang/python/README.rst
index 4cad03a..57df1f2 100644
--- a/lang/python/README.rst
+++ b/lang/python/README.rst
@@ -22,7 +22,7 @@ Authors
 * Martin Albrecht, `PyME 0.9+ <https://bitbucket.org/malb/pyme>`_, 2014 to present.
 * Ben McGinnes, `PyME Python 3 Port <https://git.gnupg.org/gpgme.git/lang/py3-pyme>`_, 2015 to present.
 
-  
+
 ------------
 Mailing List
 ------------
diff --git a/lang/python/docs/old-commits.log b/lang/python/docs/old-commits.log
index 4d2bfe0..0db59a0 100644
--- a/lang/python/docs/old-commits.log
+++ b/lang/python/docs/old-commits.log
@@ -4,7 +4,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Wed May 6 03:04:19 2015 +1000
 
     Merge pull request #4 from Hasimir/master
-    
+
     history
 
 commit 2036f1a0a670a0561993e195c458059220b36114
@@ -19,7 +19,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Wed May 6 02:52:23 2015 +1000
 
     Added a short history
-    
+
     * A (very) brief summary of the project's history since 2002.
     * Deals with why the commit log in the GPGME repo does not include the
       history of PyME.
@@ -36,7 +36,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Wed May 6 02:21:34 2015 +1000
 
     Merge pull request #3 from Hasimir/master
-    
+
     Version release preparation
 
 commit 7c37a27a6845c58222d4d947c2efbe38e955b612
@@ -51,7 +51,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Wed May 6 02:09:44 2015 +1000
 
     TODO update
-    
+
     * Removed reference to GitHub, replaced with impending new home at gnupg.org.
 
  docs/TODO.rst | 4 ++--
@@ -62,7 +62,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Wed May 6 02:00:44 2015 +1000
 
     Version bump
-    
+
     * Bumped version number to 0.9.1 to keep it somewhat in line with the
       existing PyME project, even though there will be some divergence at
       some point (or even re-merging, depending on how many of the Python 3
@@ -80,7 +80,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Wed May 6 01:48:01 2015 +1000
 
     README preparation.
-    
+
     * Changes in preparation for impending move of code to the GnuPG git
       server as a part of GPGME.
 
@@ -92,7 +92,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Wed May 6 01:43:53 2015 +1000
 
     TODO moved to docs
-    
+
     * As it says.
 
  TODO.rst      | 25 -------------------------
@@ -114,7 +114,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Sun May 3 14:59:44 2015 +1000
 
     Merge pull request #2 from Hasimir/master
-    
+
     Minor editing.
 
 commit 44837f6e50fc539c86aef1f75a6a3538b02029ea
@@ -122,7 +122,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Sun May 3 14:56:55 2015 +1000
 
     Minor editing.
-    
+
     * Fixed another URL.
     * Changed Py3 version's version number to v0.9.1-beta0.
 
@@ -135,7 +135,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Sun May 3 14:26:11 2015 +1000
 
     Merge pull request #1 from Hasimir/master
-    
+
     Links
 
 commit 48eb1856cb0739cc9f0b9084da9d965e1fc7fddd
@@ -143,7 +143,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Sun May 3 14:22:30 2015 +1000
 
     Links
-    
+
     * Fixed URLs for authors.
     * Updated my entry to point to github location.
     ** I strongly suspect the result of this work will be concurrent
@@ -157,9 +157,9 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Sun May 3 11:29:00 2015 +1000
 
     Explicit over Implicit ...
-    
+
     ... isn't just for code.
-    
+
     * Removed the 2to3 working directory and its contents.
     * Made the README.rst file a little more clear that this branch is for
       Python 3 (set Python 3.2 as a fairly arbitrary requirement for the
@@ -176,7 +176,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Sun May 3 11:19:41 2015 +1000
 
     Added authors.
-    
+
     * In alphabetical order.
     * Mine will need updating once Martin and I have decided what to do
       regarding the two main branches.
@@ -189,7 +189,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Sun May 3 10:23:00 2015 +1000
 
     Docs and other things.
-    
+
     * Now able to import pyme.core without error, indicates port process is
       successful.
     * Code is *not* compatible with the Python 2 version.
@@ -227,7 +227,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Sun May 3 10:08:22 2015 +1000
 
     Bytes vs. Unicode
-    
+
     * Trying PyBytes instead of PyUnicode.
 
  gpgme.i   | 14 +++++++-------
@@ -239,7 +239,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Sun May 3 09:22:58 2015 +1000
 
     String to Unicode
-    
+
     * Replaced all instances of PyString with PyUnicode (and hoping there's
       no byte data in there).
 
@@ -252,7 +252,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Sun May 3 09:17:06 2015 +1000
 
     PyInt_AsLong
-    
+
     * Replaced all instances of PyInt with PyLong, as per C API docs.
 
  gpgme.i   | 4 ++--
@@ -264,7 +264,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Sun May 3 05:59:36 2015 +1000
 
     Import correction
-    
+
     * Once pygpgme.py is generated and moved, it will be in the right
       directory for the explicit "from . import pygpgme" to be correct.
 
@@ -303,10 +303,10 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Sun May 3 04:53:21 2015 +1000
 
     Pet Peeve
-    
+
     def pet_peeve(self):
         peeve = print("people who don't press return after a colon!")
-    
+
     FFS!
 
  pyme/core.py | 5 +++--
@@ -371,7 +371,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Sun May 3 03:51:48 2015 +1000
 
     Linking swig to py3
-    
+
     * Changed the swig invocations to run with the -python -py3 flags explicitly.
 
  Makefile | 4 ++--
@@ -383,7 +383,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Sat May 2 11:12:00 2015 +1000
 
     String fun
-    
+
     * streamlined confdata details, including decoding strom binary to string.
 
  setup.py | 4 +---
@@ -394,7 +394,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Sat May 2 10:46:59 2015 +1000
 
     Open File
-    
+
     * Removed deprecated file() and replaced with open().
 
  examples/PyGtkGpgKeys.py | 2 +-
@@ -407,7 +407,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Sat May 2 10:36:15 2015 +1000
 
     print() fix
-    
+
     * Makefile includes a python print, changed from statement to function.
 
  Makefile | 2 +-
@@ -418,7 +418,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Sat May 2 10:28:42 2015 +1000
 
     Updated Makefile
-    
+
     * set make to use python3 instead.
     * This will mean a successful port may need to be maintained seperately
       from the original python2 code instead of merged, but ought to be able
@@ -434,7 +434,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Sat May 2 10:15:20 2015 +1000
 
     Env and a little license issue
-    
+
     * Updated all the /usr/bin/env paths to point to python3.
     * Also fixed the hard coded /usr/bin/python paths.
     * Updated part of setup.py which gave the impression this package was
@@ -463,7 +463,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Sat May 2 08:50:54 2015 +1000
 
     Removed extraneous files.
-    
+
     * The two .bak files.
 
  pyme/errors.py.bak |  46 ---------------------
@@ -475,7 +475,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Sat May 2 08:19:37 2015 +1000
 
     Added TODO.org
-    
+
     * TODO list in Emacs org-mode.
     * Will eventually be removed along with this entire directory when the
       porting process is complete.
@@ -488,7 +488,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Sat May 2 07:58:40 2015 +1000
 
     2to3 conversion of remaining files
-    
+
     * Ran the extended version against all the unmodified python files.
     * Only pyme/errors.py required additional work.
 
@@ -502,7 +502,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Sat May 2 07:50:39 2015 +1000
 
     2to3 conversion of setup.py
-    
+
     * Ran extended 2to3 command to produce python 3 code for setup.py.
     * Effectively testing for what to run against the other originally
       unmodified py2 files.
@@ -517,7 +517,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Fri May 1 21:50:07 2015 +1000
 
     Removing 2to3 generated .bak files.
-    
+
     * Not really needed with a real VCS, but couldn't hurt to have them for
       a couple of revisions.  ;)
 
@@ -548,7 +548,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Fri May 1 21:45:50 2015 +1000
 
     2to3 conversion log
-    
+
     * The output of the command to convert the code from Python 2 to 3.
     * Note: this contains the list of files which were not modified and
       which will or may need to be modified.
@@ -561,7 +561,7 @@ Author: Ben McGinnes <ben at adversary.org>
 Date:   Fri May 1 21:36:58 2015 +1000
 
     2to3 conversion of pyme master
-    
+
     * Branch from commit 459f3eca659b4949e394c4a032d9ce2053e6c721
     * Ran this: or x in `find . | egrep .py$` ; do 2to3 -w $x; done ;
     * Multiple files not modified, will record elsewhere (see next commit).
@@ -614,7 +614,7 @@ Author: Martin Albrecht <martinralbrecht at googlemail.com>
 Date:   Wed Jul 9 10:48:33 2014 +0100
 
     Merged in jerrykan/pyme/fix_setup_26 (pull request #1)
-    
+
     Provide support for using setup.py with Python v2.6
 
 commit dae7f14a54e6c2bde0ad4da7308cc7fc0d0c0469
@@ -622,7 +622,7 @@ Author: John Kristensen <john.kristensen at dpipwe.tas.gov.au>
 Date:   Wed Jul 9 15:54:39 2014 +1000
 
     Provide support for using setup.py with Python v2.6
-    
+
     The setup.py script uses subprocess.check_output() which was introduced
     in Python v2.7. The equivalent functionality can be achieved without
     adding much extra code and provide support for Python v2.6.
@@ -701,7 +701,7 @@ Author: Martin Albrecht <martinralbrecht at googlemail.com>
 Date:   Sat May 10 15:41:02 2014 +0100
 
     Merge branch 'master' of bitbucket.org:malb/pyme
-    
+
     Conflicts:
     	setup.py
 
@@ -1018,10 +1018,10 @@ Author: Martin Albrecht <martinralbrecht at googlemail.com>
 Date:   Mon Jan 6 17:44:20 2014 +0100
 
     fixing op_export_keys()
-    
+
     the conversion of gpgme_key_t [] was restricted to gpgme_key_t [] with the
     name recv, i.e. only the use-cases of encryption were covered.
-    
+
     see: http://sourceforge.net/mailarchive/forum.php?forum_name=pyme-help&max_rows=25&style=nested&viewmonth=201309
 
  pyme/gpgme.i | 6 +++---
@@ -1618,9 +1618,9 @@ Date:   Fri Jun 10 03:01:22 2005 +0000
     Update 'docs' rule in Makefile to build packages first to ensure that
     documentation is build for the current version of pyme and not for the
     installed one.
-    
+
     Added 'callbacks' into the list of visible pyme modules (__all__ var.)
-    
+
     Slightly updated INSTALL file.
 
  pyme/INSTALL          | 11 ++++++++---
@@ -2100,7 +2100,7 @@ Author: belyi <devnull at localhost>
 Date:   Fri Mar 18 19:09:33 2005 +0000
 
     Added package building for python2.4
-    
+
     Updated copyright notes to include myslef and avoid confusion who's the
     maintainer. In John's own words: "I'd prefer to just step out of the picture".
     Jonh's copyright notice left intact.
diff --git a/lang/python/examples/encrypt-to-all.py b/lang/python/examples/encrypt-to-all.py
index 8f9d250..c890df4 100755
--- a/lang/python/examples/encrypt-to-all.py
+++ b/lang/python/examples/encrypt-to-all.py
@@ -54,7 +54,7 @@ for key in c.op_keylist_all(None, 0):
                   (keyid, can_encrypt and "enabled" or "disabled"))
     except UnicodeEncodeError as e:
         print(e)
-    
+
     if valid:
         names.append(key)
     else:
diff --git a/lang/python/examples/signverify.py b/lang/python/examples/signverify.py
index f8804ca..7194157 100755
--- a/lang/python/examples/signverify.py
+++ b/lang/python/examples/signverify.py
@@ -43,7 +43,7 @@ if not c.signers_enum(0):
 passlist = {
     b"<joe at example.org>": b"Crypt0R0cks"
     }
-    
+
 # callback will return password based on the e-mail listed in the hint.
 c.set_passphrase_cb(lambda x,y,z: passlist[x[x.rindex("<"):]])
 
diff --git a/lang/python/examples/t-edit.py b/lang/python/examples/t-edit.py
index 6c53342..5553190 100644
--- a/lang/python/examples/t-edit.py
+++ b/lang/python/examples/t-edit.py
@@ -32,7 +32,7 @@ class KeyEditor:
         out.seek(0,0)
         print(out.read(), end=' ')
         print("[-- Code: %d, %s --]" % (status, args))
-    
+
         if args == "keyedit.prompt":
             result = self.steps[self.step]
             self.step += 1
diff --git a/lang/python/examples/testCMSgetkey.py b/lang/python/examples/testCMSgetkey.py
index 53fdef7..7c95301 100644
--- a/lang/python/examples/testCMSgetkey.py
+++ b/lang/python/examples/testCMSgetkey.py
@@ -22,7 +22,7 @@ from pyme.constants import protocol
 def printgetkeyresults(keyfpr):
     """Run gpgme_get_key()."""
 
-    # gpgme_check_version() necessary for initialisation according to 
+    # gpgme_check_version() necessary for initialisation according to
     # gogme 1.1.6 and this is not done automatically in pyme-0.7.0
     print("gpgme version:", core.check_version(None))
     c = core.Context()
@@ -45,5 +45,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-
- 	  	 
diff --git a/lang/python/examples/verifydetails.py b/lang/python/examples/verifydetails.py
index 0d47ba5..a8d840e 100755
--- a/lang/python/examples/verifydetails.py
+++ b/lang/python/examples/verifydetails.py
@@ -96,5 +96,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-
- 	  	 
diff --git a/lang/python/gpgme.i b/lang/python/gpgme.i
index 0115caf..87efce7 100644
--- a/lang/python/gpgme.i
+++ b/lang/python/gpgme.i
@@ -241,14 +241,14 @@ gpgme_error_t pyEditCb(void *opaque, gpgme_status_code_t status,
     func = pyopaque;
     pyargs = PyTuple_New(2);
   }
-  
+
   PyTuple_SetItem(pyargs, 0, PyLong_FromLong((long) status));
   PyTuple_SetItem(pyargs, 1, PyBytes_FromString(args));
   if (dataarg) {
     Py_INCREF(dataarg);		/* Because GetItem doesn't give a ref but SetItem taketh away */
     PyTuple_SetItem(pyargs, 2, dataarg);
   }
-  
+
   retval = PyObject_CallObject(func, pyargs);
   Py_DECREF(pyargs);
   if (PyErr_Occurred()) {
diff --git a/lang/python/helpers.c b/lang/python/helpers.c
index b53dbdd..96c844f 100644
--- a/lang/python/helpers.c
+++ b/lang/python/helpers.c
@@ -66,7 +66,7 @@ static gpgme_error_t pyPassphraseCb(void *hook,
   PyObject *args = NULL;
   PyObject *retval = NULL;
   PyObject *dataarg = NULL;
-  gpgme_error_t err_status = 0;  
+  gpgme_error_t err_status = 0;
 
   pygpgme_exception_init();
 
@@ -119,7 +119,7 @@ static void pyProgressCb(void *hook, const char *what, int type, int current,
 			 int total) {
   PyObject *func = NULL, *dataarg = NULL, *args = NULL, *retval = NULL;
   PyObject *pyhook = (PyObject *) hook;
-  
+
   if (PyTuple_Check(pyhook)) {
     func = PyTuple_GetItem(pyhook, 0);
     dataarg = PyTuple_GetItem(pyhook, 1);
@@ -137,7 +137,7 @@ static void pyProgressCb(void *hook, const char *what, int type, int current,
     Py_INCREF(dataarg);		/* Because GetItem doesn't give a ref but SetItem taketh away */
     PyTuple_SetItem(args, 4, dataarg);
   }
-  
+
   retval = PyObject_CallObject(func, args);
   Py_DECREF(args);
   Py_XDECREF(retval);
diff --git a/lang/python/pyme/callbacks.py b/lang/python/pyme/callbacks.py
index e3c810c..3a507b9 100644
--- a/lang/python/pyme/callbacks.py
+++ b/lang/python/pyme/callbacks.py
@@ -33,7 +33,7 @@ def passphrase_stdin(hint, desc, prev_bad, hook=None):
 def progress_stdout(what, type, current, total, hook=None):
     print("PROGRESS UPDATE: what = %s, type = %d, current = %d, total = %d" %\
           (what, type, current, total))
-    
+
 def readcb_fh(count, hook):
     """A callback for data.  hook should be a Python file-like object."""
     if count:
diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py
index b03cedb..09f0fa8 100644
--- a/lang/python/pyme/core.py
+++ b/lang/python/pyme/core.py
@@ -37,7 +37,7 @@ class Context(GpgmeWrapper):
 
     def _getctype(self):
         return 'gpgme_ctx_t'
-    
+
     def _getnameprepend(self):
         return 'gpgme_'
 
@@ -106,7 +106,7 @@ class Context(GpgmeWrapper):
         if key:
             key.__del__ = lambda self: pygpgme.gpgme_key_unref(self)
             return key
-    
+
     def get_key(self, fpr, secret):
         """Return the key corresponding to the fingerprint 'fpr'"""
         ptr = pygpgme.new_gpgme_key_t_p()
@@ -147,7 +147,7 @@ class Context(GpgmeWrapper):
         desc, a string describing the passphrase it needs;
         prev_bad, a boolean equal True if this is a call made after
         unsuccessful previous attempt.
-        
+
         If hook has a value other than None it will be passed into the func
         as a forth argument.
 
@@ -206,7 +206,7 @@ class Context(GpgmeWrapper):
         context = pygpgme.gpgme_wait(self.wrapped, ptr, hang)
         status = pygpgme.gpgme_error_t_p_value(ptr)
         pygpgme.delete_gpgme_error_t_p(ptr)
-        
+
         if context == None:
             errorcheck(status)
             return None
@@ -219,7 +219,7 @@ class Context(GpgmeWrapper):
             raise ValueError("op_edit: First argument cannot be None")
         opaquedata = (func, fnc_value)
         errorcheck(pygpgme.gpgme_op_edit(self.wrapped, key, opaquedata, out))
-    
+
 class Data(GpgmeWrapper):
     """From the GPGME C manual:
 
@@ -236,7 +236,7 @@ class Data(GpgmeWrapper):
 
     def _getctype(self):
         return 'gpgme_data_t'
-    
+
     def _getnameprepend(self):
         return 'gpgme_data_'
 
@@ -247,7 +247,7 @@ class Data(GpgmeWrapper):
                name == 'gpgme_data_seek':
             return 0
         return 1
-    
+
     def __init__(self, string = None, file = None, offset = None,
                  length = None, cbs = None):
         """Initialize a new gpgme_data_t object.
@@ -360,7 +360,7 @@ class Data(GpgmeWrapper):
         """This wraps the GPGME gpgme_data_new_from_fd() function.
         The argument "file" may be a file-like object, supporting the fileno()
         call and the mode attribute."""
-        
+
         tmp = pygpgme.new_gpgme_data_t_p()
         fp = pygpgme.fdopen(file.fileno(), file.mode)
         if fp == None:
@@ -375,18 +375,18 @@ class Data(GpgmeWrapper):
         new_from_fd() method since in python there's not difference
         between file stream and file descriptor"""
         self.new_from_fd(file)
-    
+
     def write(self, buffer):
         errorcheck(pygpgme.gpgme_data_write(self.wrapped, buffer, len(buffer)))
 
     def read(self, size = -1):
         """Read at most size bytes, returned as a string.
-        
+
         If the size argument is negative or omitted, read until EOF is reached.
 
         Returns the data read, or the empty string if there was no data
         to read before EOF was reached."""
-        
+
         if size == 0:
             return ''
 
@@ -445,11 +445,11 @@ def set_locale(category, value):
 def wait(hang):
     """Wait for asynchronous call on any Context  to finish.
     Wait forever if hang is True.
-    
+
     For finished anynch calls it returns a tuple (status, context):
         status  - status return by asnynchronous call.
         context - context which caused this call to return.
-        
+
     Please read the GPGME manual of more information."""
     ptr = pygpgme.new_gpgme_error_t_p()
     context = pygpgme.gpgme_wait(None, ptr, hang)
diff --git a/lang/python/pyme/errors.py b/lang/python/pyme/errors.py
index 0ad22f2..37d0fe6 100644
--- a/lang/python/pyme/errors.py
+++ b/lang/python/pyme/errors.py
@@ -22,7 +22,7 @@ class GPGMEError(Exception):
     def __init__(self, error = None, message = None):
         self.error = error
         self.message = message
-    
+
     def getstring(self):
         message = "%s: %s" % (pygpgme.gpgme_strsource(self.error),
                               pygpgme.gpgme_strerror(self.error))
@@ -35,7 +35,7 @@ class GPGMEError(Exception):
 
     def getsource(self):
         return pygpgme.gpgme_err_source(self.error)
-    
+
     def __str__(self):
         return "%s (%d,%d)"%(self.getstring(), self.getsource(), self.getcode())
 
diff --git a/lang/python/pyme/util.py b/lang/python/pyme/util.py
index c5f02a9..32e2f55 100644
--- a/lang/python/pyme/util.py
+++ b/lang/python/pyme/util.py
@@ -28,7 +28,7 @@ def process_constants(starttext, dict):
             continue
         name = identifier[index:]
         dict[name] = getattr(pygpgme, identifier)
-        
+
 class GpgmeWrapper(object):
     """Base class all Pyme wrappers for GPGME functionality.  Not to be
     instantiated directly."""
@@ -51,7 +51,7 @@ class GpgmeWrapper(object):
 
     def _getctype(self):
         raise NotImplementedException
-    
+
     def __getattr__(self, name):
         """On-the-fly function generation."""
         if name[0] == '_' or self._getnameprepend() == None:
diff --git a/lang/python/setup.py b/lang/python/setup.py
index b0ed3b2..562c08f 100755
--- a/lang/python/setup.py
+++ b/lang/python/setup.py
@@ -60,7 +60,7 @@ for item in getconfig('cflags'):
 # Adjust include and library locations in case of win32
 uname_s = os.popen("uname -s").read()
 if uname_s.startswith("MINGW32"):
-   mnts = [x.split()[0:3:2] for x in os.popen("mount").read().split("\n") if x] 
+   mnts = [x.split()[0:3:2] for x in os.popen("mount").read().split("\n") if x]
    tmplist = sorted([(len(x[1]), x[1], x[0]) for x in mnts])
    tmplist.reverse()
    extra_dirs = []
@@ -89,9 +89,9 @@ except OSError as e:
         raise RuntimeError("Could not call swig, perhaps install swig.")
     else:
         raise
-    
+
 subprocess.call(["make swig"], shell=True)
-               
+
 swige = Extension("pyme._pygpgme", ["gpgme_wrap.c", "helpers.c"],
                   include_dirs = include_dirs,
                   define_macros = define_macros,
@@ -106,7 +106,7 @@ setup(name = "pyme",
       url = version.homepage,
       ext_modules=[swige],
       packages = ['pyme', 'pyme.constants', 'pyme.constants.data',
-                  'pyme.constants.keylist', 'pyme.constants.sig'], 
+                  'pyme.constants.keylist', 'pyme.constants.sig'],
       license = version.copyright + \
                 ", Licensed under the GPL version 2 and the LGPL version 2.1"
 )

commit 000dbb5b9a56f9b9143ca2555999a8f83ec88536
Author: Justus Winter <justus at gnupg.org>
Date:   Tue May 10 13:21:34 2016 +0200

    python: Drop Debian packaging.
    
    --
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/debian/README.Debian b/lang/python/debian/README.Debian
deleted file mode 100644
index c520ba6..0000000
--- a/lang/python/debian/README.Debian
+++ /dev/null
@@ -1,6 +0,0 @@
-Please note:
-
-The documentation for this package is in python-pyme-doc. 
-
-When you install that package, you can find the documentation and examples
-in /usr/share/doc/python-pyme-doc.
diff --git a/lang/python/debian/changelog b/lang/python/debian/changelog
deleted file mode 100644
index 7071d79..0000000
--- a/lang/python/debian/changelog
+++ /dev/null
@@ -1,93 +0,0 @@
-pyme (0.8.1) unstable; urgency=low
-
-  * Add issuing gpgme_key_unref() in __del__ method for keys return from
-    op_keylist_next() and get_key() calls to avoid memory leak in a long
-    living contexts.
-  * Add missing (get|set)_engine_info() methods for the Context class and
-    set_engine_info() and set_locale() for the core module.
-  * Remove support for python2.3 in debian packaging since neither testing
-    nor unstable dist contains packages for it now.
-  * Update verifydetails.py for the new way structure types are handled;
-    add testCMSgetkey.py example for CMS keys. Thanks to Bernhard Reiter.
-  * Fix hang on Windows caused by passphrase_cb.
-
- -- Igor Belyi <belyi at users.sourceforge.net>  Mon, 24 Nov 2008 01:56:19 -0500
-
-pyme (0.8.0) unstable; urgency=low
-
-  * Make all structure types containing 'next' field to be return as lists.
-    This includes when they are return from a function and when they are
-    member of another structure. Update all examples to use that updated
-    API.
-  * Switch to using pycentral for debian packages.
-  * Add rules to update PY file location in generated doc files.
-
- -- Igor Belyi <belyi at users.sourceforge.net>  Sat, 29 Mar 2008 18:43:27 -0400
-
-pyme (0.7.1) unstable; urgency=low
-
-  * Add rules to build Windows version of the package.
-  * Move all constants into pyme.constants package to avoid conflicts with
-    Python reserved words. Previous location are preserved for now for
-    compatibility purposes.
-  * Change name of the internal GPGME wrapper package from 'gpgme' to
-    'pygpgme' to avoid conflict with gpgme.dll library on Windows.
-  * Fix gpgme.i to work with SWIG version >= 1.3.28
-  * Add core.check_version(None) call to the examples to do the proper
-    startup initialization.
-  * Add verifydetails.py example provided by Bernhard Reiter.
-
- -- Igor Belyi <belyi at users.sourceforge.net>  Sun, 09 Mar 2008 21:35:16 -0400
-
-pyme (0.7.0) unstable; urgency=low
-
-  * Removed workaround in Context.wait()
-  * Updated core.wait() to return Context() object instead of GPGME pointer.
-  * Made Context.wait() and Context.op_edit() throw exception on failure.
-  * Added exception handling for passphrase_cb and edit_cb
-  * Allowed using None to unset previous callback and made hook argument
-    optional
-  * Fixed passphrase_cb to pass previously missing prev_bad argument as well
-  * Got rid of "warning: function declaration isn't a prototype" in helpers.h
-  * License on PyMe is changed from GPL to LGPL. Examples keep GPL license.
-  * Added pygpa.py example to illustrate gpa functionality using python.
-
- -- Igor Belyi <belyi at users.sourceforge.net>  Wed, 27 Apr 2005 17:22:11 -0400
-
-pyme (0.6.2) unstable; urgency=low
-
-  * Implemented Context.wait() method more sutable for asynch calls in Python.
-  * Implemented Context.op_edit() to support editing operations
-  * Fixed string representation of the errors.GPGMEError exception
-  * Added a nice example: PyGtkGpgKeys.py (requires Glade2 and PyGTK 2.4).
-    No match to gpa, seahorse, or kgpg of course. :)
-
- -- Igor Belyi <belyi at users.sourceforge.net>  Sat, 26 Mar 2005 11:42:27 -0500
-
-pyme (0.6.1) unstable; urgency=low
-
-  * Added package building for python2.4
-  * Updated copyright notes to avoid confusion for John's sake.
-  * Cleanup deprecated functions and typedefs from gpgme.h before building.
-
- -- Igor Belyi <belyi at users.sourceforge.net>  Fri, 18 Mar 2005 20:41:52 -0500
-
-pyme (0.6.0) unstable; urgency=low
-
-  * Added support for libgpgme11 revision of GPGME library.
-
- -- Igor Belyi <belyi at katehok.homeip.net>  Sun, 14 Mar 2004 16:37:39 -0500
-	
-pyme (0.5.1) unstable; urgency=low
-
-  * Added support for read callbacks for data objects, and an 
-    example for such to callbacks module.
-
- -- John Goerzen <jgoerzen at complete.org>  Thu, 21 Nov 2002 08:29:52 -0600
-
-pyme (0.5.0) unstable; urgency=low
-
-  * Initial Release.  Closes: #169807.
-
- -- John Goerzen <jgoerzen at complete.org>  Tue, 19 Nov 2002 14:32:36 -0600
-
diff --git a/lang/python/debian/control b/lang/python/debian/control
deleted file mode 100644
index 56885f9..0000000
--- a/lang/python/debian/control
+++ /dev/null
@@ -1,34 +0,0 @@
-Source: pyme
-Section: python
-Priority: optional
-Maintainer: Igor Belyi <belyi at users.sourceforge.net>
-Build-Depends: debhelper (>> 4.1.67), python-central, python2.4-dev, python2.5-dev, libgpgme11-dev, swig
-XS-Python-Version: 2.4, 2.5
-Standards-Version: 3.5.2
-
-Package: python-pyme-doc
-Architecture: all
-XB-Python-Version: ${python:Versions}
-Description: Python interface to the GPGME GnuPG encryption library
- This package contains the documentation for Pyme.
-
-Package: python-pyme
-Architecture: any
-Provides: ${python:Provides}
-Depends: ${python:Depends}, ${shlibs:Depends}
-XB-Python-Version: ${python:Versions}
-Suggests: python-pyme-doc
-Description: Python interface to the GPGME GnuPG encryption library
- Pyme is, for the most part, a direct interface to the C GPGME
- library.  However, it is re-packaged in a more Pythonic way --
- object-oriented with classes and modules.  Take a look at the classes
- defined here -- they correspond directly to certain object types in GPGME
- for C.
- .
- Features:
- * Feature-rich, full implementation of the GPGME library. Supports all
-   GPGME features. Callback functions may be written in pure Python.
- * Ability to sign, encrypt, decrypt, and verify data.
- * Ability to list keys, export and import keys, and manage the keyring.
- * Fully object-oriented with convenient classes and modules.
-
diff --git a/lang/python/debian/copyright b/lang/python/debian/copyright
deleted file mode 100644
index 5ea64b3..0000000
--- a/lang/python/debian/copyright
+++ /dev/null
@@ -1,25 +0,0 @@
-The maintainance of the package was taken over by Igor Belyi
-<belyi at users.sourceforge.net> on Thu, 18 March 2004 <time unknown>
-This package was debianized by John Goerzen <jgoerzen at complete.org> on
-Tue, 19 Nov 2002 14:32:36 -0600.
-
-Copyright:
-
-Copyright (C) 2004 Igor Belyi <belyi at users.sourceforge.net>
-Copyright (C) 2002 John Goerzen <jgoerzen at complete.org>
-
-   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 2.1 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, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-
-Debian users may find the GPL in /usr/share/common-licenses/LGPL-2.1
diff --git a/lang/python/debian/docs b/lang/python/debian/docs
deleted file mode 100644
index 9f2374e..0000000
--- a/lang/python/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/README.Debian
-doc
diff --git a/lang/python/debian/examples b/lang/python/debian/examples
deleted file mode 100644
index 636d928..0000000
--- a/lang/python/debian/examples
+++ /dev/null
@@ -1,2 +0,0 @@
-examples/*.py
-examples/*.glade
diff --git a/lang/python/debian/rules b/lang/python/debian/rules
deleted file mode 100755
index 0e886ee..0000000
--- a/lang/python/debian/rules
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-
-	touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp 
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE) swig
-	python2.4 setup.py build -b `pwd`/build
-	python2.5 setup.py build -b `pwd`/build
-	$(MAKE) PYSRCURL=file:/usr/share/pyshared/\\1 docs
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) reallyclean
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Add here commands to install the package into debian/pyme.
-	python2.4 setup.py install --root=`pwd`/debian/python-pyme
-	python2.5 setup.py install --root=`pwd`/debian/python-pyme
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs -i -XCVS
-	dh_installexamples -i -XCVS
-	dh_installmenu -i
-	dh_installchangelogs -i
-	dh_link -i
-	dh_strip -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_pycentral -i
-	dh_installdeb -i
-	dh_shlibdeps -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs -a -XCVS
-	dh_installexamples -a -XCVS
-	dh_installmenu -a
-	dh_installchangelogs -a
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_pycentral -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure

commit f4ba16b31ea282d0787a40be3f37b951584143a1
Author: Justus Winter <justus at gnupg.org>
Date:   Tue May 10 13:19:26 2016 +0200

    python: Rename bindings.
    
    --
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/Makefile.am b/lang/Makefile.am
index 29446eb..8eb461d 100644
--- a/lang/Makefile.am
+++ b/lang/Makefile.am
@@ -17,6 +17,6 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
-SUBDIRS = cl, py3-pyme
+SUBDIRS = cl python
 
 EXTRA_DIST = README
diff --git a/lang/py3-pyme/COPYING b/lang/python/COPYING
similarity index 100%
rename from lang/py3-pyme/COPYING
rename to lang/python/COPYING
diff --git a/lang/py3-pyme/COPYING.LESSER b/lang/python/COPYING.LESSER
similarity index 100%
rename from lang/py3-pyme/COPYING.LESSER
rename to lang/python/COPYING.LESSER
diff --git a/lang/py3-pyme/INSTALL b/lang/python/INSTALL
similarity index 100%
rename from lang/py3-pyme/INSTALL
rename to lang/python/INSTALL
diff --git a/lang/py3-pyme/MANIFEST.in b/lang/python/MANIFEST.in
similarity index 100%
rename from lang/py3-pyme/MANIFEST.in
rename to lang/python/MANIFEST.in
diff --git a/lang/py3-pyme/README.rst b/lang/python/README.rst
similarity index 100%
rename from lang/py3-pyme/README.rst
rename to lang/python/README.rst
diff --git a/lang/py3-pyme/debian/README.Debian b/lang/python/debian/README.Debian
similarity index 100%
rename from lang/py3-pyme/debian/README.Debian
rename to lang/python/debian/README.Debian
diff --git a/lang/py3-pyme/debian/changelog b/lang/python/debian/changelog
similarity index 100%
rename from lang/py3-pyme/debian/changelog
rename to lang/python/debian/changelog
diff --git a/lang/py3-pyme/debian/control b/lang/python/debian/control
similarity index 100%
rename from lang/py3-pyme/debian/control
rename to lang/python/debian/control
diff --git a/lang/py3-pyme/debian/copyright b/lang/python/debian/copyright
similarity index 100%
rename from lang/py3-pyme/debian/copyright
rename to lang/python/debian/copyright
diff --git a/lang/py3-pyme/debian/docs b/lang/python/debian/docs
similarity index 100%
rename from lang/py3-pyme/debian/docs
rename to lang/python/debian/docs
diff --git a/lang/py3-pyme/debian/examples b/lang/python/debian/examples
similarity index 100%
rename from lang/py3-pyme/debian/examples
rename to lang/python/debian/examples
diff --git a/lang/py3-pyme/debian/rules b/lang/python/debian/rules
similarity index 100%
rename from lang/py3-pyme/debian/rules
rename to lang/python/debian/rules
diff --git a/lang/py3-pyme/docs/Short_History.rst b/lang/python/docs/Short_History.rst
similarity index 100%
rename from lang/py3-pyme/docs/Short_History.rst
rename to lang/python/docs/Short_History.rst
diff --git a/lang/py3-pyme/docs/TODO.rst b/lang/python/docs/TODO.rst
similarity index 100%
rename from lang/py3-pyme/docs/TODO.rst
rename to lang/python/docs/TODO.rst
diff --git a/lang/py3-pyme/docs/old-commits.log b/lang/python/docs/old-commits.log
similarity index 100%
rename from lang/py3-pyme/docs/old-commits.log
rename to lang/python/docs/old-commits.log
diff --git a/lang/py3-pyme/examples/Examples.rst b/lang/python/examples/Examples.rst
similarity index 100%
rename from lang/py3-pyme/examples/Examples.rst
rename to lang/python/examples/Examples.rst
diff --git a/lang/py3-pyme/examples/delkey.py b/lang/python/examples/delkey.py
similarity index 100%
rename from lang/py3-pyme/examples/delkey.py
rename to lang/python/examples/delkey.py
diff --git a/lang/py3-pyme/examples/encrypt-to-all.py b/lang/python/examples/encrypt-to-all.py
similarity index 100%
rename from lang/py3-pyme/examples/encrypt-to-all.py
rename to lang/python/examples/encrypt-to-all.py
diff --git a/lang/py3-pyme/examples/exportimport.py b/lang/python/examples/exportimport.py
similarity index 100%
rename from lang/py3-pyme/examples/exportimport.py
rename to lang/python/examples/exportimport.py
diff --git a/lang/py3-pyme/examples/genkey.py b/lang/python/examples/genkey.py
similarity index 100%
rename from lang/py3-pyme/examples/genkey.py
rename to lang/python/examples/genkey.py
diff --git a/lang/py3-pyme/examples/inter-edit.py b/lang/python/examples/inter-edit.py
similarity index 100%
rename from lang/py3-pyme/examples/inter-edit.py
rename to lang/python/examples/inter-edit.py
diff --git a/lang/py3-pyme/examples/sign.py b/lang/python/examples/sign.py
similarity index 100%
rename from lang/py3-pyme/examples/sign.py
rename to lang/python/examples/sign.py
diff --git a/lang/py3-pyme/examples/signverify.py b/lang/python/examples/signverify.py
similarity index 100%
rename from lang/py3-pyme/examples/signverify.py
rename to lang/python/examples/signverify.py
diff --git a/lang/py3-pyme/examples/simple.py b/lang/python/examples/simple.py
similarity index 100%
rename from lang/py3-pyme/examples/simple.py
rename to lang/python/examples/simple.py
diff --git a/lang/py3-pyme/examples/t-edit.py b/lang/python/examples/t-edit.py
similarity index 100%
rename from lang/py3-pyme/examples/t-edit.py
rename to lang/python/examples/t-edit.py
diff --git a/lang/py3-pyme/examples/testCMSgetkey.py b/lang/python/examples/testCMSgetkey.py
similarity index 100%
rename from lang/py3-pyme/examples/testCMSgetkey.py
rename to lang/python/examples/testCMSgetkey.py
diff --git a/lang/py3-pyme/examples/verifydetails.py b/lang/python/examples/verifydetails.py
similarity index 100%
rename from lang/py3-pyme/examples/verifydetails.py
rename to lang/python/examples/verifydetails.py
diff --git a/lang/py3-pyme/gpgme-h-clean.py b/lang/python/gpgme-h-clean.py
similarity index 100%
rename from lang/py3-pyme/gpgme-h-clean.py
rename to lang/python/gpgme-h-clean.py
diff --git a/lang/py3-pyme/gpgme.i b/lang/python/gpgme.i
similarity index 100%
rename from lang/py3-pyme/gpgme.i
rename to lang/python/gpgme.i
diff --git a/lang/py3-pyme/helpers.c b/lang/python/helpers.c
similarity index 100%
rename from lang/py3-pyme/helpers.c
rename to lang/python/helpers.c
diff --git a/lang/py3-pyme/helpers.h b/lang/python/helpers.h
similarity index 100%
rename from lang/py3-pyme/helpers.h
rename to lang/python/helpers.h
diff --git a/lang/py3-pyme/pyme/__init__.py b/lang/python/pyme/__init__.py
similarity index 100%
rename from lang/py3-pyme/pyme/__init__.py
rename to lang/python/pyme/__init__.py
diff --git a/lang/py3-pyme/pyme/callbacks.py b/lang/python/pyme/callbacks.py
similarity index 100%
rename from lang/py3-pyme/pyme/callbacks.py
rename to lang/python/pyme/callbacks.py
diff --git a/lang/py3-pyme/pyme/constants/__init__.py b/lang/python/pyme/constants/__init__.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/__init__.py
rename to lang/python/pyme/constants/__init__.py
diff --git a/lang/py3-pyme/pyme/constants/data/__init__.py b/lang/python/pyme/constants/data/__init__.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/data/__init__.py
rename to lang/python/pyme/constants/data/__init__.py
diff --git a/lang/py3-pyme/pyme/constants/data/encoding.py b/lang/python/pyme/constants/data/encoding.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/data/encoding.py
rename to lang/python/pyme/constants/data/encoding.py
diff --git a/lang/py3-pyme/pyme/constants/event.py b/lang/python/pyme/constants/event.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/event.py
rename to lang/python/pyme/constants/event.py
diff --git a/lang/py3-pyme/pyme/constants/import.py b/lang/python/pyme/constants/import.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/import.py
rename to lang/python/pyme/constants/import.py
diff --git a/lang/py3-pyme/pyme/constants/sig/__init__.py b/lang/python/pyme/constants/keylist/__init__.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/sig/__init__.py
rename to lang/python/pyme/constants/keylist/__init__.py
diff --git a/lang/py3-pyme/pyme/constants/keylist/mode.py b/lang/python/pyme/constants/keylist/mode.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/keylist/mode.py
rename to lang/python/pyme/constants/keylist/mode.py
diff --git a/lang/py3-pyme/pyme/constants/md.py b/lang/python/pyme/constants/md.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/md.py
rename to lang/python/pyme/constants/md.py
diff --git a/lang/py3-pyme/pyme/constants/pk.py b/lang/python/pyme/constants/pk.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/pk.py
rename to lang/python/pyme/constants/pk.py
diff --git a/lang/py3-pyme/pyme/constants/protocol.py b/lang/python/pyme/constants/protocol.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/protocol.py
rename to lang/python/pyme/constants/protocol.py
diff --git a/lang/py3-pyme/pyme/constants/keylist/__init__.py b/lang/python/pyme/constants/sig/__init__.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/keylist/__init__.py
rename to lang/python/pyme/constants/sig/__init__.py
diff --git a/lang/py3-pyme/pyme/constants/sig/mode.py b/lang/python/pyme/constants/sig/mode.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/sig/mode.py
rename to lang/python/pyme/constants/sig/mode.py
diff --git a/lang/py3-pyme/pyme/constants/sigsum.py b/lang/python/pyme/constants/sigsum.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/sigsum.py
rename to lang/python/pyme/constants/sigsum.py
diff --git a/lang/py3-pyme/pyme/constants/status.py b/lang/python/pyme/constants/status.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/status.py
rename to lang/python/pyme/constants/status.py
diff --git a/lang/py3-pyme/pyme/constants/validity.py b/lang/python/pyme/constants/validity.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/validity.py
rename to lang/python/pyme/constants/validity.py
diff --git a/lang/py3-pyme/pyme/core.py b/lang/python/pyme/core.py
similarity index 100%
rename from lang/py3-pyme/pyme/core.py
rename to lang/python/pyme/core.py
diff --git a/lang/py3-pyme/pyme/errors.py b/lang/python/pyme/errors.py
similarity index 100%
rename from lang/py3-pyme/pyme/errors.py
rename to lang/python/pyme/errors.py
diff --git a/lang/py3-pyme/pyme/util.py b/lang/python/pyme/util.py
similarity index 100%
rename from lang/py3-pyme/pyme/util.py
rename to lang/python/pyme/util.py
diff --git a/lang/py3-pyme/pyme/version.py b/lang/python/pyme/version.py
similarity index 100%
rename from lang/py3-pyme/pyme/version.py
rename to lang/python/pyme/version.py
diff --git a/lang/py3-pyme/setup.py b/lang/python/setup.py
similarity index 100%
rename from lang/py3-pyme/setup.py
rename to lang/python/setup.py

commit f531608539b45f0bbd036f430943b390ec21aa65
Merge: a7fbd52 fc38c15
Author: Justus Winter <justus at gnupg.org>
Date:   Tue May 10 13:03:34 2016 +0200

    Merge branch 'master' into justus/pyme3


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


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



From cvs at cvs.gnupg.org  Wed May 11 14:58:18 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Wed, 11 May 2016 14:58:18 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-63-gb8de791
Message-ID: <E1b0Th6-0006ZE-Rz@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  b8de79160b2e05ac84d8feb61ff7ed1f7015a623 (commit)
      from  34e5c5b33de3608bedc2826be27a06e6eec0ea44 (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 b8de79160b2e05ac84d8feb61ff7ed1f7015a623
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed May 11 14:56:20 2016 +0200

    Cpp: Ensure gpgme.h is taken from current build
    
    * lang/cpp/src/Makefile.am (AM_CPPFLAGS): Add gpgme.h location.
    --
    This fixes the build in case an incompatible gpgme.h is also
    installed in other include locations.

diff --git a/lang/cpp/src/Makefile.am b/lang/cpp/src/Makefile.am
index 24e0461..d3d28ce 100644
--- a/lang/cpp/src/Makefile.am
+++ b/lang/cpp/src/Makefile.am
@@ -59,7 +59,8 @@ nobase_gpgmeppinclude_HEADERS = $(interface_headers)
 libgpgmepp_la_SOURCES = $(main_sources) $(gpgmepp_headers) context_vanilla.cpp \
                         $(interface_headers) $(private_gpgmepp_headers)
 
-AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ -DBUILDING_GPGMEPP
+AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \
+              -DBUILDING_GPGMEPP
 
 libgpgmepp_la_LIBADD = ../../../src/libgpgme.la @LIBASSUAN_LIBS@
 libgpgmepp_la_LDFLAGS = -version-info \

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

Summary of changes:
 lang/cpp/src/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


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



From cvs at cvs.gnupg.org  Thu May 12 12:01:03 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Thu, 12 May 2016 12:01:03 +0200
Subject: [git] GPGME - branch, justus/pyme3, updated. gpgme-1.6.0-39-gce5121a
Message-ID: <E1b0nP6-0003uX-RM@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, justus/pyme3 has been updated
       via  ce5121ad53b0e17fbf9150b354c80da73f7fe190 (commit)
       via  c89d3a71ad20ff02755539a44f254b1e59054c4a (commit)
       via  d60deb8a127fb35c01acc729f33b014840af0e7b (commit)
      from  bbeee5e1a060f2d1e37a08220eb552cf4673a058 (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 ce5121ad53b0e17fbf9150b354c80da73f7fe190
Author: Justus Winter <justus at gnupg.org>
Date:   Thu May 12 11:53:43 2016 +0200

    python: Handle interpreter shutdown.
    
    * lang/python/pyme/core.py: Avoid races at interpreter shutdown.  This
    silences the most annoying occurrences, however this problem also
    affects the SWIG generated code, which might indicate that the real
    problem is somewhere else.  If so, this change can be easily reverted.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py
index fd4802e..2a37ba3 100644
--- a/lang/python/pyme/core.py
+++ b/lang/python/pyme/core.py
@@ -66,21 +66,29 @@ class Context(GpgmeWrapper):
         self.last_progresscb = None
 
     def __del__(self):
+        if not pygpgme:
+            # At interpreter shutdown, pygpgme is set to NONE.
+            return
+
         self._free_passcb()
         self._free_progresscb()
-        if self.own:
+        if self.own and pygpgme.gpgme_release:
             pygpgme.gpgme_release(self.wrapped)
 
     def _free_passcb(self):
         if self.last_passcb != None:
-            pygpgme.pygpgme_clear_generic_cb(self.last_passcb)
-            pygpgme.delete_PyObject_p_p(self.last_passcb)
+            if pygpgme.pygpgme_clear_generic_cb:
+                pygpgme.pygpgme_clear_generic_cb(self.last_passcb)
+            if pygpgme.delete_PyObject_p_p:
+                pygpgme.delete_PyObject_p_p(self.last_passcb)
             self.last_passcb = None
 
     def _free_progresscb(self):
         if self.last_progresscb != None:
-            pygpgme.pygpgme_clear_generic_cb(self.last_progresscb)
-            pygpgme.delete_PyObject_p_p(self.last_progresscb)
+            if pygpgme.pygpgme_clear_generic_cb:
+                pygpgme.pygpgme_clear_generic_cb(self.last_progresscb)
+            if pygpgme.delete_PyObject_p_p:
+                pygpgme.delete_PyObject_p_p(self.last_progresscb)
             self.last_progresscb = None
 
     def op_keylist_all(self, *args, **kwargs):
@@ -292,14 +300,20 @@ class Data(GpgmeWrapper):
             self.new()
 
     def __del__(self):
-        if self.wrapped != None:
+        if not pygpgme:
+            # At interpreter shutdown, pygpgme is set to NONE.
+            return
+
+        if self.wrapped != None and pygpgme.gpgme_data_release:
             pygpgme.gpgme_data_release(self.wrapped)
         self._free_readcb()
 
     def _free_readcb(self):
         if self.last_readcb != None:
-            pygpgme.pygpgme_clear_generic_cb(self.last_readcb)
-            pygpgme.delete_PyObject_p_p(self.last_readcb)
+            if pygpgme.pygpgme_clear_generic_cb:
+                pygpgme.pygpgme_clear_generic_cb(self.last_readcb)
+            if pygpgme.delete_PyObject_p_p:
+                pygpgme.delete_PyObject_p_p(self.last_readcb)
             self.last_readcb = None
 
     def new(self):

commit c89d3a71ad20ff02755539a44f254b1e59054c4a
Author: Justus Winter <justus at gnupg.org>
Date:   Thu May 12 11:51:21 2016 +0200

    python: Make test case more robust.
    
    * lang/python/examples/t-edit.py: Check if key is found.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/examples/t-edit.py b/lang/python/examples/t-edit.py
index 5553190..5e5857a 100644
--- a/lang/python/examples/t-edit.py
+++ b/lang/python/examples/t-edit.py
@@ -16,6 +16,7 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+import sys
 import os
 from pyme import core
 from pyme.core import Data, Context
@@ -53,6 +54,9 @@ else:
     out = Data()
     c.op_keylist_start(b"Alpha", 0)
     key = c.op_keylist_next()
+    if not key:
+        sys.exit("Key Alpha not found.  " +
+                 "Did you point GNUPGHOME to GPGME's tests/gpg dir?")
     c.op_edit(key, KeyEditor().edit_fnc, out, out)
     print("[-- Last response --]")
     out.seek(0,0)

commit d60deb8a127fb35c01acc729f33b014840af0e7b
Author: Justus Winter <justus at gnupg.org>
Date:   Thu May 12 11:21:58 2016 +0200

    python: Fix type translation.
    
    * lang/python/gpgme.i: Adjust to Python3's string type being
    'Unicode', not 'bytes'.  Fix type checking.
    * lang/python/core.py (Data.write): Add docstring mentioning the
    expected type of parameter 'buffer'.
    (Data.read): Adjust read loop.  Also, use a saner chunk size, and join
    all chunks at the end instead of adding them.
    * lang/python/examples/simple.py: Adjust example.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/examples/simple.py b/lang/python/examples/simple.py
index 739291e..4ff6d28 100755
--- a/lang/python/examples/simple.py
+++ b/lang/python/examples/simple.py
@@ -25,7 +25,7 @@ core.check_version(None)
 
 # Set up our input and output buffers.
 
-plain = core.Data(b'This is my message.')
+plain = core.Data('This is my message.')
 cipher = core.Data()
 
 # Initialize our context.
@@ -38,7 +38,7 @@ c.set_armor(1)
 sys.stdout.write("Enter name of your recipient: ")
 sys.stdout.flush()
 name = sys.stdin.readline().strip()
-c.op_keylist_start(name.encode(), 0)
+c.op_keylist_start(name, 0)
 r = c.op_keylist_next()
 
 if r == None:
@@ -48,6 +48,6 @@ else:
     try:
         c.op_encrypt([r], 1, plain, cipher)
         cipher.seek(0,0)
-        print(cipher.read())
+        sys.stdout.buffer.write(cipher.read())
     except errors.GPGMEError as ex:
         print(ex.getstring())
diff --git a/lang/python/gpgme.i b/lang/python/gpgme.i
index 87efce7..7c11943 100644
--- a/lang/python/gpgme.i
+++ b/lang/python/gpgme.i
@@ -24,16 +24,18 @@
 // Generate doc strings for all methods.
 %feature("autodoc", "0");
 
-// Allow use of None for strings.
+/* Allow use of Unicode objects, bytes, and None for strings.  */
 
 %typemap(in) const char * {
   if ($input == Py_None)
     $1 = NULL;
+  else if (PyUnicode_Check($input))
+    $1 = PyUnicode_AsUTF8($input);
   else if (PyBytes_Check($input))
     $1 = PyBytes_AsString($input);
   else {
     PyErr_Format(PyExc_TypeError,
-                 "arg %d: expected string or None, got %s",
+                 "arg %d: expected str, bytes, or None, got %s",
 		 $argnum, $input->ob_type->tp_name);
     return NULL;
   }
@@ -49,20 +51,27 @@
 PyObject* object_to_gpgme_t(PyObject* input, const char* objtype, int argnum) {
   PyObject *pyname = NULL, *pypointer = NULL;
   pyname = PyObject_CallMethod(input, "_getctype", NULL);
-  if (pyname == NULL) {
-    PyErr_Format(PyExc_TypeError,
-		 "arg %d: Expected an instance of type %s, but got %s",
-		 argnum, objtype,
-		 input == Py_None ? "None" : input->ob_type->tp_name);
-    return NULL;
-  }
-  if (strcmp(PyBytes_AsString(pyname), objtype) != 0) {
-    PyErr_Format(PyExc_TypeError,
-		 "arg %d: Expected value of type %s, but got %s",
-		 argnum, objtype, PyBytes_AsString(pyname));
-    Py_DECREF(pyname);
-    return NULL;
-  }
+  if (pyname && PyUnicode_Check(pyname))
+    {
+      if (strcmp(PyUnicode_AsUTF8(pyname), objtype) != 0)
+        {
+          PyErr_Format(PyExc_TypeError,
+                       "arg %d: Expected value of type %s, but got %s",
+                       argnum, objtype, PyUnicode_AsUTF8(pyname));
+          Py_DECREF(pyname);
+          return NULL;
+        }
+    }
+  else
+    {
+      PyErr_Format(PyExc_TypeError,
+                   "Protocol violation: Expected an instance of type str "
+                   "from _getctype, but got %s",
+                   pyname == NULL ? "NULL"
+                   : (pyname == Py_None ? "None" : pyname->ob_type->tp_name));
+      return NULL;
+    }
+
   Py_DECREF(pyname);
   pypointer = PyObject_GetAttrString(input, "wrapped");
   if (pypointer == NULL) {
@@ -243,7 +252,7 @@ gpgme_error_t pyEditCb(void *opaque, gpgme_status_code_t status,
   }
 
   PyTuple_SetItem(pyargs, 0, PyLong_FromLong((long) status));
-  PyTuple_SetItem(pyargs, 1, PyBytes_FromString(args));
+  PyTuple_SetItem(pyargs, 1, PyUnicode_FromString(args));
   if (dataarg) {
     Py_INCREF(dataarg);		/* Because GetItem doesn't give a ref but SetItem taketh away */
     PyTuple_SetItem(pyargs, 2, dataarg);
@@ -254,8 +263,12 @@ gpgme_error_t pyEditCb(void *opaque, gpgme_status_code_t status,
   if (PyErr_Occurred()) {
     err_status = pygpgme_exception2code();
   } else {
-    if (fd>=0 && retval) {
-      write(fd, PyBytes_AsString(retval), PyBytes_Size(retval));
+    if (fd>=0 && retval && PyUnicode_Check(retval)) {
+      const char *buffer;
+      Py_ssize_t size;
+
+      buffer = PyUnicode_AsUTF8AndSize(retval, &size);
+      write(fd, buffer, size);
       write(fd, "\n", 1);
     }
   }
diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py
index 09f0fa8..fd4802e 100644
--- a/lang/python/pyme/core.py
+++ b/lang/python/pyme/core.py
@@ -377,10 +377,11 @@ class Data(GpgmeWrapper):
         self.new_from_fd(file)
 
     def write(self, buffer):
+        """Write buffer given as bytes."""
         errorcheck(pygpgme.gpgme_data_write(self.wrapped, buffer, len(buffer)))
 
     def read(self, size = -1):
-        """Read at most size bytes, returned as a string.
+        """Read at most size bytes, returned as bytes.
 
         If the size argument is negative or omitted, read until EOF is reached.
 
@@ -393,13 +394,13 @@ class Data(GpgmeWrapper):
         if size > 0:
             return pygpgme.gpgme_data_read(self.wrapped, size)
         else:
-            retval = ''
+            chunks = []
             while 1:
-                result = pygpgme.gpgme_data_read(self.wrapped, 10240)
+                result = pygpgme.gpgme_data_read(self.wrapped, 4096)
                 if len(result) == 0:
                     break
-                retval += result
-            return retval
+                chunks.append(result)
+            return b''.join(chunks)
 
 def pubkey_algo_name(algo):
     return pygpgme.gpgme_pubkey_algo_name(algo)

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

Summary of changes:
 lang/python/examples/simple.py |  6 ++---
 lang/python/examples/t-edit.py |  4 ++++
 lang/python/gpgme.i            | 51 ++++++++++++++++++++++++++----------------
 lang/python/pyme/core.py       | 41 ++++++++++++++++++++++-----------
 4 files changed, 67 insertions(+), 35 deletions(-)


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



From cvs at cvs.gnupg.org  Fri May 13 13:19:45 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Fri, 13 May 2016 13:19:45 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-65-g52f2295
Message-ID: <E1b1B6n-0001lT-B5@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  52f2295d528029a36a3e0a89c777297762b3fc9b (commit)
       via  66ded1a5ce7236254f8541addecd4c3bc7b2878e (commit)
      from  b8de79160b2e05ac84d8feb61ff7ed1f7015a623 (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 52f2295d528029a36a3e0a89c777297762b3fc9b
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri May 13 13:16:12 2016 +0200

    Qt: Add keyLocateJob and test for it
    
    * configure.ac (LIBQGPGME_LT_REVISION): Bump.
    * lang/qt/src/protocol.h (locateKeysJob): Add Job.
    * lang/qt/src/protocol_p.h (locateKeysJob): Implement.
    * lang/qt/tests/Makefile.am: Add t-keylocate.
    * lang/qt/tests/t-keylocate.cpp: New.

diff --git a/configure.ac b/configure.ac
index 87b9e97..eefa1de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,7 @@ LIBGPGMEPP_LT_REVISION=0
 
 LIBQGPGME_LT_CURRENT=6
 LIBQGPGME_LT_AGE=0
-LIBQGPGME_LT_REVISION=0
+LIBQGPGME_LT_REVISION=1
 
 # If the API is changed in an incompatible way: increment the next counter.
 GPGME_CONFIG_API_VERSION=1
diff --git a/lang/qt/src/protocol.h b/lang/qt/src/protocol.h
index 5162fe6..e5153b5 100644
--- a/lang/qt/src/protocol.h
+++ b/lang/qt/src/protocol.h
@@ -96,6 +96,20 @@ public:
     virtual ChangeOwnerTrustJob  *changeOwnerTrustJob() const = 0;
     virtual AddUserIDJob         *addUserIDJob() const = 0;
     virtual SpecialJob           *specialJob(const char *type, const QMap<QString, QVariant> &args) const = 0;
+
+    /** A key locate job.
+     *
+     * This tries to find a key in local
+     * and remote sources, if the key was remote it is imported
+     * by GnuPG. Same as KeyListJob but intended to be used
+     * to locate keys automatically. This ends up calling --locate-keys.
+     *
+     * Only available for OpenPGP
+     *
+     * Results are validated. As if keyListJob was called
+     * with both includeSigs and validate options.
+     */
+    virtual KeyListJob *locateKeysJob() const = 0;
 };
 
 /** Obtain a reference to the OpenPGP Protocol.
diff --git a/lang/qt/src/protocol_p.h b/lang/qt/src/protocol_p.h
index d6c5625..9fcbc8b 100644
--- a/lang/qt/src/protocol_p.h
+++ b/lang/qt/src/protocol_p.h
@@ -365,6 +365,18 @@ public:
         return new QGpgME::QGpgMEAddUserIDJob(context);
     }
 
+    QGpgME::KeyListJob *locateKeysJob() const Q_DECL_OVERRIDE
+    {
+        if (mProtocol != GpgME::OpenPGP) {
+            return Q_NULLPTR;
+        }
+        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
+        if (!context) {
+            return Q_NULLPTR;
+        }
+        context->setKeyListMode(GpgME::Extern | GpgME::Local | GpgME::Signatures | GpgME::Validate);
+        return new QGpgME::QGpgMEKeyListJob(context);
+    }
 };
 
 }
diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
index 6da9d29..4a14e63 100644
--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
@@ -24,9 +24,9 @@ TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir)
 
 EXTRA_DIST = initial.test
 
-TESTS = initial.test t-keylist
+TESTS = initial.test t-keylist t-keylocate
 
-moc_files = t-keylist.moc
+moc_files = t-keylist.moc t-keylocate.moc
 
 AM_LDFLAGS = -no-install
 
@@ -47,12 +47,13 @@ check-local: ./pubring-stamp
 initial.test : check-local
 
 t_keylist_SOURCES = t-keylist.cpp
+t_keylocate_SOURCES = t-keylocate.cpp
 
 nodist_t_keylist_SOURCES = $(moc_files)
 
 BUILT_SOURCES = $(moc_files)
 
-noinst_PROGRAMS = t-keylist
+noinst_PROGRAMS = t-keylist t-keylocate
 
 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-keylocate.cpp b/lang/qt/tests/t-keylocate.cpp
new file mode 100644
index 0000000..12ab551
--- /dev/null
+++ b/lang/qt/tests/t-keylocate.cpp
@@ -0,0 +1,129 @@
+/* t-keylocate.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.
+*/
+#include <QDebug>
+#include <QTest>
+#include <QSignalSpy>
+#include <QTemporaryDir>
+#include "keylistjob.h"
+#include "protocol.h"
+#include "keylistresult.h"
+
+using namespace QGpgME;
+using namespace GpgME;
+
+class KeyLocateTest : public QObject
+{
+    Q_OBJECT
+
+Q_SIGNALS:
+    void asyncDone();
+
+private Q_SLOTS:
+
+#ifdef DO_ONLINE_TESTS
+    void testDaneKeyLocate()
+    {
+        QTemporaryDir dir;
+        const QString oldHome = qgetenv("GNUPGHOME");
+        qputenv("GNUPGHOME", dir.path().toUtf8());
+        /* Could do this with gpgconf but this is not a gpgconf test ;-) */
+        QFile conf(dir.path() + QStringLiteral("/gpg.conf"));
+        Q_ASSERT(conf.open(QIODevice::WriteOnly));
+        conf.write("auto-key-locate dane");
+        conf.close();
+
+        auto *job = openpgp()->locateKeysJob();
+        mTestpattern = QStringLiteral("wk at gnupg.org");
+        connect(job, &KeyListJob::result, job, [this, job](KeyListResult result, std::vector<Key> keys, QString, Error)
+        {
+            Q_ASSERT(!result.error());
+            Q_ASSERT(keys.size() == 1);
+
+            Key k = keys.front();
+            Q_ASSERT(k.numUserIDs());
+            bool found = false;
+            Q_FOREACH (const UserID uid, k.userIDs()) {
+                const QString mailBox = QString::fromUtf8(uid.email());
+                if (mTestpattern.toLower() == mailBox.toLower()) {
+                    found = true;
+                }
+            }
+            Q_ASSERT(found);
+            Q_EMIT asyncDone();
+        });
+        job->start(QStringList() << mTestpattern);
+        QSignalSpy spy (this, &KeyLocateTest::asyncDone);
+        Q_ASSERT(spy.wait());
+        qputenv("GNUPGHOME", oldHome.toUtf8());
+    }
+#endif
+
+    void testKeyLocateSingle()
+    {
+        auto *job = openpgp()->locateKeysJob();
+        mTestpattern = QStringLiteral("alfa at example.net");
+
+        connect(job, &KeyListJob::result, job, [this, job](KeyListResult result, std::vector<Key> keys, QString, Error)
+        {
+            Q_ASSERT(!result.isNull());
+            Q_ASSERT(!result.isTruncated());
+            Q_ASSERT(!result.error());
+            Q_ASSERT(keys.size() == 1);
+
+            Key k = keys.front();
+            Q_ASSERT(k.numUserIDs());
+            bool found = false;
+            Q_FOREACH (const UserID uid, k.userIDs()) {
+                const QString mailBox = QString::fromUtf8(uid.email());
+                if (mTestpattern.toLower() == mailBox.toLower()) {
+                    found = true;
+                }
+            }
+            Q_ASSERT(found);
+            Q_EMIT asyncDone();
+        });
+        job->start(QStringList() << mTestpattern);
+        QSignalSpy spy (this, &KeyLocateTest::asyncDone);
+        Q_ASSERT(spy.wait());
+    }
+
+    void initTestCase()
+    {
+        const QString gpgHome = qgetenv("GNUPGHOME");
+        QVERIFY2(!gpgHome.isEmpty(), "GNUPGHOME environment variable is not set.");
+    }
+private:
+    QString mTestpattern;
+};
+
+QTEST_MAIN(KeyLocateTest)
+
+#include "t-keylocate.moc"

commit 66ded1a5ce7236254f8541addecd4c3bc7b2878e
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri May 13 12:52:52 2016 +0200

    Qt: Add missing copyright header in test
    
    * lang/qt/tests/t-keylist.cpp: Add copyright header.

diff --git a/lang/qt/tests/t-keylist.cpp b/lang/qt/tests/t-keylist.cpp
index f5c7f13..40cb13c 100644
--- a/lang/qt/tests/t-keylist.cpp
+++ b/lang/qt/tests/t-keylist.cpp
@@ -1,3 +1,34 @@
+/* t-keylist.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.
+*/
+
 #include <QDebug>
 #include <QTest>
 #include <QSignalSpy>

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

Summary of changes:
 configure.ac                  |   2 +-
 lang/qt/src/protocol.h        |  14 +++++
 lang/qt/src/protocol_p.h      |  12 ++++
 lang/qt/tests/Makefile.am     |   7 ++-
 lang/qt/tests/t-keylist.cpp   |  31 ++++++++++
 lang/qt/tests/t-keylocate.cpp | 129 ++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 191 insertions(+), 4 deletions(-)
 create mode 100644 lang/qt/tests/t-keylocate.cpp


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



From cvs at cvs.gnupg.org  Fri May 13 21:40:34 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 13 May 2016 21:40:34 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. 49e14dd7905a3f331cee7ee5edc250e3db1112c3
Message-ID: <E1b1IvR-0005aA-BR@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  49e14dd7905a3f331cee7ee5edc250e3db1112c3 (commit)
      from  8bdcda7bd619f8faca93eaafa77afc2df3c94664 (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 49e14dd7905a3f331cee7ee5edc250e3db1112c3
Author: Werner Koch <wk at gnupg.org>
Date:   Fri May 13 21:39:34 2016 +0200

    drafts: First changes to openpgp-web-key-service

diff --git a/misc/id/openpgp-webkey-service/back.mkd b/misc/id/openpgp-webkey-service/back.mkd
index 78d234b..fe988e5 100644
--- a/misc/id/openpgp-webkey-service/back.mkd
+++ b/misc/id/openpgp-webkey-service/back.mkd
@@ -13,9 +13,11 @@ given:
    version 2.1.12.  To use it, the new method "wkd" needs to be used
    with the --auto-key-locate option.
 
-# Changes
+# Changes since -00
 
-  - This is the initial draft.
+  - Changed field names in the request and response format.
+  - Removed useless checks.
+  - Added a new policy flag.
 
 ## TODO
 
diff --git a/misc/id/openpgp-webkey-service/middle.mkd b/misc/id/openpgp-webkey-service/middle.mkd
index 4dbca42..56aed03 100644
--- a/misc/id/openpgp-webkey-service/middle.mkd
+++ b/misc/id/openpgp-webkey-service/middle.mkd
@@ -123,8 +123,7 @@ Directory, she performs the following steps:
    specified by PGP/MIME.
 
 3. The provider checks that the received key has a User ID which
-    - matches an account name of the provider,
-    - and that the from address matches that account.
+   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
@@ -211,15 +210,15 @@ specified order:
 "type"
   : The value must be "confirmation-request".
 
-"from"
+"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.
+    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 be UTF-8 encoded as required for an
+    address.  The value MUST be UTF-8 encoded as required for an
     OpenPGP User ID.
 
 "fingerprint"
@@ -271,9 +270,9 @@ name-value pairs in this order:
 "type"
   : The value must be "confirmation-response".
 
-"from"
+"sender"
   : The value must match the mailbox part of the "From:" address of
-    this response.
+    this response.  Exactly one address MUST be given.
 
 "nonce"
   : The value is the value of the "nonce" parameter from the
@@ -302,6 +301,11 @@ Currently defined keywords are:
     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 Directory but only
+    an OpenPGP DANE service.  The Web Key Directory Update protocol is
+    used to update the keys for the DANE service.
+
 More keywords will be defined in updates to this I-D.  There is no
 registry yet except for this document.  For experimental use of new
 features or for provider specific settings, keywords MUST be prefixed

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

Summary of changes:
 misc/id/openpgp-webkey-service/back.mkd   |  6 ++++--
 misc/id/openpgp-webkey-service/middle.mkd | 20 ++++++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)


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



From cvs at cvs.gnupg.org  Mon May 16 21:22:32 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Mon, 16 May 2016 21:22:32 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. 5094fddd47141c6f52f41b23a461bba20147661b
Message-ID: <E1b2O4Z-0000xo-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 GnuPG website and other docs".

The branch, master has been updated
       via  5094fddd47141c6f52f41b23a461bba20147661b (commit)
       via  b35cc5cb1c17ca3f5220fad48e81c157d6b54a02 (commit)
      from  49e14dd7905a3f331cee7ee5edc250e3db1112c3 (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 5094fddd47141c6f52f41b23a461bba20147661b
Author: Werner Koch <wk at gnupg.org>
Date:   Mon May 16 21:20:51 2016 +0200

    drafts: openpgp-webkey-service - Convert to org-mode
    
    This does now use a single file and a Makefile.

diff --git a/misc/id/openpgp-webkey-service/Makefile b/misc/id/openpgp-webkey-service/Makefile
new file mode 100644
index 0000000..5e95728
--- /dev/null
+++ b/misc/id/openpgp-webkey-service/Makefile
@@ -0,0 +1,25 @@
+
+MD_EXAMPLE_FIX = '(defun org-md-example-block (example-block contents info) \
+"with fixed indentation" \
+(replace-regexp-in-string \
+"^" "      " \
+(org-remove-indentation \
+ (org-export-format-code-default example-block info))))'
+
+
+draft.txt: draft.org
+	emacs --batch \
+           --eval "(require 'org)" \
+           --eval "(require 'ox-md)" \
+           --eval $(MD_EXAMPLE_FIX)  \
+           --visit "draft.org" \
+           --eval "(org-md-export-to-markdown)"
+	sed <draft.md  -n '/^# Abstract/q;1,$$ p' >template.xml
+	sed <draft.md  -n '/^# Abstract/,/^# Middle/p' | \
+		sed  '1 d;$$ d' >tmp-abstract.md
+	sed <draft.md  -n '/^# Middle/,/^# Back/p' | \
+		sed  '1 d;$$ d' >tmp-middle.md
+	sed <draft.md  -n '/^# Back/,$$ p' | \
+		sed  '1 d'     >tmp-back.md
+	pandoc2rfc tmp-abstract.md tmp-middle.md tmp-back.md
+	rm template.xml tmp-abstract.md tmp-middle.md tmp-back.md
diff --git a/misc/id/openpgp-webkey-service/abstract.mkd b/misc/id/openpgp-webkey-service/abstract.mkd
deleted file mode 100644
index d8596be..0000000
--- a/misc/id/openpgp-webkey-service/abstract.mkd
+++ /dev/null
@@ -1,4 +0,0 @@
-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.
diff --git a/misc/id/openpgp-webkey-service/back.mkd b/misc/id/openpgp-webkey-service/back.mkd
deleted file mode 100644
index f081a8f..0000000
--- a/misc/id/openpgp-webkey-service/back.mkd
+++ /dev/null
@@ -1,26 +0,0 @@
-# Test Vectors
-
-For help implementing this specification a non-normative example is
-given:
-
-## Sample key
-
-  TODO
-
-## Software Notes
-
-   GnuPG supports the key discovery described in this document since
-   version 2.1.12.  To use it, the new method "wkd" needs to be used
-   with the --auto-key-locate option.
-
-# Changes since -00
-
-  - Changed field names in the request and response format.
-  - Removed useless checks.
-  - Added a new policy flag.
-  - Dropped the second occurrence of the domain name from the URL.
-
-## TODO
-
-  - What about authenticated submission?
-  - Describe how to handle a key with several User IDs.
diff --git a/misc/id/openpgp-webkey-service/draft.org b/misc/id/openpgp-webkey-service/draft.org
new file mode 100644
index 0000000..b10dedf
--- /dev/null
+++ b/misc/id/openpgp-webkey-service/draft.org
@@ -0,0 +1,446 @@
+# openpgp-webkey-service
+#+startup: showall
+#+options: toc:nil
+#+macro: RFC  [](#RFC$1)
+#+macro: https_scheme ~https://~
+
+#+begin_src rfc
+<?xml version="1.0" ?>
+<!DOCTYPE rfc SYSTEM 'rfc2629.dtd' [
+  <!ENTITY pandocAbstract PUBLIC '' 'tmp-abstract.xml'>
+  <!ENTITY pandocMiddle   PUBLIC '' 'tmp-middle.xml'>
+  <!ENTITY pandocBack     PUBLIC '' 'tmp-back.xml'>
+  <!ENTITY rfc.2119       PUBLIC '' '../common/reference.RFC.2119.xml'>
+  <!ENTITY rfc.3156       PUBLIC '' '../common/reference.RFC.3156.xml'>
+  <!ENTITY rfc.4880       PUBLIC '' '../common/reference.RFC.4880.xml'>
+  <!ENTITY rfc.5226       PUBLIC '' '../common/reference.RFC.5226.xml'>
+  <!ENTITY rfc.5785       PUBLIC '' '../common/reference.RFC.5785.xml'>
+  <!ENTITY rfc.6189       PUBLIC '' '../common/reference.RFC.6189.xml'>
+]>
+
+<rfc ipr="trust200902" category="info"
+     docName="draft-koch-openpgp-webkey-service-00">
+
+<?rfc toc="yes"?>
+<?rfc symrefs="yes"?>
+<?rfc sortrefs="yes"?>
+<?rfc subcompact="no"?>
+<?rfc compact="yes"?>
+<?rfc comments="yes"?>
+
+  <front>
+    <title>OpenPGP Web Key Service</title>
+    <author initials="W." surname="Koch"
+            fullname="Werner Koch">
+      <organization>GnuPG Project</organization>
+      <address>
+        <email>wk at gnupg.org</email>
+        <uri>https://gnupg.org</uri>
+      </address>
+    </author>
+
+    <date month="May" year="2016" />
+    <area>Security</area>
+
+    <abstract>
+      &pandocAbstract;
+    </abstract>
+  </front>
+
+  <middle>
+    &pandocMiddle;
+  </middle>
+
+  <back>
+    <references title="Normative References">
+      &rfc.2119;
+      &rfc.3156;
+      &rfc.4880;
+      &rfc.5785;
+      &rfc.6189;
+    </references>
+    &pandocBack;
+  </back>
+</rfc>
+#+end_src
+
+* 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.
+
+* Middle
+
+* 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.
+
+* 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 {{{RFC(2119)}}}.
+
+
+* 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 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
+
+-  sending an initial unencrypted message with the public key attached,
+-  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.
+
+** 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.
+
+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 {{{RFC(6189)}}}, section 5.1.6. The resulting string has a
+fixed length of 32 octets. To form the URI, the scheme
+{{{https_scheme}}} 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:
+
+#+BEGIN_EXAMPLE
+         https://example.org/.well-known/openpgpkey/
+         hu/iy9q119eutrkn8s1mk4r39qejnbu3n5q
+#+END_EXAMPLE
+
+(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
+check for the existence of a key.
+
+The server SHOULD return "application/octet-string" as the content-type
+for the data but clients MAY also accept any other appropriate
+content-type. The server MUST NOT return an ASCII armored version of the
+key.
+
+* 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
+#+begin_example
+     https://example.org/.well-known/openpgpkey/submission-address
+#+end_example
+
+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. Also 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 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
+
+#+BEGIN_EXAMPLE
+      WELLKNOWN := https://example.org/.well-known/openpgpkey
+#+END_EXAMPLE
+
+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.
+
+** The Submission Address
+
+The address of the submission file is
+
+#+BEGIN_EXAMPLE
+      WELLKNOWN/submission-address
+#+END_EXAMPLE
+
+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
+submission of a key to the mail provider. For example the content of the
+file may be
+
+#+BEGIN_EXAMPLE
+      key-submission-example.org at directory.example.org
+#+END_EXAMPLE
+
+** The Submission Mail
+
+The mail used to submit a key to the mail provider MUST comply to the
+PGP/MIME specification ({{{RFC(3156)}}}, 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 {{{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 Confirmation Request
+
+The mail provider sends a confirmation mail in response to a received
+key publication request. The message SHOULD 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:
+
+- "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 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.
+
+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
+
+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 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.
+
+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".
+
+- "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.
+
+** 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
+
+#+BEGIN_EXAMPLE
+      WELLKNOWN/policy
+#+END_EXAMPLE
+
+The file contains keywords, 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. Clients MUST use case-insensitive matching.
+
+Currently defined keywords are:
+
+- "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
+                 Directory but only an OpenPGP DANE service. The Web
+                 Key Directory Update protocol is used to update the
+                 keys for the DANE service.
+
+More keywords will be defined in updates to this I-D. There is no
+registry yet 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.
+
+* 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
+web service is required for each domain name.
+
+* IANA Considerations
+
+** Well-Known URI
+
+IANA is requested to assign a well-known URI in the "Well-Known URIs"
+registry as defined by {{{RFC(5785)}}}:
+
+URI suffix: openpgpkey
+
+Change controller: IETF
+
+Specification document: This
+
+* 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.
+
+* Back
+
+* Test Vectors
+
+For help implementing this specification a non-normative example is
+given:
+
+** Sample key
+
+TODO
+
+** Software Notes
+
+GnuPG supports the key discovery described in this document since
+version 2.1.12. To use it, the new method "wkd" needs to be used with
+the =--auto-key-locate= option.
+
+* Changes since -00
+
+-  Changed field names in the request and response format.
+-  Removed useless checks.
+-  Added a new policy flag.
+-  Dropped the second occurrence of the domain name from the URL.
+
+** TODO
+
+-  What about authenticated submission?
+-  Describe how to handle a key with several User IDs.
diff --git a/misc/id/openpgp-webkey-service/middle.mkd b/misc/id/openpgp-webkey-service/middle.mkd
deleted file mode 100644
index 22ae453..0000000
--- a/misc/id/openpgp-webkey-service/middle.mkd
+++ /dev/null
@@ -1,345 +0,0 @@
-# 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.
-
-# 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).
-
-
-# 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 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
-
- - sending an initial unencrypted message with the public key
-   attached,
- - 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.
-
-## 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.
-
-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.  The server MUST also accept a HEAD method so that a
-client may only check for the existence of a key.
-
-The server SHOULD return "application/octet-string" as the
-content-type for the data but clients MAY also accept any other
-appropriate content-type.  The server MUST NOT return an ASCII armored
-version of the key.
-
-
-# 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
-
-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.  Also 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
-   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.
-
-## 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
-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
-
-## 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.
-
-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 ([](#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.
-
-## 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
-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 ([](#RFC3156),
-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:
-
-"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 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.
-
-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
-
-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 SHOULD be encrypted.  The PGP/MIME Combined
-format MUST be used for encryption and signing ([](#RFC3156),
-section 6.2).  The encryption key can be taken from the Web Key
-Directory.
-
-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".
-
-"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.
-
-
-## 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, 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.  Clients MUST use case-insensitive matching.
-
-Currently defined keywords are:
-
-"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 Directory but only
-    an OpenPGP DANE service.  The Web Key Directory Update protocol is
-    used to update the keys for the DANE service.
-
-More keywords will be defined in updates to this I-D.  There is no
-registry yet 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.
-
-
-# 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 web service is required for each domain name.
-
-
-# IANA Considerations
-
-## 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
-
-
-# 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.
diff --git a/misc/id/openpgp-webkey-service/template.xml b/misc/id/openpgp-webkey-service/template.xml
deleted file mode 100644
index 1c6d3fc..0000000
--- a/misc/id/openpgp-webkey-service/template.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE rfc SYSTEM 'rfc2629.dtd' [
-  <!ENTITY pandocAbstract PUBLIC '' 'abstract.xml'>
-  <!ENTITY pandocMiddle   PUBLIC '' 'middle.xml'>
-  <!ENTITY pandocBack     PUBLIC '' 'back.xml'>
-  <!ENTITY rfc.2119       PUBLIC '' '../common/reference.RFC.2119.xml'>
-  <!ENTITY rfc.3156       PUBLIC '' '../common/reference.RFC.3156.xml'>
-  <!ENTITY rfc.4880       PUBLIC '' '../common/reference.RFC.4880.xml'>
-  <!ENTITY rfc.5226       PUBLIC '' '../common/reference.RFC.5226.xml'>
-  <!ENTITY rfc.5785       PUBLIC '' '../common/reference.RFC.5785.xml'>
-  <!ENTITY rfc.6189       PUBLIC '' '../common/reference.RFC.6189.xml'>
-]>
-
-<rfc ipr="trust200902" category="info"
-     docName="draft-koch-openpgp-webkey-service-00">
-
-<?rfc toc="yes"?>
-<?rfc symrefs="yes"?>
-<?rfc sortrefs="yes"?>
-<?rfc subcompact="no"?>
-<?rfc compact="yes"?>
-<?rfc comments="yes"?>
-
-
-  <front>
-    <title>OpenPGP Web Key Service</title>
-    <author initials="W." surname="Koch"
-            fullname="Werner Koch">
-      <organization>GnuPG Project</organization>
-      <address>
-        <email>wk at gnupg.org</email>
-        <uri>https://gnupg.org</uri>
-      </address>
-    </author>
-
-    <date month="May" year="2016" />
-    <area>Security</area>
-
-    <abstract>
-      &pandocAbstract;
-    </abstract>
-  </front>
-
-  <middle>
-    &pandocMiddle;
-  </middle>
-
-  <back>
-    <references title="Normative References">
-      &rfc.2119;
-      &rfc.3156;
-      &rfc.4880;
-      &rfc.5785;
-      &rfc.6189;
-    </references>
-    &pandocBack;
-  </back>
-</rfc>

commit b35cc5cb1c17ca3f5220fad48e81c157d6b54a02
Author: Werner Koch <wk at gnupg.org>
Date:   Mon May 16 18:45:39 2016 +0200

    drafts: openpgp-webkey-service - drop repeated domain name.

diff --git a/misc/id/openpgp-webkey-service/back.mkd b/misc/id/openpgp-webkey-service/back.mkd
index fe988e5..f081a8f 100644
--- a/misc/id/openpgp-webkey-service/back.mkd
+++ b/misc/id/openpgp-webkey-service/back.mkd
@@ -18,6 +18,7 @@ given:
   - Changed field names in the request and response format.
   - Removed useless checks.
   - Added a new policy flag.
+  - Dropped the second occurrence of the domain name from the URL.
 
 ## TODO
 
diff --git a/misc/id/openpgp-webkey-service/middle.mkd b/misc/id/openpgp-webkey-service/middle.mkd
index 56aed03..22ae453 100644
--- a/misc/id/openpgp-webkey-service/middle.mkd
+++ b/misc/id/openpgp-webkey-service/middle.mkd
@@ -76,13 +76,13 @@ 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/", the "domain-part" again, and the above
-constructed 32 octet 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/example.org/iy9q119eutrkn8s1mk4r39qejnbu3n5q
+      hu/iy9q119eutrkn8s1mk4r39qejnbu3n5q
 
 (line has been wrapped for rendering purposes)
 
@@ -336,3 +336,10 @@ registry as defined by [](#RFC5785):
   Change controller: IETF
 
   Specification document: This
+
+
+# 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.

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

Summary of changes:
 misc/id/openpgp-webkey-service/Makefile     |  25 ++
 misc/id/openpgp-webkey-service/abstract.mkd |   4 -
 misc/id/openpgp-webkey-service/back.mkd     |  25 --
 misc/id/openpgp-webkey-service/draft.org    | 446 ++++++++++++++++++++++++++++
 misc/id/openpgp-webkey-service/middle.mkd   | 338 ---------------------
 misc/id/openpgp-webkey-service/template.xml |  58 ----
 6 files changed, 471 insertions(+), 425 deletions(-)
 create mode 100644 misc/id/openpgp-webkey-service/Makefile
 delete mode 100644 misc/id/openpgp-webkey-service/abstract.mkd
 delete mode 100644 misc/id/openpgp-webkey-service/back.mkd
 create mode 100644 misc/id/openpgp-webkey-service/draft.org
 delete mode 100644 misc/id/openpgp-webkey-service/middle.mkd
 delete mode 100644 misc/id/openpgp-webkey-service/template.xml


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



From cvs at cvs.gnupg.org  Tue May 17 10:48:16 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Tue, 17 May 2016 10:48:16 +0200
Subject: [git] GPGME - branch, justus/pyme3, updated. gpgme-1.6.0-46-g11314f0
Message-ID: <E1b2aeH-0001vq-Qj@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, justus/pyme3 has been updated
       via  11314f0db6e57597e3f56351a86fdb36a7a17dd7 (commit)
       via  c5d118b2a76e9528df780d11da9566ff7c22e4f5 (commit)
       via  f7094d8358e933f3ce074eade7a40b2a7d291180 (commit)
       via  e64bffe0307d14204b00a177a472cd4f99c07561 (commit)
       via  ed0ce84fbd2904bf59ac66ae7422716db3624efa (commit)
       via  e3d3d366bd1a1aea8a38ae5dcbf71ea3c784e920 (commit)
       via  af9371eb63664c92fb67e8e7e03cc984e7d38a7f (commit)
      from  ce5121ad53b0e17fbf9150b354c80da73f7fe190 (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 11314f0db6e57597e3f56351a86fdb36a7a17dd7
Author: Justus Winter <justus at gnupg.org>
Date:   Thu May 12 18:29:04 2016 +0200

    python: Share generated methods between objects.
    
    * lang/python/pyme/util.py (GpgmeWrapper.__getattr__): Monkey-patch
    the class.
    * lang/python/tests/t-wrapper.py: Demonstrate the sharing.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/pyme/util.py b/lang/python/pyme/util.py
index a856099..a9fa19d 100644
--- a/lang/python/pyme/util.py
+++ b/lang/python/pyme/util.py
@@ -74,19 +74,25 @@ class GpgmeWrapper(object):
         if key[0] == '_' or self._getnameprepend() == None:
             return None
         name = self._getnameprepend() + key
+        func = getattr(pygpgme, name)
+
         if self._errorcheck(name):
-            def _funcwrap(*args, **kwargs):
-                args = [self.wrapped] + list(args)
-                return errorcheck(getattr(pygpgme, name)(*args, **kwargs),
+            def _funcwrap(slf, *args, **kwargs):
+                return errorcheck(func(slf.wrapped, *args, **kwargs),
                                   "Invocation of " + name)
         else:
-            def _funcwrap(*args, **kwargs):
-                args = [self.wrapped] + list(args)
-                return getattr(pygpgme, name)(*args, **kwargs)
+            def _funcwrap(slf, *args, **kwargs):
+                return func(slf.wrapped, *args, **kwargs)
+
+        _funcwrap.__doc__ = getattr(func, "__doc__")
+
+        # Monkey-patch the class.
+        setattr(self.__class__, key, _funcwrap)
 
-        _funcwrap.__doc__ = getattr(getattr(pygpgme, name), "__doc__")
+        # Bind the method to 'self'.
+        def wrapper(*args, **kwargs):
+            return _funcwrap(self, *args, **kwargs)
+        _funcwrap.__doc__ = getattr(func, "__doc__")
 
-        # Cache the wrapper function.
-        setattr(self, key, _funcwrap)
-        return _funcwrap
+        return wrapper
 
diff --git a/lang/python/tests/t-wrapper.py b/lang/python/tests/t-wrapper.py
index acc2ecf..fab0d81 100755
--- a/lang/python/tests/t-wrapper.py
+++ b/lang/python/tests/t-wrapper.py
@@ -20,4 +20,6 @@
 from pyme import core
 
 d0 = core.Data()
+d0.seek # trigger on-demand-wrapping
 assert d0.seek == d0.seek, "Generated wrapper functions are not cached"
+assert hasattr(core.Data, 'seek'), "Generated wrapper functions are not shared"

commit c5d118b2a76e9528df780d11da9566ff7c22e4f5
Author: Justus Winter <justus at gnupg.org>
Date:   Thu May 12 18:00:16 2016 +0200

    python: Raise exceptions on write errors.
    
    * lang/python/pyme/core.py (Data.write): Handle errors.
    * lang/python/pyme/errors.py (GPGMEError.fromSyserror): New function.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py
index dafbd9b..1d6e384 100644
--- a/lang/python/pyme/core.py
+++ b/lang/python/pyme/core.py
@@ -394,7 +394,10 @@ class Data(GpgmeWrapper):
         """Write buffer given as string or bytes.
 
         If a string is given, it is implicitly encoded using UTF-8."""
-        return pygpgme.gpgme_data_write(self.wrapped, buffer)
+        written = pygpgme.gpgme_data_write(self.wrapped, buffer)
+        if written < 0:
+            raise GPGMEError.fromSyserror()
+        return written
 
     def read(self, size = -1):
         """Read at most size bytes, returned as bytes.
diff --git a/lang/python/pyme/errors.py b/lang/python/pyme/errors.py
index 37d0fe6..5c8f922 100644
--- a/lang/python/pyme/errors.py
+++ b/lang/python/pyme/errors.py
@@ -23,6 +23,10 @@ class GPGMEError(Exception):
         self.error = error
         self.message = message
 
+    @classmethod
+    def fromSyserror(cls):
+        return cls(pygpgme.gpgme_err_code_from_syserror())
+
     def getstring(self):
         message = "%s: %s" % (pygpgme.gpgme_strsource(self.error),
                               pygpgme.gpgme_strerror(self.error))

commit f7094d8358e933f3ce074eade7a40b2a7d291180
Author: Justus Winter <justus at gnupg.org>
Date:   Thu May 12 17:44:54 2016 +0200

    python: Fix writing to data buffers.
    
    * lang/python/gpgme.i: Add typemap for buffers.
    * lang/python/pyme/core.py (Data.write): Fix function.
    * lang/python/tests/Makefile.am: Add new test.
    * lang/python/tests/t-data.py: New file.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/gpgme.i b/lang/python/gpgme.i
index 7c11943..c5b5bc9 100644
--- a/lang/python/gpgme.i
+++ b/lang/python/gpgme.i
@@ -173,6 +173,23 @@ PyObject* object_to_gpgme_t(PyObject* input, const char* objtype, int argnum) {
   free($1);
 }
 
+/* For gpgme_data_write, but should be universal.  */
+%typemap(in) (const void *buffer, size_t size) {
+  if ($input == Py_None)
+    $1 = NULL, $2 = 0;
+  else if (PyUnicode_Check($input))
+    $1 = PyUnicode_AsUTF8AndSize($input, (size_t *) &$2);
+  else if (PyBytes_Check($input))
+    PyBytes_AsStringAndSize($input, (char **) &$1, (size_t *) &$2);
+  else {
+    PyErr_Format(PyExc_TypeError,
+                 "arg %d: expected str, bytes, or None, got %s",
+		 $argnum, $input->ob_type->tp_name);
+    return NULL;
+  }
+}
+%typemap(freearg) (const void *buffer, size_t size) "";
+
 // Make types containing 'next' field to be lists
 %ignore next;
 %typemap(out) gpgme_sig_notation_t, gpgme_engine_info_t, gpgme_subkey_t, gpgme_key_sig_t,
diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py
index e822704..dafbd9b 100644
--- a/lang/python/pyme/core.py
+++ b/lang/python/pyme/core.py
@@ -391,8 +391,10 @@ class Data(GpgmeWrapper):
         self.new_from_fd(file)
 
     def write(self, buffer):
-        """Write buffer given as bytes."""
-        errorcheck(pygpgme.gpgme_data_write(self.wrapped, buffer, len(buffer)))
+        """Write buffer given as string or bytes.
+
+        If a string is given, it is implicitly encoded using UTF-8."""
+        return pygpgme.gpgme_data_write(self.wrapped, buffer)
 
     def read(self, size = -1):
         """Read at most size bytes, returned as bytes.
diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index 56ff74c..50c78e3 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -19,4 +19,4 @@
 TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) \
 	PYTHONPATH=`echo $(abs_builddir)/../build/lib.*`
 
-TESTS = t-wrapper.py
+TESTS = t-wrapper.py t-data.py
diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/t-data.py
old mode 100644
new mode 100755
similarity index 51%
copy from lang/python/tests/Makefile.am
copy to lang/python/tests/t-data.py
index 56ff74c..af2eb98
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/t-data.py
@@ -1,4 +1,5 @@
-# Makefile.am for the tests of the Python bindings.
+#!/usr/bin/env python3
+
 # Copyright (C) 2016 g10 Code GmbH
 #
 # This file is part of GPGME.
@@ -16,7 +17,33 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) \
-	PYTHONPATH=`echo $(abs_builddir)/../build/lib.*`
+import os
+
+from pyme import core
+
+data = core.Data('Hello world!')
+assert data.read() == b'Hello world!'
+assert data.read() == b''
+
+data.seek(0, os.SEEK_SET)
+assert data.read() == b'Hello world!'
+assert data.read() == b''
+
+data = core.Data(b'Hello world!')
+assert data.read() == b'Hello world!'
+
+data = core.Data()
+data.write('Hello world!')
+data.seek(0, os.SEEK_SET)
+assert data.read() == b'Hello world!'
+
+data = core.Data()
+data.write(b'Hello world!')
+data.seek(0, os.SEEK_SET)
+assert data.read() == b'Hello world!'
 
-TESTS = t-wrapper.py
+binjunk = bytes(range(256))
+data = core.Data()
+data.write(binjunk)
+data.seek(0, os.SEEK_SET)
+assert data.read() == binjunk

commit e64bffe0307d14204b00a177a472cd4f99c07561
Author: Justus Winter <justus at gnupg.org>
Date:   Thu May 12 15:27:50 2016 +0200

    python: Add a test suite.
    
    * configure.ac: Add new Makefile.
    * lang/python/Makefile.am: Add subdirectory.
    * lang/python/tests/Makefile.am: New file.
    * lang/python/tests/t-wrapper.py: Likewise.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/configure.ac b/configure.ac
index 96df059..e2b4029 100644
--- a/configure.ac
+++ b/configure.ac
@@ -659,7 +659,7 @@ AC_CONFIG_FILES(Makefile src/Makefile
                 src/gpgme.h)
 AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)
 AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd
-                 lang/python/Makefile])
+                 lang/python/Makefile lang/python/tests/Makefile])
 AC_OUTPUT
 
 echo "
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
index a1a2bc9..308fcd0 100644
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
@@ -17,6 +17,7 @@
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 EXTRA_DIST = README.rst
+SUBDIRS = tests
 
 # Cleanup gpgme.h from deprecated functions and typedefs.
 gpgme.h: ../../src/gpgme.h
diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
new file mode 100644
index 0000000..56ff74c
--- /dev/null
+++ b/lang/python/tests/Makefile.am
@@ -0,0 +1,22 @@
+# Makefile.am for the tests of the Python bindings.
+# Copyright (C) 2016 g10 Code GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME 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.
+#
+# GPGME 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 program; if not, see <http://www.gnu.org/licenses/>.
+
+TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) \
+	PYTHONPATH=`echo $(abs_builddir)/../build/lib.*`
+
+TESTS = t-wrapper.py
diff --git a/lang/python/tests/t-wrapper.py b/lang/python/tests/t-wrapper.py
new file mode 100755
index 0000000..acc2ecf
--- /dev/null
+++ b/lang/python/tests/t-wrapper.py
@@ -0,0 +1,23 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2016 g10 Code GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME 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.
+#
+# GPGME 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 program; if not, see <http://www.gnu.org/licenses/>.
+
+from pyme import core
+
+d0 = core.Data()
+assert d0.seek == d0.seek, "Generated wrapper functions are not cached"

commit ed0ce84fbd2904bf59ac66ae7422716db3624efa
Author: Justus Winter <justus at gnupg.org>
Date:   Thu May 12 14:57:42 2016 +0200

    python: Cache generated wrapper functions.
    
    * lang/python/util.py (GpgmeWrap.__getattr__): Cache generated wrapper
    functions.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/pyme/util.py b/lang/python/pyme/util.py
index 19bbb7f..a856099 100644
--- a/lang/python/pyme/util.py
+++ b/lang/python/pyme/util.py
@@ -69,11 +69,11 @@ class GpgmeWrapper(object):
         returning gpgme_error_t."""
         raise NotImplementedError()
 
-    def __getattr__(self, name):
+    def __getattr__(self, key):
         """On-the-fly function generation."""
-        if name[0] == '_' or self._getnameprepend() == None:
+        if key[0] == '_' or self._getnameprepend() == None:
             return None
-        name = self._getnameprepend() + name
+        name = self._getnameprepend() + key
         if self._errorcheck(name):
             def _funcwrap(*args, **kwargs):
                 args = [self.wrapped] + list(args)
@@ -85,5 +85,8 @@ class GpgmeWrapper(object):
                 return getattr(pygpgme, name)(*args, **kwargs)
 
         _funcwrap.__doc__ = getattr(getattr(pygpgme, name), "__doc__")
+
+        # Cache the wrapper function.
+        setattr(self, key, _funcwrap)
         return _funcwrap
 

commit e3d3d366bd1a1aea8a38ae5dcbf71ea3c784e920
Author: Justus Winter <justus at gnupg.org>
Date:   Thu May 12 12:54:15 2016 +0200

    python: Fix function invocation.
    
    * lang/python/pyme/core.py (Data.new_from_fd): Fix function
    invocation.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py
index 2a37ba3..e822704 100644
--- a/lang/python/pyme/core.py
+++ b/lang/python/pyme/core.py
@@ -380,7 +380,7 @@ class Data(GpgmeWrapper):
         if fp == None:
             raise ValueError("Failed to open file from %s arg %s" % \
                   (str(type(file)), str(file)))
-        errorcheck(gpgme_data_new_from_fd(tmp, fp))
+        errorcheck(pygpgme.gpgme_data_new_from_fd(tmp, fp))
         self.wrapped = pygpgme.gpgme_data_t_p_value(tmp)
         pygpgme.delete_gpgme_data_t_p(tmp)
 

commit af9371eb63664c92fb67e8e7e03cc984e7d38a7f
Author: Justus Winter <justus at gnupg.org>
Date:   Thu May 12 12:51:30 2016 +0200

    python: Fix name of exception, make slot methods explicit.
    
    * lang/python/pyme/util.py (GpgmeWrapper._getctype): Fix exception,
    add docstring.
    (GpgmeWrapper._getnameprepend): New function.
    (GpgmeWrapper._errorcheck): Likewise.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/pyme/util.py b/lang/python/pyme/util.py
index 32e2f55..19bbb7f 100644
--- a/lang/python/pyme/util.py
+++ b/lang/python/pyme/util.py
@@ -50,7 +50,24 @@ class GpgmeWrapper(object):
             return repr(self.wrapped) == repr(other.wrapped)
 
     def _getctype(self):
-        raise NotImplementedException
+        """Must be implemented by child classes.
+
+        Must return the name of the c type."""
+        raise NotImplementedError()
+
+    def _getnameprepend(self):
+        """Must be implemented by child classes.
+
+        Must return the prefix of all c functions mapped to methods of
+        this class."""
+        raise NotImplementedError()
+
+    def _errorcheck(self, name):
+        """Must be implemented by child classes.
+
+        This function must return a trueish value for all c functions
+        returning gpgme_error_t."""
+        raise NotImplementedError()
 
     def __getattr__(self, name):
         """On-the-fly function generation."""

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

Summary of changes:
 configure.ac                   |  2 +-
 lang/python/Makefile.am        |  1 +
 lang/python/gpgme.i            | 17 ++++++++++++++
 lang/python/pyme/core.py       | 11 +++++++---
 lang/python/pyme/errors.py     |  4 ++++
 lang/python/pyme/util.py       | 50 ++++++++++++++++++++++++++++++++----------
 lang/python/tests/Makefile.am  | 22 +++++++++++++++++++
 lang/python/tests/t-data.py    | 49 +++++++++++++++++++++++++++++++++++++++++
 lang/python/tests/t-wrapper.py | 25 +++++++++++++++++++++
 9 files changed, 165 insertions(+), 16 deletions(-)
 create mode 100644 lang/python/tests/Makefile.am
 create mode 100755 lang/python/tests/t-data.py
 create mode 100755 lang/python/tests/t-wrapper.py


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



From cvs at cvs.gnupg.org  Tue May 17 14:34:57 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 17 May 2016 14:34:57 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-66-gafc65aa
Message-ID: <E1b2eBf-00028o-54@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  afc65aa60aa7834ca09e7eca22a2f59a2f12a554 (commit)
      from  52f2295d528029a36a3e0a89c777297762b3fc9b (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 afc65aa60aa7834ca09e7eca22a2f59a2f12a554
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 17 14:33:49 2016 +0200

    Trailing white space cleanup for 2 files in tests/.
    
    --

diff --git a/tests/gpg/t-decrypt-verify.c b/tests/gpg/t-decrypt-verify.c
index 113aec1..0d89669 100644
--- a/tests/gpg/t-decrypt-verify.c
+++ b/tests/gpg/t-decrypt-verify.c
@@ -1,23 +1,22 @@
 /* t-decrypt-verify.c - Regression test.
-   Copyright (C) 2000 Werner Koch (dd9jn)
-   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH
-
-   This file is part of GPGME.
- 
-   GPGME 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 2.1 of
-   the License, or (at your option) any later version.
-   
-   GPGME 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 program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+ * Copyright (C) 2000 Werner Koch (dd9jn)
+ * Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH
+ *
+ * This file is part of GPGME.
+ *
+ * GPGME 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 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * GPGME 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 program; if not, see <http://www.gnu.org/licenses/>.
+ */
 
 /* We need to include config.h so that we know whether we are building
    with large file system (LFS) support. */
@@ -94,7 +93,7 @@ check_verify_result (gpgme_verify_result_t result, unsigned int summary,
 }
 
 
-int 
+int
 main (int argc, char *argv[])
 {
   gpgme_ctx_t ctx;
@@ -127,7 +126,7 @@ main (int argc, char *argv[])
       fprintf (stderr, "%s:%i: unsupported algorithm: %s\n",
 	       __FILE__, __LINE__, decrypt_result->unsupported_algorithm);
       exit (1);
-    }    
+    }
   print_data (out);
   verify_result = gpgme_op_verify_result (ctx);
   check_verify_result (verify_result, 0,
diff --git a/tests/gpg/t-encrypt.c b/tests/gpg/t-encrypt.c
index 264f31a..09474fe 100644
--- a/tests/gpg/t-encrypt.c
+++ b/tests/gpg/t-encrypt.c
@@ -3,17 +3,17 @@
    Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH
 
    This file is part of GPGME.
- 
+
    GPGME 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 2.1 of
    the License, or (at your option) any later version.
-   
+
    GPGME 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 program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -34,7 +34,7 @@
 #include "t-support.h"
 
 

-int 
+int
 main (int argc, char *argv[])
 {
   gpgme_ctx_t ctx;
@@ -44,7 +44,7 @@ main (int argc, char *argv[])
   gpgme_encrypt_result_t result;
 
   init_gpgme (GPGME_PROTOCOL_OpenPGP);
-    
+
   err = gpgme_new (&ctx);
   fail_if_err (err);
   gpgme_set_armor (ctx, 1);

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

Summary of changes:
 tests/gpg/t-decrypt-verify.c | 41 ++++++++++++++++++++---------------------
 tests/gpg/t-encrypt.c        | 10 +++++-----
 2 files changed, 25 insertions(+), 26 deletions(-)


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



From cvs at cvs.gnupg.org  Tue May 17 16:43:06 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Tue, 17 May 2016 16:43:06 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-104-g4711a1e
Message-ID: <E1b2gBf-0007LK-LQ@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  4711a1e181153a2395e5f523047595abd47965db (commit)
      from  09c1e4a85e40514d1ac1e7c8665c3c17a624b736 (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 4711a1e181153a2395e5f523047595abd47965db
Author: Justus Winter <justus at gnupg.org>
Date:   Tue May 17 16:34:39 2016 +0200

    build: Add python autoconf macro.
    
    * m4/ax_python_devel.m4: New file.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4
new file mode 100644
index 0000000..59a2ff0
--- /dev/null
+++ b/m4/ax_python_devel.m4
@@ -0,0 +1,324 @@
+# ===========================================================================
+#      http://www.gnu.org/software/autoconf-archive/ax_python_devel.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PYTHON_DEVEL([version])
+#
+# DESCRIPTION
+#
+#   Note: Defines as a precious variable "PYTHON_VERSION". Don't override it
+#   in your configure.ac.
+#
+#   This macro checks for Python and tries to get the include path to
+#   'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS)
+#   output variables. It also exports $(PYTHON_EXTRA_LIBS) and
+#   $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code.
+#
+#   You can search for some particular version of Python by passing a
+#   parameter to this macro, for example ">= '2.3.1'", or "== '2.4'". Please
+#   note that you *have* to pass also an operator along with the version to
+#   match, and pay special attention to the single quotes surrounding the
+#   version number. Don't use "PYTHON_VERSION" for this: that environment
+#   variable is declared as precious and thus reserved for the end-user.
+#
+#   This macro should work for all versions of Python >= 2.1.0. As an end
+#   user, you can disable the check for the python version by setting the
+#   PYTHON_NOVERSIONCHECK environment variable to something else than the
+#   empty string.
+#
+#   If you need to use this macro for an older Python version, please
+#   contact the authors. We're always open for feedback.
+#
+# LICENSE
+#
+#   Copyright (c) 2009 Sebastian Huber <sebastian-huber at web.de>
+#   Copyright (c) 2009 Alan W. Irwin
+#   Copyright (c) 2009 Rafael Laboissiere <rafael at laboissiere.net>
+#   Copyright (c) 2009 Andrew Collier
+#   Copyright (c) 2009 Matteo Settenvini <matteo at member.fsf.org>
+#   Copyright (c) 2009 Horst Knorr <hk_classes at knoda.org>
+#   Copyright (c) 2013 Daniel Mullner <muellner at math.stanford.edu>
+#
+#   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 3 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 17
+
+AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL])
+AC_DEFUN([AX_PYTHON_DEVEL],[
+	#
+	# Allow the use of a (user set) custom python version
+	#
+	AC_ARG_VAR([PYTHON_VERSION],[The installed Python
+		version to use, for example '2.3'. This string
+		will be appended to the Python interpreter
+		canonical name.])
+
+	AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
+	if test -z "$PYTHON"; then
+	   AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path])
+	   PYTHON_VERSION=""
+	fi
+
+	#
+	# Check for a version of Python >= 2.1.0
+	#
+	AC_MSG_CHECKING([for a version of Python >= '2.1.0'])
+	ac_supports_python_ver=`$PYTHON -c "import sys; \
+		ver = sys.version.split ()[[0]]; \
+		print (ver >= '2.1.0')"`
+	if test "$ac_supports_python_ver" != "True"; then
+		if test -z "$PYTHON_NOVERSIONCHECK"; then
+			AC_MSG_RESULT([no])
+			AC_MSG_FAILURE([
+This version of the AC@&t at _PYTHON_DEVEL macro
+doesn't work properly with versions of Python before
+2.1.0. You may need to re-run configure, setting the
+variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG,
+PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
+Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
+to something else than an empty string.
+])
+		else
+			AC_MSG_RESULT([skip at user request])
+		fi
+	else
+		AC_MSG_RESULT([yes])
+	fi
+
+	#
+	# if the macro parameter ``version'' is set, honour it
+	#
+	if test -n "$1"; then
+		AC_MSG_CHECKING([for a version of Python $1])
+		ac_supports_python_ver=`$PYTHON -c "import sys; \
+			ver = sys.version.split ()[[0]]; \
+			print (ver $1)"`
+		if test "$ac_supports_python_ver" = "True"; then
+		   AC_MSG_RESULT([yes])
+		else
+			AC_MSG_RESULT([no])
+			AC_MSG_ERROR([this package requires Python $1.
+If you have it installed, but it isn't the default Python
+interpreter in your system path, please pass the PYTHON_VERSION
+variable to configure. See ``configure --help'' for reference.
+])
+			PYTHON_VERSION=""
+		fi
+	fi
+
+	#
+	# Check if you have distutils, else fail
+	#
+	AC_MSG_CHECKING([for the distutils Python package])
+	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+	if test -z "$ac_distutils_result"; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		AC_MSG_ERROR([cannot import Python module "distutils".
+Please check your Python installation. The error was:
+$ac_distutils_result])
+		PYTHON_VERSION=""
+	fi
+
+	#
+	# Check for Python include path
+	#
+	AC_MSG_CHECKING([for Python include path])
+	if test -z "$PYTHON_CPPFLAGS"; then
+		python_path=`$PYTHON -c "import distutils.sysconfig; \
+			print (distutils.sysconfig.get_python_inc ());"`
+		plat_python_path=`$PYTHON -c "import distutils.sysconfig; \
+			print (distutils.sysconfig.get_python_inc (plat_specific=1));"`
+		if test -n "${python_path}"; then
+			if test "${plat_python_path}" != "${python_path}"; then
+				python_path="-I$python_path -I$plat_python_path"
+			else
+				python_path="-I$python_path"
+			fi
+		fi
+		PYTHON_CPPFLAGS=$python_path
+	fi
+	AC_MSG_RESULT([$PYTHON_CPPFLAGS])
+	AC_SUBST([PYTHON_CPPFLAGS])
+
+	#
+	# Check for Python library path
+	#
+	AC_MSG_CHECKING([for Python library path])
+	if test -z "$PYTHON_LDFLAGS"; then
+		# (makes two attempts to ensure we've got a version number
+		# from the interpreter)
+		ac_python_version=`cat<<EOD | $PYTHON -
+
+# join all versioning strings, on some systems
+# major/minor numbers could be in different list elements
+from distutils.sysconfig import *
+e = get_config_var('VERSION')
+if e is not None:
+	print(e)
+EOD`
+
+		if test -z "$ac_python_version"; then
+			if test -n "$PYTHON_VERSION"; then
+				ac_python_version=$PYTHON_VERSION
+			else
+				ac_python_version=`$PYTHON -c "import sys; \
+					print (sys.version[[:3]])"`
+			fi
+		fi
+
+		# Make the versioning information available to the compiler
+		AC_DEFINE_UNQUOTED([HAVE_PYTHON], ["$ac_python_version"],
+                                   [If available, contains the Python version number currently in use.])
+
+		# First, the library directory:
+		ac_python_libdir=`cat<<EOD | $PYTHON -
+
+# There should be only one
+import distutils.sysconfig
+e = distutils.sysconfig.get_config_var('LIBDIR')
+if e is not None:
+	print (e)
+EOD`
+
+		# Now, for the library:
+		ac_python_library=`cat<<EOD | $PYTHON -
+
+import distutils.sysconfig
+c = distutils.sysconfig.get_config_vars()
+if 'LDVERSION' in c:
+	print ('python'+c[['LDVERSION']])
+else:
+	print ('python'+c[['VERSION']])
+EOD`
+
+		# This small piece shamelessly adapted from PostgreSQL python macro;
+		# credits goes to momjian, I think. I'd like to put the right name
+		# in the credits, if someone can point me in the right direction... ?
+		#
+		if test -n "$ac_python_libdir" -a -n "$ac_python_library"
+		then
+			# use the official shared library
+			ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`
+			PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library"
+		else
+			# old way: use libpython from python_configdir
+			ac_python_libdir=`$PYTHON -c \
+			  "from distutils.sysconfig import get_python_lib as f; \
+			  import os; \
+			  print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`
+			PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version"
+		fi
+
+		if test -z "PYTHON_LDFLAGS"; then
+			AC_MSG_ERROR([
+  Cannot determine location of your Python DSO. Please check it was installed with
+  dynamic libraries enabled, or try setting PYTHON_LDFLAGS by hand.
+			])
+		fi
+	fi
+	AC_MSG_RESULT([$PYTHON_LDFLAGS])
+	AC_SUBST([PYTHON_LDFLAGS])
+
+	#
+	# Check for site packages
+	#
+	AC_MSG_CHECKING([for Python site-packages path])
+	if test -z "$PYTHON_SITE_PKG"; then
+		PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
+			print (distutils.sysconfig.get_python_lib(0,0));"`
+	fi
+	AC_MSG_RESULT([$PYTHON_SITE_PKG])
+	AC_SUBST([PYTHON_SITE_PKG])
+
+	#
+	# libraries which must be linked in when embedding
+	#
+	AC_MSG_CHECKING(python extra libraries)
+	if test -z "$PYTHON_EXTRA_LIBS"; then
+	   PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
+                conf = distutils.sysconfig.get_config_var; \
+                print (conf('LIBS') + ' ' + conf('SYSLIBS'))"`
+	fi
+	AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
+	AC_SUBST(PYTHON_EXTRA_LIBS)
+
+	#
+	# linking flags needed when embedding
+	#
+	AC_MSG_CHECKING(python extra linking flags)
+	if test -z "$PYTHON_EXTRA_LDFLAGS"; then
+		PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
+			conf = distutils.sysconfig.get_config_var; \
+			print (conf('LINKFORSHARED'))"`
+	fi
+	AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
+	AC_SUBST(PYTHON_EXTRA_LDFLAGS)
+
+	#
+	# final check to see if everything compiles alright
+	#
+	AC_MSG_CHECKING([consistency of all components of python development environment])
+	# save current global flags
+	ac_save_LIBS="$LIBS"
+	ac_save_CPPFLAGS="$CPPFLAGS"
+	LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS $PYTHON_EXTRA_LIBS"
+	CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
+	AC_LANG_PUSH([C])
+	AC_LINK_IFELSE([
+		AC_LANG_PROGRAM([[#include <Python.h>]],
+				[[Py_Initialize();]])
+		],[pythonexists=yes],[pythonexists=no])
+	AC_LANG_POP([C])
+	# turn back to default flags
+	CPPFLAGS="$ac_save_CPPFLAGS"
+	LIBS="$ac_save_LIBS"
+
+	AC_MSG_RESULT([$pythonexists])
+
+        if test ! "x$pythonexists" = "xyes"; then
+	   AC_MSG_FAILURE([
+  Could not link test program to Python. Maybe the main Python library has been
+  installed in some non-standard library path. If so, pass it to configure,
+  via the LDFLAGS environment variable.
+  Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib"
+  ============================================================================
+   ERROR!
+   You probably have to install the development version of the Python package
+   for your distribution.  The exact name of this package varies among them.
+  ============================================================================
+	   ])
+	  PYTHON_VERSION=""
+	fi
+
+	#
+	# all done!
+	#
+])

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

Summary of changes:
 m4/ax_python_devel.m4 | 324 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 324 insertions(+)
 create mode 100644 m4/ax_python_devel.m4


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



From cvs at cvs.gnupg.org  Tue May 17 16:58:18 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 17 May 2016 16:58:18 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-105-g9f14a24
Message-ID: <E1b2gQN-0007gO-0f@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  9f14a24076e7f93f7762d5d5383281eb593bfea9 (commit)
      from  4711a1e181153a2395e5f523047595abd47965db (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 9f14a24076e7f93f7762d5d5383281eb593bfea9
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 17 16:57:11 2016 +0200

    python: Delete duplicated license texts/
    
    --

diff --git a/lang/python/COPYING b/lang/python/COPYING
deleted file mode 100644
index d60c31a..0000000
--- a/lang/python/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-

-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-

-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-

-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-

-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the 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 Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-

-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/lang/python/COPYING.LESSER b/lang/python/COPYING.LESSER
deleted file mode 100644
index 2331e2a..0000000
--- a/lang/python/COPYING.LESSER
+++ /dev/null
@@ -1,508 +0,0 @@
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-

-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes a de-facto standard.  To achieve this, non-free programs must
-be allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-

-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-

-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-

-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-

-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at least
-    three years, to give the same user the materials specified in
-    Subsection 6a, above, for a charge no more than the cost of
-    performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-

-  7. 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 not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-

-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the 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
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-

-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-

-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
-
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 2.1 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, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the library,
-if necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James
-  Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!

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

Summary of changes:
 lang/python/COPYING        | 340 ------------------------------
 lang/python/COPYING.LESSER | 508 ---------------------------------------------
 2 files changed, 848 deletions(-)
 delete mode 100644 lang/python/COPYING
 delete mode 100644 lang/python/COPYING.LESSER


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



From cvs at cvs.gnupg.org  Tue May 17 17:55:07 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Tue, 17 May 2016 17:55:07 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-106-g9b36ebf
Message-ID: <E1b2hJM-0001d6-Nq@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  9b36ebf37a3b889c955ba68038bd5b3d9c5cde4e (commit)
      from  9f14a24076e7f93f7762d5d5383281eb593bfea9 (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 9b36ebf37a3b889c955ba68038bd5b3d9c5cde4e
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue May 17 17:49:56 2016 +0200

    Qt / Cpp: Port auto_ptr to unique_ptr
    
    * lang/cpp/src/context.cpp,
    lang/cpp/src/context.h,
    lang/cpp/src/context_p.h (Context::createForEngine),
    (Context::edit, Context::startEditing),
    (Context::takeLastEditInteractor, Context::cardEdit),
    (Context::startCardEditing, Context::takeLastCardEditInteractor),
    (Context::assuanTransact, Context::startAssuanTransaction),
    (Context::takeLastAssuanTransaction): Port to unique_ptr.
    * lang/qt/src/qgpgmeadduseridjob.cpp,
    lang/qt/src/qgpgmechangeexpiryjob.cpp,
    lang/qt/src/qgpgmechangeownertrustjob.cpp,
    lang/qt/src/qgpgmechangepasswdjob.cpp,
    lang/qt/src/qgpgmesignkeyjob.cpp: Update accordingly.
    
    --
    This is another API break but as we already broke API with GpgME++
    and QGpgME from KDE Frameworks this is a good time to do this
    to avoid using a deprected C++ class in the API.

diff --git a/lang/cpp/src/context.cpp b/lang/cpp/src/context.cpp
index 93244b4..085b835 100644
--- a/lang/cpp/src/context.cpp
+++ b/lang/cpp/src/context.cpp
@@ -224,14 +224,14 @@ Context *Context::createForProtocol(Protocol proto)
     return new Context(ctx);
 }
 
-std::auto_ptr<Context> Context::createForEngine(Engine eng, Error *error)
+std::unique_ptr<Context> Context::createForEngine(Engine eng, Error *error)
 {
     gpgme_ctx_t ctx = 0;
     if (const gpgme_error_t err = gpgme_new(&ctx)) {
         if (error) {
             *error = Error(err);
         }
-        return std::auto_ptr<Context>();
+        return std::unique_ptr<Context>();
     }
 
     switch (eng) {
@@ -241,7 +241,7 @@ std::auto_ptr<Context> Context::createForEngine(Engine eng, Error *error)
             if (error) {
                 *error = Error(err);
             }
-            return std::auto_ptr<Context>();
+            return std::unique_ptr<Context>();
         }
         break;
     case G13Engine:
@@ -250,21 +250,21 @@ std::auto_ptr<Context> Context::createForEngine(Engine eng, Error *error)
             if (error) {
                 *error = Error(err);
             }
-            return std::auto_ptr<Context>();
+            return std::unique_ptr<Context>();
         }
         break;
     default:
         if (error) {
             *error = Error::fromCode(GPG_ERR_INV_ARG);
         }
-        return std::auto_ptr<Context>();
+        return std::unique_ptr<Context>();
     }
 
     if (error) {
         *error = Error();
     }
 
-    return std::auto_ptr<Context>(new Context(ctx));
+    return std::unique_ptr<Context>(new Context(ctx));
 }
 
 //
@@ -685,10 +685,10 @@ Error Context::startPasswd(const Key &key)
     return Error(d->lasterr = gpgme_op_passwd_start(d->ctx, key.impl(), 0U));
 }
 
-Error Context::edit(const Key &key, std::auto_ptr<EditInteractor> func, Data &data)
+Error Context::edit(const Key &key, std::unique_ptr<EditInteractor> func, Data &data)
 {
     d->lastop = Private::Edit;
-    d->lastEditInteractor = func;
+    d->lastEditInteractor = std::move(func);
     Data::Private *const dp = data.impl();
     return Error(d->lasterr = gpgme_op_edit(d->ctx, key.impl(),
                                             d->lastEditInteractor.get() ? edit_interactor_callback : 0,
@@ -696,10 +696,10 @@ Error Context::edit(const Key &key, std::auto_ptr<EditInteractor> func, Data &da
                                             dp ? dp->data : 0));
 }
 
-Error Context::startEditing(const Key &key, std::auto_ptr<EditInteractor> func, Data &data)
+Error Context::startEditing(const Key &key, std::unique_ptr<EditInteractor> func, Data &data)
 {
     d->lastop = Private::Edit;
-    d->lastEditInteractor = func;
+    d->lastEditInteractor = std::move(func);
     Data::Private *const dp = data.impl();
     return Error(d->lasterr = gpgme_op_edit_start(d->ctx, key.impl(),
                               d->lastEditInteractor.get() ? edit_interactor_callback : 0,
@@ -712,15 +712,15 @@ EditInteractor *Context::lastEditInteractor() const
     return d->lastEditInteractor.get();
 }
 
-std::auto_ptr<EditInteractor> Context::takeLastEditInteractor()
+std::unique_ptr<EditInteractor> Context::takeLastEditInteractor()
 {
-    return d->lastEditInteractor;
+    return std::move(d->lastEditInteractor);
 }
 
-Error Context::cardEdit(const Key &key, std::auto_ptr<EditInteractor> func, Data &data)
+Error Context::cardEdit(const Key &key, std::unique_ptr<EditInteractor> func, Data &data)
 {
     d->lastop = Private::CardEdit;
-    d->lastCardEditInteractor = func;
+    d->lastCardEditInteractor = std::move(func);
     Data::Private *const dp = data.impl();
     return Error(d->lasterr = gpgme_op_card_edit(d->ctx, key.impl(),
                               d->lastCardEditInteractor.get() ? edit_interactor_callback : 0,
@@ -728,10 +728,10 @@ Error Context::cardEdit(const Key &key, std::auto_ptr<EditInteractor> func, Data
                               dp ? dp->data : 0));
 }
 
-Error Context::startCardEditing(const Key &key, std::auto_ptr<EditInteractor> func, Data &data)
+Error Context::startCardEditing(const Key &key, std::unique_ptr<EditInteractor> func, Data &data)
 {
     d->lastop = Private::CardEdit;
-    d->lastCardEditInteractor = func;
+    d->lastCardEditInteractor = std::move(func);
     Data::Private *const dp = data.impl();
     return Error(d->lasterr = gpgme_op_card_edit_start(d->ctx, key.impl(),
                               d->lastCardEditInteractor.get() ? edit_interactor_callback : 0,
@@ -744,9 +744,9 @@ EditInteractor *Context::lastCardEditInteractor() const
     return d->lastCardEditInteractor.get();
 }
 
-std::auto_ptr<EditInteractor> Context::takeLastCardEditInteractor()
+std::unique_ptr<EditInteractor> Context::takeLastCardEditInteractor()
 {
-    return d->lastCardEditInteractor;
+    return std::move(d->lastCardEditInteractor);
 }
 
 Error Context::startTrustItemListing(const char *pattern, int maxLevel)
@@ -803,13 +803,13 @@ static gpgme_error_t assuan_transaction_status_callback(void *opaque, const char
 
 AssuanResult Context::assuanTransact(const char *command)
 {
-    return assuanTransact(command, std::auto_ptr<AssuanTransaction>(new DefaultAssuanTransaction));
+    return assuanTransact(command, std::unique_ptr<AssuanTransaction>(new DefaultAssuanTransaction));
 }
 
-AssuanResult Context::assuanTransact(const char *command, std::auto_ptr<AssuanTransaction> transaction)
+AssuanResult Context::assuanTransact(const char *command, std::unique_ptr<AssuanTransaction> transaction)
 {
     d->lastop = Private::AssuanTransact;
-    d->lastAssuanTransaction = transaction;
+    d->lastAssuanTransaction = std::move(transaction);
     if (!d->lastAssuanTransaction.get()) {
         return AssuanResult(Error(d->lasterr = make_error(GPG_ERR_INV_ARG)));
     }
@@ -825,13 +825,13 @@ AssuanResult Context::assuanTransact(const char *command, std::auto_ptr<AssuanTr
 
 Error Context::startAssuanTransaction(const char *command)
 {
-    return startAssuanTransaction(command, std::auto_ptr<AssuanTransaction>(new DefaultAssuanTransaction));
+    return startAssuanTransaction(command, std::unique_ptr<AssuanTransaction>(new DefaultAssuanTransaction));
 }
 
-Error Context::startAssuanTransaction(const char *command, std::auto_ptr<AssuanTransaction> transaction)
+Error Context::startAssuanTransaction(const char *command, std::unique_ptr<AssuanTransaction> transaction)
 {
     d->lastop = Private::AssuanTransact;
-    d->lastAssuanTransaction = transaction;
+    d->lastAssuanTransaction = std::move(transaction);
     if (!d->lastAssuanTransaction.get()) {
         return Error(d->lasterr = make_error(GPG_ERR_INV_ARG));
     }
@@ -858,9 +858,9 @@ AssuanTransaction *Context::lastAssuanTransaction() const
     return d->lastAssuanTransaction.get();
 }
 
-std::auto_ptr<AssuanTransaction> Context::takeLastAssuanTransaction()
+std::unique_ptr<AssuanTransaction> Context::takeLastAssuanTransaction()
 {
-    return d->lastAssuanTransaction;
+    return std::move(d->lastAssuanTransaction);
 }
 
 DecryptionResult Context::decrypt(const Data &cipherText, Data &plainText)
diff --git a/lang/cpp/src/context.h b/lang/cpp/src/context.h
index ee4f847..a8112d6 100644
--- a/lang/cpp/src/context.h
+++ b/lang/cpp/src/context.h
@@ -69,7 +69,7 @@ public:
     //
 
     static Context *createForProtocol(Protocol proto);
-    static std::auto_ptr<Context> createForEngine(Engine engine, Error *err = 0);
+    static std::unique_ptr<Context> createForEngine(Engine engine, Error *err = 0);
     virtual ~Context();
 
     //
@@ -188,21 +188,21 @@ public:
     // Key Editing
     //
 
-    GpgME::Error edit(const Key &key, std::auto_ptr<EditInteractor> function, Data &out);
-    GpgME::Error startEditing(const Key &key, std::auto_ptr<EditInteractor> function, Data &out);
+    GpgME::Error edit(const Key &key, std::unique_ptr<EditInteractor> function, Data &out);
+    GpgME::Error startEditing(const Key &key, std::unique_ptr<EditInteractor> function, Data &out);
 
     EditInteractor *lastEditInteractor() const;
-    std::auto_ptr<EditInteractor> takeLastEditInteractor();
+    std::unique_ptr<EditInteractor> takeLastEditInteractor();
 
     //
     // SmartCard Editing
     //
 
-    GpgME::Error cardEdit(const Key &key, std::auto_ptr<EditInteractor> function, Data &out);
-    GpgME::Error startCardEditing(const Key &key, std::auto_ptr<EditInteractor> function, Data &out);
+    GpgME::Error cardEdit(const Key &key, std::unique_ptr<EditInteractor> function, Data &out);
+    GpgME::Error startCardEditing(const Key &key, std::unique_ptr<EditInteractor> function, Data &out);
 
     EditInteractor *lastCardEditInteractor() const;
-    std::auto_ptr<EditInteractor> takeLastCardEditInteractor();
+    std::unique_ptr<EditInteractor> takeLastCardEditInteractor();
 
     //
     // Trust Item Management
@@ -216,14 +216,14 @@ public:
     // Assuan Transactions
     //
 
-    AssuanResult assuanTransact(const char *command, std::auto_ptr<AssuanTransaction> transaction);
+    AssuanResult assuanTransact(const char *command, std::unique_ptr<AssuanTransaction> transaction);
     AssuanResult assuanTransact(const char *command);
-    GpgME::Error startAssuanTransaction(const char *command, std::auto_ptr<AssuanTransaction> transaction);
+    GpgME::Error startAssuanTransaction(const char *command, std::unique_ptr<AssuanTransaction> transaction);
     GpgME::Error startAssuanTransaction(const char *command);
     AssuanResult assuanResult() const;
 
     AssuanTransaction *lastAssuanTransaction() const;
-    std::auto_ptr<AssuanTransaction> takeLastAssuanTransaction();
+    std::unique_ptr<AssuanTransaction> takeLastAssuanTransaction();
 
     //
     //
diff --git a/lang/cpp/src/context_p.h b/lang/cpp/src/context_p.h
index 2991123..be34783 100644
--- a/lang/cpp/src/context_p.h
+++ b/lang/cpp/src/context_p.h
@@ -75,8 +75,8 @@ public:
     Operation lastop;
     gpgme_error_t lasterr;
     Data lastAssuanInquireData;
-    std::auto_ptr<AssuanTransaction> lastAssuanTransaction;
-    std::auto_ptr<EditInteractor> lastEditInteractor, lastCardEditInteractor;
+    std::unique_ptr<AssuanTransaction> lastAssuanTransaction;
+    std::unique_ptr<EditInteractor> lastEditInteractor, lastCardEditInteractor;
 };
 
 } // namespace GpgME
diff --git a/lang/qt/src/qgpgmeadduseridjob.cpp b/lang/qt/src/qgpgmeadduseridjob.cpp
index aa873f4..eb3bfab 100644
--- a/lang/qt/src/qgpgmeadduseridjob.cpp
+++ b/lang/qt/src/qgpgmeadduseridjob.cpp
@@ -57,18 +57,16 @@ QGpgMEAddUserIDJob::~QGpgMEAddUserIDJob() {}
 static QGpgMEAddUserIDJob::result_type add_user_id(Context *ctx, const Key &key, const QString &name, const QString &email, const QString &comment)
 {
 
-    std::auto_ptr<GpgAddUserIDEditInteractor> gau(new GpgAddUserIDEditInteractor);
+    GpgAddUserIDEditInteractor *gau = new GpgAddUserIDEditInteractor;
 
     gau->setNameUtf8(name.toUtf8().constData());
     gau->setEmailUtf8(email.toUtf8().constData());
     gau->setCommentUtf8(comment.toUtf8().constData());
 
-    std::auto_ptr<EditInteractor> ei(gau);
-
     QGpgME::QByteArrayDataProvider dp;
     Data data(&dp);
     assert(!data.isNull());
-    const Error err = ctx->edit(key, ei, data);
+    const Error err = ctx->edit(key, std::unique_ptr<EditInteractor> (gau), data);
     Error ae;
     const QString log = _detail::audit_log_as_html(ctx, ae);
     return std::make_tuple(err, log, ae);
diff --git a/lang/qt/src/qgpgmechangeexpiryjob.cpp b/lang/qt/src/qgpgmechangeexpiryjob.cpp
index e0c6c4d..43ceee3 100644
--- a/lang/qt/src/qgpgmechangeexpiryjob.cpp
+++ b/lang/qt/src/qgpgmechangeexpiryjob.cpp
@@ -59,15 +59,14 @@ QGpgMEChangeExpiryJob::~QGpgMEChangeExpiryJob() {}
 
 static QGpgMEChangeExpiryJob::result_type change_expiry(Context *ctx, const Key &key, const QDateTime &expiry)
 {
-    std::auto_ptr<EditInteractor>
-    ei(expiry.isValid()
+    EditInteractor *ei = expiry.isValid()
        ? new GpgSetExpiryTimeEditInteractor(expiry.date().toString(Qt::ISODate).toStdString())
-       : new GpgSetExpiryTimeEditInteractor());
+       : new GpgSetExpiryTimeEditInteractor();
 
     QGpgME::QByteArrayDataProvider dp;
     Data data(&dp);
     assert(!data.isNull());
-    const Error err = ctx->edit(key, ei, data);
+    const Error err = ctx->edit(key, std::unique_ptr<EditInteractor> (ei), data);
     Error ae;
     const QString log = _detail::audit_log_as_html(ctx, ae);
     return std::make_tuple(err, log, ae);
diff --git a/lang/qt/src/qgpgmechangeownertrustjob.cpp b/lang/qt/src/qgpgmechangeownertrustjob.cpp
index 2f055f1..55131d9 100644
--- a/lang/qt/src/qgpgmechangeownertrustjob.cpp
+++ b/lang/qt/src/qgpgmechangeownertrustjob.cpp
@@ -56,14 +56,13 @@ QGpgMEChangeOwnerTrustJob::~QGpgMEChangeOwnerTrustJob() {}
 
 static QGpgMEChangeOwnerTrustJob::result_type change_ownertrust(Context *ctx, const Key &key, Key::OwnerTrust trust)
 {
-    std::auto_ptr<EditInteractor>
-    ei(new GpgSetOwnerTrustEditInteractor(trust));
+    EditInteractor *ei = new GpgSetOwnerTrustEditInteractor(trust);
 
     QGpgME::QByteArrayDataProvider dp;
     Data data(&dp);
     assert(!data.isNull());
 
-    const Error err = ctx->edit(key, ei, data);
+    const Error err = ctx->edit(key, std::unique_ptr<EditInteractor>(ei), data);
     Error ae;
     const QString log = _detail::audit_log_as_html(ctx, ae);
     return std::make_tuple(err, log, ae);
diff --git a/lang/qt/src/qgpgmechangepasswdjob.cpp b/lang/qt/src/qgpgmechangepasswdjob.cpp
index 675eee6..0aec927 100644
--- a/lang/qt/src/qgpgmechangepasswdjob.cpp
+++ b/lang/qt/src/qgpgmechangepasswdjob.cpp
@@ -56,7 +56,7 @@ QGpgMEChangePasswdJob::~QGpgMEChangePasswdJob() {}
 static QGpgMEChangePasswdJob::result_type change_passwd(Context *ctx, const Key &key)
 {
 #if 0 // in case we want to fall back to edit interactor for gpg...
-    std::auto_ptr<EditInteractor> ei(new GpgChangePasswdEditInteractor);
+    std::unique_ptr<EditInteractor> ei(new GpgChangePasswdEditInteractor);
 
     QGpgME::QByteArrayDataProvider dp;
     Data data(&dp);
diff --git a/lang/qt/src/qgpgmesignkeyjob.cpp b/lang/qt/src/qgpgmesignkeyjob.cpp
index 9a12f61..e6c1478 100644
--- a/lang/qt/src/qgpgmesignkeyjob.cpp
+++ b/lang/qt/src/qgpgmesignkeyjob.cpp
@@ -64,18 +64,16 @@ static QGpgMESignKeyJob::result_type sign_key(Context *ctx, const Key &key, cons
     QGpgME::QByteArrayDataProvider dp;
     Data data(&dp);
 
-    std::auto_ptr<GpgSignKeyEditInteractor> skei(new GpgSignKeyEditInteractor);
+    GpgSignKeyEditInteractor *skei(new GpgSignKeyEditInteractor);
     skei->setUserIDsToSign(uids);
     skei->setCheckLevel(checkLevel);
     skei->setSigningOptions(opts);
 
-    std::auto_ptr<EditInteractor> ei(skei);
-
     if (!signer.isNull())
         if (const Error err = ctx->addSigningKey(signer)) {
             return std::make_tuple(err, QString(), Error());
         }
-    const Error err = ctx->edit(key, ei, data);
+    const Error err = ctx->edit(key, std::unique_ptr<EditInteractor> (skei), data);
     Error ae;
     const QString log = _detail::audit_log_as_html(ctx, ae);
     return std::make_tuple(err, log, ae);

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

Summary of changes:
 lang/cpp/src/context.cpp                  | 52 +++++++++++++++----------------
 lang/cpp/src/context.h                    | 20 ++++++------
 lang/cpp/src/context_p.h                  |  4 +--
 lang/qt/src/qgpgmeadduseridjob.cpp        |  6 ++--
 lang/qt/src/qgpgmechangeexpiryjob.cpp     |  7 ++---
 lang/qt/src/qgpgmechangeownertrustjob.cpp |  5 ++-
 lang/qt/src/qgpgmechangepasswdjob.cpp     |  2 +-
 lang/qt/src/qgpgmesignkeyjob.cpp          |  6 ++--
 8 files changed, 48 insertions(+), 54 deletions(-)


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



From cvs at cvs.gnupg.org  Tue May 17 19:45:48 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 17 May 2016 19:45:48 +0200
Subject: [git] GPG-ERROR - branch, master,
 updated. libgpg-error-1.22-3-g1ee822f
Message-ID: <E1b2j2T-0006Au-7l@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  1ee822f9ff73a9a302ad0eb298640797d735e62b (commit)
      from  dfcd58fd3f58e548062b91bd6e20e27cbf4da18d (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 1ee822f9ff73a9a302ad0eb298640797d735e62b
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 17 19:44:12 2016 +0200

    Add GPG_ERR_SUBKEYS_EXP_OR_REV.

diff --git a/NEWS b/NEWS
index 75f2063..be14b91 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 Noteworthy changes in version 1.23 (unreleased) [C18/A18/R_)
 -----------------------------------------------
 
+ * Interface changes relative to the 1.22 release:
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ GPG_ERR_SUBKEYS_EXP_OR_REV       NEW.
+
 
 Noteworthy changes in version 1.22 (2016-04-25) [C18/A18/R0)
 -----------------------------------------------
diff --git a/doc/errorref.txt b/doc/errorref.txt
index bf27a81..2922b9f 100644
--- a/doc/errorref.txt
+++ b/doc/errorref.txt
@@ -316,7 +316,7 @@ GPG_ERR_INV_NAME		Invalid name
 
     [more to come]
 
-89	GPG_ERR_BAD_DATA		Bad data
+GPG_ERR_BAD_DATA		Bad data
 
 GPG_ERR_INV_PARAMETER		Invalid parameter
 
@@ -439,6 +439,10 @@ GPG_ERR_UNSUPPORTED_ENCODING	Unsupported encoding
     GCRYPT:  gcry_kdf_proc for an unknown kdf algorithm
 
 150	GPG_ERR_INV_ENGINE		Invalid crypto engine
+
+    GPGME: Several uses use cases.  For example:
+           - Unexpected format of a status line.
+
 151	GPG_ERR_PUBKEY_NOT_TRUSTED	Public key not trusted
 152	GPG_ERR_DECRYPT_FAILED		Decryption failed
 153	GPG_ERR_KEY_EXPIRED		Key expired
@@ -488,7 +492,10 @@ GPG_ERR_INV_CERT_OBJ		Invalid certificate object
 
 166	GPG_ERR_LOCALE_PROBLEM		A locale function failed
 167	GPG_ERR_NOT_LOCKED		Not locked
-168	GPG_ERR_PROTOCOL_VIOLATION	Protocol violation
+
+GPG_ERR_PROTOCOL_VIOLATION	Protocol violation
+
+    GNUPG: - Used for invalid HTTP responses.
 
 
 GPG_ERR_INV_MAC			Invalid MAC
@@ -626,6 +633,9 @@ GPG_ERR_MAC_ALGO
 212	GPG_ERR_SEXP_ODD_HEX_NUMBERS	Odd hexadecimal numbers in S-expression
 213	GPG_ERR_SEXP_BAD_OCT_CHAR	Bad octal character in S-expression
 
+
+GPG_ERR_SUBKEYS_EXP_REV (217)           All subkeys are expired or revoked
+
 GPG_ERR_DB_CORRUPTED (218)		Database is corrupted
 
 GPG_ERR_SERVER_FAILED (219)		Server indicated a failure
diff --git a/src/err-codes.h.in b/src/err-codes.h.in
index 887ea78..eefe088 100644
--- a/src/err-codes.h.in
+++ b/src/err-codes.h.in
@@ -247,7 +247,8 @@
 212	GPG_ERR_SEXP_ODD_HEX_NUMBERS	Odd hexadecimal numbers in S-expression
 213	GPG_ERR_SEXP_BAD_OCT_CHAR	Bad octal character in S-expression
 
-# 214 to 217 are free to be used.
+# 214 to 216 are free to be used.
+217	GPG_ERR_SUBKEYS_EXP_OR_REV	All subkeys are expired or revoked
 218	GPG_ERR_DB_CORRUPTED		Database is corrupted
 219	GPG_ERR_SERVER_FAILED		Server indicated a failure
 220	GPG_ERR_NO_NAME			No name

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

Summary of changes:
 NEWS               |  4 ++++
 doc/errorref.txt   | 14 ++++++++++++--
 src/err-codes.h.in |  3 ++-
 3 files changed, 18 insertions(+), 3 deletions(-)


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



From cvs at cvs.gnupg.org  Tue May 17 20:24:54 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 17 May 2016 20:24:54 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-108-g30b447f
Message-ID: <E1b2jeI-0007fi-KQ@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  30b447fcfe0e4f362c2575e1b9388e8144b5b2fd (commit)
       via  315fb73d4a774e2c699ac1804f5377559b4d0027 (commit)
      from  9b36ebf37a3b889c955ba68038bd5b3d9c5cde4e (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 30b447fcfe0e4f362c2575e1b9388e8144b5b2fd
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 17 19:59:51 2016 +0200

    tests: New maintenance helper run-encrypt.
    
    * tests/run-encrypt.c: New.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/NEWS b/NEWS
index 85c084f..cfff559 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Noteworthy changes in version 1.6.1 (unreleased) [C25/A14/R_]
+Noteworthy changes in version 1.7.0 (unreleased) [C25/A14/R_]
 ------------------------------------------------
 
  * New function to format a GnuPG style public key algorithm string.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 89e52e8..22c07d2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -32,7 +32,7 @@ LDADD = ../src/libgpgme.la @GPG_ERROR_LIBS@
 noinst_HEADERS = run-support.h
 
 noinst_PROGRAMS = $(TESTS) run-keylist run-export run-import run-sign \
-		  run-verify
+		  run-verify run-encrypt
 
 
 if RUN_GPG_TESTS
diff --git a/tests/run-encrypt.c b/tests/run-encrypt.c
new file mode 100644
index 0000000..a00f028
--- /dev/null
+++ b/tests/run-encrypt.c
@@ -0,0 +1,218 @@
+/* run-encrypt.c  - Helper to perform an encrypt operation
+ * Copyright (C) 2016 g10 Code GmbH
+ *
+ * This file is part of GPGME.
+ *
+ * GPGME 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 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * GPGME 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 program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* We need to include config.h so that we know whether we are building
+   with large file system (LFS) support. */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <gpgme.h>
+
+#define PGM "run-encrypt"
+
+#include "run-support.h"
+
+
+static int verbose;
+
+static gpg_error_t
+status_cb (void *opaque, const char *keyword, const char *value)
+{
+  (void)opaque;
+  printf ("status_cb: %s %s\n", keyword, value);
+  return 0;
+}
+
+
+static void
+print_result (gpgme_encrypt_result_t result)
+{
+  gpgme_invalid_key_t invkey;
+
+  for (invkey = result->invalid_recipients; invkey; invkey = invkey->next)
+    printf ("Encryption key `%s' not used: %s <%s>\n",
+            nonnull (invkey->fpr),
+            gpg_strerror (invkey->reason), gpg_strsource (invkey->reason));
+}
+
+
+
+static int
+show_usage (int ex)
+{
+  fputs ("usage: " PGM " [options] FILE\n\n"
+         "Options:\n"
+         "  --verbose        run in verbose mode\n"
+         "  --status         print status lines from the backend\n"
+         "  --openpgp        use the OpenPGP protocol (default)\n"
+         "  --cms            use the CMS protocol\n"
+         "  --uiserver       use the UI server\n"
+         "  --loopback       use a loopback pinentry\n"
+         "  --key NAME       encrypt to key NAME\n"
+         , stderr);
+  exit (ex);
+}
+
+
+int
+main (int argc, char **argv)
+{
+  int last_argc = -1;
+  gpgme_error_t err;
+  gpgme_ctx_t ctx;
+  const char *key_string = NULL;
+  gpgme_protocol_t protocol = GPGME_PROTOCOL_OpenPGP;
+  gpgme_data_t in, out;
+  gpgme_encrypt_result_t result;
+  int print_status = 0;
+  int use_loopback = 0;
+  char *keyargs[10];
+  gpgme_key_t keys[10+1];
+  int keycount = 0;
+  int i;
+
+  if (argc)
+    { argc--; argv++; }
+
+  if (DIM(keys) != DIM(keyargs)+1)
+    abort ();
+
+  while (argc && last_argc != argc )
+    {
+      last_argc = argc;
+      if (!strcmp (*argv, "--"))
+        {
+          argc--; argv++;
+          break;
+        }
+      else if (!strcmp (*argv, "--help"))
+        show_usage (0);
+      else if (!strcmp (*argv, "--verbose"))
+        {
+          verbose = 1;
+          argc--; argv++;
+        }
+      else if (!strcmp (*argv, "--status"))
+        {
+          print_status = 1;
+          argc--; argv++;
+        }
+      else if (!strcmp (*argv, "--openpgp"))
+        {
+          protocol = GPGME_PROTOCOL_OpenPGP;
+          argc--; argv++;
+        }
+      else if (!strcmp (*argv, "--cms"))
+        {
+          protocol = GPGME_PROTOCOL_CMS;
+          argc--; argv++;
+        }
+      else if (!strcmp (*argv, "--uiserver"))
+        {
+          protocol = GPGME_PROTOCOL_UISERVER;
+          argc--; argv++;
+        }
+      else if (!strcmp (*argv, "--key"))
+        {
+          argc--; argv++;
+          if (!argc)
+            show_usage (1);
+          if (keycount == DIM (keyargs))
+            show_usage (1);
+          keyargs[keycount++] = *argv;
+          argc--; argv++;
+        }
+      else if (!strcmp (*argv, "--loopback"))
+        {
+          use_loopback = 1;
+          argc--; argv++;
+        }
+      else if (!strncmp (*argv, "--", 2))
+        show_usage (1);
+
+    }
+
+  if (argc != 1)
+    show_usage (1);
+
+  if (key_string && protocol == GPGME_PROTOCOL_UISERVER)
+    {
+      fprintf (stderr, PGM ": ignoring --key in UI-server mode\n");
+      key_string = NULL;
+    }
+
+  if (!key_string)
+    key_string = "test";
+
+  init_gpgme (protocol);
+
+  err = gpgme_new (&ctx);
+  fail_if_err (err);
+  gpgme_set_protocol (ctx, protocol);
+  gpgme_set_armor (ctx, 1);
+  if (print_status)
+    gpgme_set_status_cb (ctx, status_cb, NULL);
+  if (use_loopback)
+    gpgme_set_pinentry_mode (ctx, GPGME_PINENTRY_MODE_LOOPBACK);
+
+  for (i=0; i < keycount; i++)
+    {
+      err = gpgme_get_key (ctx, keyargs[i], &keys[i], 0);
+      fail_if_err (err);
+    }
+  keys[i] = NULL;
+
+  err = gpgme_data_new_from_file (&in, *argv, 1);
+  if (err)
+    {
+      fprintf (stderr, PGM ": error reading `%s': %s\n",
+               *argv, gpg_strerror (err));
+      exit (1);
+    }
+
+  err = gpgme_data_new (&out);
+  fail_if_err (err);
+
+  err = gpgme_op_encrypt (ctx, keys, GPGME_ENCRYPT_ALWAYS_TRUST, in, out);
+  result = gpgme_op_encrypt_result (ctx);
+  if (result)
+    print_result (result);
+  if (err)
+    {
+      fprintf (stderr, PGM ": encrypting failed: %s\n", gpg_strerror (err));
+      exit (1);
+    }
+
+  fputs ("Begin Output:\n", stdout);
+  print_data (out);
+  fputs ("End Output.\n", stdout);
+  gpgme_data_release (out);
+
+  gpgme_data_release (in);
+
+  for (i=0; i < keycount; i++)
+    gpgme_key_unref (keys[i]);
+  gpgme_release (ctx);
+  return 0;
+}

commit 315fb73d4a774e2c699ac1804f5377559b4d0027
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 17 20:21:01 2016 +0200

    Return dedicated error code for all subkeys expired or revoked.
    
    * src/gpgme.h.in (GPGME_STATUS_KEY_CONSIDERED): New.
    (GPGME_SIGSUM_TOFU_CONFLICT): New.
    * src/status-table.c (KEY_CONSIDERED): New.
    * src/op-support.c (_gpgme_parse_inv_recp): Add argc KC_FPR and
    KC_FLAGS.  Use calloc.  Detect all expired or revoked subkeys.
    (_gpgme_parse_key_considered): New.
    * src/sign.c (op_data_t): Add fields KC_FPR and KC_FLAGS.
    (release_op_data): Free KC_FPR.
    (_gpgme_sign_status_handler): Handle STATUS_KEY_CONSIDERED.
    * src/encrypt.c (op_data_t): Add fields KC_FPR and KC_FLAGS.
    (release_op_data): Free KC_FPR.
    (_gpgme_encrypt_status_handler): Handle STATUS_KEY_CONSIDERED.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/encrypt.c b/src/encrypt.c
index 9f5134d..8672cd3 100644
--- a/src/encrypt.c
+++ b/src/encrypt.c
@@ -39,6 +39,12 @@ typedef struct
   /* The error code from a FAILURE status line or 0.  */
   gpg_error_t failure_code;
 
+  /* The fingerprint from the last KEY_CONSIDERED status line.  */
+  char *kc_fpr;
+
+  /* The flags from the last KEY_CONSIDERED status line.  */
+  unsigned int kc_flags;
+
   /* A pointer to the next pointer of the last invalid recipient in
      the list.  This makes appending new invalid recipients painless
      while preserving the order.  */
@@ -60,6 +66,8 @@ release_op_data (void *hook)
       free (invalid_recipient);
       invalid_recipient = next;
     }
+
+  free (opd->kc_fpr);
 }
 
 
@@ -128,12 +136,26 @@ _gpgme_encrypt_status_handler (void *priv, gpgme_status_code_t code,
         return opd->failure_code;
       break;
 
+    case GPGME_STATUS_KEY_CONSIDERED:
+      /* This is emitted during gpg's key lookup to give information
+       * about the lookup results.  We store the last one so it can be
+       * used in connection with INV_RECP.  */
+      free (opd->kc_fpr);
+      opd->kc_fpr = NULL;
+      err = _gpgme_parse_key_considered (args, &opd->kc_fpr, &opd->kc_flags);
+      if (err)
+        return err;
+      break;
+
     case GPGME_STATUS_INV_RECP:
-      err = _gpgme_parse_inv_recp (args, opd->lastp);
+      err = _gpgme_parse_inv_recp (args, 0, opd->kc_fpr, opd->kc_flags,
+                                   opd->lastp);
       if (err)
-	return err;
+        return err;
 
       opd->lastp = &(*opd->lastp)->next;
+      free (opd->kc_fpr);
+      opd->kc_fpr = NULL;
       break;
 
     case GPGME_STATUS_NO_RECP:
diff --git a/src/gpgme.h.in b/src/gpgme.h.in
index 8264bab..7a58ded 100644
--- a/src/gpgme.h.in
+++ b/src/gpgme.h.in
@@ -532,7 +532,8 @@ typedef enum
     GPGME_STATUS_BEGIN_SIGNING = 90,
     GPGME_STATUS_KEY_NOT_CREATED = 91,
     GPGME_STATUS_INQUIRE_MAXLEN = 92,
-    GPGME_STATUS_FAILURE = 93
+    GPGME_STATUS_FAILURE = 93,
+    GPGME_STATUS_KEY_CONSIDERED = 94
   }
 gpgme_status_code_t;
 
@@ -861,7 +862,12 @@ typedef struct _gpgme_key *gpgme_key_t;
 struct _gpgme_invalid_key
 {
   struct _gpgme_invalid_key *next;
+
+  /* The string used to request the key.  Despite the name this may
+   * not be a fingerprint.  */
   char *fpr;
+
+  /* The error code.  */
   gpgme_error_t reason;
 };
 typedef struct _gpgme_invalid_key *gpgme_invalid_key_t;
@@ -1518,7 +1524,8 @@ typedef enum
     GPGME_SIGSUM_CRL_MISSING = 0x0100,  /* CRL not available.  */
     GPGME_SIGSUM_CRL_TOO_OLD = 0x0200,  /* Available CRL is too old.  */
     GPGME_SIGSUM_BAD_POLICY  = 0x0400,  /* A policy was not met.  */
-    GPGME_SIGSUM_SYS_ERROR   = 0x0800   /* A system error occurred.  */
+    GPGME_SIGSUM_SYS_ERROR   = 0x0800,  /* A system error occurred.  */
+    GPGME_SIGSUM_TOFU_CONFLICT=0x1000   /* Tofu conflict detected.  */
   }
 gpgme_sigsum_t;
 
@@ -1541,7 +1548,7 @@ struct _gpgme_signature
   /* Signature creation time.  */
   unsigned long timestamp;
 
-  /* Signature exipration time or 0.  */
+  /* Signature expiration time or 0.  */
   unsigned long exp_timestamp;
 
   /* Key should not have been used for signing.  */
diff --git a/src/op-support.c b/src/op-support.c
index 02940ef..d51d643 100644
--- a/src/op-support.c
+++ b/src/op-support.c
@@ -33,6 +33,11 @@
 #include "util.h"
 #include "debug.h"
 
+#if GPG_ERROR_VERSION_NUMBER < 0x011700  /* 1.23 */
+# define GPG_ERR_SUBKEYS_EXP_REV 217
+#endif
+
+
 

 gpgme_error_t
 _gpgme_op_data_lookup (gpgme_ctx_t ctx, ctx_op_data_id_t type, void **hook,
@@ -190,16 +195,19 @@ _gpgme_op_reset (gpgme_ctx_t ctx, int type)
 }
 
 

-/* Parse the INV_RECP or INV-SNDR status line in ARGS and return the
-   result in KEY.  */
+/* Parse the INV_RECP or INV_SNDR status line in ARGS and return the
+   result in KEY.  If KC_FPR (from the KEY_CONSIDERED status line) is
+   not NULL take the KC_FLAGS in account. */
 gpgme_error_t
-_gpgme_parse_inv_recp (char *args, gpgme_invalid_key_t *key)
+_gpgme_parse_inv_recp (char *args, int for_signing,
+                       const char *kc_fpr, unsigned int kc_flags,
+                       gpgme_invalid_key_t *key)
 {
   gpgme_invalid_key_t inv_key;
   char *tail;
   long int reason;
 
-  inv_key = malloc (sizeof (*inv_key));
+  inv_key = calloc (1, sizeof (*inv_key));
   if (!inv_key)
     return gpg_error_from_syserror ();
   inv_key->next = NULL;
@@ -214,9 +222,11 @@ _gpgme_parse_inv_recp (char *args, gpgme_invalid_key_t *key)
 
   switch (reason)
     {
-    default:
     case 0:
-      inv_key->reason = gpg_error (GPG_ERR_GENERAL);
+      if (kc_fpr && (kc_flags & 2))
+        inv_key->reason = gpg_error (GPG_ERR_SUBKEYS_EXP_OR_REV);
+      else
+        inv_key->reason = gpg_error (GPG_ERR_GENERAL);
       break;
 
     case 1:
@@ -274,6 +284,10 @@ _gpgme_parse_inv_recp (char *args, gpgme_invalid_key_t *key)
     case 14:
       inv_key->reason = gpg_error (GPG_ERR_INV_USER_ID);
       break;
+
+    default:
+      inv_key->reason = gpg_error (GPG_ERR_GENERAL);
+      break;
     }
 
   while (*tail && *tail == ' ')
@@ -287,14 +301,49 @@ _gpgme_parse_inv_recp (char *args, gpgme_invalid_key_t *key)
 	  return gpg_error_from_syserror ();
 	}
     }
-  else
-    inv_key->fpr = NULL;
 
   *key = inv_key;
   return 0;
 }
 
 
+

+/* Parse a KEY_CONSIDERED status line in ARGS and store the
+ * fingerprint and the flags at R_FPR and R_FLAGS.  The caller must
+ * free the value at R_FPR on success.  */
+gpgme_error_t
+_gpgme_parse_key_considered (const char *args,
+                             char **r_fpr, unsigned int *r_flags)
+{
+  char *pend;
+  size_t n;
+
+  *r_fpr = NULL;
+
+  pend = strchr (args, ' ');
+  if (!pend || pend == args)
+    return trace_gpg_error (GPG_ERR_INV_ENGINE);  /* Bogus status line.  */
+  n = pend - args;
+  *r_fpr = malloc (n + 1);
+  if (!*r_fpr)
+    return gpg_error_from_syserror ();
+  memcpy (*r_fpr, args, n);
+  (*r_fpr)[n] = 0;
+  args = pend + 1;
+
+  gpg_err_set_errno (0);
+  *r_flags = strtoul (args, &pend, 0);
+  if (errno || args == pend || (*pend && *pend != ' '))
+    {
+      free (*r_fpr);
+      *r_fpr = NULL;
+      return trace_gpg_error (GPG_ERR_INV_ENGINE);
+    }
+
+  return 0;
+}
+
+
 /* Parse the PLAINTEXT status line in ARGS and return the result in
    FILENAMEP.  */
 gpgme_error_t
diff --git a/src/ops.h b/src/ops.h
index 3662d57..9c27529 100644
--- a/src/ops.h
+++ b/src/ops.h
@@ -57,9 +57,15 @@ gpgme_error_t _gpgme_op_data_lookup (gpgme_ctx_t ctx, ctx_op_data_id_t type,
 /* Prepare a new operation on CTX.  */
 gpgme_error_t _gpgme_op_reset (gpgme_ctx_t ctx, int synchronous);
 
+/* Parse the KEY_CONSIDERED status line.  */
+gpgme_error_t _gpgme_parse_key_considered (const char *args,
+                                           char **r_fpr, unsigned int *r_flags);
+
 /* Parse the INV_RECP status line in ARGS and return the result in
    KEY.  */
-gpgme_error_t _gpgme_parse_inv_recp (char *args, gpgme_invalid_key_t *key);
+gpgme_error_t _gpgme_parse_inv_recp (char *args, int for_signing,
+                                     const char *kc_fpr, unsigned int kc_flags,
+                                     gpgme_invalid_key_t *key);
 
 /* Parse the PLAINTEXT status line in ARGS and return the result in
    FILENAMEP.  */
diff --git a/src/sign.c b/src/sign.c
index 6c9fc03..d8650a9 100644
--- a/src/sign.c
+++ b/src/sign.c
@@ -42,6 +42,12 @@ typedef struct
   /* The error code from a FAILURE status line or 0.  */
   gpg_error_t failure_code;
 
+  /* The fingerprint from the last KEY_CONSIDERED status line.  */
+  char *kc_fpr;
+
+  /* The flags from the last KEY_CONSIDERED status line.  */
+  unsigned int kc_flags;
+
   /* A pointer to the next pointer of the last invalid signer in
      the list.  This makes appending new invalid signers painless
      while preserving the order.  */
@@ -86,6 +92,7 @@ release_op_data (void *hook)
     }
 
   release_signatures (opd->result.signatures);
+  free (opd->kc_fpr);
 }
 
 
@@ -316,6 +323,17 @@ _gpgme_sign_status_handler (void *priv, gpgme_status_code_t code, char *args)
       opd->last_sig_p = &(*opd->last_sig_p)->next;
       break;
 
+    case GPGME_STATUS_KEY_CONSIDERED:
+      /* This is emitted during gpg's key lookup to give information
+       * about the lookup results.  We store the last one so it can be
+       * used in connection with INV_RECP.  */
+      free (opd->kc_fpr);
+      opd->kc_fpr = NULL;
+      err = _gpgme_parse_key_considered (args, &opd->kc_fpr, &opd->kc_flags);
+      if (err)
+        return err;
+      break;
+
     case GPGME_STATUS_INV_RECP:
       if (opd->inv_sgnr_seen && opd->ignore_inv_recp)
         break;
@@ -323,11 +341,16 @@ _gpgme_sign_status_handler (void *priv, gpgme_status_code_t code, char *args)
     case GPGME_STATUS_INV_SGNR:
       if (code == GPGME_STATUS_INV_SGNR)
         opd->inv_sgnr_seen = 1;
-      err = _gpgme_parse_inv_recp (args, opd->last_signer_p);
+      free (opd->kc_fpr);
+      opd->kc_fpr = NULL;
+      err = _gpgme_parse_inv_recp (args, 1, opd->kc_fpr, opd->kc_flags,
+                                   opd->last_signer_p);
       if (err)
 	return err;
 
       opd->last_signer_p = &(*opd->last_signer_p)->next;
+      free (opd->kc_fpr);
+      opd->kc_fpr = NULL;
       break;
 
     case GPGME_STATUS_FAILURE:
diff --git a/src/status-table.c b/src/status-table.c
index 6d428d7..e70cb8b 100644
--- a/src/status-table.c
+++ b/src/status-table.c
@@ -84,6 +84,7 @@ static struct status_table_s status_table[] =
   { "INQUIRE_MAXLEN", GPGME_STATUS_INQUIRE_MAXLEN },
   { "INV_RECP", GPGME_STATUS_INV_RECP },
   { "INV_SGNR", GPGME_STATUS_INV_SGNR },
+  { "KEY_CONSIDERED", GPGME_STATUS_KEY_CONSIDERED },
   { "KEY_CREATED", GPGME_STATUS_KEY_CREATED },
   { "KEY_NOT_CREATED",   GPGME_STATUS_KEY_NOT_CREATED  },
   { "KEYEXPIRED", GPGME_STATUS_KEYEXPIRED },

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

Summary of changes:
 NEWS                                |  2 +-
 src/encrypt.c                       | 26 +++++++++-
 src/gpgme.h.in                      | 13 +++--
 src/op-support.c                    | 65 ++++++++++++++++++++++---
 src/ops.h                           |  8 ++-
 src/sign.c                          | 25 +++++++++-
 src/status-table.c                  |  1 +
 tests/Makefile.am                   |  2 +-
 tests/{run-sign.c => run-encrypt.c} | 97 ++++++++++++++++++-------------------
 9 files changed, 171 insertions(+), 68 deletions(-)
 copy tests/{run-sign.c => run-encrypt.c} (64%)


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



From cvs at cvs.gnupg.org  Wed May 18 09:36:41 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 18 May 2016 09:36:41 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. 8b3deef9012abc8da5814eb5e3ed46c0a5448a0f
Message-ID: <E1b2w0X-0005vC-Qc@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  8b3deef9012abc8da5814eb5e3ed46c0a5448a0f (commit)
      from  5094fddd47141c6f52f41b23a461bba20147661b (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 8b3deef9012abc8da5814eb5e3ed46c0a5448a0f
Author: Werner Koch <wk at gnupg.org>
Date:   Wed May 18 09:35:35 2016 +0200

    drafts: openpgp-webkey-service - published 01

diff --git a/misc/id/openpgp-webkey-service/Makefile b/misc/id/openpgp-webkey-service/Makefile
index 5e95728..dad63f1 100644
--- a/misc/id/openpgp-webkey-service/Makefile
+++ b/misc/id/openpgp-webkey-service/Makefile
@@ -7,7 +7,7 @@ MD_EXAMPLE_FIX = '(defun org-md-example-block (example-block contents info) \
  (org-export-format-code-default example-block info))))'
 
 
-draft.txt: draft.org
+draft.txt, draft.xml: draft.org
 	emacs --batch \
            --eval "(require 'org)" \
            --eval "(require 'ox-md)" \
@@ -22,4 +22,5 @@ draft.txt: draft.org
 	sed <draft.md  -n '/^# Back/,$$ p' | \
 		sed  '1 d'     >tmp-back.md
 	pandoc2rfc tmp-abstract.md tmp-middle.md tmp-back.md
-	rm template.xml tmp-abstract.md tmp-middle.md tmp-back.md
+	pandoc2rfc -X tmp-abstract.md tmp-middle.md tmp-back.md
+	rm template.xml tmp-abstract.md tmp-middle.md tmp-back.md draft.md
diff --git a/misc/id/openpgp-webkey-service/draft-koch-openpgp-webkey-service-01.txt b/misc/id/openpgp-webkey-service/draft-koch-openpgp-webkey-service-01.txt
new file mode 100644
index 0000000..e36c435
--- /dev/null
+++ b/misc/id/openpgp-webkey-service/draft-koch-openpgp-webkey-service-01.txt
@@ -0,0 +1,560 @@
+
+
+
+
+Network Working Group                                            W. Koch
+Internet-Draft                                             GnuPG Project
+Intended status: Informational                              May 18, 2016
+Expires: November 19, 2016
+
+
+                        OpenPGP Web Key Service
+                  draft-koch-openpgp-webkey-service-01
+
+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 November 19, 2016.
+
+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 November 19, 2016               [Page 1]
+

+Internet-Draft           OpenPGP Web Key Service                May 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 . . . . . . . . . . . . . . . .   7
+     4.5.  Policy Flags  . . . . . . . . . . . . . . . . . . . . . .   8
+   5.  Security Considerations . . . . . . . . . . . . . . . . . . .   8
+   6.  IANA Considerations . . . . . . . . . . . . . . . . . . . . .   9
+     6.1.  Well-Known URI  . . . . . . . . . . . . . . . . . . . . .   9
+   7.  Acknowledgments . . . . . . . . . . . . . . . . . . . . . . .   9
+   8.  Normative References  . . . . . . . . . . . . . . . . . . . .   9
+   Appendix A.  Test Vectors . . . . . . . . . . . . . . . . . . . .  10
+     A.1.  Sample key  . . . . . . . . . . . . . . . . . . . . . . .  10
+     A.2.  Software Notes  . . . . . . . . . . . . . . . . . . . . .  10
+   Appendix B.  Changes since -00  . . . . . . . . . . . . . . . . .  10
+     B.1.  TODO  . . . . . . . . . . . . . . . . . . . . . . . . . .  10
+   Author's Address  . . . . . . . . . . . . . . . . . . . . . . . .  10
+
+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
+
+
+
+Koch                    Expires November 19, 2016               [Page 2]
+

+Internet-Draft           OpenPGP Web Key Service                May 2016
+
+
+   several keys matching a mail address and thus one needs to pick a key
+   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-
+
+
+
+
+Koch                    Expires November 19, 2016               [Page 3]
+

+Internet-Draft           OpenPGP Web Key Service                May 2016
+
+
+   insensitive anyway, all upper-case ASCII characters in a User ID are
+   mapped to lowercase.  Non-ASCII characters are not changed.
+
+   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.  The server MUST also accept a HEAD method so that a
+   client may only check for the existence of a key.
+
+   The server SHOULD return "application/octet-string" as the content-
+   type for the data but clients MAY also accept any other appropriate
+   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 November 19, 2016               [Page 4]
+

+Internet-Draft           OpenPGP Web Key Service                May 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.  Also 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 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 November 19, 2016               [Page 5]
+

+Internet-Draft           OpenPGP Web Key Service                May 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.
+
+   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 ([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 SHOULD 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 ([RFC3156], 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:
+
+   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.
+
+
+
+
+Koch                    Expires November 19, 2016               [Page 6]
+

+Internet-Draft           OpenPGP Web Key Service                May 2016
+
+
+   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 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.
+
+   In other cases the confirmation request is legitimate and the MUA
+   shall silently send a response as described in the next section.
+
+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 SHOULD be encrypted.  The PGP/MIME
+   Combined format MUST be used for encryption and signing ([RFC3156],
+   section 6.2).  The encryption key can be taken from the Web Key
+   Directory.
+
+   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:
+
+
+
+
+Koch                    Expires November 19, 2016               [Page 7]
+

+Internet-Draft           OpenPGP Web Key Service                May 2016
+
+
+   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, 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.  Clients MUST use case-insensitive matching.
+
+   Currently defined keywords are:
+
+   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.
+
+   More keywords will be defined in updates to this I-D.  There is no
+   registry yet 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.
+
+
+
+
+
+
+Koch                    Expires November 19, 2016               [Page 8]
+

+Internet-Draft           OpenPGP Web Key Service                May 2016
+
+
+   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.
+
+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.
+
+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>.
+
+
+
+
+
+
+
+
+Koch                    Expires November 19, 2016               [Page 9]
+

+Internet-Draft           OpenPGP Web Key Service                May 2016
+
+
+Appendix A.  Test Vectors
+
+   For help implementing this specification a non-normative example is
+   given:
+
+A.1.  Sample key
+
+   TODO
+
+A.2.  Software Notes
+
+   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.
+
+Appendix B.  Changes since -00
+
+   o  Dropped the second occurrence of the domain name from the URL.
+
+   o  Changed field names in the request and response format.
+
+   o  Removed useless checks.
+
+   o  Added a new policy flag.
+
+B.1.  TODO
+
+   o  What about authenticated submission?
+
+   o  Describe how to handle a key with several User IDs.
+
+Author's Address
+
+   Werner Koch
+   GnuPG Project
+
+   Email: wk at gnupg.org
+   URI:   https://gnupg.org
+
+
+
+
+
+
+
+
+
+
+
+Koch                    Expires November 19, 2016              [Page 10]
diff --git a/misc/id/openpgp-webkey-service/draft.org b/misc/id/openpgp-webkey-service/draft.org
index b10dedf..5756e7d 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-00">
+     docName="draft-koch-openpgp-webkey-service-01">
 
 <?rfc toc="yes"?>
 <?rfc symrefs="yes"?>
@@ -429,16 +429,17 @@ TODO
 
 ** Software Notes
 
-GnuPG supports the key discovery described in this document since
-version 2.1.12. To use it, the new method "wkd" needs to be used with
-the =--auto-key-locate= option.
+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.
 
 * Changes since -00
 
+-  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.
--  Dropped the second occurrence of the domain name from the URL.
 
 ** TODO
 

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

Summary of changes:
 misc/id/openpgp-webkey-service/Makefile            |   5 +-
 ...xt => draft-koch-openpgp-webkey-service-01.txt} | 198 ++++++++++-----------
 misc/id/openpgp-webkey-service/draft.org           |  11 +-
 3 files changed, 108 insertions(+), 106 deletions(-)
 copy misc/id/openpgp-webkey-service/{draft-koch-openpgp-webkey-service-00.txt => draft-koch-openpgp-webkey-service-01.txt} (80%)


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



From cvs at cvs.gnupg.org  Wed May 18 09:53:01 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 18 May 2016 09:53:01 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.12-8-gcf97769
Message-ID: <E1b2wGM-0006q3-7a@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  cf97769906337d65289ad58225a5ecc53c715550 (commit)
       via  ff71521d9698c7c5df94831a1398e948213af433 (commit)
      from  83a90a916e8e2f8e44c3b11d11e1dd75f65a87fb (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 cf97769906337d65289ad58225a5ecc53c715550
Author: Werner Koch <wk at gnupg.org>
Date:   Wed May 18 09:46:22 2016 +0200

    dirmngr: Adjust the WKD lookup to specs version -01.
    
    * dirmngr/server.c (cmd_wkd_get): Remove second occurrence of the
    domain part.
    --
    
    This change updates gnupg to comply with
    draft-koch-openpgp-webkey-service-01

diff --git a/dirmngr/server.c b/dirmngr/server.c
index 80ce5b5..bca0d8e 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -834,8 +834,6 @@ cmd_wkd_get (assuan_context_t ctx, char *line)
   uri = strconcat ("https://",
                    domain,
                    "/.well-known/openpgpkey/hu/",
-                   domain,
-                   "/",
                    encodedhash,
                    NULL);
   if (!uri)

commit ff71521d9698c7c5df94831a1398e948213af433
Author: Werner Koch <wk at gnupg.org>
Date:   Fri May 13 16:24:59 2016 +0200

    gpg: Emit new status line KEY_CONSIDERED.
    
    * common/status.h (STATUS_KEY_CONSIDERED): New.
    * g10/getkey.c: Include status.h.
    (LOOKUP_NOT_SELECTED, LOOKUP_ALL_SUBKEYS_EXPIRED): New.
    (finish_lookup): Add arg R_FLAGS.  Count expired and revoked keys and
    set flag.  Check a requested usage before checking for expiraion or
    revocation.
    (print_status_key_considered): New.
    (lookup): Print new status.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/status.h b/common/status.h
index 730a75c..966489f 100644
--- a/common/status.h
+++ b/common/status.h
@@ -105,6 +105,7 @@ enum
     STATUS_INV_SGNR,
     STATUS_NO_RECP,
     STATUS_NO_SGNR,
+    STATUS_KEY_CONSIDERED,
 
     STATUS_ALREADY_SIGNED,
     STATUS_KEYEXPIRED,
diff --git a/doc/DETAILS b/doc/DETAILS
index 5ceab68..2710007 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -548,7 +548,7 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB:
     that case, this status tag does not appear.
 
 *** ATTRIBUTE <arguments>
-    The list or argemnts are:
+    The list or arguments are:
     - <fpr>
     - <octets>
     - <type>
@@ -602,18 +602,29 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB:
        - 13 :: Key disabled
        - 14 :: Syntax error in specification
 
+    If no specific reason was given a previously emitted status code
+    KEY_CONSIDERED may be used to analyzed the problem.
+
     Note that for historical reasons the INV_RECP status is also used
     for gpgsm's SIGNER command where it relates to signer's of course.
     Newer GnuPG versions are using INV_SGNR; applications should
     ignore the INV_RECP during the sender's command processing once
     they have seen an INV_SGNR.  Different codes are used so that they
     can be distinguish while doing an encrypt+sign operation.
+
 *** NO_RECP <reserved>
     Issued if no recipients are usable.
 
 *** NO_SGNR <reserved>
     Issued if no senders are usable.
 
+*** KEY_CONSIDERED <fpr> <flags>
+    Issued to explian the lookup of a key.  FPR is the hexified
+    fingerprint of the primary key.  The bit values for FLAGS are:
+
+    - 1 :: The key has not been selected.
+    - 2 :: All subkeys of the key are expired or have been revoked.
+
 *** KEYEXPIRED <expire-timestamp>
     The key has expired.  expire-timestamp is the expiration time in
     seconds since Epoch.  This status line is not very useful because
diff --git a/g10/getkey.c b/g10/getkey.c
index 907007b..ad0148e 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -38,6 +38,7 @@
 #include "call-agent.h"
 #include "host2net.h"
 #include "mbox-util.h"
+#include "status.h"
 
 #define MAX_PK_CACHE_ENTRIES   PK_UID_CACHE_SIZE
 #define MAX_UID_CACHE_ENTRIES  PK_UID_CACHE_SIZE
@@ -46,6 +47,13 @@
 #error We need the cache for key creation
 #endif
 
+/* Flags values returned by the lookup code.  Note that the values are
+ * directly used by the KEY_CONSIDERED status line.  */
+#define LOOKUP_NOT_SELECTED        (1<<0)
+#define LOOKUP_ALL_SUBKEYS_EXPIRED (1<<1)  /* or revoked */
+
+
+/* A context object used by the lookup functions.  */
 struct getkey_ctx_s
 {
   /* Part of the search criteria: whether the search is an exact
@@ -3045,51 +3053,54 @@ merge_selfsigs (KBNODE keyblock)
 
 

 /* See whether the key satisfies any additional requirements specified
-   in CTX.  If so, return 1 and set CTX->FOUND_KEY to an appropriate
-   key or subkey.  Otherwise, return 0 if there was no appropriate
-   key.
-
-   In case the primary key is not required, select a suitable subkey.
-   We need the primary key if PUBKEY_USAGE_CERT is set in
-   CTX->REQ_USAGE or we are in PGP6 or PGP7 mode and PUBKEY_USAGE_SIG
-   is set in CTX->REQ_USAGE.
-
-   If any of PUBKEY_USAGE_SIG, PUBKEY_USAGE_ENC and PUBKEY_USAGE_CERT
-   are set in CTX->REQ_USAGE, we filter by the key's function.
-   Concretely, if PUBKEY_USAGE_SIG and PUBKEY_USAGE_CERT are set, then
-   we only return a key if it is (at least) either a signing or a
-   certification key.
-
-   If CTX->REQ_USAGE is set, then we reject any keys that are not good
-   (i.e., valid, not revoked, not expired, etc.).  This allows the
-   getkey functions to be used for plain key listings.
-
-   Sets the matched key's user id field (pk->user_id) to the user id
-   that matched the low-level search criteria or NULL.
-
-
-   This function needs to handle several different cases:
-
-    1. No requested usage and no primary key requested
-       Examples for this case are that we have a keyID to be used
-       for decrytion or verification.
-    2. No usage but primary key requested
-       This is the case for all functions which work on an
-       entire keyblock, e.g. for editing or listing
-    3. Usage and primary key requested
-       FXME
-    4. Usage but no primary key requested
-       FIXME
-
+ * in CTX.  If so, return 1 and set CTX->FOUND_KEY to an appropriate
+ * key or subkey.  Otherwise, return 0 if there was no appropriate
+ * key.
+ *
+ * In case the primary key is not required, select a suitable subkey.
+ * We need the primary key if PUBKEY_USAGE_CERT is set in
+ * CTX->REQ_USAGE or we are in PGP6 or PGP7 mode and PUBKEY_USAGE_SIG
+ * is set in CTX->REQ_USAGE.
+ *
+ * If any of PUBKEY_USAGE_SIG, PUBKEY_USAGE_ENC and PUBKEY_USAGE_CERT
+ * are set in CTX->REQ_USAGE, we filter by the key's function.
+ * Concretely, if PUBKEY_USAGE_SIG and PUBKEY_USAGE_CERT are set, then
+ * we only return a key if it is (at least) either a signing or a
+ * certification key.
+ *
+ * If CTX->REQ_USAGE is set, then we reject any keys that are not good
+ * (i.e., valid, not revoked, not expired, etc.).  This allows the
+ * getkey functions to be used for plain key listings.
+ *
+ * Sets the matched key's user id field (pk->user_id) to the user id
+ * that matched the low-level search criteria or NULL.  If R_FLAGS is
+ * not NULL set certain flags for more detailed error reporting.  Used
+ * flags are:
+ * - LOOKUP_ALL_SUBKEYS_EXPIRED :: All Subkeys are expired or have
+ *                                 been revoked.
+ *
+ * This function needs to handle several different cases:
+ *
+ *  1. No requested usage and no primary key requested
+ *     Examples for this case are that we have a keyID to be used
+ *     for decrytion or verification.
+ *  2. No usage but primary key requested
+ *     This is the case for all functions which work on an
+ *     entire keyblock, e.g. for editing or listing
+ *  3. Usage and primary key requested
+ *     FIXME
+ *  4. Usage but no primary key requested
+ *     FIXME
+ *
  */
-static KBNODE
-finish_lookup (GETKEY_CTX ctx, KBNODE keyblock)
+static kbnode_t
+finish_lookup (getkey_ctx_t ctx, kbnode_t keyblock, unsigned int *r_flags)
 {
-  KBNODE k;
+  kbnode_t k;
 
   /* If CTX->EXACT is set, the key or subkey that actually matched the
      low-level search criteria.  */
-  KBNODE foundk = NULL;
+  kbnode_t foundk = NULL;
   /* The user id (if any) that matched the low-level search criteria.  */
   PKT_user_id *foundu = NULL;
 
@@ -3100,21 +3111,23 @@ finish_lookup (GETKEY_CTX ctx, KBNODE keyblock)
      if signing data while --pgp6 or --pgp7 is on since pgp 6 and 7
      do not understand signatures made by a signing subkey.  PGP 8
      does. */
-  int req_prim = (ctx->req_usage & PUBKEY_USAGE_CERT) ||
-    ((PGP6 || PGP7) && (ctx->req_usage & PUBKEY_USAGE_SIG));
+  int req_prim = ((ctx->req_usage & PUBKEY_USAGE_CERT)
+                  || ((PGP6 || PGP7) && (ctx->req_usage & PUBKEY_USAGE_SIG)));
 
   u32 curtime = make_timestamp ();
 
   u32 latest_date;
-  KBNODE latest_key;
+  kbnode_t latest_key;
   PKT_public_key *pk;
 
-
   log_assert (keyblock->pkt->pkttype == PKT_PUBLIC_KEY);
 
+  if (r_flags)
+    *r_flags = 0;
+
+  /* For an exact match mark the primary or subkey that matched the
+     low-level search criteria.  */
   if (ctx->exact)
-    /* Get the key or subkey that matched the low-level search
-       criteria.  */
     {
       for (k = keyblock; k; k = k->next)
 	{
@@ -3154,24 +3167,28 @@ finish_lookup (GETKEY_CTX ctx, KBNODE keyblock)
 
   latest_date = 0;
   latest_key = NULL;
-  /* Set latest_key to the latest (the one with the most recent
-     timestamp) good (valid, not revoked, not expired, etc.) subkey.
-
-     Don't bother if we are only looking for a primary key or we need
-     an exact match and the exact match is not a subkey.  */
+  /* Set LATEST_KEY to the latest (the one with the most recent
+   * timestamp) good (valid, not revoked, not expired, etc.) subkey.
+   *
+   * Don't bother if we are only looking for a primary key or we need
+   * an exact match and the exact match is not a subkey.  */
   if (req_prim || (foundk && foundk->pkt->pkttype != PKT_PUBLIC_SUBKEY))
     ;
   else
     {
-      KBNODE nextk;
+      kbnode_t nextk;
+      int n_subkeys = 0;
+      int n_revoked_or_expired = 0;
 
       /* Either start a loop or check just this one subkey.  */
       for (k = foundk ? foundk : keyblock; k; k = nextk)
 	{
 	  if (foundk)
-	    /* If FOUNDK is not NULL, then only consider that exact
-	       key, i.e., don't iterate.  */
-	    nextk = NULL;
+            {
+              /* If FOUNDK is not NULL, then only consider that exact
+                 key, i.e., don't iterate.  */
+              nextk = NULL;
+            }
 	  else
 	    nextk = k->next;
 
@@ -3182,24 +3199,35 @@ finish_lookup (GETKEY_CTX ctx, KBNODE keyblock)
 	  if (DBG_LOOKUP)
 	    log_debug ("\tchecking subkey %08lX\n",
 		       (ulong) keyid_from_pk (pk, NULL));
+
 	  if (!pk->flags.valid)
 	    {
 	      if (DBG_LOOKUP)
 		log_debug ("\tsubkey not valid\n");
 	      continue;
 	    }
+	  if (!((pk->pubkey_usage & USAGE_MASK) & req_usage))
+	    {
+	      if (DBG_LOOKUP)
+		log_debug ("\tusage does not match: want=%x have=%x\n",
+			   req_usage, pk->pubkey_usage);
+	      continue;
+	    }
+
+          n_subkeys++;
 	  if (pk->flags.revoked)
 	    {
 	      if (DBG_LOOKUP)
 		log_debug ("\tsubkey has been revoked\n");
+              n_revoked_or_expired++;
 	      continue;
 	    }
 	  if (pk->has_expired)
 	    {
 	      if (DBG_LOOKUP)
 		log_debug ("\tsubkey has expired\n");
+              n_revoked_or_expired++;
 	      continue;
-
 	    }
 	  if (pk->timestamp > curtime && !opt.ignore_valid_from)
 	    {
@@ -3208,14 +3236,6 @@ finish_lookup (GETKEY_CTX ctx, KBNODE keyblock)
 	      continue;
 	    }
 
-	  if (!((pk->pubkey_usage & USAGE_MASK) & req_usage))
-	    {
-	      if (DBG_LOOKUP)
-		log_debug ("\tusage does not match: want=%x have=%x\n",
-			   req_usage, pk->pubkey_usage);
-	      continue;
-	    }
-
 	  if (DBG_LOOKUP)
 	    log_debug ("\tsubkey might be fine\n");
 	  /* In case a key has a timestamp of 0 set, we make sure
@@ -3228,18 +3248,20 @@ finish_lookup (GETKEY_CTX ctx, KBNODE keyblock)
 	      latest_key = k;
 	    }
 	}
+      if (n_subkeys == n_revoked_or_expired && r_flags)
+        *r_flags |= LOOKUP_ALL_SUBKEYS_EXPIRED;
     }
 
   /* Check if the primary key is ok (valid, not revoke, not expire,
-     matches requested usage) if:
-
-       - we didn't find an appropriate subkey and we're not doing an
-         exact search,
-
-       - we're doing an exact match and the exact match was the
-         primary key, or,
-
-       - we're just considering the primary key.  */
+   * matches requested usage) if:
+   *
+   *   - we didn't find an appropriate subkey and we're not doing an
+   *     exact search,
+   *
+   *   - we're doing an exact match and the exact match was the
+   *     primary key, or,
+   *
+   *   - we're just considering the primary key.  */
   if ((!latest_key && !ctx->exact) || foundk == keyblock || req_prim)
     {
       if (DBG_LOOKUP && !foundk && !req_prim)
@@ -3250,6 +3272,12 @@ finish_lookup (GETKEY_CTX ctx, KBNODE keyblock)
 	  if (DBG_LOOKUP)
 	    log_debug ("\tprimary key not valid\n");
 	}
+      else if (!((pk->pubkey_usage & USAGE_MASK) & req_usage))
+	{
+	  if (DBG_LOOKUP)
+	    log_debug ("\tprimary key usage does not match: "
+		       "want=%x have=%x\n", req_usage, pk->pubkey_usage);
+	}
       else if (pk->flags.revoked)
 	{
 	  if (DBG_LOOKUP)
@@ -3260,12 +3288,6 @@ finish_lookup (GETKEY_CTX ctx, KBNODE keyblock)
 	  if (DBG_LOOKUP)
 	    log_debug ("\tprimary key has expired\n");
 	}
-      else if (!((pk->pubkey_usage & USAGE_MASK) & req_usage))
-	{
-	  if (DBG_LOOKUP)
-	    log_debug ("\tprimary key usage does not match: "
-		       "want=%x have=%x\n", req_usage, pk->pubkey_usage);
-	}
       else /* Okay.  */
 	{
 	  if (DBG_LOOKUP)
@@ -3309,6 +3331,34 @@ found:
 }
 
 
+/* Print a KEY_CONSIDERED status line.  */
+static void
+print_status_key_considered (kbnode_t keyblock, unsigned int flags)
+{
+  char hexfpr[2*MAX_FINGERPRINT_LEN + 1];
+  kbnode_t node;
+  char flagbuf[20];
+
+  if (!is_status_enabled ())
+    return;
+
+  for (node=keyblock; node; node = node->next)
+    if (node->pkt->pkttype == PKT_PUBLIC_KEY
+        || node->pkt->pkttype == PKT_SECRET_KEY)
+      break;
+  if (!node)
+    {
+      log_error ("%s: keyblock w/o primary key\n", __func__);
+      return;
+    }
+
+  hexfingerprint (node->pkt->pkt.public_key, hexfpr, sizeof hexfpr);
+  snprintf (flagbuf, sizeof flagbuf, " %u", flags);
+  write_status_strings (STATUS_KEY_CONSIDERED, hexfpr, flagbuf, NULL);
+}
+
+
+
 /* A high-level function to lookup keys.
 
    This function builds on top of the low-level keydb API.  It first
@@ -3329,6 +3379,7 @@ lookup (getkey_ctx_t ctx, kbnode_t *ret_keyblock, kbnode_t *ret_found_key,
   int no_suitable_key = 0;
   KBNODE keyblock = NULL;
   KBNODE found_key = NULL;
+  unsigned int infoflags;
 
   if (ret_keyblock)
     *ret_keyblock = NULL;
@@ -3360,14 +3411,19 @@ lookup (getkey_ctx_t ctx, kbnode_t *ret_keyblock, kbnode_t *ret_found_key,
        * merge_selfsigs.  For secret keys, premerge transferred the
        * keys to the keyblock.  */
       merge_selfsigs (keyblock);
-      found_key = finish_lookup (ctx, keyblock);
+      found_key = finish_lookup (ctx, keyblock, &infoflags);
+      if (!found_key)
+        infoflags |= LOOKUP_NOT_SELECTED;
+      print_status_key_considered (keyblock, infoflags);
       if (found_key)
 	{
 	  no_suitable_key = 0;
 	  goto found;
 	}
       else
-	no_suitable_key = 1;
+        {
+          no_suitable_key = 1;
+        }
 
     skip:
       /* Release resources and continue search. */
@@ -3381,7 +3437,7 @@ lookup (getkey_ctx_t ctx, kbnode_t *ret_keyblock, kbnode_t *ret_found_key,
       keydb_disable_caching (ctx->kr_handle);
     }
 
-found:
+ found:
   if (rc && gpg_err_code (rc) != GPG_ERR_NOT_FOUND)
     log_error ("keydb_search failed: %s\n", gpg_strerror (rc));
 

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

Summary of changes:
 common/status.h  |   1 +
 dirmngr/server.c |   2 -
 doc/DETAILS      |  13 +++-
 g10/getkey.c     | 220 ++++++++++++++++++++++++++++++++++---------------------
 4 files changed, 151 insertions(+), 85 deletions(-)


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



From cvs at cvs.gnupg.org  Wed May 18 15:29:02 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Wed, 18 May 2016 15:29:02 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-109-gf0dca0a
Message-ID: <E1b31VW-0003Yv-Ig@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  f0dca0ab92ed18d80e30d7d39db1596b4112794f (commit)
      from  30b447fcfe0e4f362c2575e1b9388e8144b5b2fd (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 f0dca0ab92ed18d80e30d7d39db1596b4112794f
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed May 18 15:27:32 2016 +0200

    Fix typo in compatibility declaration
    
    * src/op-support.c (GPG_ERR_SUBKEYS_EXP_REV): Change to
    GPG_ERR_SUBKEYS_EXP_OR_REV.
    
    --
    This fixes the build with libgpg-error < 1.23

diff --git a/src/op-support.c b/src/op-support.c
index d51d643..4e388a4 100644
--- a/src/op-support.c
+++ b/src/op-support.c
@@ -34,7 +34,7 @@
 #include "debug.h"
 
 #if GPG_ERROR_VERSION_NUMBER < 0x011700  /* 1.23 */
-# define GPG_ERR_SUBKEYS_EXP_REV 217
+# define GPG_ERR_SUBKEYS_EXP_OR_REV 217
 #endif
 
 

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

Summary of changes:
 src/op-support.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  Wed May 18 15:38:34 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Wed, 18 May 2016 15:38:34 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-110-g2c3a5d9
Message-ID: <E1b31ej-0003w2-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 "GnuPG Made Easy".

The branch, master has been updated
       via  2c3a5d93e78cfca22785e51c5a65184a47da4bff (commit)
      from  f0dca0ab92ed18d80e30d7d39db1596b4112794f (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 2c3a5d93e78cfca22785e51c5a65184a47da4bff
Author: Justus Winter <justus at gnupg.org>
Date:   Wed May 18 13:17:59 2016 +0200

    python: Various fixes.
    
    * configure.ac: Fix SWIG detection, bump required Python version.
    * lang/python/Makefile.am: Portability fix.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/configure.ac b/configure.ac
index 36f4f94..1472132 100644
--- a/configure.ac
+++ b/configure.ac
@@ -345,16 +345,15 @@ if test "$found" = "1"; then
     AX_PKG_SWIG
     if test -z "$SWIG"; then
         if test "$explicit_languages" = "1"; then
-            die=yes
-            AC_MSG_NOTICE([[
+            AC_MSG_ERROR([[
 ***
 *** You need SWIG to build the Python bindings.
 ***]])
         else
-            enabled_languages=$(echo $enabled_languages | sed 's/qt//')
+            enabled_languages=$(echo $enabled_languages | sed 's/python//')
         fi
     else
-        AM_PATH_PYTHON([3.2])
+        AM_PATH_PYTHON([3.3])
         AX_SWIG_PYTHON
     fi
 fi
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
index 308fcd0..86c1965 100644
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
@@ -26,7 +26,7 @@ gpgme.h: ../../src/gpgme.h
 # For VPATH builds we need to copy some files because Python's
 # distutils are not VPATH-aware.
 copystamp: $(srcdir)/pyme $(srcdir)/helpers.c $(srcdir)/helpers.h
-	if test "$(srcdir)" != "$(builddir)" ; then cp -a $^ . ; fi
+	if test "$(srcdir)" != "$(builddir)" ; then cp -r $^ . ; fi
 	touch $@
 
 gpgme_wrap.c pyme/pygpgme.py: gpgme.i gpgme.h copystamp

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

Summary of changes:
 configure.ac            | 7 +++----
 lang/python/Makefile.am | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)


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



From cvs at cvs.gnupg.org  Wed May 18 17:01:51 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 18 May 2016 17:01:51 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.12-9-ga69d3c1
Message-ID: <E1b32xL-00083x-29@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  a69d3c122c47ad8f857ab749e94b8b63e8d64623 (commit)
      from  cf97769906337d65289ad58225a5ecc53c715550 (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 a69d3c122c47ad8f857ab749e94b8b63e8d64623
Author: Werner Koch <wk at gnupg.org>
Date:   Wed May 18 17:00:03 2016 +0200

    gpg: Add --weak-digest to gpgv's help screen.
    
    --
    
    Suggested-by: Daniel Kahn Gillmor

diff --git a/g10/gpgv.c b/g10/gpgv.c
index 2a53e69..7e87176 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -79,7 +79,8 @@ static ARGPARSE_OPTS opts[] = {
                 N_("|FD|write status info to this FD")),
   ARGPARSE_s_i (oLoggerFD, "logger-fd", "@"),
   ARGPARSE_s_s (oHomedir, "homedir", "@"),
-  ARGPARSE_s_s (oWeakDigest, "weak-digest", "@"),
+  ARGPARSE_s_s (oWeakDigest, "weak-digest",
+                N_("|ALGO|reject signatures made with ALGO")),
 
   ARGPARSE_end ()
 };

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

Summary of changes:
 g10/gpgv.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


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



From cvs at cvs.gnupg.org  Thu May 19 11:16:28 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Thu, 19 May 2016 11:16:28 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-115-g2f748b5
Message-ID: <E1b3K2c-0005Rz-CU@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  2f748b5a2d162be4f23b18782219771ead54cb51 (commit)
      from  464d404c8816fc93baf945816c93e86bdeb0ea39 (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 2f748b5a2d162be4f23b18782219771ead54cb51
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu May 19 11:14:24 2016 +0200

    Qt: Check for graphviz and set HAVE_DOT correctly
    
    * configure.ac: Check for graphviz and define HAVE_DOT.
    * lang/qt/doc/Doxyfile.in (HAVE_DOT): Use variable.

diff --git a/configure.ac b/configure.ac
index 1472132..7559559 100644
--- a/configure.ac
+++ b/configure.ac
@@ -334,10 +334,20 @@ if test "$found" = "1"; then
             # This is not highlighted becase it's not really important.
             then AC_MSG_WARN([Doxygen not found - Qt binding doc will not be built.])
         fi
+        AC_CHECK_PROGS([GRAPHVIZ], [dot])
+        if test -z "$GRAPHVIZ";
+            then AC_MSG_WARN([Graphviz not found - Qt binding doc will not have diagrams.])
+        fi
     fi
 fi
 AM_CONDITIONAL([HAVE_DOXYGEN],
                [test -n "$DOXYGEN"])
+if test -n "$GRAPHVIZ"; then
+    HAVE_DOT="YES"
+else
+    HAVE_DOT="NO"
+fi
+AC_SUBST(HAVE_DOT)
 
 # Python bindings.
 LIST_MEMBER("python", $enabled_languages)
diff --git a/lang/qt/doc/Doxyfile.in b/lang/qt/doc/Doxyfile.in
index ef0a5c0..5d94f90 100644
--- a/lang/qt/doc/Doxyfile.in
+++ b/lang/qt/doc/Doxyfile.in
@@ -2087,7 +2087,7 @@ HIDE_UNDOC_RELATIONS   = YES
 # set to NO
 # The default value is: YES.
 
-HAVE_DOT               = YES
+HAVE_DOT               = @HAVE_DOT@
 
 # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
 # to run in parallel. When set to 0 doxygen will base this on the number of

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

Summary of changes:
 configure.ac            | 10 ++++++++++
 lang/qt/doc/Doxyfile.in |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)


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



From cvs at cvs.gnupg.org  Thu May 19 11:14:20 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Thu, 19 May 2016 11:14:20 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-114-g464d404
Message-ID: <E1b3K0Y-0005RS-ET@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  464d404c8816fc93baf945816c93e86bdeb0ea39 (commit)
       via  c1c893e3384a07ff864507902fbac4a7fee4d6f1 (commit)
       via  07f71cd17706093ca6b1507c41609356d479ae9f (commit)
      from  375523ead3a749d77d286c56f10d403c07f2b014 (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 464d404c8816fc93baf945816c93e86bdeb0ea39
Author: Justus Winter <justus at gnupg.org>
Date:   Wed May 18 15:33:36 2016 +0200

    python: Add more tests.
    
    * lang/python/tests/Makefile.am (py_tests): Add new tests.
    * lang/python/tests/support.py (print_data): New function.
    * lang/python/tests/t-decrypt.py: Use new function.
    * lang/python/tests/t-encrypt.py: Likewise.
    * lang/python/tests/t-sign.py: New file.
    * lang/python/tests/t-encrypt-sym.py: Likewise.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index 87fb8d1..c4fc602 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -31,6 +31,8 @@ TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) \
 py_tests = t-wrapper.py \
 	t-data.py \
 	t-encrypt.py \
+	t-encrypt-sym.py \
+	t-sign.py \
 	t-decrypt.py
 
 TESTS = $(top_srcdir)/tests/gpg/initial.test \
diff --git a/lang/python/tests/support.py b/lang/python/tests/support.py
index 36b3c88..a57d581 100644
--- a/lang/python/tests/support.py
+++ b/lang/python/tests/support.py
@@ -15,6 +15,7 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
+import sys
 import os
 from pyme import core
 
@@ -24,3 +25,8 @@ def make_filename(name):
 def init_gpgme(proto):
     core.check_version()
     core.engine_check_version(proto)
+
+def print_data(data):
+    if int(os.environ.get('verbose', 0)) > 1:
+        data.seek(0, os.SEEK_SET)
+        sys.stdout.buffer.write(data.read())
diff --git a/lang/python/tests/t-decrypt.py b/lang/python/tests/t-decrypt.py
index da62ba4..bd7b59f 100755
--- a/lang/python/tests/t-decrypt.py
+++ b/lang/python/tests/t-decrypt.py
@@ -17,8 +17,6 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-import sys
-import os
 from pyme import core, constants
 import support
 
@@ -33,5 +31,4 @@ result = c.op_decrypt_result()
 assert not result.unsupported_algorithm, \
     "Unsupported algorithm: {}".format(result.unsupported_algorithm)
 
-sink.seek(0, os.SEEK_SET)
-sys.stdout.buffer.write(sink.read())
+support.print_data(sink)
diff --git a/lang/python/tests/t-encrypt-sym.py b/lang/python/tests/t-encrypt-sym.py
new file mode 100755
index 0000000..0b24fd5
--- /dev/null
+++ b/lang/python/tests/t-encrypt-sym.py
@@ -0,0 +1,63 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2016 g10 Code GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME 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.
+#
+# GPGME 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 program; if not, see <http://www.gnu.org/licenses/>.
+
+import os
+from pyme import core, constants
+import support
+
+support.init_gpgme(constants.PROTOCOL_OpenPGP)
+
+for passphrase in ("abc", b"abc"):
+    c = core.Context()
+    c.set_armor(True)
+    c.set_pinentry_mode(constants.PINENTRY_MODE_LOOPBACK)
+
+    source = core.Data("Hallo Leute\n")
+    cipher = core.Data()
+
+    passphrase_cb_called = 0
+    def passphrase_cb(hint, desc, prev_bad, hook=None):
+        global passphrase_cb_called
+        passphrase_cb_called += 1
+        return passphrase
+
+    c.set_passphrase_cb(passphrase_cb, None)
+
+    c.op_encrypt([], 0, source, cipher)
+    assert passphrase_cb_called == 1, \
+        "Callback called {} times".format(passphrase_cb_called)
+    support.print_data(cipher)
+
+    c = core.Context()
+    c.set_armor(True)
+    c.set_pinentry_mode(constants.PINENTRY_MODE_LOOPBACK)
+    c.set_passphrase_cb(passphrase_cb, None)
+    plain = core.Data()
+    cipher.seek(0, os.SEEK_SET)
+
+    c.op_decrypt(cipher, plain)
+    # Seems like the passphrase is cached.
+    #assert passphrase_cb_called == 2, \
+    #    "Callback called {} times".format(passphrase_cb_called)
+    support.print_data(plain)
+
+    plain.seek(0, os.SEEK_SET)
+    plaintext = plain.read()
+    assert plaintext == b"Hallo Leute\n", \
+        "Wrong plaintext {!r}".format(plaintext)
diff --git a/lang/python/tests/t-encrypt.py b/lang/python/tests/t-encrypt.py
index 3bed752..24869fc 100755
--- a/lang/python/tests/t-encrypt.py
+++ b/lang/python/tests/t-encrypt.py
@@ -17,8 +17,6 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-import sys
-import os
 from pyme import core, constants
 import support
 
@@ -38,5 +36,4 @@ result = c.op_encrypt_result()
 assert not result.invalid_recipients, \
     "Invalid recipient encountered: {}".format(result.invalid_recipients.fpr)
 
-sink.seek(0, os.SEEK_SET)
-sys.stdout.buffer.write(sink.read())
+support.print_data(sink)
diff --git a/lang/python/tests/t-sign.py b/lang/python/tests/t-sign.py
new file mode 100755
index 0000000..a721f03
--- /dev/null
+++ b/lang/python/tests/t-sign.py
@@ -0,0 +1,84 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2016 g10 Code GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME 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.
+#
+# GPGME 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 program; if not, see <http://www.gnu.org/licenses/>.
+
+import sys
+import os
+from pyme import core, constants
+import support
+
+def check_result(r, typ):
+    if r.invalid_signers:
+        sys.exit("Invalid signer found: {}".format(r.invalid_signers.fpr))
+
+    if len(r.signatures) != 1:
+        sys.exit("Unexpected number of signatures created")
+
+    signature = r.signatures[0]
+    if signature.type != typ:
+        sys.exit("Wrong type of signature created")
+
+    if signature.pubkey_algo != constants.PK_DSA:
+        sys.exit("Wrong pubkey algorithm reported: {}".format(
+            signature.pubkey_algo))
+
+    if signature.hash_algo != constants.MD_SHA1:
+        sys.exit("Wrong hash algorithm reported: {}".format(
+            signature.hash_algo))
+
+    if signature.sig_class != 1:
+        sys.exit("Wrong signature class reported: {}".format(
+            signature.sig_class))
+
+    if signature.fpr != "A0FF4590BB6122EDEF6E3C542D727CC768697734":
+        sys.exit("Wrong fingerprint reported: {}".format(signature.fpr))
+
+
+support.init_gpgme(constants.PROTOCOL_OpenPGP)
+c = core.Context()
+c.set_textmode(True)
+c.set_armor(True)
+
+source = core.Data("Hallo Leute\n")
+sink = core.Data()
+
+c.op_sign(source, sink, constants.SIG_MODE_NORMAL)
+
+result = c.op_sign_result()
+check_result(result, constants.SIG_MODE_NORMAL)
+support.print_data(sink)
+
+# Now a detached signature.
+source.seek(0, os.SEEK_SET)
+sink = core.Data()
+
+c.op_sign(source, sink, constants.SIG_MODE_DETACH)
+
+result = c.op_sign_result()
+check_result(result, constants.SIG_MODE_DETACH)
+support.print_data(sink)
+
+# And finally a cleartext signature.  */
+source.seek(0, os.SEEK_SET)
+sink = core.Data()
+
+c.op_sign(source, sink, constants.SIG_MODE_CLEAR)
+
+result = c.op_sign_result()
+check_result(result, constants.SIG_MODE_CLEAR)
+support.print_data(sink)

commit c1c893e3384a07ff864507902fbac4a7fee4d6f1
Author: Justus Winter <justus at gnupg.org>
Date:   Thu May 19 10:55:34 2016 +0200

    python: More type conversion fixes.
    
    * lang/python/helpers.c (pyPassphraseCb): Cope with 'uid_hint' being
    NULL, convert it to an Unicode object, and cope with the callback
    returning both Unicode and bytes objects.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/helpers.c b/lang/python/helpers.c
index 285b1da..447a29f 100644
--- a/lang/python/helpers.c
+++ b/lang/python/helpers.c
@@ -82,7 +82,15 @@ static gpgme_error_t pyPassphraseCb(void *hook,
     args = PyTuple_New(3);
   }
 
-  PyTuple_SetItem(args, 0, PyBytes_FromString(uid_hint));
+  if (uid_hint == NULL)
+    {
+      Py_INCREF(Py_None);
+      PyTuple_SetItem(args, 0, Py_None);
+    }
+  else
+    PyTuple_SetItem(args, 0, PyUnicode_DecodeUTF8(uid_hint, strlen (uid_hint),
+                                                  "strict"));
+
   PyTuple_SetItem(args, 1, PyBytes_FromString(passphrase_info));
   PyTuple_SetItem(args, 2, PyBool_FromLong((long)prev_was_bad));
   if (dataarg) {
@@ -98,7 +106,21 @@ static gpgme_error_t pyPassphraseCb(void *hook,
     if (!retval) {
       write(fd, "\n", 1);
     } else {
-      write(fd, PyBytes_AsString(retval), PyBytes_Size(retval));
+      char *buf;
+      size_t len;
+      if (PyBytes_Check(retval))
+        buf = PyBytes_AsString(retval), len = PyBytes_Size(retval);
+      else if (PyUnicode_Check(retval))
+        buf = PyUnicode_AsUTF8AndSize(retval, &len);
+      else
+        {
+          PyErr_Format(PyExc_TypeError,
+                       "expected str or bytes from passphrase callback, got %s",
+                       retval->ob_type->tp_name);
+          return gpg_error(GPG_ERR_GENERAL);
+        }
+
+      write(fd, buf, len);
       write(fd, "\n", 1);
       Py_DECREF(retval);
     }

commit 07f71cd17706093ca6b1507c41609356d479ae9f
Author: Justus Winter <justus at gnupg.org>
Date:   Thu May 19 10:49:43 2016 +0200

    python: Fix import.
    
    * lang/python/helpers.c (pygpgme_exception_init): Make module import
    relative.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/helpers.c b/lang/python/helpers.c
index 96c844f..285b1da 100644
--- a/lang/python/helpers.c
+++ b/lang/python/helpers.c
@@ -29,7 +29,10 @@ static PyObject *GPGMEError = NULL;
 void pygpgme_exception_init(void) {
   if (GPGMEError == NULL) {
     PyObject *errors;
-    errors = PyImport_ImportModule("errors");
+    PyObject *from_list = PyList_New(0);
+    errors = PyImport_ImportModuleLevel("errors", PyEval_GetGlobals(),
+                                        PyEval_GetLocals(), from_list, 1);
+    Py_XDECREF(from_list);
     if (errors) {
       GPGMEError=PyDict_GetItemString(PyModule_GetDict(errors), "GPGMEError");
       Py_XINCREF(GPGMEError);

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

Summary of changes:
 lang/python/helpers.c              | 31 ++++++++++++--
 lang/python/tests/Makefile.am      |  2 +
 lang/python/tests/support.py       |  6 +++
 lang/python/tests/t-decrypt.py     |  5 +--
 lang/python/tests/t-encrypt-sym.py | 63 ++++++++++++++++++++++++++++
 lang/python/tests/t-encrypt.py     |  5 +--
 lang/python/tests/t-sign.py        | 84 ++++++++++++++++++++++++++++++++++++++
 7 files changed, 185 insertions(+), 11 deletions(-)
 create mode 100755 lang/python/tests/t-encrypt-sym.py
 create mode 100755 lang/python/tests/t-sign.py


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



From cvs at cvs.gnupg.org  Thu May 19 10:59:10 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Thu, 19 May 2016 10:59:10 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-111-g375523e
Message-ID: <E1b3Jls-0004xu-Nb@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  375523ead3a749d77d286c56f10d403c07f2b014 (commit)
      from  2c3a5d93e78cfca22785e51c5a65184a47da4bff (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 375523ead3a749d77d286c56f10d403c07f2b014
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu May 19 10:56:49 2016 +0200

    Qt: Fix compilation of unit tests
    
    * lang/qt/tests/Makefile.am (AM_CPPFLAGS): Add -DBUILDING_QGPGME.
    
    --
    Without building QGpgME the headers of gpgme++ are not included
    corretly and taken from an already installed gpgme++.

diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
index 4a14e63..7658a73 100644
--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
@@ -36,7 +36,7 @@ LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgme.la \
 
 AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@ \
               @GPGME_QT_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \
-              @GPGME_QTTEST_CFLAGS@ \
+              @GPGME_QTTEST_CFLAGS@ -DBUILDING_QGPGME \
               -I$(top_srcdir)/lang/cpp/src -I$(top_srcdir)/lang/qt/src \
               -DTOP_SRCDIR="$(top_srcdir)"
 

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

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  Thu May 19 10:39:29 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Thu, 19 May 2016 10:39:29 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. 16899f0f6433fdde3a70b8026f1ca91d53dc89c7
Message-ID: <E1b3JSq-0003sx-7B@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  16899f0f6433fdde3a70b8026f1ca91d53dc89c7 (commit)
      from  8b3deef9012abc8da5814eb5e3ed46c0a5448a0f (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 16899f0f6433fdde3a70b8026f1ca91d53dc89c7
Author: Justus Winter <justus at gnupg.org>
Date:   Fri Apr 22 16:53:55 2016 +0200

    blog: New entry

diff --git a/misc/blog.gnupg.org/20160519-gnupg-in-2016.org b/misc/blog.gnupg.org/20160519-gnupg-in-2016.org
new file mode 100644
index 0000000..90443cf
--- /dev/null
+++ b/misc/blog.gnupg.org/20160519-gnupg-in-2016.org
@@ -0,0 +1,147 @@
+# GnuPG in 2016
+#+STARTUP: showall
+#+AUTHOR: Justus
+#+DATE: May 19th, 2016
+#+Keywords: Presentation
+
+** GnuPG in 2016
+
+This is an overview of what happened in the first half of 2016 in the
+GnuPG project and community.
+
+*** Development
+
+There has been one release of the current stable branch of GnuPG,
+version [[https://lists.gnupg.org/pipermail/gnupg-announce/2016q1/000385.html][2.0.30]].  Our development branch GnuPG modern saw two releases,
+[[https://lists.gnupg.org/pipermail/gnupg-announce/2016q1/000383.html][2.1.11]], and [[https://lists.gnupg.org/pipermail/gnupg-announce/2016q2/000387.html][2.1.12]].
+
+Among many bugfixes and other improvements GnuPG 2.1.11 added a new
+command ~--export-ssh-key~ that replaces the ~gpgkey2ssh~ tool, and we
+now use the CA certificate of ~hkps.pool.sks-keyservers.net~ to secure
+communications with the servers in the pool without further
+configuration.  Furthermore, we now print a warning if a GnuPG
+component is using an older version of our backend daemons.
+
+2.1.12 brought support for a new experimental "Web Key Directory" key
+location service, read-support for a new private key protection format
+and the new extended private key format, improved Tofu support, use of
+the new libusb 1.0 API, and countless small features and fixes.
+
+
+Daniel Genkin, Lev Pachmanov, Itamar Pipman, and Eran Tromer from the
+Tel Aviv University demonstrated a practical way to extract ECDH keys
+via low-bandwidth electromagnetic attacks on PCs[fn:1].  Libgcrypt
+version 1.6.5 and an updated Windows installer for GnuPG 2.1.11 has
+been [[https://lists.gnupg.org/pipermail/gnupg-announce/2016q1/000384.html][released]] to mitigate this attack.
+
+In April we released a new stable version of Libgcrypt, version [[https://lists.gnupg.org/pipermail/gnupg-announce/2016q2/000386.html][1.7]].
+It retains full API and ABI compatibiliy to the 1.6 series.  Its main
+features are new algorithms, curves, and performance improvements.
+
+
+Andre worked on PGP/MIME support in GpgOL, and the current stable
+version [[http://lists.wald.intevation.org/pipermail/gpg4win-announce/2016-April/000068.html][2.3.1]] of Gpg4win includes an option to enable experimental
+support for sending GPG/MIME and S/MIME.  He also worked on Kleopatra,
+removing some dependencies on KDE components and DBUS, and porting it
+to newer KDE frameworks, making it easier to build, maintain and hack.
+A [[https://wiki.gnupg.org/Gpg4win/Testversions][beta version]] of Gpg4win 3.0.0 has been released featuring the leaner
+Kleopatra with newer KDE libraries.  Andre also worked on registering
+file extensions in Windows integrating encryption and decryption of
+files into the desktop environment, and implementing a 'Show Password'
+feature for the pinentries.
+
+
+Jussi worked on libgcrypt, most notably [[https://lists.gnupg.org/pipermail/gcrypt-devel/2016-January/003671.html][adding]] an ARM assembly
+implementation of SHA-512, and Intel PCMUL implementations for CRC
+algorithms.
+
+
+Justus worked on a new [[https://lists.gnupg.org/pipermail/gnupg-devel/2016-April/031027.html][test framework]] for GnuPG and related projects,
+a new [[https://lists.gnupg.org/pipermail/gnupg-devel/2016-April/031001.html][extensible storage format]] for private keys, [[https://www.libssh.org/archive/libssh/2016-03/0000058.html][implemented]]
+elliptic-curve cryptography in libssh using libgcrypt as backend, and
+triaged and fixed GnuPG bugs.
+
+
+Kai evaluated Mailpile.  As the future of Mozilla Thunderbird - and
+with it Enigmails - is uncertain, we decided to explore alternative
+end-user-friendly mail clients with support for GnuPG.
+
+
+Gniibe worked on GnuPG and libgcrypt.  He ported GnuPG's ~scdaemon~ to
+libusb 1.0, and worked with the team from Tel Aviv University to
+protect libgcrypt against the sidechannel attack.  Gniibe also
+maintains GnuPG-related packages in Debian.  He updated both [[https://tracker.debian.org/pkg/poldi][Poldi]] and
+[[https://tracker.debian.org/pkg/scute][Scute]].  Gniibe designs and sells the FST-1, a small microcontroller
+that depending on the firmware either acts as an OpenPGP smart card or
+a hardware random number generator.  As the stock is running low and
+some components cannot be sourced any longer, he is [[http://www.gniibe.org/memo/development/fs-bb48/fs-bb48-idea.html][working]] on the
+successor featuring a simpler design, a button, and support for
+elliptic curve cryptography.
+
+*** Press
+
+Werner received the [[https://www.fsf.org/news/library-freedom-project-and-werner-koch-are-2015-free-software-awards-winners][Award for the Advancement of Free Software]] for his
+work on GnuPG.
+
+*** Discussions
+
+Andre [[http://lists.gnupg.org/pipermail/gnupg-users/2016-January/054943.html][asked]] how to obtain a key in a format suitable for SSH's
+~authorized_keys~ file from an OpenPGP public certificate now that
+~gpgkey2ssh~ has been deprecated.  The discussion was [[https://bugs.gnupg.org/gnupg/issue2212][taken to the bug
+tracker]], and a solution released with GnuPG 2.1.11.
+
+Lachlan J. Gunn, Andrew Allison, and Derek Abbott wrote a paper about
+how Tor can be used to detect malicious key servers[fn:2].  The
+[[http://lists.gnupg.org/pipermail/gnupg-users/2016-February/055326.html][announcement]] contains more information including a link to their
+implementation.
+
+Daniel [[https://lists.gnupg.org/pipermail/gnupg-users/2016-April/055819.html][reported]] that there have been discussions on building a Live-CD
+for securely managing OpenPGP master keys and smart cards over at
+debian-devel, and he asked if anyone knows about such an effort, or
+has comments on his proposal.  The discussion went into all kinds of
+directions, but the consensus was that this is a useful idea.
+
+Bernhard [[https://lists.gnupg.org/pipermail/gnupg-devel/2016-May/031042.html][wrote]] about work being done for the EasyGpg2016 project.
+They produced [[https://wiki.gnupg.org/EasyGpg2016/VisionAndStories][user archetypes and stories]] that should guide the
+refinement of GnuPG and related tools, and a [[https://wiki.gnupg.org/EasyGpg2016/CertDistributionConcept][key distribution concept]].
+
+*** Donations
+
+We received this year until now about 90 donations summing up to 3000
+Euro.  Thanks for that help.  Sure, that is not enough to pay our
+costs, but fortunately we still have enough money in our accounts to
+keep bread, water, and beer on our tables for this year and somewhat
+longer.  We will eventually run a new donation campaign, though.
+
+It is probably less know that that we offer SEPA payments which can be
+used for recurring donations.  We have not received many payments
+through SEPA yet and thus this method is only semi-automated and the
+cause for delays between a donation and a confirmation mail.  There is
+an obvious way to make us automate this ;-)
+
+Lastly, let us confirm that we were meanwhile able to clarify our
+perceived problem with the Facebook donation promise.  This was all
+due to an unfortunate misunderstanding between us.  Facebook will keep
+on supporting GnuPG in 2016 with a donation of 50000 USD.
+
+** About this news posting
+
+We try to write a news posting each month (though we must admit that
+we slipped a little in 2016).  However, other work may have a higher
+priority (e.g. security fixes) and thus there is no promise for a
+fixed publication date.  If you have an interesting topic for a news
+posting, please send it to us.  A regular summary of the mailing list
+discussions would make a nice column on this news.
+
+* Footnotes
+
+[fn:1] Daniel Genkin, Lev Pachmanov, Itamar Pipman, Eran Tromer, ECDH
+       key-extraction via low-bandwidth electromagnetic attacks on
+       PCs, proc. RSA Conference Cryptographers' Track (CT-RSA) 2016,
+       LNCS 9610, 219-235, Springer, 2016,
+       https://www.cs.tau.ac.il/~tromer/ecdh/
+
+[fn:2] Lachlan J. Gunn, Andrew Allison, Derek Abbott, Verifying public
+       keys without trust: How anonymity can guarantee data integrity,
+       arXiv preprint arXiv:1602.03316, 2016,
+       http://arxiv.org/pdf/1602.03316v1.pdf

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

Summary of changes:
 misc/blog.gnupg.org/20160519-gnupg-in-2016.org | 147 +++++++++++++++++++++++++
 1 file changed, 147 insertions(+)
 create mode 100644 misc/blog.gnupg.org/20160519-gnupg-in-2016.org


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



From cvs at cvs.gnupg.org  Thu May 19 11:46:26 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Thu, 19 May 2016 11:46:26 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. 099e03a0bd0cdc7f69eb1f590565e5f35f99d313
Message-ID: <E1b3KVc-00077Z-O9@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  099e03a0bd0cdc7f69eb1f590565e5f35f99d313 (commit)
      from  16899f0f6433fdde3a70b8026f1ca91d53dc89c7 (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 099e03a0bd0cdc7f69eb1f590565e5f35f99d313
Author: Werner Koch <wk at gnupg.org>
Date:   Thu May 19 11:45:02 2016 +0200

    web: Added CSS rules for footnotes and fixed two errors.

diff --git a/web/share/site.css b/web/share/site.css
index 16989b9..26aea64 100644
--- a/web/share/site.css
+++ b/web/share/site.css
@@ -202,7 +202,6 @@ div.entry-qotd {
 #header a.logo:hover img {
     background: transparent;
     opacity: 0.4;
-    filter: alpha(opacity=40); /* For IE8 and earlier */
 }
 #header a,
 #header a:hover {
@@ -577,6 +576,21 @@ td.wideright  {
 }
 
 
+/* Footnotes for org-mode.  */
+
+h2.footnotes {
+    font-size: 100%;
+}
+
+#footnotes {
+    font-size: 75%;
+}
+
+.footnum {
+  font-size: 1em;
+  float: left;
+}
+
 /* Tag cloudlist.  */
 
 #tagcloudlist ul {
@@ -639,7 +653,7 @@ td.wideright  {
 
 .footerbox p {
     margin-top: 0px;
-    margin-bottom 0px;
+    margin-bottom: 0px;
     clear: both;
 }
 

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

Summary of changes:
 web/share/site.css | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)


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



From cvs at cvs.gnupg.org  Thu May 19 16:09:36 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Thu, 19 May 2016 16:09:36 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-117-g0d4e956
Message-ID: <E1b3OcI-0004B8-GZ@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  0d4e95621e05d50cd454049a424bb9ee098a5db6 (commit)
       via  d90857a08c4fe5b73b6d6d46fd6200efdd72db44 (commit)
      from  2f748b5a2d162be4f23b18782219771ead54cb51 (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 0d4e95621e05d50cd454049a424bb9ee098a5db6
Author: Justus Winter <justus at gnupg.org>
Date:   Thu May 19 15:53:19 2016 +0200

    python: Improve progress callbacks.
    
    * lang/python/helpers.c (pyProgressCb): Stash python errors, convert
    'what' to Unicode object.
    * lang/python/pyme/core.py (Context.set_progress_cb): Hand in 'self'.
    * lang/python/tests/t-callbacks.py: Test progress callbacks.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/helpers.c b/lang/python/helpers.c
index c3cf3b3..7ced04a 100644
--- a/lang/python/helpers.c
+++ b/lang/python/helpers.c
@@ -229,17 +229,25 @@ static void pyProgressCb(void *hook, const char *what, int type, int current,
 			 int total) {
   PyObject *func = NULL, *dataarg = NULL, *args = NULL, *retval = NULL;
   PyObject *pyhook = (PyObject *) hook;
+  PyObject *self = NULL;
 
-  if (PyTuple_Check(pyhook)) {
-    func = PyTuple_GetItem(pyhook, 0);
+  assert (PyTuple_Check(pyhook));
+  self = PyTuple_GetItem(pyhook, 0);
+  func = PyTuple_GetItem(pyhook, 1);
+  if (PyTuple_Size(pyhook) == 3) {
     dataarg = PyTuple_GetItem(pyhook, 1);
     args = PyTuple_New(5);
   } else {
-    func = pyhook;
     args = PyTuple_New(4);
   }
 
-  PyTuple_SetItem(args, 0, PyBytes_FromString(what));
+  PyTuple_SetItem(args, 0, PyUnicode_DecodeUTF8(what, strlen (what),
+                                                "strict"));
+  if (PyErr_Occurred()) {
+    pygpgme_stash_callback_exception(self);
+    Py_DECREF(args);
+    return;
+  }
   PyTuple_SetItem(args, 1, PyLong_FromLong((long) type));
   PyTuple_SetItem(args, 2, PyLong_FromLong((long) current));
   PyTuple_SetItem(args, 3, PyLong_FromLong((long) total));
@@ -249,6 +257,8 @@ static void pyProgressCb(void *hook, const char *what, int type, int current,
   }
 
   retval = PyObject_CallObject(func, args);
+  if (PyErr_Occurred())
+    pygpgme_stash_callback_exception(self);
   Py_DECREF(args);
   Py_XDECREF(retval);
 }
diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py
index 8a4c197..9e7faf7 100644
--- a/lang/python/pyme/core.py
+++ b/lang/python/pyme/core.py
@@ -185,9 +185,9 @@ class Context(GpgmeWrapper):
         else:
             self.last_progresscb = pygpgme.new_PyObject_p_p()
             if hook == None:
-                hookdata = func
+                hookdata = (self, func)
             else:
-                hookdata = (func, hook)
+                hookdata = (self, func, hook)
         pygpgme.pygpgme_set_progress_cb(self.wrapped, hookdata, self.last_progresscb)
 
     def get_engine_info(self):
diff --git a/lang/python/tests/t-callbacks.py b/lang/python/tests/t-callbacks.py
index e89fcb8..bd88d86 100755
--- a/lang/python/tests/t-callbacks.py
+++ b/lang/python/tests/t-callbacks.py
@@ -75,3 +75,41 @@ except Exception as e:
     assert type(e) == TypeError
 else:
     assert False, "Expected an error, got none"
+
+
+
+# Test the progress callback.
+parms = """<GnupgKeyParms format="internal">
+Key-Type: RSA
+Key-Length: 1024
+Name-Real: Joe Tester
+Name-Comment: with stupid passphrase
+Name-Email: joe+pyme at example.org
+Passphrase: Crypt0R0cks
+Expire-Date: 2020-12-31
+</GnupgKeyParms>
+"""
+
+messages = []
+def progress_cb(what, typ, current, total, hook=None):
+    messages.append(
+        "PROGRESS UPDATE: what = {}, type = {}, current = {}, total = {}"
+        .format(what, typ, current, total))
+
+c = core.Context()
+c.set_progress_cb(progress_cb, None)
+c.op_genkey(parms, None, None)
+assert len(messages) > 0
+
+# Test exception handling.
+def progress_cb(what, typ, current, total, hook=None):
+    raise myException
+
+c = core.Context()
+c.set_progress_cb(progress_cb, None)
+try:
+    c.op_genkey(parms, None, None)
+except Exception as e:
+    assert e == myException
+else:
+    assert False, "Expected an error, got none"

commit d90857a08c4fe5b73b6d6d46fd6200efdd72db44
Author: Justus Winter <justus at gnupg.org>
Date:   Thu May 19 11:03:27 2016 +0200

    python: Robust exception handling in callbacks.
    
    * lang/python/helpers.c (pygpgme_stash_callback_exception): New
    function.
    (pygpgme_raise_callback_exception): Likewise.
    (pyPassphraseCb): Stash python errors.
    * lang/python/helpers.h (pygpgme_raise_callback_exception): New
    prototype.
    * lang/python/pyme/core.py ({Context,Data}.__init__): Move common
    initialization to superclass.
    (Context.set_progress_cb): Hand in 'self'.
    * lang/python/pyme/util.py (GpgmeWrapper.__init__): New function.
    (GpgmeWrapper.__getattr__): Raise stashed exceptions.
    * lang/python/tests/Makefile.am (py_tests): Add new test.
    * lang/python/tests/t-callbacks.py: New file.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/helpers.c b/lang/python/helpers.c
index 447a29f..c3cf3b3 100644
--- a/lang/python/helpers.c
+++ b/lang/python/helpers.c
@@ -17,6 +17,8 @@
 #    License along with this library; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 */
+
+#include <assert.h>
 #include <stdio.h>
 #include <gpgme.h>
 #include <stdlib.h>
@@ -59,12 +61,84 @@ void pygpgme_clear_generic_cb(PyObject **cb) {
   Py_DECREF(*cb);
 }
 
+/* Exception support for callbacks.  */
+#define EXCINFO	"_callback_excinfo"
+
+static void pygpgme_stash_callback_exception(PyObject *self)
+{
+  PyObject *ptype, *pvalue, *ptraceback, *excinfo;
+
+  PyErr_Fetch(&ptype, &pvalue, &ptraceback);
+  excinfo = PyTuple_New(3);
+  PyTuple_SetItem(excinfo, 0, ptype);
+
+  if (pvalue)
+    PyTuple_SetItem(excinfo, 1, pvalue);
+  else {
+    Py_INCREF(Py_None);
+    PyTuple_SetItem(excinfo, 1, Py_None);
+  }
+
+  if (ptraceback)
+    PyTuple_SetItem(excinfo, 2, ptraceback);
+  else {
+    Py_INCREF(Py_None);
+    PyTuple_SetItem(excinfo, 2, Py_None);
+  }
+
+  PyObject_SetAttrString(self, EXCINFO, excinfo);
+}
+
+PyObject *pygpgme_raise_callback_exception(PyObject *self)
+{
+  PyObject *ptype, *pvalue, *ptraceback, *excinfo;
+
+  if (! PyObject_HasAttrString(self, EXCINFO))
+    goto leave;
+
+  excinfo = PyObject_GetAttrString(self, EXCINFO);
+  if (! PyTuple_Check(excinfo))
+    {
+      Py_DECREF(excinfo);
+      goto leave;
+    }
+
+  ptype = PyTuple_GetItem(excinfo, 0);
+  Py_INCREF(excinfo);
+
+  pvalue = PyTuple_GetItem(excinfo, 1);
+  if (pvalue == Py_None)
+    pvalue = NULL;
+  else
+    Py_INCREF(pvalue);
+
+  ptraceback = PyTuple_GetItem(excinfo, 2);
+  if (ptraceback == Py_None)
+    ptraceback = NULL;
+  else
+    Py_INCREF(ptraceback);
+
+  Py_DECREF(excinfo);
+  PyErr_Restore(ptype, pvalue, ptraceback);
+
+  Py_INCREF(Py_None);
+  PyObject_SetAttrString(self, EXCINFO, Py_None);
+
+  return NULL; /* Raise exception.  */
+
+ leave:
+  Py_INCREF(Py_None);
+  return Py_None;
+}
+#undef EXCINFO
+
 static gpgme_error_t pyPassphraseCb(void *hook,
 				    const char *uid_hint,
 				    const char *passphrase_info,
 				    int prev_was_bad,
 				    int fd) {
   PyObject *pyhook = (PyObject *) hook;
+  PyObject *self = NULL;
   PyObject *func = NULL;
   PyObject *args = NULL;
   PyObject *retval = NULL;
@@ -73,12 +147,13 @@ static gpgme_error_t pyPassphraseCb(void *hook,
 
   pygpgme_exception_init();
 
-  if (PyTuple_Check(pyhook)) {
-    func = PyTuple_GetItem(pyhook, 0);
-    dataarg = PyTuple_GetItem(pyhook, 1);
+  assert (PyTuple_Check(pyhook));
+  self = PyTuple_GetItem(pyhook, 0);
+  func = PyTuple_GetItem(pyhook, 1);
+  if (PyTuple_Size(pyhook) == 3) {
+    dataarg = PyTuple_GetItem(pyhook, 2);
     args = PyTuple_New(4);
   } else {
-    func = pyhook;
     args = PyTuple_New(3);
   }
 
@@ -90,6 +165,11 @@ static gpgme_error_t pyPassphraseCb(void *hook,
   else
     PyTuple_SetItem(args, 0, PyUnicode_DecodeUTF8(uid_hint, strlen (uid_hint),
                                                   "strict"));
+  if (PyErr_Occurred()) {
+    Py_DECREF(args);
+    err_status = gpg_error(GPG_ERR_GENERAL);
+    goto leave;
+  }
 
   PyTuple_SetItem(args, 1, PyBytes_FromString(passphrase_info));
   PyTuple_SetItem(args, 2, PyBool_FromLong((long)prev_was_bad));
@@ -117,7 +197,8 @@ static gpgme_error_t pyPassphraseCb(void *hook,
           PyErr_Format(PyExc_TypeError,
                        "expected str or bytes from passphrase callback, got %s",
                        retval->ob_type->tp_name);
-          return gpg_error(GPG_ERR_GENERAL);
+          err_status = gpg_error(GPG_ERR_GENERAL);
+          goto leave;
         }
 
       write(fd, buf, len);
@@ -126,6 +207,10 @@ static gpgme_error_t pyPassphraseCb(void *hook,
     }
   }
 
+ leave:
+  if (err_status)
+    pygpgme_stash_callback_exception(self);
+
   return err_status;
 }
 
diff --git a/lang/python/helpers.h b/lang/python/helpers.h
index 12d7cfa..81d17ff 100644
--- a/lang/python/helpers.h
+++ b/lang/python/helpers.h
@@ -30,6 +30,7 @@ void pygpgme_exception_init(void);
 gpgme_error_t pygpgme_exception2code(void);
 
 void pygpgme_clear_generic_cb(PyObject **cb);
+PyObject *pygpgme_raise_callback_exception(PyObject *self);
 
 void pygpgme_set_passphrase_cb(gpgme_ctx_t ctx, PyObject *cb,
 			       PyObject **freelater);
diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py
index 2a0ca07..8a4c197 100644
--- a/lang/python/pyme/core.py
+++ b/lang/python/pyme/core.py
@@ -54,14 +54,14 @@ class Context(GpgmeWrapper):
 
     def __init__(self, wrapped=None):
         if wrapped:
-            self.wrapped = wrapped
             self.own = False
         else:
             tmp = pygpgme.new_gpgme_ctx_t_p()
             errorcheck(pygpgme.gpgme_new(tmp))
-            self.wrapped = pygpgme.gpgme_ctx_t_p_value(tmp)
+            wrapped = pygpgme.gpgme_ctx_t_p_value(tmp)
             pygpgme.delete_gpgme_ctx_t_p(tmp)
             self.own = True
+        super().__init__(wrapped)
         self.last_passcb = None
         self.last_progresscb = None
 
@@ -167,9 +167,9 @@ class Context(GpgmeWrapper):
         else:
             self.last_passcb = pygpgme.new_PyObject_p_p()
             if hook == None:
-                hookdata = func
+                hookdata = (self, func)
             else:
-                hookdata = (func, hook)
+                hookdata = (self, func, hook)
         pygpgme.pygpgme_set_passphrase_cb(self.wrapped, hookdata, self.last_passcb)
 
     def set_progress_cb(self, func, hook=None):
@@ -282,7 +282,7 @@ class Data(GpgmeWrapper):
         that file.
 
         Any other use will result in undefined or erroneous behavior."""
-        self.wrapped = None
+        super().__init__(None)
         self.last_readcb = None
 
         if cbs != None:
diff --git a/lang/python/pyme/util.py b/lang/python/pyme/util.py
index 3c34c79..b54cd4d 100644
--- a/lang/python/pyme/util.py
+++ b/lang/python/pyme/util.py
@@ -32,6 +32,11 @@ def process_constants(starttext, dict):
 class GpgmeWrapper(object):
     """Base class all Pyme wrappers for GPGME functionality.  Not to be
     instantiated directly."""
+
+    def __init__(self, wrapped):
+        self._callback_excinfo = None
+        self.wrapped = wrapped
+
     def __repr__(self):
         return '<instance of %s.%s with GPG object at %s>' % \
                (__name__, self.__class__.__name__,
@@ -78,11 +83,16 @@ class GpgmeWrapper(object):
 
         if self._errorcheck(name):
             def _funcwrap(slf, *args, **kwargs):
-                return errorcheck(func(slf.wrapped, *args, **kwargs),
-                                  "Invocation of " + name)
+                result = func(slf.wrapped, *args, **kwargs)
+                if slf._callback_excinfo:
+                    pygpgme.pygpgme_raise_callback_exception(slf)
+                return errorcheck(result, "Invocation of " + name)
         else:
             def _funcwrap(slf, *args, **kwargs):
-                return func(slf.wrapped, *args, **kwargs)
+                result = func(slf.wrapped, *args, **kwargs)
+                if slf._callback_excinfo:
+                    pygpgme.pygpgme_raise_callback_exception(slf)
+                return result
 
         _funcwrap.__doc__ = getattr(func, "__doc__")
 
diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index c4fc602..30f1aec 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -29,6 +29,7 @@ TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) \
 	PYTHONPATH=`echo $(abs_builddir)/../build/lib.*`
 
 py_tests = t-wrapper.py \
+	t-callbacks.py \
 	t-data.py \
 	t-encrypt.py \
 	t-encrypt-sym.py \
diff --git a/lang/python/tests/t-callbacks.py b/lang/python/tests/t-callbacks.py
new file mode 100755
index 0000000..e89fcb8
--- /dev/null
+++ b/lang/python/tests/t-callbacks.py
@@ -0,0 +1,77 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2016 g10 Code GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME 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.
+#
+# GPGME 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 program; if not, see <http://www.gnu.org/licenses/>.
+
+import os
+from pyme import core, constants
+import support
+
+support.init_gpgme(constants.PROTOCOL_OpenPGP)
+
+c = core.Context()
+c.set_pinentry_mode(constants.PINENTRY_MODE_LOOPBACK)
+
+source = core.Data("Hallo Leute\n")
+sink = core.Data()
+
+# Valid passphrases, both as string and bytes.
+for passphrase in ('foo', b'foo'):
+    def passphrase_cb(hint, desc, prev_bad, hook=None):
+        assert hook == passphrase
+        return hook
+
+    c.set_passphrase_cb(passphrase_cb, passphrase)
+    c.op_encrypt([], 0, source, sink)
+
+# Returning an invalid type.
+def passphrase_cb(hint, desc, prev_bad, hook=None):
+    return 0
+
+c.set_passphrase_cb(passphrase_cb, None)
+try:
+    c.op_encrypt([], 0, source, sink)
+except Exception as e:
+    assert type(e) == TypeError
+    assert str(e) == "expected str or bytes from passphrase callback, got int"
+else:
+    assert False, "Expected an error, got none"
+
+# Raising an exception inside callback.
+myException = Exception()
+def passphrase_cb(hint, desc, prev_bad, hook=None):
+    raise myException
+
+c.set_passphrase_cb(passphrase_cb, None)
+try:
+    c.op_encrypt([], 0, source, sink)
+except Exception as e:
+    assert e == myException
+else:
+    assert False, "Expected an error, got none"
+
+# Wrong kind of callback function.
+def bad_passphrase_cb():
+    pass
+
+c.set_passphrase_cb(bad_passphrase_cb, None)
+try:
+    c.op_encrypt([], 0, source, sink)
+except Exception as e:
+    assert type(e) == TypeError
+else:
+    assert False, "Expected an error, got none"

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

Summary of changes:
 lang/python/helpers.c            | 113 +++++++++++++++++++++++++++++++++++---
 lang/python/helpers.h            |   1 +
 lang/python/pyme/core.py         |  14 ++---
 lang/python/pyme/util.py         |  16 +++++-
 lang/python/tests/Makefile.am    |   1 +
 lang/python/tests/t-callbacks.py | 115 +++++++++++++++++++++++++++++++++++++++
 6 files changed, 241 insertions(+), 19 deletions(-)
 create mode 100755 lang/python/tests/t-callbacks.py


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



From cvs at cvs.gnupg.org  Thu May 19 17:06:41 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Thu, 19 May 2016 17:06:41 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-119-g88f2c1c
Message-ID: <E1b3PVX-00078f-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 "GnuPG Made Easy".

The branch, master has been updated
       via  88f2c1c0d16eee6bb36a901623ea65ac69499f03 (commit)
       via  5aa8e588e166abeef2e3d677ab6830f2d7af1b5d (commit)
      from  0d4e95621e05d50cd454049a424bb9ee098a5db6 (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 88f2c1c0d16eee6bb36a901623ea65ac69499f03
Author: Werner Koch <wk at gnupg.org>
Date:   Thu May 19 17:01:07 2016 +0200

    api: Add new function gpgme_set_ctx_flag.
    
    * src/gpgme.h.in (gpgme_set_ctx_flag): New prototype.
    * src/gpgme.c (gpgme_set_ctx_flag): New.
    * src/gpgme.def, src/libgpgme.vers: Add new function.
    * src/context.h (struct gpgme_context): Add FULL_STATUS.
    * src/decrypt.c (_gpgme_decrypt_status_handler): Do not call the
      status callback if FULL_STATUS is set.
    * src/genkey.c (genkey_status_handler): Ditto.
    * src/passphrase.c (_gpgme_passphrase_status_handler): Ditto.
    * src/sign.c (_gpgme_sign_status_handler): Ditto.
    
    * src/engine-backend.h (struct engine_ops): Add SET_STATUS_CB and add
    adjust all definitions of that variable.
    * src/engine.c (_gpgme_engine_set_status_cb): New.
    * src/op-support.c (_gpgme_op_reset): Call this function.
    
    * src/engine-gpg.c (struct engine_gpg): Add fields MON_CB and
    MON_CB_VALUE.
    (gpg_set_status_cb): New.
    (_gpgme_engine_ops_gpg): Register that function.
    (read_status): Call the monitor callback.
    
    * src/engine-gpgsm.c (struct engine_gpgsm): Add fields MON_CB and
    MON_CB_VALUE.
    (_gpgme_engine_ops_gpgsm): Register that function.
    (gpgsm_assuan_simple_command): Change first arg to be an engine
    context and adjust call callers.  Call the monitor callback.
    
    * src/engine-uiserver.c (struct engine_uiserver): Add fields MON_CB
    and MON_CB_VALUE.
    (_gpgme_engine_ops_uiserver): Register that function.
    (uiserver_assuan_simple_command): Change first arg to be an engine
    context and adjust call callers.  Call the monitor callback.
    
    * tests/run-verify.c (status_cb): New.
    (print_result): Print algo names.
    (main): Add option --status.
    --
    
    This new feature is mainly intended for bug tracking.  Having access
    to the raw status lines might also be useful for applications, though.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/NEWS b/NEWS
index cfff559..119866e 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ Noteworthy changes in version 1.7.0 (unreleased) [C25/A14/R_]
  * Interface changes relative to the 1.6.0 release:
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  gpgme_pubkey_algo_string       NEW.
+ gpgme_set_ctx_flag             NEW.
  GPGME_PK_EDDSA                 NEW.
 
 
diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index db94617..4d7a874 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -2736,6 +2736,27 @@ or @var{ctx} is not a valid pointer, @code{NULL} is returned in both
 variables.
 @end deftypefun
 
+ at deftypefun {gpgme_error_t} gpgme_set_ctx_flag  @
+            (@w{gpgme_ctx_t @var{ctx}}, @
+            @w{const char *@var{name}}, @
+            @w{const char *@var{value}})
+
+Some minor properties of the context can be controlled with flags set
+by this function.  The properties are identified by the following
+values for @var{name}:
+
+ at table @code
+ at item "full-status"
+Using a @var{value} of "1" the status callback set by
+gpgme_set_status_cb returns all status lines with the exception of
+PROGRESS lines.  With the default of "0" the status callback is only
+called in certain situations.
+
+ at end table
+
+This function returns @code{0} on success.
+ at end deftypefun
+
 
 @node Locale
 @subsection Locale
diff --git a/src/context.h b/src/context.h
index 757d9b4..078f0cb 100644
--- a/src/context.h
+++ b/src/context.h
@@ -101,6 +101,10 @@ struct gpgme_context
   /* True if offline mode should be used.  */
   unsigned int offline : 1;
 
+  /* True if a status callback shall be called for nearly all status
+   * lines.  */
+  unsigned int full_status : 1;
+
   /* Flags for keylist mode.  */
   gpgme_keylist_mode_t keylist_mode;
 
diff --git a/src/decrypt.c b/src/decrypt.c
index 4db68a1..51e4292 100644
--- a/src/decrypt.c
+++ b/src/decrypt.c
@@ -303,7 +303,7 @@ _gpgme_decrypt_status_handler (void *priv, gpgme_status_code_t code,
       break;
 
     case GPGME_STATUS_INQUIRE_MAXLEN:
-      if (ctx->status_cb)
+      if (ctx->status_cb && !ctx->full_status)
         {
           err = ctx->status_cb (ctx->status_cb_value, "INQUIRE_MAXLEN", args);
           if (err)
diff --git a/src/engine-assuan.c b/src/engine-assuan.c
index 9902467..a396006 100644
--- a/src/engine-assuan.c
+++ b/src/engine-assuan.c
@@ -752,6 +752,7 @@ struct engine_ops _gpgme_engine_ops_assuan =
     /* Member functions.  */
     llass_release,
     NULL,		/* reset */
+    NULL,               /* set_status_cb */
     NULL,               /* set_status_handler */
     NULL,		/* set_command_handler */
     NULL,               /* set_colon_line_handler */
diff --git a/src/engine-backend.h b/src/engine-backend.h
index 4f4519c..ea7db14 100644
--- a/src/engine-backend.h
+++ b/src/engine-backend.h
@@ -49,6 +49,7 @@ struct engine_ops
   /* Member functions.  */
   void (*release) (void *engine);
   gpgme_error_t (*reset) (void *engine);
+  void (*set_status_cb) (void *engine, gpgme_status_cb_t cb, void *cb_value);
   void (*set_status_handler) (void *engine, engine_status_handler_t fnc,
 			      void *fnc_value);
   gpgme_error_t (*set_command_handler) (void *engine,
diff --git a/src/engine-g13.c b/src/engine-g13.c
index 4a7b75c..8f24f4c 100644
--- a/src/engine-g13.c
+++ b/src/engine-g13.c
@@ -768,6 +768,7 @@ struct engine_ops _gpgme_engine_ops_g13 =
 #else
     NULL,			/* reset */
 #endif
+    NULL,               /* set_status_cb */
     NULL,               /* set_status_handler */
     NULL,		/* set_command_handler */
     NULL,               /* set_colon_line_handler */
diff --git a/src/engine-gpg.c b/src/engine-gpg.c
index 9efced2..e507c68 100644
--- a/src/engine-gpg.c
+++ b/src/engine-gpg.c
@@ -95,6 +95,8 @@ struct engine_gpg
     int eof;
     engine_status_handler_t fnc;
     void *fnc_value;
+    gpgme_status_cb_t mon_cb;
+    void *mon_cb_value;
     void *tag;
   } status;
 
@@ -609,6 +611,17 @@ gpg_set_locale (void *engine, int category, const char *value)
   return 0;
 }
 
+/* This sets a status callback for monitoring status lines before they
+ * are passed to a caller set handler.  */
+static void
+gpg_set_status_cb (void *engine, gpgme_status_cb_t cb, void *cb_value)
+{
+  engine_gpg_t gpg = engine;
+
+  gpg->status.mon_cb = cb;
+  gpg->status.mon_cb_value = cb_value;
+}
+
 
 /* Note, that the status_handler is allowed to modifiy the args
    value.  */
@@ -1019,6 +1032,7 @@ read_status (engine_gpg_t gpg)
   size_t bufsize = gpg->status.bufsize;
   char *buffer = gpg->status.buffer;
   size_t readpos = gpg->status.readpos;
+  gpgme_error_t err;
 
   assert (buffer);
   if (bufsize - readpos < 256)
@@ -1037,15 +1051,15 @@ read_status (engine_gpg_t gpg)
 
   if (!nread)
     {
+      err = 0;
       gpg->status.eof = 1;
+      if (gpg->status.mon_cb)
+        err = gpg->status.mon_cb (gpg->status.mon_cb_value,
+                                  GPGME_STATUS_EOF, "");
       if (gpg->status.fnc)
-	{
-	  gpgme_error_t err;
-	  err = gpg->status.fnc (gpg->status.fnc_value, GPGME_STATUS_EOF, "");
-	  if (err)
-	    return err;
-	}
-      return 0;
+        err = gpg->status.fnc (gpg->status.fnc_value, GPGME_STATUS_EOF, "");
+
+      return err;
     }
 
   while (nread > 0)
@@ -1071,6 +1085,15 @@ read_status (engine_gpg_t gpg)
 		    *rest++ = 0;
 
 		  r = _gpgme_parse_status (buffer + 9);
+                  if (gpg->status.mon_cb && r != GPGME_STATUS_PROGRESS)
+                    {
+                      /* Note that we call the monitor even if we do
+                       * not know the status code (r < 0).  */
+                      err = gpg->status.mon_cb (gpg->status.mon_cb_value,
+                                                buffer + 9, rest);
+                      if (err)
+                        return err;
+                    }
 		  if (r >= 0)
 		    {
 		      if (gpg->cmd.used
@@ -1099,7 +1122,6 @@ read_status (engine_gpg_t gpg)
                         }
 		      else if (gpg->status.fnc)
 			{
-			  gpgme_error_t err;
 			  err = gpg->status.fnc (gpg->status.fnc_value,
 						 r, rest);
 			  if (err)
@@ -2470,6 +2492,7 @@ struct engine_ops _gpgme_engine_ops_gpg =
     /* Member functions.  */
     gpg_release,
     NULL,				/* reset */
+    gpg_set_status_cb,
     gpg_set_status_handler,
     gpg_set_command_handler,
     gpg_set_colon_line_handler,
diff --git a/src/engine-gpgconf.c b/src/engine-gpgconf.c
index a2407ac..bcc9522 100644
--- a/src/engine-gpgconf.c
+++ b/src/engine-gpgconf.c
@@ -934,6 +934,7 @@ struct engine_ops _gpgme_engine_ops_gpgconf =
     /* Member functions.  */
     gpgconf_release,
     NULL,		/* reset */
+    NULL,               /* set_status_cb */
     NULL,		/* set_status_handler */
     NULL,		/* set_command_handler */
     NULL,		/* set_colon_line_handler */
diff --git a/src/engine-gpgsm.c b/src/engine-gpgsm.c
index 476e9ef..3aa9f0b 100644
--- a/src/engine-gpgsm.c
+++ b/src/engine-gpgsm.c
@@ -88,6 +88,8 @@ struct engine_gpgsm
   {
     engine_status_handler_t fnc;
     void *fnc_value;
+    gpgme_status_cb_t mon_cb;
+    void *mon_cb_value;
   } status;
 
   struct
@@ -558,10 +560,11 @@ gpgsm_set_locale (void *engine, int category, const char *value)
 
 
 static gpgme_error_t
-gpgsm_assuan_simple_command (assuan_context_t ctx, char *cmd,
+gpgsm_assuan_simple_command (engine_gpgsm_t gpgsm, char *cmd,
 			     engine_status_handler_t status_fnc,
 			     void *status_fnc_value)
 {
+  assuan_context_t ctx = gpgsm->assuan_ctx;
   gpg_error_t err, cb_err;
   char *line;
   size_t linelen;
@@ -610,8 +613,15 @@ gpgsm_assuan_simple_command (assuan_context_t ctx, char *cmd,
                 *(rest++) = 0;
 
               r = _gpgme_parse_status (line + 2);
+              if (gpgsm->status.mon_cb && r != GPGME_STATUS_PROGRESS)
+                {
+                  /* Note that we call the monitor even if we do
+                   * not know the status code (r < 0).  */
+                  cb_err = gpgsm->status.mon_cb (gpgsm->status.mon_cb_value,
+                                                 line + 2, rest);
+                }
 
-              if (r >= 0 && status_fnc)
+              if (r >= 0 && status_fnc && !cb_err)
                 cb_err = status_fnc (status_fnc_value, r, rest);
             }
 	}
@@ -726,7 +736,7 @@ gpgsm_set_fd (engine_gpgsm_t gpgsm, fd_type_t fd_type, const char *opt)
               which, iocb_data->server_fd_str);
 #endif
 
-  err = gpgsm_assuan_simple_command (gpgsm->assuan_ctx, line, NULL, NULL);
+  err = gpgsm_assuan_simple_command (gpgsm, line, NULL, NULL);
 
 #if USE_DESCRIPTOR_PASSING
  leave_set_fd:
@@ -1075,8 +1085,7 @@ gpgsm_reset (void *engine)
      need to reset the list of signers.  Note that RESET does not
      reset OPTION commands. */
   return (gpgsm->assuan_ctx
-          ? gpgsm_assuan_simple_command (gpgsm->assuan_ctx, "RESET",
-                                         NULL, NULL)
+          ? gpgsm_assuan_simple_command (gpgsm, "RESET", NULL, NULL)
           : 0);
 }
 #endif
@@ -1180,7 +1189,6 @@ static gpgme_error_t
 set_recipients (engine_gpgsm_t gpgsm, gpgme_key_t recp[])
 {
   gpgme_error_t err = 0;
-  assuan_context_t ctx = gpgsm->assuan_ctx;
   char *line;
   int linelen;
   int invalid_recipients = 0;
@@ -1218,7 +1226,7 @@ set_recipients (engine_gpgsm_t gpgsm, gpgme_key_t recp[])
 	}
       strcpy (&line[10], fpr);
 
-      err = gpgsm_assuan_simple_command (ctx, line, gpgsm->status.fnc,
+      err = gpgsm_assuan_simple_command (gpgsm, line, gpgsm->status.fnc,
 					 gpgsm->status.fnc_value);
       /* FIXME: This requires more work.  */
       if (gpg_err_code (err) == GPG_ERR_NO_PUBKEY)
@@ -1249,7 +1257,7 @@ gpgsm_encrypt (void *engine, gpgme_key_t recp[], gpgme_encrypt_flags_t flags,
 
   if (flags & GPGME_ENCRYPT_NO_ENCRYPT_TO)
     {
-      err = gpgsm_assuan_simple_command (gpgsm->assuan_ctx,
+      err = gpgsm_assuan_simple_command (gpgsm,
 					 "OPTION no-encrypt-to", NULL, NULL);
       if (err)
 	return err;
@@ -1472,8 +1480,7 @@ gpgsm_import (void *engine, gpgme_data_t keydata, gpgme_key_t *keyarray)
       /* Fist check whether the engine already features the
          --re-import option.  */
       err = gpgsm_assuan_simple_command
-        (gpgsm->assuan_ctx,
-         "GETINFO cmd_has_option IMPORT re-import", NULL, NULL);
+        (gpgsm, "GETINFO cmd_has_option IMPORT re-import", NULL, NULL);
       if (err)
 	return gpg_error (GPG_ERR_NOT_SUPPORTED);
 
@@ -1575,13 +1582,12 @@ gpgsm_keylist (void *engine, const char *pattern, int secret_only,
      available and thus there is no need for gpgsm to ask the agent
      whether a secret key exists for the public key.  */
   if (secret_only || (mode & GPGME_KEYLIST_MODE_WITH_SECRET))
-    gpgsm_assuan_simple_command (gpgsm->assuan_ctx, "GETINFO agent-check",
-                                 NULL, NULL);
+    gpgsm_assuan_simple_command (gpgsm, "GETINFO agent-check", NULL, NULL);
 
   /* Always send list-mode option because RESET does not reset it.  */
   if (asprintf (&line, "OPTION list-mode=%d", (list_mode & 3)) < 0)
     return gpg_error_from_syserror ();
-  err = gpgsm_assuan_simple_command (gpgsm->assuan_ctx, line, NULL, NULL);
+  err = gpgsm_assuan_simple_command (gpgsm, line, NULL, NULL);
   free (line);
   if (err)
     return err;
@@ -1591,24 +1597,24 @@ gpgsm_keylist (void *engine, const char *pattern, int secret_only,
 
   /* Use the validation mode if requested.  We don't check for an error
      yet because this is a pretty fresh gpgsm features. */
-  gpgsm_assuan_simple_command (gpgsm->assuan_ctx,
+  gpgsm_assuan_simple_command (gpgsm,
                                (mode & GPGME_KEYLIST_MODE_VALIDATE)?
                                "OPTION with-validation=1":
                                "OPTION with-validation=0" ,
                                NULL, NULL);
   /* Include the ephemeral keys if requested.  We don't check for an error
      yet because this is a pretty fresh gpgsm features. */
-  gpgsm_assuan_simple_command (gpgsm->assuan_ctx,
+  gpgsm_assuan_simple_command (gpgsm,
                                (mode & GPGME_KEYLIST_MODE_EPHEMERAL)?
                                "OPTION with-ephemeral-keys=1":
                                "OPTION with-ephemeral-keys=0" ,
                                NULL, NULL);
-  gpgsm_assuan_simple_command (gpgsm->assuan_ctx,
+  gpgsm_assuan_simple_command (gpgsm,
                                (mode & GPGME_KEYLIST_MODE_WITH_SECRET)?
                                "OPTION with-secret=1":
                                "OPTION with-secret=0" ,
                                NULL, NULL);
-  gpgsm_assuan_simple_command (gpgsm->assuan_ctx,
+  gpgsm_assuan_simple_command (gpgsm,
                                (engine_flags & GPGME_ENGINE_FLAG_OFFLINE)?
                                "OPTION offline=1":
                                "OPTION offline=0" ,
@@ -1665,7 +1671,7 @@ gpgsm_keylist_ext (void *engine, const char *pattern[], int secret_only,
   /* Always send list-mode option because RESET does not reset it.  */
   if (asprintf (&line, "OPTION list-mode=%d", (list_mode & 3)) < 0)
     return gpg_error_from_syserror ();
-  err = gpgsm_assuan_simple_command (gpgsm->assuan_ctx, line, NULL, NULL);
+  err = gpgsm_assuan_simple_command (gpgsm, line, NULL, NULL);
   free (line);
   if (err)
     return err;
@@ -1673,17 +1679,17 @@ gpgsm_keylist_ext (void *engine, const char *pattern[], int secret_only,
   /* Always send key validation because RESET does not reset it.  */
   /* Use the validation mode if required.  We don't check for an error
      yet because this is a pretty fresh gpgsm features. */
-  gpgsm_assuan_simple_command (gpgsm->assuan_ctx,
+  gpgsm_assuan_simple_command (gpgsm,
                                (mode & GPGME_KEYLIST_MODE_VALIDATE)?
                                "OPTION with-validation=1":
                                "OPTION with-validation=0" ,
                                NULL, NULL);
-  gpgsm_assuan_simple_command (gpgsm->assuan_ctx,
+  gpgsm_assuan_simple_command (gpgsm,
                                (mode & GPGME_KEYLIST_MODE_WITH_SECRET)?
                                "OPTION with-secret=1":
                                "OPTION with-secret=0" ,
                                NULL, NULL);
-  gpgsm_assuan_simple_command (gpgsm->assuan_ctx,
+  gpgsm_assuan_simple_command (gpgsm,
                                (engine_flags & GPGME_ENGINE_FLAG_OFFLINE)?
                                "OPTION offline=1":
                                "OPTION offline=0" ,
@@ -1797,8 +1803,7 @@ gpgsm_sign (void *engine, gpgme_data_t in, gpgme_data_t out,
 
       if (asprintf (&assuan_cmd, "OPTION include-certs %i", include_certs) < 0)
 	return gpg_error_from_syserror ();
-      err = gpgsm_assuan_simple_command (gpgsm->assuan_ctx, assuan_cmd,
-                                         NULL, NULL);
+      err = gpgsm_assuan_simple_command (gpgsm, assuan_cmd, NULL, NULL);
       free (assuan_cmd);
       if (err)
 	return err;
@@ -1812,7 +1817,7 @@ gpgsm_sign (void *engine, gpgme_data_t in, gpgme_data_t out,
           char buf[100];
 
           strcpy (stpcpy (buf, "SIGNER "), s);
-          err = gpgsm_assuan_simple_command (gpgsm->assuan_ctx, buf,
+          err = gpgsm_assuan_simple_command (gpgsm, buf,
                                              gpgsm->status.fnc,
                                              gpgsm->status.fnc_value);
 	}
@@ -1913,6 +1918,17 @@ gpgsm_getauditlog (void *engine, gpgme_data_t output, unsigned int flags)
 }
 
 
+/* This sets a status callback for monitoring status lines before they
+ * are passed to a caller set handler.  */
+static void
+gpgsm_set_status_cb (void *engine, gpgme_status_cb_t cb, void *cb_value)
+{
+  engine_gpgsm_t gpgsm = engine;
+
+  gpgsm->status.mon_cb = cb;
+  gpgsm->status.mon_cb_value = cb_value;
+}
+
 
 static void
 gpgsm_set_status_handler (void *engine, engine_status_handler_t fnc,
@@ -2001,6 +2017,7 @@ struct engine_ops _gpgme_engine_ops_gpgsm =
 #else
     NULL,			/* reset */
 #endif
+    gpgsm_set_status_cb,
     gpgsm_set_status_handler,
     NULL,		/* set_command_handler */
     gpgsm_set_colon_line_handler,
diff --git a/src/engine-spawn.c b/src/engine-spawn.c
index eb4e038..3674efb 100644
--- a/src/engine-spawn.c
+++ b/src/engine-spawn.c
@@ -440,6 +440,7 @@ struct engine_ops _gpgme_engine_ops_spawn =
     /* Member functions.  */
     engspawn_release,
     NULL,		/* reset */
+    NULL,               /* set_status_cb */
     NULL,		/* set_status_handler */
     NULL,		/* set_command_handler */
     NULL,		/* set_colon_line_handler */
diff --git a/src/engine-uiserver.c b/src/engine-uiserver.c
index e4fd47c..d05ade6 100644
--- a/src/engine-uiserver.c
+++ b/src/engine-uiserver.c
@@ -90,6 +90,8 @@ struct engine_uiserver
   {
     engine_status_handler_t fnc;
     void *fnc_value;
+    gpgme_status_cb_t mon_cb;
+    void *mon_cb_value;
   } status;
 
   struct
@@ -451,10 +453,11 @@ uiserver_set_protocol (void *engine, gpgme_protocol_t protocol)
 
 
 static gpgme_error_t
-uiserver_assuan_simple_command (assuan_context_t ctx, char *cmd,
-			     engine_status_handler_t status_fnc,
-			     void *status_fnc_value)
+uiserver_assuan_simple_command (engine_uiserver_t uiserver, char *cmd,
+                                engine_status_handler_t status_fnc,
+                                void *status_fnc_value)
 {
+  assuan_context_t ctx = uiserver->assuan_ctx;
   gpg_error_t err;
   char *line;
   size_t linelen;
@@ -493,8 +496,17 @@ uiserver_assuan_simple_command (assuan_context_t ctx, char *cmd,
 	    *(rest++) = 0;
 
 	  r = _gpgme_parse_status (line + 2);
+          if (uiserver->status.mon_cb && r != GPGME_STATUS_PROGRESS)
+            {
+              /* Note that we call the monitor even if we do
+               * not know the status code (r < 0).  */
+              err = uiserver->status.mon_cb (uiserver->status.mon_cb_value,
+                                             line + 2, rest);
+            }
 
-	  if (r >= 0 && status_fnc)
+          if (err)
+            ;
+	  else if (r >= 0 && status_fnc)
 	    err = status_fnc (status_fnc_value, r, rest);
 	  else
 	    err = gpg_error (GPG_ERR_GENERAL);
@@ -576,7 +588,7 @@ uiserver_set_fd (engine_uiserver_t uiserver, fd_type_t fd_type, const char *opt)
   else
     snprintf (line, COMMANDLINELEN, "%s FD", which);
 
-  err = uiserver_assuan_simple_command (uiserver->assuan_ctx, line, NULL, NULL);
+  err = uiserver_assuan_simple_command (uiserver, line, NULL, NULL);
 
  leave_set_fd:
   if (err)
@@ -915,7 +927,7 @@ uiserver_reset (void *engine)
 
   /* We must send a reset because we need to reset the list of
      signers.  Note that RESET does not reset OPTION commands. */
-  return uiserver_assuan_simple_command (uiserver->assuan_ctx, "RESET", NULL, NULL);
+  return uiserver_assuan_simple_command (uiserver, "RESET", NULL, NULL);
 }
 
 
@@ -984,7 +996,6 @@ static gpgme_error_t
 set_recipients (engine_uiserver_t uiserver, gpgme_key_t recp[])
 {
   gpgme_error_t err = 0;
-  assuan_context_t ctx = uiserver->assuan_ctx;
   char *line;
   int linelen;
   int invalid_recipients = 0;
@@ -1023,7 +1034,8 @@ set_recipients (engine_uiserver_t uiserver, gpgme_key_t recp[])
       /* FIXME: need to do proper escaping  */
       strcpy (&line[10], uid);
 
-      err = uiserver_assuan_simple_command (ctx, line, uiserver->status.fnc,
+      err = uiserver_assuan_simple_command (uiserver, line,
+                                            uiserver->status.fnc,
                                             uiserver->status.fnc_value);
       /* FIXME: This might requires more work.  */
       if (gpg_err_code (err) == GPG_ERR_NO_PUBKEY)
@@ -1160,7 +1172,7 @@ uiserver_sign (void *engine, gpgme_data_t in, gpgme_data_t out,
           char buf[100];
 
           strcpy (stpcpy (buf, "SENDER --info "), s);
-          err = uiserver_assuan_simple_command (uiserver->assuan_ctx, buf,
+          err = uiserver_assuan_simple_command (uiserver, buf,
                                                 uiserver->status.fnc,
                                                 uiserver->status.fnc_value);
         }
@@ -1252,6 +1264,18 @@ uiserver_verify (void *engine, gpgme_data_t sig, gpgme_data_t signed_text,
 }
 
 
+/* This sets a status callback for monitoring status lines before they
+ * are passed to a caller set handler.  */
+static void
+uiserver_set_status_cb (void *engine, gpgme_status_cb_t cb, void *cb_value)
+{
+  engine_uiserver_t uiserver = engine;
+
+  uiserver->status.mon_cb = cb;
+  uiserver->status.mon_cb_value = cb_value;
+}
+
+
 static void
 uiserver_set_status_handler (void *engine, engine_status_handler_t fnc,
 			  void *fnc_value)
@@ -1309,6 +1333,7 @@ struct engine_ops _gpgme_engine_ops_uiserver =
     /* Member functions.  */
     uiserver_release,
     uiserver_reset,
+    uiserver_set_status_cb,
     uiserver_set_status_handler,
     NULL,		/* set_command_handler */
     uiserver_set_colon_line_handler,
diff --git a/src/engine.c b/src/engine.c
index 8e84da9..c9449db 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -503,6 +503,21 @@ _gpgme_engine_release (engine_t engine)
 }
 
 
+/* Set a status callback which is used to monitor the status values
+ * before they are passed to a handler set with
+ * _gpgme_engine_set_status_handler.  */
+void
+_gpgme_engine_set_status_cb (engine_t engine,
+                             gpgme_status_cb_t cb, void *cb_value)
+{
+  if (!engine)
+    return;
+
+  if (engine->ops->set_status_cb)
+    (*engine->ops->set_status_cb) (engine->engine, cb, cb_value);
+}
+
+
 void
 _gpgme_engine_set_status_handler (engine_t engine,
 				  engine_status_handler_t fnc, void *fnc_value)
diff --git a/src/engine.h b/src/engine.h
index 56fcc42..238a21c 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -62,6 +62,8 @@ gpgme_error_t _gpgme_engine_set_locale (engine_t engine, int category,
 gpgme_error_t _gpgme_engine_set_protocol (engine_t engine,
 					  gpgme_protocol_t protocol);
 void _gpgme_engine_release (engine_t engine);
+void _gpgme_engine_set_status_cb (engine_t engine,
+                                  gpgme_status_cb_t cb, void *cb_value);
 void _gpgme_engine_set_status_handler (engine_t engine,
 				       engine_status_handler_t fnc,
 				       void *fnc_value);
diff --git a/src/genkey.c b/src/genkey.c
index 3afd3b4..34cc5af 100644
--- a/src/genkey.c
+++ b/src/genkey.c
@@ -134,7 +134,7 @@ genkey_status_handler (void *priv, gpgme_status_code_t code, char *args)
       break;
 
     case GPGME_STATUS_INQUIRE_MAXLEN:
-      if (ctx->status_cb)
+      if (ctx->status_cb && !ctx->full_status)
         {
           err = ctx->status_cb (ctx->status_cb_value, "INQUIRE_MAXLEN", args);
           if (err)
diff --git a/src/gpgme.c b/src/gpgme.c
index 0b42ea1..3289be9 100644
--- a/src/gpgme.c
+++ b/src/gpgme.c
@@ -82,6 +82,30 @@ gpgme_set_global_flag (const char *name, const char *value)
 }
 
 
+/* Set the flag NAME for CTX to VALUE.  The supported flags are:
+ *
+ * - full-status :: With a value of "1" the status callback set by
+ *                  gpgme_set_status_cb returns all status lines
+ *                  except for PROGRESS lines.  With the default of
+ *                  "0" the status callback is only called in certain
+ *                  situations.
+ */
+gpgme_error_t
+gpgme_set_ctx_flag (gpgme_ctx_t ctx, const char *name, const char *value)
+{
+  if (!ctx || !name || !value)
+    return gpg_error (GPG_ERR_INV_VALUE);
+  else if (!strcmp (name, "full-status"))
+    {
+      ctx->full_status = *value? !!atoi (value) : 0;
+    }
+  else
+    return gpg_error (GPG_ERR_UNKNOWN_NAME);
+
+  return 0;
+}
+
+
 

 /* Create a new context as an environment for GPGME crypto
    operations.  */
diff --git a/src/gpgme.def b/src/gpgme.def
index 3b56aaa..dfdb6c6 100644
--- a/src/gpgme.def
+++ b/src/gpgme.def
@@ -225,5 +225,6 @@ EXPORTS
     gpgme_get_status_cb                   @168
 
     gpgme_pubkey_algo_string              @169
+    gpgme_set_ctx_flag                    @170
 ; END
 
diff --git a/src/gpgme.h.in b/src/gpgme.h.in
index 7a58ded..5f7896d 100644
--- a/src/gpgme.h.in
+++ b/src/gpgme.h.in
@@ -911,6 +911,10 @@ gpgme_error_t gpgme_new (gpgme_ctx_t *ctx);
 /* Release the context CTX.  */
 void gpgme_release (gpgme_ctx_t ctx);
 
+/* Set the flag NAME for CTX to VALUE.  */
+gpgme_error_t gpgme_set_ctx_flag (gpgme_ctx_t ctx,
+                                  const char *name, const char *value);
+
 /* Set the protocol to be used by CTX to PROTO.  */
 gpgme_error_t gpgme_set_protocol (gpgme_ctx_t ctx, gpgme_protocol_t proto);
 
@@ -993,7 +997,7 @@ void gpgme_get_progress_cb (gpgme_ctx_t ctx, gpgme_progress_cb_t *cb,
 			    void **hook_value);
 
 /* Set the status callback function in CTX to CB.  HOOK_VALUE is
-   passed as first argument to thes status callback function.  */
+   passed as first argument to the status callback function.  */
 void gpgme_set_status_cb (gpgme_ctx_t c, gpgme_status_cb_t cb,
                           void *hook_value);
 
diff --git a/src/libgpgme.vers b/src/libgpgme.vers
index c677190..873cb19 100644
--- a/src/libgpgme.vers
+++ b/src/libgpgme.vers
@@ -100,6 +100,7 @@ GPGME_1.1 {
     gpgme_get_status_cb;
 
     gpgme_pubkey_algo_string;
+    gpgme_set_ctx_flag;
 };
 
 
diff --git a/src/op-support.c b/src/op-support.c
index 4e388a4..a74405e 100644
--- a/src/op-support.c
+++ b/src/op-support.c
@@ -148,6 +148,12 @@ _gpgme_op_reset (gpgme_ctx_t ctx, int type)
             err = 0;
         }
 
+      if (!err && ctx->status_cb && ctx->full_status)
+        {
+          _gpgme_engine_set_status_cb (ctx->engine,
+                                       ctx->status_cb, ctx->status_cb_value);
+        }
+
       if (err)
         {
           _gpgme_engine_release (ctx->engine);
diff --git a/src/passphrase.c b/src/passphrase.c
index c88e57d..74d235c 100644
--- a/src/passphrase.c
+++ b/src/passphrase.c
@@ -118,9 +118,8 @@ _gpgme_passphrase_status_handler (void *priv, gpgme_status_code_t code,
 
     case GPGME_STATUS_ERROR:
       /* We abuse this status handler to forward ERROR status codes to
-         the caller.  This should better be done in a generic handler,
-         but for now this is sufficient.  */
-      if (ctx->status_cb)
+         the caller.  */
+      if (ctx->status_cb && !ctx->full_status)
         {
           err = ctx->status_cb (ctx->status_cb_value, "ERROR", args);
           if (err)
@@ -130,9 +129,8 @@ _gpgme_passphrase_status_handler (void *priv, gpgme_status_code_t code,
 
     case GPGME_STATUS_FAILURE:
       /* We abuse this status handler to forward FAILURE status codes
-         to the caller.  This should better be done in a generic
-         handler, but for now this is sufficient.  */
-      if (ctx->status_cb)
+         to the caller.  */
+      if (ctx->status_cb && !ctx->full_status)
         {
           err = ctx->status_cb (ctx->status_cb_value, "FAILURE", args);
           if (err)
@@ -173,6 +171,7 @@ _gpgme_passphrase_command_handler (void *priv, gpgme_status_code_t code,
       if (processed)
 	*processed = 1;
 
+      /* Fake a status line to to convey the MAXLEN info.  */
       if (ctx->status_cb && opd->maxlen)
         err = ctx->status_cb (ctx->status_cb_value, "INQUIRE_MAXLEN",
                               opd->maxlen);
diff --git a/src/sign.c b/src/sign.c
index d8650a9..bfd9ad1 100644
--- a/src/sign.c
+++ b/src/sign.c
@@ -369,7 +369,7 @@ _gpgme_sign_status_handler (void *priv, gpgme_status_code_t code, char *args)
       break;
 
     case GPGME_STATUS_INQUIRE_MAXLEN:
-      if (ctx->status_cb)
+      if (ctx->status_cb && !ctx->full_status)
         err = ctx->status_cb (ctx->status_cb_value, "INQUIRE_MAXLEN", args);
       break;
 
diff --git a/tests/run-verify.c b/tests/run-verify.c
index b49ea2a..b7be320 100644
--- a/tests/run-verify.c
+++ b/tests/run-verify.c
@@ -36,6 +36,15 @@
 
 static int verbose;
 
+static gpg_error_t
+status_cb (void *opaque, const char *keyword, const char *value)
+{
+  (void)opaque;
+  fprintf (stderr, "status_cb: %s %s\n", keyword, value);
+  return 0;
+}
+
+
 static void
 print_summary (gpgme_sigsum_t summary)
 {
@@ -102,8 +111,10 @@ print_result (gpgme_verify_result_t result)
       printf ("  validity ..: ");
       print_validity (sig->validity); putchar ('\n');
       printf ("  val.reason : %s\n", gpgme_strerror (sig->status));
-      printf ("  pubkey algo: %d\n", sig->pubkey_algo);
-      printf ("  digest algo: %d\n", sig->hash_algo);
+      printf ("  pubkey algo: %d (%s)\n", sig->pubkey_algo,
+              nonnull(gpgme_pubkey_algo_name (sig->pubkey_algo)));
+      printf ("  digest algo: %d (%s)\n", sig->hash_algo,
+              nonnull(gpgme_hash_algo_name (sig->hash_algo)));
       printf ("  pka address: %s\n", nonnull (sig->pka_address));
       printf ("  pka trust .: %s\n",
               sig->pka_trust == 0? "n/a" :
@@ -126,6 +137,7 @@ show_usage (int ex)
   fputs ("usage: " PGM " [options] [DETACHEDSIGFILE] FILE\n\n"
          "Options:\n"
          "  --verbose        run in verbose mode\n"
+         "  --status         print status lines from the backend\n"
          "  --openpgp        use the OpenPGP protocol (default)\n"
          "  --cms            use the CMS protocol\n"
          , stderr);
@@ -145,6 +157,7 @@ main (int argc, char **argv)
   FILE *fp_msg = NULL;
   gpgme_data_t msg = NULL;
   gpgme_verify_result_t result;
+  int print_status = 0;
 
   if (argc)
     { argc--; argv++; }
@@ -164,6 +177,11 @@ main (int argc, char **argv)
           verbose = 1;
           argc--; argv++;
         }
+      else if (!strcmp (*argv, "--status"))
+        {
+          print_status = 1;
+          argc--; argv++;
+        }
       else if (!strcmp (*argv, "--openpgp"))
         {
           protocol = GPGME_PROTOCOL_OpenPGP;
@@ -207,6 +225,11 @@ main (int argc, char **argv)
   err = gpgme_new (&ctx);
   fail_if_err (err);
   gpgme_set_protocol (ctx, protocol);
+  if (print_status)
+    {
+      gpgme_set_status_cb (ctx, status_cb, NULL);
+      gpgme_set_ctx_flag (ctx, "full-status", "1");
+    }
 
   err = gpgme_data_new_from_stream (&sig, fp_sig);
   if (err)
@@ -232,7 +255,7 @@ main (int argc, char **argv)
     print_result (result);
   if (err)
     {
-      fprintf (stderr, PGM ": signing failed: %s\n", gpgme_strerror (err));
+      fprintf (stderr, PGM ": verify failed: %s\n", gpgme_strerror (err));
       exit (1);
     }
 

commit 5aa8e588e166abeef2e3d677ab6830f2d7af1b5d
Author: Werner Koch <wk at gnupg.org>
Date:   Thu May 19 14:26:22 2016 +0200

    api: Remove arbitrary restriction from gpgme_op_verify.
    
    * src/verify.c (verify_start): Do not return GPG_ERR_INV_VALUES when
    when SIGNED_TEXT is not given.
    --
    
    The original idea behind this restriction probably was that it is
    useless to verify a non-detached signatures without also returning the
    signed text.  However, it is sometimes useful to just check the
    signature, for example to see who signed it.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/verify.c b/src/verify.c
index 75914e2..4781d99 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -861,8 +861,6 @@ verify_start (gpgme_ctx_t ctx, int synchronous, gpgme_data_t sig,
 
   if (!sig)
     return gpg_error (GPG_ERR_NO_DATA);
-  if (!signed_text && !plaintext)
-    return gpg_error (GPG_ERR_INV_VALUE);
 
   return _gpgme_engine_op_verify (ctx->engine, sig, signed_text, plaintext);
 }

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

Summary of changes:
 NEWS                  |  1 +
 doc/gpgme.texi        | 21 +++++++++++++++++
 src/context.h         |  4 ++++
 src/decrypt.c         |  2 +-
 src/engine-assuan.c   |  1 +
 src/engine-backend.h  |  1 +
 src/engine-g13.c      |  1 +
 src/engine-gpg.c      | 39 ++++++++++++++++++++++++-------
 src/engine-gpgconf.c  |  1 +
 src/engine-gpgsm.c    | 65 ++++++++++++++++++++++++++++++++-------------------
 src/engine-spawn.c    |  1 +
 src/engine-uiserver.c | 43 +++++++++++++++++++++++++++-------
 src/engine.c          | 15 ++++++++++++
 src/engine.h          |  2 ++
 src/genkey.c          |  2 +-
 src/gpgme.c           | 24 +++++++++++++++++++
 src/gpgme.def         |  1 +
 src/gpgme.h.in        |  6 ++++-
 src/libgpgme.vers     |  1 +
 src/op-support.c      |  6 +++++
 src/passphrase.c      | 11 ++++-----
 src/sign.c            |  2 +-
 src/verify.c          |  2 --
 tests/run-verify.c    | 29 ++++++++++++++++++++---
 24 files changed, 225 insertions(+), 56 deletions(-)


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



From cvs at cvs.gnupg.org  Thu May 19 22:57:31 2016
From: cvs at cvs.gnupg.org (by Robert J. Hansen)
Date: Thu, 19 May 2016 22:57:31 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. 3a1c2730c0e0791df51da23a4c55f28b37187681
Message-ID: <E1b3Uz2-0006bN-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  3a1c2730c0e0791df51da23a4c55f28b37187681 (commit)
      from  099e03a0bd0cdc7f69eb1f590565e5f35f99d313 (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 3a1c2730c0e0791df51da23a4c55f28b37187681
Author: Robert J. Hansen <rjh at sixdemonbag.org>
Date:   Thu May 19 16:57:25 2016 -0400

    Typo fix.

diff --git a/web/faq/gnupg-faq.org b/web/faq/gnupg-faq.org
index 984d41f..16f6472 100644
--- a/web/faq/gnupg-faq.org
+++ b/web/faq/gnupg-faq.org
@@ -247,7 +247,7 @@ A convenient Windows installer is available from [[http://www.gpg4win.org][GPG4W
 
 The [[http://www.gpgtools.org][GPGtools project]] has everything needed to get started.
 However, GPGTools only offers GnuPG 2.0; if you want the latest-and-greatest 2.1, look
-at Patrick Brunschwig?s [[http://sourceforge.net/projects/gpgosx/][GnuPG for OS X] project
+at Patrick Brunschwig?s [[http://sourceforge.net/projects/gpgosx/][GnuPG for OS X]] project
 on SourceForge.
 
 

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

Summary of changes:
 web/faq/gnupg-faq.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  Fri May 20 13:38:31 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 20 May 2016 13:38:31 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. 167b1395db1c0539001cd408c852ed163f76ca3f
Message-ID: <E1b3ijc-0006y7-CQ@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  167b1395db1c0539001cd408c852ed163f76ca3f (commit)
      from  3a1c2730c0e0791df51da23a4c55f28b37187681 (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 167b1395db1c0539001cd408c852ed163f76ca3f
Author: Werner Koch <wk at gnupg.org>
Date:   Fri May 20 13:25:36 2016 +0200

    news: Add OpenPGP.conf item

diff --git a/web/index.org b/web/index.org
index f2dcf63..7682c1d 100644
--- a/web/index.org
+++ b/web/index.org
@@ -66,6 +66,11 @@ The latest release news:\\
 # GnuPG's latest news are available as [[http://feedvalidator.org/check.cgi?url%3Dhttps://www.gnupg.org/news.en.rss][RSS 2.0 compliant]] feed.  Just
 # point or paste the [[news.en.rss][RSS file]] into your aggregator.
 
+** First OpenPGP conference (2016-05-20)
+
+If you are a user or implementer of OpenPGP related software, you may
+join us at [[https://gnupg.org/conf/][OpenPGP.conf]] in Cologne on September 8 and 9, 2016.
+
 ** GnuPG 2.1.12 released (2016-05-04)
 
 A new version of the /modern/ branch of GnuPG has been released.

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

Summary of changes:
 web/index.org | 5 +++++
 1 file changed, 5 insertions(+)


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



From cvs at cvs.gnupg.org  Fri May 20 16:08:28 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Fri, 20 May 2016 16:08:28 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-121-geaf2d01
Message-ID: <E1b3l4i-000606-PA@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  eaf2d018e63c15cd9a81e5c1fd2fedbf8829f7b9 (commit)
       via  5df858cbf196b2a53d600b7f45655f7b35c1fe93 (commit)
      from  88f2c1c0d16eee6bb36a901623ea65ac69499f03 (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 eaf2d018e63c15cd9a81e5c1fd2fedbf8829f7b9
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri May 20 16:04:50 2016 +0200

    Qt: Add test for changeownertrust
    
    * lang/qt/tests/t-ownertrust.cpp: New test.
    * lang/qt/tests/Makefile.am: Add test.
    
    --
    This test would have catched the issue created by not handling
    GPGME_STATUS_KEY_CONSIDERED.

diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
index 7658a73..db40e77 100644
--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
@@ -24,9 +24,9 @@ TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir)
 
 EXTRA_DIST = initial.test
 
-TESTS = initial.test t-keylist t-keylocate
+TESTS = initial.test t-keylist t-keylocate t-ownertrust
 
-moc_files = t-keylist.moc t-keylocate.moc
+moc_files = t-keylist.moc t-keylocate.moc t-ownertrust.moc
 
 AM_LDFLAGS = -no-install
 
@@ -48,12 +48,13 @@ initial.test : check-local
 
 t_keylist_SOURCES = t-keylist.cpp
 t_keylocate_SOURCES = t-keylocate.cpp
+t_ownertrust_SOURCES = t-ownertrust.cpp
 
 nodist_t_keylist_SOURCES = $(moc_files)
 
 BUILT_SOURCES = $(moc_files)
 
-noinst_PROGRAMS = t-keylist t-keylocate
+noinst_PROGRAMS = t-keylist t-keylocate t-ownertrust
 
 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-ownertrust.cpp b/lang/qt/tests/t-ownertrust.cpp
new file mode 100644
index 0000000..d4385bf
--- /dev/null
+++ b/lang/qt/tests/t-ownertrust.cpp
@@ -0,0 +1,105 @@
+/* t-ownertrust.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.
+*/
+
+#include <QDebug>
+#include <QTest>
+#include <QSignalSpy>
+#include "keylistjob.h"
+#include "protocol.h"
+#include "keylistresult.h"
+#include "changeownertrustjob.h"
+
+using namespace QGpgME;
+using namespace GpgME;
+
+class ChangeOwnerTrustTest: public QObject
+{
+    Q_OBJECT
+
+Q_SIGNALS:
+    void asyncDone();
+
+private Q_SLOTS:
+
+    void testChangeOwnerTrust()
+    {
+        KeyListJob *job = openpgp()->keyListJob(false, true, true);
+        std::vector<GpgME::Key> keys;
+        GpgME::KeyListResult result = job->exec(QStringList() << QStringLiteral("alfa at example.net"),
+                                                false, keys);
+        Q_ASSERT (!result.error());
+        Q_ASSERT (keys.size() == 1);
+        Key key = keys.front();
+        qDebug() << "Trust is: " << key.ownerTrust();
+        Q_ASSERT (key.ownerTrust() == Key::Unknown);
+
+        ChangeOwnerTrustJob *job2 = openpgp()->changeOwnerTrustJob();
+        connect(job2, &ChangeOwnerTrustJob::result, this, [this](Error e)
+        {
+            Q_ASSERT(!e);
+            Q_EMIT asyncDone();
+        });
+        job2->start(key, Key::Ultimate);
+        QSignalSpy spy (this, &ChangeOwnerTrustTest::asyncDone);
+        Q_ASSERT(spy.wait());
+
+        job = openpgp()->keyListJob(false, true, true);
+        result = job->exec(QStringList() << QStringLiteral("alfa at example.net"),
+                           false, keys);
+        key = keys.front();
+        Q_ASSERT (key.ownerTrust() == Key::Ultimate);
+
+        ChangeOwnerTrustJob *job3 = openpgp()->changeOwnerTrustJob();
+        connect(job3, &ChangeOwnerTrustJob::result, this, [this](Error e)
+        {
+            Q_ASSERT(!e);
+            Q_EMIT asyncDone();
+        });
+        job3->start(key, Key::Unknown);
+        Q_ASSERT(spy.wait());
+
+        job = openpgp()->keyListJob(false, true, true);
+        result = job->exec(QStringList() << QStringLiteral("alfa at example.net"),
+                           false, keys);
+        key = keys.front();
+        Q_ASSERT (key.ownerTrust() == Key::Unknown);
+    }
+
+    void initTestCase()
+    {
+        const QString gpgHome = qgetenv("GNUPGHOME");
+        QVERIFY2(!gpgHome.isEmpty(), "GNUPGHOME environment variable is not set.");
+    }
+};
+
+QTEST_MAIN(ChangeOwnerTrustTest)
+
+#include "t-ownertrust.moc"

commit 5df858cbf196b2a53d600b7f45655f7b35c1fe93
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri May 20 16:03:08 2016 +0200

    Cpp: Ignore STATUS_KEY_CONSIDERED when editing
    
    * lang/cpp/src/editinteractor.cpp (EditInteractor::needsNoResponse):
    Handle GPGME_STATUS_KEY_CONSIDERED.

diff --git a/lang/cpp/src/editinteractor.cpp b/lang/cpp/src/editinteractor.cpp
index c05ccd6..fb68bcb 100644
--- a/lang/cpp/src/editinteractor.cpp
+++ b/lang/cpp/src/editinteractor.cpp
@@ -211,6 +211,7 @@ bool EditInteractor::needsNoResponse(unsigned int status) const
     case GPGME_STATUS_SIGEXPIRED:
     case GPGME_STATUS_KEYEXPIRED:
     case GPGME_STATUS_PINENTRY_LAUNCHED:
+    case GPGME_STATUS_KEY_CONSIDERED:
         return true;
     default:
         return false;

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

Summary of changes:
 lang/cpp/src/editinteractor.cpp                   |  1 +
 lang/qt/tests/Makefile.am                         |  7 +--
 lang/qt/tests/{t-keylist.cpp => t-ownertrust.cpp} | 54 ++++++++++++++++-------
 3 files changed, 42 insertions(+), 20 deletions(-)
 copy lang/qt/tests/{t-keylist.cpp => t-ownertrust.cpp} (59%)


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



From cvs at cvs.gnupg.org  Fri May 20 16:34:43 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 20 May 2016 16:34:43 +0200
Subject: [git] GPA - branch, master, updated. gpa-0.9.9-5-gb9efe75
Message-ID: <E1b3lU7-0007bY-U0@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 Assistant".

The branch, master has been updated
       via  b9efe75ab7addb2eecd8e2274ed8907b9f6a3712 (commit)
      from  ea99f888c0f557fdce3870bb021ac7c3dd84a12d (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 b9efe75ab7addb2eecd8e2274ed8907b9f6a3712
Author: Werner Koch <wk at gnupg.org>
Date:   Fri May 20 16:31:45 2016 +0200

    Make the gpgme edito FSM more robust.
    
    * src/gpgmeedit.c (edit_fnc): Whitelist instead of blacklisting needed
    status codes.
    --
    
    The old code broke every  time we added a new status code to gpg.
    This way it is MUCH more robust.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/gpgmeedit.c b/src/gpgmeedit.c
index 5f6768f..72b6832 100644
--- a/src/gpgmeedit.c
+++ b/src/gpgmeedit.c
@@ -211,26 +211,26 @@ edit_fnc (void *opaque, gpgme_status_code_t status,
   struct edit_parms_s *parms = opaque;
   char *result = NULL;
 
-  /* Ignore these status lines, as they don't require any response */
-  if (status == GPGME_STATUS_EOF
-      || status == GPGME_STATUS_GOT_IT
-      || status == GPGME_STATUS_NEED_PASSPHRASE
-      || status == GPGME_STATUS_NEED_PASSPHRASE_SYM
-      || status == GPGME_STATUS_GOOD_PASSPHRASE
-      || status == GPGME_STATUS_BAD_PASSPHRASE
-      || status == GPGME_STATUS_USERID_HINT
-      || status == GPGME_STATUS_SIGEXPIRED
-      || status == GPGME_STATUS_KEYEXPIRED
-      || status == GPGME_STATUS_BACKUP_KEY_CREATED
-      || status == GPGME_STATUS_CARDCTRL       /* Issued by gpg1.  */
-      || status == GPGME_STATUS_SC_OP_SUCCESS
-      || status == GPGME_STATUS_PINENTRY_LAUNCHED
-      || status == GPGME_STATUS_PROGRESS)
+  /* Whitelist all status code we know about.  */
+  switch (status)
     {
+    case GPGME_STATUS_ALREADY_SIGNED:
+    case GPGME_STATUS_ERROR:
+    case GPGME_STATUS_GET_BOOL:
+    case GPGME_STATUS_GET_LINE:
+    case GPGME_STATUS_KEY_CREATED:
+    case GPGME_STATUS_NEED_PASSPHRASE_SYM:
+    case GPGME_STATUS_SC_OP_FAILURE:
+      break;
+
+    default:
+      /* We don't know and thus do not need this status code.  */
       return parms->err;
     }
-  else if (!parms->need_status_passphrase_sym
-           && status == GPGME_STATUS_NEED_PASSPHRASE_SYM)
+
+
+  if (!parms->need_status_passphrase_sym
+      && status == GPGME_STATUS_NEED_PASSPHRASE_SYM)
     {
       return parms->err;
     }

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

Summary of changes:
 src/gpgmeedit.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)


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



From cvs at cvs.gnupg.org  Sat May 21 10:34:14 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Sat, 21 May 2016 10:34:14 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-124-g10df06e
Message-ID: <E1b42Kn-00007I-FZ@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  10df06ee8f9192309bf124872438f7c32457e1c6 (commit)
       via  dac2c5441d418536632f014c8b0e1359580279d1 (commit)
       via  a92946a8cacc44f655249d84b316deae59e62671 (commit)
      from  eaf2d018e63c15cd9a81e5c1fd2fedbf8829f7b9 (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 10df06ee8f9192309bf124872438f7c32457e1c6
Author: Werner Koch <wk at gnupg.org>
Date:   Sat May 21 10:29:49 2016 +0200

    api: Return Tofu info for signatures.
    
    * src/gpgme.h.in (gpgme_tofu_policy_t): New.
    (gpgme_status_code_t): Add status codes for TOFU.
    (struct _gpgme_tofu_info, gpgme_tofu_info_t): New.
    (struct _gpgme_signature): Add field 'tofu'.
    * src/status-table.c (status_table): Add new codes.
    * src/verify.c: Include limits.h.
    (release_tofu_info): New.
    (release_op_data): Call that.
    (parse_tofu_user): New.
    (parse_tofu_stats): New.
    (parse_tofu_stats_long): New.
    (_gpgme_verify_status_handler): Handle TOFU status lines.
    
    * tests/run-verify.c (print_description): New.
    (print_result): print tofu info.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/NEWS b/NEWS
index 119866e..04cfe12 100644
--- a/NEWS
+++ b/NEWS
@@ -6,8 +6,15 @@ Noteworthy changes in version 1.7.0 (unreleased) [C25/A14/R_]
  * Interface changes relative to the 1.6.0 release:
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  gpgme_pubkey_algo_string       NEW.
- gpgme_set_ctx_flag             NEW.
  GPGME_PK_EDDSA                 NEW.
+ gpgme_set_ctx_flag             NEW.
+ gpgme_signature_t              EXTENDED: New field tofu.
+ gpgme_tofu_policy_t            NEW.
+ gpgme_tofu_info_t              NEW.
+ GPGME_STATUS_KEY_CONSIDERED    NEW.
+ GPGME_STATUS_TOFU_USER         NEW.
+ GPGME_STATUS_TOFU_STATS        NEW.
+ GPGME_STATUS_TOFU_STATS_LONG   NEW.
 
 
 Noteworthy changes in version 1.6.0 (2015-08-26) [C25/A14/R0]
diff --git a/src/gpgme.h.in b/src/gpgme.h.in
index 5f7896d..335ed6b 100644
--- a/src/gpgme.h.in
+++ b/src/gpgme.h.in
@@ -371,6 +371,19 @@ typedef enum
 gpgme_validity_t;
 
 
+/* The TOFU policies. */
+typedef enum
+  {
+    GPGME_TOFU_POLICY_NONE    = 0,
+    GPGME_TOFU_POLICY_AUTO    = 1,
+    GPGME_TOFU_POLICY_GOOD    = 2,
+    GPGME_TOFU_POLICY_UNKNOWN = 3,
+    GPGME_TOFU_POLICY_BAD     = 4,
+    GPGME_TOFU_POLICY_ASK     = 5
+  }
+gpgme_tofu_policy_t;
+
+
 /* The available protocols.  */
 typedef enum
   {
@@ -533,7 +546,10 @@ typedef enum
     GPGME_STATUS_KEY_NOT_CREATED = 91,
     GPGME_STATUS_INQUIRE_MAXLEN = 92,
     GPGME_STATUS_FAILURE = 93,
-    GPGME_STATUS_KEY_CONSIDERED = 94
+    GPGME_STATUS_KEY_CONSIDERED = 94,
+    GPGME_STATUS_TOFU_USER = 95,
+    GPGME_STATUS_TOFU_STATS = 96,
+    GPGME_STATUS_TOFU_STATS_LONG = 97
   }
 gpgme_status_code_t;
 
@@ -1533,6 +1549,46 @@ typedef enum
   }
 gpgme_sigsum_t;
 
+
+struct _gpgme_tofu_info
+{
+  struct _gpgme_tofu_info *next;
+
+  /* The mail address (addr-spec from RFC5322) of the tofu binding.  */
+  char *address;
+
+  /* The fingerprint of the primary key.  */
+  char *fpr;
+
+  /* The TOFU validity:
+   *  0 := conflict
+   *  1 := key without history
+   *  2 := key with too little history
+   *  3 := key with enough history for basic trust
+   *  4 := key with a lot of history
+   */
+  unsigned int validity : 3;
+
+  /* The TOFU policy (gpgme_tofu_policy_t).  */
+  unsigned int policy : 4;
+
+  unsigned int _rfu : 25;
+
+  /* Number of signatures seen for this binding.  Capped at USHRT_MAX.  */
+  unsigned short signcount;
+  unsigned short reserved;
+
+  /* Number of seconds since the first and the most recently seen
+   * message was verified.  */
+  unsigned int firstseen;
+  unsigned int lastseen;
+
+  /* If non-NULL a human readable string summarizing the TOFU data. */
+  char *description;
+};
+typedef struct _gpgme_tofu_info *gpgme_tofu_info_t;
+
+
 struct _gpgme_signature
 {
   struct _gpgme_signature *next;
@@ -1578,6 +1634,9 @@ struct _gpgme_signature
 
   /* The mailbox from the PKA information or NULL. */
   char *pka_address;
+
+  /* If non-NULL, TOFU info for this signature are available.  */
+  gpgme_tofu_info_t tofu;
 };
 typedef struct _gpgme_signature *gpgme_signature_t;
 
diff --git a/src/status-table.c b/src/status-table.c
index e70cb8b..5850a36 100644
--- a/src/status-table.c
+++ b/src/status-table.c
@@ -124,6 +124,9 @@ static struct status_table_s status_table[] =
   { "SIG_SUBPACKET", GPGME_STATUS_SIG_SUBPACKET },
   { "SIGEXPIRED", GPGME_STATUS_SIGEXPIRED },
   { "SUCCESS", GPGME_STATUS_SUCCESS },
+  { "TOFU_STATS", GPGME_STATUS_TOFU_STATS },
+  { "TOFU_STATS_LONG", GPGME_STATUS_TOFU_STATS_LONG },
+  { "TOFU_USER", GPGME_STATUS_TOFU_USER },
   { "TRUNCATED", GPGME_STATUS_TRUNCATED },
   { "TRUST_FULLY", GPGME_STATUS_TRUST_FULLY },
   { "TRUST_MARGINAL", GPGME_STATUS_TRUST_MARGINAL },
diff --git a/src/verify.c b/src/verify.c
index 4781d99..e6c9665 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -26,6 +26,7 @@
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
+#include <limits.h>
 
 #include "gpgme.h"
 #include "debug.h"
@@ -49,6 +50,22 @@ typedef struct
 
 
 static void
+release_tofu_info (gpgme_tofu_info_t t)
+{
+  while (t)
+    {
+      gpgme_tofu_info_t t2 = t->next;
+
+      free (t->address);
+      free (t->fpr);
+      free (t->description);
+      free (t);
+      t = t2;
+    }
+}
+
+
+static void
 release_op_data (void *hook)
 {
   op_data_t opd = (op_data_t) hook;
@@ -71,6 +88,7 @@ release_op_data (void *hook)
 	free (sig->fpr);
       if (sig->pka_address)
 	free (sig->pka_address);
+      release_tofu_info (sig->tofu);
       free (sig);
       sig = next;
     }
@@ -635,6 +653,169 @@ parse_trust (gpgme_signature_t sig, gpgme_status_code_t code, char *args)
 }
 
 
+/* Parse a TOFU_USER line and put the info into SIG.  */
+static gpgme_error_t
+parse_tofu_user (gpgme_signature_t sig, char *args)
+{
+  gpg_error_t err;
+  char *tail;
+  gpgme_tofu_info_t ti, ti2;
+
+  tail = strchr (args, ' ');
+  if (!tail || tail == args)
+    return trace_gpg_error (GPG_ERR_INV_ENGINE);  /* No fingerprint.  */
+  *tail++ = 0;
+
+  ti = calloc (1, sizeof *ti);
+  if (!ti)
+    return gpg_error_from_syserror ();
+
+  ti->fpr = strdup (args);
+  if (!ti->fpr)
+    {
+      free (ti);
+      return gpg_error_from_syserror ();
+    }
+
+  args = tail;
+  tail = strchr (args, ' ');
+  if (tail == args)
+    return trace_gpg_error (GPG_ERR_INV_ENGINE);  /* No addr-spec.  */
+  if (tail)
+    *tail = 0;
+
+  err = _gpgme_decode_percent_string (args, &ti->address, 0, 0);
+  if (err)
+    {
+      free (ti);
+      return err;
+    }
+
+  /* Append to the tofu info list.  */
+  if (!sig->tofu)
+    sig->tofu = ti;
+  else
+    {
+      for (ti2 = sig->tofu; ti2->next; ti2 = ti2->next)
+        ;
+      ti2->next = ti;
+    }
+
+  return 0;
+}
+
+
+/* Parse a TOFU_STATS line and store it in the last tofu info of SIG.
+ *
+ *   TOFU_STATS <validity> <sign-count> 0 [<policy> [<tm1> <tm2>]]
+ */
+static gpgme_error_t
+parse_tofu_stats (gpgme_signature_t sig, char *args)
+{
+  gpgme_error_t err;
+  gpgme_tofu_info_t ti;
+  char *field[6];
+  int nfields;
+  unsigned long uval;
+
+  if (!sig->tofu)
+    return trace_gpg_error (GPG_ERR_INV_ENGINE); /* No TOFU_USER seen.  */
+  for (ti = sig->tofu; ti->next; ti = ti->next)
+    ;
+  if (ti->firstseen || ti->signcount || ti->validity || ti->policy)
+    return trace_gpg_error (GPG_ERR_INV_ENGINE); /* Already seen.  */
+
+  nfields = _gpgme_split_fields (args, field, DIM (field));
+  if (nfields < 3)
+    return trace_gpg_error (GPG_ERR_INV_ENGINE); /* Required args missing.  */
+
+  /* Note that we allow a value of up to 7 which is what we can store
+   * in the ti->validity.  */
+  err = _gpgme_strtoul_field (field[0], &uval);
+  if (err || uval > 7)
+    return trace_gpg_error (GPG_ERR_INV_ENGINE);
+  ti->validity = uval;
+
+  /* Parse the sign-count.  */
+  err = _gpgme_strtoul_field (field[1], &uval);
+  if (err)
+    return trace_gpg_error (GPG_ERR_INV_ENGINE);
+  if (uval > USHRT_MAX)
+    uval = USHRT_MAX;
+  ti->signcount = uval;
+
+  /* We skip the 0, which is RFU.  */
+
+  if (nfields == 3)
+    return 0; /* All mandatory fields parsed.  */
+
+  /* Parse the policy.  */
+  if (!strcmp (field[3], "none"))
+    ti->policy = GPGME_TOFU_POLICY_NONE;
+  else if (!strcmp (field[3], "auto"))
+    ti->policy = GPGME_TOFU_POLICY_AUTO;
+  else if (!strcmp (field[3], "good"))
+    ti->policy = GPGME_TOFU_POLICY_GOOD;
+  else if (!strcmp (field[3], "bad"))
+    ti->policy = GPGME_TOFU_POLICY_BAD;
+  else if (!strcmp (field[3], "ask"))
+    ti->policy = GPGME_TOFU_POLICY_ASK;
+  else /* "unknown" and invalid policy strings.  */
+    ti->policy = GPGME_TOFU_POLICY_UNKNOWN;
+
+  if (nfields == 4)
+    return 0; /* No more optional fields.  */
+
+  /* Parse first and last seen (none or both are required).  */
+  if (nfields < 6)
+    return trace_gpg_error (GPG_ERR_INV_ENGINE); /* "tm2" missing.  */
+  err = _gpgme_strtoul_field (field[4], &uval);
+  if (err)
+    return trace_gpg_error (GPG_ERR_INV_ENGINE);
+  if (uval > UINT_MAX)
+    uval = UINT_MAX;
+  ti->firstseen = uval;
+  err = _gpgme_strtoul_field (field[5], &uval);
+  if (err)
+    return trace_gpg_error (GPG_ERR_INV_ENGINE);
+  if (uval > UINT_MAX)
+    uval = UINT_MAX;
+  ti->lastseen = uval;
+
+  return 0;
+}
+
+
+/* Parse a TOFU_STATS_LONG line and store it in the last tofu info of SIG.  */
+static gpgme_error_t
+parse_tofu_stats_long (gpgme_signature_t sig, char *args, int raw)
+{
+  gpgme_error_t err;
+  gpgme_tofu_info_t ti;
+  char *p;
+
+  if (!sig->tofu)
+    return trace_gpg_error (GPG_ERR_INV_ENGINE); /* No TOFU_USER seen.  */
+  for (ti = sig->tofu; ti->next; ti = ti->next)
+    ;
+  if (ti->description)
+    return trace_gpg_error (GPG_ERR_INV_ENGINE); /* Already seen.  */
+
+  err = _gpgme_decode_percent_string (args, &ti->description, 0, 0);
+  if (err)
+    return err;
+
+  /* Remove the non-breaking spaces.  */
+  if (!raw)
+    {
+      for (p = ti->description; *p; p++)
+        if (*p == '~')
+          *p = ' ';
+    }
+  return 0;
+}
+
+
 /* Parse an error status line and if SET_STATUS is true update the
    result status as appropriate.  With SET_STATUS being false, only
    check for an error.  */
@@ -766,6 +947,21 @@ _gpgme_verify_status_handler (void *priv, gpgme_status_code_t code, char *args)
       sig->pka_address = strdup (args);
       break;
 
+    case GPGME_STATUS_TOFU_USER:
+      opd->only_newsig_seen = 0;
+      return sig ? parse_tofu_user (sig, args)
+        /*    */ : trace_gpg_error (GPG_ERR_INV_ENGINE);
+
+    case GPGME_STATUS_TOFU_STATS:
+      opd->only_newsig_seen = 0;
+      return sig ? parse_tofu_stats (sig, args)
+        /*    */ : trace_gpg_error (GPG_ERR_INV_ENGINE);
+
+    case GPGME_STATUS_TOFU_STATS_LONG:
+      opd->only_newsig_seen = 0;
+      return sig ? parse_tofu_stats_long (sig, args, ctx->raw_description)
+        /*    */ : trace_gpg_error (GPG_ERR_INV_ENGINE);
+
     case GPGME_STATUS_ERROR:
       opd->only_newsig_seen = 0;
       /* Some  error stati are informational, so we don't return an
diff --git a/tests/run-verify.c b/tests/run-verify.c
index b7be320..df8cbf6 100644
--- a/tests/run-verify.c
+++ b/tests/run-verify.c
@@ -94,9 +94,23 @@ print_validity (gpgme_validity_t val)
 
 
 static void
+print_description (const char *text, int indent)
+{
+  for (; *text; text++)
+    {
+      putchar (*text);
+      if (*text == '\n')
+        printf ("%*s", indent, "");
+    }
+  putchar ('\n');
+}
+
+
+static void
 print_result (gpgme_verify_result_t result)
 {
   gpgme_signature_t sig;
+  gpgme_tofu_info_t ti;
   int count = 0;
 
   printf ("Original file name: %s\n", nonnull(result->file_name));
@@ -126,6 +140,30 @@ print_result (gpgme_verify_result_t result)
               );
       printf ("  notations .: %s\n",
               sig->notations? "yes":"no");
+      for (ti = sig->tofu; ti; ti = ti->next)
+        {
+          printf ("  tofu addr .: %s\n", ti->address);
+          if (!sig->fpr || strcmp (sig->fpr, ti->fpr))
+            printf ("    WARNING .: fpr mismatch (%s)\n", ti->fpr);
+          printf ("    validity : %u (%s)\n", ti->validity,
+                  ti->validity == 0? "conflict" :
+                  ti->validity == 1? "no history" :
+                  ti->validity == 2? "little history" :
+                  ti->validity == 3? "enough history" :
+                  ti->validity == 4? "lot of history" : "?");
+          printf ("    policy ..: %u (%s)\n", ti->policy,
+                  ti->policy == GPGME_TOFU_POLICY_NONE? "none" :
+                  ti->policy == GPGME_TOFU_POLICY_AUTO? "auto" :
+                  ti->policy == GPGME_TOFU_POLICY_GOOD? "good" :
+                  ti->policy == GPGME_TOFU_POLICY_UNKNOWN? "unknown" :
+                  ti->policy == GPGME_TOFU_POLICY_BAD? "bad" :
+                  ti->policy == GPGME_TOFU_POLICY_ASK? "ask" : "?");
+          printf ("    sigcount : %hu\n", ti->signcount);
+          printf ("    firstseen: %u\n", ti->firstseen);
+          printf ("    lastseen : %u\n", ti->lastseen);
+          printf ("    desc ....: ");
+          print_description (nonnull (ti->description), 15);
+        }
     }
 }
 
@@ -230,6 +268,7 @@ main (int argc, char **argv)
       gpgme_set_status_cb (ctx, status_cb, NULL);
       gpgme_set_ctx_flag (ctx, "full-status", "1");
     }
+  /* gpgme_set_ctx_flag (ctx, "raw-description", "1"); */
 
   err = gpgme_data_new_from_stream (&sig, fp_sig);
   if (err)

commit dac2c5441d418536632f014c8b0e1359580279d1
Author: Werner Koch <wk at gnupg.org>
Date:   Sat May 21 10:22:57 2016 +0200

    api: Add new context flag "raw-description".
    
    * src/context.h (struct gpgme_context): Add field raw_description.
    * src/gpgme.c (gpgme_set_ctx_flag): New flag.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index 4d7a874..8d666c3 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -2752,6 +2752,12 @@ gpgme_set_status_cb returns all status lines with the exception of
 PROGRESS lines.  With the default of "0" the status callback is only
 called in certain situations.
 
+ at item "raw-description"
+Setting the @var{value} to "1" returns human readable strings in a raw
+format.  For example the non breaking space characters ("~") will not
+be removed from the @code{description} field of the
+ at code{gpgme_tofu_info_t} object.
+
 @end table
 
 This function returns @code{0} on success.
diff --git a/src/context.h b/src/context.h
index 078f0cb..de69a7a 100644
--- a/src/context.h
+++ b/src/context.h
@@ -105,6 +105,11 @@ struct gpgme_context
    * lines.  */
   unsigned int full_status : 1;
 
+  /* The Tofu info has a human readable string which is presented to
+   * the user in a directly usable format.  By enabling this flag the
+   * unmodified string, as received form gpg, will be returned.  */
+  unsigned int raw_description : 1;
+
   /* Flags for keylist mode.  */
   gpgme_keylist_mode_t keylist_mode;
 
diff --git a/src/gpgme.c b/src/gpgme.c
index 3289be9..e0cd9b0 100644
--- a/src/gpgme.c
+++ b/src/gpgme.c
@@ -93,11 +93,20 @@ gpgme_set_global_flag (const char *name, const char *value)
 gpgme_error_t
 gpgme_set_ctx_flag (gpgme_ctx_t ctx, const char *name, const char *value)
 {
+  int abool;
+
   if (!ctx || !name || !value)
     return gpg_error (GPG_ERR_INV_VALUE);
-  else if (!strcmp (name, "full-status"))
+
+  abool = *value? !!atoi (value) : 0;
+
+  if (!strcmp (name, "full-status"))
+    {
+      ctx->full_status = abool;
+    }
+  else if (!strcmp (name, "raw-description"))
     {
-      ctx->full_status = *value? !!atoi (value) : 0;
+      ctx->raw_description = abool;
     }
   else
     return gpg_error (GPG_ERR_UNKNOWN_NAME);

commit a92946a8cacc44f655249d84b316deae59e62671
Author: Werner Koch <wk at gnupg.org>
Date:   Sat May 21 10:21:06 2016 +0200

    core: New functions to help parsing of status lines.
    
    * src/conversion.c (_gpgme_split_fields): New.
    (_gpgme_strtoul_field): New.
    --
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/conversion.c b/src/conversion.c
index 0992225..c2b27a1 100644
--- a/src/conversion.c
+++ b/src/conversion.c
@@ -317,6 +317,53 @@ _gpgme_encode_percent_string (const char *src, char **destp, size_t len)
 }
 
 
+/* Split a string into space delimited fields and remove leading and
+ * trailing spaces from each field.  A pointer to the each field is
+ * stored in ARRAY.  Stop splitting at ARRAYSIZE fields.  The function
+ * modifies STRING.  The number of parsed fields is returned.
+ */
+int
+_gpgme_split_fields (char *string, char **array, int arraysize)
+{
+  int n = 0;
+  char *p, *pend;
+
+  for (p = string; *p == ' '; p++)
+    ;
+  do
+    {
+      if (n == arraysize)
+        break;
+      array[n++] = p;
+      pend = strchr (p, ' ');
+      if (!pend)
+        break;
+      *pend++ = 0;
+      for (p = pend; *p == ' '; p++)
+        ;
+    }
+  while (*p);
+
+  return n;
+}
+
+/* Convert the field STRING into an unsigned long value.  Check for
+ * trailing garbage.  */
+gpgme_error_t
+_gpgme_strtoul_field (const char *string, unsigned long *result)
+{
+  char *endp;
+
+  gpg_err_set_errno (0);
+  *result = strtoul (string, &endp, 0);
+  if (errno)
+    return gpg_error_from_syserror ();
+  if (endp == string || *endp)
+    return gpg_error (GPG_ERR_INV_VALUE);
+  return 0;
+}
+
+
 #ifdef HAVE_W32_SYSTEM
 static time_t
 _gpgme_timegm (struct tm *tm)
diff --git a/src/util.h b/src/util.h
index 365f1d8..9c62f57 100644
--- a/src/util.h
+++ b/src/util.h
@@ -124,6 +124,15 @@ gpgme_error_t _gpgme_decode_percent_string (const char *src, char **destp,
 gpgme_error_t _gpgme_encode_percent_string (const char *src, char **destp,
 					    size_t len);
 
+/* Split a string into space delimited fields and remove leading and
+ * trailing spaces from each field.  A pointer to the each field is
+ * stored in ARRAY.  Stop splitting at ARRAYSIZE fields.  The function
+ * modifies STRING.  The number of parsed fields is returned.  */
+int _gpgme_split_fields (char *string, char **array, int arraysize);
+
+/* Convert the field STRING into an unsigned long value.  Check for
+ * trailing garbage.  */
+gpgme_error_t _gpgme_strtoul_field (const char *string, unsigned long *result);
 
 /* Parse the string TIMESTAMP into a time_t.  The string may either be
    seconds since Epoch or in the ISO 8601 format like

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

Summary of changes:
 NEWS               |   9 ++-
 doc/gpgme.texi     |   6 ++
 src/context.h      |   5 ++
 src/conversion.c   |  47 +++++++++++++
 src/gpgme.c        |  13 +++-
 src/gpgme.h.in     |  61 ++++++++++++++++-
 src/status-table.c |   3 +
 src/util.h         |   9 +++
 src/verify.c       | 196 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/run-verify.c |  39 +++++++++++
 10 files changed, 384 insertions(+), 4 deletions(-)


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



From cvs at cvs.gnupg.org  Sat May 21 11:44:42 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Sat, 21 May 2016 11:44:42 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.12-12-g027c4e5
Message-ID: <E1b43R1-0005st-Qu@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  027c4e55522b8e18711a3331932a9869ab89ca26 (commit)
       via  fd973ee1c18aa8fe764e09ba4dff589309b2d78d (commit)
       via  437c97ab6a34ff1936001dd05209193b4466a81d (commit)
      from  a69d3c122c47ad8f857ab749e94b8b63e8d64623 (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 027c4e55522b8e18711a3331932a9869ab89ca26
Author: Werner Koch <wk at gnupg.org>
Date:   Sat May 21 11:41:49 2016 +0200

    gpg: Pass CTRL object down to the trust functions
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/gpg.c b/g10/gpg.c
index 006c95b..3e0ae3f 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -4432,12 +4432,12 @@ main (int argc, char **argv)
       case aUpdateTrustDB:
 	if( argc )
 	    wrong_args("--update-trustdb");
-	update_trustdb();
+	update_trustdb (ctrl);
 	break;
 
       case aCheckTrustDB:
         /* Old versions allowed for arguments - ignore them */
-        check_trustdb();
+        check_trustdb (ctrl);
 	break;
 
       case aFixTrustDB:
diff --git a/g10/gpgv.c b/g10/gpgv.c
index 7e87176..ea26659 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -247,8 +247,9 @@ g10_exit( int rc )
  * this utility assumes that all keys in the keyring are trustworthy
  */
 int
-check_signatures_trust( PKT_signature *sig )
+check_signatures_trust (ctrl_t ctrl, PKT_signature *sig)
 {
+  (void)ctrl;
   (void)sig;
   return 0;
 }
@@ -280,22 +281,25 @@ cache_disabled_value(PKT_public_key *pk)
 }
 
 void
-check_trustdb_stale(void)
+check_trustdb_stale (ctrl_t ctrl)
 {
+  (void)ctrl;
 }
 
 int
-get_validity_info (PKT_public_key *pk, PKT_user_id *uid)
+get_validity_info (ctrl_t ctrl, PKT_public_key *pk, PKT_user_id *uid)
 {
+  (void)ctrl;
   (void)pk;
   (void)uid;
   return '?';
 }
 
 unsigned int
-get_validity (PKT_public_key *pk, PKT_user_id *uid, PKT_signature *sig,
-	      int may_ask)
+get_validity (ctrl_t ctrl, PKT_public_key *pk, PKT_user_id *uid,
+              PKT_signature *sig, int may_ask)
 {
+  (void)ctrl;
   (void)pk;
   (void)uid;
   (void)sig;
@@ -311,8 +315,9 @@ trust_value_to_string (unsigned int value)
 }
 
 const char *
-uid_trust_string_fixed (PKT_public_key *key, PKT_user_id *uid)
+uid_trust_string_fixed (ctrl_t ctrl, PKT_public_key *key, PKT_user_id *uid)
 {
+  (void)ctrl;
   (void)key;
   (void)uid;
   return "err";
diff --git a/g10/import.c b/g10/import.c
index 6707797..7c0d1e2 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -249,7 +249,7 @@ import_keys_internal (ctrl_t ctrl, iobuf_t inp, char **fnames, int nnames,
      interactive or by not setting no-auto-check-trustdb */
 
   if (!(options & IMPORT_FAST))
-    check_or_update_trustdb ();
+    check_or_update_trustdb (ctrl);
 
   return rc;
 }
diff --git a/g10/keydb.h b/g10/keydb.h
index 8896eea..a30cf7a 100644
--- a/g10/keydb.h
+++ b/g10/keydb.h
@@ -222,7 +222,7 @@ gpg_error_t keydb_search_fpr (KEYDB_HANDLE hd, const byte *fpr);
 
 /*-- pkclist.c --*/
 void show_revocation_reason( PKT_public_key *pk, int mode );
-int  check_signatures_trust( PKT_signature *sig );
+int  check_signatures_trust (ctrl_t ctrl, PKT_signature *sig);
 
 void release_pk_list (PK_LIST pk_list);
 int  build_pk_list (ctrl_t ctrl, strlist_t rcpts, PK_LIST *ret_pk_list);
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 200a1ab..c7288b2 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -51,7 +51,8 @@
 
 static void show_prefs (PKT_user_id * uid, PKT_signature * selfsig,
 			int verbose);
-static void show_names (estream_t fp, KBNODE keyblock, PKT_public_key * pk,
+static void show_names (ctrl_t ctrl, estream_t fp,
+                        kbnode_t keyblock, PKT_public_key * pk,
 			unsigned int flag, int with_prefs);
 static void show_key_with_all_names (ctrl_t ctrl, estream_t fp,
                                      KBNODE keyblock, int only_marked,
@@ -61,8 +62,8 @@ static void show_key_with_all_names (ctrl_t ctrl, estream_t fp,
 static void show_key_and_fingerprint (kbnode_t keyblock, int with_subkeys);
 static void show_key_and_grip (kbnode_t keyblock);
 static void subkey_expire_warning (kbnode_t keyblock);
-static int menu_adduid (KBNODE keyblock, int photo, const char *photo_name,
-                        const char *uidstr);
+static int menu_adduid (ctrl_t ctrl, kbnode_t keyblock,
+                        int photo, const char *photo_name, const char *uidstr);
 static void menu_deluid (KBNODE pub_keyblock);
 static int menu_delsig (KBNODE pub_keyblock);
 static int menu_clean (KBNODE keyblock, int self_only);
@@ -85,13 +86,13 @@ static int count_selected_uids (KBNODE keyblock);
 static int real_uids_left (KBNODE keyblock);
 static int count_selected_keys (KBNODE keyblock);
 static int menu_revsig (KBNODE keyblock);
-static int menu_revuid (KBNODE keyblock);
+static int menu_revuid (ctrl_t ctrl, kbnode_t keyblock);
 static int menu_revkey (KBNODE pub_keyblock);
 static int menu_revsubkey (KBNODE pub_keyblock);
 #ifndef NO_TRUST_MODELS
 static int enable_disable_key (KBNODE keyblock, int disable);
 #endif /*!NO_TRUST_MODELS*/
-static void menu_showphoto (KBNODE keyblock);
+static void menu_showphoto (ctrl_t ctrl, kbnode_t keyblock);
 
 static int update_trust = 0;
 
@@ -2022,7 +2023,7 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,
      and run the stale check as early as possible.  Note, that for
      non- W32 platforms it is run indirectly trough a call to
      get_validity ().  */
-  check_trustdb_stale ();
+  check_trustdb_stale (ctrl);
 #endif
 
   /* Get the public key */
@@ -2295,7 +2296,7 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,
 	  photo = 1;
 	  /* fall through */
 	case cmdADDUID:
-	  if (menu_adduid (keyblock, photo, arg_string, NULL))
+	  if (menu_adduid (ctrl, keyblock, photo, arg_string, NULL))
 	    {
 	      update_trust = 1;
 	      redisplay = 1;
@@ -2537,7 +2538,7 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,
                       n1 > 1 ? _("Really revoke all selected user IDs? (y/N) ")
 		      :        _("Really revoke this user ID? (y/N) ")))
 	      {
-		if (menu_revuid (keyblock))
+		if (menu_revuid (ctrl, keyblock))
 		  {
 		    modified = 1;
 		    redisplay = 1;
@@ -2631,7 +2632,7 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,
 
 	  show_key_with_all_names (ctrl, NULL, keyblock, 0, 0, 0, 1, 0, 0);
 	  tty_printf ("\n");
-	  if (edit_ownertrust (find_kbnode (keyblock,
+	  if (edit_ownertrust (ctrl, find_kbnode (keyblock,
 					    PKT_PUBLIC_KEY)->pkt->pkt.
 			       public_key, 1))
 	    {
@@ -2648,7 +2649,7 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,
 	  {
 	    int count = count_selected_uids (keyblock);
 	    log_assert (keyblock->pkt->pkttype == PKT_PUBLIC_KEY);
-	    show_names (NULL, keyblock, keyblock->pkt->pkt.public_key,
+	    show_names (ctrl, NULL, keyblock, keyblock->pkt->pkt.public_key,
 			count ? NODFLG_SELUID : 0, 1);
 	  }
 	  break;
@@ -2657,7 +2658,7 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,
 	  {
 	    int count = count_selected_uids (keyblock);
 	    log_assert (keyblock->pkt->pkttype == PKT_PUBLIC_KEY);
-	    show_names (NULL, keyblock, keyblock->pkt->pkt.public_key,
+	    show_names (ctrl, NULL, keyblock, keyblock->pkt->pkt.public_key,
 			count ? NODFLG_SELUID : 0, 2);
 	  }
 	  break;
@@ -2733,7 +2734,7 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,
 #endif /*!NO_TRUST_MODELS*/
 
 	case cmdSHOWPHOTO:
-	  menu_showphoto (keyblock);
+	  menu_showphoto (ctrl, keyblock);
 	  break;
 
 	case cmdCLEAN:
@@ -2863,7 +2864,7 @@ keyedit_quick_adduid (ctrl_t ctrl, const char *username, const char *newuid)
 
 #ifdef HAVE_W32_SYSTEM
   /* See keyedit_menu for why we need this.  */
-  check_trustdb_stale ();
+  check_trustdb_stale (ctrl);
 #endif
 
   /* Search the key; we don't want the whole getkey stuff here.  */
@@ -2914,7 +2915,7 @@ keyedit_quick_adduid (ctrl_t ctrl, const char *username, const char *newuid)
 
   fix_keyblock (&keyblock);
 
-  if (menu_adduid (keyblock, 0, NULL, uidstring))
+  if (menu_adduid (ctrl, keyblock, 0, NULL, uidstring))
     {
       err = keydb_update_keyblock (kdbhd, keyblock);
       if (err)
@@ -2956,7 +2957,7 @@ keyedit_quick_sign (ctrl_t ctrl, const char *fpr, strlist_t uids,
 
 #ifdef HAVE_W32_SYSTEM
   /* See keyedit_menu for why we need this.  */
-  check_trustdb_stale ();
+  check_trustdb_stale (ctrl);
 #endif
 
   /* We require a fingerprint because only this uniquely identifies a
@@ -3371,7 +3372,7 @@ show_key_with_all_names_colon (ctrl_t ctrl, estream_t fp, kbnode_t keyblock)
 	    es_putc ('e', fp);
 	  else if (!(opt.fast_list_mode || opt.no_expensive_trust_checks))
 	    {
-	      int trust = get_validity_info (pk, NULL);
+	      int trust = get_validity_info (ctrl, pk, NULL);
 	      if (trust == 'u')
 		ulti_hack = 1;
 	      es_putc (trust, fp);
@@ -3430,7 +3431,7 @@ show_key_with_all_names_colon (ctrl_t ctrl, estream_t fp, kbnode_t keyblock)
 	      int uid_validity;
 
 	      if (primary && !ulti_hack)
-		uid_validity = get_validity_info (primary, uid);
+		uid_validity = get_validity_info (ctrl, primary, uid);
 	      else
 		uid_validity = 'u';
 	      es_fprintf (fp, "%c::::::::", uid_validity);
@@ -3497,8 +3498,8 @@ show_key_with_all_names_colon (ctrl_t ctrl, estream_t fp, kbnode_t keyblock)
 
 
 static void
-show_names (estream_t fp,
-            KBNODE keyblock, PKT_public_key * pk, unsigned int flag,
+show_names (ctrl_t ctrl, estream_t fp,
+            kbnode_t keyblock, PKT_public_key * pk, unsigned int flag,
 	    int with_prefs)
 {
   KBNODE node;
@@ -3513,7 +3514,7 @@ show_names (estream_t fp,
 	  if (!flag || (flag && (node->flag & flag)))
 	    {
 	      if (!(flag & NODFLG_MARK_A) && pk)
-		tty_fprintf (fp, "%s ", uid_trust_string_fixed (pk, uid));
+		tty_fprintf (fp, "%s ", uid_trust_string_fixed (ctrl, pk, uid));
 
 	      if (flag & NODFLG_MARK_A)
 		tty_fprintf (fp, "     ");
@@ -3600,12 +3601,12 @@ show_key_with_all_names (ctrl_t ctrl, estream_t fp,
 	       * output */
 	      static int did_warn = 0;
 
-	      trust = get_validity_string (pk, NULL);
+	      trust = get_validity_string (ctrl, pk, NULL);
 	      otrust = get_ownertrust_string (pk);
 
 	      /* Show a warning once */
 	      if (!did_warn
-		  && (get_validity (pk, NULL, NULL, 0)
+		  && (get_validity (ctrl, pk, NULL, NULL, 0)
 		      & TRUST_FLAG_PENDING_CHECK))
 		{
 		  did_warn = 1;
@@ -3792,7 +3793,7 @@ show_key_with_all_names (ctrl_t ctrl, estream_t fp,
 	}
     }
 
-  show_names (fp,
+  show_names (ctrl, fp,
               keyblock, primary, only_marked ? NODFLG_MARK_A : 0, with_prefs);
 
   if (do_warn && !nowarn)
@@ -4037,8 +4038,8 @@ subkey_expire_warning (kbnode_t keyblock)
  * user id.
  */
 static int
-menu_adduid (kbnode_t pub_keyblock, int photo, const char *photo_name,
-             const char *uidstring)
+menu_adduid (ctrl_t ctrl, kbnode_t pub_keyblock,
+             int photo, const char *photo_name, const char *uidstring)
 {
   PKT_user_id *uid;
   PKT_public_key *pk = NULL;
@@ -4100,7 +4101,7 @@ menu_adduid (kbnode_t pub_keyblock, int photo, const char *photo_name,
 	    }
 	}
 
-      uid = generate_photo_id (pk, photo_name);
+      uid = generate_photo_id (ctrl, pk, photo_name);
     }
   else
     uid = generate_user_id (pub_keyblock, uidstring);
@@ -6015,7 +6016,7 @@ reloop:			/* (must use this, because we are modifing the list) */
 /* Revoke a user ID (i.e. revoke a user ID selfsig).  Return true if
    keyblock changed.  */
 static int
-menu_revuid (KBNODE pub_keyblock)
+menu_revuid (ctrl_t ctrl, kbnode_t pub_keyblock)
 {
   PKT_public_key *pk = pub_keyblock->pkt->pkt.public_key;
   KBNODE node;
@@ -6096,7 +6097,7 @@ menu_revuid (KBNODE pub_keyblock)
 		/* If the trustdb has an entry for this key+uid then the
 		   trustdb needs an update. */
 		if (!update_trust
-		    && (get_validity (pk, uid, NULL, 0) & TRUST_MASK) >=
+		    && (get_validity (ctrl, pk, uid, NULL, 0) & TRUST_MASK) >=
 		    TRUST_UNDEFINED)
 		  update_trust = 1;
 #endif /*!NO_TRUST_MODELS*/
@@ -6258,7 +6259,7 @@ enable_disable_key (KBNODE keyblock, int disable)
 
 
 static void
-menu_showphoto (KBNODE keyblock)
+menu_showphoto (ctrl_t ctrl, kbnode_t keyblock)
 {
   KBNODE node;
   int select_all = !count_selected_uids (keyblock);
@@ -6295,7 +6296,7 @@ menu_showphoto (KBNODE keyblock)
 				    "key %s (uid %d)\n"),
 				  image_type_to_string (type, 1),
 				  (ulong) size, keystr_from_pk (pk), count);
-		      show_photos (&uid->attribs[i], 1, pk, uid);
+		      show_photos (ctrl, &uid->attribs[i], 1, pk, uid);
 		    }
 		}
 	    }
diff --git a/g10/keylist.c b/g10/keylist.c
index 1649991..763edac 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -130,7 +130,7 @@ public_key_list (ctrl_t ctrl, strlist_t list, int locate_mode)
      is very bad for W32 because of a sharing violation. For real OSes
      it might lead to false results if we are later listing a keyring
      which is associated with the inode of a deleted file.  */
-  check_trustdb_stale ();
+  check_trustdb_stale (ctrl);
 
 #ifdef USE_TOFU
   tofu_begin_batch_update ();
@@ -154,7 +154,7 @@ secret_key_list (ctrl_t ctrl, strlist_t list)
 {
   (void)ctrl;
 
-  check_trustdb_stale ();
+  check_trustdb_stale (ctrl);
 
   if (!list)
     list_all (ctrl, 1, 0);
@@ -1010,7 +1010,7 @@ list_keyblock_pka (ctrl_t ctrl, kbnode_t keyblock)
 
 
 static void
-list_keyblock_print (KBNODE keyblock, int secret, int fpr,
+list_keyblock_print (ctrl_t ctrl, kbnode_t keyblock, int secret, int fpr,
                      struct keylist_context *listctx)
 {
   int rc;
@@ -1051,7 +1051,7 @@ list_keyblock_print (KBNODE keyblock, int secret, int fpr,
   else
     s2k_char = ' ';
 
-  check_trustdb_stale ();
+  check_trustdb_stale (ctrl);
 
 
   es_fprintf (es_stdout, "%s%c  %s/%s %s",
@@ -1088,7 +1088,7 @@ list_keyblock_print (KBNODE keyblock, int secret, int fpr,
      include, but it looks sort of confusing in the listing... */
   if (opt.list_options & LIST_SHOW_VALIDITY)
     {
-      int validity = get_validity (pk, NULL, NULL, 0);
+      int validity = get_validity (ctrl, pk, NULL, NULL, 0);
       es_fprintf (es_stdout, " [%s]", trust_value_to_string (validity));
     }
 #endif
@@ -1134,9 +1134,9 @@ list_keyblock_print (KBNODE keyblock, int secret, int fpr,
 	    {
 	      const char *validity;
 
-	      validity = uid_trust_string_fixed (pk, uid);
+	      validity = uid_trust_string_fixed (ctrl, pk, uid);
 	      indent = ((keystrlen () + (opt.legacy_list_mode? 9:11))
-                        - atoi (uid_trust_string_fixed (NULL, NULL)));
+                        - atoi (uid_trust_string_fixed (ctrl, NULL, NULL)));
 	      if (indent < 0 || indent > 40)
 		indent = 0;
 
@@ -1174,7 +1174,7 @@ list_keyblock_print (KBNODE keyblock, int secret, int fpr,
             }
 
 	  if ((opt.list_options & LIST_SHOW_PHOTOS) && uid->attribs != NULL)
-	    show_photos (uid->attribs, uid->numattribs, pk, uid);
+	    show_photos (ctrl, uid->attribs, uid->numattribs, pk, uid);
 	}
       else if (node->pkt->pkttype == PKT_PUBLIC_SUBKEY)
 	{
@@ -1390,7 +1390,8 @@ print_revokers (estream_t fp, PKT_public_key * pk)
    record (i.e. requested via --list-secret-key).  If HAS_SECRET a
    secret key is available even if SECRET is not set.  */
 static void
-list_keyblock_colon (KBNODE keyblock, int secret, int has_secret, int fpr)
+list_keyblock_colon (ctrl_t ctrl, kbnode_t keyblock,
+                     int secret, int has_secret, int fpr)
 {
   int rc;
   KBNODE kbctx;
@@ -1437,7 +1438,7 @@ list_keyblock_colon (KBNODE keyblock, int secret, int has_secret, int fpr)
     ;
   else
     {
-      trustletter = get_validity_info (pk, NULL);
+      trustletter = get_validity_info (ctrl, pk, NULL);
       if (trustletter == 'u')
         ulti_hack = 1;
       es_putc (trustletter, es_stdout);
@@ -1519,7 +1520,7 @@ list_keyblock_colon (KBNODE keyblock, int secret, int has_secret, int fpr)
 	      int uid_validity;
 
 	      if (!ulti_hack)
-		uid_validity = get_validity_info (pk, uid);
+		uid_validity = get_validity_info (ctrl, pk, uid);
 	      else
 		uid_validity = 'u';
 	      es_fprintf (es_stdout, "%s:%c::::", str, uid_validity);
@@ -1814,9 +1815,9 @@ list_keyblock (ctrl_t ctrl,
   if (opt.print_pka_records || opt.print_dane_records)
     list_keyblock_pka (ctrl, keyblock);
   else if (opt.with_colons)
-    list_keyblock_colon (keyblock, secret, has_secret, fpr);
+    list_keyblock_colon (ctrl, keyblock, secret, has_secret, fpr);
   else
-    list_keyblock_print (keyblock, secret, fpr, listctx);
+    list_keyblock_print (ctrl, keyblock, secret, fpr, listctx);
   if (secret)
     es_fflush (es_stdout);
 }
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 3486abb..40659f0 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -1464,7 +1464,7 @@ keyserver_refresh (ctrl_t ctrl, strlist_t users)
   /* If the original options didn't have fast import, and the trustdb
      is dirty, rebuild. */
   if(!(opt.keyserver_options.import_options&IMPORT_FAST))
-    check_or_update_trustdb ();
+    check_or_update_trustdb (ctrl);
 
   return err;
 }
@@ -1885,7 +1885,7 @@ keyserver_fetch (ctrl_t ctrl, strlist_t urilist)
   /* If the original options didn't have fast import, and the trustdb
      is dirty, rebuild. */
   if (!(opt.keyserver_options.import_options&IMPORT_FAST))
-    check_or_update_trustdb ();
+    check_or_update_trustdb (ctrl);
 
   return 0;
 }
diff --git a/g10/mainproc.c b/g10/mainproc.c
index d56790b..a2bfae3 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -1002,7 +1002,7 @@ list_node (CTX c, kbnode_t node)
           keyid_from_pk( pk, keyid );
           if (mainkey)
             c->trustletter = (opt.fast_list_mode?
-                              0 : get_validity_info( pk, NULL));
+                              0 : get_validity_info (c->ctrl, pk, NULL));
           es_printf ("%s:", mainkey? "pub":"sub" );
           if (c->trustletter)
             es_putc (c->trustletter, es_stdout);
@@ -1603,31 +1603,31 @@ check_sig_and_print (CTX c, kbnode_t node)
     }
 
   /* Check that the message composition is valid.
-
-     Per RFC-2440bis (-15) allowed:
-
-     S{1,n}           -- detached signature.
-     S{1,n} P         -- old style PGP2 signature
-     O{1,n} P S{1,n}  -- standard OpenPGP signature.
-     C P S{1,n}       -- cleartext signature.
-
-
-          O = One-Pass Signature packet.
-          S = Signature packet.
-          P = OpenPGP Message packet (Encrypted | Compressed | Literal)
-                 (Note that the current rfc2440bis draft also allows
-                  for a signed message but that does not work as it
-                  introduces ambiguities.)
-              We keep track of these packages using the marker packet
-              CTRLPKT_PLAINTEXT_MARK.
-          C = Marker packet for cleartext signatures.
-
-     We reject all other messages.
-
-     Actually we are calling this too often, i.e. for verification of
-     each message but better have some duplicate work than to silently
-     introduce a bug here.
-  */
+   *
+   * Per RFC-2440bis (-15) allowed:
+   *
+   * S{1,n}           -- detached signature.
+   * S{1,n} P         -- old style PGP2 signature
+   * O{1,n} P S{1,n}  -- standard OpenPGP signature.
+   * C P S{1,n}       -- cleartext signature.
+   *
+   *
+   *      O = One-Pass Signature packet.
+   *      S = Signature packet.
+   *      P = OpenPGP Message packet (Encrypted | Compressed | Literal)
+   *             (Note that the current rfc2440bis draft also allows
+   *              for a signed message but that does not work as it
+   *              introduces ambiguities.)
+   *          We keep track of these packages using the marker packet
+   *          CTRLPKT_PLAINTEXT_MARK.
+   *      C = Marker packet for cleartext signatures.
+   *
+   * We reject all other messages.
+   *
+   * Actually we are calling this too often, i.e. for verification of
+   * each message but better have some duplicate work than to silently
+   * introduce a bug here.
+   */
   {
     kbnode_t n;
     int n_onepass, n_sig;
@@ -1871,7 +1871,7 @@ check_sig_and_print (CTX c, kbnode_t node)
 	     does not print a LF we need to compute the validity
 	     before calling that function.  */
           if ((opt.verify_options & VERIFY_SHOW_UID_VALIDITY))
-            valid = get_validity (pk, un->pkt->pkt.user_id, NULL, 0);
+            valid = get_validity (c->ctrl, pk, un->pkt->pkt.user_id, NULL, 0);
           else
             valid = 0; /* Not used.  */
 
@@ -1950,7 +1950,8 @@ check_sig_and_print (CTX c, kbnode_t node)
                   dump_attribs (un->pkt->pkt.user_id, pk);
 
                   if (opt.verify_options&VERIFY_SHOW_PHOTOS)
-                    show_photos (un->pkt->pkt.user_id->attribs,
+                    show_photos (c->ctrl,
+                                 un->pkt->pkt.user_id->attribs,
                                  un->pkt->pkt.user_id->numattribs,
                                  pk ,un->pkt->pkt.user_id);
                 }
@@ -1973,7 +1974,8 @@ check_sig_and_print (CTX c, kbnode_t node)
 		       actually ask the user to update any trust
 		       information.  */
                     valid = (trust_value_to_string
-                             (get_validity (pk, un->pkt->pkt.user_id, sig, 0)));
+                             (get_validity (c->ctrl, pk,
+                                            un->pkt->pkt.user_id, sig, 0)));
                   log_printf (" [%s]\n",valid);
                 }
               else
@@ -2061,7 +2063,7 @@ check_sig_and_print (CTX c, kbnode_t node)
         {
           if ((opt.verify_options & VERIFY_PKA_LOOKUPS))
             pka_uri_from_sig (c, sig); /* Make sure PKA info is available. */
-          rc = check_signatures_trust (sig);
+          rc = check_signatures_trust (c->ctrl, sig);
         }
 
       /* Print extra information about the signature.  */
diff --git a/g10/photoid.c b/g10/photoid.c
index f6e625a..e188653 100644
--- a/g10/photoid.c
+++ b/g10/photoid.c
@@ -48,7 +48,7 @@
 /* Generate a new photo id packet, or return NULL if canceled.
    FIXME:  Should we add a duplicates check similar to generate_user_id? */
 PKT_user_id *
-generate_photo_id(PKT_public_key *pk,const char *photo_name)
+generate_photo_id (ctrl_t ctrl, PKT_public_key *pk,const char *photo_name)
 {
   PKT_user_id *uid;
   int error=1,i;
@@ -163,7 +163,7 @@ generate_photo_id(PKT_public_key *pk,const char *photo_name)
          "user" may not be able to dismiss a viewer window! */
       if(opt.command_fd==-1)
 	{
-	  show_photos (uid->attribs, uid->numattribs, pk, uid);
+	  show_photos (ctrl, uid->attribs, uid->numattribs, pk, uid);
 	  switch(cpr_get_answer_yes_no_quit("photoid.jpeg.okay",
 					 _("Is this photo correct (y/N/q)? ")))
 	    {
@@ -286,9 +286,10 @@ static const char *get_default_photo_command(void)
 }
 #endif
 
+
 void
-show_photos(const struct user_attribute *attrs, int count,
-            PKT_public_key *pk, PKT_user_id *uid)
+show_photos (ctrl_t ctrl, const struct user_attribute *attrs, int count,
+             PKT_public_key *pk, PKT_user_id *uid)
 {
 #ifdef DISABLE_PHOTO_VIEWER
   (void)attrs;
@@ -303,8 +304,8 @@ show_photos(const struct user_attribute *attrs, int count,
 
   memset (&args, 0, sizeof(args));
   args.pk = pk;
-  args.validity_info = get_validity_info (pk, uid);
-  args.validity_string = get_validity_string (pk, uid);
+  args.validity_info = get_validity_info (ctrl, pk, uid);
+  args.validity_string = get_validity_string (ctrl, pk, uid);
   namehash_from_uid (uid);
   args.namehash = uid->namehash;
 
diff --git a/g10/photoid.h b/g10/photoid.h
index ec2b55f..9fc758e 100644
--- a/g10/photoid.h
+++ b/g10/photoid.h
@@ -24,10 +24,11 @@
 
 #include "packet.h"
 
-PKT_user_id *generate_photo_id(PKT_public_key *pk,const char *filename);
+PKT_user_id *generate_photo_id (ctrl_t ctrl,
+                                PKT_public_key *pk,const char *filename);
 int parse_image_header(const struct user_attribute *attr,byte *type,u32 *len);
 char *image_type_to_string(byte type,int style);
-void show_photos (const struct user_attribute *attrs, int count,
+void show_photos (ctrl_t ctrl, const struct user_attribute *attrs, int count,
                   PKT_public_key *pk, PKT_user_id *uid);
 
 #endif /* !_PHOTOID_H_ */
diff --git a/g10/pkclist.c b/g10/pkclist.c
index de8897a..f284107 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -178,7 +178,7 @@ show_revocation_reason( PKT_public_key *pk, int mode )
  */
 #ifndef NO_TRUST_MODELS
 static int
-do_edit_ownertrust (PKT_public_key *pk, int mode,
+do_edit_ownertrust (ctrl_t ctrl, PKT_public_key *pk, int mode,
                     unsigned *new_trust, int defer_help )
 {
   char *p;
@@ -248,7 +248,8 @@ do_edit_ownertrust (PKT_public_key *pk, int mode,
 
 		if((opt.verify_options&VERIFY_SHOW_PHOTOS)
 		   && un->pkt->pkt.user_id->attrib_data)
-		  show_photos (un->pkt->pkt.user_id->attribs,
+		  show_photos (ctrl,
+                               un->pkt->pkt.user_id->attribs,
                                un->pkt->pkt.user_id->numattribs, pk,
                                un->pkt->pkt.user_id);
 
@@ -376,14 +377,14 @@ do_edit_ownertrust (PKT_public_key *pk, int mode,
  */
 #ifndef NO_TRUST_MODELS
 int
-edit_ownertrust (PKT_public_key *pk, int mode )
+edit_ownertrust (ctrl_t ctrl, PKT_public_key *pk, int mode )
 {
   unsigned int trust = 0;
   int no_help = 0;
 
   for(;;)
     {
-      switch ( do_edit_ownertrust (pk, mode, &trust, no_help ) )
+      switch ( do_edit_ownertrust (ctrl, pk, mode, &trust, no_help ) )
         {
         case -1: /* quit */
           return -1;
@@ -526,7 +527,7 @@ write_trust_status (int statuscode, int trustlevel)
  * Returns an error code if we should not trust this signature.
  */
 int
-check_signatures_trust( PKT_signature *sig )
+check_signatures_trust (ctrl_t ctrl, PKT_signature *sig)
 {
   PKT_public_key *pk = xmalloc_clear( sizeof *pk );
   unsigned int trustlevel = TRUST_UNKNOWN;
@@ -553,7 +554,7 @@ check_signatures_trust( PKT_signature *sig )
     log_info(_("WARNING: this key might be revoked (revocation key"
 	       " not present)\n"));
 
-  trustlevel = get_validity (pk, NULL, sig, 1);
+  trustlevel = get_validity (ctrl, pk, NULL, sig, 1);
 
   if ( (trustlevel & TRUST_FLAG_REVOKED) )
     {
@@ -845,7 +846,7 @@ find_and_check_key (ctrl_t ctrl, const char *name, unsigned int use,
     }
 
   /* Key found and usable.  Check validity. */
-  trustlevel = get_validity (pk, pk->user_id, NULL, 1);
+  trustlevel = get_validity (ctrl, pk, pk->user_id, NULL, 1);
   if ( (trustlevel & TRUST_FLAG_DISABLED) )
     {
       /* Key has been disabled. */
@@ -1183,7 +1184,7 @@ build_pk_list (ctrl_t ctrl, strlist_t rcpts, PK_LIST *ret_pk_list)
                 { /* Check validity of this key. */
                   int trustlevel;
 
-                  trustlevel = get_validity (pk, pk->user_id, NULL, 1);
+                  trustlevel = get_validity (ctrl, pk, pk->user_id, NULL, 1);
                   if ( (trustlevel & TRUST_FLAG_DISABLED) )
                     {
                       tty_printf (_("Public key is disabled.\n") );
diff --git a/g10/seskey.c b/g10/seskey.c
index c41a145..d0e6b6f 100644
--- a/g10/seskey.c
+++ b/g10/seskey.c
@@ -347,6 +347,9 @@ encode_md_value (PKT_public_key *pk, gcry_md_hd_t md, int hash_algo)
         return NULL;
       if ( gcry_md_algo_info (hash_algo, GCRYCTL_GET_ASNOID, asn, &asnlen) )
         BUG();
+      log_debug ("%s: hash_algo=%d pk=%p\n", __func__, hash_algo, pk);
+      log_debug ("%s: pk->pkey[0]=%p\n", __func__, pk->pkey[0]);
+      gcry_log_debugmpi ("pkey[0]", pk->pkey[0]);
       frame = do_encode_md (md, hash_algo, gcry_md_get_algo_dlen (hash_algo),
                             gcry_mpi_get_nbits (pk->pkey[0]), asn, asnlen);
       xfree (asn);
diff --git a/g10/test-stubs.c b/g10/test-stubs.c
index 2edae18..177f35a 100644
--- a/g10/test-stubs.c
+++ b/g10/test-stubs.c
@@ -58,8 +58,9 @@ g10_exit( int rc )
  * this utility assumes that all keys in the keyring are trustworthy
  */
 int
-check_signatures_trust( PKT_signature *sig )
+check_signatures_trust (ctrl_t ctrl, PKT_signature *sig)
 {
+  (void)ctrl;
   (void)sig;
   return 0;
 }
@@ -91,22 +92,25 @@ cache_disabled_value(PKT_public_key *pk)
 }
 
 void
-check_trustdb_stale(void)
+check_trustdb_stale (ctrl_t ctrl)
 {
+  (void)ctrl;
 }
 
 int
-get_validity_info (PKT_public_key *pk, PKT_user_id *uid)
+get_validity_info (ctrl_t ctrl, PKT_public_key *pk, PKT_user_id *uid)
 {
+  (void)ctrl;
   (void)pk;
   (void)uid;
   return '?';
 }
 
 unsigned int
-get_validity (PKT_public_key *pk, PKT_user_id *uid, PKT_signature *sig,
-	      int may_ask)
+get_validity (ctrl_t ctrl, PKT_public_key *pk, PKT_user_id *uid,
+              PKT_signature *sig, int may_ask)
 {
+  (void)ctrl;
   (void)pk;
   (void)uid;
   (void)sig;
@@ -122,8 +126,9 @@ trust_value_to_string (unsigned int value)
 }
 
 const char *
-uid_trust_string_fixed (PKT_public_key *key, PKT_user_id *uid)
+uid_trust_string_fixed (ctrl_t ctrl, PKT_public_key *key, PKT_user_id *uid)
 {
+  (void)ctrl;
   (void)key;
   (void)uid;
   return "err";
diff --git a/g10/trust.c b/g10/trust.c
index b15fa04..8790754 100644
--- a/g10/trust.c
+++ b/g10/trust.c
@@ -131,7 +131,7 @@ string_to_trust_value (const char *str)
 
 
 const char *
-uid_trust_string_fixed (PKT_public_key *key, PKT_user_id *uid)
+uid_trust_string_fixed (ctrl_t ctrl, PKT_public_key *key, PKT_user_id *uid)
 {
   if (!key && !uid)
     {
@@ -151,7 +151,7 @@ uid_trust_string_fixed (PKT_public_key *key, PKT_user_id *uid)
     return                         _("[ expired]");
   else if(key)
     {
-      switch (get_validity (key, uid, NULL, 0) & TRUST_MASK)
+      switch (get_validity (ctrl, key, uid, NULL, 0) & TRUST_MASK)
         {
         case TRUST_UNKNOWN:   return _("[ unknown]");
         case TRUST_EXPIRED:   return _("[ expired]");
@@ -275,19 +275,23 @@ revalidation_mark (void)
 
 
 void
-check_trustdb_stale (void)
+check_trustdb_stale (ctrl_t ctrl)
 {
 #ifndef NO_TRUST_MODELS
-  tdb_check_trustdb_stale ();
+  tdb_check_trustdb_stale (ctrl);
+#else
+  (void)ctrl;
 #endif
 }
 
 
 void
-check_or_update_trustdb (void)
+check_or_update_trustdb (ctrl_t ctrl)
 {
 #ifndef NO_TRUST_MODELS
-  tdb_check_or_update ();
+  tdb_check_or_update (ctrl);
+#else
+  (void)ctrl;
 #endif
 }
 
@@ -298,8 +302,8 @@ check_or_update_trustdb (void)
  * otherwise, a reasonable value for the entire key is returned.
  */
 unsigned int
-get_validity (PKT_public_key *pk, PKT_user_id *uid, PKT_signature *sig,
-	      int may_ask)
+get_validity (ctrl_t ctrl, PKT_public_key *pk, PKT_user_id *uid,
+              PKT_signature *sig, int may_ask)
 {
   int rc;
   unsigned int validity;
@@ -331,7 +335,7 @@ get_validity (PKT_public_key *pk, PKT_user_id *uid, PKT_signature *sig,
 #ifdef NO_TRUST_MODELS
   validity = TRUST_UNKNOWN;
 #else
-  validity = tdb_get_validity_core (pk, uid, main_pk, sig, may_ask);
+  validity = tdb_get_validity_core (ctrl, pk, uid, main_pk, sig, may_ask);
 #endif
 
  leave:
@@ -353,14 +357,14 @@ get_validity (PKT_public_key *pk, PKT_user_id *uid, PKT_signature *sig,
 
 
 int
-get_validity_info (PKT_public_key *pk, PKT_user_id *uid)
+get_validity_info (ctrl_t ctrl, PKT_public_key *pk, PKT_user_id *uid)
 {
   int trustlevel;
 
   if (!pk)
     return '?';  /* Just in case a NULL PK is passed.  */
 
-  trustlevel = get_validity (pk, uid, NULL, 0);
+  trustlevel = get_validity (ctrl, pk, uid, NULL, 0);
   if ((trustlevel & TRUST_FLAG_REVOKED))
     return 'r';
   return trust_letter (trustlevel);
@@ -368,14 +372,14 @@ get_validity_info (PKT_public_key *pk, PKT_user_id *uid)
 
 
 const char *
-get_validity_string (PKT_public_key *pk, PKT_user_id *uid)
+get_validity_string (ctrl_t ctrl, PKT_public_key *pk, PKT_user_id *uid)
 {
   int trustlevel;
 
   if (!pk)
     return "err";  /* Just in case a NULL PK is passed.  */
 
-  trustlevel = get_validity (pk, uid, NULL, 0);
+  trustlevel = get_validity (ctrl, pk, uid, NULL, 0);
   if ((trustlevel & TRUST_FLAG_REVOKED))
     return _("revoked");
   return trust_value_to_string (trustlevel);
diff --git a/g10/trustdb.c b/g10/trustdb.c
index 195a006..e5f7121 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -70,7 +70,7 @@ static struct key_item *utk_list;      /* all ultimately trusted keys */
 
 static int pending_check_trustdb;
 
-static int validate_keys (int interactive);
+static int validate_keys (ctrl_t ctrl, int interactive);
 
 

 /**********************************************
@@ -494,7 +494,7 @@ init_trustdb ()
  * when a check is due.  This can be used to run the check from a crontab
  */
 void
-check_trustdb ()
+check_trustdb (ctrl_t ctrl)
 {
   init_trustdb();
   if (opt.trust_model == TM_PGP || opt.trust_model == TM_CLASSIC
@@ -519,7 +519,7 @@ check_trustdb ()
 	    }
 	}
 
-      validate_keys (0);
+      validate_keys (ctrl, 0);
     }
   else
     log_info (_("no need for a trustdb check with '%s' trust model\n"),
@@ -531,12 +531,12 @@ check_trustdb ()
  * Recreate the WoT.
  */
 void
-update_trustdb()
+update_trustdb (ctrl_t ctrl)
 {
-  init_trustdb();
+  init_trustdb ();
   if (opt.trust_model == TM_PGP || opt.trust_model == TM_CLASSIC
       || opt.trust_model == TM_TOFU_PGP || opt.trust_model == TM_TOFU)
-    validate_keys (1);
+    validate_keys (ctrl, 1);
   else
     log_info (_("no need for a trustdb update with '%s' trust model\n"),
 	      trust_model_string(opt.trust_model));
@@ -565,14 +565,14 @@ trustdb_pending_check(void)
 /* If the trustdb is dirty, and we're interactive, update it.
    Otherwise, check it unless no-auto-check-trustdb is set. */
 void
-tdb_check_or_update (void)
+tdb_check_or_update (ctrl_t ctrl)
 {
-  if(trustdb_pending_check())
+  if (trustdb_pending_check ())
     {
-      if(opt.interactive)
-	update_trustdb();
-      else if(!opt.no_auto_check_trustdb)
-	check_trustdb();
+      if (opt.interactive)
+	update_trustdb (ctrl);
+      else if (!opt.no_auto_check_trustdb)
+	check_trustdb (ctrl);
     }
 }
 
@@ -938,7 +938,7 @@ tdb_cache_disabled_value (PKT_public_key *pk)
 
 
 void
-tdb_check_trustdb_stale (void)
+tdb_check_trustdb_stale (ctrl_t ctrl)
 {
   static int did_nextcheck=0;
 
@@ -968,7 +968,7 @@ tdb_check_trustdb_stale (void)
             {
               if (!opt.quiet)
                 log_info (_("checking the trustdb\n"));
-              validate_keys (0);
+              validate_keys (ctrl, 0);
             }
         }
     }
@@ -981,7 +981,8 @@ tdb_check_trustdb_stale (void)
  * by the TOFU code to record statistics.
  */
 unsigned int
-tdb_get_validity_core (PKT_public_key *pk, PKT_user_id *uid,
+tdb_get_validity_core (ctrl_t ctrl,
+                       PKT_public_key *pk, PKT_user_id *uid,
                        PKT_public_key *main_pk,
 		       PKT_signature *sig,
 		       int may_ask)
@@ -1008,7 +1009,7 @@ tdb_get_validity_core (PKT_public_key *pk, PKT_user_id *uid,
   if (trustdb_args.no_trustdb && opt.trust_model == TM_ALWAYS)
     return TRUST_UNKNOWN;
 
-  check_trustdb_stale();
+  check_trustdb_stale (ctrl);
 
   if(opt.trust_model==TM_DIRECT)
     {
@@ -1267,7 +1268,7 @@ enum_cert_paths_print (void **context, FILE *fp,
  ****************************************/
 
 static int
-ask_ownertrust (u32 *kid,int minimum)
+ask_ownertrust (ctrl_t ctrl, u32 *kid, int minimum)
 {
   PKT_public_key *pk;
   int rc;
@@ -1291,7 +1292,7 @@ ask_ownertrust (u32 *kid,int minimum)
     }
   else
     {
-      ot=edit_ownertrust(pk,0);
+      ot=edit_ownertrust (ctrl, pk, 0);
       if(ot>0)
 	ot = tdb_get_ownertrust (pk);
       else if(ot==0)
@@ -1881,7 +1882,7 @@ reset_trust_records(void)
  *
  */
 static int
-validate_keys (int interactive)
+validate_keys (ctrl_t ctrl, int interactive)
 {
   int rc = 0;
   int quit=0;
@@ -1989,7 +1990,7 @@ validate_keys (int interactive)
 
           if (interactive && k->ownertrust == TRUST_UNKNOWN)
 	    {
-	      k->ownertrust = ask_ownertrust (k->kid,min);
+	      k->ownertrust = ask_ownertrust (ctrl, k->kid,min);
 
 	      if (k->ownertrust == (unsigned int)(-1))
 		{
diff --git a/g10/trustdb.h b/g10/trustdb.h
index 7e1307d..47d7b72 100644
--- a/g10/trustdb.h
+++ b/g10/trustdb.h
@@ -83,20 +83,22 @@ void register_trusted_key (const char *string);
 
 const char *trust_value_to_string (unsigned int value);
 int string_to_trust_value (const char *str);
-const char *uid_trust_string_fixed (PKT_public_key *key, PKT_user_id *uid);
+const char *uid_trust_string_fixed (ctrl_t ctrl,
+                                    PKT_public_key *key, PKT_user_id *uid);
 
 unsigned int get_ownertrust (PKT_public_key *pk);
 void update_ownertrust (PKT_public_key *pk, unsigned int new_trust);
 int clear_ownertrusts (PKT_public_key *pk);
 
 void revalidation_mark (void);
-void check_trustdb_stale (void);
-void check_or_update_trustdb (void);
+void check_trustdb_stale (ctrl_t ctrl);
+void check_or_update_trustdb (ctrl_t ctrl);
 
-unsigned int get_validity (PKT_public_key *pk, PKT_user_id *uid,
+unsigned int get_validity (ctrl_t ctrl, PKT_public_key *pk, PKT_user_id *uid,
 			   PKT_signature *sig, int may_ask);
-int get_validity_info (PKT_public_key *pk, PKT_user_id *uid);
-const char *get_validity_string (PKT_public_key *pk, PKT_user_id *uid);
+int get_validity_info (ctrl_t ctrl, PKT_public_key *pk, PKT_user_id *uid);
+const char *get_validity_string (ctrl_t ctrl,
+                                 PKT_public_key *pk, PKT_user_id *uid);
 
 void mark_usable_uid_certs (kbnode_t keyblock, kbnode_t uidnode,
                             u32 *main_kid, struct key_item *klist,
@@ -115,22 +117,23 @@ void tdb_register_trusted_keyid (u32 *keyid);
 void tdb_register_trusted_key (const char *string);
 /* Returns whether KID is on the list of ultimately trusted keys.  */
 int tdb_keyid_is_utk (u32 *kid);
-void check_trustdb (void);
-void update_trustdb (void);
+void check_trustdb (ctrl_t ctrl);
+void update_trustdb (ctrl_t ctrl);
 int setup_trustdb( int level, const char *dbname );
 void how_to_fix_the_trustdb (void);
 const char *trust_model_string (int model);
 void init_trustdb( void );
-void tdb_check_trustdb_stale (void);
+void tdb_check_trustdb_stale (ctrl_t ctrl);
 void sync_trustdb( void );
 
 void tdb_revalidation_mark (void);
 int trustdb_pending_check(void);
-void tdb_check_or_update (void);
+void tdb_check_or_update (ctrl_t ctrl);
 
 int tdb_cache_disabled_value (PKT_public_key *pk);
 
-unsigned int tdb_get_validity_core (PKT_public_key *pk, PKT_user_id *uid,
+unsigned int tdb_get_validity_core (ctrl_t ctrl,
+                                    PKT_public_key *pk, PKT_user_id *uid,
                                     PKT_public_key *main_pk,
 				    PKT_signature *sig, int may_ask);
 
@@ -158,6 +161,6 @@ void export_ownertrust(void);
 void import_ownertrust(const char *fname);
 
 /*-- pkclist.c --*/
-int edit_ownertrust (PKT_public_key *pk, int mode );
+int edit_ownertrust (ctrl_t ctrl, PKT_public_key *pk, int mode);
 
 #endif /*G10_TRUSTDB_H*/

commit fd973ee1c18aa8fe764e09ba4dff589309b2d78d
Author: Werner Koch <wk at gnupg.org>
Date:   Sat May 21 11:06:24 2016 +0200

    gpg: Fix the TOFU_STATS_LONG status.
    
    * g10/tofu.c (show_statistics): Print TOFU STATS with formatting
    characters.
    --
    
    We better leave the non-breaking space character in the status
    messages so that the caller can make use of them.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/doc/DETAILS b/doc/DETAILS
index 2710007..59f8d56 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -688,7 +688,7 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB:
 
     This status identifies the key and the userid for all following
     Tofu information.  The fingerprint is the fingerprint of the
-    primary key and the mbox is in general the mailbox part of the
+    primary key and the mbox is in general the addr-spec part of the
     userid encoded in UTF-8 and percent escaped.
 
 *** TOFU_STATS <validity> <sign-count> 0 [<policy> [<tm1> <tm2>]]
@@ -730,8 +730,8 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB:
 *** PKA_TRUST_
     This is is one:
 
-    - PKA_TRUST_GOOD <mailbox>
-    - PKA_TRUST_BAD  <mailbox>
+    - PKA_TRUST_GOOD <addr-spec>
+    - PKA_TRUST_BAD  <addr-spec>
 
     Depending on the outcome of the PKA check one of the above status
     codes is emitted in addition to a =TRUST_*= status.
diff --git a/g10/tofu.c b/g10/tofu.c
index e591aa5..b73ad93 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -2101,7 +2101,7 @@ get_trust (struct dbs *dbs, const char *fingerprint, const char *email,
 	/* TRANSLATORS: Please translate the text found in the source
 	   file below.  We don't directly internationalize that text
 	   so that we can tweak it without breaking translations.  */
-	const char *text = _("TOFU detected a binding conflict");
+	char *text = _("TOFU detected a binding conflict");
         char *textbuf;
 	if (strcmp (text, "TOFU detected a binding conflict") == 0)
 	  /* No translation.  Use the English text.  */
@@ -2542,15 +2542,18 @@ show_statistics (struct dbs *dbs, const char *fingerprint,
               log_fatal ("error snatching memory stream\n");
             msg = format_text (tmpmsg, 0, 72, 80);
             es_free (tmpmsg);
-            for (p=msg; *p; p++)
-              if (*p == '~')
-                *p = ' ';
 
             /* Print a status line but suppress the trailing LF.
              * Spaces are not percent escaped. */
             if (*msg)
               write_status_buffer (STATUS_TOFU_STATS_LONG,
                                    msg, strlen (msg)-1, -1);
+
+            /* Remove the non-breaking space markers.  */
+            for (p=msg; *p; p++)
+              if (*p == '~')
+                *p = ' ';
+
           }
 
 	  log_string (GPGRT_LOG_INFO, msg);

commit 437c97ab6a34ff1936001dd05209193b4466a81d
Author: Werner Koch <wk at gnupg.org>
Date:   Thu May 19 09:35:20 2016 +0200

    gpg: Print "[  never ]" instead of err for validity.
    
    * g10/trust.c (uid_trust_string_fixed): Handle NEVER.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/trust.c b/g10/trust.c
index 82de7cb..b15fa04 100644
--- a/g10/trust.c
+++ b/g10/trust.c
@@ -156,6 +156,7 @@ uid_trust_string_fixed (PKT_public_key *key, PKT_user_id *uid)
         case TRUST_UNKNOWN:   return _("[ unknown]");
         case TRUST_EXPIRED:   return _("[ expired]");
         case TRUST_UNDEFINED: return _("[  undef ]");
+        case TRUST_NEVER:     return _("[  never ]");
         case TRUST_MARGINAL:  return _("[marginal]");
         case TRUST_FULLY:     return _("[  full  ]");
         case TRUST_ULTIMATE:  return _("[ultimate]");

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

Summary of changes:
 doc/DETAILS      |  6 +++---
 g10/gpg.c        |  4 ++--
 g10/gpgv.c       | 17 ++++++++++------
 g10/import.c     |  2 +-
 g10/keydb.h      |  2 +-
 g10/keyedit.c    | 61 ++++++++++++++++++++++++++++---------------------------
 g10/keylist.c    | 27 ++++++++++++------------
 g10/keyserver.c  |  4 ++--
 g10/mainproc.c   | 62 +++++++++++++++++++++++++++++---------------------------
 g10/photoid.c    | 13 ++++++------
 g10/photoid.h    |  5 +++--
 g10/pkclist.c    | 17 ++++++++--------
 g10/seskey.c     |  3 +++
 g10/test-stubs.c | 17 ++++++++++------
 g10/tofu.c       | 11 ++++++----
 g10/trust.c      | 31 ++++++++++++++++------------
 g10/trustdb.c    | 41 +++++++++++++++++++------------------
 g10/trustdb.h    | 27 +++++++++++++-----------
 18 files changed, 191 insertions(+), 159 deletions(-)


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



From cvs at cvs.gnupg.org  Sat May 21 12:53:14 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Sat, 21 May 2016 12:53:14 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.12-15-g006a612
Message-ID: <E1b44VK-0002LG-O0@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  006a6126131ffd59d9a47889ac031f932ecc5d0b (commit)
       via  8abd1f53fd57ac1d0e417b95d7a7af5a93a8dbf7 (commit)
       via  754b1c463034a634a678d8efc76c27fd46aad9b9 (commit)
      from  027c4e55522b8e18711a3331932a9869ab89ca26 (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 006a6126131ffd59d9a47889ac031f932ecc5d0b
Author: Werner Koch <wk at gnupg.org>
Date:   Sat May 21 12:49:12 2016 +0200

    gpg: Explicitly close a combined Tofu DB.
    
    * g10/tofu.c (tofu_closedbs): Close combined DB.

diff --git a/g10/tofu.c b/g10/tofu.c
index 314c76b..8c639db 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -84,8 +84,8 @@ enum db_type
    theis case, NAME is either the normalized email address or the
    fingerprint.
 
-   To initialize this data structure, call opendbs().  When you are
-   done, clean it up using closedbs().  To get a handle to a database,
+   To initialize this data structure, call opendbs().  Cleanup is done
+   when the CTRL object is released.  To get a handle to a database,
    use the getdb() function.  This will either return an existing
    handle or open a new DB connection, as appropriate.  */
 struct db
@@ -1063,7 +1063,12 @@ tofu_closedbs (ctrl_t ctrl)
   if (!dbs)
     return;  /* Not initialized.  */
 
-  if (dbs->db)
+  if (dbs->db && dbs->db->type == DB_COMBINED)
+    {
+      log_assert (!dbs->db->next);
+      closedb (dbs->db);
+    }
+  else if (dbs->db)
     {
       struct db *old_head = db_cache;
       struct db *db;

commit 8abd1f53fd57ac1d0e417b95d7a7af5a93a8dbf7
Author: Werner Koch <wk at gnupg.org>
Date:   Sat May 21 12:33:41 2016 +0200

    gpg: Remove debug output accidently introduced with 027c4e5.
    
    --
    
    Fixes-commit: 027c4e55522b8e18711a3331932a9869ab89ca26
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/seskey.c b/g10/seskey.c
index d0e6b6f..c41a145 100644
--- a/g10/seskey.c
+++ b/g10/seskey.c
@@ -347,9 +347,6 @@ encode_md_value (PKT_public_key *pk, gcry_md_hd_t md, int hash_algo)
         return NULL;
       if ( gcry_md_algo_info (hash_algo, GCRYCTL_GET_ASNOID, asn, &asnlen) )
         BUG();
-      log_debug ("%s: hash_algo=%d pk=%p\n", __func__, hash_algo, pk);
-      log_debug ("%s: pk->pkey[0]=%p\n", __func__, pk->pkey[0]);
-      gcry_log_debugmpi ("pkey[0]", pk->pkey[0]);
       frame = do_encode_md (md, hash_algo, gcry_md_get_algo_dlen (hash_algo),
                             gcry_mpi_get_nbits (pk->pkey[0]), asn, asnlen);
       xfree (asn);

commit 754b1c463034a634a678d8efc76c27fd46aad9b9
Author: Werner Koch <wk at gnupg.org>
Date:   Sat May 21 12:26:44 2016 +0200

    gpg: Store the Tofu meta handle for databases in CTRL.
    
    * g10/gpg.h (struct tofu_dbs_s, tofu_dbs_t): New declarations.
    (struct server_control_s): Add field tofu.dbs.
    * g10/tofu.c (struct dbs): Rename to tofu_dbs_s.  Replace all users by
    by tofu_dbs_t.
    (opendbs):  Add arg CTRL.  Cache the DBS in CTRL.
    (closedbs): Rename to tofu_closedbs and make global.  Add arg CTRL.
    (tofu_register): Add arg CTRL.  Change all callers.  Do not call
    closedbs.
    (tofu_get_validity): Ditto.
    (tofu_set_policy): Ditto.
    (tofu_get_policy): Ditto.
    (tofu_set_policy_by_keyid): Add arg CTRL.
    * g10/gpg.c (gpg_deinit_default_ctrl): Call tofu_closedbs.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/gpg.c b/g10/gpg.c
index 3e0ae3f..f901bbd 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2046,6 +2046,7 @@ gpg_init_default_ctrl (ctrl_t ctrl)
 static void
 gpg_deinit_default_ctrl (ctrl_t ctrl)
 {
+  tofu_closedbs (ctrl);
   gpg_dirmngr_deinit_session_data (ctrl);
 }
 
@@ -4586,7 +4587,7 @@ main (int argc, char **argv)
 		}
 
 	      merge_keys_and_selfsig (kb);
-	      if (tofu_set_policy (kb, policy))
+	      if (tofu_set_policy (ctrl, kb, policy))
 		g10_exit (1);
 	    }
 
diff --git a/g10/gpg.h b/g10/gpg.h
index 5cd8366..c0f0a2d 100644
--- a/g10/gpg.h
+++ b/g10/gpg.h
@@ -63,6 +63,10 @@ typedef struct dirmngr_local_s *dirmngr_local_t;
 typedef struct kbnode_struct *KBNODE;
 typedef struct kbnode_struct *kbnode_t;
 
+/* TOFU database meta object.  */
+struct tofu_dbs_s;
+typedef struct tofu_dbs_s *tofu_dbs_t;
+
 
 /* Session control object.  This object is passed to most functions to
    convey the status of a session.  Note that the defaults are set by
@@ -74,6 +78,12 @@ struct server_control_s
 
   /* Local data for call-dirmngr.c  */
   dirmngr_local_t dirmngr_local;
+
+  /* Local data for tofu.c  */
+  struct {
+    tofu_dbs_t dbs;
+  } tofu;
+
 };
 
 
diff --git a/g10/gpgv.c b/g10/gpgv.c
index ea26659..f1e994b 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -645,9 +645,10 @@ export_pubkey_buffer (ctrl_t ctrl, const char *keyspec, unsigned int options,
 }
 
 gpg_error_t
-tofu_get_policy (PKT_public_key *pk, PKT_user_id *user_id,
+tofu_get_policy (ctrl_t ctrl, PKT_public_key *pk, PKT_user_id *user_id,
 		 enum tofu_policy *policy)
 {
+  (void)ctrl;
   (void)pk;
   (void)user_id;
   (void)policy;
diff --git a/g10/keyedit.c b/g10/keyedit.c
index c7288b2..c78f8a3 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -3485,7 +3485,7 @@ show_key_with_all_names_colon (ctrl_t ctrl, estream_t fp, kbnode_t keyblock)
 	    {
 #ifdef USE_TOFU
 	      enum tofu_policy policy;
-	      if (! tofu_get_policy (primary, uid, &policy)
+	      if (! tofu_get_policy (ctrl, primary, uid, &policy)
 		  && policy != TOFU_POLICY_NONE)
 		es_fprintf (fp, "%s", tofu_policy_str (policy));
 #endif /*USE_TOFU*/
diff --git a/g10/keylist.c b/g10/keylist.c
index 763edac..cbde0bb 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -1545,7 +1545,7 @@ list_keyblock_colon (ctrl_t ctrl, kbnode_t keyblock,
 	    {
 #ifdef USE_TOFU
 	      enum tofu_policy policy;
-	      if (! tofu_get_policy (pk, uid, &policy)
+	      if (! tofu_get_policy (ctrl, pk, uid, &policy)
 		  && policy != TOFU_POLICY_NONE)
 		es_fprintf (es_stdout, "%s", tofu_policy_str (policy));
 #endif /*USE_TOFU*/
diff --git a/g10/test-stubs.c b/g10/test-stubs.c
index 177f35a..cfaa72c 100644
--- a/g10/test-stubs.c
+++ b/g10/test-stubs.c
@@ -456,9 +456,10 @@ export_pubkey_buffer (ctrl_t ctrl, const char *keyspec, unsigned int options,
 }
 
 gpg_error_t
-tofu_get_policy (PKT_public_key *pk, PKT_user_id *user_id,
+tofu_get_policy (ctrl_t ctrl, PKT_public_key *pk, PKT_user_id *user_id,
 		 enum tofu_policy *policy)
 {
+  (void)ctrl;
   (void)pk;
   (void)user_id;
   (void)policy;
diff --git a/g10/tofu.c b/g10/tofu.c
index b73ad93..314c76b 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -782,7 +782,8 @@ opendb (char *filename, enum db_type type)
   return db;
 }
 
-struct dbs
+/* Definition of the Tofu dabase meta handle.  */
+struct tofu_dbs_s
 {
   struct db *db;
 };
@@ -814,7 +815,7 @@ link_db (struct db **head, struct db *db)
    TYPE must be either DB_MAIL or DB_KEY.  In the combined format, the
    combined DB is always returned.  */
 static struct db *
-getdb (struct dbs *dbs, const char *name, enum db_type type)
+getdb (tofu_dbs_t dbs, const char *name, enum db_type type)
 {
   struct db *t = NULL;
   char *name_sanitized = NULL;
@@ -980,9 +981,12 @@ closedb (struct db *db)
 /* Create a new DB meta-handle.  Returns NULL on error.  */
 /* FIXME: Change to return an error code for better reporting by the
    caller.  */
-static struct dbs *
-opendbs (void)
+static tofu_dbs_t
+opendbs (ctrl_t ctrl)
 {
+  if (ctrl->tofu.dbs)
+    return ctrl->tofu.dbs;
+
   if (opt.tofu_db_format == TOFU_DB_AUTO)
     {
       char *filename = make_filename (opt.homedir, "tofu.db", NULL);
@@ -1045,13 +1049,20 @@ opendbs (void)
 	}
     }
 
-  return xmalloc_clear (sizeof (struct dbs));
+  ctrl->tofu.dbs = xmalloc_clear (sizeof (struct tofu_dbs_s));
+  return ctrl->tofu.dbs;
 }
 
+
 /* Release all of the resources associated with a DB meta-handle.  */
-static void
-closedbs (struct dbs *dbs)
+void
+tofu_closedbs (ctrl_t ctrl)
 {
+  tofu_dbs_t dbs = ctrl->tofu.dbs;
+
+  if (!dbs)
+    return;  /* Not initialized.  */
+
   if (dbs->db)
     {
       struct db *old_head = db_cache;
@@ -1103,7 +1114,8 @@ closedbs (struct dbs *dbs)
         }
     }
 
-  xfree (dbs);
+  xfree (ctrl->tofu.dbs);
+  ctrl->tofu.dbs = NULL;
 
 #if DEBUG_TOFU_CACHE
   log_debug ("Queries: %d (prepares saved: %d)\n",
@@ -1142,7 +1154,7 @@ 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 (struct dbs *dbs, const char *fingerprint, const char *email,
+record_binding (tofu_dbs_t dbs, const char *fingerprint, const char *email,
 		const char *user_id, enum tofu_policy policy, int show_old)
 {
   char *fingerprint_pp = format_hexfingerprint (fingerprint, NULL, 0);
@@ -1485,7 +1497,7 @@ time_ago_scale (signed long t)
    if CONFLICT is not NULL.  Returns _tofu_GET_POLICY_ERROR if an error
    occurs.  */
 static enum tofu_policy
-get_policy (struct dbs *dbs, const char *fingerprint, const char *email,
+get_policy (tofu_dbs_t dbs, const char *fingerprint, const char *email,
 	    char **conflict)
 {
   struct db *db;
@@ -1598,7 +1610,7 @@ get_policy (struct dbs *dbs, const char *fingerprint, const char *email,
    conflicting binding's policy to TOFU_POLICY_ASK.  In either case,
    we return TRUST_UNDEFINED.  */
 static enum tofu_policy
-get_trust (struct dbs *dbs, const char *fingerprint, const char *email,
+get_trust (tofu_dbs_t dbs, const char *fingerprint, const char *email,
 	   const char *user_id, int may_ask)
 {
   char *fingerprint_pp;
@@ -2405,7 +2417,7 @@ write_stats_status (long messages, enum tofu_policy policy,
 }
 
 static void
-show_statistics (struct dbs *dbs, const char *fingerprint,
+show_statistics (tofu_dbs_t dbs, const char *fingerprint,
 		 const char *email, const char *user_id,
 		 const char *sig_exclude)
 {
@@ -2646,11 +2658,11 @@ email_from_user_id (const char *user_id)
    This function returns the binding's trust level on return.  If an
    error occurs, this function returns TRUST_UNKNOWN.  */
 int
-tofu_register (PKT_public_key *pk, const char *user_id,
+tofu_register (ctrl_t ctrl, PKT_public_key *pk, const char *user_id,
 	       const byte *sig_digest_bin, int sig_digest_bin_len,
 	       time_t sig_time, const char *origin, int may_ask)
 {
-  struct dbs *dbs;
+  tofu_dbs_t dbs;
   struct db *db;
   char *fingerprint = NULL;
   char *fingerprint_pp = NULL;
@@ -2664,7 +2676,7 @@ tofu_register (PKT_public_key *pk, const char *user_id,
 
   sig_digest = make_radix64_string (sig_digest_bin, sig_digest_bin_len);
 
-  dbs = opendbs ();
+  dbs = opendbs (ctrl);
   if (! dbs)
     {
       log_error (_("error opening TOFU database: %s\n"),
@@ -2806,8 +2818,6 @@ tofu_register (PKT_public_key *pk, const char *user_id,
   xfree (email);
   xfree (fingerprint_pp);
   xfree (fingerprint);
-  if (dbs)
-    closedbs (dbs);
   xfree (sig_digest);
 
   return trust_level;
@@ -2887,15 +2897,15 @@ tofu_wot_trust_combine (int tofu_base, int wot_base)
 
    Returns TRUST_UNDEFINED if an error occurs.  */
 int
-tofu_get_validity (PKT_public_key *pk, const char *user_id,
+tofu_get_validity (ctrl_t ctrl, PKT_public_key *pk, const char *user_id,
 		   int may_ask)
 {
-  struct dbs *dbs;
+  tofu_dbs_t dbs;
   char *fingerprint = NULL;
   char *email = NULL;
   int trust_level = TRUST_UNDEFINED;
 
-  dbs = opendbs ();
+  dbs = opendbs (ctrl);
   if (! dbs)
     {
       log_error (_("error opening TOFU database: %s\n"),
@@ -2925,9 +2935,6 @@ tofu_get_validity (PKT_public_key *pk, const char *user_id,
  die:
   xfree (email);
   xfree (fingerprint);
-  if (dbs)
-    closedbs (dbs);
-
   return trust_level;
 }
 
@@ -2939,16 +2946,16 @@ tofu_get_validity (PKT_public_key *pk, const char *user_id,
 
    Returns 0 on success and an error code otherwise.  */
 gpg_error_t
-tofu_set_policy (kbnode_t kb, enum tofu_policy policy)
+tofu_set_policy (ctrl_t ctrl, kbnode_t kb, enum tofu_policy policy)
 {
-  struct dbs *dbs;
+  tofu_dbs_t dbs;
   PKT_public_key *pk;
   char *fingerprint = NULL;
 
   log_assert (kb->pkt->pkttype == PKT_PUBLIC_KEY);
   pk = kb->pkt->pkt.public_key;
 
-  dbs = opendbs ();
+  dbs = opendbs (ctrl);
   if (! dbs)
     {
       log_error (_("error opening TOFU database: %s\n"),
@@ -2987,8 +2994,6 @@ tofu_set_policy (kbnode_t kb, enum tofu_policy policy)
     }
 
   xfree (fingerprint);
-  closedbs (dbs);
-
   return 0;
 }
 
@@ -3000,13 +3005,13 @@ tofu_set_policy (kbnode_t kb, enum tofu_policy policy)
 
    Returns 0 on success and an error code otherwise.  */
 gpg_error_t
-tofu_set_policy_by_keyid (u32 *keyid, enum tofu_policy policy)
+tofu_set_policy_by_keyid (ctrl_t ctrl, u32 *keyid, enum tofu_policy policy)
 {
   kbnode_t keyblock = get_pubkeyblock (keyid);
   if (! keyblock)
     return gpg_error (GPG_ERR_NO_PUBKEY);
 
-  return tofu_set_policy (keyblock, policy);
+  return tofu_set_policy (ctrl, keyblock, policy);
 }
 
 /* Return the TOFU policy for the specified binding in *POLICY.  If no
@@ -3017,10 +3022,10 @@ tofu_set_policy_by_keyid (u32 *keyid, enum tofu_policy policy)
 
    Returns 0 on success and an error code otherwise.  */
 gpg_error_t
-tofu_get_policy (PKT_public_key *pk, PKT_user_id *user_id,
+tofu_get_policy (ctrl_t ctrl, PKT_public_key *pk, PKT_user_id *user_id,
 		 enum tofu_policy *policy)
 {
-  struct dbs *dbs;
+  tofu_dbs_t dbs;
   char *fingerprint;
   char *email;
 
@@ -3028,7 +3033,7 @@ tofu_get_policy (PKT_public_key *pk, PKT_user_id *user_id,
   log_assert (pk->main_keyid[0] == pk->keyid[0]
               && pk->main_keyid[1] == pk->keyid[1]);
 
-  dbs = opendbs ();
+  dbs = opendbs (ctrl);
   if (! dbs)
     {
       log_error (_("error opening TOFU database: %s\n"),
@@ -3044,8 +3049,6 @@ tofu_get_policy (PKT_public_key *pk, PKT_user_id *user_id,
 
   xfree (email);
   xfree (fingerprint);
-  closedbs (dbs);
-
   if (*policy == _tofu_GET_POLICY_ERROR)
     return gpg_error (GPG_ERR_GENERAL);
   return 0;
diff --git a/g10/tofu.h b/g10/tofu.h
index 7ee1083..d3448b9 100644
--- a/g10/tofu.h
+++ b/g10/tofu.h
@@ -63,6 +63,7 @@ enum tofu_policy
     _tofu_GET_POLICY_ERROR = 100
   };
 
+
 /* Return a string representation of a trust policy.  Returns "???" if
    POLICY is not valid.  */
 const char *tofu_policy_str (enum tofu_policy policy);
@@ -78,7 +79,7 @@ int tofu_policy_to_trust_level (enum tofu_policy policy);
    interact with the user in the case of a conflict or if the
    binding's policy is ask.  This function returns the binding's trust
    level.  If an error occurs, it returns TRUST_UNKNOWN.  */
-int tofu_register (PKT_public_key *pk, const char *user_id,
+int tofu_register (ctrl_t ctrl, PKT_public_key *pk, const char *user_id,
 		   const byte *sigs_digest, int sigs_digest_len,
 		   time_t sig_time, const char *origin, int may_ask);
 
@@ -91,18 +92,21 @@ int tofu_wot_trust_combine (int tofu, int wot);
    <PK, USER_ID>.  If MAY_ASK is 1, then this function may
    interact with the user.  If not, TRUST_UNKNOWN is returned.  If an
    error occurs, TRUST_UNDEFINED is returned.  */
-int tofu_get_validity (PKT_public_key *pk, const char *user_id, int may_ask);
+int tofu_get_validity (ctrl_t ctrl,
+                       PKT_public_key *pk, const char *user_id, int may_ask);
 
 /* Set the policy for all non-revoked user ids in the keyblock KB to
    POLICY.  */
-gpg_error_t tofu_set_policy (kbnode_t kb, enum tofu_policy policy);
+gpg_error_t tofu_set_policy (ctrl_t ctrl, kbnode_t kb, enum tofu_policy policy);
 
 /* Set the TOFU policy for all non-revoked users in the key with the
    key id KEYID to POLICY.  */
-gpg_error_t tofu_set_policy_by_keyid (u32 *keyid, enum tofu_policy policy);
+gpg_error_t tofu_set_policy_by_keyid (ctrl_t ctrl,
+                                      u32 *keyid, enum tofu_policy policy);
 
 /* Return the TOFU policy for the specified binding in *POLICY.  */
-gpg_error_t tofu_get_policy (PKT_public_key *pk, PKT_user_id *user_id,
+gpg_error_t tofu_get_policy (ctrl_t ctrl,
+                             PKT_public_key *pk, PKT_user_id *user_id,
 			     enum tofu_policy *policy);
 
 /* When doing a lot of DB activities (in particular, when listing
@@ -111,4 +115,7 @@ gpg_error_t tofu_get_policy (PKT_public_key *pk, PKT_user_id *user_id,
 void tofu_begin_batch_update (void);
 void tofu_end_batch_update (void);
 
+/* Release all of the resources associated with a DB meta-handle.  */
+void tofu_closedbs (ctrl_t ctrl);
+
 #endif /*G10_TOFU_H*/
diff --git a/g10/trustdb.c b/g10/trustdb.c
index e5f7121..527a23d 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -1065,12 +1065,12 @@ tdb_get_validity_core (ctrl_t ctrl,
 	  user_ids ++;
 
 	  if (sig)
-	    tl = tofu_register (main_pk, user_id->name,
+	    tl = tofu_register (ctrl, main_pk, user_id->name,
 				sig->digest, sig->digest_len,
 				sig->timestamp, "unknown",
 				may_ask);
 	  else
-	    tl = tofu_get_validity (main_pk, user_id->name, may_ask);
+	    tl = tofu_get_validity (ctrl, main_pk, user_id->name, may_ask);
 
 	  if (tl == TRUST_EXPIRED)
 	    user_ids_expired ++;

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

Summary of changes:
 g10/gpg.c        |  3 +-
 g10/gpg.h        | 10 +++++++
 g10/gpgv.c       |  3 +-
 g10/keyedit.c    |  2 +-
 g10/keylist.c    |  2 +-
 g10/seskey.c     |  3 --
 g10/test-stubs.c |  3 +-
 g10/tofu.c       | 84 +++++++++++++++++++++++++++++++-------------------------
 g10/tofu.h       | 17 ++++++++----
 g10/trustdb.c    |  4 +--
 10 files changed, 78 insertions(+), 53 deletions(-)


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



From cvs at cvs.gnupg.org  Sat May 21 20:09:39 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Sat, 21 May 2016 20:09:39 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.12-16-gb1ba460
Message-ID: <E1b4BJe-0007UF-R5@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  b1ba460d8f3358342c2ee2927114d36e767a439f (commit)
      from  006a6126131ffd59d9a47889ac031f932ecc5d0b (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 b1ba460d8f3358342c2ee2927114d36e767a439f
Author: Werner Koch <wk at gnupg.org>
Date:   Sat May 21 20:06:59 2016 +0200

    gpg: Avoid name spaces clash with future sqlite versions.
    
    * g10/sqlite.c: Rename to gpgsql.c.  Change function prefixes to
    gpgsql_.
    * g10/sqlite.h: Rename to gpgsql.h.
    * g10/tofu.c: Adjust for changes.
    --
    
    We used for our own extensions symbols with an sqlite_ names prefix.
    This may in theory lead to duplicated symbols but more important, it
    is harder to understand what is from gpg and what is from libsqlite.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/Makefile.am b/g10/Makefile.am
index 18a1b69..fc33e83 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -74,7 +74,7 @@ trust_source = trustdb.c trustdb.h tdbdump.c tdbio.c tdbio.h
 endif
 
 if USE_TOFU
-tofu_source = tofu.h tofu.c sqlite.c sqlite.h
+tofu_source = tofu.h tofu.c gpgsql.c gpgsql.h
 else
 tofu_source =
 endif
diff --git a/g10/sqlite.c b/g10/gpgsql.c
similarity index 90%
rename from g10/sqlite.c
rename to g10/gpgsql.c
index 90490c2..72f51b5 100644
--- a/g10/sqlite.c
+++ b/g10/gpgsql.c
@@ -1,4 +1,4 @@
-/* sqlite.c - SQLite helper functions.
+/* gpgsql.c - SQLite helper functions.
  * Copyright (C) 2015 g10 Code GmbH
  *
  * This file is part of GnuPG.
@@ -26,15 +26,15 @@
 #include "util.h"
 #include "logging.h"
 
-#include "sqlite.h"
+#include "gpgsql.h"
 
 /* This is a convenience function that combines sqlite3_mprintf and
    sqlite3_exec.  */
 int
-sqlite3_exec_printf (sqlite3 *db,
-		     int (*callback)(void*,int,char**,char**), void *cookie,
-		     char **errmsg,
-		     const char *sql, ...)
+gpgsql_exec_printf (sqlite3 *db,
+                    int (*callback)(void*,int,char**,char**), void *cookie,
+                    char **errmsg,
+                    const char *sql, ...)
 {
   va_list ap;
   int rc;
@@ -56,12 +56,12 @@ sqlite3_exec_printf (sqlite3 *db,
 }
 
 int
-sqlite3_stepx (sqlite3 *db,
-               sqlite3_stmt **stmtp,
-               sqlite3_stepx_callback callback,
-               void *cookie,
-               char **errmsg,
-               const char *sql, ...)
+gpgsql_stepx (sqlite3 *db,
+              sqlite3_stmt **stmtp,
+              gpgsql_stepx_callback callback,
+              void *cookie,
+              char **errmsg,
+              const char *sql, ...)
 {
   int rc;
   int err = 0;
@@ -69,7 +69,7 @@ sqlite3_stepx (sqlite3 *db,
 
   va_list va;
   int args;
-  enum sqlite_arg_type t;
+  enum gpgsql_arg_type t;
   int i;
 
   int cols;
@@ -128,7 +128,7 @@ sqlite3_stepx (sqlite3 *db,
     {
       for (i = 1; i <= args; i ++)
         {
-          t = va_arg (va, enum sqlite_arg_type);
+          t = va_arg (va, enum gpgsql_arg_type);
           switch (t)
             {
             case SQLITE_ARG_INT:
@@ -169,7 +169,7 @@ sqlite3_stepx (sqlite3 *db,
         }
 
     }
-  t = va_arg (va, enum sqlite_arg_type);
+  t = va_arg (va, enum gpgsql_arg_type);
   log_assert (t == SQLITE_ARG_END);
   va_end (va);
 
diff --git a/g10/gpgsql.h b/g10/gpgsql.h
new file mode 100644
index 0000000..a540684
--- /dev/null
+++ b/g10/gpgsql.h
@@ -0,0 +1,61 @@
+/* gpgsql.h - SQLite helper functions.
+ * Copyright (C) 2015 g10 Code GmbH
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG 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/>.
+ */
+
+#ifndef GNUPG_GPGSQL_H
+#define GNUPG_GPGSQL_H
+
+#include <sqlite3.h>
+
+enum gpgsql_arg_type
+  {
+    SQLITE_ARG_END = 0xdead001,
+    SQLITE_ARG_INT,
+    SQLITE_ARG_LONG_LONG,
+    SQLITE_ARG_STRING,
+    /* This takes two arguments: the blob as a void * and the length
+       of the blob as a long long.  */
+    SQLITE_ARG_BLOB
+  };
+
+int gpgsql_exec_printf (sqlite3 *db,
+                     int (*callback)(void*,int,char**,char**), void *cookie,
+                     char **errmsg,
+                     const char *sql, ...);
+
+typedef int (*gpgsql_stepx_callback) (void *cookie,
+                                      /* number of columns.  */
+                                      int cols,
+                                      /* columns as text.  */
+                                      char **values,
+                                      /* column names.  */
+                                      char **names,
+                                      /* The prepared statement so
+                                       * that it is possible to use
+                                       * something like
+                                       * sqlite3_column_blob().  */
+                                      sqlite3_stmt *statement);
+
+int gpgsql_stepx (sqlite3 *db,
+                  sqlite3_stmt **stmtp,
+                  gpgsql_stepx_callback callback,
+                  void *cookie,
+                  char **errmsg,
+                  const char *sql, ...);
+
+#endif /*GNUPG_GPGSQL_H*/
diff --git a/g10/sqlite.h b/g10/sqlite.h
deleted file mode 100644
index 753e37a..0000000
--- a/g10/sqlite.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* sqlite.h - SQLite helper functions.
- * Copyright (C) 2015 g10 Code GmbH
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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 3 of the License, or
- * (at your option) any later version.
- *
- * GnuPG 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/>.
- */
-
-#ifndef GNUPG_SQLITE_H
-#define GNUPG_SQLITE_H
-
-#include <sqlite3.h>
-
-enum sqlite_arg_type
-  {
-    SQLITE_ARG_END = 0xdead001,
-    SQLITE_ARG_INT,
-    SQLITE_ARG_LONG_LONG,
-    SQLITE_ARG_STRING,
-    /* This takes two arguments: the blob as a void * and the length
-       of the blob as a long long.  */
-    SQLITE_ARG_BLOB
-  };
-
-
-int sqlite3_exec_printf (sqlite3 *db,
-                         int (*callback)(void*,int,char**,char**), void *cookie,
-                         char **errmsg,
-                         const char *sql, ...);
-
-typedef int (*sqlite3_stepx_callback) (void *cookie,
-                                       /* number of columns.  */
-                                       int cols,
-                                       /* columns as text.  */
-                                       char **values,
-                                       /* column names.  */
-                                       char **names,
-                                       /* The prepared statement so
-                                          that it is possible to use
-                                          something like
-                                          sqlite3_column_blob().  */
-                                       sqlite3_stmt *statement);
-
-int sqlite3_stepx (sqlite3 *db,
-                   sqlite3_stmt **stmtp,
-                   sqlite3_stepx_callback callback,
-                   void *cookie,
-                   char **errmsg,
-                   const char *sql, ...);
-
-#endif
diff --git a/g10/tofu.c b/g10/tofu.c
index 8c639db..78bc02c 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -39,7 +39,7 @@
 #include "ttyio.h"
 #include "trustdb.h"
 #include "mkdir_p.h"
-#include "sqlite.h"
+#include "gpgsql.h"
 #include "status.h"
 
 #include "tofu.h"
@@ -262,7 +262,7 @@ begin_transaction (struct db *db, int only_batch)
 
   if (batch_update && ! db->batch_update)
     {
-      rc = sqlite3_stepx (db->db, &db->s.savepoint_batch,
+      rc = gpgsql_stepx (db->db, &db->s.savepoint_batch,
                           NULL, NULL, &err,
                           "savepoint batch;", SQLITE_ARG_END);
       if (rc)
@@ -281,7 +281,7 @@ begin_transaction (struct db *db, int only_batch)
   if (only_batch)
     return 0;
 
-  rc = sqlite3_stepx (db->db, &db->s.savepoint_inner,
+  rc = gpgsql_stepx (db->db, &db->s.savepoint_inner,
                       NULL, NULL, &err,
                       "savepoint inner;", SQLITE_ARG_END);
   if (rc)
@@ -316,7 +316,7 @@ end_transaction (struct db *db, int only_batch)
     {
       db->batch_update = 0;
 
-      rc = sqlite3_stepx (db->db, &db->s.savepoint_batch_commit,
+      rc = gpgsql_stepx (db->db, &db->s.savepoint_batch_commit,
                           NULL, NULL, &err,
                           "release batch;", SQLITE_ARG_END);
       if (rc)
@@ -337,7 +337,7 @@ end_transaction (struct db *db, int only_batch)
   if (only_batch)
     return 0;
 
-  rc = sqlite3_stepx (db->db, &db->s.savepoint_inner_commit,
+  rc = gpgsql_stepx (db->db, &db->s.savepoint_inner_commit,
                       NULL, NULL, &err,
                       "release inner;", SQLITE_ARG_END);
   if (rc)
@@ -640,7 +640,7 @@ initdb (sqlite3 *db, enum db_type type)
    *     know why this occurred, we also set conflict to 0xbaddecaf.
    */
   if (type == DB_EMAIL || type == DB_COMBINED)
-    rc = sqlite3_exec_printf
+    rc = gpgsql_exec_printf
       (db, NULL, NULL, &err,
        "create table bindings\n"
        " (oid INTEGER PRIMARY KEY AUTOINCREMENT,\n"
@@ -659,7 +659,7 @@ initdb (sqlite3 *db, enum db_type type)
 
        Note: since the data is split on the email address, there is no
        need to index the email column.  */
-    rc = sqlite3_exec_printf
+    rc = gpgsql_exec_printf
       (db, NULL, NULL, &err,
        "create table bindings\n"
        " (oid INTEGER PRIMARY KEY AUTOINCREMENT,\n"
@@ -1220,7 +1220,7 @@ record_binding (tofu_dbs_t dbs, const char *fingerprint, const char *email,
        purposes, there is no need to start a transaction or to die if
        there is a failure.  */
     {
-      rc = sqlite3_stepx
+      rc = gpgsql_stepx
 	(db_email->db, &db_email->s.record_binding_get_old_policy,
          get_single_long_cb2, &policy_old, &err,
 	 "select policy from bindings where fingerprint = ? and email = ?",
@@ -1259,7 +1259,7 @@ record_binding (tofu_dbs_t dbs, const char *fingerprint, const char *email,
       goto out;
     }
 
-  rc = sqlite3_stepx
+  rc = gpgsql_stepx
     (db_email->db, &db_email->s.record_binding_update, NULL, NULL, &err,
      "insert or replace into bindings\n"
      " (oid, fingerprint, email, user_id, time, policy)\n"
@@ -1287,7 +1287,7 @@ record_binding (tofu_dbs_t dbs, const char *fingerprint, const char *email,
     {
       log_assert (opt.tofu_db_format == TOFU_DB_SPLIT);
 
-      rc = sqlite3_stepx
+      rc = gpgsql_stepx
 	(db_key->db, &db_key->s.record_binding_update2, NULL, NULL, &err,
 	 "insert or replace into bindings\n"
 	 " (oid, fingerprint, email, user_id)\n"
@@ -1520,7 +1520,7 @@ get_policy (tofu_dbs_t dbs, const char *fingerprint, const char *email,
      (TOFU_POLICY_NONE cannot appear in the DB.  Thus, if POLICY is
      still TOFU_POLICY_NONE after executing the query, then the
      result set was empty.)  */
-  rc = sqlite3_stepx (db->db, &db->s.get_policy_select_policy_and_conflict,
+  rc = gpgsql_stepx (db->db, &db->s.get_policy_select_policy_and_conflict,
                       strings_collect_cb2, &strlist, &err,
                       "select policy, conflict from bindings\n"
                       " where fingerprint = ? and email = ?",
@@ -1773,7 +1773,7 @@ get_trust (tofu_dbs_t dbs, const char *fingerprint, const char *email,
      address.  Note: if the binding in question is in the DB, it will
      also be returned.  Thus, if the result set is empty, then this is
      a new binding.  */
-  rc = sqlite3_stepx
+  rc = gpgsql_stepx
     (db->db, &db->s.get_trust_bindings_with_this_email,
      strings_collect_cb2, &bindings_with_this_email, &err,
      "select distinct fingerprint from bindings where email = ?;",
@@ -1942,7 +1942,7 @@ get_trust (tofu_dbs_t dbs, const char *fingerprint, const char *email,
 
       if (db_key)
 	{
-	  rc = sqlite3_stepx
+	  rc = gpgsql_stepx
 	    (db_key->db, &db_key->s.get_trust_gather_other_user_ids,
              strings_collect_cb2, &other_user_ids, &err,
              opt.tofu_db_format == TOFU_DB_SPLIT
@@ -1993,7 +1993,7 @@ get_trust (tofu_dbs_t dbs, const char *fingerprint, const char *email,
     /* XXX: When generating the statistics, do we want the time
        embedded in the signature (column 'sig_time') or the time that
        we first verified the signature (column 'time').  */
-    rc = sqlite3_stepx
+    rc = gpgsql_stepx
       (db->db, &db->s.get_trust_gather_other_keys,
        signature_stats_collect_cb, &stats, &err,
        "select fingerprint, policy, time_ago, count(*)\n"
@@ -2223,7 +2223,7 @@ get_trust (tofu_dbs_t dbs, const char *fingerprint, const char *email,
       if (! may_ask)
 	/* If we weren't allowed to ask, also update this key as
 	   conflicting with itself.  */
-	rc = sqlite3_exec_printf
+	rc = gpgsql_exec_printf
 	  (db->db, NULL, NULL, &err,
 	   "update bindings set policy = %d, conflict = %Q"
 	   " where email = %Q"
@@ -2231,7 +2231,7 @@ get_trust (tofu_dbs_t dbs, const char *fingerprint, const char *email,
 	   TOFU_POLICY_ASK, fingerprint, email, TOFU_POLICY_AUTO,
 	   TOFU_POLICY_ASK, fingerprint);
       else
-	rc = sqlite3_exec_printf
+	rc = gpgsql_exec_printf
 	  (db->db, NULL, NULL, &err,
 	   "update bindings set policy = %d, conflict = %Q"
 	   " where email = %Q and fingerprint != %Q and policy = %d;",
@@ -2438,7 +2438,7 @@ show_statistics (tofu_dbs_t dbs, const char *fingerprint,
 
   fingerprint_pp = format_hexfingerprint (fingerprint, NULL, 0);
 
-  rc = sqlite3_exec_printf
+  rc = gpgsql_exec_printf
     (db->db, strings_collect_cb, &strlist, &err,
      "select count (*), strftime('%%s','now') - min (signatures.time),\n"
      "  strftime('%%s','now') - max (signatures.time)\n"
@@ -2731,7 +2731,7 @@ tofu_register (ctrl_t ctrl, PKT_public_key *pk, const char *user_id,
 
   /* If we've already seen this signature before, then don't add
      it again.  */
-  rc = sqlite3_stepx
+  rc = gpgsql_stepx
     (db->db, &db->s.register_already_seen,
      get_single_unsigned_long_cb2, &c, &err,
      "select count (*)\n"
@@ -2781,7 +2781,7 @@ tofu_register (ctrl_t ctrl, PKT_public_key *pk, const char *user_id,
 
       log_assert (c == 0);
 
-      rc = sqlite3_stepx
+      rc = gpgsql_stepx
 	(db->db, &db->s.register_insert, NULL, NULL, &err,
 	 "insert into signatures\n"
 	 " (binding, sig_digest, origin, sig_time, time)\n"

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

Summary of changes:
 g10/Makefile.am            |  2 +-
 g10/{sqlite.c => gpgsql.c} | 30 +++++++++++-----------
 g10/gpgsql.h               | 61 +++++++++++++++++++++++++++++++++++++++++++++
 g10/sqlite.h               | 62 ----------------------------------------------
 g10/tofu.c                 | 38 ++++++++++++++--------------
 5 files changed, 96 insertions(+), 97 deletions(-)
 rename g10/{sqlite.c => gpgsql.c} (90%)
 create mode 100644 g10/gpgsql.h
 delete mode 100644 g10/sqlite.h


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



From cvs at cvs.gnupg.org  Sat May 21 20:39:49 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Sat, 21 May 2016 20:39:49 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.12-17-g78bb084
Message-ID: <E1b4Bmq-0000ri-KX@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  78bb08425af5b1edb7f3ef0119013529b3a9e4ba (commit)
      from  b1ba460d8f3358342c2ee2927114d36e767a439f (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 78bb08425af5b1edb7f3ef0119013529b3a9e4ba
Author: Werner Koch <wk at gnupg.org>
Date:   Sat May 21 20:38:18 2016 +0200

    gpg: Speed up key listing in Tofu mode.
    
    * g10/tofu.c (get_trust): Add arg PK.  Uses this instead of a an extra
    lookup of the public key by fingerrpint.
    (tofu_register): Pass PK to get_trust.
    (tofu_get_validity): Ditto.
    
    *g10/tofu.c (tofu_register): Remove unused FINGERPRINT_PP.
    --
    
    With my test keybox I see a speedup of 10 times (33s to 3.1s).  The
    reason for this was the extra key lookup which I hacked in at some
    point to make the extraction of a keyid correct also for non v4 keys.
    However our caller already has the public key and thus can easily pass
    it to get_trust along with the fingerprint.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/tofu.c b/g10/tofu.c
index 78bc02c..043ecb1 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -1603,19 +1603,22 @@ get_policy (tofu_dbs_t dbs, const char *fingerprint, const char *email,
 }
 
 /* Return the trust level (TRUST_NEVER, etc.) for the binding
-   <FINGERPRINT, EMAIL> (email is already normalized).  If no policy
-   is registered, returns TOFU_POLICY_NONE.  If an error occurs,
-   returns _tofu_GET_TRUST_ERROR.
-
-   USER_ID is the unadultered user id.
-
-   If MAY_ASK is set, then we may interact with the user.  This is
-   necessary if there is a conflict or the binding's policy is
-   TOFU_POLICY_ASK.  In the case of a conflict, we set the new
-   conflicting binding's policy to TOFU_POLICY_ASK.  In either case,
-   we return TRUST_UNDEFINED.  */
+ * <FINGERPRINT, EMAIL> (email is already normalized).  If no policy
+ * is registered, returns TOFU_POLICY_NONE.  If an error occurs,
+ * returns _tofu_GET_TRUST_ERROR.
+ *
+ * PK is the public key object for FINGERPRINT.
+ *
+ * USER_ID is the unadulterated user id.
+ *
+ * If MAY_ASK is set, then we may interact with the user.  This is
+ * necessary if there is a conflict or the binding's policy is
+ * TOFU_POLICY_ASK.  In the case of a conflict, we set the new
+ * conflicting binding's policy to TOFU_POLICY_ASK.  In either case,
+ * we return TRUST_UNDEFINED.  */
 static enum tofu_policy
-get_trust (tofu_dbs_t dbs, const char *fingerprint, const char *email,
+get_trust (tofu_dbs_t dbs, PKT_public_key *pk,
+           const char *fingerprint, const char *email,
 	   const char *user_id, int may_ask)
 {
   char *fingerprint_pp;
@@ -1650,42 +1653,10 @@ get_trust (tofu_dbs_t dbs, const char *fingerprint, const char *email,
 
   policy = get_policy (dbs, fingerprint, email, &conflict);
   if (policy == TOFU_POLICY_AUTO || policy == TOFU_POLICY_NONE)
-    /* See if the key is ultimately trusted.  If so, we're done.  */
-    {
-      PKT_public_key *pk;
+    { /* See if the key is ultimately trusted.  If so, we're done.  */
       u32 kid[2];
-      char fpr_bin[MAX_FINGERPRINT_LEN+1];
-      size_t fpr_bin_len;
-
-      if (!hex2str (fingerprint, fpr_bin, sizeof fpr_bin, &fpr_bin_len))
-        {
-          log_error ("error converting fingerprint: %s\n",
-                     gpg_strerror (gpg_error_from_syserror ()));
-          return _tofu_GET_TRUST_ERROR;
-        }
 
-      /* We need to lookup the key by fingerprint again so that we can
-         properly extract the keyid.  Extracting direct from the
-         fingerprint works only for v4 keys and would assume that
-         there is no collision in the low 64 bit.  We can't guarantee
-         the latter in case the Tofu DB is used with a different
-         keyring.  In any case the UTK stuff needs to be changed to
-         use only fingerprints.  */
-      pk = xtrycalloc (1, sizeof *pk);
-      if (!pk)
-         {
-           log_error (_("out of core\n"));
-           return _tofu_GET_TRUST_ERROR;
-         }
-      rc = get_pubkey_byfprint_fast (pk, fpr_bin, fpr_bin_len);
-      if (rc)
-        {
-          log_error (_("public key %s not found: %s\n"),
-                     fingerprint, gpg_strerror (rc));
-          return _tofu_GET_TRUST_ERROR;
-        }
       keyid_from_pk (pk, kid);
-      free_public_key (pk);
 
       if (tdb_keyid_is_utk (kid))
         {
@@ -2670,7 +2641,6 @@ tofu_register (ctrl_t ctrl, PKT_public_key *pk, const char *user_id,
   tofu_dbs_t dbs;
   struct db *db;
   char *fingerprint = NULL;
-  char *fingerprint_pp = NULL;
   char *email = NULL;
   char *err = NULL;
   int rc;
@@ -2690,7 +2660,6 @@ tofu_register (ctrl_t ctrl, PKT_public_key *pk, const char *user_id,
     }
 
   fingerprint = hexfingerprint (pk, NULL, 0);
-  fingerprint_pp = format_hexfingerprint (fingerprint, NULL, 0);
 
   if (! *user_id)
     {
@@ -2706,7 +2675,7 @@ tofu_register (ctrl_t ctrl, PKT_public_key *pk, const char *user_id,
 
   /* It's necessary to get the trust so that we are certain that the
      binding has been registered.  */
-  trust_level = get_trust (dbs, fingerprint, email, user_id, may_ask);
+  trust_level = get_trust (dbs, pk, fingerprint, email, user_id, may_ask);
   if (trust_level == _tofu_GET_TRUST_ERROR)
     /* An error.  */
     {
@@ -2821,7 +2790,6 @@ tofu_register (ctrl_t ctrl, PKT_public_key *pk, const char *user_id,
 		     already_verified ? NULL : sig_digest);
 
   xfree (email);
-  xfree (fingerprint_pp);
   xfree (fingerprint);
   xfree (sig_digest);
 
@@ -2929,7 +2897,7 @@ tofu_get_validity (ctrl_t ctrl, PKT_public_key *pk, const char *user_id,
 
   email = email_from_user_id (user_id);
 
-  trust_level = get_trust (dbs, fingerprint, email, user_id, may_ask);
+  trust_level = get_trust (dbs, pk, fingerprint, email, user_id, may_ask);
   if (trust_level == _tofu_GET_TRUST_ERROR)
     /* An error.  */
     trust_level = TRUST_UNDEFINED;

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

Summary of changes:
 g10/tofu.c | 68 +++++++++++++++++---------------------------------------------
 1 file changed, 18 insertions(+), 50 deletions(-)


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



From cvs at cvs.gnupg.org  Mon May 23 11:43:00 2016
From: cvs at cvs.gnupg.org (by Damien Goutte-Gattat)
Date: Mon, 23 May 2016 11:43:00 +0200
Subject: [git] Scute - branch, master, updated. scute-1.3.0-59-gbc6c9e7
Message-ID: <E1b4mMP-0003te-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 "PKCS#11 token on top of gpg-agent".

The branch, master has been updated
       via  bc6c9e746432f4005aef359a620660a9d35df791 (commit)
       via  8d6099136c765b053d88c0a9a516804021503b00 (commit)
       via  764de881a38da9b725652994145410b8676b586a (commit)
      from  dc7dff17066510ed4687a2bfdd16afded77f4d27 (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 bc6c9e746432f4005aef359a620660a9d35df791
Author: Damien Goutte-Gattat <dgouttegattat at incenp.org>
Date:   Wed Apr 6 09:17:00 2016 +0200

    Add test for C_GenerateRandom.
    
    * tests/Makefile.am (TESTS): Add t-generaterandom test.
    * tests/t-generaterandom.c: New file.
    
    Signed-off-by: Damien Goutte-Gattat <dgouttegattat at incenp.org>

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 644eeb0..6c19071 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -33,7 +33,7 @@ noinst_HEADERS = t-support.h
 TESTS = t-link t-getfunctionlist t-initialize t-getinfo t-getslotlist \
 	t-getslotinfo t-gettokeninfo t-getmechanismlist t-getmechanisminfo \
 	t-opensession t-closeallsessions t-getsessioninfo \
-	t-findobjects t-getattribute t-auth
+	t-findobjects t-getattribute t-auth t-generaterandom
 
 noinst_PROGRAMS = $(TESTS)
 
diff --git a/tests/t-generaterandom.c b/tests/t-generaterandom.c
new file mode 100644
index 0000000..675138d
--- /dev/null
+++ b/tests/t-generaterandom.c
@@ -0,0 +1,105 @@
+/* t-generaterandom.c - Regression test.
+   Copyright (C) 2016 g10 Code GmbH
+
+   This file is part of Scute.
+
+   Scute 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.
+
+   Scute 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 Scute; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+   In addition, as a special exception, g10 Code GmbH gives permission
+   to link this library: with the Mozilla Foundation's code for
+   Mozilla (or with modified versions of it that use the same license
+   as the "Mozilla" code), and distribute the linked executables.  You
+   must obey the GNU General Public License in all respects for all of
+   the code used other than "Mozilla".  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.  */
+
+#include <stdio.h>
+#include <stdbool.h>
+
+#include "t-support.h"
+
+
+int
+main (int argc, char *argv[])
+{
+  CK_RV err;
+  CK_SLOT_ID_PTR slots;
+  CK_ULONG slots_count;
+  unsigned int i;
+
+  (void) argc;
+  (void) argv;
+
+  init_cryptoki ();
+
+  err = C_GetSlotList (true, NULL, &slots_count);
+  fail_if_err (err);
+
+  if (slots_count == 0)
+    {
+      printf ("Skipping test because no token is present.\n");
+      return 77;
+    }
+
+  printf ("Number of slots with tokens: %lu\n", slots_count);
+  slots = malloc (sizeof (CK_SLOT_ID) * slots_count);
+  if (!slots)
+    fail_if_err (CKR_HOST_MEMORY);
+
+  err = C_GetSlotList (true, slots, &slots_count);
+  fail_if_err (err);
+
+  for (i = 0; i < slots_count; i++)
+    {
+      CK_TOKEN_INFO info;
+
+      printf ("%2i. Slot ID %lu\n", i, slots[i]);
+
+      err = C_GetTokenInfo (slots[i], &info);
+      fail_if_err (err);
+
+      if ((info.flags & CKF_RNG) > 0)
+        {
+          CK_SESSION_HANDLE session;
+          unsigned char buffer[16];
+          unsigned int j;
+
+          printf("    RNG available\n");
+
+          err = C_OpenSession (slots[i], CKF_SERIAL_SESSION, NULL, NULL,
+                               &session);
+          fail_if_err (err);
+
+          printf ("    Session ID: %lu\n", session);
+
+          err = C_GenerateRandom (session, buffer, sizeof(buffer));
+          fail_if_err (err);
+
+          printf ("    Random bytes: 0x");
+          for (j = 0; j < sizeof(buffer); j++)
+            printf ("%02x", buffer[j]);
+          printf ("\n");
+
+          err = C_CloseSession (session);
+          fail_if_err (err);
+        }
+      else
+        printf ("    No RNG available on token\n");
+    }
+
+  return 0;
+}

commit 8d6099136c765b053d88c0a9a516804021503b00
Author: Damien Goutte-Gattat <dgouttegattat at incenp.org>
Date:   Wed Apr 6 09:16:59 2016 +0200

    Check whether the card has a RNG.
    
    * src/agent.c (learn_status_cb): Learn from the agent whether the
    card supports GET CHALLENGE.
    * src/agent.h (struct agent_card_info_s): New member rng_available.
    * src/p11-gettokeninfo (C_GetTokenInfo): Set CKF_RNG flag.
    * src/slots.c (slot_token_has_rng): New function.
    * src/slots.h (slot_token_has_rng): New prototype.
    Parse card capabilities
    --
    
    Now that C_GenerateRandom is implemented, we can inform the client
    application that a RNG is available on the token.
    
    But support for the GET CHALLENGE operation does not seem to be
    mandatory as per the OpenPGP Card specification, so we should
    first make sure that the inserted token does support it.
    
    The code for parsing the EXTCAP line is taken from GnuPG, with
    Werner's permission to reuse it under the same licensing terms as
    the rest of Scute.
    
    Signed-off-by: Damien Goutte-Gattat <dgouttegattat at incenp.org>

diff --git a/src/agent.c b/src/agent.c
index e2ed31e..8fc48e0 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -846,6 +846,30 @@ learn_status_cb (void *opaque, const char *line)
 	    }
 	}
     }
+  else if (keywordlen == 6 && !memcmp (keyword, "EXTCAP", keywordlen))
+    {
+      char *p, *p2, *buf;
+      int abool;
+
+      buf = p = unescape_status_string (line);
+      if (buf)
+        {
+          for (p = strtok (buf, " "); p; p = strtok (NULL, " "))
+            {
+              p2 = strchr (p, '=');
+              if (p2)
+                {
+                  *p2++ = 0;
+                  abool = (*p2 == '1');
+                  if (!strcmp (p, "gc"))
+                    parm->rng_available = abool;
+                  /* We're currently not interested in the
+                   * other capabilities. */
+                }
+            }
+          free (buf);
+        }
+    }
   return 0;
 }
 
diff --git a/src/agent.h b/src/agent.h
index 6f3f6df..0d6bb30 100644
--- a/src/agent.h
+++ b/src/agent.h
@@ -73,6 +73,8 @@ struct agent_card_info_s
   char grip1[41];
   char grip2[41];
   char grip3[41];
+  int rng_available;    /* True if the GET CHALLENGE operation
+                           is supported. */
 };
 
 

diff --git a/src/p11-gettokeninfo.c b/src/p11-gettokeninfo.c
index 88d77be..c0a2417 100644
--- a/src/p11-gettokeninfo.c
+++ b/src/p11-gettokeninfo.c
@@ -72,8 +72,11 @@ CK_DEFINE_FUNCTION(CK_RV, C_GetTokenInfo)
   pInfo->flags = CKF_TOKEN_INITIALIZED
     | CKF_PROTECTED_AUTHENTICATION_PATH | CKF_WRITE_PROTECTED
     | CKF_USER_PIN_INITIALIZED;
-  /* FIXME: Support this later: CKF_RNG.
-     FIXME: CKF_USER_PIN_INITIALIZED only if PIN is not default pin?
+
+  if (slot_token_has_rng (slot))
+    pInfo->flags |= CKF_RNG;
+
+  /* FIXME: CKF_USER_PIN_INITIALIZED only if PIN is not default pin?
      FIXME: CKF_LOGIN_REQUIRED needed?  We could implement login via
      the "SCD CHECKPIN" command.  I am not sure how this mixes with
      CKF_PROTECTED_AUTHENTICATION_PATH.
diff --git a/src/slots.c b/src/slots.c
index 136d64e..810be0b 100644
--- a/src/slots.c
+++ b/src/slots.c
@@ -657,6 +657,15 @@ slot_get_id (slot_iterator_t slot)
   return slot;
 }
 
+/* Return true if the token supports the GET CHALLENGE operation. */
+bool
+slot_token_has_rng (slot_iterator_t id)
+{
+  struct slot *slot = scute_table_data (slots, id);
+
+  return slot->info.rng_available;
+}
+
 

 /* Mechanism management.  */
 
diff --git a/src/slots.h b/src/slots.h
index e36be27..3624c55 100644
--- a/src/slots.h
+++ b/src/slots.h
@@ -116,6 +116,9 @@ void slot_token_pincount (slot_iterator_t id, int *max, int *len);
 /* Return the ID of slot SLOT.  */
 CK_SLOT_ID slot_get_id (slot_iterator_t slot);
 
+/* Return true if the token supports the GET CHALLENGE operation. */
+bool slot_token_has_rng (slot_iterator_t id);
+
 

 /* Begin iterating over the list of mechanisms.  If succeeds, will be
    followed up by a slot_iterate_end.  */

commit 764de881a38da9b725652994145410b8676b586a
Author: Damien Goutte-Gattat <dgouttegattat at incenp.org>
Date:   Wed Apr 6 09:16:58 2016 +0200

    Implement C_GenerateRandom.
    
    * src/agent.c (scute_agent_get_random, get_challenge_data_cb):
    New functions.
    * src/agent.h (scute_agent_get_random): New prototype.
    * src/p11-generaterandom.c (C_GenerateRandom): Implement feature.
    
    Signed-off-by: Damien Goutte-Gattat <dgouttegattat at incenp.org>

diff --git a/src/agent.c b/src/agent.c
index b51dc7e..e2ed31e 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -1281,6 +1281,42 @@ scute_agent_get_cert (int no, struct cert *cert)
   return 0;
 }
 
+struct random_request
+{
+    unsigned char *buffer;
+    size_t len;
+};
+
+gpg_error_t
+get_challenge_data_cb (void *opaque, const void *line, size_t len)
+{
+  struct random_request *request = opaque;
+
+  if (len != request->len)
+    return gpg_error (GPG_ERR_INV_LENGTH);
+
+  memcpy (request->buffer, line, len);
+
+  return 0;
+}
+
+gpg_error_t
+scute_agent_get_random (unsigned char *data, size_t len)
+{
+    char command[16];
+    gpg_error_t err;
+    struct random_request request;
+
+    snprintf (command, sizeof(command), "SCD RANDOM %lu", len);
+
+    request.buffer = data;
+    request.len = len;
+    err = assuan_transact (agent_ctx, command, get_challenge_data_cb,
+                           &request, NULL, NULL, NULL, NULL);
+
+    return err;
+}
+
 

 void
 scute_agent_finalize (void)
diff --git a/src/agent.h b/src/agent.h
index 6ac479f..6f3f6df 100644
--- a/src/agent.h
+++ b/src/agent.h
@@ -113,4 +113,7 @@ gpg_error_t scute_agent_is_trusted (char *fpr, bool *is_trusted);
 /* Try to get certificate for key numer NO.  */
 gpg_error_t scute_agent_get_cert (int no, struct cert *cert);
 
+/* Get random bytes from the card. */
+gpg_error_t scute_agent_get_random (unsigned char *data, size_t len);
+
 #endif	/* AGENT_H */
diff --git a/src/p11-generaterandom.c b/src/p11-generaterandom.c
index f192e9d..e8b20d9 100644
--- a/src/p11-generaterandom.c
+++ b/src/p11-generaterandom.c
@@ -33,14 +33,32 @@
 
 #include "cryptoki.h"
 
+#include "locking.h"
+#include "slots.h"
+#include "agent.h"
+#include "error-mapping.h"
+
 

 CK_DEFINE_FUNCTION(CK_RV, C_GenerateRandom)
      (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pRandomData,
       CK_ULONG ulRandomLen)
 {
-  /* FIXME: Implement me.  */
-  (void) hSession;
-  (void) pRandomData;
-  (void) ulRandomLen;
-  return CKR_FUNCTION_NOT_SUPPORTED;
+  CK_RV err;
+  slot_iterator_t slot;
+  session_iterator_t session;
+
+  if (pRandomData == NULL_PTR)
+    return CKR_ARGUMENTS_BAD;
+
+  err = scute_global_lock ();
+  if (err)
+    return err;
+
+  err = slots_lookup_session (hSession, &slot, &session);
+  if (!err)
+    err = scute_gpg_err_to_ck (scute_agent_get_random (pRandomData,
+                                                       ulRandomLen));
+
+  scute_global_unlock ();
+  return err;
 }

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

Summary of changes:
 src/agent.c                                        | 60 ++++++++++++++++++++++
 src/agent.h                                        |  5 ++
 src/p11-generaterandom.c                           | 28 ++++++++--
 src/p11-gettokeninfo.c                             |  7 ++-
 src/slots.c                                        |  9 ++++
 src/slots.h                                        |  3 ++
 tests/Makefile.am                                  |  2 +-
 tests/{t-getmechanismlist.c => t-generaterandom.c} | 45 ++++++++++------
 8 files changed, 135 insertions(+), 24 deletions(-)
 copy tests/{t-getmechanismlist.c => t-generaterandom.c} (69%)


hooks/post-receive
-- 
PKCS#11 token on top of gpg-agent
http://git.gnupg.org



From cvs at cvs.gnupg.org  Mon May 23 11:52:49 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Mon, 23 May 2016 11:52:49 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. 1efd48af908ae6457f32d923f08d5b9024a7b521
Message-ID: <E1b4mVt-0004IH-7q@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  1efd48af908ae6457f32d923f08d5b9024a7b521 (commit)
      from  167b1395db1c0539001cd408c852ed163f76ca3f (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 1efd48af908ae6457f32d923f08d5b9024a7b521
Author: Justus Winter <justus at gnupg.org>
Date:   Mon May 23 11:52:45 2016 +0200

    blog: fix typo

diff --git a/misc/blog.gnupg.org/20160519-gnupg-in-2016.org b/misc/blog.gnupg.org/20160519-gnupg-in-2016.org
index 90443cf..d4c7eac 100644
--- a/misc/blog.gnupg.org/20160519-gnupg-in-2016.org
+++ b/misc/blog.gnupg.org/20160519-gnupg-in-2016.org
@@ -113,7 +113,7 @@ costs, but fortunately we still have enough money in our accounts to
 keep bread, water, and beer on our tables for this year and somewhat
 longer.  We will eventually run a new donation campaign, though.
 
-It is probably less know that that we offer SEPA payments which can be
+It is probably less known that that we offer SEPA payments which can be
 used for recurring donations.  We have not received many payments
 through SEPA yet and thus this method is only semi-automated and the
 cause for delays between a donation and a confirmation mail.  There is

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

Summary of changes:
 misc/blog.gnupg.org/20160519-gnupg-in-2016.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  Mon May 23 15:05:36 2016
From: cvs at cvs.gnupg.org (by Daniel Kahn Gillmor)
Date: Mon, 23 May 2016 15:05:36 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.12-18-g5beb6ab
Message-ID: <E1b4pWT-0007Tl-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 "The GNU Privacy Guard".

The branch, master has been updated
       via  5beb6ab4b07d6a25a119d5f272f2df04d130b984 (commit)
      from  78bb08425af5b1edb7f3ef0119013529b3a9e4ba (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 5beb6ab4b07d6a25a119d5f272f2df04d130b984
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Fri May 20 07:21:38 2016 -0700

    g10: Fix typo in comment.
    
    --
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/g10/export.c b/g10/export.c
index 89604b4..aae8d42 100644
--- a/g10/export.c
+++ b/g10/export.c
@@ -831,7 +831,7 @@ print_status_exported (PKT_public_key *pk)
  *
  * Since the key data from agant is encrypted, decrypt it by CIPHERHD.
  * Then, parse the decrypted key data in transfer format, and put
- * secret papameters into PK.
+ * secret parameters into PK.
  *
  * CACHE_NONCE_ADDR is used to share nonce for multple key retrievals.
  */

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

Summary of changes:
 g10/export.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  Mon May 23 16:04:03 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Mon, 23 May 2016 16:04:03 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-126-ga42d814
Message-ID: <E1b4qR1-0002rR-B5@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  a42d814a65fdc29a3be6efa97433997495696a88 (commit)
       via  c9cc0412e940c78c3e9bacb6ff1459b5bb5bb9ad (commit)
      from  10df06ee8f9192309bf124872438f7c32457e1c6 (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 a42d814a65fdc29a3be6efa97433997495696a88
Author: Justus Winter <justus at gnupg.org>
Date:   Mon May 23 15:42:14 2016 +0200

    python: Port more tests.
    
    * lang/python/tests/Makefile.am (TESTS_ENVIRONMENT): Set
    LD_LIBRARY_PATH.
    (pytests): Add new tests.
    * lang/python/tests/t-callbacks.py: Trim imports.
    * lang/python/tests/t-encrypt-sign.py: New file.
    * lang/python/tests/t-export.py: Likewise.
    * lang/python/tests/t-signers.py: Likewise.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index 30f1aec..32dc432 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -26,6 +26,7 @@ test_srcdir = $(top_srcdir)/tests/gpg
 TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) \
 	LC_ALL=C GPG_AGENT_INFO= \
 	top_srcdir=$(top_srcdir) \
+	LD_LIBRARY_PATH="../../../src/.libs" \
 	PYTHONPATH=`echo $(abs_builddir)/../build/lib.*`
 
 py_tests = t-wrapper.py \
@@ -33,8 +34,11 @@ py_tests = t-wrapper.py \
 	t-data.py \
 	t-encrypt.py \
 	t-encrypt-sym.py \
+	t-encrypt-sign.py \
 	t-sign.py \
-	t-decrypt.py
+	t-signers.py \
+	t-decrypt.py \
+	t-export.py
 
 TESTS = $(top_srcdir)/tests/gpg/initial.test \
 	$(py_tests) \
diff --git a/lang/python/tests/t-callbacks.py b/lang/python/tests/t-callbacks.py
index bd88d86..13ce486 100755
--- a/lang/python/tests/t-callbacks.py
+++ b/lang/python/tests/t-callbacks.py
@@ -17,7 +17,6 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-import os
 from pyme import core, constants
 import support
 
diff --git a/lang/python/tests/t-encrypt-sign.py b/lang/python/tests/t-encrypt-sign.py
new file mode 100755
index 0000000..cba697c
--- /dev/null
+++ b/lang/python/tests/t-encrypt-sign.py
@@ -0,0 +1,71 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2016 g10 Code GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME 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.
+#
+# GPGME 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 program; if not, see <http://www.gnu.org/licenses/>.
+
+import sys
+from pyme import core, constants
+import support
+
+support.init_gpgme(constants.PROTOCOL_OpenPGP)
+c = core.Context()
+c.set_armor(True)
+
+def check_result(r, typ):
+    if r.invalid_signers:
+        sys.exit("Invalid signer found: {}".format(r.invalid_signers.fpr))
+
+    if len(r.signatures) != 1:
+        sys.exit("Unexpected number of signatures created")
+
+    signature = r.signatures[0]
+    if signature.type != typ:
+        sys.exit("Wrong type of signature created")
+
+    if signature.pubkey_algo != constants.PK_DSA:
+        sys.exit("Wrong pubkey algorithm reported: {}".format(
+            signature.pubkey_algo))
+
+    if signature.hash_algo not in (constants.MD_SHA1, constants.MD_RMD160):
+        sys.exit("Wrong hash algorithm reported: {}".format(
+            signature.hash_algo))
+
+    if signature.sig_class != 0:
+        sys.exit("Wrong signature class reported: {}".format(
+            signature.sig_class))
+
+    if signature.fpr != "A0FF4590BB6122EDEF6E3C542D727CC768697734":
+        sys.exit("Wrong fingerprint reported: {}".format(signature.fpr))
+
+keys = []
+keys.append(c.get_key("A0FF4590BB6122EDEF6E3C542D727CC768697734", False))
+keys.append(c.get_key("D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2", False))
+
+for recipients in (keys, []):
+    source = core.Data("Hallo Leute\n")
+    sink = core.Data()
+
+    c.op_encrypt_sign(recipients, constants.ENCRYPT_ALWAYS_TRUST, source, sink)
+    result = c.op_encrypt_result()
+    assert not result.invalid_recipients, \
+        "Invalid recipient encountered: {}".format(
+            result.invalid_recipients.fpr)
+
+    result = c.op_sign_result()
+    check_result(result, constants.SIG_MODE_NORMAL)
+
+    support.print_data(sink)
diff --git a/lang/python/tests/t-export.py b/lang/python/tests/t-export.py
new file mode 100755
index 0000000..a102425
--- /dev/null
+++ b/lang/python/tests/t-export.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2016 g10 Code GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME 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.
+#
+# GPGME 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 program; if not, see <http://www.gnu.org/licenses/>.
+
+from pyme import core, constants
+import support
+
+support.init_gpgme(constants.PROTOCOL_OpenPGP)
+c = core.Context()
+c.set_armor(True)
+
+sink = core.Data()
+c.op_export_ext(['Alpha', 'Bob'], 0, sink)
+support.print_data(sink)
+
+# Again. Now using a key array.
+keys = []
+keys.append(c.get_key("0x68697734", False)) # Alpha
+keys.append(c.get_key("0xA9E3B0B2", False)) # Bob
+sink = core.Data()
+c.op_export_keys(keys, 0, sink)
+support.print_data(sink)
diff --git a/lang/python/tests/t-signers.py b/lang/python/tests/t-signers.py
new file mode 100755
index 0000000..26dded5
--- /dev/null
+++ b/lang/python/tests/t-signers.py
@@ -0,0 +1,75 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2016 g10 Code GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME 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.
+#
+# GPGME 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 program; if not, see <http://www.gnu.org/licenses/>.
+
+import sys
+from pyme import core, constants
+import support
+
+def check_result(r, typ):
+    if r.invalid_signers:
+        sys.exit("Invalid signer found: {}".format(r.invalid_signers.fpr))
+
+    if len(r.signatures) != 2:
+        sys.exit("Unexpected number of signatures created")
+
+    for signature in r.signatures:
+        if signature.type != typ:
+            sys.exit("Wrong type of signature created")
+
+        if signature.pubkey_algo != constants.PK_DSA:
+            sys.exit("Wrong pubkey algorithm reported: {}".format(
+                signature.pubkey_algo))
+
+        if signature.hash_algo != constants.MD_SHA1:
+            sys.exit("Wrong hash algorithm reported: {}".format(
+                signature.hash_algo))
+
+        if signature.sig_class != 1:
+            sys.exit("Wrong signature class reported: {}".format(
+                signature.sig_class))
+
+        if signature.fpr not in ("A0FF4590BB6122EDEF6E3C542D727CC768697734",
+                                 "23FD347A419429BACCD5E72D6BC4778054ACD246"):
+            sys.exit("Wrong fingerprint reported: {}".format(signature.fpr))
+
+
+support.init_gpgme(constants.PROTOCOL_OpenPGP)
+c = core.Context()
+c.set_textmode(True)
+c.set_armor(True)
+
+keys = []
+c.op_keylist_start('', True)
+keys.append(c.op_keylist_next())
+keys.append(c.op_keylist_next())
+c.op_keylist_end()
+
+c.signers_add(keys[0])
+c.signers_add(keys[1])
+
+for mode in (constants.SIG_MODE_NORMAL, constants.SIG_MODE_DETACH,
+             constants.SIG_MODE_CLEAR):
+    source = core.Data("Hallo Leute\n")
+    sink = core.Data()
+
+    c.op_sign(source, sink, mode)
+
+    result = c.op_sign_result()
+    check_result(result, mode)
+    support.print_data(sink)

commit c9cc0412e940c78c3e9bacb6ff1459b5bb5bb9ad
Author: Justus Winter <justus at gnupg.org>
Date:   Mon May 23 15:41:06 2016 +0200

    python: Translate list of strings.
    
    * lang/python/gpgme.i: Add typemap translating list of strings.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/gpgme.i b/lang/python/gpgme.i
index 4809fd6..fb882c8 100644
--- a/lang/python/gpgme.i
+++ b/lang/python/gpgme.i
@@ -42,6 +42,40 @@
 }
 %typemap(freearg) const char * "";
 
+/* Likewise for a list of strings.  */
+%typemap(in) const char *[] {
+  /* Check if is a list */
+  if (PyList_Check($input)) {
+    size_t i, size = PyList_Size($input);
+    $1 = (char **) malloc((size+1) * sizeof(char *));
+
+    for (i = 0; i < size; i++) {
+      PyObject *o = PyList_GetItem($input,i);
+      if (PyUnicode_Check(o))
+        $1[i] = PyUnicode_AsUTF8(o);
+      else if (PyString_Check(o))
+	$1[i] = PyString_AsString(o);
+      else {
+	PyErr_Format(PyExc_TypeError,
+                     "arg %d: list must contain only str or bytes, got %s "
+                     "at position %d",
+                     $argnum, o->ob_type->tp_name, i);
+	free($1);
+	return NULL;
+      }
+    }
+    $1[i] = NULL;
+  } else {
+    PyErr_Format(PyExc_TypeError,
+                 "arg %d: expected a list of str or bytes, got %s",
+                 $argnum, $input->ob_type->tp_name);
+    return NULL;
+  }
+}
+%typemap(freearg) const char *[] {
+  free((char *) $1);
+}
+
 // Release returned buffers as necessary.
 %typemap(newfree) char * "free($1);";
 %newobject gpgme_data_release_and_get_mem;

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

Summary of changes:
 lang/python/gpgme.i                                | 34 ++++++++++
 lang/python/tests/Makefile.am                      |  6 +-
 lang/python/tests/t-callbacks.py                   |  1 -
 lang/python/tests/{t-sign.py => t-encrypt-sign.py} | 53 ++++++---------
 lang/python/tests/{t-decrypt.py => t-export.py}    | 15 +++--
 lang/python/tests/t-signers.py                     | 75 ++++++++++++++++++++++
 6 files changed, 143 insertions(+), 41 deletions(-)
 copy lang/python/tests/{t-sign.py => t-encrypt-sign.py} (68%)
 copy lang/python/tests/{t-decrypt.py => t-export.py} (75%)
 create mode 100755 lang/python/tests/t-signers.py


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



From cvs at cvs.gnupg.org  Mon May 23 16:13:38 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Mon, 23 May 2016 16:13:38 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.12-22-gb9d1e09
Message-ID: <E1b4qaJ-00042X-H9@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  b9d1e099c3ec3163c86afe627ecbe028db1facf6 (commit)
       via  4994153924e0948a657edddaef54a39a6001beff (commit)
       via  41b10c66ec1dd33633386f4fc8013ddeab7737ca (commit)
       via  a54e89a58576108fcae10ceeb4fc65822aecc170 (commit)
      from  5beb6ab4b07d6a25a119d5f272f2df04d130b984 (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 b9d1e099c3ec3163c86afe627ecbe028db1facf6
Author: Justus Winter <justus at g10code.com>
Date:   Tue Apr 19 16:23:42 2016 +0200

    tests: Test the pinentry interactions when exporting keys.
    
    * tests/openpgp/export.test: Test pinentry interactions.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/openpgp/export.test b/tests/openpgp/export.test
index 08b8272..e0fe926 100755
--- a/tests/openpgp/export.test
+++ b/tests/openpgp/export.test
@@ -36,12 +36,34 @@ check_armored_private_key()
     check_exported_private_key $1
 }
 
+logfile="`pwd`/pinentry.log"
+ppfile="`pwd`/passphrases"
+rm -f -- $logfile $ppfile
+touch $ppfile
+
+prepare_passphrase()
+{
+    echo $* >>$ppfile
+}
+
+prepare_passphrase_confirm()
+{
+    echo "fake-entry being started to CONFIRM the weak phrase" >>$ppfile
+}
+
+assert_passphrases_consumed()
+{
+    if test -s $ppfile; then
+        echo "Expected $ppfile to be empty, but these are enqueued:" >&2
+        cat "$ppfile" >&2
+        exit 1
+    fi
+    rm -f -- $logfile
+}
+
 # XXX: Currently, gpg does not allow one to export private keys
-# without a passphrase (issue2070, issue2324), and our fake pinentry
-# only allows us to specify one passphrase.  We therefore use the
-# passphrase of our first key to unlock it (the other keys are not
-# protected), and also use the same passphrase for the exported keys.
-export PINENTRY_USER_DATA="$usrpass1"
+# without a passphrase (issue2070, issue2324).
+export PINENTRY_USER_DATA="--logfile=$logfile --passphrasefile=$ppfile"
 
 info "Checking key export."
 for KEY in D74C5F22 C40FDECF ECABF51D
@@ -56,13 +78,53 @@ do
     check_armored_public_key $KEY.public
     rm $KEY.public
 
+    if [ $KEY = D74C5F22 ]; then
+        # Key D74C5F22 is protected by a passphrase.  Prepare this
+        # one.  Currently, GnuPG does not ask for an export passphrase
+        # in this case.
+        prepare_passphrase "$usrpass1"
+    else
+        # We use a weak passphrase which we'll have to confirm.
+        prepare_passphrase "export passphrase"
+        prepare_passphrase_confirm
+        prepare_passphrase "export passphrase"
+
+        # Key C40FDECF has a subkey.
+        if [ $KEY = C40FDECF ]; then
+            prepare_passphrase "export passphrase"
+            prepare_passphrase_confirm
+            prepare_passphrase "export passphrase"
+        fi
+    fi
+
     $GPG --export-secret-keys $KEY >$KEY.private
     check_exported_private_key $KEY.private
     rm $KEY.private
 
+    assert_passphrases_consumed
+
+    if [ $KEY = D74C5F22 ]; then
+        # Key D74C5F22 is protected by a passphrase.  Prepare this
+        # one.  Currently, GnuPG does not ask for an export passphrase
+        # in this case.
+        prepare_passphrase "$usrpass1"
+    else
+        # We use a stronger passphrase here.
+        prepare_passphrase "strong export passphrase H0LHWCHPkNa36A"
+        prepare_passphrase "strong export passphrase H0LHWCHPkNa36A"
+
+        # Key C40FDECF has a subkey.
+        if [ $KEY = C40FDECF ]; then
+            prepare_passphrase "strong export passphrase H0LHWCHPkNa36A"
+            prepare_passphrase "strong export passphrase H0LHWCHPkNa36A"
+        fi
+    fi
+
     $GPG --armor --export-secret-keys $KEY >$KEY.private
     check_armored_private_key $KEY.private
     rm $KEY.private
+
+    assert_passphrases_consumed
 done
 
 progress_end

commit 4994153924e0948a657edddaef54a39a6001beff
Author: Justus Winter <justus at g10code.com>
Date:   Tue Apr 19 15:44:23 2016 +0200

    tests: Add support for a passphrase queue to fake pinentry.
    
    * tests/openpgp/fake-pinentry.c (get_passphrase): New function.
    (main): Add option --passphrasefile and read passphrases from it.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/openpgp/fake-pinentry.c b/tests/openpgp/fake-pinentry.c
index b888cdb..a651726 100644
--- a/tests/openpgp/fake-pinentry.c
+++ b/tests/openpgp/fake-pinentry.c
@@ -44,6 +44,74 @@ reply (const char *fmt, ...)
 
   return result;
 }
+
+/* Return the first line from FNAME, removing it from the file.  */
+char *
+get_passphrase (const char *fname)
+{
+  char *passphrase = NULL;
+  size_t fname_len;
+  char *fname_new;
+  FILE *source, *sink;
+  char linebuf[80];
+
+  fname_len = strlen (fname);
+  fname_new = malloc (fname_len + 5);
+  if (fname_new == NULL)
+    {
+      perror ("malloc");
+      exit (1);
+    }
+  snprintf (fname_new, fname_len + 5, "%s.new", fname);
+
+  source = fopen (fname, "r");
+  if (! source)
+    {
+      perror (fname);
+      exit (1);
+    }
+
+  sink = fopen (fname_new, "w");
+  if (! sink)
+    {
+      perror (fname_new);
+      exit (1);
+    }
+
+  while (fgets (linebuf, sizeof linebuf, source))
+    {
+      linebuf[sizeof linebuf - 1] = 0;
+      if (passphrase == NULL)
+        {
+          passphrase = strdup (linebuf);
+          if (passphrase == NULL)
+            {
+              perror ("strdup");
+              exit (1);
+            }
+        }
+      else
+        fputs (linebuf, sink);
+    }
+
+  if (ferror (source))
+    {
+      perror (fname);
+      exit (1);
+    }
+
+  if (ferror (sink))
+    {
+      perror (fname_new);
+      exit (1);
+    }
+
+  fclose (source);
+  fclose (sink);
+  rename (fname_new, fname);
+  return passphrase;
+}
+
 

 #define spacep(p)   (*(p) == ' ' || *(p) == '\t')
 
@@ -97,7 +165,8 @@ main (int argc, char **argv)
 {
   char *args;
   char *logfile;
-  static char *passphrase;
+  char *passphrasefile;
+  char *passphrase;
 
   /* We get our options via PINENTRY_USER_DATA.  */
   (void) argc, (void) argv;
@@ -127,7 +196,30 @@ main (int argc, char **argv)
         }
     }
 
-  passphrase = skip_options (args);
+  passphrasefile = option_value (args, "--passphrasefile");
+  if (passphrasefile)
+    {
+      char *p = passphrasefile, more;
+      while (*p && ! spacep (p))
+        p++;
+      more = !! *p;
+      *p = 0;
+      args = more ? p+1 : p;
+
+      passphrase = get_passphrase (passphrasefile);
+      if (! passphrase)
+        {
+          reply ("# Passphrasefile '%s' is empty.  Terminating.\n",
+                 passphrasefile);
+          return 1;
+        }
+
+      p = passphrase + strlen (passphrase) - 1;
+      if (*p == '\n')
+        *p = 0;
+    }
+  else
+    passphrase = skip_options (args);
 
   reply ("# fake-pinentry started.  Passphrase='%s'.\n", passphrase);
   reply ("OK - what's up?\n");

commit 41b10c66ec1dd33633386f4fc8013ddeab7737ca
Author: Justus Winter <justus at g10code.com>
Date:   Tue Apr 19 14:21:10 2016 +0200

    tests: Add logging to fake pinentry.
    
    * tests/openpgp/fake-pinentry.c (log_stream): New variable.
    (reply): New function.
    (spacep,skip_options,option_value): Copy from common.
    (main): Parse arguments, add --logfile option, write logfile.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/openpgp/fake-pinentry.c b/tests/openpgp/fake-pinentry.c
index b8aa848..b888cdb 100644
--- a/tests/openpgp/fake-pinentry.c
+++ b/tests/openpgp/fake-pinentry.c
@@ -21,30 +21,116 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdarg.h>
+
+FILE *log_stream;
+
+int
+reply (const char *fmt, ...)
+{
+  int result;
+  va_list ap;
+
+  if (log_stream)
+    {
+      fprintf (log_stream, "> ");
+      va_start (ap, fmt);
+      vfprintf (log_stream, fmt, ap);
+      va_end (ap);
+    }
+  va_start (ap, fmt);
+  result = vprintf (fmt, ap);
+  va_end (ap);
+
+  return result;
+}
+

+#define spacep(p)   (*(p) == ' ' || *(p) == '\t')
+
+/* Skip over options in LINE.
+
+   Blanks after the options are also removed.  Options are indicated
+   by two leading dashes followed by a string consisting of non-space
+   characters.  The special option "--" indicates an explicit end of
+   options; all what follows will not be considered an option.  The
+   first no-option string also indicates the end of option parsing. */
+char *
+skip_options (const char *line)
+{
+  while (spacep (line))
+    line++;
+  while (*line == '-' && line[1] == '-')
+    {
+      while (*line && !spacep (line))
+        line++;
+      while (spacep (line))
+        line++;
+    }
+  return (char*) line;
+}
+
+
+/* Return a pointer to the argument of the option with NAME.  If such
+   an option is not given, NULL is returned. */
+char *
+option_value (const char *line, const char *name)
+{
+  char *s;
+  int n = strlen (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] == '='))
+    {
+      s += n + 1;
+      s += strspn (s, " ");
+      if (*s && !spacep(s))
+        return s;
+    }
+  return NULL;
+}
 
 int
 main (int argc, char **argv)
 {
+  char *args;
+  char *logfile;
   static char *passphrase;
-  char *p;
 
+  /* We get our options via PINENTRY_USER_DATA.  */
   (void) argc, (void) argv;
 
   setvbuf (stdin, NULL, _IOLBF, BUFSIZ);
   setvbuf (stdout, NULL, _IOLBF, BUFSIZ);
 
-  if (!passphrase)
+  args = getenv ("PINENTRY_USER_DATA");
+  if (! args)
+    args = "";
+
+  logfile = option_value (args, "--logfile");
+  if (logfile)
     {
-      passphrase = getenv ("PINENTRY_USER_DATA");
-      if (!passphrase)
-        passphrase = "";
-      for (p=passphrase; *p; p++)
-        if (*p == '\r' || *p == '\n')
-          *p = '.';
-      printf ("# Passphrase='%s'\n", passphrase);
+      char *p = logfile, more;
+      while (*p && ! spacep (p))
+        p++;
+      more = !! *p;
+      *p = 0;
+      args = more ? p+1 : p;
+
+      log_stream = fopen (logfile, "a");
+      if (! log_stream)
+        {
+          perror (logfile);
+          return 1;
+        }
     }
 
-  printf ("OK - what's up?\n");
+  passphrase = skip_options (args);
+
+  reply ("# fake-pinentry started.  Passphrase='%s'.\n", passphrase);
+  reply ("OK - what's up?\n");
 
   while (! feof (stdin))
     {
@@ -53,15 +139,23 @@ main (int argc, char **argv)
       if (fgets (buffer, sizeof buffer, stdin) == NULL)
 	break;
 
+      if (log_stream)
+        fprintf (log_stream, "< %s", buffer);
+
       if (strncmp (buffer, "GETPIN", 6) == 0)
-	printf ("D %s\nOK\n", passphrase);
+        reply ("D %s\n", passphrase);
       else if (strncmp (buffer, "BYE", 3) == 0)
 	{
-	  printf ("OK\n");
+	  reply ("OK\n");
 	  break;
 	}
-      else
-	printf ("OK\n");
+
+      reply ("OK\n");
     }
+
+  reply ("# Connection terminated.\n");
+  if (log_stream)
+    fclose (log_stream);
+
   return 0;
 }

commit a54e89a58576108fcae10ceeb4fc65822aecc170
Author: Justus Winter <justus at g10code.com>
Date:   Tue Apr 19 13:40:46 2016 +0200

    tests: Add export test.
    
    * tests/openpgp/Makefile.am (TESTS): Add new file.
    * tests/openpgp/export.test: New file.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index bab0b7d..6dc4d5b 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -57,6 +57,7 @@ TESTS = version.test mds.test \
 	import.test ecc.test 4gb-packet.test \
 	$(sqlite3_dependent_tests) \
 	gpgtar.test use-exact-key.test default-key.test \
+	export.test \
 	finish.test
 
 
diff --git a/tests/openpgp/export.test b/tests/openpgp/export.test
new file mode 100755
index 0000000..08b8272
--- /dev/null
+++ b/tests/openpgp/export.test
@@ -0,0 +1,68 @@
+#!/bin/sh
+
+. $srcdir/defs.inc || exit 3
+
+check_exported_public_key()
+{
+    $GPG --list-packets $1 >$1.packets
+    grep '^:public key packet:' $1.packets >/dev/null
+    grep "^	keyid: .*$KEY$" $1.packets >/dev/null
+    grep '^:user ID packet:' $1.packets >/dev/null
+    grep "^:signature packet:.*keyid.*$KEY" $1.packets >/dev/null
+    rm $1.packets
+}
+
+check_armored_public_key()
+{
+    grep '^-----BEGIN PGP PUBLIC KEY BLOCK-----$' $1 >/dev/null
+    grep '^-----END PGP PUBLIC KEY BLOCK-----$' $1 >/dev/null
+    check_exported_public_key $1
+}
+
+check_exported_private_key()
+{
+    $GPG --list-packets $1 >$1.packets
+    grep '^:secret key packet:' $1.packets >/dev/null
+    grep "^	keyid: .*$KEY$" $1.packets >/dev/null
+    grep '^:user ID packet:' $1.packets >/dev/null
+    grep "^:signature packet:.*keyid.*$KEY" $1.packets >/dev/null
+    rm $1.packets
+}
+
+check_armored_private_key()
+{
+    grep '^-----BEGIN PGP PRIVATE KEY BLOCK-----$' $1 >/dev/null
+    grep '^-----END PGP PRIVATE KEY BLOCK-----$' $1 >/dev/null
+    check_exported_private_key $1
+}
+
+# XXX: Currently, gpg does not allow one to export private keys
+# without a passphrase (issue2070, issue2324), and our fake pinentry
+# only allows us to specify one passphrase.  We therefore use the
+# passphrase of our first key to unlock it (the other keys are not
+# protected), and also use the same passphrase for the exported keys.
+export PINENTRY_USER_DATA="$usrpass1"
+
+info "Checking key export."
+for KEY in D74C5F22 C40FDECF ECABF51D
+do
+    progress $KEY
+
+    $GPG --export $KEY >$KEY.public
+    check_exported_public_key $KEY.public
+    rm $KEY.public
+
+    $GPG --armor --export $KEY >$KEY.public
+    check_armored_public_key $KEY.public
+    rm $KEY.public
+
+    $GPG --export-secret-keys $KEY >$KEY.private
+    check_exported_private_key $KEY.private
+    rm $KEY.private
+
+    $GPG --armor --export-secret-keys $KEY >$KEY.private
+    check_armored_private_key $KEY.private
+    rm $KEY.private
+done
+
+progress_end

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

Summary of changes:
 tests/openpgp/Makefile.am     |   1 +
 tests/openpgp/export.test     | 130 +++++++++++++++++++++++++
 tests/openpgp/fake-pinentry.c | 216 +++++++++++++++++++++++++++++++++++++++---
 3 files changed, 332 insertions(+), 15 deletions(-)
 create mode 100755 tests/openpgp/export.test


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



From cvs at cvs.gnupg.org  Tue May 24 13:12:37 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 24 May 2016 13:12:37 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.12-24-gf7426b7
Message-ID: <E1b5AEe-0006mg-Uh@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  f7426b73ce3176f2bd3ea02120be1c70d145542e (commit)
       via  9bbb841bd9ed2350299608b043cd144ff934815b (commit)
      from  b9d1e099c3ec3163c86afe627ecbe028db1facf6 (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 f7426b73ce3176f2bd3ea02120be1c70d145542e
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 24 13:02:14 2016 +0200

    common,w32: Silence an unused arg warning message.
    
    --

diff --git a/common/sysutils.c b/common/sysutils.c
index 18625d0..d82eb8e 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -636,6 +636,8 @@ int
 gnupg_chmod (const char *name, const char *modestr)
 {
 #ifdef HAVE_W32_SYSTEM
+  (void)name;
+  (void)modestr;
   return 0;
 #else
   return chmod (name, modestr_to_mode (modestr));

commit 9bbb841bd9ed2350299608b043cd144ff934815b
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 24 13:01:27 2016 +0200

    gpg, w32: Fix build regression.
    
    --
    
    Fixes-commit: 754b1c463034a634a678d8efc76c27fd46aad9b9

diff --git a/g10/gpg.c b/g10/gpg.c
index f901bbd..a88499a 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2046,7 +2046,9 @@ gpg_init_default_ctrl (ctrl_t ctrl)
 static void
 gpg_deinit_default_ctrl (ctrl_t ctrl)
 {
+#ifdef USE_TOFU
   tofu_closedbs (ctrl);
+#endif
   gpg_dirmngr_deinit_session_data (ctrl);
 }
 

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

Summary of changes:
 common/sysutils.c | 2 ++
 g10/gpg.c         | 2 ++
 2 files changed, 4 insertions(+)


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



From cvs at cvs.gnupg.org  Tue May 24 13:17:54 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Tue, 24 May 2016 13:17:54 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-129-g09803c4
Message-ID: <E1b5AJk-0007a5-Mf@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  09803c4a81b9431fd4c8f30abb1c60c4c735f0cb (commit)
       via  283f0bdc3d32624dac93d02ba3df516e69d8d4ba (commit)
       via  5476ca6813fc9d8833d5224f19d4bb7515380ab5 (commit)
      from  a42d814a65fdc29a3be6efa97433997495696a88 (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 09803c4a81b9431fd4c8f30abb1c60c4c735f0cb
Author: Justus Winter <justus at gnupg.org>
Date:   Tue May 24 12:29:32 2016 +0200

    python: Improve support for edit callbacks.
    
    * lang/python/helpers.c (pyEditCb): Stash exceptions.
    * lang/python/pyme/core.py (Context.op_edit): Hand in 'self'.
    * lang/python/tests/Makefile.am (py_tests): Add new test.
    * lang/python/tests/t-callbacks.py: Test edit callbacks.
    * lang/python/tests/t-edit.py: New file.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/helpers.c b/lang/python/helpers.c
index 0ee24a3..d0c1f3b 100644
--- a/lang/python/helpers.c
+++ b/lang/python/helpers.c
@@ -280,15 +280,18 @@ gpgme_error_t pyEditCb(void *opaque, gpgme_status_code_t status,
   PyObject *func = NULL, *dataarg = NULL, *pyargs = NULL, *retval = NULL;
   PyObject *pyopaque = (PyObject *) opaque;
   gpgme_error_t err_status = 0;
+  PyObject *self = NULL;
 
   pygpgme_exception_init();
 
-  if (PyTuple_Check(pyopaque)) {
-    func = PyTuple_GetItem(pyopaque, 0);
-    dataarg = PyTuple_GetItem(pyopaque, 1);
+  assert (PyTuple_Check(pyopaque));
+  assert (PyTuple_Size(pyopaque) == 2 || PyTuple_Size(pyopaque) == 3);
+  self = PyTuple_GetItem(pyopaque, 0);
+  func = PyTuple_GetItem(pyopaque, 1);
+  if (PyTuple_Size(pyopaque) == 3) {
+    dataarg = PyTuple_GetItem(pyopaque, 2);
     pyargs = PyTuple_New(3);
   } else {
-    func = pyopaque;
     pyargs = PyTuple_New(2);
   }
 
@@ -303,6 +306,7 @@ gpgme_error_t pyEditCb(void *opaque, gpgme_status_code_t status,
   Py_DECREF(pyargs);
   if (PyErr_Occurred()) {
     err_status = pygpgme_exception2code();
+    pygpgme_stash_callback_exception(self);
   } else {
     if (fd>=0 && retval && PyUnicode_Check(retval)) {
       const char *buffer;
diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py
index 9e7faf7..1b4e6ae 100644
--- a/lang/python/pyme/core.py
+++ b/lang/python/pyme/core.py
@@ -225,8 +225,15 @@ class Context(GpgmeWrapper):
         """Start key editing using supplied callback function"""
         if key == None:
             raise ValueError("op_edit: First argument cannot be None")
-        opaquedata = (func, fnc_value)
-        errorcheck(pygpgme.gpgme_op_edit(self.wrapped, key, opaquedata, out))
+        if fnc_value:
+            opaquedata = (self, func, fnc_value)
+        else:
+            opaquedata = (self, func)
+
+        result = pygpgme.gpgme_op_edit(self.wrapped, key, opaquedata, out)
+        if self._callback_excinfo:
+            pygpgme.pygpgme_raise_callback_exception(self)
+        errorcheck(result)
 
 class Data(GpgmeWrapper):
     """From the GPGME C manual:
diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index 32dc432..236354f 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -38,7 +38,8 @@ py_tests = t-wrapper.py \
 	t-sign.py \
 	t-signers.py \
 	t-decrypt.py \
-	t-export.py
+	t-export.py \
+	t-edit.py
 
 TESTS = $(top_srcdir)/tests/gpg/initial.test \
 	$(py_tests) \
diff --git a/lang/python/tests/t-callbacks.py b/lang/python/tests/t-callbacks.py
index 70f641d..d962dc4 100755
--- a/lang/python/tests/t-callbacks.py
+++ b/lang/python/tests/t-callbacks.py
@@ -113,3 +113,36 @@ except Exception as e:
     assert e == myException
 else:
     assert False, "Expected an error, got none"
+
+
+# Test the edit callback.
+c = core.Context()
+c.set_pinentry_mode(constants.PINENTRY_MODE_LOOPBACK)
+c.set_passphrase_cb(lambda *args: "abc")
+sink = core.Data()
+alpha = c.get_key("A0FF4590BB6122EDEF6E3C542D727CC768697734", False)
+
+cookie = object()
+edit_cb_called = False
+def edit_cb(status, args, hook):
+    global edit_cb_called
+    edit_cb_called = True
+    assert hook == cookie
+    return "quit" if args == "keyedit.prompt" else None
+c.op_edit(alpha, edit_cb, cookie, sink)
+assert edit_cb_called
+
+# Test exceptions.
+c = core.Context()
+c.set_pinentry_mode(constants.PINENTRY_MODE_LOOPBACK)
+c.set_passphrase_cb(lambda *args: "abc")
+sink = core.Data()
+
+def edit_cb(status, args):
+    raise myException
+try:
+    c.op_edit(alpha, edit_cb, None, sink)
+except Exception as e:
+    assert e == myException
+else:
+    assert False, "Expected an error, got none"
diff --git a/lang/python/tests/t-edit.py b/lang/python/tests/t-edit.py
new file mode 100755
index 0000000..64255c9
--- /dev/null
+++ b/lang/python/tests/t-edit.py
@@ -0,0 +1,62 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2005 Igor Belyi <belyi at users.sourceforge.net>
+# Copyright (C) 2016 g10 Code GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME 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.
+#
+# GPGME 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 program; if not, see <http://www.gnu.org/licenses/>.
+
+import sys
+import os
+from pyme import core, constants
+import support
+
+class KeyEditor(object):
+    def __init__(self):
+        self.steps = ["fpr", "expire", "1", "primary", "quit"]
+        self.step = 0
+        self.done = False
+        self.verbose = int(os.environ.get('verbose', 0)) > 1
+
+    def edit_fnc(self, status, args, out):
+        if args == "keyedit.prompt":
+            result = self.steps[self.step]
+            self.step += 1
+        elif args == "keyedit.save.okay":
+            result = "Y"
+            self.done = self.step == len(self.steps)
+        elif args == "keygen.valid":
+            result = "0"
+        else:
+            result = None
+
+        if self.verbose:
+            sys.stderr.write("Code: {}, args: {!r}, Returning: {!r}\n"
+                             .format(status, args, result))
+
+        return result
+
+support.init_gpgme(constants.PROTOCOL_OpenPGP)
+
+c = core.Context()
+c.set_pinentry_mode(constants.PINENTRY_MODE_LOOPBACK)
+c.set_passphrase_cb(lambda *args: "abc")
+c.set_armor(True)
+sink = core.Data()
+
+editor = KeyEditor()
+c.op_edit(c.get_key("A0FF4590BB6122EDEF6E3C542D727CC768697734", False),
+          editor.edit_fnc, sink, sink)
+assert editor.done

commit 283f0bdc3d32624dac93d02ba3df516e69d8d4ba
Author: Justus Winter <justus at gnupg.org>
Date:   Mon May 23 18:23:34 2016 +0200

    python: Fix hook.
    
    * lang/python/helpers.c (pyProgressCb): Fix getting hook data.
    * lang/python/tests/t-callbacks.py: Show that this works.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/helpers.c b/lang/python/helpers.c
index e305574..0ee24a3 100644
--- a/lang/python/helpers.c
+++ b/lang/python/helpers.c
@@ -235,7 +235,7 @@ static void pyProgressCb(void *hook, const char *what, int type, int current,
   self = PyTuple_GetItem(pyhook, 0);
   func = PyTuple_GetItem(pyhook, 1);
   if (PyTuple_Size(pyhook) == 3) {
-    dataarg = PyTuple_GetItem(pyhook, 1);
+    dataarg = PyTuple_GetItem(pyhook, 2);
     args = PyTuple_New(5);
   } else {
     args = PyTuple_New(4);
diff --git a/lang/python/tests/t-callbacks.py b/lang/python/tests/t-callbacks.py
index 13ce486..70f641d 100755
--- a/lang/python/tests/t-callbacks.py
+++ b/lang/python/tests/t-callbacks.py
@@ -91,12 +91,13 @@ Expire-Date: 2020-12-31
 
 messages = []
 def progress_cb(what, typ, current, total, hook=None):
+    assert hook == messages
     messages.append(
         "PROGRESS UPDATE: what = {}, type = {}, current = {}, total = {}"
         .format(what, typ, current, total))
 
 c = core.Context()
-c.set_progress_cb(progress_cb, None)
+c.set_progress_cb(progress_cb, messages)
 c.op_genkey(parms, None, None)
 assert len(messages) > 0
 

commit 5476ca6813fc9d8833d5224f19d4bb7515380ab5
Author: Justus Winter <justus at gnupg.org>
Date:   Mon May 23 18:09:22 2016 +0200

    python: Move edit callback function.
    
    * lang/python/gpgme.i (pyEditCb): Move...
    * lang/python/helpers.c: ... here.
    * lang/python/helpers.h (pyEditCb): New prototype.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/gpgme.i b/lang/python/gpgme.i
index fb882c8..a82efb5 100644
--- a/lang/python/gpgme.i
+++ b/lang/python/gpgme.i
@@ -283,48 +283,3 @@ FILE *fdopen(int fildes, const char *mode);
 #include "helpers.h"
 %}
 %include "helpers.h"
-
-%{
-gpgme_error_t pyEditCb(void *opaque, gpgme_status_code_t status,
-		       const char *args, int fd) {
-  PyObject *func = NULL, *dataarg = NULL, *pyargs = NULL, *retval = NULL;
-  PyObject *pyopaque = (PyObject *) opaque;
-  gpgme_error_t err_status = 0;
-
-  pygpgme_exception_init();
-
-  if (PyTuple_Check(pyopaque)) {
-    func = PyTuple_GetItem(pyopaque, 0);
-    dataarg = PyTuple_GetItem(pyopaque, 1);
-    pyargs = PyTuple_New(3);
-  } else {
-    func = pyopaque;
-    pyargs = PyTuple_New(2);
-  }
-
-  PyTuple_SetItem(pyargs, 0, PyLong_FromLong((long) status));
-  PyTuple_SetItem(pyargs, 1, PyUnicode_FromString(args));
-  if (dataarg) {
-    Py_INCREF(dataarg);		/* Because GetItem doesn't give a ref but SetItem taketh away */
-    PyTuple_SetItem(pyargs, 2, dataarg);
-  }
-
-  retval = PyObject_CallObject(func, pyargs);
-  Py_DECREF(pyargs);
-  if (PyErr_Occurred()) {
-    err_status = pygpgme_exception2code();
-  } else {
-    if (fd>=0 && retval && PyUnicode_Check(retval)) {
-      const char *buffer;
-      Py_ssize_t size;
-
-      buffer = PyUnicode_AsUTF8AndSize(retval, &size);
-      write(fd, buffer, size);
-      write(fd, "\n", 1);
-    }
-  }
-
-  Py_XDECREF(retval);
-  return err_status;
-}
-%}
diff --git a/lang/python/helpers.c b/lang/python/helpers.c
index 7ced04a..e305574 100644
--- a/lang/python/helpers.c
+++ b/lang/python/helpers.c
@@ -272,3 +272,48 @@ void pygpgme_set_progress_cb(gpgme_ctx_t ctx, PyObject *cb, PyObject **freelater
   *freelater = cb;
   gpgme_set_progress_cb(ctx, (gpgme_progress_cb_t) pyProgressCb, (void *) cb);
 }
+
+

+/* Edit callbacks.  */
+gpgme_error_t pyEditCb(void *opaque, gpgme_status_code_t status,
+		       const char *args, int fd) {
+  PyObject *func = NULL, *dataarg = NULL, *pyargs = NULL, *retval = NULL;
+  PyObject *pyopaque = (PyObject *) opaque;
+  gpgme_error_t err_status = 0;
+
+  pygpgme_exception_init();
+
+  if (PyTuple_Check(pyopaque)) {
+    func = PyTuple_GetItem(pyopaque, 0);
+    dataarg = PyTuple_GetItem(pyopaque, 1);
+    pyargs = PyTuple_New(3);
+  } else {
+    func = pyopaque;
+    pyargs = PyTuple_New(2);
+  }
+
+  PyTuple_SetItem(pyargs, 0, PyLong_FromLong((long) status));
+  PyTuple_SetItem(pyargs, 1, PyUnicode_FromString(args));
+  if (dataarg) {
+    Py_INCREF(dataarg);		/* Because GetItem doesn't give a ref but SetItem taketh away */
+    PyTuple_SetItem(pyargs, 2, dataarg);
+  }
+
+  retval = PyObject_CallObject(func, pyargs);
+  Py_DECREF(pyargs);
+  if (PyErr_Occurred()) {
+    err_status = pygpgme_exception2code();
+  } else {
+    if (fd>=0 && retval && PyUnicode_Check(retval)) {
+      const char *buffer;
+      Py_ssize_t size;
+
+      buffer = PyUnicode_AsUTF8AndSize(retval, &size);
+      write(fd, buffer, size);
+      write(fd, "\n", 1);
+    }
+  }
+
+  Py_XDECREF(retval);
+  return err_status;
+}
diff --git a/lang/python/helpers.h b/lang/python/helpers.h
index 81d17ff..4bd8ef8 100644
--- a/lang/python/helpers.h
+++ b/lang/python/helpers.h
@@ -35,3 +35,6 @@ PyObject *pygpgme_raise_callback_exception(PyObject *self);
 void pygpgme_set_passphrase_cb(gpgme_ctx_t ctx, PyObject *cb,
 			       PyObject **freelater);
 void pygpgme_set_progress_cb(gpgme_ctx_t ctx, PyObject *cb, PyObject **freelater);
+
+gpgme_error_t pyEditCb(void *opaque, gpgme_status_code_t status,
+		       const char *args, int fd);

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

Summary of changes:
 lang/python/gpgme.i              | 45 -----------------------------
 lang/python/helpers.c            | 51 ++++++++++++++++++++++++++++++++-
 lang/python/helpers.h            |  3 ++
 lang/python/pyme/core.py         | 11 +++++--
 lang/python/tests/Makefile.am    |  3 +-
 lang/python/tests/t-callbacks.py | 36 ++++++++++++++++++++++-
 lang/python/tests/t-edit.py      | 62 ++++++++++++++++++++++++++++++++++++++++
 7 files changed, 161 insertions(+), 50 deletions(-)
 create mode 100755 lang/python/tests/t-edit.py


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



From cvs at cvs.gnupg.org  Tue May 24 14:14:03 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Tue, 24 May 2016 14:14:03 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-130-gb107fc8
Message-ID: <E1b5BC5-0003Jr-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 Made Easy".

The branch, master has been updated
       via  b107fc8a92bd16bc0d868c771b6334d6594e6395 (commit)
      from  09803c4a81b9431fd4c8f30abb1c60c4c735f0cb (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 b107fc8a92bd16bc0d868c771b6334d6594e6395
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue May 24 14:10:16 2016 +0200

    Cpp: Set -std=c++11 also if CXXCPP is already set
    
    * m4/ax_cxx_compile_stdxx.m4 (AX_CXX_COMPILE_STDCXX): Set CXXCPP if
    neccessary.
    
    --
    This fixes the build with scan-build where CXXCPP is already set but
    does not include stdc++11. While this deviates from the
    autotools-archive version of the script it does not make sense
    to me first to check if stdc++11 needs to be set and then not
    set it.

diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4
index 2c18e49..de3d012 100644
--- a/m4/ax_cxx_compile_stdcxx.m4
+++ b/m4/ax_cxx_compile_stdcxx.m4
@@ -82,9 +82,7 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
          CXX="$ac_save_CXX"])
       if eval test x\$$cachevar = xyes; then
         CXX="$CXX $switch"
-        if test -n "$CXXCPP" ; then
-          CXXCPP="$CXXCPP $switch"
-        fi
+        CXXCPP="$CXXCPP $switch"
         ac_success=yes
         break
       fi
@@ -108,9 +106,7 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
          CXX="$ac_save_CXX"])
       if eval test x\$$cachevar = xyes; then
         CXX="$CXX $switch"
-        if test -n "$CXXCPP" ; then
-          CXXCPP="$CXXCPP $switch"
-        fi
+        CXXCPP="$CXXCPP $switch"
         ac_success=yes
         break
       fi

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

Summary of changes:
 m4/ax_cxx_compile_stdcxx.m4 | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)


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



From cvs at cvs.gnupg.org  Tue May 24 16:02:29 2016
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Tue, 24 May 2016 16:02:29 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-131-g00e93b2
Message-ID: <E1b5Ct1-0001tU-KN@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  00e93b2cae0585ff10425421d9097a846943b21c (commit)
      from  b107fc8a92bd16bc0d868c771b6334d6594e6395 (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 00e93b2cae0585ff10425421d9097a846943b21c
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue May 24 16:00:42 2016 +0200

    Qt: Fix test build with clang
    
    * lang/qt/tests/Makefile.am (LDADD): Explicitly add -lstdc++
    
    --
    g++ does not need that but clang does need it explicitly

diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
index db40e77..c060c70 100644
--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
@@ -32,7 +32,7 @@ AM_LDFLAGS = -no-install
 
 LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgme.la \
         ../../../src/libgpgme.la @GPGME_QT_LIBS@ @GPG_ERROR_LIBS@ \
-        @GPGME_QTTEST_LIBS@
+        @GPGME_QTTEST_LIBS@ -lstdc++
 
 AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@ \
               @GPGME_QT_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \

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

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  Tue May 24 16:08:31 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 24 May 2016 16:08:31 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.12-26-g91bc783
Message-ID: <E1b5Cys-0002KP-CT@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  91bc7833836f19256d56984c94cacf44853ff5c8 (commit)
       via  2421f7f7ed74ed20372efd63a2efd58d3b55005c (commit)
      from  f7426b73ce3176f2bd3ea02120be1c70d145542e (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 91bc7833836f19256d56984c94cacf44853ff5c8
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 24 15:54:48 2016 +0200

    gpgtar: Simplify code by using ccparray.
    
    * tools/gpgtar-create.c (gpgtar_create): Use ccparray functions.
    * tools/gpgtar-extract.c (gpgtar_extract): Ditto.
    * tools/gpgtar-list.c (gpgtar_list): Ditto.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/tools/gpgtar-create.c b/tools/gpgtar-create.c
index 968dca6..f7c8b1a 100644
--- a/tools/gpgtar-create.c
+++ b/tools/gpgtar-create.c
@@ -38,6 +38,7 @@
 #include "i18n.h"
 #include "../common/exectool.h"
 #include "../common/sysutils.h"
+#include "../common/ccparray.h"
 #include "gpgtar.h"
 
 #ifndef HAVE_LSTAT
@@ -888,8 +889,8 @@ gpgtar_create (char **inpattern, int encrypt, int sign)
 
   if (encrypt || sign)
     {
-      int i;
       strlist_t arg;
+      ccparray_t ccp;
       const char **argv;
 
       err = es_fseek (outstream, 0, SEEK_SET);
@@ -899,43 +900,36 @@ gpgtar_create (char **inpattern, int encrypt, int sign)
       /* '--encrypt' may be combined with '--symmetric', but 'encrypt'
          is set either way.  Clear it if no recipients are specified.
          XXX: Fix command handling.  */
-       if (opt.symmetric && opt.recipients == NULL)
-         encrypt = 0;
-
-      argv = xtrycalloc (strlist_length (opt.gpg_arguments)
-                         + 2 * strlist_length (opt.recipients)
-                         + 1 + !!encrypt + !!sign + 2 * !!opt.user
-                         + !!opt.symmetric,
-                         sizeof *argv);
-      if (argv == NULL)
-        {
-          err = gpg_error_from_syserror ();
-          goto leave;
-        }
-      i = 0;
+      if (opt.symmetric && opt.recipients == NULL)
+        encrypt = 0;
+
+      ccparray_init (&ccp, 0);
       if (encrypt)
-        argv[i++] = "--encrypt";
+        ccparray_put (&ccp, "--encrypt");
       if (sign)
-        argv[i++] = "--sign";
+        ccparray_put (&ccp, "--sign");
       if (opt.user)
         {
-          argv[i++] = "--local-user";
-          argv[i++] = opt.user;
+          ccparray_put (&ccp, "--local-user");
+          ccparray_put (&ccp, opt.user);
         }
       if (opt.symmetric)
-        argv[i++] = "--symmetric";
+        ccparray_put (&ccp, "--symmetric");
       for (arg = opt.recipients; arg; arg = arg->next)
         {
-          argv[i++] = "--recipient";
-          argv[i++] = arg->d;
+          ccparray_put (&ccp, "--recipient");
+          ccparray_put (&ccp, arg->d);
         }
       for (arg = opt.gpg_arguments; arg; arg = arg->next)
-        argv[i++] = arg->d;
-      argv[i++] = NULL;
-      assert (i == strlist_length (opt.gpg_arguments)
-              + 2 * strlist_length (opt.recipients)
-              + 1 + !!encrypt + !!sign + 2 * !!opt.user
-              + !!opt.symmetric);
+        ccparray_put (&ccp, arg->d);
+
+      ccparray_put (&ccp, NULL);
+      argv = ccparray_get (&ccp, NULL);
+      if (!argv)
+        {
+          err = gpg_error_from_syserror ();
+          goto leave;
+        }
 
       err = gnupg_exec_tool_stream (opt.gpg_program, argv,
                                     outstream, cipher_stream);
diff --git a/tools/gpgtar-extract.c b/tools/gpgtar-extract.c
index 95f2b56..3ee73ef 100644
--- a/tools/gpgtar-extract.c
+++ b/tools/gpgtar-extract.c
@@ -30,6 +30,7 @@
 #include "i18n.h"
 #include "../common/exectool.h"
 #include "../common/sysutils.h"
+#include "../common/ccparray.h"
 #include "gpgtar.h"
 
 
@@ -299,8 +300,8 @@ gpgtar_extract (const char *filename, int decrypt)
 
   if (decrypt)
     {
-      int i;
       strlist_t arg;
+      ccparray_t ccp;
       const char **argv;
 
       cipher_stream = stream;
@@ -311,19 +312,19 @@ gpgtar_extract (const char *filename, int decrypt)
           goto leave;
         }
 
-      argv = xtrycalloc (strlist_length (opt.gpg_arguments) + 2,
-                         sizeof *argv);
-      if (argv == NULL)
+      ccparray_init (&ccp, 0);
+
+      ccparray_put (&ccp, "--decrypt");
+      for (arg = opt.gpg_arguments; arg; arg = arg->next)
+        ccparray_put (&ccp, arg->d);
+
+      ccparray_put (&ccp, NULL);
+      argv = ccparray_get (&ccp, NULL);
+      if (!argv)
         {
           err = gpg_error_from_syserror ();
           goto leave;
         }
-      i = 0;
-      argv[i++] = "--decrypt";
-      for (arg = opt.gpg_arguments; arg; arg = arg->next)
-        argv[i++] = arg->d;
-      argv[i++] = NULL;
-      assert (i == strlist_length (opt.gpg_arguments) + 2);
 
       err = gnupg_exec_tool_stream (opt.gpg_program, argv,
                                     cipher_stream, stream);
diff --git a/tools/gpgtar-list.c b/tools/gpgtar-list.c
index 25c70d2..930712a 100644
--- a/tools/gpgtar-list.c
+++ b/tools/gpgtar-list.c
@@ -27,6 +27,7 @@
 #include "i18n.h"
 #include "gpgtar.h"
 #include "../common/exectool.h"
+#include "../common/ccparray.h"
 
 
 

@@ -299,8 +300,8 @@ gpgtar_list (const char *filename, int decrypt)
 
   if (decrypt)
     {
-      int i;
       strlist_t arg;
+      ccparray_t ccp;
       const char **argv;
 
       cipher_stream = stream;
@@ -311,19 +312,19 @@ gpgtar_list (const char *filename, int decrypt)
           goto leave;
         }
 
-      argv = xtrycalloc (strlist_length (opt.gpg_arguments) + 2,
-                         sizeof *argv);
-      if (argv == NULL)
+      ccparray_init (&ccp, 0);
+
+      ccparray_put (&ccp, "--decrypt");
+      for (arg = opt.gpg_arguments; arg; arg = arg->next)
+        ccparray_put (&ccp, arg->d);
+
+      ccparray_put (&ccp, NULL);
+      argv = ccparray_get (&ccp, NULL);
+      if (!argv)
         {
           err = gpg_error_from_syserror ();
           goto leave;
         }
-      i = 0;
-      argv[i++] = "--decrypt";
-      for (arg = opt.gpg_arguments; arg; arg = arg->next)
-        argv[i++] = arg->d;
-      argv[i++] = NULL;
-      assert (i == strlist_length (opt.gpg_arguments) + 2);
 
       err = gnupg_exec_tool_stream (opt.gpg_program, argv,
                                     cipher_stream, stream);

commit 2421f7f7ed74ed20372efd63a2efd58d3b55005c
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 24 15:43:16 2016 +0200

    common: Add simple dynamic array function.
    
    * common/ccparray.c: New.
    * common/ccparray.h: New.
    * common/t-ccparray.c: New.
    * common/Makefile.am (common_sources): Add files.
    (module_tests): Add test file.
    (t_ccparray_LDADD): New.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/Makefile.am b/common/Makefile.am
index 4a35f64..884c966 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -72,6 +72,7 @@ common_sources = \
 	xasprintf.c \
 	xreadline.c \
 	membuf.c membuf.h \
+	ccparray.c ccparray.h \
 	iobuf.c iobuf.h \
 	ttyio.c ttyio.h \
 	asshelp.c asshelp2.c asshelp.h \
@@ -156,7 +157,7 @@ module_tests = t-stringhelp t-timestuff \
                t-convert t-percent t-gettime t-sysutils t-sexputil \
 	       t-session-env t-openpgp-oid t-ssh-utils \
 	       t-mapstrings t-zb32 t-mbox-util t-iobuf t-strlist \
-	       t-private-keys
+	       t-private-keys t-ccparray
 if !HAVE_W32CE_SYSTEM
 module_tests += t-exechelp
 endif
@@ -206,6 +207,7 @@ t_mbox_util_LDADD = $(t_common_ldadd)
 t_iobuf_LDADD = $(t_common_ldadd)
 t_strlist_LDADD = $(t_common_ldadd)
 t_private_keys_LDADD = $(t_common_ldadd)
+t_ccparray_LDADD = $(t_common_ldadd)
 
 # System specific test
 if HAVE_W32_SYSTEM
diff --git a/common/ccparray.c b/common/ccparray.c
new file mode 100644
index 0000000..490dbf5
--- /dev/null
+++ b/common/ccparray.c
@@ -0,0 +1,147 @@
+/* ccparray.c - A simple dynamic array for character pointer.
+ * Copyright (C) 2016 g10 Code GmbH
+ *
+ * This file is part of GnuPG.
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of either
+ *
+ *   - 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.
+ *
+ * or
+ *
+ *   - 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.
+ *
+ * or both in parallel, as here.
+ *
+ * This file 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/>.
+ */
+
+#include <config.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdarg.h>
+
+#include "util.h"
+#include "ccparray.h"
+
+
+/* A simple implementation of a dynamic array of const char pointers.
+ * The example code:
+ *
+ *   ccparray_t ccp;
+ *   const char **argv;
+ *   int i;
+ *
+ *   ccparray_init (&ccp, 0);
+ *   ccparray_put (&ccp, "First arg");
+ *   ccparray_put (&ccp, "Second arg");
+ *   ccparray_put (&ccp, NULL);
+ *   ccparray_put (&ccp, "Fourth arg");
+ *   argv = ccparray_get (&ccp, NULL);
+ *   if (!argv)
+ *     die ("error building array: %s\n", strerror (errno));
+ *   for (i=0; argv[i]; i++)
+ *     printf ("[%d] = '%s'\n", i, argv[i]);
+ *   xfree (argv);
+ *
+ * will result in this output:
+ *
+ *   [0] = 'First arg'
+ *   [1] = 'Second arg'
+ *
+ * Note that allocation errors are detected but only returned with the
+ * final ccparray_get(); this helps not to clutter the code with out
+ * of core checks.
+ */
+
+void
+ccparray_init (ccparray_t *cpa, unsigned int initialsize)
+{
+  if (!initialsize)
+    cpa->size = 16;
+  else if (initialsize < (1<<16))
+    cpa->size = initialsize;
+  else
+    cpa->size = (1<<16);
+
+  cpa->count = 0;
+  cpa->out_of_core = 0;
+  cpa->array = xtrycalloc (cpa->size, sizeof *cpa->array);
+  if (!cpa->array)
+    cpa->out_of_core = errno;
+}
+
+
+void
+ccparray_put (ccparray_t *cpa, const char *value)
+{
+  if (cpa->out_of_core)
+    return;
+
+  if (cpa->count + 1 >= cpa->size)
+    {
+      const char **newarray;
+      size_t n, newsize;
+
+      if (cpa->size < 8)
+        newsize = 16;
+      else if (cpa->size < 4096)
+        newsize = 2 * cpa->size;
+      else if (cpa->size < (1<<16))
+        newsize = cpa->size + 2048;
+      else
+        {
+          cpa->out_of_core = ENOMEM;
+          return;
+        }
+
+      newarray = xtrycalloc (newsize, sizeof *newarray);
+      if (!newarray)
+        {
+          cpa->out_of_core = errno ? errno : ENOMEM;
+          return;
+        }
+      for (n=0; n < cpa->size; n++)
+        newarray[n] = cpa->array[n];
+      cpa->array = newarray;
+      cpa->size = newsize;
+
+    }
+  cpa->array[cpa->count++] = value;
+}
+
+
+const char **
+ccparray_get (ccparray_t *cpa, size_t *r_count)
+{
+  const char **result;
+
+  if (cpa->out_of_core)
+    {
+      if (cpa->array)
+        {
+          xfree (cpa->array);
+          cpa->array = NULL;
+        }
+      gpg_err_set_errno (cpa->out_of_core);
+      return NULL;
+    }
+
+  result= cpa->array;
+  if (r_count)
+    *r_count = cpa->count;
+  cpa->array = NULL;
+  cpa->out_of_core = ENOMEM; /* hack to make sure it won't get reused. */
+  return result;
+}
diff --git a/common/ccparray.h b/common/ccparray.h
new file mode 100644
index 0000000..241d42d
--- /dev/null
+++ b/common/ccparray.h
@@ -0,0 +1,51 @@
+/* ccparray.c - A simple dynamic array for character pointer.
+ * Copyright (C) 2016 g10 Code GmbH
+ *
+ * This file is part of GnuPG.
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of either
+ *
+ *   - 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.
+ *
+ * or
+ *
+ *   - 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.
+ *
+ * or both in parallel, as here.
+ *
+ * This file 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/>.
+ */
+
+#ifndef GNUPG_COMMON_CCPARRAY_H
+#define GNUPG_COMMON_CCPARRAY_H
+
+/* The definition of the structure is private, we only need it here,
+ * so it can be allocated on the stack.  */
+struct _ccparray_private_s
+{
+  unsigned int count;
+  unsigned int size;
+  int out_of_core;
+  const char **array;
+};
+
+typedef struct _ccparray_private_s ccparray_t;
+
+
+void ccparray_init (ccparray_t *cpa, unsigned int initialsize);
+void ccparray_put (ccparray_t *cpa, const char *value);
+const char **ccparray_get (ccparray_t *cpa, size_t *r_nelems);
+
+
+#endif /*GNUPG_COMMON_CCPARRAY_H*/
diff --git a/common/t-ccparray.c b/common/t-ccparray.c
new file mode 100644
index 0000000..0512346
--- /dev/null
+++ b/common/t-ccparray.c
@@ -0,0 +1,93 @@
+/* t-ccparray.c - Module test for ccparray.c
+ * Copyright (C) 2016 g10 Code GmbH
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG 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/>.
+ */
+
+#include <config.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "util.h"
+#include "ccparray.h"
+
+#define pass()  do { ; } while(0)
+#define fail(a)  do { fprintf (stderr, "%s:%d: test %d failed\n",\
+                               __FILE__,__LINE__, (a));          \
+                       exit (1);                                 \
+                    } while(0)
+
+
+static void
+run_test_1 (void)
+{
+  ccparray_t ccp;
+  const char **argv;
+  size_t nelem;
+
+  ccparray_init (&ccp, 0);
+  ccparray_put (&ccp, "First arg");
+  ccparray_put (&ccp, "Second arg");
+  ccparray_put (&ccp, NULL);
+  ccparray_put (&ccp, "Fourth arg");
+  argv = ccparray_get (&ccp, &nelem);
+  if (!argv)
+    {
+      fprintf (stderr, "error building array: %s\n", strerror (errno));
+      exit (1);
+    }
+
+  if (nelem != 4)
+    fail (1);
+
+  /* for (i=0; argv[i]; i++) */
+  /*   printf ("[%d] = '%s'\n", i, argv[i]); */
+  xfree (argv);
+}
+
+
+static void
+run_test_var (int count)
+{
+  ccparray_t ccp;
+  size_t nelem;
+  int i;
+
+  ccparray_init (&ccp, 0);
+  for (i=0; i < count; i++)
+    ccparray_put (&ccp, "An arg");
+  xfree (ccparray_get (&ccp, &nelem));
+  if (nelem != i)
+    fail (2);
+}
+
+
+int
+main (int argc, char **argv)
+{
+  (void)argc;
+  (void)argv;
+
+  run_test_1 ();
+  run_test_var (0);
+  run_test_var (7);
+  run_test_var (8);
+  run_test_var (9);
+  run_test_var (4096);
+
+  return 0;
+}

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

Summary of changes:
 common/Makefile.am                 |   4 +-
 common/ccparray.c                  | 147 +++++++++++++++++++++++++++++++++++++
 common/{ssh-utils.h => ccparray.h} |  26 +++++--
 common/t-ccparray.c                |  93 +++++++++++++++++++++++
 tools/gpgtar-create.c              |  50 ++++++-------
 tools/gpgtar-extract.c             |  21 +++---
 tools/gpgtar-list.c                |  21 +++---
 7 files changed, 306 insertions(+), 56 deletions(-)
 create mode 100644 common/ccparray.c
 copy common/{ssh-utils.h => ccparray.h} (58%)
 create mode 100644 common/t-ccparray.c


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



From cvs at cvs.gnupg.org  Tue May 24 18:01:15 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Tue, 24 May 2016 18:01:15 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-136-g00ff6d0
Message-ID: <E1b5Ejx-0002So-Ha@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  00ff6d07330028da370c869e3ec442eb76f8cbb8 (commit)
       via  7bc9cc717e428f48d4b27016f44c9f3900b1fba6 (commit)
       via  0ebd6a1b43a96bffa78da89dc8629edac0a74d35 (commit)
       via  8b57f06e0c04f5c9b87a3c76618230d757412076 (commit)
       via  72afb68f8c2f0cb326f20b289215402fd849339d (commit)
      from  00e93b2cae0585ff10425421d9097a846943b21c (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 00ff6d07330028da370c869e3ec442eb76f8cbb8
Author: Justus Winter <justus at gnupg.org>
Date:   Tue May 24 17:57:10 2016 +0200

    python: Improve and test Context.wait.
    
    * lang/python/pyme/core.py (Context.wait): Improve docstring.  As the
    context passed to 'gpgme_wait' is never NULL, it is pointless to look
    at the returned context.  Always raise exceptions.
    * lang/python/tests/Makefile.am (pytests): Add new test.
    * lang/python/tests/t-wait.py: New file.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py
index aca5ec2..5f8378d 100644
--- a/lang/python/pyme/core.py
+++ b/lang/python/pyme/core.py
@@ -316,23 +316,17 @@ class Context(GpgmeWrapper):
         errorcheck(pygpgme.gpgme_ctx_set_engine_info(self.wrapped, proto, file_name, home_dir))
 
     def wait(self, hang):
-        """Wait for asynchronous call to finish. Wait forever if hang is True
+        """Wait for asynchronous call to finish. Wait forever if hang is True.
+        Raises an exception on errors.
 
-        Return:
-            On an async call completion its return status.
-            On timeout - None.
+        Please read the GPGME manual for more information.
 
-        Please read the GPGME manual for more information."""
+        """
         ptr = pygpgme.new_gpgme_error_t_p()
-        context = pygpgme.gpgme_wait(self.wrapped, ptr, hang)
+        pygpgme.gpgme_wait(self.wrapped, ptr, hang)
         status = pygpgme.gpgme_error_t_p_value(ptr)
         pygpgme.delete_gpgme_error_t_p(ptr)
-
-        if context == None:
-            errorcheck(status)
-            return None
-        else:
-            return status
+        errorcheck(status)
 
     def op_edit(self, key, func, fnc_value, out):
         """Start key editing using supplied callback function"""
diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index 236354f..7df40a2 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -39,7 +39,8 @@ py_tests = t-wrapper.py \
 	t-signers.py \
 	t-decrypt.py \
 	t-export.py \
-	t-edit.py
+	t-edit.py \
+	t-wait.py
 
 TESTS = $(top_srcdir)/tests/gpg/initial.test \
 	$(py_tests) \
diff --git a/lang/python/tests/t-wait.py b/lang/python/tests/t-wait.py
new file mode 100755
index 0000000..7eaa46a
--- /dev/null
+++ b/lang/python/tests/t-wait.py
@@ -0,0 +1,42 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2016 g10 Code GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME 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.
+#
+# GPGME 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 program; if not, see <http://www.gnu.org/licenses/>.
+
+import time
+from pyme import core, constants, errors
+import support
+
+support.init_gpgme(constants.PROTOCOL_OpenPGP)
+c = core.Context()
+c.set_armor(True)
+
+# Checking a message without a signature.
+sig = core.Data("foo\n")
+text = core.Data()
+c.op_verify_start(sig, None, text)
+
+try:
+    while True:
+        err = c.wait(False)
+        if err:
+            break
+        time.sleep(0.1)
+except Exception as e:
+    assert e.getcode() == errors.NO_DATA
+else:
+    assert False, "Expected an error, got none"

commit 7bc9cc717e428f48d4b27016f44c9f3900b1fba6
Author: Justus Winter <justus at gnupg.org>
Date:   Tue May 24 17:22:08 2016 +0200

    python: Make all GnuPG errors available.
    
    * lang/python/Makefile.am (errors.i): Generate file.
    * lang/python/gpgme.i: Include generated file.
    * lang/python/pyme/errors.py: Pull in all errors and error sources.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
index 86c1965..f58f079 100644
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
@@ -29,7 +29,12 @@ copystamp: $(srcdir)/pyme $(srcdir)/helpers.c $(srcdir)/helpers.h
 	if test "$(srcdir)" != "$(builddir)" ; then cp -r $^ . ; fi
 	touch $@
 
-gpgme_wrap.c pyme/pygpgme.py: gpgme.i gpgme.h copystamp
+errors.i:
+	sed -n -e \
+	  '/GPG_ERR_[^ ]* =/s/ *\(.*\) = .*/%constant long \1 = \1;/p' \
+	  `gpg-error-config --prefix`/include/gpg-error.h >$@
+
+gpgme_wrap.c pyme/pygpgme.py: gpgme.i errors.i gpgme.h copystamp
 	$(SWIG) -python -py3 $(SWIGOPT) \
 	  -o $(builddir)/gpgme_wrap.c -outdir $(builddir)/pyme \
 	  $<
@@ -38,7 +43,8 @@ all-local: gpgme_wrap.c pyme/pygpgme.py copystamp
 	$(PYTHON) $(srcdir)/setup.py build --verbose
 
 clean-local:
-	rm -rf -- build gpgme.h gpgme_wrap.c pyme/pygpgme.py copystamp
+	rm -rf -- build gpgme.h errors.i gpgme_wrap.c pyme/pygpgme.py \
+	  copystamp
 	if test "$(srcdir)" != "$(builddir)" ; then \
 	  rm -rf pyme helpers.c helpers.h ; \
 	fi
diff --git a/lang/python/gpgme.i b/lang/python/gpgme.i
index a82efb5..84bc6e9 100644
--- a/lang/python/gpgme.i
+++ b/lang/python/gpgme.i
@@ -259,7 +259,7 @@ PyObject* object_to_gpgme_t(PyObject* input, const char* objtype, int argnum) {
 %}
 %include "gpgme.h"
 
-%constant long EOF = GPG_ERR_EOF;
+%include "errors.i"
 
 // Generating and handling pointers-to-pointers.
 
diff --git a/lang/python/pyme/errors.py b/lang/python/pyme/errors.py
index 5c8f922..f716421 100644
--- a/lang/python/pyme/errors.py
+++ b/lang/python/pyme/errors.py
@@ -17,6 +17,9 @@
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 
 from . import pygpgme
+from . import util
+
+util.process_constants('GPG_ERR_', globals())
 
 class GPGMEError(Exception):
     def __init__(self, error = None, message = None):
@@ -43,8 +46,6 @@ class GPGMEError(Exception):
     def __str__(self):
         return "%s (%d,%d)"%(self.getstring(), self.getsource(), self.getcode())
 
-EOF = getattr(pygpgme, "EOF")
-
 def errorcheck(retval, extradata = None):
     if retval:
         raise GPGMEError(retval, extradata)

commit 0ebd6a1b43a96bffa78da89dc8629edac0a74d35
Author: Justus Winter <justus at gnupg.org>
Date:   Tue May 24 16:45:39 2016 +0200

    python: Move the base wrapper class.
    
    * python/lang/pyme/util.py (GpgmeWrapper): Move...
    * python/lang/pyme/core.py: ... here.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py
index f15444b..aca5ec2 100644
--- a/lang/python/pyme/core.py
+++ b/lang/python/pyme/core.py
@@ -22,7 +22,83 @@
 from . import pygpgme
 from .errors import errorcheck, GPGMEError
 from . import errors
-from .util import GpgmeWrapper
+
+class GpgmeWrapper(object):
+    """Base class all Pyme wrappers for GPGME functionality.  Not to be
+    instantiated directly."""
+
+    def __init__(self, wrapped):
+        self._callback_excinfo = None
+        self.wrapped = wrapped
+
+    def __repr__(self):
+        return '<instance of %s.%s with GPG object at %s>' % \
+               (__name__, self.__class__.__name__,
+                self.wrapped)
+
+    def __str__(self):
+        return repr(self)
+
+    def __hash__(self):
+        return hash(repr(self.wrapped))
+
+    def __eq__(self, other):
+        if other == None:
+            return False
+        else:
+            return repr(self.wrapped) == repr(other.wrapped)
+
+    def _getctype(self):
+        """Must be implemented by child classes.
+
+        Must return the name of the c type."""
+        raise NotImplementedError()
+
+    def _getnameprepend(self):
+        """Must be implemented by child classes.
+
+        Must return the prefix of all c functions mapped to methods of
+        this class."""
+        raise NotImplementedError()
+
+    def _errorcheck(self, name):
+        """Must be implemented by child classes.
+
+        This function must return a trueish value for all c functions
+        returning gpgme_error_t."""
+        raise NotImplementedError()
+
+    def __getattr__(self, key):
+        """On-the-fly function generation."""
+        if key[0] == '_' or self._getnameprepend() == None:
+            return None
+        name = self._getnameprepend() + key
+        func = getattr(pygpgme, name)
+
+        if self._errorcheck(name):
+            def _funcwrap(slf, *args, **kwargs):
+                result = func(slf.wrapped, *args, **kwargs)
+                if slf._callback_excinfo:
+                    pygpgme.pygpgme_raise_callback_exception(slf)
+                return errorcheck(result, "Invocation of " + name)
+        else:
+            def _funcwrap(slf, *args, **kwargs):
+                result = func(slf.wrapped, *args, **kwargs)
+                if slf._callback_excinfo:
+                    pygpgme.pygpgme_raise_callback_exception(slf)
+                return result
+
+        _funcwrap.__doc__ = getattr(func, "__doc__")
+
+        # Monkey-patch the class.
+        setattr(self.__class__, key, _funcwrap)
+
+        # Bind the method to 'self'.
+        def wrapper(*args, **kwargs):
+            return _funcwrap(self, *args, **kwargs)
+        _funcwrap.__doc__ = getattr(func, "__doc__")
+
+        return wrapper
 
 class Context(GpgmeWrapper):
     """From the GPGME C documentation:
diff --git a/lang/python/pyme/util.py b/lang/python/pyme/util.py
index b54cd4d..d52cd1f 100644
--- a/lang/python/pyme/util.py
+++ b/lang/python/pyme/util.py
@@ -17,7 +17,6 @@
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 
 from . import pygpgme
-from .errors import errorcheck
 
 def process_constants(starttext, dict):
     """Called by the constant libraries to load up the appropriate constants
@@ -28,80 +27,3 @@ def process_constants(starttext, dict):
             continue
         name = identifier[index:]
         dict[name] = getattr(pygpgme, identifier)
-
-class GpgmeWrapper(object):
-    """Base class all Pyme wrappers for GPGME functionality.  Not to be
-    instantiated directly."""
-
-    def __init__(self, wrapped):
-        self._callback_excinfo = None
-        self.wrapped = wrapped
-
-    def __repr__(self):
-        return '<instance of %s.%s with GPG object at %s>' % \
-               (__name__, self.__class__.__name__,
-                self.wrapped)
-
-    def __str__(self):
-        return repr(self)
-
-    def __hash__(self):
-        return hash(repr(self.wrapped))
-
-    def __eq__(self, other):
-        if other == None:
-            return False
-        else:
-            return repr(self.wrapped) == repr(other.wrapped)
-
-    def _getctype(self):
-        """Must be implemented by child classes.
-
-        Must return the name of the c type."""
-        raise NotImplementedError()
-
-    def _getnameprepend(self):
-        """Must be implemented by child classes.
-
-        Must return the prefix of all c functions mapped to methods of
-        this class."""
-        raise NotImplementedError()
-
-    def _errorcheck(self, name):
-        """Must be implemented by child classes.
-
-        This function must return a trueish value for all c functions
-        returning gpgme_error_t."""
-        raise NotImplementedError()
-
-    def __getattr__(self, key):
-        """On-the-fly function generation."""
-        if key[0] == '_' or self._getnameprepend() == None:
-            return None
-        name = self._getnameprepend() + key
-        func = getattr(pygpgme, name)
-
-        if self._errorcheck(name):
-            def _funcwrap(slf, *args, **kwargs):
-                result = func(slf.wrapped, *args, **kwargs)
-                if slf._callback_excinfo:
-                    pygpgme.pygpgme_raise_callback_exception(slf)
-                return errorcheck(result, "Invocation of " + name)
-        else:
-            def _funcwrap(slf, *args, **kwargs):
-                result = func(slf.wrapped, *args, **kwargs)
-                if slf._callback_excinfo:
-                    pygpgme.pygpgme_raise_callback_exception(slf)
-                return result
-
-        _funcwrap.__doc__ = getattr(func, "__doc__")
-
-        # Monkey-patch the class.
-        setattr(self.__class__, key, _funcwrap)
-
-        # Bind the method to 'self'.
-        def wrapper(*args, **kwargs):
-            return _funcwrap(self, *args, **kwargs)
-        _funcwrap.__doc__ = getattr(func, "__doc__")
-
-        return wrapper

commit 8b57f06e0c04f5c9b87a3c76618230d757412076
Author: Justus Winter <justus at gnupg.org>
Date:   Tue May 24 15:14:53 2016 +0200

    python: Support status callbacks.
    
    * lang/python/helpers.c (pyStatusCb): New function.
    (pygpgme_set_status_cb): Likewise.
    * lang/python/helpers.h (pygpgme_set_status_cb): New prototype.
    * lang/python/pyme/core.py (Context.__init__): Initialize
    'last_statuscb'.
    (Context._free_statuscb): New function.
    (Context.set_status_cb): Likewise.
    * lang/python/tests/t-callbacks.py: Test status callbacks.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/helpers.c b/lang/python/helpers.c
index d0c1f3b..ec7264a 100644
--- a/lang/python/helpers.c
+++ b/lang/python/helpers.c
@@ -272,7 +272,72 @@ void pygpgme_set_progress_cb(gpgme_ctx_t ctx, PyObject *cb, PyObject **freelater
   *freelater = cb;
   gpgme_set_progress_cb(ctx, (gpgme_progress_cb_t) pyProgressCb, (void *) cb);
 }
+

+/* Status callbacks.  */
+static gpgme_error_t pyStatusCb(void *hook, const char *keyword,
+                                const char *args) {
+  gpgme_error_t err = 0;
+  PyObject *pyhook = (PyObject *) hook;
+  PyObject *self = NULL;
+  PyObject *func = NULL;
+  PyObject *dataarg = NULL;
+  PyObject *pyargs = NULL;
+  PyObject *retval = NULL;
+
+  assert (PyTuple_Check(pyhook));
+  assert (PyTuple_Size(pyhook) == 2 || PyTuple_Size(pyhook) == 3);
+  self = PyTuple_GetItem(pyhook, 0);
+  func = PyTuple_GetItem(pyhook, 1);
+  if (PyTuple_Size(pyhook) == 3) {
+    dataarg = PyTuple_GetItem(pyhook, 2);
+    pyargs = PyTuple_New(3);
+  } else {
+    pyargs = PyTuple_New(2);
+  }
+
+  if (keyword)
+    PyTuple_SetItem(pyargs, 0, PyUnicode_DecodeUTF8(keyword, strlen (keyword),
+                                                    "strict"));
+  else
+    {
+      Py_INCREF(Py_None);
+      PyTuple_SetItem(pyargs, 0, Py_None);
+    }
+  PyTuple_SetItem(pyargs, 1, PyUnicode_DecodeUTF8(args, strlen (args),
+                                                "strict"));
+  if (PyErr_Occurred()) {
+    err = gpg_error(GPG_ERR_GENERAL);
+    Py_DECREF(pyargs);
+    goto leave;
+  }
+
+  if (dataarg) {
+    Py_INCREF(dataarg);
+    PyTuple_SetItem(pyargs, 2, dataarg);
+  }
+
+  retval = PyObject_CallObject(func, pyargs);
+  if (PyErr_Occurred())
+    err = pygpgme_exception2code();
+  Py_DECREF(pyargs);
+  Py_XDECREF(retval);
+
+ leave:
+  if (err)
+    pygpgme_stash_callback_exception(self);
+  return err;
+}
 
+void pygpgme_set_status_cb(gpgme_ctx_t ctx, PyObject *cb,
+                           PyObject **freelater) {
+  if (cb == Py_None) {
+    gpgme_set_status_cb(ctx, NULL, NULL);
+    return;
+  }
+  Py_INCREF(cb);
+  *freelater = cb;
+  gpgme_set_status_cb(ctx, (gpgme_status_cb_t) pyStatusCb, (void *) cb);
+}
 

 /* Edit callbacks.  */
 gpgme_error_t pyEditCb(void *opaque, gpgme_status_code_t status,
diff --git a/lang/python/helpers.h b/lang/python/helpers.h
index 4bd8ef8..5dd88a0 100644
--- a/lang/python/helpers.h
+++ b/lang/python/helpers.h
@@ -35,6 +35,8 @@ PyObject *pygpgme_raise_callback_exception(PyObject *self);
 void pygpgme_set_passphrase_cb(gpgme_ctx_t ctx, PyObject *cb,
 			       PyObject **freelater);
 void pygpgme_set_progress_cb(gpgme_ctx_t ctx, PyObject *cb, PyObject **freelater);
+void pygpgme_set_status_cb(gpgme_ctx_t ctx, PyObject *cb,
+                           PyObject **freelater);
 
 gpgme_error_t pyEditCb(void *opaque, gpgme_status_code_t status,
 		       const char *args, int fd);
diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py
index 43a2413..f15444b 100644
--- a/lang/python/pyme/core.py
+++ b/lang/python/pyme/core.py
@@ -64,6 +64,7 @@ class Context(GpgmeWrapper):
         super().__init__(wrapped)
         self.last_passcb = None
         self.last_progresscb = None
+        self.last_statuscb = None
 
     def __del__(self):
         if not pygpgme:
@@ -91,6 +92,14 @@ class Context(GpgmeWrapper):
                 pygpgme.delete_PyObject_p_p(self.last_progresscb)
             self.last_progresscb = None
 
+    def _free_statuscb(self):
+        if self.last_statuscb != None:
+            if pygpgme.pygpgme_clear_generic_cb:
+                pygpgme.pygpgme_clear_generic_cb(self.last_statuscb)
+            if pygpgme.delete_PyObject_p_p:
+                pygpgme.delete_PyObject_p_p(self.last_statuscb)
+            self.last_statuscb = None
+
     def op_keylist_all(self, *args, **kwargs):
         self.op_keylist_start(*args, **kwargs)
         key = self.op_keylist_next()
@@ -195,6 +204,29 @@ class Context(GpgmeWrapper):
                 hookdata = (self, func, hook)
         pygpgme.pygpgme_set_progress_cb(self.wrapped, hookdata, self.last_progresscb)
 
+    def set_status_cb(self, func, hook=None):
+        """Sets the status callback to the function specified by FUNC.  If
+        FUNC is None, the callback will be cleared.
+
+        The function will be called with two arguments, keyword and
+        args.  If HOOK is not None, it will be supplied as third
+        argument.
+
+        Please see the GPGME manual for more information.
+
+        """
+        self._free_statuscb()
+        if func == None:
+            hookdata = None
+        else:
+            self.last_statuscb = pygpgme.new_PyObject_p_p()
+            if hook == None:
+                hookdata = (self, func)
+            else:
+                hookdata = (self, func, hook)
+        pygpgme.pygpgme_set_status_cb(self.wrapped, hookdata,
+                                      self.last_statuscb)
+
     def get_engine_info(self):
         """Returns this context specific engine info"""
         return pygpgme.gpgme_ctx_get_engine_info(self.wrapped)
diff --git a/lang/python/tests/t-callbacks.py b/lang/python/tests/t-callbacks.py
index d962dc4..5797526 100755
--- a/lang/python/tests/t-callbacks.py
+++ b/lang/python/tests/t-callbacks.py
@@ -146,3 +146,38 @@ except Exception as e:
     assert e == myException
 else:
     assert False, "Expected an error, got none"
+
+
+
+# Test the status callback.
+source = core.Data("Hallo Leute\n")
+sink = core.Data()
+
+status_cb_called = False
+def status_cb(keyword, args, hook=None):
+    global status_cb_called
+    status_cb_called = True
+    assert hook == cookie
+
+c = core.Context()
+c.set_status_cb(status_cb, cookie)
+c.set_ctx_flag("full-status", "1")
+c.op_encrypt([alpha], constants.ENCRYPT_ALWAYS_TRUST, source, sink)
+assert status_cb_called
+
+# Test exceptions.
+source = core.Data("Hallo Leute\n")
+sink = core.Data()
+
+def status_cb(keyword, args):
+    raise myException
+
+c = core.Context()
+c.set_status_cb(status_cb, None)
+c.set_ctx_flag("full-status", "1")
+try:
+    c.op_encrypt([alpha], constants.ENCRYPT_ALWAYS_TRUST, source, sink)
+except Exception as e:
+    assert e == myException
+else:
+    assert False, "Expected an error, got none"

commit 72afb68f8c2f0cb326f20b289215402fd849339d
Author: Justus Winter <justus at gnupg.org>
Date:   Tue May 24 15:12:40 2016 +0200

    python: Improve docstring.
    
    * lang/python/pyme/core.py (Context.set_progress_cb): Improve
    docstring.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py
index 1b4e6ae..43a2413 100644
--- a/lang/python/pyme/core.py
+++ b/lang/python/pyme/core.py
@@ -173,12 +173,17 @@ class Context(GpgmeWrapper):
         pygpgme.pygpgme_set_passphrase_cb(self.wrapped, hookdata, self.last_passcb)
 
     def set_progress_cb(self, func, hook=None):
-        """Sets the progress meter callback to the function specified by
+        """Sets the progress meter callback to the function specified by FUNC.
+        If FUNC is None, the callback will be cleared.
 
-        This function will be called to provide an interactive update of
-        the system's progress.
+        This function will be called to provide an interactive update
+        of the system's progress.  The function will be called with
+        three arguments, type, total, and current.  If HOOK is not
+        None, it will be supplied as fourth argument.
 
-        Please see the GPGME manual for more information."""
+        Please see the GPGME manual for more information.
+
+        """
         self._free_progresscb()
         if func == None:
             hookdata = None

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

Summary of changes:
 lang/python/Makefile.am                      |  10 +-
 lang/python/gpgme.i                          |   2 +-
 lang/python/helpers.c                        |  65 ++++++++++++
 lang/python/helpers.h                        |   2 +
 lang/python/pyme/core.py                     | 141 +++++++++++++++++++++++----
 lang/python/pyme/errors.py                   |   5 +-
 lang/python/pyme/util.py                     |  78 ---------------
 lang/python/tests/Makefile.am                |   3 +-
 lang/python/tests/t-callbacks.py             |  35 +++++++
 lang/python/tests/{t-export.py => t-wait.py} |  27 ++---
 10 files changed, 256 insertions(+), 112 deletions(-)
 copy lang/python/tests/{t-export.py => t-wait.py} (67%)


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



From cvs at cvs.gnupg.org  Wed May 25 08:18:31 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 25 May 2016 08:18:31 +0200
Subject: [git] KSBA - branch, master, updated. libksba-1.3.4-3-g43f890f
Message-ID: <E1b5S7Y-0006az-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 "KSBA is a library to access X.509 certificates and CMS data.".

The branch, master has been updated
       via  43f890f37b514757db5653608ec59b5a74e8e092 (commit)
      from  2a9fc5654df497b91ab9b64e946c1e19371888e5 (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 43f890f37b514757db5653608ec59b5a74e8e092
Author: Werner Koch <wk at gnupg.org>
Date:   Wed May 25 08:17:13 2016 +0200

    Fix OOB read in parse_distribution_point.
    
    * src/cert.c (parse_distribution_point): Check TI.length.
    --
    
    GnuPG-bug-id: 2350
    Co-authored-by: Pascal Cuoq <cuoq at trust-in-soft.com>
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/cert.c b/src/cert.c
index dc97f83..d8dabb6 100644
--- a/src/cert.c
+++ b/src/cert.c
@@ -1586,6 +1586,8 @@ parse_distribution_point (const unsigned char *der, size_t derlen,
       unsigned int bits, mask;
       int i, unused, full;
 
+      if (!ti.length || ti.length > derlen)
+        return gpg_error (GPG_ERR_ENCODING_PROBLEM);
       unused = *der++; derlen--;
       ti.length--;
       if ((!ti.length && unused) || unused/8 > ti.length)

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

Summary of changes:
 src/cert.c | 2 ++
 1 file changed, 2 insertions(+)


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  Wed May 25 14:46:31 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 25 May 2016 14:46:31 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.12-27-g7402809
Message-ID: <E1b5YB2-0005wg-S7@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  74028096e06d2904f77b74b373750264e5b7b1ea (commit)
      from  91bc7833836f19256d56984c94cacf44853ff5c8 (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 74028096e06d2904f77b74b373750264e5b7b1ea
Author: Werner Koch <wk at gnupg.org>
Date:   Wed May 25 14:44:50 2016 +0200

    build: Switch to new URL for swdb.lst

diff --git a/build-aux/getswdb.sh b/build-aux/getswdb.sh
index 4a1730b..83ecdb2 100755
--- a/build-aux/getswdb.sh
+++ b/build-aux/getswdb.sh
@@ -11,9 +11,7 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 # The URL of the file to retrieve.
-# (some wget versions seem to have problems with SubjectAltName, thus
-#  we do not use www.gnupg.org)
-urlbase="https://gnupg.org/"
+urlbase="https://versions.gnupg.org/"
 
 WGET=wget
 GPGV=gpgv

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

Summary of changes:
 build-aux/getswdb.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)


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



From cvs at cvs.gnupg.org  Fri May 27 11:31:11 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 27 May 2016 11:31:11 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.12-29-g6c957c3
Message-ID: <E1b6E55-0001Ss-0C@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  6c957c3d880c069bb843cc58fdcebb9fc344727e (commit)
      from  b3e043ba905fdf2efcdadbd7022ac53f4408b748 (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 6c957c3d880c069bb843cc58fdcebb9fc344727e
Author: Werner Koch <wk at gnupg.org>
Date:   Fri May 27 11:28:22 2016 +0200

    gpg: Keep current and total of PROGESS status lines small enough.
    
    * g10/progress.c (progress_filter): Factor status wrote out to...
    (write_status_progress): New.  Scale values down.
    --
    
    GnuPG-bug-id: 2368
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/progress.c b/g10/progress.c
index 21810a4..a1027b8 100644
--- a/g10/progress.c
+++ b/g10/progress.c
@@ -71,6 +71,49 @@ release_progress_context (progress_filter_context_t *pfx)
 }
 
 
+static void
+write_status_progress (const char *what,
+                       unsigned long current, unsigned long total)
+{
+  char buffer[50];
+
+  /* Although we use an unsigned long for the values, 32 bit
+   * applications using GPGME will use an "int" and thus are limited
+   * in the total size which can be represented.  On Windows, where
+   * sizeof(int)==sizeof(long), this is even worse and will lead to an
+   * integer overflow for all files larger than 2 GiB.  Although, the
+   * allowed value range of TOTAL and CURRENT is nowhere specified, we
+   * better protect applications from the need to handle negative
+   * values.  The common usage pattern of the progress information is
+   * to display how many percent of the operation has been done and
+   * thus scaling CURRENT and TOTAL down before they get to large,
+   * should not have a noticeable effect except for rounding
+   * imprecision. */
+  if (total)
+    {
+      if (current > total)
+        current = total;
+
+      while (total > 1024*1024)
+        {
+          total /= 1024;
+          current /= 1024;
+        }
+    }
+  else
+    {
+      while (current > 1024*1024)
+        {
+          current /= 1024;
+        }
+    }
+
+  snprintf (buffer, sizeof buffer, "%.20s ? %lu %lu",
+            what? what : "?", current, total);
+  write_status_text (STATUS_PROGRESS, buffer);
+}
+
+
 /****************
  * The filter is used to report progress to the user.
  */
@@ -83,17 +126,11 @@ progress_filter (void *opaque, int control,
 
   if (control == IOBUFCTRL_INIT)
     {
-      char buffer[50];
-
       pfx->last = 0;
       pfx->offset = 0;
       pfx->last_time = make_timestamp ();
 
-      sprintf (buffer, "%.20s ? %lu %lu",
-               pfx->what? pfx->what : "?",
-               pfx->offset,
-	       pfx->total);
-      write_status_text (STATUS_PROGRESS, buffer);
+      write_status_progress (pfx->what, pfx->offset, pfx->total);
     }
   else if (control == IOBUFCTRL_UNDERFLOW)
     {
@@ -113,14 +150,7 @@ progress_filter (void *opaque, int control,
       if ((len == -1 && pfx->offset != pfx->last)
 	  || timestamp - pfx->last_time > 0)
 	{
-	  char buffer[50];
-
-	  sprintf (buffer, "%.20s ? %lu %lu",
-                   pfx->what? pfx->what : "?",
-                   pfx->offset,
-		   pfx->total);
-	  write_status_text (STATUS_PROGRESS, buffer);
-
+          write_status_progress (pfx->what, pfx->offset, pfx->total);
 	  pfx->last = pfx->offset;
 	  pfx->last_time = timestamp;
 	}

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

Summary of changes:
 g10/progress.c | 60 +++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 45 insertions(+), 15 deletions(-)


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



From cvs at cvs.gnupg.org  Fri May 27 15:53:13 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 27 May 2016 15:53:13 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.12-33-gad75ca9
Message-ID: <E1b6IAe-00075r-SR@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  ad75ca9c963bebbe02aae8d73e199a705764ae82 (commit)
       via  d755bcb89dbeaf6c7c1eca73ccabdf89b536c535 (commit)
       via  5d991e333a1885adc40abd9d00c01fec4bd5d9d7 (commit)
       via  96c7901ec1c79be732570811223d3ea54875abfe (commit)
      from  6c957c3d880c069bb843cc58fdcebb9fc344727e (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 ad75ca9c963bebbe02aae8d73e199a705764ae82
Author: Werner Koch <wk at gnupg.org>
Date:   Fri May 27 15:51:25 2016 +0200

    tools: Improve debug output of rfc822parse.
    
    * tools/rfc822parse.c (show_event): Add missing events.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/tools/rfc822parse.c b/tools/rfc822parse.c
index f911bd2..215ab52 100644
--- a/tools/rfc822parse.c
+++ b/tools/rfc822parse.c
@@ -1117,7 +1117,7 @@ dump_structure (rfc822parse_t msg, part_t part, int indent)
     {
       rfc822parse_field_t ctx;
       part_t save_part; /* ugly hack - we should have a function to
-                           get part inforation. */
+                           get part information. */
       const char *s;
 
       save_part = msg->current_part;
@@ -1177,8 +1177,13 @@ show_event (rfc822parse_event_t event)
     case RFC822PARSE_T2BODY: s= "T2Body"; break;
     case RFC822PARSE_FINISH: s= "Finish"; break;
     case RFC822PARSE_RCVD_SEEN: s= "Rcvd_Seen"; break;
+    case RFC822PARSE_LEVEL_DOWN: s= "Level_Down"; break;
+    case RFC822PARSE_LEVEL_UP:   s= "Level_Up"; break;
     case RFC822PARSE_BOUNDARY: s= "Boundary"; break;
     case RFC822PARSE_LAST_BOUNDARY: s= "Last_Boundary"; break;
+    case RFC822PARSE_BEGIN_HEADER: s= "Begin_Header"; break;
+    case RFC822PARSE_PREAMBLE: s= "Preamble"; break;
+    case RFC822PARSE_EPILOGUE: s= "Epilogue"; break;
     default: s= "***invalid event***"; break;
     }
   printf ("*** got RFC822 event %s\n", s);

commit d755bcb89dbeaf6c7c1eca73ccabdf89b536c535
Author: Werner Koch <wk at gnupg.org>
Date:   Fri May 27 15:50:30 2016 +0200

    build: Remove obsolete tests for funopen and fopencookie.
    
    * configure.ac (AC_CHECK_FUNCS): Remove tests for funopen.
    --
    
    Meanwhile we are using the portable functions from libgpg-error.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/configure.ac b/configure.ac
index d90921c..07d728a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1383,7 +1383,7 @@ AC_CHECK_FUNCS([waitpid wait4 sigaction sigprocmask pipe getaddrinfo])
 AC_CHECK_FUNCS([ttyname rand ftello fsync stat lstat])
 AC_CHECK_FUNCS([memicmp stpcpy strsep strlwr strtoul memmove stricmp strtol \
                 memrchr isascii timegm getrusage setrlimit stat setlocale   \
-                flockfile funlockfile fopencookie funopen getpwnam getpwuid \
+                flockfile funlockfile getpwnam getpwuid \
                 getenv inet_pton strpbrk])
 
 if test "$have_android_system" = yes; then
diff --git a/doc/sysnotes.texi b/doc/sysnotes.texi
index a8cea87..dec07bd 100644
--- a/doc/sysnotes.texi
+++ b/doc/sysnotes.texi
@@ -11,28 +11,6 @@ right now, however there are probably a lot of smaller glitches we need
 to fix first.  The major problem areas are:
 
 @itemize
- at item 
-For logging to sockets and other internal operations the
- at code{fopencookie} function (@code{funopen} under *BSD) is used.  This
-is a very convenient function which makes it possible to create outputs in
-a structures and easy maintainable way.  The drawback however is that
-most proprietary OSes don't support this function.  At g10 at tie{}Code we
-have looked into several ways on how to overcome this limitation but no
-sufficiently easy and maintainable way has been found.  Porting
- at emph{glibc} to a general POSIX system is of course an option and would
-make writing portable software much easier; this it has not yet been
-done and the system administrator would need to cope with the GNU
-specific admin things in addition to the generic ones of his system.
-
-We have now settled to use explicit stdio wrappers with a functionality
-similar to funopen.  Although the code for this has already been written
-(@emph{libestream}), we have not yet changed GnuPG to use it.
-
-This means that on systems not supporting either @code{funopen} or
- at code{fopencookie}, logging to a socket won't work, prompts are not
-formatted as pretty as they should be and @command{gpgsm}'s
- at code{LISTKEYS} Assuan command does not work.
-
 @item
 We are planning to use file descriptor passing for interprocess
 communication.  This will allow us save a lot of resources and improve
@@ -78,9 +56,3 @@ The periodical smartcard status checking done by @command{scdaemon} is
 not yet supported.
 
 @end itemize
-
-
-
-
-
-

commit 5d991e333a1885adc40abd9d00c01fec4bd5d9d7
Author: Werner Koch <wk at gnupg.org>
Date:   Fri May 27 15:41:55 2016 +0200

    common: Extend gnupg_create_inbound_pipe et al.
    
    * common/exechelp-posix.c (gnupg_create_inbound_pipe): Add args 'r_fp'
    and 'nonblock'.
    (gnupg_create_outbound_pipe): Ditto.
    * common/exechelp-w32.c (gnupg_create_inbound_pipe): Add non yet
    functional args 'r_fp' and 'nonblock'.
    (gnupg_create_outbound_pipe): Ditto.
    * common/exechelp-w32ce.c (gnupg_create_inbound_pipe): Ditto.
    (gnupg_create_outbound_pipe): Ditto.
    --
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/call-gpg.c b/common/call-gpg.c
index f5a62ec..0bda1d3 100644
--- a/common/call-gpg.c
+++ b/common/call-gpg.c
@@ -430,9 +430,9 @@ _gpg_encrypt (ctrl_t ctrl,
   assert ((reader_mb == NULL) != (cipher_stream == NULL));
 
   /* Create two pipes.  */
-  err = gnupg_create_outbound_pipe (outbound_fds);
+  err = gnupg_create_outbound_pipe (outbound_fds, NULL, 0);
   if (!err)
-    err = gnupg_create_inbound_pipe (inbound_fds);
+    err = gnupg_create_inbound_pipe (inbound_fds, NULL, 0);
   if (err)
     {
       log_error (_("error creating a pipe: %s\n"), gpg_strerror (err));
@@ -614,9 +614,9 @@ _gpg_decrypt (ctrl_t ctrl,
   assert ((reader_mb == NULL) != (plain_stream == NULL));
 
   /* Create two pipes.  */
-  err = gnupg_create_outbound_pipe (outbound_fds);
+  err = gnupg_create_outbound_pipe (outbound_fds, NULL, 0);
   if (!err)
-    err = gnupg_create_inbound_pipe (inbound_fds);
+    err = gnupg_create_inbound_pipe (inbound_fds, NULL, 0);
   if (err)
     {
       log_error (_("error creating a pipe: %s\n"), gpg_strerror (err));
diff --git a/common/exechelp-posix.c b/common/exechelp-posix.c
index 069b07a..87c6e55 100644
--- a/common/exechelp-posix.c
+++ b/common/exechelp-posix.c
@@ -341,20 +341,28 @@ create_pipe_and_estream (int filedes[2], estream_t *r_fp,
 
 
 /* Portable function to create a pipe.  Under Windows the write end is
-   inheritable.  */
+   inheritable.  If R_FP is not NULL, an estream is created for the
+   read end and stored at R_FP.  */
 gpg_error_t
-gnupg_create_inbound_pipe (int filedes[2])
+gnupg_create_inbound_pipe (int filedes[2], estream_t *r_fp, int nonblock)
 {
-  return do_create_pipe (filedes);
+  if (r_fp)
+    return create_pipe_and_estream (filedes, r_fp, 0, nonblock);
+  else
+    return do_create_pipe (filedes);
 }
 
 
 /* Portable function to create a pipe.  Under Windows the read end is
-   inheritable.  */
+   inheritable.  If R_FP is not NULL, an estream is created for the
+   write end and stored at R_FP.  */
 gpg_error_t
-gnupg_create_outbound_pipe (int filedes[2])
+gnupg_create_outbound_pipe (int filedes[2], estream_t *r_fp, int nonblock)
 {
-  return do_create_pipe (filedes);
+  if (r_fp)
+    return create_pipe_and_estream (filedes, r_fp, 1, nonblock);
+  else
+    return do_create_pipe (filedes);
 }
 
 
diff --git a/common/exechelp-w32.c b/common/exechelp-w32.c
index 0aa2020..a8a8b45 100644
--- a/common/exechelp-w32.c
+++ b/common/exechelp-w32.c
@@ -320,20 +320,28 @@ do_create_pipe (int filedes[2], int flags)
 }
 
 /* Portable function to create a pipe.  Under Windows the write end is
-   inheritable.  */
+   inheritable.  If R_FP is not NULL, an estream is created for the
+   read end and stored at R_FP.  */
 gpg_error_t
-gnupg_create_inbound_pipe (int filedes[2])
+gnupg_create_inbound_pipe (int filedes[2], estream_t *r_fp, int nonblock)
 {
-  return do_create_pipe (filedes, INHERIT_WRITE);
+  if (r_fp)
+    return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
+  else
+    return do_create_pipe (filedes, INHERIT_WRITE);
 }
 
 
 /* Portable function to create a pipe.  Under Windows the read end is
-   inheritable.  */
+   inheritable.  If R_FP is not NULL, an estream is created for the
+   write end and stored at R_FP.  */
 gpg_error_t
-gnupg_create_outbound_pipe (int filedes[2])
+gnupg_create_outbound_pipe (int filedes[2], estream_t *r_fp, int nonblock)
 {
-  return do_create_pipe (filedes, INHERIT_READ);
+  if (r_fp)
+    return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
+  else
+    return do_create_pipe (filedes, INHERIT_READ);
 }
 
 
diff --git a/common/exechelp-w32ce.c b/common/exechelp-w32ce.c
index 57ecaf3..06aa6bc 100644
--- a/common/exechelp-w32ce.c
+++ b/common/exechelp-w32ce.c
@@ -450,18 +450,24 @@ create_inheritable_pipe (int filedes[2], int inherit_idx)
 /* Portable function to create a pipe.  Under Windows the write end is
    inheritable (i.e. an rendezvous id).  */
 gpg_error_t
-gnupg_create_inbound_pipe (int filedes[2])
+gnupg_create_inbound_pipe (int filedes[2], estream_t *r_fp, int nonblock)
 {
-  return create_inheritable_pipe (filedes, 1);
+  if (r_fp)
+    return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
+  else
+    return create_inheritable_pipe (filedes, 1);
 }
 
 
 /* Portable function to create a pipe.  Under Windows the read end is
    inheritable (i.e. an rendezvous id).  */
 gpg_error_t
-gnupg_create_outbound_pipe (int filedes[2])
+gnupg_create_outbound_pipe (int filedes[2], estream_t *r_fp, int nonblock)
 {
-  return create_inheritable_pipe (filedes, 0);
+  if (r_fp)
+    return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
+  else
+    return create_inheritable_pipe (filedes, 0);
 }
 
 
diff --git a/common/exechelp.h b/common/exechelp.h
index 3454cd6..d6ef5f0 100644
--- a/common/exechelp.h
+++ b/common/exechelp.h
@@ -52,12 +52,16 @@ int *get_all_open_fds (void);
 
 
 /* Portable function to create a pipe.  Under Windows the write end is
-   inheritable.  */
-gpg_error_t gnupg_create_inbound_pipe (int filedes[2]);
+   inheritable.  If R_FP is not NULL, an estream is created for the
+   write end and stored at R_FP.  */
+gpg_error_t gnupg_create_inbound_pipe (int filedes[2],
+                                       estream_t *r_fp, int nonblock);
 
 /* Portable function to create a pipe.  Under Windows the read end is
-   inheritable.  */
-gpg_error_t gnupg_create_outbound_pipe (int filedes[2]);
+   inheritable.  If R_FP is not NULL, an estream is created for the
+   write end and stored at R_FP.  */
+gpg_error_t gnupg_create_outbound_pipe (int filedes[2],
+                                        estream_t *r_fp, int nonblock);
 
 /* Portable function to create a pipe.  Under Windows both ends are
    inheritable.  */
diff --git a/dirmngr/ldap-wrapper.c b/dirmngr/ldap-wrapper.c
index c073f17..55fcd8b 100644
--- a/dirmngr/ldap-wrapper.c
+++ b/dirmngr/ldap-wrapper.c
@@ -695,10 +695,10 @@ ldap_wrapper (ctrl_t ctrl, ksba_reader_t *reader, const char *argv[])
       return err;
     }
 
-  err = gnupg_create_inbound_pipe (outpipe);
+  err = gnupg_create_inbound_pipe (outpipe, NULL, 0);
   if (!err)
     {
-      err = gnupg_create_inbound_pipe (errpipe);
+      err = gnupg_create_inbound_pipe (errpipe, NULL, 0);
       if (err)
         {
           close (outpipe[0]);
diff --git a/g13/be-encfs.c b/g13/be-encfs.c
index f59f4d9..a873541 100644
--- a/g13/be-encfs.c
+++ b/g13/be-encfs.c
@@ -246,9 +246,9 @@ run_encfs_tool (ctrl_t ctrl, enum encfs_cmds cmd,
   if (err)
     goto leave;
 
-  err = gnupg_create_inbound_pipe (inbound);
+  err = gnupg_create_inbound_pipe (inbound, NULL, 0);
   if (!err)
-    err = gnupg_create_outbound_pipe (outbound);
+    err = gnupg_create_outbound_pipe (outbound, NULL, 0);
   if (err)
     {
       log_error (_("error creating a pipe: %s\n"), gpg_strerror (err));

commit 96c7901ec1c79be732570811223d3ea54875abfe
Author: Werner Koch <wk at gnupg.org>
Date:   Fri May 27 15:25:03 2016 +0200

    common: 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.
    (create_pipe_and_estream): Remove arg ERRSOURCE and fix use of
    OUTBOUND which has a wrong name.  Adjust callers.
    (gnupg_spawn_process): Remove arg ERRSOURCE and replace by use of
    DEFAULT_ERRSOURCE.
    * common/exechelp-w32.c (gnupg_spawn_process): Ditto.
    * common/exechelp-w32ce.c (gnupg_spawn_process): Ditto.
    * common/exectool.c (gnupg_exec_tool_stream):  Do not pass
    GPG_ERROR_FROM_SYSERROR.
    * tools/gpgconf-comp.c (gc_component_check_options): Ditto.
    (retrieve_options_from_program): Ditto.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/exechelp-posix.c b/common/exechelp-posix.c
index 6614eb7..069b07a 100644
--- a/common/exechelp-posix.c
+++ b/common/exechelp-posix.c
@@ -73,6 +73,20 @@
 #include "exechelp.h"
 
 
+/* 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.  */
@@ -285,64 +299,36 @@ do_create_pipe (int filedes[2])
 
   if (pipe (filedes) == -1)
     {
-      err = gpg_error_from_syserror ();
+      err = my_error_from_syserror ();
       filedes[0] = filedes[1] = -1;
     }
 
   return err;
 }
 
-/* Portable function to create a pipe.  Under Windows the write end is
-   inheritable.  */
-gpg_error_t
-gnupg_create_inbound_pipe (int filedes[2])
-{
-  return do_create_pipe (filedes);
-}
-
-
-/* Portable function to create a pipe.  Under Windows the read end is
-   inheritable.  */
-gpg_error_t
-gnupg_create_outbound_pipe (int filedes[2])
-{
-  return do_create_pipe (filedes);
-}
-
-
-/* Portable function to create a pipe.  Under Windows both ends are
-   inheritable.  */
-gpg_error_t
-gnupg_create_pipe (int filedes[2])
-{
-  return do_create_pipe (filedes);
-}
-
-
 
 static gpg_error_t
 create_pipe_and_estream (int filedes[2], estream_t *r_fp,
-                         int outbound, int nonblock,
-                         gpg_err_source_t errsource)
+                         int outbound, int nonblock)
 {
   gpg_error_t err;
 
   if (pipe (filedes) == -1)
     {
-      err = gpg_err_make (errsource, gpg_err_code_from_syserror ());
+      err = my_error_from_syserror ();
       log_error (_("error creating a pipe: %s\n"), gpg_strerror (err));
       filedes[0] = filedes[1] = -1;
       *r_fp = NULL;
       return err;
     }
 
-  if (outbound)
+  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 = gpg_err_make (errsource, gpg_err_code_from_syserror ());
+      err = my_error_from_syserror ();
       log_error (_("error creating a stream for a pipe: %s\n"),
                  gpg_strerror (err));
       close (filedes[0]);
@@ -354,11 +340,36 @@ create_pipe_and_estream (int filedes[2], estream_t *r_fp,
 }
 
 
+/* Portable function to create a pipe.  Under Windows the write end is
+   inheritable.  */
+gpg_error_t
+gnupg_create_inbound_pipe (int filedes[2])
+{
+  return do_create_pipe (filedes);
+}
+
+
+/* Portable function to create a pipe.  Under Windows the read end is
+   inheritable.  */
+gpg_error_t
+gnupg_create_outbound_pipe (int filedes[2])
+{
+  return do_create_pipe (filedes);
+}
+
+
+/* Portable function to create a pipe.  Under Windows both ends are
+   inheritable.  */
+gpg_error_t
+gnupg_create_pipe (int filedes[2])
+{
+  return do_create_pipe (filedes);
+}
+
 
 /* Fork and exec the PGMNAME, see exechelp.h for details.  */
 gpg_error_t
 gnupg_spawn_process (const char *pgmname, const char *argv[],
-                     gpg_err_source_t errsource,
                      void (*preexec)(void), unsigned int flags,
                      estream_t *r_infp,
                      estream_t *r_outfp,
@@ -384,14 +395,14 @@ gnupg_spawn_process (const char *pgmname, const char *argv[],
 
   if (r_infp)
     {
-      err = create_pipe_and_estream (inpipe, &infp, 0, nonblock, errsource);
+      err = create_pipe_and_estream (inpipe, &infp, 1, nonblock);
       if (err)
         return err;
     }
 
   if (r_outfp)
     {
-      err = create_pipe_and_estream (outpipe, &outfp, 1, nonblock, errsource);
+      err = create_pipe_and_estream (outpipe, &outfp, 0, nonblock);
       if (err)
         {
           if (infp)
@@ -407,7 +418,7 @@ gnupg_spawn_process (const char *pgmname, const char *argv[],
 
   if (r_errfp)
     {
-      err = create_pipe_and_estream (errpipe, &errfp, 1, nonblock, errsource);
+      err = create_pipe_and_estream (errpipe, &errfp, 0, nonblock);
       if (err)
         {
           if (infp)
@@ -432,7 +443,7 @@ gnupg_spawn_process (const char *pgmname, const char *argv[],
   *pid = fork ();
   if (*pid == (pid_t)(-1))
     {
-      err = gpg_err_make (errsource, gpg_err_code_from_syserror ());
+      err = my_error_from_syserror ();
       log_error (_("error forking process: %s\n"), gpg_strerror (err));
 
       if (infp)
@@ -505,7 +516,7 @@ gnupg_spawn_process_fd (const char *pgmname, const char *argv[],
   *pid = fork ();
   if (*pid == (pid_t)(-1))
     {
-      err = gpg_error_from_syserror ();
+      err = my_error_from_syserror ();
       log_error (_("error forking process: %s\n"), strerror (errno));
       return err;
     }
@@ -543,7 +554,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);
     }
 
   left = count;
@@ -638,16 +649,16 @@ gnupg_spawn_process_detached (const char *pgmname, const char *argv[],
   int i;
 
   if (getuid() != geteuid())
-    return gpg_error (GPG_ERR_BUG);
+    return my_error (GPG_ERR_BUG);
 
   if (access (pgmname, X_OK))
-    return gpg_error_from_syserror ();
+    return my_error_from_syserror ();
 
   pid = fork ();
   if (pid == (pid_t)(-1))
     {
       log_error (_("error forking process: %s\n"), strerror (errno));
-      return gpg_error_from_syserror ();
+      return my_error_from_syserror ();
     }
   if (!pid)
     {
diff --git a/common/exechelp-w32.c b/common/exechelp-w32.c
index 3e407d2..0aa2020 100644
--- a/common/exechelp-w32.c
+++ b/common/exechelp-w32.c
@@ -349,7 +349,6 @@ gnupg_create_pipe (int filedes[2])
 /* Fork and exec the PGMNAME, see exechelp.h for details.  */
 gpg_error_t
 gnupg_spawn_process (const char *pgmname, const char *argv[],
-                     gpg_err_source_t errsource,
                      void (*preexec)(void), unsigned int flags,
                      estream_t *r_infp,
                      estream_t *r_outfp,
@@ -379,6 +378,7 @@ gnupg_spawn_process (const char *pgmname, const char *argv[],
                       INVALID_HANDLE_VALUE};
   int i;
   es_syshd_t syshd;
+  gpg_err_source_t errsource = default_errsource;
 
   if (r_infp)
     *r_infp = NULL;
diff --git a/common/exechelp-w32ce.c b/common/exechelp-w32ce.c
index e208f6e..57ecaf3 100644
--- a/common/exechelp-w32ce.c
+++ b/common/exechelp-w32ce.c
@@ -509,7 +509,6 @@ create_process (const char *pgmname, const char *cmdline,
 /* Fork and exec the PGMNAME, see exechelp.h for details.  */
 gpg_error_t
 gnupg_spawn_process (const char *pgmname, const char *argv[],
-                     gpg_err_source_t errsource,
                      void (*preexec)(void), unsigned int flags,
                      estream_t *r_infp,
                      estream_t *r_outfp,
@@ -534,6 +533,7 @@ gnupg_spawn_process (const char *pgmname, const char *argv[],
   } errpipe = {INVALID_HANDLE_VALUE, 0};
   estream_t outfp = NULL;
   estream_t errfp = NULL;
+  gpg_err_source_t errsource = default_errsource;
 
   (void)preexec;
   (void)flags;
diff --git a/common/exechelp.h b/common/exechelp.h
index 82224fd..3454cd6 100644
--- a/common/exechelp.h
+++ b/common/exechelp.h
@@ -112,7 +112,6 @@ gpg_error_t gnupg_create_pipe (int filedes[2]);
  */
 gpg_error_t
 gnupg_spawn_process (const char *pgmname, const char *argv[],
-                     gpg_err_source_t errsource,
                      void (*preexec)(void), unsigned int flags,
                      estream_t *r_infp,
                      estream_t *r_outfp,
diff --git a/common/exectool.c b/common/exectool.c
index 7b3a8f1..9ba336d 100644
--- a/common/exectool.c
+++ b/common/exectool.c
@@ -251,7 +251,7 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
   copy_buffer_init (&cpbuf[0]);
   copy_buffer_init (&cpbuf[1]);
 
-  err = gnupg_spawn_process (pgmname, argv, GPG_ERR_SOURCE_DEFAULT,
+  err = gnupg_spawn_process (pgmname, argv,
                              NULL, GNUPG_SPAWN_NONBLOCK,
                              input? &infp : NULL,
                              &outfp, &errfp, &pid);
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 4dd10a4..5d4a26a 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -1626,7 +1626,7 @@ gc_component_check_options (int component, estream_t out, const char *conf_file)
 
   result = 0;
   errlines = NULL;
-  err = gnupg_spawn_process (pgmname, argv, GPG_ERR_SOURCE_DEFAULT, NULL, 0,
+  err = gnupg_spawn_process (pgmname, argv, NULL, 0,
                              NULL, NULL, &errfp, &pid);
   if (err)
     result |= 1; /* Program could not be run.  */
@@ -1965,7 +1965,7 @@ retrieve_options_from_program (gc_component_t component, gc_backend_t backend)
   argv[0] = "--gpgconf-list";
   argv[1] = NULL;
 
-  err = gnupg_spawn_process (pgmname, argv, GPG_ERR_SOURCE_DEFAULT, NULL, 0,
+  err = gnupg_spawn_process (pgmname, argv, NULL, 0,
                              NULL, &outfp, NULL, &pid);
   if (err)
     {

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

Summary of changes:
 common/call-gpg.c       |   8 ++--
 common/exechelp-posix.c | 105 ++++++++++++++++++++++++++++--------------------
 common/exechelp-w32.c   |  22 ++++++----
 common/exechelp-w32ce.c |  16 +++++---
 common/exechelp.h       |  13 +++---
 common/exectool.c       |   2 +-
 configure.ac            |   2 +-
 dirmngr/ldap-wrapper.c  |   4 +-
 doc/sysnotes.texi       |  28 -------------
 g13/be-encfs.c          |   4 +-
 tools/gpgconf-comp.c    |   4 +-
 tools/rfc822parse.c     |   7 +++-
 12 files changed, 114 insertions(+), 101 deletions(-)


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



From cvs at cvs.gnupg.org  Fri May 27 17:26:48 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Fri, 27 May 2016 17:26:48 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-144-g3915842
Message-ID: <E1b6JdB-0002yT-J4@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  3915842657f0849a038752fd7445f96081a89dd9 (commit)
       via  5265017d58e72b99b953932da2683522bb7bc741 (commit)
       via  e3dfd0a5ed53043a2fb1ceb23fc3aff03c47708d (commit)
       via  2ae847c02731994d99e69d3d025ff01f41406452 (commit)
       via  ebfe2300c33a3bad311e9ac1530e6c92636a08a4 (commit)
       via  e74cd9fb80f12b764d5e4561e73d55644147e9e7 (commit)
       via  bf188e280b8b4fc775f33c47e2e1e275ed044004 (commit)
       via  ce73ae9d0cbf782cd3a1949fc4f568f0d1da60d9 (commit)
      from  00ff6d07330028da370c869e3ec442eb76f8cbb8 (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 3915842657f0849a038752fd7445f96081a89dd9
Author: Justus Winter <justus at gnupg.org>
Date:   Fri May 27 15:58:23 2016 +0200

    python: Port more tests.
    
    * lang/python/pyme/core.py (Data._error_check): Add
    'gpgme_data_get_file_name' to the list of functions not returning an
    error code.
    * lang/python/tests/Makefile.am (pytests): Add new tests.
    * lang/python/tests/support.py (verbose): New variable.
    * lang/python/tests/t-data.py: Test setting and getting the filename.
    * lang/python/tests/t-encrypt-large.py: New file.
    * lang/python/tests/t-file-name.py: Likewise.
    * lang/python/tests/t-trustlist.py: Likewise.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py
index e89c181..cc262c9 100644
--- a/lang/python/pyme/core.py
+++ b/lang/python/pyme/core.py
@@ -363,11 +363,12 @@ class Data(GpgmeWrapper):
 
     def _errorcheck(self, name):
         """This function should list all functions returning gpgme_error_t"""
-        if name == 'gpgme_data_release_and_get_mem' or \
-               name == 'gpgme_data_get_encoding' or \
-               name == 'gpgme_data_seek':
-            return 0
-        return 1
+        return name not in {
+            'gpgme_data_release_and_get_mem',
+            'gpgme_data_get_encoding',
+            'gpgme_data_seek',
+            'gpgme_data_get_file_name',
+        }
 
     def __init__(self, string=None, file=None, offset=None,
                  length=None, cbs=None, copy=True):
diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index 7df40a2..0bc8c7f 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -39,8 +39,11 @@ py_tests = t-wrapper.py \
 	t-signers.py \
 	t-decrypt.py \
 	t-export.py \
+	t-trustlist.py \
 	t-edit.py \
-	t-wait.py
+	t-wait.py \
+	t-encrypt-large.py \
+	t-file-name.py
 
 TESTS = $(top_srcdir)/tests/gpg/initial.test \
 	$(py_tests) \
diff --git a/lang/python/tests/support.py b/lang/python/tests/support.py
index a57d581..99d96cf 100644
--- a/lang/python/tests/support.py
+++ b/lang/python/tests/support.py
@@ -26,7 +26,8 @@ def init_gpgme(proto):
     core.check_version()
     core.engine_check_version(proto)
 
+verbose = int(os.environ.get('verbose', 0)) > 1
 def print_data(data):
-    if int(os.environ.get('verbose', 0)) > 1:
+    if verbose:
         data.seek(0, os.SEEK_SET)
         sys.stdout.buffer.write(data.read())
diff --git a/lang/python/tests/t-data.py b/lang/python/tests/t-data.py
index de60c47..3774f09 100755
--- a/lang/python/tests/t-data.py
+++ b/lang/python/tests/t-data.py
@@ -52,6 +52,10 @@ data.write(binjunk)
 data.seek(0, os.SEEK_SET)
 assert data.read() == binjunk
 
+data = core.Data()
+data.set_file_name("foobar")
+assert data.get_file_name() == "foobar"
+
 # Test reading from an existing file.
 with tempfile.NamedTemporaryFile() as tmp:
     tmp.write(binjunk)
diff --git a/lang/python/tests/t-encrypt-large.py b/lang/python/tests/t-encrypt-large.py
new file mode 100755
index 0000000..69aed48
--- /dev/null
+++ b/lang/python/tests/t-encrypt-large.py
@@ -0,0 +1,63 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2016 g10 Code GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME 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.
+#
+# GPGME 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 program; if not, see <http://www.gnu.org/licenses/>.
+
+import sys
+import random
+from pyme import core, constants
+import support
+
+if len(sys.argv) == 2:
+    nbytes = int(sys.argv[1])
+else:
+    nbytes = 100000
+
+support.init_gpgme(constants.PROTOCOL_OpenPGP)
+c = core.Context()
+
+ntoread = nbytes
+def read_cb(amount):
+    global ntoread
+    chunk = ntoread if ntoread < amount else amount
+    ntoread -= chunk
+    assert ntoread >= 0
+    assert chunk >= 0
+    return bytes(random.randrange(256) for i in range(chunk))
+
+nwritten = 0
+def write_cb(data):
+    global nwritten
+    nwritten += len(data)
+    return len(data)
+
+source = core.Data(cbs=(read_cb, None, None, lambda: None))
+sink = core.Data(cbs=(None, write_cb, None, lambda: None))
+
+keys = []
+keys.append(c.get_key("A0FF4590BB6122EDEF6E3C542D727CC768697734", False))
+keys.append(c.get_key("D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2", False))
+
+c.op_encrypt(keys, constants.ENCRYPT_ALWAYS_TRUST, source, sink)
+result = c.op_encrypt_result()
+assert not result.invalid_recipients, \
+    "Invalid recipient encountered: {}".format(result.invalid_recipients.fpr)
+assert ntoread == 0
+
+if support.verbose:
+    sys.stderr.write(
+        "plaintext={} bytes, ciphertext={} bytes\n".format(nbytes, nwritten))
diff --git a/lang/python/tests/support.py b/lang/python/tests/t-file-name.py
old mode 100644
new mode 100755
similarity index 55%
copy from lang/python/tests/support.py
copy to lang/python/tests/t-file-name.py
index a57d581..6f9294e
--- a/lang/python/tests/support.py
+++ b/lang/python/tests/t-file-name.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 # Copyright (C) 2016 g10 Code GmbH
 #
 # This file is part of GPGME.
@@ -15,18 +17,26 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-import sys
 import os
-from pyme import core
+from pyme import core, constants
+import support
+
+testname = "abcde12345"
+
+support.init_gpgme(constants.PROTOCOL_OpenPGP)
+c = core.Context()
+c.set_armor(True)
 
-def make_filename(name):
-    return os.path.join(os.environ['top_srcdir'], 'tests', 'gpg', name)
+source = core.Data("Hallo Leute\n")
+source.set_file_name(testname)
+cipher = core.Data()
+plain = core.Data()
 
-def init_gpgme(proto):
-    core.check_version()
-    core.engine_check_version(proto)
+keys = []
+keys.append(c.get_key("A0FF4590BB6122EDEF6E3C542D727CC768697734", False))
 
-def print_data(data):
-    if int(os.environ.get('verbose', 0)) > 1:
-        data.seek(0, os.SEEK_SET)
-        sys.stdout.buffer.write(data.read())
+c.op_encrypt(keys, constants.ENCRYPT_ALWAYS_TRUST, source, cipher)
+cipher.seek(0, os.SEEK_SET)
+c.op_decrypt(cipher, plain)
+result = c.op_decrypt_result()
+assert result.file_name == testname
diff --git a/lang/python/tests/support.py b/lang/python/tests/t-trustlist.py
old mode 100644
new mode 100755
similarity index 64%
copy from lang/python/tests/support.py
copy to lang/python/tests/t-trustlist.py
index a57d581..61f8fa5
--- a/lang/python/tests/support.py
+++ b/lang/python/tests/t-trustlist.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 # Copyright (C) 2016 g10 Code GmbH
 #
 # This file is part of GPGME.
@@ -15,18 +17,18 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-import sys
-import os
-from pyme import core
+from pyme import core, constants
+import support
 
-def make_filename(name):
-    return os.path.join(os.environ['top_srcdir'], 'tests', 'gpg', name)
+support.init_gpgme(constants.PROTOCOL_OpenPGP)
+c = core.Context()
+c.op_trustlist_start("alice", 0)
 
-def init_gpgme(proto):
-    core.check_version()
-    core.engine_check_version(proto)
+while True:
+    item = c.op_trustlist_next()
+    if not item:
+        break
 
-def print_data(data):
-    if int(os.environ.get('verbose', 0)) > 1:
-        data.seek(0, os.SEEK_SET)
-        sys.stdout.buffer.write(data.read())
+    print("l={} k={} t={} o={} v={} u={}".format(
+        item.level, item.keyid, item.type, item.owner_trust,
+        item.validity, item.name))

commit 5265017d58e72b99b953932da2683522bb7bc741
Author: Justus Winter <justus at gnupg.org>
Date:   Fri May 27 15:46:17 2016 +0200

    src: Fix typo.
    
    --
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/src/gpgme.h.in b/src/gpgme.h.in
index 87550fe..d68372c 100644
--- a/src/gpgme.h.in
+++ b/src/gpgme.h.in
@@ -1290,7 +1290,7 @@ gpgme_error_t gpgme_data_new_with_read_cb (gpgme_data_t *r_dh,
 
 /* Create a new data buffer filled with the content of file FNAME.
    COPY must be non-zero.  For delayed read, please use
-   gpgme_data_new_from_fd or gpgme_data_new_from stream instead.  */
+   gpgme_data_new_from_fd or gpgme_data_new_from_stream instead.  */
 gpgme_error_t gpgme_data_new_from_file (gpgme_data_t *r_dh,
 					const char *fname,
 					int copy);

commit e3dfd0a5ed53043a2fb1ceb23fc3aff03c47708d
Author: Justus Winter <justus at gnupg.org>
Date:   Fri May 27 15:27:55 2016 +0200

    tests: Fix test.
    
    --
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/tests/gpg/t-file-name.c b/tests/gpg/t-file-name.c
index eb20fc0..dad4bd9 100644
--- a/tests/gpg/t-file-name.c
+++ b/tests/gpg/t-file-name.c
@@ -87,7 +87,7 @@ main (int argc, char *argv[])
     {
       fprintf (stderr, "%s:%i: Unexpected result file name: %s\n",
                __FILE__, __LINE__,
-	       result->file_name ? "(null)" : result->file_name);
+	       result->file_name ? result->file_name : "(null)");
       exit (1);
     }
 

commit 2ae847c02731994d99e69d3d025ff01f41406452
Author: Justus Winter <justus at gnupg.org>
Date:   Fri May 27 14:04:28 2016 +0200

    python: Implement data callbacks.
    
    * lang/python/gpgme.i (object_to_gpgme_t): Set exception on error.
    * lang/python/helpers.c (pyDataReadCb): New function.
    (pyDataWriteCb): Likewise.
    (pyDataSeekCb): Likewise.
    (pyDataReleaseCb): Likewise.
    (pygpgme_data_new_from_cbs): Likewise.
    * lang/python/helpers.h (pygpgme_data_new_from_cbs): New prototype.
    * lang/python/pyme/core.py (Data.__init__): Fix docstring, fix read
    callbacks.
    (Data.__del__): Fix read callbacks.
    (Data._free_readcb): Drop function.
    (Data._free_datacbs): New function.
    (Data.new_from_cbs): Fix setting the callbacks.
    (Data.write): Raise stashed exceptions.
    (Data.read): Likewise.
    * lang/python/tests/t-callbacks.py: Test new functionality.
    * lang/python/tests/t-data.py: Likewise.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/gpgme.i b/lang/python/gpgme.i
index 84bc6e9..5b3c193 100644
--- a/lang/python/gpgme.i
+++ b/lang/python/gpgme.i
@@ -180,10 +180,13 @@ PyObject* object_to_gpgme_t(PyObject* input, const char* objtype, int argnum) {
 			gpgme_data_t pubkey, gpgme_data_t seckey,
 			gpgme_data_t out};
 
-// SWIG has problem interpreting ssize_t, off_t or gpgme_error_t in gpgme.h
+/* SWIG has problems interpreting ssize_t, off_t or gpgme_error_t in
+   gpgme.h.  */
+/* XXX: This is wrong at least for off_t if compiled with LFS.  */
 %typemap(out) ssize_t, off_t, gpgme_error_t, gpgme_err_code_t, gpgme_err_source_t, gpg_error_t {
   $result = PyLong_FromLong($1);
 }
+/* XXX: This is wrong at least for off_t if compiled with LFS.  */
 %typemap(in) ssize_t, off_t, gpgme_error_t, gpgme_err_code_t, gpgme_err_source_t, gpg_error_t {
   $1 = PyLong_AsLong($input);
 }
@@ -201,7 +204,7 @@ PyObject* object_to_gpgme_t(PyObject* input, const char* objtype, int argnum) {
   Py_XDECREF($result);   /* Blow away any previous result */
   if (result < 0) {      /* Check for I/O error */
     free($1);
-    return NULL;
+    return PyErr_SetFromErrno(PyExc_RuntimeError);
   }
   $result = PyBytes_FromStringAndSize($1,result);
   free($1);
diff --git a/lang/python/helpers.c b/lang/python/helpers.c
index 9fe81c9..4792c87 100644
--- a/lang/python/helpers.c
+++ b/lang/python/helpers.c
@@ -402,3 +402,245 @@ gpgme_error_t pyEditCb(void *opaque, gpgme_status_code_t status,
   Py_XDECREF(retval);
   return err_status;
 }
+

+/* Data callbacks.  */
+
+/* Read up to SIZE bytes into buffer BUFFER from the data object with
+   the handle HOOK.  Return the number of characters read, 0 on EOF
+   and -1 on error.  If an error occurs, errno is set.  */
+static ssize_t pyDataReadCb(void *hook, void *buffer, size_t size)
+{
+  ssize_t result;
+  PyObject *pyhook = (PyObject *) hook;
+  PyObject *self = NULL;
+  PyObject *func = NULL;
+  PyObject *dataarg = NULL;
+  PyObject *pyargs = NULL;
+  PyObject *retval = NULL;
+
+  assert (PyTuple_Check(pyhook));
+  assert (PyTuple_Size(pyhook) == 5 || PyTuple_Size(pyhook) == 6);
+
+  self = PyTuple_GetItem(pyhook, 0);
+  func = PyTuple_GetItem(pyhook, 1);
+  if (PyTuple_Size(pyhook) == 6) {
+    dataarg = PyTuple_GetItem(pyhook, 5);
+    pyargs = PyTuple_New(2);
+  } else {
+    pyargs = PyTuple_New(1);
+  }
+
+  PyTuple_SetItem(pyargs, 0, PyLong_FromSize_t(size));
+  if (dataarg) {
+    Py_INCREF(dataarg);
+    PyTuple_SetItem(pyargs, 1, dataarg);
+  }
+
+  retval = PyObject_CallObject(func, pyargs);
+  Py_DECREF(pyargs);
+  if (PyErr_Occurred()) {
+    pygpgme_stash_callback_exception(self);
+    result = -1;
+    goto leave;
+  }
+
+  if (! PyBytes_Check(retval)) {
+    PyErr_Format(PyExc_TypeError,
+                 "expected bytes from read callback, got %s",
+                 retval->ob_type->tp_name);
+    pygpgme_stash_callback_exception(self);
+    result = -1;
+    goto leave;
+  }
+
+  if (PyBytes_Size(retval) > size) {
+    PyErr_Format(PyExc_TypeError,
+                 "expected %zu bytes from read callback, got %zu",
+                 size, PyBytes_Size(retval));
+    pygpgme_stash_callback_exception(self);
+    result = -1;
+    goto leave;
+  }
+
+  memcpy(buffer, PyBytes_AsString(retval), PyBytes_Size(retval));
+  result = PyBytes_Size(retval);
+
+ leave:
+  Py_XDECREF(retval);
+  return result;
+}
+
+/* Write up to SIZE bytes from buffer BUFFER to the data object with
+   the handle HOOK.  Return the number of characters written, or -1
+   on error.  If an error occurs, errno is set.  */
+static ssize_t pyDataWriteCb(void *hook, const void *buffer, size_t size)
+{
+  ssize_t result;
+  PyObject *pyhook = (PyObject *) hook;
+  PyObject *self = NULL;
+  PyObject *func = NULL;
+  PyObject *dataarg = NULL;
+  PyObject *pyargs = NULL;
+  PyObject *retval = NULL;
+
+  assert (PyTuple_Check(pyhook));
+  assert (PyTuple_Size(pyhook) == 5 || PyTuple_Size(pyhook) == 6);
+
+  self = PyTuple_GetItem(pyhook, 0);
+  func = PyTuple_GetItem(pyhook, 2);
+  if (PyTuple_Size(pyhook) == 6) {
+    dataarg = PyTuple_GetItem(pyhook, 5);
+    pyargs = PyTuple_New(2);
+  } else {
+    pyargs = PyTuple_New(1);
+  }
+
+  PyTuple_SetItem(pyargs, 0, PyBytes_FromStringAndSize(buffer, size));
+  if (dataarg) {
+    Py_INCREF(dataarg);
+    PyTuple_SetItem(pyargs, 1, dataarg);
+  }
+
+  retval = PyObject_CallObject(func, pyargs);
+  Py_DECREF(pyargs);
+  if (PyErr_Occurred()) {
+    pygpgme_stash_callback_exception(self);
+    result = -1;
+    goto leave;
+  }
+
+  if (! PyLong_Check(retval)) {
+    PyErr_Format(PyExc_TypeError,
+                 "expected int from read callback, got %s",
+                 retval->ob_type->tp_name);
+    pygpgme_stash_callback_exception(self);
+    result = -1;
+    goto leave;
+  }
+
+  result = PyLong_AsSsize_t(retval);
+
+ leave:
+  Py_XDECREF(retval);
+  return result;
+}
+
+/* Set the current position from where the next read or write starts
+   in the data object with the handle HOOK to OFFSET, relativ to
+   WHENCE.  Returns the new offset in bytes from the beginning of the
+   data object.  */
+static off_t pyDataSeekCb(void *hook, off_t offset, int whence)
+{
+  off_t result;
+  PyObject *pyhook = (PyObject *) hook;
+  PyObject *self = NULL;
+  PyObject *func = NULL;
+  PyObject *dataarg = NULL;
+  PyObject *pyargs = NULL;
+  PyObject *retval = NULL;
+
+  assert (PyTuple_Check(pyhook));
+  assert (PyTuple_Size(pyhook) == 5 || PyTuple_Size(pyhook) == 6);
+
+  self = PyTuple_GetItem(pyhook, 0);
+  func = PyTuple_GetItem(pyhook, 3);
+  if (PyTuple_Size(pyhook) == 6) {
+    dataarg = PyTuple_GetItem(pyhook, 5);
+    pyargs = PyTuple_New(3);
+  } else {
+    pyargs = PyTuple_New(2);
+  }
+
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
+  PyTuple_SetItem(pyargs, 0, PyLong_FromLongLong((long long) offset));
+#else
+  PyTuple_SetItem(pyargs, 0, PyLong_FromLong((long) offset));
+#endif
+  PyTuple_SetItem(pyargs, 1, PyLong_FromLong((long) whence));
+  if (dataarg) {
+    Py_INCREF(dataarg);
+    PyTuple_SetItem(pyargs, 2, dataarg);
+  }
+
+  retval = PyObject_CallObject(func, pyargs);
+  Py_DECREF(pyargs);
+  if (PyErr_Occurred()) {
+    pygpgme_stash_callback_exception(self);
+    result = -1;
+    goto leave;
+  }
+
+  if (! PyLong_Check(retval)) {
+    PyErr_Format(PyExc_TypeError,
+                 "expected int from read callback, got %s",
+                 retval->ob_type->tp_name);
+    pygpgme_stash_callback_exception(self);
+    result = -1;
+    goto leave;
+  }
+
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
+  result = PyLong_AsLongLong(retval);
+#else
+  result = PyLong_AsLong(retval);
+#endif
+
+ leave:
+  Py_XDECREF(retval);
+  return result;
+}
+
+/* Close the data object with the handle HOOK.  */
+static void pyDataReleaseCb(void *hook)
+{
+  PyObject *pyhook = (PyObject *) hook;
+  PyObject *self = NULL;
+  PyObject *func = NULL;
+  PyObject *dataarg = NULL;
+  PyObject *pyargs = NULL;
+  PyObject *retval = NULL;
+
+  assert (PyTuple_Check(pyhook));
+  assert (PyTuple_Size(pyhook) == 5 || PyTuple_Size(pyhook) == 6);
+
+  self = PyTuple_GetItem(pyhook, 0);
+  func = PyTuple_GetItem(pyhook, 4);
+  if (PyTuple_Size(pyhook) == 6) {
+    dataarg = PyTuple_GetItem(pyhook, 5);
+    pyargs = PyTuple_New(1);
+  } else {
+    pyargs = PyTuple_New(0);
+  }
+
+  if (dataarg) {
+    Py_INCREF(dataarg);
+    PyTuple_SetItem(pyargs, 0, dataarg);
+  }
+
+  retval = PyObject_CallObject(func, pyargs);
+  Py_XDECREF(retval);
+  Py_DECREF(pyargs);
+  if (PyErr_Occurred())
+    pygpgme_stash_callback_exception(self);
+}
+
+gpgme_error_t pygpgme_data_new_from_cbs(gpgme_data_t *r_data,
+                                        PyObject *pycbs,
+                                        PyObject **freelater)
+{
+  static struct gpgme_data_cbs cbs = {
+    pyDataReadCb,
+    pyDataWriteCb,
+    pyDataSeekCb,
+    pyDataReleaseCb,
+  };
+  PyObject *dataarg = NULL;
+
+  assert (PyTuple_Check(pycbs));
+  assert (PyTuple_Size(pycbs) == 5 || PyTuple_Size(pycbs) == 6);
+
+  Py_INCREF(pycbs);
+  *freelater = pycbs;
+
+  return gpgme_data_new_from_cbs(r_data, &cbs, (void *) pycbs);
+}
diff --git a/lang/python/helpers.h b/lang/python/helpers.h
index 5dd88a0..8b90008 100644
--- a/lang/python/helpers.h
+++ b/lang/python/helpers.h
@@ -40,3 +40,7 @@ void pygpgme_set_status_cb(gpgme_ctx_t ctx, PyObject *cb,
 
 gpgme_error_t pyEditCb(void *opaque, gpgme_status_code_t status,
 		       const char *args, int fd);
+
+gpgme_error_t pygpgme_data_new_from_cbs(gpgme_data_t *r_data,
+                                        PyObject *pycbs,
+                                        PyObject **freelater);
diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py
index 6ef2dab..e89c181 100644
--- a/lang/python/pyme/core.py
+++ b/lang/python/pyme/core.py
@@ -384,7 +384,7 @@ class Data(GpgmeWrapper):
 
         If cbs is specified, it MUST be a tuple of the form:
 
-        ((read_cb, write_cb, seek_cb, release_cb), hook)
+        (read_cb, write_cb, seek_cb, release_cb[, hook])
 
         where func is a callback function taking two arguments (count,
         hook) and returning a string of read data, or None on EOF.
@@ -396,7 +396,7 @@ class Data(GpgmeWrapper):
 
         Any other use will result in undefined or erroneous behavior."""
         super().__init__(None)
-        self.last_readcb = None
+        self.data_cbs = None
 
         if cbs != None:
             self.new_from_cbs(*cbs)
@@ -419,15 +419,18 @@ class Data(GpgmeWrapper):
 
         if self.wrapped != None and pygpgme.gpgme_data_release:
             pygpgme.gpgme_data_release(self.wrapped)
-        self._free_readcb()
+            if self._callback_excinfo:
+                print(self._callback_excinfo)
+                pygpgme.pygpgme_raise_callback_exception(self)
+        self._free_datacbs()
 
-    def _free_readcb(self):
-        if self.last_readcb != None:
+    def _free_datacbs(self):
+        if self.data_cbs != None:
             if pygpgme.pygpgme_clear_generic_cb:
-                pygpgme.pygpgme_clear_generic_cb(self.last_readcb)
+                pygpgme.pygpgme_clear_generic_cb(self.data_cbs)
             if pygpgme.delete_PyObject_p_p:
-                pygpgme.delete_PyObject_p_p(self.last_readcb)
-            self.last_readcb = None
+                pygpgme.delete_PyObject_p_p(self.data_cbs)
+            self.data_cbs = None
 
     def new(self):
         tmp = pygpgme.new_gpgme_data_t_p()
@@ -453,14 +456,18 @@ class Data(GpgmeWrapper):
         self.wrapped = pygpgme.gpgme_data_t_p_value(tmp)
         pygpgme.delete_gpgme_data_t_p(tmp)
 
-    def new_from_cbs(self, funcs, hook):
-        """Argument funcs must be a 4 element tuple with callbacks:
-        (read_cb, write_cb, seek_cb, release_cb)"""
+    def new_from_cbs(self, read_cb, write_cb, seek_cb, release_cb, hook=None):
+        assert self.data_cbs == None
+        self.data_cbs = pygpgme.new_PyObject_p_p()
         tmp = pygpgme.new_gpgme_data_t_p()
-        self._free_readcb()
-        self.last_readcb = pygpgme.new_PyObject_p_p()
-        hookdata = (funcs, hook)
-        pygpgme.pygpgme_data_new_from_cbs(tmp, hookdata, self.last_readcb)
+        if hook != None:
+            hookdata = (weakref.ref(self),
+                        read_cb, write_cb, seek_cb, release_cb, hook)
+        else:
+            hookdata = (weakref.ref(self),
+                        read_cb, write_cb, seek_cb, release_cb)
+        errorcheck(
+            pygpgme.pygpgme_data_new_from_cbs(tmp, hookdata, self.data_cbs))
         self.wrapped = pygpgme.gpgme_data_t_p_value(tmp)
         pygpgme.delete_gpgme_data_t_p(tmp)
 
@@ -512,7 +519,10 @@ class Data(GpgmeWrapper):
         If a string is given, it is implicitly encoded using UTF-8."""
         written = pygpgme.gpgme_data_write(self.wrapped, buffer)
         if written < 0:
-            raise GPGMEError.fromSyserror()
+            if self._callback_excinfo:
+                pygpgme.pygpgme_raise_callback_exception(self)
+            else:
+                raise GPGMEError.fromSyserror()
         return written
 
     def read(self, size = -1):
@@ -527,11 +537,24 @@ class Data(GpgmeWrapper):
             return ''
 
         if size > 0:
-            return pygpgme.gpgme_data_read(self.wrapped, size)
+            try:
+                result = pygpgme.gpgme_data_read(self.wrapped, size)
+            except:
+                if self._callback_excinfo:
+                    pygpgme.pygpgme_raise_callback_exception(self)
+                else:
+                    raise
+            return result
         else:
             chunks = []
-            while 1:
-                result = pygpgme.gpgme_data_read(self.wrapped, 4096)
+            while True:
+                try:
+                    result = pygpgme.gpgme_data_read(self.wrapped, 4096)
+                except:
+                    if self._callback_excinfo:
+                        pygpgme.pygpgme_raise_callback_exception(self)
+                    else:
+                        raise
                 if len(result) == 0:
                     break
                 chunks.append(result)
diff --git a/lang/python/tests/t-callbacks.py b/lang/python/tests/t-callbacks.py
index 5797526..3219463 100755
--- a/lang/python/tests/t-callbacks.py
+++ b/lang/python/tests/t-callbacks.py
@@ -17,6 +17,7 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
+import os
 from pyme import core, constants
 import support
 
@@ -181,3 +182,73 @@ except Exception as e:
     assert e == myException
 else:
     assert False, "Expected an error, got none"
+
+
+
+# Test the data callbacks.
+def read_cb(amount, hook=None):
+    assert hook == cookie
+    return 0
+def release_cb(hook=None):
+    assert hook == cookie
+data = core.Data(cbs=(read_cb, None, None, release_cb, cookie))
+try:
+    data.read()
+except Exception as e:
+    assert type(e) == TypeError
+else:
+    assert False, "Expected an error, got none"
+
+def read_cb(amount):
+    raise myException
+data = core.Data(cbs=(read_cb, None, None, lambda: None))
+try:
+    data.read()
+except Exception as e:
+    assert e == myException
+else:
+    assert False, "Expected an error, got none"
+
+
+def write_cb(what, hook=None):
+    assert hook == cookie
+    return "wrong type"
+data = core.Data(cbs=(None, write_cb, None, release_cb, cookie))
+try:
+    data.write(b'stuff')
+except Exception as e:
+    assert type(e) == TypeError
+else:
+    assert False, "Expected an error, got none"
+
+def write_cb(what):
+    raise myException
+data = core.Data(cbs=(None, write_cb, None, lambda: None))
+try:
+    data.write(b'stuff')
+except Exception as e:
+    assert e == myException
+else:
+    assert False, "Expected an error, got none"
+
+
+def seek_cb(offset, whence, hook=None):
+    assert hook == cookie
+    return "wrong type"
+data = core.Data(cbs=(None, None, seek_cb, release_cb, cookie))
+try:
+    data.seek(0, os.SEEK_SET)
+except Exception as e:
+    assert type(e) == TypeError
+else:
+    assert False, "Expected an error, got none"
+
+def seek_cb(offset, whence):
+    raise myException
+data = core.Data(cbs=(None, None, seek_cb, lambda: None))
+try:
+    data.seek(0, os.SEEK_SET)
+except Exception as e:
+    assert e == myException
+else:
+    assert False, "Expected an error, got none"
diff --git a/lang/python/tests/t-data.py b/lang/python/tests/t-data.py
index 6cf10fa..de60c47 100755
--- a/lang/python/tests/t-data.py
+++ b/lang/python/tests/t-data.py
@@ -17,6 +17,7 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
+import io
 import os
 import tempfile
 from pyme import core
@@ -79,3 +80,43 @@ with tempfile.NamedTemporaryFile() as tmp:
     # Open using name, offset, and length.
     data = core.Data(file=tmp.name, offset=23, length=42)
     assert data.read() == binjunk[23:23+42]
+
+# Test callbacks.
+class DataObject(object):
+    def __init__(self):
+        self.buffer = io.BytesIO()
+        self.released = False
+
+    def read(self, amount, hook=None):
+        assert not self.released
+        return self.buffer.read(amount)
+
+    def write(self, data, hook=None):
+        assert not self.released
+        return self.buffer.write(data)
+
+    def seek(self, offset, whence, hook=None):
+        assert not self.released
+        return self.buffer.seek(offset, whence)
+
+    def release(self, hook=None):
+        assert not self.released
+        self.released = True
+
+do = DataObject()
+cookie = object()
+data = core.Data(cbs=(do.read, do.write, do.seek, do.release, cookie))
+data.write('Hello world!')
+data.seek(0, os.SEEK_SET)
+assert data.read() == b'Hello world!'
+del data
+assert do.released
+
+# Again, without the cookie.
+do = DataObject()
+data = core.Data(cbs=(do.read, do.write, do.seek, do.release))
+data.write('Hello world!')
+data.seek(0, os.SEEK_SET)
+assert data.read() == b'Hello world!'
+del data
+assert do.released

commit ebfe2300c33a3bad311e9ac1530e6c92636a08a4
Author: Justus Winter <justus at gnupg.org>
Date:   Fri May 27 12:25:59 2016 +0200

    python: Fix object deallocation.
    
    Handing a reference to the wrapper object created a non-trivial
    circular reference that Pythons garbage collector is unable to break.
    Explicitly break it by using a weak reference.
    
    * lang/python/helpers.c (pygpgme_stash_callback_exception): Retrieve
    object from weak reference.
    * lang/python/pyme/core.py (Context.__del__): Free status callback.
    (Context.set_passphrase_cb): Use a weak reference.
    (Context.set_progress_cb): Likewise.
    (Context.set_status_cb): Likewise.
    (Context.op_edit): Likewise.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/helpers.c b/lang/python/helpers.c
index ec7264a..9fe81c9 100644
--- a/lang/python/helpers.c
+++ b/lang/python/helpers.c
@@ -64,9 +64,9 @@ void pygpgme_clear_generic_cb(PyObject **cb) {
 /* Exception support for callbacks.  */
 #define EXCINFO	"_callback_excinfo"
 
-static void pygpgme_stash_callback_exception(PyObject *self)
+static void pygpgme_stash_callback_exception(PyObject *weak_self)
 {
-  PyObject *ptype, *pvalue, *ptraceback, *excinfo;
+  PyObject *self, *ptype, *pvalue, *ptraceback, *excinfo;
 
   PyErr_Fetch(&ptype, &pvalue, &ptraceback);
   excinfo = PyTuple_New(3);
@@ -86,7 +86,23 @@ static void pygpgme_stash_callback_exception(PyObject *self)
     PyTuple_SetItem(excinfo, 2, Py_None);
   }
 
-  PyObject_SetAttrString(self, EXCINFO, excinfo);
+  self = PyWeakref_GetObject(weak_self);
+  /* self only has a borrowed reference.  */
+  if (self == Py_None) {
+    /* This should not happen, as even if we're called from the data
+       release callback triggered from the wrappers destructor, the
+       object is still alive and hence the weak reference still refers
+       to the object.  However, in case this ever changes, not seeing
+       any exceptions is worse than having a little extra code, so
+       here we go.  */
+      fprintf(stderr,
+              "Error occurred in callback, but the wrapper object "
+              "has been deallocated.\n");
+      PyErr_Restore(ptype, pvalue, ptraceback);
+      PyErr_Print();
+    }
+  else
+    PyObject_SetAttrString(self, EXCINFO, excinfo);
 }
 
 PyObject *pygpgme_raise_callback_exception(PyObject *self)
diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py
index 0c2dd60..6ef2dab 100644
--- a/lang/python/pyme/core.py
+++ b/lang/python/pyme/core.py
@@ -16,9 +16,7 @@
 #    License along with this library; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 
-# import generators for portability with python2.2
-
-
+import weakref
 from . import pygpgme
 from .errors import errorcheck, GPGMEError
 from . import errors
@@ -149,6 +147,7 @@ class Context(GpgmeWrapper):
 
         self._free_passcb()
         self._free_progresscb()
+        self._free_statuscb()
         if self.own and pygpgme.gpgme_release:
             pygpgme.gpgme_release(self.wrapped)
 
@@ -252,9 +251,9 @@ class Context(GpgmeWrapper):
         else:
             self.last_passcb = pygpgme.new_PyObject_p_p()
             if hook == None:
-                hookdata = (self, func)
+                hookdata = (weakref.ref(self), func)
             else:
-                hookdata = (self, func, hook)
+                hookdata = (weakref.ref(self), func, hook)
         pygpgme.pygpgme_set_passphrase_cb(self.wrapped, hookdata, self.last_passcb)
 
     def set_progress_cb(self, func, hook=None):
@@ -275,9 +274,9 @@ class Context(GpgmeWrapper):
         else:
             self.last_progresscb = pygpgme.new_PyObject_p_p()
             if hook == None:
-                hookdata = (self, func)
+                hookdata = (weakref.ref(self), func)
             else:
-                hookdata = (self, func, hook)
+                hookdata = (weakref.ref(self), func, hook)
         pygpgme.pygpgme_set_progress_cb(self.wrapped, hookdata, self.last_progresscb)
 
     def set_status_cb(self, func, hook=None):
@@ -297,9 +296,9 @@ class Context(GpgmeWrapper):
         else:
             self.last_statuscb = pygpgme.new_PyObject_p_p()
             if hook == None:
-                hookdata = (self, func)
+                hookdata = (weakref.ref(self), func)
             else:
-                hookdata = (self, func, hook)
+                hookdata = (weakref.ref(self), func, hook)
         pygpgme.pygpgme_set_status_cb(self.wrapped, hookdata,
                                       self.last_statuscb)
 
@@ -333,9 +332,9 @@ class Context(GpgmeWrapper):
         if key == None:
             raise ValueError("op_edit: First argument cannot be None")
         if fnc_value:
-            opaquedata = (self, func, fnc_value)
+            opaquedata = (weakref.ref(self), func, fnc_value)
         else:
-            opaquedata = (self, func)
+            opaquedata = (weakref.ref(self), func)
 
         result = pygpgme.gpgme_op_edit(self.wrapped, key, opaquedata, out)
         if self._callback_excinfo:

commit e74cd9fb80f12b764d5e4561e73d55644147e9e7
Author: Justus Winter <justus at gnupg.org>
Date:   Fri May 27 12:19:52 2016 +0200

    Improve comments.
    
    * src/gpgme.h.in (gpgme_data_seek_cb_t, gpgme_data_seek): Clarify that
    these functions return the new offset.
    (gpgme_data_release_cb_t): Fix name of parameter.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/src/gpgme.h.in b/src/gpgme.h.in
index 335ed6b..87550fe 100644
--- a/src/gpgme.h.in
+++ b/src/gpgme.h.in
@@ -1196,11 +1196,12 @@ typedef @API__SSIZE_T@ (*gpgme_data_write_cb_t) (void *handle, const void *buffe
 
 /* Set the current position from where the next read or write starts
    in the data object with the handle HANDLE to OFFSET, relativ to
-   WHENCE.  */
+   WHENCE.  Returns the new offset in bytes from the beginning of the
+   data object.  */
 typedef @API__OFF_T@ (*gpgme_data_seek_cb_t) (void *handle,
                                        @API__OFF_T@ offset, int whence);
 
-/* Close the data object with the handle DL.  */
+/* Close the data object with the handle HANDLE.  */
 typedef void (*gpgme_data_release_cb_t) (void *handle);
 
 struct gpgme_data_cbs
@@ -1223,8 +1224,9 @@ typedef struct gpgme_data_cbs *gpgme_data_cbs_t;
 @API__SSIZE_T@ gpgme_data_write (gpgme_data_t dh, const void *buffer, size_t size);
 
 /* Set the current position from where the next read or write starts
-   in the data object with the handle DH to OFFSET, relativ to
-   WHENCE.  */
+   in the data object with the handle DH to OFFSET, relativ to WHENCE.
+   Returns the new offset in bytes from the beginning of the data
+   object.  */
 @API__OFF_T@ gpgme_data_seek (gpgme_data_t dh, @API__OFF_T@ offset, int whence);
 
 /* Create a new data buffer and return it in R_DH.  */

commit bf188e280b8b4fc775f33c47e2e1e275ed044004
Author: Justus Winter <justus at gnupg.org>
Date:   Wed May 25 12:47:28 2016 +0200

    python: Fix reading data from existing files.
    
    * lang/python/pyme/core.py (Data.__init__): Add 'copy' kwargument, and
    pass it to functions supporting it.  PEP8 fix.
    (Data.new_from_fd): PEP8 fix.
    (Data.new_from_file): Give a more helpful error message if copy is
    False.  PEP8 fix.
    (Data.new_from_fd): Hand the file descriptor to
    'gpgme_data_new_from_fd', not a stream.  Fix docstring.
    * lang/python/tests/t-data.py: Add tests for this.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py
index 5f8378d..0c2dd60 100644
--- a/lang/python/pyme/core.py
+++ b/lang/python/pyme/core.py
@@ -370,8 +370,8 @@ class Data(GpgmeWrapper):
             return 0
         return 1
 
-    def __init__(self, string = None, file = None, offset = None,
-                 length = None, cbs = None):
+    def __init__(self, string=None, file=None, offset=None,
+                 length=None, cbs=None, copy=True):
         """Initialize a new gpgme_data_t object.
 
         If no args are specified, make it an empty object.
@@ -402,12 +402,12 @@ class Data(GpgmeWrapper):
         if cbs != None:
             self.new_from_cbs(*cbs)
         elif string != None:
-            self.new_from_mem(string)
+            self.new_from_mem(string, copy)
         elif file != None and offset != None and length != None:
             self.new_from_filepart(file, offset, length)
         elif file != None:
             if type(file) == type("x"):
-                self.new_from_file(file)
+                self.new_from_file(file, copy)
             else:
                 self.new_from_fd(file)
         else:
@@ -436,15 +436,21 @@ class Data(GpgmeWrapper):
         self.wrapped = pygpgme.gpgme_data_t_p_value(tmp)
         pygpgme.delete_gpgme_data_t_p(tmp)
 
-    def new_from_mem(self, string, copy = 1):
+    def new_from_mem(self, string, copy=True):
         tmp = pygpgme.new_gpgme_data_t_p()
         errorcheck(pygpgme.gpgme_data_new_from_mem(tmp,string,len(string),copy))
         self.wrapped = pygpgme.gpgme_data_t_p_value(tmp)
         pygpgme.delete_gpgme_data_t_p(tmp)
 
-    def new_from_file(self, filename, copy = 1):
+    def new_from_file(self, filename, copy=True):
         tmp = pygpgme.new_gpgme_data_t_p()
-        errorcheck(pygpgme.gpgme_data_new_from_file(tmp, filename, copy))
+        try:
+            errorcheck(pygpgme.gpgme_data_new_from_file(tmp, filename, copy))
+        except errors.GPGMEError as e:
+            if e.getcode() == errors.INV_VALUE and not copy:
+                raise ValueError("delayed reads are not yet supported")
+            else:
+                raise e
         self.wrapped = pygpgme.gpgme_data_t_p_value(tmp)
         pygpgme.delete_gpgme_data_t_p(tmp)
 
@@ -485,16 +491,13 @@ class Data(GpgmeWrapper):
         pygpgme.delete_gpgme_data_t_p(tmp)
 
     def new_from_fd(self, file):
-        """This wraps the GPGME gpgme_data_new_from_fd() function.
-        The argument "file" may be a file-like object, supporting the fileno()
-        call and the mode attribute."""
+        """This wraps the GPGME gpgme_data_new_from_fd() function.  The
+        argument "file" must be a file-like object, supporting the
+        fileno() method.
 
+        """
         tmp = pygpgme.new_gpgme_data_t_p()
-        fp = pygpgme.fdopen(file.fileno(), file.mode)
-        if fp == None:
-            raise ValueError("Failed to open file from %s arg %s" % \
-                  (str(type(file)), str(file)))
-        errorcheck(pygpgme.gpgme_data_new_from_fd(tmp, fp))
+        errorcheck(pygpgme.gpgme_data_new_from_fd(tmp, file.fileno()))
         self.wrapped = pygpgme.gpgme_data_t_p_value(tmp)
         pygpgme.delete_gpgme_data_t_p(tmp)
 
diff --git a/lang/python/tests/t-data.py b/lang/python/tests/t-data.py
index af2eb98..6cf10fa 100755
--- a/lang/python/tests/t-data.py
+++ b/lang/python/tests/t-data.py
@@ -18,7 +18,7 @@
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 import os
-
+import tempfile
 from pyme import core
 
 data = core.Data('Hello world!')
@@ -32,6 +32,9 @@ assert data.read() == b''
 data = core.Data(b'Hello world!')
 assert data.read() == b'Hello world!'
 
+data = core.Data(b'Hello world!', copy=False)
+assert data.read() == b'Hello world!'
+
 data = core.Data()
 data.write('Hello world!')
 data.seek(0, os.SEEK_SET)
@@ -47,3 +50,32 @@ data = core.Data()
 data.write(binjunk)
 data.seek(0, os.SEEK_SET)
 assert data.read() == binjunk
+
+# Test reading from an existing file.
+with tempfile.NamedTemporaryFile() as tmp:
+    tmp.write(binjunk)
+    tmp.flush()
+    tmp.seek(0)
+
+    # Open using name.
+    data = core.Data(file=tmp.name)
+    assert data.read() == binjunk
+
+    # Open using name, without copying.
+    if False:
+        # delayed reads are not yet supported
+        data = core.Data(file=tmp.name, copy=False)
+        assert data.read() == binjunk
+
+    # Open using stream.
+    tmp.seek(0)
+    data = core.Data(file=tmp)
+    assert data.read() == binjunk
+
+    # Open using stream, offset, and length.
+    data = core.Data(file=tmp, offset=0, length=42)
+    assert data.read() == binjunk[:42]
+
+    # Open using name, offset, and length.
+    data = core.Data(file=tmp.name, offset=23, length=42)
+    assert data.read() == binjunk[23:23+42]

commit ce73ae9d0cbf782cd3a1949fc4f568f0d1da60d9
Author: Justus Winter <justus at gnupg.org>
Date:   Wed May 25 12:45:25 2016 +0200

    src: Fix trace string.
    
    * src/data-compat.c (gpgme_data_new_from_file): Fix trace string.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/src/data-compat.c b/src/data-compat.c
index abb7863..ec80172 100644
--- a/src/data-compat.c
+++ b/src/data-compat.c
@@ -128,7 +128,7 @@ gpgme_data_new_from_file (gpgme_data_t *r_dh, const char *fname, int copy)
 #else
   gpgme_error_t err;
   struct stat statbuf;
-  TRACE_BEG3 (DEBUG_DATA, "gpgme_data_new_from_filepart", r_dh,
+  TRACE_BEG3 (DEBUG_DATA, "gpgme_data_new_from_file", r_dh,
 	      "file_name=%s, copy=%i (%s)", fname, copy, copy ? "yes" : "no");
 
   if (!fname || !copy)

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

Summary of changes:
 lang/python/gpgme.i                                |   7 +-
 lang/python/helpers.c                              | 264 ++++++++++++++++++++-
 lang/python/helpers.h                              |   4 +
 lang/python/pyme/core.py                           | 128 ++++++----
 lang/python/tests/Makefile.am                      |   5 +-
 lang/python/tests/support.py                       |   3 +-
 lang/python/tests/t-callbacks.py                   |  71 ++++++
 lang/python/tests/t-data.py                        |  79 +++++-
 .../tests/{t-encrypt.py => t-encrypt-large.py}     |  32 ++-
 lang/python/tests/{t-encrypt.py => t-file-name.py} |  19 +-
 lang/python/tests/{t-decrypt.py => t-trustlist.py} |  16 +-
 src/data-compat.c                                  |   2 +-
 src/gpgme.h.in                                     |  12 +-
 tests/gpg/t-file-name.c                            |   2 +-
 14 files changed, 558 insertions(+), 86 deletions(-)
 copy lang/python/tests/{t-encrypt.py => t-encrypt-large.py} (63%)
 copy lang/python/tests/{t-encrypt.py => t-file-name.py} (74%)
 copy lang/python/tests/{t-decrypt.py => t-trustlist.py} (75%)


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



From cvs at cvs.gnupg.org  Fri May 27 22:04:39 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 27 May 2016 22:04:39 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.12-34-g512c56a
Message-ID: <E1b6Ny5-00041y-I5@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  512c56af43027149e8beacf259746b8d7bf9b1a2 (commit)
      from  ad75ca9c963bebbe02aae8d73e199a705764ae82 (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 512c56af43027149e8beacf259746b8d7bf9b1a2
Author: Werner Koch <wk at gnupg.org>
Date:   Fri May 27 22:02:54 2016 +0200

    common: Speedup closing fds before an exec.
    
    * common/exechelp-posix.c [__linux__]: Include dirent.h.
    (get_max_fds) [__linux__]: Return the actual used highest fd.
    --
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/exechelp-posix.c b/common/exechelp-posix.c
index 87c6e55..81831ee 100644
--- a/common/exechelp-posix.c
+++ b/common/exechelp-posix.c
@@ -67,6 +67,11 @@
 # include <sys/stat.h>
 #endif
 
+#if __linux__
+# include <sys/types.h>
+# include <dirent.h>
+#endif /*__linux__ */
+
 #include "util.h"
 #include "i18n.h"
 #include "sysutils.h"
@@ -97,6 +102,45 @@ get_max_fds (void)
 #ifdef HAVE_GETRLIMIT
   struct rlimit rl;
 
+  /* Under Linux we can figure out the highest used file descriptor by
+   * reading /proc/PID/fd.  This is in the common cases much fast than
+   * for example doing 4096 close calls where almost all of them will
+   * fail.  On a system with a limit of 4096 files and only 8 files
+   * open with the highest number being 10, we speedup close_all_fds
+   * from 125ms to 0.4ms including readdir.
+   *
+   * Another option would be to close the file descriptors as returned
+   * from reading that directory - however then we need to snapshot
+   * that list before starting to close them.  */
+#ifdef __linux__
+  {
+    char dirname[50];
+    DIR *dir = NULL;
+    struct dirent *dir_entry;
+    const char *s;
+    int x;
+
+    snprintf (dirname, sizeof dirname, "/proc/%u/fd", (unsigned int)getpid ());
+    dir = opendir (dirname);
+    if (dir)
+      {
+        while ((dir_entry = readdir (dir)))
+          {
+            s = dir_entry->d_name;
+            if ( *s < '0' || *s > '9')
+              continue;
+            x = atoi (s);
+            if (x > max_fds)
+              max_fds = x;
+          }
+        closedir (dir);
+      }
+    if (max_fds != -1)
+      return max_fds + 1;
+    }
+#endif /* __linux__ */
+
+
 # ifdef RLIMIT_NOFILE
   if (!getrlimit (RLIMIT_NOFILE, &rl))
     max_fds = rl.rlim_max;

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

Summary of changes:
 common/exechelp-posix.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)


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



From cvs at cvs.gnupg.org  Fri May 27 22:21:00 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 27 May 2016 22:21:00 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-145-g89d22f9
Message-ID: <E1b6ODt-0005ZD-CU@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  89d22f9229f2ecd559ac6ea91dae60eeff940fa5 (commit)
      from  3915842657f0849a038752fd7445f96081a89dd9 (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 89d22f9229f2ecd559ac6ea91dae60eeff940fa5
Author: Werner Koch <wk at gnupg.org>
Date:   Fri May 27 22:19:35 2016 +0200

    Speedup closing of fds before exec.
    
    * src/posix-io.c [__linux__]: Include dirent.h.
    (get_max_fds) [__linux__]: Try to figure out the highest used fd.
    --
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/posix-io.c b/src/posix-io.c
index e49c71e..f336153 100644
--- a/src/posix-io.c
+++ b/src/posix-io.c
@@ -47,6 +47,12 @@
 #include <ctype.h>
 #include <sys/resource.h>
 
+#if __linux__
+# include <sys/types.h>
+# include <dirent.h>
+#endif /*__linux__ */
+
+
 #include "util.h"
 #include "priv-io.h"
 #include "sema.h"
@@ -280,16 +286,50 @@ get_max_fds (void)
   long int fds = -1;
   int rc;
 
-#ifdef RLIMIT_NOFILE
+  /* Under Linux we can figure out the highest used file descriptor by
+   * reading /proc/self/fd.  This is in the common cases much fast than
+   * for example doing 4096 close calls where almost all of them will
+   * fail.  */
+#ifdef __linux__
   {
-    struct rlimit rl;
-    rc = getrlimit (RLIMIT_NOFILE, &rl);
-    if (rc == 0)
+    DIR *dir = NULL;
+    struct dirent *dir_entry;
+    const char *s;
+    int x;
+
+    dir = opendir ("/proc/self/fd");
+    if (dir)
       {
-	source = "RLIMIT_NOFILE";
-	fds = rl.rlim_max;
+        while ((dir_entry = readdir (dir)))
+          {
+            s = dir_entry->d_name;
+            if ( *s < '0' || *s > '9')
+              continue;
+            x = atoi (s);
+            if (x > fds)
+              fds = x;
+          }
+        closedir (dir);
       }
-  }
+    if (fds != -1)
+      {
+        fds++;
+        source = "/proc";
+      }
+    }
+#endif /* __linux__ */
+
+#ifdef RLIMIT_NOFILE
+  if (fds == -1)
+    {
+      struct rlimit rl;
+      rc = getrlimit (RLIMIT_NOFILE, &rl);
+      if (rc == 0)
+        {
+          source = "RLIMIT_NOFILE";
+          fds = rl.rlim_max;
+        }
+    }
 #endif
 #ifdef RLIMIT_OFILE
   if (fds == -1)

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

Summary of changes:
 src/posix-io.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 47 insertions(+), 7 deletions(-)


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



From cvs at cvs.gnupg.org  Fri May 27 22:24:03 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 27 May 2016 22:24:03 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.12-35-ge6d9a2d
Message-ID: <E1b6OGr-0005ah-5e@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  e6d9a2d07ed7aeac3944d8a7d1317c4a117356b4 (commit)
      from  512c56af43027149e8beacf259746b8d7bf9b1a2 (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 e6d9a2d07ed7aeac3944d8a7d1317c4a117356b4
Author: Werner Koch <wk at gnupg.org>
Date:   Fri May 27 22:22:37 2016 +0200

    common: Simplify the fd closing patch 512c56a.
    
    * common/exechelp-posix.c (get_max_fds): Use /proc/self.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/exechelp-posix.c b/common/exechelp-posix.c
index 81831ee..a7a9a92 100644
--- a/common/exechelp-posix.c
+++ b/common/exechelp-posix.c
@@ -114,14 +114,12 @@ get_max_fds (void)
    * that list before starting to close them.  */
 #ifdef __linux__
   {
-    char dirname[50];
     DIR *dir = NULL;
     struct dirent *dir_entry;
     const char *s;
     int x;
 
-    snprintf (dirname, sizeof dirname, "/proc/%u/fd", (unsigned int)getpid ());
-    dir = opendir (dirname);
+    dir = opendir ("/proc/self/fd");
     if (dir)
       {
         while ((dir_entry = readdir (dir)))

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

Summary of changes:
 common/exechelp-posix.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)


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



From cvs at cvs.gnupg.org  Sat May 28 00:10:16 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Sat, 28 May 2016 00:10:16 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.12-37-g239a4d5
Message-ID: <E1b6Pve-00034K-O2@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  239a4d53916b47b5b0f0167a9b2c7a8915bb9c52 (commit)
       via  44a32455c8e41400ea96db4507c8a42bdb65b3b6 (commit)
      from  e6d9a2d07ed7aeac3944d8a7d1317c4a117356b4 (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 239a4d53916b47b5b0f0167a9b2c7a8915bb9c52
Author: Werner Koch <wk at gnupg.org>
Date:   Sat May 28 00:07:09 2016 +0200

    common: Add a status callback to gnupg_exec_tool_stream.
    
    * common/exectool.h (exec_tool_status_cb_t): New.
    * common/exectool.c: Include missing exectool.h.
    (read_and_log_buffer_t): Replace array by pointer.
    (gnupg_exec_tool_stream): Add args 'status_cb' and 'status_cb_value'.
    Change all callers to pass NULL for them.  Malloc buffer for
    FDERRSTATE.
    (read_and_log_stderr): Implement status_fd feature.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/exectool.c b/common/exectool.c
index 953c34a..897450e 100644
--- a/common/exectool.c
+++ b/common/exectool.c
@@ -44,13 +44,17 @@
 #include "exechelp.h"
 #include "sysutils.h"
 #include "util.h"
+#include "exectool.h"
 
 typedef struct
 {
   const char *pgmname;
+  exec_tool_status_cb_t status_cb;
+  void *status_cb_value;
   int cont;
-  int used;
-  char buffer[256];
+  size_t used;
+  size_t buffer_size;
+  char *buffer;
 } read_and_log_buffer_t;
 
 
@@ -83,14 +87,37 @@ read_and_log_stderr (read_and_log_buffer_t *state, es_poll_t *fderr)
             pname++;
           else
             pname = state->pgmname;
-          /* If our pgmname plus colon is identical to the start of
-             the output, print only the output.  */
           len = strlen (pname);
-          if (!state->cont
+
+          if (state->status_cb
+              && !strncmp (state->buffer, "[GNUPG:] ", 9)
+              && state->buffer[9] >= 'A' && state->buffer[9] <= 'Z')
+            {
+              char *rest;
+
+              rest = strchr (state->buffer + 9, ' ');
+              if (!rest)
+                {
+                  /* Set REST to an empty string.  */
+                  rest = state->buffer + strlen (state->buffer);
+                }
+              else
+                {
+                  *rest++ = 0;
+                  trim_spaces (rest);
+                }
+              state->status_cb (state->status_cb_value,
+                                state->buffer + 9, rest);
+            }
+          else if (!state->cont
               && !strncmp (state->buffer, pname, len)
               && strlen (state->buffer) > strlen (pname)
               && state->buffer[len] == ':' )
-            log_info ("%s\n", state->buffer);
+            {
+              /* PGMNAME plus colon is identical to the start of
+                 the output: print only the output.  */
+              log_info ("%s\n", state->buffer);
+            }
           else
             log_info ("%s%c %s\n",
                       pname, state->cont? '+':':', state->buffer);
@@ -123,10 +150,39 @@ read_and_log_stderr (read_and_log_buffer_t *state, es_poll_t *fderr)
         }
       else
         {
-          if (state->used >= sizeof state->buffer - 1)
+          if (state->used >= state->buffer_size - 1)
             {
-              read_and_log_stderr (state, NULL);
-              state->cont = 1;
+              if (state->status_cb)
+                {
+                  /* A status callback requires that we have a full
+                   * line.  Thus we need to enlarget the buffer in
+                   * this case.  */
+                  char *newbuffer;
+                  size_t newsize = state->buffer_size + 256;
+
+                  newbuffer = xtrymalloc (newsize);
+                  if (!newbuffer)
+                    {
+                      log_error ("error allocating memory for status cb: %s\n",
+                                 gpg_strerror (my_error_from_syserror ()));
+                      /* We better disable the status CB in this case.  */
+                      state->status_cb = NULL;
+                      read_and_log_stderr (state, NULL);
+                      state->cont = 1;
+                    }
+                  else
+                    {
+                      memcpy (newbuffer, state->buffer, state->used);
+                      xfree (state->buffer);
+                      state->buffer = newbuffer;
+                      state->buffer_size = newsize;
+                    }
+                }
+              else
+                {
+                  read_and_log_stderr (state, NULL);
+                  state->cont = 1;
+                }
             }
           state->buffer[state->used++] = c;
         }
@@ -242,7 +298,9 @@ copy_buffer_flush (struct copy_buffer *c, estream_t sink)
 gpg_error_t
 gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
                         estream_t input, estream_t inextra,
-                        estream_t output)
+                        estream_t output,
+                        exec_tool_status_cb_t status_cb,
+                        void *status_cb_value)
 {
   gpg_error_t err;
   pid_t pid;
@@ -265,6 +323,14 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
   copy_buffer_init (&cpbuf_out);
   copy_buffer_init (&cpbuf_extra);
 
+  fderrstate.pgmname = pgmname;
+  fderrstate.status_cb = status_cb;
+  fderrstate.status_cb_value = status_cb_value;
+  fderrstate.buffer_size = 256;
+  fderrstate.buffer = xtrymalloc (fderrstate.buffer_size);
+  if (!fderrstate.buffer)
+    return my_error_from_syserror ();
+
   if (inextra)
     {
       err = gnupg_create_outbound_pipe (extrapipe, &extrafp, 1);
@@ -272,6 +338,7 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
         {
           log_error ("error running outbound pipe for extra fp: %s\n",
                      gpg_strerror (err));
+          xfree (fderrstate.buffer);
           return err;
         }
       exceptclose[0] = extrapipe[0]; /* Do not close in child. */
@@ -303,11 +370,10 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
     {
       log_error ("error running '%s': %s\n", pgmname, gpg_strerror (err));
       es_fclose (extrafp);
+      xfree (fderrstate.buffer);
       return err;
     }
 
-  fderrstate.pgmname = pgmname;
-
   fds[0].stream = infp;
   fds[0].want_write = 1;
   if (!input)
@@ -438,6 +504,7 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
   copy_buffer_shred (&cpbuf_out);
   if (inextra)
     copy_buffer_shred (&cpbuf_extra);
+  xfree (fderrstate.buffer);
   return err;
 }
 
@@ -488,7 +555,7 @@ gnupg_exec_tool (const char *pgmname, const char *argv[],
       goto leave;
     }
 
-  err = gnupg_exec_tool_stream (pgmname, argv, input, NULL, output);
+  err = gnupg_exec_tool_stream (pgmname, argv, input, NULL, output, NULL, NULL);
   if (err)
     goto leave;
 
diff --git a/common/exectool.h b/common/exectool.h
index 21bc177..94091fd 100644
--- a/common/exectool.h
+++ b/common/exectool.h
@@ -32,6 +32,17 @@
 
 #include <gpg-error.h>
 
+/* This callback can be used to process --status-fd outputs of GnuPG
+ * tools.  OPAQUE can be used to communicate between the caller of the
+ * function and the callback.  KEYWORD is the status keyword (see
+ * doc/DETAILS); it is never NULL.  ARGS are the arguments of the
+ * status line and will also never be NULL; the caller may modify this
+ * string.  */
+typedef void (*exec_tool_status_cb_t) (void *opaque,
+                                       const char *keyword,
+                                       char *args);
+
+
 /* Run the program PGMNAME with the command line arguments given in
    the NULL terminates array ARGV.  If INPUT_STRING is not NULL it
    will be fed to stdin of the process.  stderr is logged using
@@ -51,6 +62,8 @@ gpg_error_t gnupg_exec_tool (const char *pgmname, const char *argv[],
    printed, and an error code returned.  INEXTRA is reserved. */
 gpg_error_t gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
                                     estream_t input, estream_t inextra,
-                                    estream_t output);
+                                    estream_t output,
+                                    exec_tool_status_cb_t status_cb,
+                                    void *status_cb_value);
 
 #endif /* GNUPG_COMMON_EXECTOOL_H */
diff --git a/tools/gpgtar-create.c b/tools/gpgtar-create.c
index d615fd3..6adc1f5 100644
--- a/tools/gpgtar-create.c
+++ b/tools/gpgtar-create.c
@@ -932,7 +932,7 @@ gpgtar_create (char **inpattern, int encrypt, int sign)
         }
 
       err = gnupg_exec_tool_stream (opt.gpg_program, argv,
-                                    outstream, NULL, cipher_stream);
+                                    outstream, NULL, cipher_stream, NULL, NULL);
       xfree (argv);
       if (err)
         goto leave;
diff --git a/tools/gpgtar-extract.c b/tools/gpgtar-extract.c
index c4bf440..866215b 100644
--- a/tools/gpgtar-extract.c
+++ b/tools/gpgtar-extract.c
@@ -327,7 +327,7 @@ gpgtar_extract (const char *filename, int decrypt)
         }
 
       err = gnupg_exec_tool_stream (opt.gpg_program, argv,
-                                    cipher_stream, NULL, stream);
+                                    cipher_stream, NULL, stream, NULL, NULL);
       xfree (argv);
       if (err)
         goto leave;
diff --git a/tools/gpgtar-list.c b/tools/gpgtar-list.c
index a3f85ac..1d59d9c 100644
--- a/tools/gpgtar-list.c
+++ b/tools/gpgtar-list.c
@@ -327,7 +327,7 @@ gpgtar_list (const char *filename, int decrypt)
         }
 
       err = gnupg_exec_tool_stream (opt.gpg_program, argv,
-                                    cipher_stream, NULL, stream);
+                                    cipher_stream, NULL, stream, NULL, NULL);
       xfree (argv);
       if (err)
         goto leave;

commit 44a32455c8e41400ea96db4507c8a42bdb65b3b6
Author: Werner Koch <wk at gnupg.org>
Date:   Fri May 27 22:48:04 2016 +0200

    common: Allow a second input stream for gnupg_exec_tool_stream.
    
    * common/exechelp-posix.c (do_exec): Add arg 'except' and pass to
    close_all_fds.
    (gnupg_spawn_process): Add arg 'except'.  Change callers to pass NULL
    for it.
    * common/exechelp-w32.c (gnupg_spawn_process): Add dummy arg 'except'.
    * common/exechelp-w32ce.c (gnupg_spawn_process): Ditto.
    * common/exectool.c (copy_buffer_do_copy): Allow NULL for SINK.
    (gnupg_exec_tool_stream): Add arg 'inextra'. Change callers to pass
    NULL for it.  Allow NULL for OUTPUT.
    --
    
    This hack is a first step to allow calling gpg for verification of
    signatures.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/exechelp-posix.c b/common/exechelp-posix.c
index a7a9a92..aefb653 100644
--- a/common/exechelp-posix.c
+++ b/common/exechelp-posix.c
@@ -278,7 +278,7 @@ get_all_open_fds (void)
 static void
 do_exec (const char *pgmname, const char *argv[],
          int fd_in, int fd_out, int fd_err,
-         void (*preexec)(void) )
+         int *except, void (*preexec)(void) )
 {
   char **arg_list;
   int i, j;
@@ -324,7 +324,7 @@ do_exec (const char *pgmname, const char *argv[],
     }
 
   /* Close all other files. */
-  close_all_fds (3, NULL);
+  close_all_fds (3, except);
 
   if (preexec)
     preexec ();
@@ -420,7 +420,7 @@ gnupg_create_pipe (int filedes[2])
 /* Fork and exec the PGMNAME, see exechelp.h for details.  */
 gpg_error_t
 gnupg_spawn_process (const char *pgmname, const char *argv[],
-                     void (*preexec)(void), unsigned int flags,
+                     int *except, void (*preexec)(void), unsigned int flags,
                      estream_t *r_infp,
                      estream_t *r_outfp,
                      estream_t *r_errfp,
@@ -525,7 +525,8 @@ gnupg_spawn_process (const char *pgmname, const char *argv[],
       gcry_control (GCRYCTL_TERM_SECMEM);
       es_fclose (outfp);
       es_fclose (errfp);
-      do_exec (pgmname, argv, inpipe[0], outpipe[1], errpipe[1], preexec);
+      do_exec (pgmname, argv, inpipe[0], outpipe[1], errpipe[1],
+               except, preexec);
       /*NOTREACHED*/
     }
 
@@ -575,7 +576,7 @@ gnupg_spawn_process_fd (const char *pgmname, const char *argv[],
     {
       gcry_control (GCRYCTL_TERM_SECMEM);
       /* Run child. */
-      do_exec (pgmname, argv, infd, outfd, errfd, NULL);
+      do_exec (pgmname, argv, infd, outfd, errfd, NULL, NULL);
       /*NOTREACHED*/
     }
 
@@ -728,7 +729,7 @@ gnupg_spawn_process_detached (const char *pgmname, const char *argv[],
         for (i=0; envp[i]; i++)
           putenv (xstrdup (envp[i]));
 
-      do_exec (pgmname, argv, -1, -1, -1, NULL);
+      do_exec (pgmname, argv, -1, -1, -1, NULL, NULL);
 
       /*NOTREACHED*/
     }
diff --git a/common/exechelp-w32.c b/common/exechelp-w32.c
index a8a8b45..b2d2457 100644
--- a/common/exechelp-w32.c
+++ b/common/exechelp-w32.c
@@ -357,7 +357,7 @@ gnupg_create_pipe (int filedes[2])
 /* Fork and exec the PGMNAME, see exechelp.h for details.  */
 gpg_error_t
 gnupg_spawn_process (const char *pgmname, const char *argv[],
-                     void (*preexec)(void), unsigned int flags,
+                     int *except, void (*preexec)(void), unsigned int flags,
                      estream_t *r_infp,
                      estream_t *r_outfp,
                      estream_t *r_errfp,
@@ -388,6 +388,8 @@ gnupg_spawn_process (const char *pgmname, const char *argv[],
   es_syshd_t syshd;
   gpg_err_source_t errsource = default_errsource;
 
+  (void)except; /* Not yet used.  */
+
   if (r_infp)
     *r_infp = NULL;
   if (r_outfp)
diff --git a/common/exechelp-w32ce.c b/common/exechelp-w32ce.c
index 06aa6bc..9e72cef 100644
--- a/common/exechelp-w32ce.c
+++ b/common/exechelp-w32ce.c
@@ -515,7 +515,7 @@ create_process (const char *pgmname, const char *cmdline,
 /* Fork and exec the PGMNAME, see exechelp.h for details.  */
 gpg_error_t
 gnupg_spawn_process (const char *pgmname, const char *argv[],
-                     void (*preexec)(void), unsigned int flags,
+                     int *except, void (*preexec)(void), unsigned int flags,
                      estream_t *r_infp,
                      estream_t *r_outfp,
                      estream_t *r_errfp,
@@ -541,6 +541,7 @@ gnupg_spawn_process (const char *pgmname, const char *argv[],
   estream_t errfp = NULL;
   gpg_err_source_t errsource = default_errsource;
 
+  (void)except; /* Not yet used.  */
   (void)preexec;
   (void)flags;
 
diff --git a/common/exechelp.h b/common/exechelp.h
index d6ef5f0..c43cd25 100644
--- a/common/exechelp.h
+++ b/common/exechelp.h
@@ -90,6 +90,10 @@ gpg_error_t gnupg_create_pipe (int filedes[2]);
    If PREEXEC is not NULL, the given function will be called right
    before the exec.
 
+   IF EXCEPT is not NULL, it is expected to be an ordered list of file
+   descriptors, terminated by an entry with the value (-1).  These
+   file descriptors won't be closed before spawning a new program.
+
    Returns 0 on success or an error code.  Calling gnupg_wait_process
    and gnupg_release_process is required if the function succeeded.
 
@@ -116,7 +120,7 @@ gpg_error_t gnupg_create_pipe (int filedes[2]);
  */
 gpg_error_t
 gnupg_spawn_process (const char *pgmname, const char *argv[],
-                     void (*preexec)(void), unsigned int flags,
+                     int *execpt, void (*preexec)(void), unsigned int flags,
                      estream_t *r_infp,
                      estream_t *r_outfp,
                      estream_t *r_errfp,
diff --git a/common/exectool.c b/common/exectool.c
index 9ba336d..953c34a 100644
--- a/common/exectool.c
+++ b/common/exectool.c
@@ -188,7 +188,8 @@ copy_buffer_do_copy (struct copy_buffer *c, estream_t source, estream_t sink)
   if (c->nread == 0)
     return 0;	/* Done copying.  */
 
-  err = es_write (sink, c->writep, c->nread, &nwritten);
+
+  err = sink? es_write (sink, c->writep, c->nread, &nwritten) : 0;
   if (err)
     {
       if (errno == EAGAIN)
@@ -202,7 +203,7 @@ copy_buffer_do_copy (struct copy_buffer *c, estream_t source, estream_t sink)
   c->nread -= nwritten;
   assert (c->writep - c->buffer <= sizeof c->buffer);
 
-  if (es_fflush (sink) && errno != EAGAIN)
+  if (sink && es_fflush (sink) && errno != EAGAIN)
     err = my_error_from_syserror ();
 
   return err;
@@ -228,36 +229,80 @@ copy_buffer_flush (struct copy_buffer *c, estream_t sink)
 

 
 /* Run the program PGMNAME with the command line arguments given in
-   the NULL terminates array ARGV.  If INPUT is not NULL it will be
-   fed to stdin of the process.  stderr is logged using log_info and
-   the process' stdout is written to OUTPUT.  On error a diagnostic is
-   printed, and an error code returned.  */
+ * the NULL terminates array ARGV.  If INPUT is not NULL it will be
+ * fed to stdin of the process.  stderr is logged using log_info and
+ * the process' stdout is written to OUTPUT.  If OUTPUT is NULL the
+ * output is discarded.  If INEXTRA is given, an additional input
+ * stream will be passed to the child; to tell the child about this
+ * ARGV is scanned and the first occurrence of an argument
+ * "-&@INEXTRA@" is replaced by the concatenation of "-&" and the
+ * child's file descriptor of the pipe created for the INEXTRA stream.
+ *
+ * On error a diagnostic is printed and an error code returned.  */
 gpg_error_t
 gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
-                        estream_t input,
+                        estream_t input, estream_t inextra,
                         estream_t output)
 {
   gpg_error_t err;
   pid_t pid;
   estream_t infp = NULL;
+  estream_t extrafp = NULL;
   estream_t outfp, errfp;
-  es_poll_t fds[3];
+  es_poll_t fds[4];
+  int exceptclose[2];
+  int extrapipe[2] = {-1, -1};
+  char extrafdbuf[20];
+  const char *argsave = NULL;
+  int argsaveidx;
   int count;
   read_and_log_buffer_t fderrstate;
-  struct copy_buffer cpbuf[2];
+  struct copy_buffer cpbuf_in, cpbuf_out, cpbuf_extra; /* Fixme: malloc them. */
 
   memset (fds, 0, sizeof fds);
   memset (&fderrstate, 0, sizeof fderrstate);
-  copy_buffer_init (&cpbuf[0]);
-  copy_buffer_init (&cpbuf[1]);
+  copy_buffer_init (&cpbuf_in);
+  copy_buffer_init (&cpbuf_out);
+  copy_buffer_init (&cpbuf_extra);
+
+  if (inextra)
+    {
+      err = gnupg_create_outbound_pipe (extrapipe, &extrafp, 1);
+      if (err)
+        {
+          log_error ("error running outbound pipe for extra fp: %s\n",
+                     gpg_strerror (err));
+          return err;
+        }
+      exceptclose[0] = extrapipe[0]; /* Do not close in child. */
+      exceptclose[1] = -1;
+      /* Now find the argument marker and replace by the pipe's fd.
+         Yeah, that is an ugly non-thread safe hack but it safes us to
+         create a copy of the array.  */
+      snprintf (extrafdbuf, sizeof extrafdbuf, "-&%d", extrapipe[0]);
+      for (argsaveidx=0; argv[argsaveidx]; argsaveidx++)
+        if (!strcmp (argv[argsaveidx], "-&@INEXTRA@"))
+          {
+            argsave = argv[argsaveidx];
+            argv[argsaveidx] = extrafdbuf;
+            break;
+          }
+    }
+  else
+    exceptclose[0] = -1;
 
   err = gnupg_spawn_process (pgmname, argv,
-                             NULL, GNUPG_SPAWN_NONBLOCK,
+                             exceptclose, NULL, GNUPG_SPAWN_NONBLOCK,
                              input? &infp : NULL,
                              &outfp, &errfp, &pid);
+  if (extrapipe[0] != -1)
+    close (extrapipe[0]);
+  if (argsave)
+    argv[argsaveidx] = argsave;
   if (err)
     {
       log_error ("error running '%s': %s\n", pgmname, gpg_strerror (err));
+      es_fclose (extrafp);
       return err;
     }
 
@@ -271,6 +316,11 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
   fds[1].want_read = 1;
   fds[2].stream = errfp;
   fds[2].want_read = 1;
+  fds[3].stream = extrafp;
+  fds[3].want_write = 1;
+  if (!inextra)
+    fds[3].ignore = 1;
+
   /* Now read as long as we have something to poll.  We continue
      reading even after EOF or error on stdout so that we get the
      other error messages or remaining outut.  */
@@ -291,7 +341,7 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
 
       if (fds[0].got_write)
         {
-          err = copy_buffer_do_copy (&cpbuf[0], input, fds[0].stream);
+          err = copy_buffer_do_copy (&cpbuf_in, input, fds[0].stream);
           if (err)
             {
               log_error ("error feeding data to '%s': %s\n",
@@ -301,7 +351,7 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
 
           if (es_feof (input))
             {
-              err = copy_buffer_flush (&cpbuf[0], fds[0].stream);
+              err = copy_buffer_flush (&cpbuf_in, fds[0].stream);
               if (err)
                 {
                   log_error ("error feeding data to '%s': %s\n",
@@ -314,9 +364,35 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
             }
         }
 
+      if (fds[3].got_write)
+        {
+          log_assert (inextra);
+          err = copy_buffer_do_copy (&cpbuf_extra, inextra, fds[3].stream);
+          if (err)
+            {
+              log_error ("error feeding data to '%s': %s\n",
+                         pgmname, gpg_strerror (err));
+              goto leave;
+            }
+
+          if (es_feof (inextra))
+            {
+              err = copy_buffer_flush (&cpbuf_extra, fds[3].stream);
+              if (err)
+                {
+                  log_error ("error feeding data to '%s': %s\n",
+                             pgmname, gpg_strerror (err));
+                  goto leave;
+                }
+
+              fds[3].ignore = 1; /* ready.  */
+              es_fclose (extrafp); extrafp = NULL;
+            }
+        }
+
       if (fds[1].got_read)
         {
-          err = copy_buffer_do_copy (&cpbuf[1], fds[1].stream, output);
+          err = copy_buffer_do_copy (&cpbuf_out, fds[1].stream, output);
           if (err)
             {
               log_error ("error reading data from '%s': %s\n",
@@ -329,7 +405,7 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
         read_and_log_stderr (&fderrstate, fds + 2);
     }
 
-  err = copy_buffer_flush (&cpbuf[1], output);
+  err = copy_buffer_flush (&cpbuf_out, output);
   if (err)
     {
       log_error ("error reading data from '%s': %s\n",
@@ -339,6 +415,7 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
 
   read_and_log_stderr (&fderrstate, NULL); /* Flush.  */
   es_fclose (infp); infp = NULL;
+  es_fclose (extrafp); extrafp = NULL;
   es_fclose (outfp); outfp = NULL;
   es_fclose (errfp); errfp = NULL;
 
@@ -350,14 +427,17 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
     gnupg_kill_process (pid);
 
   es_fclose (infp);
+  es_fclose (extrafp);
   es_fclose (outfp);
   es_fclose (errfp);
   if (pid != (pid_t)(-1))
     gnupg_wait_process (pgmname, pid, 1, NULL);
   gnupg_release_process (pid);
 
-  copy_buffer_shred (&cpbuf[0]);
-  copy_buffer_shred (&cpbuf[1]);
+  copy_buffer_shred (&cpbuf_in);
+  copy_buffer_shred (&cpbuf_out);
+  if (inextra)
+    copy_buffer_shred (&cpbuf_extra);
   return err;
 }
 
@@ -408,7 +488,7 @@ gnupg_exec_tool (const char *pgmname, const char *argv[],
       goto leave;
     }
 
-  err = gnupg_exec_tool_stream (pgmname, argv, input, output);
+  err = gnupg_exec_tool_stream (pgmname, argv, input, NULL, output);
   if (err)
     goto leave;
 
diff --git a/common/exectool.h b/common/exectool.h
index d9439aa..21bc177 100644
--- a/common/exectool.h
+++ b/common/exectool.h
@@ -48,9 +48,9 @@ gpg_error_t gnupg_exec_tool (const char *pgmname, const char *argv[],
    the NULL terminates array ARGV.  If INPUT is not NULL it will be
    fed to stdin of the process.  stderr is logged using log_info and
    the process' stdout is written to OUTPUT.  On error a diagnostic is
-   printed, and an error code returned.  */
+   printed, and an error code returned.  INEXTRA is reserved. */
 gpg_error_t gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
-				 estream_t input,
-				 estream_t output);
+                                    estream_t input, estream_t inextra,
+                                    estream_t output);
 
 #endif /* GNUPG_COMMON_EXECTOOL_H */
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 5d4a26a..3d456a9 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -1626,7 +1626,7 @@ gc_component_check_options (int component, estream_t out, const char *conf_file)
 
   result = 0;
   errlines = NULL;
-  err = gnupg_spawn_process (pgmname, argv, NULL, 0,
+  err = gnupg_spawn_process (pgmname, argv, NULL, NULL, 0,
                              NULL, NULL, &errfp, &pid);
   if (err)
     result |= 1; /* Program could not be run.  */
@@ -1965,7 +1965,7 @@ retrieve_options_from_program (gc_component_t component, gc_backend_t backend)
   argv[0] = "--gpgconf-list";
   argv[1] = NULL;
 
-  err = gnupg_spawn_process (pgmname, argv, NULL, 0,
+  err = gnupg_spawn_process (pgmname, argv, NULL, NULL, 0,
                              NULL, &outfp, NULL, &pid);
   if (err)
     {
diff --git a/tools/gpgtar-create.c b/tools/gpgtar-create.c
index f7c8b1a..d615fd3 100644
--- a/tools/gpgtar-create.c
+++ b/tools/gpgtar-create.c
@@ -932,7 +932,7 @@ gpgtar_create (char **inpattern, int encrypt, int sign)
         }
 
       err = gnupg_exec_tool_stream (opt.gpg_program, argv,
-                                    outstream, cipher_stream);
+                                    outstream, NULL, cipher_stream);
       xfree (argv);
       if (err)
         goto leave;
diff --git a/tools/gpgtar-extract.c b/tools/gpgtar-extract.c
index 3ee73ef..c4bf440 100644
--- a/tools/gpgtar-extract.c
+++ b/tools/gpgtar-extract.c
@@ -327,7 +327,7 @@ gpgtar_extract (const char *filename, int decrypt)
         }
 
       err = gnupg_exec_tool_stream (opt.gpg_program, argv,
-                                    cipher_stream, stream);
+                                    cipher_stream, NULL, stream);
       xfree (argv);
       if (err)
         goto leave;
diff --git a/tools/gpgtar-list.c b/tools/gpgtar-list.c
index 930712a..a3f85ac 100644
--- a/tools/gpgtar-list.c
+++ b/tools/gpgtar-list.c
@@ -327,7 +327,7 @@ gpgtar_list (const char *filename, int decrypt)
         }
 
       err = gnupg_exec_tool_stream (opt.gpg_program, argv,
-                                    cipher_stream, stream);
+                                    cipher_stream, NULL, stream);
       xfree (argv);
       if (err)
         goto leave;

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

Summary of changes:
 common/exechelp-posix.c |  13 +--
 common/exechelp-w32.c   |   4 +-
 common/exechelp-w32ce.c |   3 +-
 common/exechelp.h       |   6 +-
 common/exectool.c       | 209 +++++++++++++++++++++++++++++++++++++++++-------
 common/exectool.h       |  19 ++++-
 tools/gpgconf-comp.c    |   4 +-
 tools/gpgtar-create.c   |   2 +-
 tools/gpgtar-extract.c  |   2 +-
 tools/gpgtar-list.c     |   2 +-
 10 files changed, 216 insertions(+), 48 deletions(-)


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



From cvs at cvs.gnupg.org  Sat May 28 12:05:10 2016
From: cvs at cvs.gnupg.org (by Jérémie Courrèges-Anglas)
Date: Sat, 28 May 2016 12:05:10 +0200
Subject: [git] GCRYPT - branch, master, updated. libgcrypt-1.7.0-6-g3e8074e
Message-ID: <E1b6b5S-0004q5-NK@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  3e8074ecd3a534e8bd7f11cf17f0b22d252584c8 (commit)
       via  eb6427c3b5993d62e0527b8a08b23a219824b965 (commit)
      from  c7430aa752232aa690c5d8f16575a345442ad8d7 (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 3e8074ecd3a534e8bd7f11cf17f0b22d252584c8
Author: J?r?mie Courr?ges-Anglas <jca at wxcvbn.org>
Date:   Mon May 9 04:04:59 2016 +0200

    Check for compiler SSE4.1 support in PCLMUL CRC code.
    
    * cipher/crc-intel-pclmul.c: Build PCLMUL CRC implementation only if
      compiler supports PCLMUL *and* SSE4.1
    * cipher/crc.c: Ditto
    * configure.ac (sse41support, gcry_cv_gcc_inline_asm_sse41): New.
    --
    Fixes build with the native gcc on OpenBSD/amd64, which supports PCLMUL
    but not SSE4.1.
    
    Signed-off-by: J?r?mie Courr?ges-Anglas <jca at wxcvbn.org>

diff --git a/cipher/crc-intel-pclmul.c b/cipher/crc-intel-pclmul.c
index c034e2e..2972fb4 100644
--- a/cipher/crc-intel-pclmul.c
+++ b/cipher/crc-intel-pclmul.c
@@ -30,7 +30,8 @@
 #include "bufhelp.h"
 
 
-#if defined(ENABLE_PCLMUL_SUPPORT) && __GNUC__ >= 4 && \
+#if defined(ENABLE_PCLMUL_SUPPORT) && defined(ENABLE_SSE41_SUPPORT) && \
+    __GNUC__ >= 4 &&                                                   \
     ((defined(__i386__) && SIZEOF_UNSIGNED_LONG == 4) || defined(__x86_64__))
 
 
diff --git a/cipher/crc.c b/cipher/crc.c
index ee0e4e2..a1ce50b 100644
--- a/cipher/crc.c
+++ b/cipher/crc.c
@@ -31,10 +31,10 @@
 #include "bufhelp.h"
 
 
-/* USE_INTEL_PCLMUL indicates whether to compile CRC with Intel PCLMUL
+/* USE_INTEL_PCLMUL indicates whether to compile CRC with Intel PCLMUL/SSE4.1
  * code.  */
 #undef USE_INTEL_PCLMUL
-#ifdef ENABLE_PCLMUL_SUPPORT
+#if defined(ENABLE_PCLMUL_SUPPORT) && defined(ENABLE_SSE41_SUPPORT)
 # if ((defined(__i386__) && SIZEOF_UNSIGNED_LONG == 4) || defined(__x86_64__))
 #  if __GNUC__ >= 4
 #   define USE_INTEL_PCLMUL 1
diff --git a/configure.ac b/configure.ac
index ad06dfd..ad0f64d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -597,6 +597,14 @@ AC_ARG_ENABLE(pclmul-support,
 	      pclmulsupport=$enableval,pclmulsupport=yes)
 AC_MSG_RESULT($pclmulsupport)
 
+# Implementation of the --disable-sse41-support switch.
+AC_MSG_CHECKING([whether SSE4.1 support is requested])
+AC_ARG_ENABLE(sse41-support,
+              AC_HELP_STRING([--disable-sse41-support],
+                 [Disable support for the Intel SSE4.1 instructions]),
+	      sse41support=$enableval,sse41support=yes)
+AC_MSG_RESULT($sse41support)
+
 # Implementation of the --disable-drng-support switch.
 AC_MSG_CHECKING([whether DRNG support is requested])
 AC_ARG_ENABLE(drng-support,
@@ -1109,6 +1117,7 @@ AM_CONDITIONAL(MPI_MOD_C_UDIV_QRNND, test "$mpi_mod_c_udiv_qrnnd" = yes)
 if test "$mpi_cpu_arch" != "x86" ; then
    aesnisupport="n/a"
    pclmulsupport="n/a"
+   sse41support="n/a"
    avxsupport="n/a"
    avx2support="n/a"
    padlocksupport="n/a"
@@ -1257,6 +1266,27 @@ if test "$gcry_cv_gcc_inline_asm_pclmul" = "yes" ; then
      [Defined if inline assembler supports PCLMUL instructions])
 fi
 
+#
+# Check whether GCC inline assembler supports SSE4.1 instructions.
+#
+AC_CACHE_CHECK([whether GCC inline assembler supports SSE4.1 instructions],
+       [gcry_cv_gcc_inline_asm_sse41],
+       [if test "$mpi_cpu_arch" != "x86" ; then
+          gcry_cv_gcc_inline_asm_sse41="n/a"
+        else
+          gcry_cv_gcc_inline_asm_sse41=no
+          AC_COMPILE_IFELSE([AC_LANG_SOURCE(
+          [[void a(void) {
+              int i;
+              __asm__("pextrd \$2, %%xmm0, %[out]\n\t" : [out] "=m" (i));
+            }]])],
+          [gcry_cv_gcc_inline_asm_sse41=yes])
+        fi])
+if test "$gcry_cv_gcc_inline_asm_sse41" = "yes" ; then
+   AC_DEFINE(HAVE_GCC_INLINE_ASM_SSE41,1,
+     [Defined if inline assembler supports SSE4.1 instructions])
+fi
+
 
 #
 # Check whether GCC inline assembler supports AVX instructions
@@ -1711,6 +1741,11 @@ if test x"$pclmulsupport" = xyes ; then
     pclmulsupport="no (unsupported by compiler)"
   fi
 fi
+if test x"$sse41support" = xyes ; then
+  if test "$gcry_cv_gcc_inline_asm_sse41" != "yes" ; then
+    sse41support="no (unsupported by compiler)"
+  fi
+fi
 if test x"$avxsupport" = xyes ; then
   if test "$gcry_cv_gcc_inline_asm_avx" != "yes" ; then
     avxsupport="no (unsupported by compiler)"
@@ -1735,6 +1770,10 @@ if test x"$pclmulsupport" = xyes ; then
   AC_DEFINE(ENABLE_PCLMUL_SUPPORT, 1,
             [Enable support for Intel PCLMUL instructions.])
 fi
+if test x"$sse41support" = xyes ; then
+  AC_DEFINE(ENABLE_SSE41_SUPPORT, 1,
+            [Enable support for Intel SSE4.1 instructions.])
+fi
 if test x"$avxsupport" = xyes ; then
   AC_DEFINE(ENABLE_AVX_SUPPORT,1,
             [Enable support for Intel AVX instructions.])
@@ -2340,6 +2379,7 @@ GCRY_MSG_SHOW([Using linux capabilities: ],[$use_capabilities])
 GCRY_MSG_SHOW([Try using Padlock crypto: ],[$padlocksupport])
 GCRY_MSG_SHOW([Try using AES-NI crypto:  ],[$aesnisupport])
 GCRY_MSG_SHOW([Try using Intel PCLMUL:   ],[$pclmulsupport])
+GCRY_MSG_SHOW([Try using Intel SSE4.1:   ],[$sse41support])
 GCRY_MSG_SHOW([Try using DRNG (RDRAND):  ],[$drngsupport])
 GCRY_MSG_SHOW([Try using Intel AVX:      ],[$avxsupport])
 GCRY_MSG_SHOW([Try using Intel AVX2:     ],[$avx2support])

commit eb6427c3b5993d62e0527b8a08b23a219824b965
Author: Jussi Kivilinna <jussi.kivilinna at iki.fi>
Date:   Sat May 28 12:59:54 2016 +0300

    Register DCO for J?r?mie Courr?ges-Anglas
    
    --
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>

diff --git a/AUTHORS b/AUTHORS
index f89d585..25de16c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -156,6 +156,9 @@ Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
 Dmitry Kasatkin <dmitry.kasatkin at intel.com>
 2012-12-14:50CAE2DB.80302 at intel.com:
 
+J?r?mie Courr?ges-Anglas <jca at wxcvbn.org>
+2016-05-26:87bn3ssqg0.fsf at ritchie.wxcvbn.org:
+
 Jussi Kivilinna <jussi.kivilinna at mbnet.fi>
 2012-11-15:20121115172331.150537dzb5i6jmy8 at www.dalek.fi:
 

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

Summary of changes:
 AUTHORS                   |  3 +++
 cipher/crc-intel-pclmul.c |  3 ++-
 cipher/crc.c              |  4 ++--
 configure.ac              | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 47 insertions(+), 3 deletions(-)


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



From cvs at cvs.gnupg.org  Tue May 31 11:03:34 2016
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Tue, 31 May 2016 11:03:34 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.12-38-g903328a
Message-ID: <E1b7fYR-0006QG-22@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  903328a3efc88bcf6bc7a5637de707d7119e4a57 (commit)
      from  239a4d53916b47b5b0f0167a9b2c7a8915bb9c52 (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 903328a3efc88bcf6bc7a5637de707d7119e4a57
Author: Justus Winter <justus at g10code.com>
Date:   Tue May 31 11:03:18 2016 +0200

    build: Fix URL.
    
    --
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/autogen.sh b/autogen.sh
index 7d843bd..10cc203 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -423,7 +423,7 @@ if [ -d .git ]; then
     [ -z "${SILENT}" ] && cat <<EOF
 *** Activating trailing whitespace git pre-commit hook. ***
     For more information see this thread:
-      http://mail.gnome.org/archives/desktop-devel-list/2009-May/msg00084html
+      http://mail.gnome.org/archives/desktop-devel-list/2009-May/msg00084.html
     To deactivate this pre-commit hook again move .git/hooks/pre-commit
     and .git/hooks/pre-commit.sample out of the way.
 EOF

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

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  Tue May 31 15:52:37 2016
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 31 May 2016 15:52:37 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.12-39-g67a4bc8
Message-ID: <E1b7k49-0003hv-0d@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  67a4bc8d536f6997f14daff4c039abd48a172100 (commit)
      from  903328a3efc88bcf6bc7a5637de707d7119e4a57 (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 67a4bc8d536f6997f14daff4c039abd48a172100
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 31 15:43:51 2016 +0200

    gpg: New status code NOTATION_FLAGS.
    
    * common/status.h (STATUS_NOTATION_FLAGS: New.
    * g10/packet.h (struct notation): Add flags.human.
    (notation_t): New typedef.
    * g10/build-packet.c (sig_to_notation): Set flags.human.
    * g10/keylist.c (show_notation): Write STATUS_NOTATION_FLAGS.

diff --git a/common/status.h b/common/status.h
index 966489f..f9771c2 100644
--- a/common/status.h
+++ b/common/status.h
@@ -96,6 +96,7 @@ enum
     STATUS_SIG_CREATED,
     STATUS_SESSION_KEY,
     STATUS_NOTATION_NAME,
+    STATUS_NOTATION_FLAGS,
     STATUS_NOTATION_DATA,
     STATUS_POLICY_URL,
     STATUS_KEY_CREATED,
diff --git a/doc/DETAILS b/doc/DETAILS
index 59f8d56..d2df9ac 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -520,14 +520,17 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB:
     letter 'T'.
 
 *** NOTATION_
-    There are actually two related status codes to convey notation
+    There are actually three related status codes to convey notation
     data:
 
     - NOTATION_NAME <name>
+    - NOTATION_FLAGS <critical> <human_readable>
     - NOTATION_DATA <string>
 
-    <name> and <string> are %XX escaped; the data may be split among
-    several NOTATION_DATA lines.
+    <name> and <string> are %XX escaped.  The data may be split among
+    several NOTATION_DATA lines.  NOTATION_FLAGS is emitted after
+    NOTATION_NAME and gives the critical and human readable flags;
+    the flag values are either 0 or 1.
 
 *** POLICY_URL <string>
     Note that URL in <string> is %XX escaped.
diff --git a/g10/build-packet.c b/g10/build-packet.c
index 9b64967..4bfc2ac 100644
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@@ -1277,8 +1277,9 @@ sig_to_notation(PKT_signature *sig)
 {
   const byte *p;
   size_t len;
-  int seq=0,crit;
-  struct notation *list=NULL;
+  int seq = 0;
+  int crit;
+  notation_t list = NULL;
 
   /* See RFC 4880, 5.2.3.16 for the format of notation data.  In
      short, a notation has:
@@ -1323,6 +1324,7 @@ sig_to_notation(PKT_signature *sig)
 	  n->value=xmalloc(n2+1);
 	  memcpy(n->value,&p[8+n1],n2);
 	  n->value[n2]='\0';
+          n->flags.human = 1;
 	}
       else
         /* Binary data.  */
diff --git a/g10/keylist.c b/g10/keylist.c
index cbde0bb..2a1ef2e 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -401,7 +401,7 @@ void
 show_notation (PKT_signature * sig, int indent, int mode, int which)
 {
   estream_t fp = mode ? log_get_stream () : es_stdout;
-  struct notation *nd, *notations;
+  notation_t nd, notations;
 
   if (which == 0)
     which = 3;
@@ -448,6 +448,10 @@ show_notation (PKT_signature * sig, int indent, int mode, int which)
 	{
 	  write_status_buffer (STATUS_NOTATION_NAME,
 			       nd->name, strlen (nd->name), 0);
+          if (nd->flags.critical || nd->flags.human)
+            write_status_text (STATUS_NOTATION_FLAGS,
+                               nd->flags.critical && nd->flags.human? "1 1" :
+                               nd->flags.critical? "1 0" : "0 1");
 	  write_status_buffer (STATUS_NOTATION_DATA,
 			       nd->value, strlen (nd->value), 50);
 	}
diff --git a/g10/packet.h b/g10/packet.h
index 194c134..6ea2f83 100644
--- a/g10/packet.h
+++ b/g10/packet.h
@@ -531,12 +531,14 @@ struct notation
   /* The notation's name.  */
   char *name;
   /* If the notation is human readable, then the value is stored here
-     as a NUL-terminated string.  */
+     as a NUL-terminated string.  If it is not human readable a human
+     readable approximation of the binary value _may_ be stored
+     here.  */
   char *value;
   /* Sometimes we want to %-expand the value.  In these cases, we save
      that transformed value here.  */
   char *altvalue;
-  /* If the notation is not human readable, then the value is strored
+  /* If the notation is not human readable, then the value is stored
      here.  */
   unsigned char *bdat;
   /* The amount of data stored in BDAT.
@@ -552,6 +554,8 @@ struct notation
   {
     /* The notation is critical.  */
     unsigned int critical:1;
+    /* The notation is human readable.  */
+    unsigned int human:1;
     /* The notation should be deleted.  */
     unsigned int ignore:1;
   } flags;
@@ -559,6 +563,7 @@ struct notation
   /* A field to facilitate creating a list of notations.  */
   struct notation *next;
 };
+typedef struct notation *notation_t;
 
 /*-- mainproc.c --*/
 void reset_literals_seen(void);

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

Summary of changes:
 common/status.h    | 1 +
 doc/DETAILS        | 9 ++++++---
 g10/build-packet.c | 6 ++++--
 g10/keylist.c      | 6 +++++-
 g10/packet.h       | 9 +++++++--
 5 files changed, 23 insertions(+), 8 deletions(-)


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



From cvs at cvs.gnupg.org  Tue May 31 16:40:09 2016
From: cvs at cvs.gnupg.org (by Tobias Mueller)
Date: Tue, 31 May 2016 16:40:09 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.6.0-148-g8ad17f4
Message-ID: <E1b7ko8-0006XD-HS@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  8ad17f402f6420880dcf06a13a54feadb52c0208 (commit)
       via  afa0dd56e1cce64fe08bff3c64b12aecce54fd2d (commit)
       via  18ad4413be7bda99521403568da6da98100bc402 (commit)
      from  89d22f9229f2ecd559ac6ea91dae60eeff940fa5 (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 8ad17f402f6420880dcf06a13a54feadb52c0208
Author: Tobias Mueller <muelli at cryptobitch.de>
Date:   Tue May 31 14:41:12 2016 +0200

    python: use GPG_ERROR_CONFIG variable
    
    instead of calling gpg-error-config.
    This is useful when configuring with --with-gpgerror-prefix
    because then GPG_ERROR_CONFIG contains the correct
    /path/to/bin/gpg-error-config whereas calling gpg-error-config
    directly would look in the user's PATH (and not in the prefix
    where gpg-error-config was installed).
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
index f58f079..8034922 100644
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
@@ -32,7 +32,7 @@ copystamp: $(srcdir)/pyme $(srcdir)/helpers.c $(srcdir)/helpers.h
 errors.i:
 	sed -n -e \
 	  '/GPG_ERR_[^ ]* =/s/ *\(.*\) = .*/%constant long \1 = \1;/p' \
-	  `gpg-error-config --prefix`/include/gpg-error.h >$@
+	  `$(GPG_ERROR_CONFIG) --prefix`/include/gpg-error.h >$@
 
 gpgme_wrap.c pyme/pygpgme.py: gpgme.i errors.i gpgme.h copystamp
 	$(SWIG) -python -py3 $(SWIGOPT) \

commit afa0dd56e1cce64fe08bff3c64b12aecce54fd2d
Author: Justus Winter <justus at gnupg.org>
Date:   Tue May 31 16:21:06 2016 +0200

    python: Port more tests.
    
    * lang/python/gpgme.i: Hide length fields of notations.
    * lang/python/tests/Makefile.am (pytests): Add new tests.
    * lang/python/tests/t-decrypt-verify.py: New file.
    * lang/python/tests/t-sig-notation.py: Likewise.
    * lang/python/tests/t-verify.py: Likewise.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/lang/python/gpgme.i b/lang/python/gpgme.i
index 5b3c193..87fe90d 100644
--- a/lang/python/gpgme.i
+++ b/lang/python/gpgme.i
@@ -255,11 +255,37 @@ PyObject* object_to_gpgme_t(PyObject* input, const char* objtype, int argnum) {
     $2 = $input;
 }
 
-// Include the header file both for cc (first) and for swig (second)
-// Include for swig locally since we need to fix 'class' usage there.
-%{
-#include <gpgme.h>
-%}
+/* Include the unmodified <gpgme.h> for cc, and the cleaned-up local
+   version for SWIG.  We do, however, want to hide certain fields on
+   some structs, which we provide prior to including the version for
+   SWIG.  */
+ %{ #include <gpgme.h> %}
+
+/* This is for notations, where we want to hide the length fields, and
+   the unused bit field block.  */
+struct _gpgme_sig_notation
+{
+  struct _gpgme_sig_notation *next;
+
+  /* If NAME is a null pointer, then VALUE contains a policy URL
+     rather than a notation.  */
+  char *name;
+
+  /* The value of the notation data.  */
+  char *value;
+
+  /* The accumulated flags.  */
+  gpgme_sig_notation_flags_t flags;
+
+  /* Notation data is human-readable.  */
+  unsigned int human_readable : 1;
+
+  /* Notation data is critical.  */
+  unsigned int critical : 1;
+};
+
+/* Now include our local modified version.  Any structs defined above
+   are ignored.  */
 %include "gpgme.h"
 
 %include "errors.i"
diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index 0bc8c7f..b85e82e 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -38,6 +38,9 @@ py_tests = t-wrapper.py \
 	t-sign.py \
 	t-signers.py \
 	t-decrypt.py \
+	t-verify.py \
+	t-decrypt-verify.py \
+	t-sig-notation.py \
 	t-export.py \
 	t-trustlist.py \
 	t-edit.py \
diff --git a/lang/python/tests/t-decrypt-verify.py b/lang/python/tests/t-decrypt-verify.py
new file mode 100755
index 0000000..433e0a1
--- /dev/null
+++ b/lang/python/tests/t-decrypt-verify.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2016 g10 Code GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME 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.
+#
+# GPGME 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 program; if not, see <http://www.gnu.org/licenses/>.
+
+from pyme import core, constants, errors
+import support
+
+def check_verify_result(result, summary, fpr, status):
+    assert len(result.signatures) == 1, "Unexpected number of signatures"
+    sig = result.signatures[0]
+    assert sig.summary == summary, "Unexpected signature summary"
+    assert sig.fpr == fpr
+    assert errors.GPGMEError(sig.status).getcode() == status
+    assert len(sig.notations) == 0
+    assert not sig.wrong_key_usage
+    assert sig.validity == constants.VALIDITY_UNKNOWN
+    assert errors.GPGMEError(sig.validity_reason).getcode() == errors.NO_ERROR
+
+support.init_gpgme(constants.PROTOCOL_OpenPGP)
+c = core.Context()
+
+source = core.Data(file=support.make_filename("cipher-2.asc"))
+sink = core.Data()
+
+c.op_decrypt_verify(source, sink)
+result = c.op_decrypt_result()
+assert not result.unsupported_algorithm, \
+    "Unsupported algorithm: {}".format(result.unsupported_algorithm)
+
+support.print_data(sink)
+
+verify_result = c.op_verify_result()
+check_verify_result(verify_result, 0,
+                    "A0FF4590BB6122EDEF6E3C542D727CC768697734",
+                    errors.NO_ERROR)
diff --git a/lang/python/tests/t-sig-notation.py b/lang/python/tests/t-sig-notation.py
new file mode 100755
index 0000000..2d832ef
--- /dev/null
+++ b/lang/python/tests/t-sig-notation.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2016 g10 Code GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME 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.
+#
+# GPGME 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 program; if not, see <http://www.gnu.org/licenses/>.
+
+import os
+from pyme import core, constants, errors
+import support
+
+expected_notations = {
+    "laughing at me": ("Just Squeeze Me", constants.SIG_NOTATION_HUMAN_READABLE),
+    "preferred-email-encoding at pgp.com": ("pgpmime",
+                                         constants.SIG_NOTATION_HUMAN_READABLE
+                                         | constants.SIG_NOTATION_CRITICAL),
+    None: ("http://www.gnu.org/policy/", 0),
+}
+
+def check_result(result):
+    assert len(result.signatures) == 1, "Unexpected number of signatures"
+    sig = result.signatures[0]
+    assert len(sig.notations) == len(expected_notations)
+
+    for r in sig.notations:
+        assert not 'name_len' in dir(r)
+        assert not 'value_len' in dir(r)
+        assert r.name in expected_notations
+        value, flags = expected_notations.pop(r.name)
+
+        assert r.value == value, \
+            "Expected {!r}, got {!r}".format(value, r.value)
+        assert r.human_readable \
+            == bool(flags&constants.SIG_NOTATION_HUMAN_READABLE)
+        # xxx notyet
+        #assert r.human_readable \
+        #    == bool(flags&constants.SIG_NOTATION_CRITICAL)
+
+    assert len(expected_notations) == 0
+
+support.init_gpgme(constants.PROTOCOL_OpenPGP)
+
+source = core.Data("Hallo Leute\n")
+signed = core.Data()
+
+c = core.Context()
+for name, (value, flags) in expected_notations.items():
+    c.sig_notation_add(name, value, flags)
+
+c.op_sign(source, signed, constants.SIG_MODE_NORMAL)
+
+signed.seek(0, os.SEEK_SET)
+sink = core.Data()
+c.op_verify(signed, None, sink)
+result = c.op_verify_result()
+check_result(result)
diff --git a/lang/python/tests/t-verify.py b/lang/python/tests/t-verify.py
new file mode 100755
index 0000000..333ee4e
--- /dev/null
+++ b/lang/python/tests/t-verify.py
@@ -0,0 +1,128 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2016 g10 Code GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME 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.
+#
+# GPGME 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 program; if not, see <http://www.gnu.org/licenses/>.
+
+import os
+from pyme import core, constants, errors
+import support
+
+test_text1 = "Just GNU it!\n"
+test_text1f= "Just GNU it?\n"
+test_sig1 = """-----BEGIN PGP SIGNATURE-----
+
+iN0EABECAJ0FAjoS+i9FFIAAAAAAAwA5YmFyw7bDpMO8w58gZGFzIHdhcmVuIFVt
+bGF1dGUgdW5kIGpldHp0IGVpbiBwcm96ZW50JS1aZWljaGVuNRSAAAAAAAgAJGZv
+b2Jhci4xdGhpcyBpcyBhIG5vdGF0aW9uIGRhdGEgd2l0aCAyIGxpbmVzGhpodHRw
+Oi8vd3d3Lmd1Lm9yZy9wb2xpY3kvAAoJEC1yfMdoaXc0JBIAoIiLlUsvpMDOyGEc
+dADGKXF/Hcb+AKCJWPphZCphduxSvrzH0hgzHdeQaA==
+=nts1
+-----END PGP SIGNATURE-----
+"""
+
+test_sig2 = """-----BEGIN PGP MESSAGE-----
+
+owGbwMvMwCSoW1RzPCOz3IRxjXQSR0lqcYleSUWJTZOvjVdpcYmCu1+oQmaJIleH
+GwuDIBMDGysTSIqBi1MApi+nlGGuwDeHao53HBr+FoVGP3xX+kvuu9fCMJvl6IOf
+y1kvP4y+8D5a11ang0udywsA
+=Crq6
+-----END PGP MESSAGE-----
+"""
+
+# A message with a prepended but unsigned plaintext packet.
+double_plaintext_sig = """-----BEGIN PGP MESSAGE-----
+
+rDRiCmZvb2Jhci50eHRF4pxNVGhpcyBpcyBteSBzbmVha3kgcGxhaW50ZXh0IG1l
+c3NhZ2UKowGbwMvMwCSoW1RzPCOz3IRxTWISa6JebnG666MFD1wzSzJSixQ81XMV
+UlITUxTyixRyKxXKE0uSMxQyEosVikvyCwpSU/S4FNCArq6Ce1F+aXJGvoJvYlGF
+erFCTmJxiUJ5flFKMVeHGwuDIBMDGysTyA4GLk4BmO036xgWzMgzt9V85jCtfDFn
+UqVooWlGXHwNw/xg/fVzt9VNbtjtJ/fhUqYo0/LyCGEA
+=6+AK
+-----END PGP MESSAGE-----
+"""
+
+def check_result(result, summary, fpr, status, notation):
+    assert len(result.signatures) == 1, "Unexpected number of signatures"
+    sig = result.signatures[0]
+    assert sig.summary == summary, "Unexpected signature summary"
+    assert sig.fpr == fpr
+    assert errors.GPGMEError(sig.status).getcode() == status
+
+    if notation:
+        expected_notations = {
+            "bar": b"\xc3\xb6\xc3\xa4\xc3\xbc\xc3\x9f".decode() +
+            " das waren Umlaute und jetzt ein prozent%-Zeichen",
+            "foobar.1":  "this is a notation data with 2 lines",
+            None: "http://www.gu.org/policy/",
+        }
+        assert len(sig.notations) == len(expected_notations)
+
+        for r in sig.notations:
+            assert not 'name_len' in dir(r)
+            assert not 'value_len' in dir(r)
+            assert r.name in expected_notations
+            assert r.value == expected_notations[r.name], \
+                "Expected {!r}, got {!r}".format(expected_notations[r.name],
+                                                 r.value)
+            expected_notations.pop(r.name)
+
+        assert len(expected_notations) == 0
+
+    assert not sig.wrong_key_usage
+    assert sig.validity == constants.VALIDITY_UNKNOWN
+    assert errors.GPGMEError(sig.validity_reason).getcode() == errors.NO_ERROR
+
+
+support.init_gpgme(constants.PROTOCOL_OpenPGP)
+c = core.Context()
+c.set_armor(True)
+
+# Checking a valid message.
+text = core.Data(test_text1)
+sig = core.Data(test_sig1)
+c.op_verify(sig, text, None)
+result = c.op_verify_result()
+check_result(result, 0, "A0FF4590BB6122EDEF6E3C542D727CC768697734",
+             errors.NO_ERROR, True)
+
+
+# Checking a manipulated message.
+text = core.Data(test_text1f)
+sig.seek(0, os.SEEK_SET)
+c.op_verify(sig, text, None)
+result = c.op_verify_result()
+check_result(result, constants.SIGSUM_RED, "2D727CC768697734",
+             errors.BAD_SIGNATURE, False)
+
+# Checking a normal signature.
+text = core.Data()
+sig = core.Data(test_sig2)
+c.op_verify(sig, None, text)
+result = c.op_verify_result()
+check_result(result, 0, "A0FF4590BB6122EDEF6E3C542D727CC768697734",
+             errors.NO_ERROR, False)
+
+# Checking an invalid message.
+text = core.Data()
+sig = core.Data(double_plaintext_sig)
+try:
+    c.op_verify(sig, None, text)
+except Exception as e:
+    assert type(e) == errors.GPGMEError
+    assert e.getcode() == errors.BAD_DATA
+else:
+    assert False, "Expected an error but got none."

commit 18ad4413be7bda99521403568da6da98100bc402
Author: Justus Winter <justus at gnupg.org>
Date:   Tue May 31 11:01:36 2016 +0200

    build: Fix URL.
    
    --
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/autogen.sh b/autogen.sh
index 471193c..24da40c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -347,7 +347,7 @@ if [ -d .git ]; then
     [ -z "${SILENT}" ] && cat <<EOF
 *** Activating trailing whitespace git pre-commit hook. ***
     For more information see this thread:
-      http://mail.gnome.org/archives/desktop-devel-list/2009-May/msg00084html
+      http://mail.gnome.org/archives/desktop-devel-list/2009-May/msg00084.html
     To deactivate this pre-commit hook again move .git/hooks/pre-commit
     and .git/hooks/pre-commit.sample out of the way.
 EOF

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

Summary of changes:
 autogen.sh                                         |   2 +-
 lang/python/Makefile.am                            |   2 +-
 lang/python/gpgme.i                                |  36 +++++-
 lang/python/tests/Makefile.am                      |   3 +
 .../tests/{t-decrypt.py => t-decrypt-verify.py}    |  22 +++-
 lang/python/tests/t-sig-notation.py                |  68 +++++++++++
 lang/python/tests/t-verify.py                      | 128 +++++++++++++++++++++
 7 files changed, 251 insertions(+), 10 deletions(-)
 copy lang/python/tests/{t-decrypt.py => t-decrypt-verify.py} (54%)
 create mode 100755 lang/python/tests/t-sig-notation.py
 create mode 100755 lang/python/tests/t-verify.py


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