From cvs at cvs.gnupg.org  Thu Aug  1 12:02:50 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Thu, 01 Aug 2013 12:02:50 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-230-gef6a6d9
Message-ID: <E1V4pGo-0005M4-IF@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  ef6a6d973c2bcc54006c04dc41f978ff01005c97 (commit)
       via  9ff72e4e7e4f56c241a525479a94ed4c95efc23f (commit)
       via  db4651734fe91935b17876dc9194329b00066eff (commit)
       via  6ce54a18c2a625b89d5453129d5b9d1ad9d59473 (commit)
       via  ef2e2e54020c3475bf2129c3ec8360c7bad3a6c9 (commit)
       via  25b0357bf0a4861a751cfbc3e0335ae05c8b2b1b (commit)
       via  ffa7472db551f12f66b9789c31fabb5fc80cc13a (commit)
       via  f101f34fffee4a02e7a5f62b59667e45e50e8325 (commit)
       via  2830fcb83c99289a49da0e111766daf2d9a1fa3b (commit)
       via  f254497e09fa4e0e24e63d14f7316fc31c938844 (commit)
      from  82c25e67a1669febb5332b3e9bc4652e6855fdca (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 ef6a6d973c2bcc54006c04dc41f978ff01005c97
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 1 11:32:05 2013 +0200

    agent: Include missing prototype.
    
    * agent/protect.c: Include cvt-openpgp.h.

diff --git a/agent/protect.c b/agent/protect.c
index cb2c098..b29f494 100644
--- a/agent/protect.c
+++ b/agent/protect.c
@@ -36,6 +36,7 @@
 
 #include "agent.h"
 
+#include "cvt-openpgp.h"
 #include "sexp-parse.h"
 
 #define PROT_CIPHER        GCRY_CIPHER_AES

commit 9ff72e4e7e4f56c241a525479a94ed4c95efc23f
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 1 11:20:48 2013 +0200

    w32: Add code to support a portable use of GnuPG.
    
    * common/homedir.c (w32_bin_is_bin, w32_portable_app) [W32]: New.
    (check_portable_app) [W32]: New.
    (standard_homedir, default_homedir) [W32]: Support the portable flag.
    (w32_rootdir, w32_commondir) [W32]: Ditto.
    (gnupg_bindir, gnupg_cachedir, dirmngr_socket_name) [W32]: Ditto.
    * common/logging.h (JNLIB_LOG_NO_REGISTRY): New.
    * common/logging.c (no_registry): New variable.
    (log_set_prefix, log_get_prefix): Set/get that variable.
    (do_logv): Do not check the registry if that variable is set.
    --
    
    Beware: This code has not been tested because it is not yet possible
    to build GnuPG 2.1 for Windows.  However, the code will be the base
    for an implementation in 2.0.
    
    A portable use of GnuPG under Windows means that GnuPG uses a home
    directory depending on the location of the actual binary.  No registry
    variables are considered.  The portable mode is enabled if in the
    installation directory of the the binary "gpgconf.exe" and a
    file "gpgconf.ctl" are found.  The latter file is empty or consists
    only of empty or '#' comment lines.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/NEWS b/NEWS
index 370d9c4..3b2016f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Noteworthy changes in version 2.1.0beta4 (unreleased)
+Noteworthy changes in version 2.1.0-betaN (unreleased)
 -----------------------------------------------------
 
  * GPG now accepts a space separated fingerprint as a user ID.  This
@@ -20,6 +20,8 @@ Noteworthy changes in version 2.1.0beta4 (unreleased)
  * Better support fo CCID readers.  Now, internal CCID driver supports
    readers with no auto configuration feature.
 
+ * Support installation as portable application under Windows.
+
 
 Noteworthy changes in version 2.1.0beta3 (2011-12-20)
 -----------------------------------------------------
diff --git a/common/homedir.c b/common/homedir.c
index 28e5c9a..9fec78f 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -1,5 +1,6 @@
 /* homedir.c - Setup the home directory.
  * Copyright (C) 2004, 2006, 2007, 2010 Free Software Foundation, Inc.
+ * Copyright (C) 2013 Werner Koch
  *
  * This file is part of GnuPG.
  *
@@ -33,6 +34,9 @@
 #include <fcntl.h>
 
 #ifdef HAVE_W32_SYSTEM
+#include <winsock2.h>   /* Due to the stupid mingw64 requirement to
+                           include this header before windows.h which
+                           is often implicitly included.  */
 #include <shlobj.h>
 #ifndef CSIDL_APPDATA
 #define CSIDL_APPDATA 0x001a
@@ -53,6 +57,33 @@
 #include "util.h"
 #include "sysutils.h"
 
+#ifdef HAVE_W32_SYSTEM
+/* A flag used to indicate that a control file for gpgconf has been
+   detected.  Under Windows the presence of this file indicates a
+   portable installations and triggers several changes:
+
+   - The GNUGHOME directory is fixed relative to installation
+     directory.  All other means to set the home directory are ignore.
+
+   - All registry variables will be ignored.
+
+   This flag is not used on Unix systems.
+ */
+static int w32_portable_app;
+#endif /*HAVE_W32_SYSTEM*/
+
+#ifdef HAVE_W32_SYSTEM
+/* This flag is true if this process' binary has been installed under
+   bin and not in the root directory. */
+static int w32_bin_is_bin;
+#endif /*HAVE_W32_SYSTEM*/
+
+
+#ifdef HAVE_W32_SYSTEM
+static const char *w32_rootdir (void);
+#endif
+
+
 
 #ifdef HAVE_W32_SYSTEM
 static void
@@ -124,28 +155,39 @@ standard_homedir (void)
 
   if (!dir)
     {
-      char path[MAX_PATH];
+      const char *rdir;
 
-      /* It might be better to use LOCAL_APPDATA because this is
-         defined as "non roaming" and thus more likely to be kept
-         locally.  For private keys this is desired.  However, given
-         that many users copy private keys anyway forth and back,
-         using a system roaming services might be better than to let
-         them do it manually.  A security conscious user will anyway
-         use the registry entry to have better control.  */
-      if (w32_shgetfolderpath (NULL, CSIDL_APPDATA|CSIDL_FLAG_CREATE,
-                               NULL, 0, path) >= 0)
+      rdir = w32_rootdir ();
+      if (w32_portable_app)
         {
-          char *tmp = xmalloc (strlen (path) + 6 +1);
-          strcpy (stpcpy (tmp, path), "\\gnupg");
-          dir = tmp;
-
-          /* Try to create the directory if it does not yet exists.  */
-          if (access (dir, F_OK))
-            w32_try_mkdir (dir);
+          dir = xstrconcat (rdir, DIRSEP_S "home", NULL);
         }
       else
-        dir = GNUPG_DEFAULT_HOMEDIR;
+        {
+          char path[MAX_PATH];
+
+          /* It might be better to use LOCAL_APPDATA because this is
+             defined as "non roaming" and thus more likely to be kept
+             locally.  For private keys this is desired.  However,
+             given that many users copy private keys anyway forth and
+             back, using a system roaming services might be better
+             than to let them do it manually.  A security conscious
+             user will anyway use the registry entry to have better
+             control.  */
+          if (w32_shgetfolderpath (NULL, CSIDL_APPDATA|CSIDL_FLAG_CREATE,
+                                   NULL, 0, path) >= 0)
+            {
+              char *tmp = xmalloc (strlen (path) + 6 +1);
+              strcpy (stpcpy (tmp, path), "\\gnupg");
+              dir = tmp;
+
+              /* Try to create the directory if it does not yet exists.  */
+              if (access (dir, F_OK))
+                w32_try_mkdir (dir);
+            }
+          else
+            dir = GNUPG_DEFAULT_HOMEDIR;
+        }
     }
   return dir;
 #else/*!HAVE_W32_SYSTEM*/
@@ -160,6 +202,13 @@ default_homedir (void)
 {
   const char *dir;
 
+#ifdef HAVE_W32_SYSTEM
+  /* For a portable application we only use the standard homedir.  */
+  w32_rootdir ();
+  if (w32_portable_app)
+    return standard_homedir ();
+#endif /*HAVE_W32_SYSTEM*/
+
   dir = getenv ("GNUPGHOME");
 #ifdef HAVE_W32_SYSTEM
   if (!dir || !*dir)
@@ -197,6 +246,37 @@ default_homedir (void)
 
 
 #ifdef HAVE_W32_SYSTEM
+/* Check whether gpgconf is installed and if so read the gpgconf.ctl
+   file. */
+static void
+check_portable_app (const char *dir)
+{
+  char *fname;
+
+  fname = xstrconcat (dir, DIRSEP_S "gpgconf.exe", NULL);
+  if (access (fname, F_OK))
+    log_error ("required binary '%s' is not installed\n", fname);
+  else
+    {
+      strcpy (fname + strlen (fname) - 3, ".ctl");
+      if (!access (fname, F_OK))
+        {
+          /* gpgconf.ctl file found.  Record this fact.  */
+          w32_portable_app = 1;
+          {
+            unsigned int flags;
+            log_get_prefix (&flags);
+            log_set_prefix (NULL, (flags | JNLIB_LOG_NO_REGISTRY));
+          }
+          /* FIXME: We should read the file to detect special flags
+             and print a warning if we don't understand them  */
+        }
+    }
+  xfree (fname);
+}
+
+
+/* Determine the root directory of the gnupg installation on Windows.  */
 static const char *
 w32_rootdir (void)
 {
@@ -229,11 +309,17 @@ w32_rootdir (void)
       if (p)
         {
           *p = 0;
+
+          check_portable_app (dir);
+
           /* If we are installed below "bin" we strip that and use
              the top directory instead.  */
           p = strrchr (dir, DIRSEP_C);
           if (p && !strcmp (p+1, "bin"))
-            *p = 0;
+            {
+              *p = 0;
+              w32_bin_is_bin = 1;
+            }
         }
       if (!p)
         {
@@ -255,8 +341,17 @@ w32_commondir (void)
 
   if (!dir)
     {
+      const char *rdir;
       char path[MAX_PATH];
 
+      /* Make sure that w32_rootdir has been called so that we are
+         able to check the portable application flag.  The common dir
+         is the identical to the rootdir.  In that case there is also
+         no need to strdup its value.  */
+      rdir = w32_rootdir ();
+      if (w32_portable_app)
+        return rdir;
+
       if (w32_shgetfolderpath (NULL, CSIDL_COMMON_APPDATA,
                                NULL, 0, path) >= 0)
         {
@@ -270,7 +365,7 @@ w32_commondir (void)
         {
           /* Ooops: Not defined - probably an old Windows version.
              Use the installation directory instead.  */
-          dir = xstrdup (w32_rootdir ());
+          dir = xstrdup (rdir);
         }
     }
 
@@ -315,7 +410,19 @@ gnupg_bindir (void)
     name = xstrconcat (w32_rootdir (), DIRSEP_S "bin", NULL);
   return name;
 #elif defined(HAVE_W32_SYSTEM)
-  return w32_rootdir ();
+  const char *rdir;
+
+  rdir = w32_rootdir ();
+  if (w32_bin_is_bin)
+    {
+      static char *name;
+
+      if (!name)
+        name = xstrconcat (rdir, DIRSEP_S "bin", NULL);
+      return name;
+    }
+  else
+    return rdir;
 #else /*!HAVE_W32_SYSTEM*/
   return GNUPG_BINDIR;
 #endif /*!HAVE_W32_SYSTEM*/
@@ -390,41 +497,54 @@ gnupg_cachedir (void)
 
   if (!dir)
     {
-      char path[MAX_PATH];
-      const char *s1[] = { "GNU", "cache", "gnupg", NULL };
-      int s1_len;
-      const char **comp;
-
-      s1_len = 0;
-      for (comp = s1; *comp; comp++)
-        s1_len += 1 + strlen (*comp);
+      const char *rdir;
 
-      if (w32_shgetfolderpath (NULL, CSIDL_LOCAL_APPDATA|CSIDL_FLAG_CREATE,
-                               NULL, 0, path) >= 0)
+      rdir = w32_rootdir ();
+      if (w32_portable_app)
+        {
+          dir = xstrconcat (rdir,
+                            DIRSEP_S, "var",
+                            DIRSEP_S, "cache",
+                            DIRSEP_S, "gnupg", NULL);
+        }
+      else
         {
-          char *tmp = xmalloc (strlen (path) + s1_len + 1);
-	  char *p;
+          char path[MAX_PATH];
+          const char *s1[] = { "GNU", "cache", "gnupg", NULL };
+          int s1_len;
+          const char **comp;
 
-	  p = stpcpy (tmp, path);
+          s1_len = 0;
           for (comp = s1; *comp; comp++)
-	    {
-	      p = stpcpy (p, "\\");
-	      p = stpcpy (p, *comp);
+            s1_len += 1 + strlen (*comp);
 
-	      if (access (tmp, F_OK))
-		w32_try_mkdir (tmp);
-	    }
+          if (w32_shgetfolderpath (NULL, CSIDL_LOCAL_APPDATA|CSIDL_FLAG_CREATE,
+                                   NULL, 0, path) >= 0)
+            {
+              char *tmp = xmalloc (strlen (path) + s1_len + 1);
+              char *p;
 
-          dir = tmp;
-        }
-      else
-        {
-          dir = "c:\\temp\\cache\\gnupg";
+              p = stpcpy (tmp, path);
+              for (comp = s1; *comp; comp++)
+                {
+                  p = stpcpy (p, "\\");
+                  p = stpcpy (p, *comp);
+
+                  if (access (tmp, F_OK))
+                    w32_try_mkdir (tmp);
+                }
+
+              dir = tmp;
+            }
+          else
+            {
+              dir = "c:\\temp\\cache\\gnupg";
 #ifdef HAVE_W32CE_SYSTEM
-          dir += 2;
-	  w32_try_mkdir ("\\temp\\cache");
-	  w32_try_mkdir ("\\temp\\cache\\gnupg");
+              dir += 2;
+              w32_try_mkdir ("\\temp\\cache");
+              w32_try_mkdir ("\\temp\\cache\\gnupg");
 #endif
+            }
         }
     }
   return dir;
@@ -449,16 +569,21 @@ dirmngr_socket_name (void)
 
       s1 = default_homedir ();
 # else
-      char s1[MAX_PATH];
-      const char *s2;
-
-      /* We need something akin CSIDL_COMMON_PROGRAMS, but local
-	 (non-roaming).  This is becuase the file needs to be on the
-	 local machine and makes only sense on that machine.
-	 CSIDL_WINDOWS seems to be the only location which guarantees
-	 that. */
-      if (w32_shgetfolderpath (NULL, CSIDL_WINDOWS, NULL, 0, s1) < 0)
-	strcpy (s1, "C:\\WINDOWS");
+      char s1buf[MAX_PATH];
+      const char *s1, *s2;
+
+      s1 = default_homedir ();
+      if (!w32_portable_app)
+        {
+          /* We need something akin CSIDL_COMMON_PROGRAMS, but local
+             (non-roaming).  This is because the file needs to be on
+             the local machine and makes only sense on that machine.
+             CSIDL_WINDOWS seems to be the only location which
+             guarantees that. */
+          if (w32_shgetfolderpath (NULL, CSIDL_WINDOWS, NULL, 0, s1buf) < 0)
+            strcpy (s1buf, "C:\\WINDOWS");
+          s1 = s1buf;
+        }
 # endif
       s2 = DIRSEP_S "S.dirmngr";
       name = xmalloc (strlen (s1) + strlen (s2) + 1);
diff --git a/common/logging.c b/common/logging.c
index 73b0dbe..f78df91 100644
--- a/common/logging.c
+++ b/common/logging.c
@@ -96,6 +96,9 @@ static char prefix_buffer[80];
 static int with_time;
 static int with_prefix;
 static int with_pid;
+#ifdef HAVE_W32_SYSTEM
+static int no_registry;
+#endif
 static int (*get_pid_suffix_cb)(unsigned long *r_value);
 static int running_detached;
 static int force_prefixes;
@@ -561,6 +564,9 @@ log_set_prefix (const char *text, unsigned int flags)
   with_time = (flags & JNLIB_LOG_WITH_TIME);
   with_pid  = (flags & JNLIB_LOG_WITH_PID);
   running_detached = (flags & JNLIB_LOG_RUN_DETACHED);
+#ifdef HAVE_W32_SYSTEM
+  no_registry = (flags & JNLIB_LOG_NO_REGISTRY);
+#endif
 }
 
 
@@ -578,6 +584,10 @@ log_get_prefix (unsigned int *flags)
         *flags |= JNLIB_LOG_WITH_PID;
       if (running_detached)
         *flags |= JNLIB_LOG_RUN_DETACHED;
+#ifdef HAVE_W32_SYSTEM
+      if (no_registry)
+        *flags |= JNLIB_LOG_NO_REGISTRY;
+#endif
     }
   return prefix_buffer;
 }
@@ -624,8 +634,10 @@ do_logv (int level, int ignore_arg_ptr, const char *fmt, va_list arg_ptr)
 #ifdef HAVE_W32_SYSTEM
       char *tmp;
 
-      tmp = read_w32_registry_string (NULL, "Software\\GNU\\GnuPG",
-                                            "DefaultLogFile");
+      tmp = (no_registry
+             ? NULL
+             : read_w32_registry_string (NULL, "Software\\GNU\\GnuPG",
+                                         "DefaultLogFile"));
       log_set_file (tmp && *tmp? tmp : NULL);
       jnlib_free (tmp);
 #else
diff --git a/common/logging.h b/common/logging.h
index 89913e6..3b38f73 100644
--- a/common/logging.h
+++ b/common/logging.h
@@ -42,6 +42,7 @@
 #define JNLIB_LOG_WITH_TIME    2
 #define JNLIB_LOG_WITH_PID     4
 #define JNLIB_LOG_RUN_DETACHED 256
+#define JNLIB_LOG_NO_REGISTRY  512
 
 int  log_get_errorcount (int clear);
 void log_inc_errorcount (void);
diff --git a/doc/opt-homedir.texi b/doc/opt-homedir.texi
index e382f63..033a901 100644
--- a/doc/opt-homedir.texi
+++ b/doc/opt-homedir.texi
@@ -5,6 +5,18 @@ Set the name of the home directory to @var{dir}. If this option is not
 used, the home directory defaults to @file{~/.gnupg}.  It is only
 recognized when given on the command line.  It also overrides any home
 directory stated through the environment variable @env{GNUPGHOME} or
-(on W32 systems) by means of the Registry entry
+(on Windows systems) by means of the Registry entry
 @var{HKCU\Software\GNU\GnuPG:HomeDir}.
 
+On Windows systems it is possible to install GnuPG as a portable
+application.  In this case only this command line option is
+considered, all other ways to set a home directory are ignored.
+
+To install GnuPG as a portable application under Windows, create an
+empty file name @file{gpgconf.ctl} in the same directory as the tool
+ at file{gpgconf.exe}.  The root of the installation is than that
+directory; or, if @file{gpgconf.exe} has been installed directly below
+a directory named @file{bin}, its parent directory.  You also need to
+make sure that the following directories exist and are writable:
+ at file{ROOT/home} for the GnuPG home and @file{ROOT/var/cache/gnupg}
+for internal cache files.

commit db4651734fe91935b17876dc9194329b00066eff
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 1 11:06:22 2013 +0200

    Silence compiler warning about deprecated Libgcrypt symbols
    
    * configure.ac (AH_BOTTOM): Define GCRYPT_NO_DEPRECATED.
    --
    
    Some gcc versions emit deprecated warning for such flagged Libgcrypt
    symbols; even if they are not used.

diff --git a/configure.ac b/configure.ac
index 01530e0..5a5e9f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -500,6 +500,9 @@ AH_BOTTOM([
 /* Tell libgcrypt not to use its own libgpg-error implementation. */
 #define USE_LIBGPG_ERROR 1
 
+/* Tell Libgcrypt not to include deprecated definitions.  */
+#define GCRYPT_NO_DEPRECATED 1
+
 /* We use jnlib, so tell other modules about it.  */
 #define HAVE_JNLIB_LOGGING 1
 

commit 6ce54a18c2a625b89d5453129d5b9d1ad9d59473
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 1 11:03:24 2013 +0200

    w32: Change autogen.sh to use npth.
    
    --

diff --git a/autogen.sh b/autogen.sh
index dcb3834..935a456 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -170,7 +170,7 @@ if [ "$myhost" = "w32" ]; then
 	     --with-libassuan-prefix=${w32root} \
 	     --with-zlib=${w32root} \
 	     --with-regex=${w32root} \
-             --with-pth-prefix=${w32root} \
+             --with-npth-prefix=${w32root} \
              --with-adns=${w32root} \
              ${extraoptions} --disable-g13 "$@"
     rc=$?

commit ef2e2e54020c3475bf2129c3ec8360c7bad3a6c9
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 1 11:02:03 2013 +0200

    dirmngr: Define missing LDAP constant
    
    * dirmngr/ldap-url.c (LDAP_SCOPE_DEFAULT): Define if missing.

diff --git a/dirmngr/ldap-url.c b/dirmngr/ldap-url.c
index 2dc186b..e5a7d94 100644
--- a/dirmngr/ldap-url.c
+++ b/dirmngr/ldap-url.c
@@ -96,6 +96,11 @@ software is provided `'as is'' without express or implied warranty.  */
 void ldap_pvt_hex_unescape( char *s );
 
 
+#ifndef LDAP_SCOPE_DEFAULT
+# define LDAP_SCOPE_DEFAULT -1
+#endif
+
+
 

 /* $OpenLDAP: pkg/ldap/libraries/libldap/charray.c,v 1.9.2.2 2003/03/03 17:10:04 kurt Exp $ */
 /*

commit 25b0357bf0a4861a751cfbc3e0335ae05c8b2b1b
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 1 11:01:01 2013 +0200

    scd: Fix a syntax error for Apple and Windows.
    
    * scd/apdu.c (pcsc_dword_t) [W32]: Fix syntax error.

diff --git a/scd/apdu.c b/scd/apdu.c
index 92c9864..133058d 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -83,7 +83,7 @@
 #endif
 
 #if defined(__APPLE__) || defined(_WIN32) || defined(__CYGWIN__)
-typedef unsinged int pcsc_dword_t;
+typedef unsigned int pcsc_dword_t;
 #else
 typedef unsigned long pcsc_dword_t;
 #endif

commit ffa7472db551f12f66b9789c31fabb5fc80cc13a
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 1 10:30:27 2013 +0200

    common: Fix a build error when using adns.
    
    * common/dns-cert.c (get_dns_cert) [USE_ADNS]: Fix synatx error.
    --
    
    (fixes commit 31f548a18aed729c05ea367f2d8a8104480430d5)
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/dns-cert.c b/common/dns-cert.c
index 114e61d..dca15b1 100644
--- a/common/dns-cert.c
+++ b/common/dns-cert.c
@@ -148,7 +148,7 @@ get_dns_cert (const char *name, estream_t *r_key,
           goto leave;
         }
       else if (ctype == CERTTYPE_IPGP && datalen && datalen < 1023
-               && datalen >= data[0] + 1 && fpr && fpr_len && url)
+               && datalen >= data[0] + 1 && r_fpr && r_fprlen && r_url)
         {
           /* CERT type is IPGP.  We made sure that the data is
              plausible and that the caller requested this
@@ -170,7 +170,7 @@ get_dns_cert (const char *name, estream_t *r_key,
 
           if (datalen > *r_fprlen + 1)
             {
-              *url = xtrymalloc (datalen - (*r_fprlen + 1) + 1);
+              *r_url = xtrymalloc (datalen - (*r_fprlen + 1) + 1);
               if (!*r_url)
                 {
                   err = gpg_err_make (default_errsource,
@@ -179,8 +179,9 @@ get_dns_cert (const char *name, estream_t *r_key,
                   *r_fpr = NULL;
                   goto leave;
                 }
-              memcpy (*url, data + (*r_fprlen + 1), datalen - (*r_fprlen + 1));
-              (*url)[datalen - (*r_fprlen + 1)] = '\0';
+              memcpy (*r_url,
+                      data + (*r_fprlen + 1), datalen - (*r_fprlen + 1));
+              (*r_url)[datalen - (*r_fprlen + 1)] = '\0';
             }
           else
             *r_url = NULL;

commit f101f34fffee4a02e7a5f62b59667e45e50e8325
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jul 31 16:15:01 2013 +0200

    common: Comment out unused code.
    
    * common/w32-reg.c (write_w32_registry_string): Comment out.

diff --git a/common/w32-reg.c b/common/w32-reg.c
index d3cb815..3ef7a0a 100644
--- a/common/w32-reg.c
+++ b/common/w32-reg.c
@@ -225,6 +225,7 @@ read_w32_registry_string (const char *root, const char *dir, const char *name)
 
 /* Note: This code is not well tested.  However, it is not used in
    GnuPG.  */
+#if 0
 int
 write_w32_registry_string (const char *root, const char *dir,
                            const char *name, const char *value)
@@ -319,5 +320,5 @@ write_w32_registry_string (const char *root, const char *dir,
   return 0;
 #endif /*!HAVE_W32CE_SYSTEM*/
 }
-
+#endif /*0*/
 #endif /*HAVE_W32_SYSTEM*/
diff --git a/common/w32help.h b/common/w32help.h
index 50eda67..b9b7c44 100644
--- a/common/w32help.h
+++ b/common/w32help.h
@@ -35,9 +35,6 @@
 /*-- w32-reg.c --*/
 char *read_w32_registry_string (const char *root,
 				const char *dir, const char *name );
-int write_w32_registry_string (const char *root, const char *dir,
-                               const char *name, const char *value);
-
 
 /* Other stuff.  */
 #ifdef HAVE_W32CE_SYSTEM

commit 2830fcb83c99289a49da0e111766daf2d9a1fa3b
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jul 31 16:14:00 2013 +0200

    dirmngr: Remove unused file.
    
    * dirmngr/get-path.c: Remove.

diff --git a/dirmngr/get-path.c b/dirmngr/get-path.c
deleted file mode 100644
index e5a1fdf..0000000
--- a/dirmngr/get-path.c
+++ /dev/null
@@ -1,620 +0,0 @@
-/* get-path.c - Utility functions for the W32 API
-   Copyright (C) 1999 Free Software Foundation, Inc
-   Copyright (C) 2001 Werner Koch (dd9jn)
-   Copyright (C) 2001, 2002, 2003, 2004, 2007 g10 Code GmbH
-
-   This file is part of DirMngr.
-
-   DirMngr 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.
-
-   DirMngr 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  */
-
-#error Code has been replaced by common/homedir.c
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <errno.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <fcntl.h>
-#ifdef HAVE_W32_SYSTEM
-#include <windows.h>
-#include <shlobj.h>
-#include <io.h>
-#endif
-
-#include "util.h"
-
-#ifdef HAVE_W32_SYSTEM
-#define GNUPG_DEFAULT_HOMEDIR "c:/gnupg"
-#elif defined(__VMS)
-#define GNUPG_DEFAULT_HOMEDIR "/SYS\$LOGIN/gnupg"
-#else
-#define GNUPG_DEFAULT_HOMEDIR "~/.gnupg"
-#endif
-
-#ifdef HAVE_DOSISH_SYSTEM
-#define DIRSEP_C '\\'
-#define DIRSEP_S "\\"
-#else
-#define DIRSEP_C '/'
-#define DIRSEP_S "/"
-#endif
-
-

-#ifdef HAVE_W32_SYSTEM
-#define RTLD_LAZY 0
-
-static __inline__ void *
-dlopen (const char * name, int flag)
-{
-  void * hd = LoadLibrary (name);
-  return hd;
-}
-
-static __inline__ void *
-dlsym (void * hd, const char * sym)
-{
-  if (hd && sym)
-    {
-      void * fnc = GetProcAddress (hd, sym);
-      if (!fnc)
-        return NULL;
-      return fnc;
-    }
-  return NULL;
-}
-
-static __inline__ int
-dlclose (void * hd)
-{
-  if (hd)
-    {
-      FreeLibrary (hd);
-      return 0;
-    }
-  return -1;
-}
-
-
-/* Return a string from the W32 Registry or NULL in case of error.
-   Caller must release the return value.  A NULL for root is an alias
-   for HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE in turn. */
-static char *
-read_w32_registry_string (const char *root, const char *dir, const char *name)
-{
-  HKEY root_key, key_handle;
-  DWORD n1, nbytes, type;
-  char *result = NULL;
-
-  if ( !root )
-    root_key = HKEY_CURRENT_USER;
-  else if ( !strcmp( root, "HKEY_CLASSES_ROOT" ) )
-    root_key = HKEY_CLASSES_ROOT;
-  else if ( !strcmp( root, "HKEY_CURRENT_USER" ) )
-    root_key = HKEY_CURRENT_USER;
-  else if ( !strcmp( root, "HKEY_LOCAL_MACHINE" ) )
-    root_key = HKEY_LOCAL_MACHINE;
-  else if ( !strcmp( root, "HKEY_USERS" ) )
-    root_key = HKEY_USERS;
-  else if ( !strcmp( root, "HKEY_PERFORMANCE_DATA" ) )
-    root_key = HKEY_PERFORMANCE_DATA;
-  else if ( !strcmp( root, "HKEY_CURRENT_CONFIG" ) )
-    root_key = HKEY_CURRENT_CONFIG;
-  else
-    return NULL;
-
-  if ( RegOpenKeyEx ( root_key, dir, 0, KEY_READ, &key_handle ) )
-    {
-      if (root)
-        return NULL; /* no need for a RegClose, so return direct */
-      /* It seems to be common practise to fall back to HKLM. */
-      if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, dir, 0, KEY_READ, &key_handle) )
-        return NULL; /* still no need for a RegClose, so return direct */
-    }
-
-  nbytes = 1;
-  if ( RegQueryValueEx( key_handle, name, 0, NULL, NULL, &nbytes ) )
-    {
-      if (root)
-        goto leave;
-      /* Try to fallback to HKLM also vor a missing value.  */
-      RegCloseKey (key_handle);
-      if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, dir, 0, KEY_READ, &key_handle) )
-        return NULL; /* Nope.  */
-      if (RegQueryValueEx ( key_handle, name, 0, NULL, NULL, &nbytes))
-        goto leave;
-    }
-  result = malloc ( (n1=nbytes+1) );
-  if ( !result )
-    goto leave;
-  if ( RegQueryValueEx ( key_handle, name, 0, &type, result, &n1 ) )
-    {
-      free(result); result = NULL;
-      goto leave;
-    }
-  result[nbytes] = 0; /* Make sure it is really a string.  */
-  if (type == REG_EXPAND_SZ && strchr (result, '%'))
-    {
-      char *tmp;
-
-      n1 += 1000;
-      tmp = malloc (n1+1);
-      if (!tmp)
-        goto leave;
-      nbytes = ExpandEnvironmentStrings (result, tmp, n1);
-      if (nbytes && nbytes > n1)
-        {
-          free (tmp);
-          n1 = nbytes;
-          tmp = malloc (n1 + 1);
-          if (!tmp)
-            goto leave;
-          nbytes = ExpandEnvironmentStrings (result, tmp, n1);
-          if (nbytes && nbytes > n1) {
-            free (tmp); /* Oops - truncated, better don't expand at all. */
-            goto leave;
-          }
-          tmp[nbytes] = 0;
-          free (result);
-          result = tmp;
-        }
-      else if (nbytes)  /* Okay, reduce the length. */
-        {
-          tmp[nbytes] = 0;
-          free (result);
-          result = malloc (strlen (tmp)+1);
-          if (!result)
-            result = tmp;
-          else
-            {
-              strcpy (result, tmp);
-              free (tmp);
-            }
-        }
-      else  /* Error - don't expand. */
-        {
-          free (tmp);
-        }
-    }
-
- leave:
-  RegCloseKey( key_handle );
-  return result;
-}
-
-
-/* This is a helper function to load and run a Windows function from
-   either of one DLLs. */
-static HRESULT
-w32_shgetfolderpath (HWND a, int b, HANDLE c, DWORD d, LPSTR e)
-{
-  static int initialized;
-  static HRESULT (WINAPI * func)(HWND,int,HANDLE,DWORD,LPSTR);
-
-  if (!initialized)
-    {
-      static char *dllnames[] = { "shell32.dll", "shfolder.dll", NULL };
-      void *handle;
-      int i;
-
-      initialized = 1;
-
-      for (i=0, handle = NULL; !handle && dllnames[i]; i++)
-        {
-          handle = dlopen (dllnames[i], RTLD_LAZY);
-          if (handle)
-            {
-              func = dlsym (handle, "SHGetFolderPathA");
-              if (!func)
-                {
-                  dlclose (handle);
-                  handle = NULL;
-                }
-            }
-        }
-    }
-
-  if (func)
-    return func (a,b,c,d,e);
-  else
-    return -1;
-}
-
-
-#if 0
-static char *
-find_program_in_inst_dir (const char *name)
-{
-  char *result = NULL;
-  char *tmp;
-
-  tmp = read_w32_registry_string ("HKEY_LOCAL_MACHINE",
-				  "Software\\GNU\\GnuPG",
-				  "Install Directory");
-  if (!tmp)
-    return NULL;
-
-  result = malloc (strlen (tmp) + 1 + strlen (name) + 1);
-  if (!result)
-    {
-      free (tmp);
-      return NULL;
-    }
-
-  strcpy (stpcpy (stpcpy (result, tmp), "\\"), name);
-  free (tmp);
-  if (access (result, F_OK))
-    {
-      free (result);
-      return NULL;
-    }
-
-  return result;
-}
-
-
-static char *
-find_program_at_standard_place (const char *name)
-{
-  char path[MAX_PATH];
-  char *result = NULL;
-
-  if (w32_shgetfolderpath (NULL, CSIDL_PROGRAM_FILES, NULL, 0, path) >= 0)
-    {
-      result = malloc (strlen (path) + 1 + strlen (name) + 1);
-      if (result)
-        {
-          strcpy (stpcpy (stpcpy (result, path), "\\"), name);
-          if (access (result, F_OK))
-            {
-              free (result);
-              result = NULL;
-            }
-        }
-    }
-  return result;
-}
-#endif
-#endif
-
-
-const char *
-get_dirmngr_ldap_path (void)
-{
-  static char *pgmname;
-
-#ifdef HAVE_W32_SYSTEM
-  if (! pgmname)
-    {
-      const char *dir = dirmngr_libexecdir ();
-      const char *exe = "\\dirmngr_ldap.exe";
-      pgmname = malloc (strlen (dir) + strlen (exe) + 1);
-      if (pgmname)
-	strcpy (stpcpy (pgmname, dir), exe);
-    }
-#endif
-  if (!pgmname)
-    pgmname = DIRMNGR_LIBEXECDIR "/dirmngr_ldap";
-  return pgmname;
-}
-
-
-

-/* Home directory.  */
-
-#ifdef HAVE_W32_SYSTEM
-#ifndef CSIDL_APPDATA
-#define CSIDL_APPDATA 0x001a
-#endif
-#ifndef CSIDL_LOCAL_APPDATA
-#define CSIDL_LOCAL_APPDATA 0x001c
-#endif
-#ifndef CSIDL_COMMON_APPDATA
-#define CSIDL_COMMON_APPDATA 0x0023
-#endif
-#ifndef CSIDL_FLAG_CREATE
-#define CSIDL_FLAG_CREATE 0x8000
-#endif
-#endif /*HAVE_W32_SYSTEM*/
-
-/* Get the standard home directory.  In general this function should
-   not be used as it does not consider a registry value (under W32) or
-   the GNUPGHOME environment variable.  It is better to use
-   default_homedir(). */
-const char *
-standard_homedir (void)
-{
-#ifdef HAVE_W32_SYSTEM
-  static const char *dir;
-
-  if (!dir)
-    {
-      char path[MAX_PATH];
-
-      /* It might be better to use LOCAL_APPDATA because this is
-         defined as "non roaming" and thus more likely to be kept
-         locally.  For private keys this is desired.  However, given
-         that many users copy private keys anyway forth and back,
-         using a system roaming services might be better than to let
-         them do it manually.  A security conscious user will anyway
-         use the registry entry to have better control.  */
-      if (w32_shgetfolderpath (NULL, CSIDL_APPDATA|CSIDL_FLAG_CREATE,
-                               NULL, 0, path) >= 0)
-        {
-          char *tmp = xmalloc (strlen (path) + 6 +1);
-          strcpy (stpcpy (tmp, path), "\\gnupg");
-          dir = tmp;
-
-          /* Try to create the directory if it does not yet exists.  */
-          if (access (dir, F_OK))
-            CreateDirectory (dir, NULL);
-        }
-      else
-        dir = GNUPG_DEFAULT_HOMEDIR;
-    }
-  return dir;
-#else/*!HAVE_W32_SYSTEM*/
-  return GNUPG_DEFAULT_HOMEDIR;
-#endif /*!HAVE_W32_SYSTEM*/
-}
-
-/* Set up the default home directory.  The usual --homedir option
-   should be parsed later. */
-const char *
-default_homedir (void)
-{
-  const char *dir;
-
-  dir = getenv ("GNUPGHOME");
-#ifdef HAVE_W32_SYSTEM
-  if (!dir || !*dir)
-    {
-      static const char *saved_dir;
-
-      if (!saved_dir)
-        {
-          if (!dir || !*dir)
-            {
-              char *tmp;
-
-              tmp = read_w32_registry_string (NULL, "Software\\GNU\\GnuPG",
-                                              "HomeDir");
-              if (tmp && *tmp)
-                {
-                  xfree (tmp);
-                  tmp = NULL;
-                }
-               if (tmp)
-                saved_dir = tmp;
-            }
-
-          if (!saved_dir)
-            saved_dir = standard_homedir ();
-        }
-      dir = saved_dir;
-    }
-#endif /*HAVE_W32_SYSTEM*/
-  if (!dir || !*dir)
-    dir = GNUPG_DEFAULT_HOMEDIR;
-
-  return dir;
-}
-
-
-#ifdef HAVE_W32_SYSTEM
-static const char *
-w32_rootdir (void)
-{
-  static int got_dir;
-  static char dir[MAX_PATH+5];
-
-  if (!got_dir)
-    {
-      char *p;
-
-      if ( !GetModuleFileName ( NULL, dir, MAX_PATH) )
-        {
-          log_debug ("GetModuleFileName failed: %s\n", w32_strerror (0));
-          *dir = 0;
-        }
-      got_dir = 1;
-      p = strrchr (dir, DIRSEP_C);
-      if (p)
-        *p = 0;
-      else
-        {
-          log_debug ("bad filename '%s' returned for this process\n", dir);
-          *dir = 0;
-        }
-    }
-
-  if (*dir)
-    return dir;
-  /* Fallback to the hardwired value. */
-  return DIRMNGR_LIBEXECDIR;
-}
-
-static const char *
-w32_commondir (void)
-{
-  static char *dir;
-
-  if (!dir)
-    {
-      char path[MAX_PATH];
-
-      if (w32_shgetfolderpath (NULL, CSIDL_COMMON_APPDATA,
-                               NULL, 0, path) >= 0)
-        {
-          char *tmp = xmalloc (strlen (path) + 4 +1);
-          strcpy (stpcpy (tmp, path), "\\GNU");
-          dir = tmp;
-          /* No auto create of the directory.  Either the installer or
-             the admin has to create these directories.  */
-        }
-      else
-        {
-          /* Ooops: Not defined - probably an old Windows version.
-             Use the installation directory instead.  */
-          dir = xstrdup (w32_rootdir ());
-        }
-    }
-
-  return dir;
-}
-#endif /*HAVE_W32_SYSTEM*/
-
-
-
-
-/* Return the name of the sysconfdir.  This is a static string.  This
-   function is required because under Windows we can't simply compile
-   it in.  */
-const char *
-dirmngr_sysconfdir (void)
-{
-#ifdef HAVE_W32_SYSTEM
-  static char *name;
-
-  if (!name)
-    {
-      const char *s1, *s2;
-      s1 = w32_commondir ();
-      s2 = DIRSEP_S "etc" DIRSEP_S "dirmngr";
-      name = xmalloc (strlen (s1) + strlen (s2) + 1);
-      strcpy (stpcpy (name, s1), s2);
-    }
-  return name;
-#else /*!HAVE_W32_SYSTEM*/
-  return DIRMNGR_SYSCONFDIR;
-#endif /*!HAVE_W32_SYSTEM*/
-}
-
-
-/* Return the name of the libexec directory.  The name is allocated in
-   a static area on the first use.  This function won't fail. */
-const char *
-dirmngr_libexecdir (void)
-{
-#ifdef HAVE_W32_SYSTEM
-  return w32_rootdir ();
-#else /*!HAVE_W32_SYSTEM*/
-  return DIRMNGR_LIBEXECDIR;
-#endif /*!HAVE_W32_SYSTEM*/
-}
-
-
-const char *
-dirmngr_datadir (void)
-{
-#ifdef HAVE_W32_SYSTEM
-  static char *name;
-
-  if (!name)
-    {
-      const char *s1, *s2;
-      s1 = w32_commondir ();
-      s2 = DIRSEP_S "lib" DIRSEP_S "dirmngr";
-      name = xmalloc (strlen (s1) + strlen (s2) + 1);
-      strcpy (stpcpy (name, s1), s2);
-    }
-  return name;
-#else /*!HAVE_W32_SYSTEM*/
-  return DIRMNGR_DATADIR;
-#endif /*!HAVE_W32_SYSTEM*/
-}
-
-
-const char *
-dirmngr_cachedir (void)
-{
-#ifdef HAVE_W32_SYSTEM
-  static const char *dir;
-
-  if (!dir)
-    {
-      char path[MAX_PATH];
-      const char *s1[] = { "GNU", "cache", "dirmngr", NULL };
-      int s1_len;
-      const char **comp;
-
-      s1_len = 0;
-      for (comp = s1; *comp; comp++)
-	{
-	  /* Take account for the separator.  */
-	  s1_len += 1 + strlen (*comp);
-	}
-
-      if (w32_shgetfolderpath (NULL, CSIDL_LOCAL_APPDATA|CSIDL_FLAG_CREATE,
-                               NULL, 0, path) >= 0)
-        {
-          char *tmp = xmalloc (strlen (path) + s1_len + 1);
-	  char *p;
-
-	  p = stpcpy (tmp, path);
-          for (comp = s1; *comp; comp++)
-	    {
-	      p = stpcpy (p, "\\");
-	      p = stpcpy (p, *comp);
-
-	      if (access (tmp, F_OK))
-		CreateDirectory (tmp, NULL);
-	    }
-
-          dir = tmp;
-        }
-      else
-        dir = "c:\\temp\\cache\\dirmngr";
-    }
-  return dir;
-#else /*!HAVE_W32_SYSTEM*/
-  return DIRMNGR_CACHEDIR;
-#endif /*!HAVE_W32_SYSTEM*/
-}
-
-
-const char *
-default_socket_name (void)
-{
-#ifdef HAVE_W32_SYSTEM
-  static char *name;
-
-  if (!name)
-    {
-      char s1[MAX_PATH];
-      const char *s2;
-
-      /* We need something akin CSIDL_COMMON_PROGRAMS, but local
-	 (non-roaming).  This is becuase the file needs to be on the
-	 local machine and makes only sense on that machine.
-	 CSIDL_WINDOWS seems to be the only location which guarantees
-	 that. */
-      if (w32_shgetfolderpath (NULL, CSIDL_WINDOWS, NULL, 0, s1) < 0)
-	strcpy (s1, "C:\\WINDOWS");
-      s2 = DIRSEP_S "S.dirmngr";
-      name = xmalloc (strlen (s1) + strlen (s2) + 1);
-      strcpy (stpcpy (name, s1), s2);
-    }
-  return name;
-#else /*!HAVE_W32_SYSTEM*/
-  return DIRMNGR_SOCKETDIR "/socket";
-#endif /*!HAVE_W32_SYSTEM*/
-}

commit f254497e09fa4e0e24e63d14f7316fc31c938844
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jun 27 11:40:12 2013 +0200

    sm: Remove cruft from source files.
    
    * sm/keydb.c, sm/keydb.h: Remove disabled code parts.

diff --git a/sm/keydb.c b/sm/keydb.c
index 6912b42..de9c95c 100644
--- a/sm/keydb.c
+++ b/sm/keydb.c
@@ -477,113 +477,6 @@ unlock_all (KEYDB_HANDLE hd)
 }
 
 

-#if 0
-/*
- * Return the last found keybox.  Caller must free it.
- * The returned keyblock has the kbode flag bit 0 set for the node with
- * the public key used to locate the keyblock or flag bit 1 set for
- * the user ID node.
- */
-int
-keydb_get_keyblock (KEYDB_HANDLE hd, KBNODE *ret_kb)
-{
-    int rc = 0;
-
-    if (!hd)
-        return G10ERR_INV_ARG;
-
-    if ( hd->found < 0 || hd->found >= hd->used)
-        return -1; /* nothing found */
-
-    switch (hd->active[hd->found].type) {
-      case KEYDB_RESOURCE_TYPE_NONE:
-        rc = G10ERR_GENERAL; /* oops */
-        break;
-      case KEYDB_RESOURCE_TYPE_KEYBOX:
-        rc = keybox_get_keyblock (hd->active[hd->found].u.kr, ret_kb);
-        break;
-    }
-
-    return rc;
-}
-
-/*
- * update the current keyblock with KB
- */
-int
-keydb_update_keyblock (KEYDB_HANDLE hd, KBNODE kb)
-{
-    int rc = 0;
-
-    if (!hd)
-        return G10ERR_INV_ARG;
-
-    if ( hd->found < 0 || hd->found >= hd->used)
-        return -1; /* nothing found */
-
-    if( opt.dry_run )
-	return 0;
-
-    if (!hd->locked)
-      return gpg_error (GPG_ERR_NOT_LOCKED);
-
-    switch (hd->active[hd->found].type) {
-      case KEYDB_RESOURCE_TYPE_NONE:
-        rc = G10ERR_GENERAL; /* oops */
-        break;
-      case KEYDB_RESOURCE_TYPE_KEYBOX:
-        rc = keybox_update_keyblock (hd->active[hd->found].u.kr, kb);
-        break;
-    }
-
-    unlock_all (hd);
-    return rc;
-}
-
-
-/*
- * Insert a new KB into one of the resources.
- */
-int
-keydb_insert_keyblock (KEYDB_HANDLE hd, KBNODE kb)
-{
-    int rc = -1;
-    int idx;
-
-    if (!hd)
-        return G10ERR_INV_ARG;
-
-    if( opt.dry_run )
-	return 0;
-
-    if ( hd->found >= 0 && hd->found < hd->used)
-        idx = hd->found;
-    else if ( hd->current >= 0 && hd->current < hd->used)
-        idx = hd->current;
-    else
-        return G10ERR_GENERAL;
-
-    rc = lock_all (hd);
-    if (rc)
-        return rc;
-
-    switch (hd->active[idx].type) {
-      case KEYDB_RESOURCE_TYPE_NONE:
-        rc = G10ERR_GENERAL; /* oops */
-        break;
-      case KEYDB_RESOURCE_TYPE_KEYBOX:
-        rc = keybox_insert_keyblock (hd->active[idx].u.kr, kb);
-        break;
-    }
-
-    unlock_all (hd);
-    return rc;
-}
-
-#endif /*disabled code*/
-
-
-

 /*
   Return the last found object.  Caller must free it.  The returned
   keyblock has the kbode flag bit 0 set for the node with the public
diff --git a/sm/keydb.h b/sm/keydb.h
index 33876ce..6e432f8 100644
--- a/sm/keydb.h
+++ b/sm/keydb.h
@@ -39,12 +39,6 @@ int keydb_set_ephemeral (KEYDB_HANDLE hd, int yes);
 const char *keydb_get_resource_name (KEYDB_HANDLE hd);
 gpg_error_t keydb_lock (KEYDB_HANDLE hd);
 
-#if 0 /* pgp stuff */
-int keydb_get_keyblock (KEYDB_HANDLE hd, KBNODE *ret_kb);
-int keydb_update_keyblock (KEYDB_HANDLE hd, KBNODE kb);
-int keydb_insert_keyblock (KEYDB_HANDLE hd, KBNODE kb);
-#endif
-
 gpg_error_t keydb_get_flags (KEYDB_HANDLE hd, int which, int idx,
                              unsigned int *value);
 gpg_error_t keydb_set_flags (KEYDB_HANDLE hd, int which, int idx,

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

Summary of changes:
 NEWS                 |    4 +-
 agent/protect.c      |    1 +
 autogen.sh           |    2 +-
 common/dns-cert.c    |    9 +-
 common/homedir.c     |  241 +++++++++++++++-----
 common/logging.c     |   16 ++-
 common/logging.h     |    1 +
 common/w32-reg.c     |    3 +-
 common/w32help.h     |    3 -
 configure.ac         |    3 +
 dirmngr/get-path.c   |  620 --------------------------------------------------
 dirmngr/ldap-url.c   |    5 +
 doc/opt-homedir.texi |   14 +-
 scd/apdu.c           |    2 +-
 sm/keydb.c           |  107 ---------
 sm/keydb.h           |    6 -
 16 files changed, 232 insertions(+), 805 deletions(-)
 delete mode 100644 dirmngr/get-path.c


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



From cvs at cvs.gnupg.org  Thu Aug  1 15:26:13 2013
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Thu, 01 Aug 2013 15:26:13 +0200
Subject: [git] GpgOL - branch, master, updated. gpgol-1.1.3-47-ge5f2b3f
Message-ID: <E1V4sRc-0000oF-75@lists.gnupg.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".

The branch, master has been updated
       via  e5f2b3f718ab56c1ecc0528d9117cbdd953815f6 (commit)
       via  bce68bff2375e9a2a756074aade51542a341d7e2 (commit)
      from  1b5a49b6039d86989f5154ea0fd6e45d9c912d37 (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 e5f2b3f718ab56c1ecc0528d9117cbdd953815f6
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Aug 1 12:55:33 2013 +0000

    Fix accessing uninitialized memory
    
        When called to decrypt the full body the wordApplication,
        wordEditor and selection would be uninitalized and
        but when they are not NULL they would still be released in
        the end.
    
        * src/ribbon-callbacks.cpp (decryptInspector): Initialize
        dispatcher pointers.

diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index 1f0ac46..529cdf2 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -445,11 +445,11 @@ decryptAttachments (LPDISPATCH ctrl)
 HRESULT
 decryptInspector (LPDISPATCH ctrl, int flags)
 {
-  LPDISPATCH context;
-  LPDISPATCH selection;
-  LPDISPATCH wordEditor;
-  LPDISPATCH mailItem;
-  LPDISPATCH wordApplication;
+  LPDISPATCH context = NULL;
+  LPDISPATCH selection = NULL;
+  LPDISPATCH wordEditor = NULL;
+  LPDISPATCH mailItem = NULL;
+  LPDISPATCH wordApplication = NULL;
 
   struct sink_s decsinkmem;
   sink_t decsink = &decsinkmem;

commit bce68bff2375e9a2a756074aade51542a341d7e2
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Jul 31 14:27:32 2013 +0000

    Factor out recipient lookup and some cleanups
    
        * src/oomhelp.cpp, src/oomhelp.h (get_oom_recipients): New.
        * src/ribbon-callbacks.cpp (encrypt_inspector): Move out
        recipient handling code. Fix indentation.
        (decrypt_inspector): Clean up some comments.

diff --git a/src/oomhelp.cpp b/src/oomhelp.cpp
index 73270f2..21be27f 100644
--- a/src/oomhelp.cpp
+++ b/src/oomhelp.cpp
@@ -789,3 +789,38 @@ get_oom_context_window (LPDISPATCH context)
   return ret;
 }
 
+/* Gets a malloced NULL terminated array of recipent strings from
+   an OOM recipients Object. */
+char **
+get_oom_recipients (LPDISPATCH recipients)
+{
+  int recipientsCnt = get_oom_int (recipients, "Count");
+  char **recipientAddrs = NULL;
+  int i;
+
+  if (!recipientsCnt)
+    {
+      return NULL;
+    }
+
+  /* Get the recipients */
+  recipientAddrs = (char**) xmalloc((recipientsCnt + 1) * sizeof(char*));
+  recipientAddrs[recipientsCnt] = NULL;
+  for (i = 1; i <= recipientsCnt; i++)
+    {
+      char buf[16];
+      LPDISPATCH recipient;
+      snprintf (buf, sizeof (buf), "Item(%i)", i);
+      recipient = get_oom_object (recipients, buf);
+      if (!recipient)
+        {
+          /* Should be impossible */
+          recipientAddrs[i-1] = NULL;
+          log_error ("%s:%s: could not find Item %i;",
+                     SRCNAME, __func__, i);
+          break;
+        }
+      recipientAddrs[i-1] = get_oom_string (recipient, "Address");
+    }
+  return recipientAddrs;
+}
diff --git a/src/oomhelp.h b/src/oomhelp.h
index 1f62cbf..231c27d 100644
--- a/src/oomhelp.h
+++ b/src/oomhelp.h
@@ -121,6 +121,10 @@ void del_oom_button (LPDISPATCH button);
 /* Get the HWND of the active window in the current context */
 HWND get_oom_context_window (LPDISPATCH context);
 
+/* Get the address of the recipients as string list */
+char **
+get_oom_recipients (LPDISPATCH recipients);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index 2b6d809..1f0ac46 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -81,12 +81,12 @@ encryptInspector (LPDISPATCH ctrl, int flags)
   struct sink_s sinkmem;
   sink_t sink = &sinkmem;
   char* senderAddr = NULL;
+  char** recipientAddrs = NULL;
   LPSTREAM tmpstream = NULL;
   engine_filter_t filter = NULL;
   char* plaintext = NULL;
   int rc = 0;
   HRESULT hr;
-  int recipientsCnt;
   HWND curWindow;
   protocol_t protocol;
   unsigned int session_number;
@@ -128,7 +128,6 @@ encryptInspector (LPDISPATCH ctrl, int flags)
 
       if (!plaintext || strlen (plaintext) <= 1)
         {
-          /* TODO more usable if we just use all text in this case? */
           MessageBox (NULL,
                       _("Please select text to encrypt."),
                       _("GpgOL"),
@@ -141,7 +140,6 @@ encryptInspector (LPDISPATCH ctrl, int flags)
       plaintext = get_oom_string (mailItem, "Body");
       if (!plaintext || strlen (plaintext) <= 1)
         {
-          /* TODO more usable if we just use all text in this case? */
           MessageBox (NULL,
                       _("Textbody empty."),
                       _("GpgOL"),
@@ -169,9 +167,9 @@ encryptInspector (LPDISPATCH ctrl, int flags)
 
   senderAddr = get_oom_string (sender, "Address");
 
-  recipientsCnt = get_oom_int (recipients, "Count");
+  recipientAddrs = get_oom_recipients (recipients);
 
-  if (!recipientsCnt)
+  if (!recipientAddrs || !(*recipientAddrs))
     {
       MessageBox (NULL,
                   _("Please add at least one recipent."),
@@ -180,92 +178,64 @@ encryptInspector (LPDISPATCH ctrl, int flags)
       goto failure;
     }
 
-  {
-    /* Get the recipients */
-    char *recipientAddrs[recipientsCnt + 1];
-    recipientAddrs[recipientsCnt] = NULL;
-    for (i = 1; i <= recipientsCnt; i++)
-      {
-        char buf[16];
-        LPDISPATCH recipient;
-        snprintf (buf, sizeof (buf), "Item(%i)", i);
-        recipient = get_oom_object (recipients, buf);
-        if (!recipient)
-          {
-            /* Should be impossible */
-            recipientAddrs[i-1] = NULL;
-            log_error ("%s:%s: could not find Item %i;",
-                       SRCNAME, __func__, i);
-            break;
-          }
-        recipientAddrs[i-1] = get_oom_string (recipient, "Address");
-      }
-
-    /* Not lets prepare our encryption */
-    session_number = engine_new_session_number ();
+  /* Now lets prepare our encryption */
+  session_number = engine_new_session_number ();
 
-    /* Prepare the encryption sink */
+  /* Prepare the encryption sink */
 
-    if (engine_create_filter (&filter, write_buffer_for_cb, sink))
-      {
-        for (i = 0; i < recipientsCnt; i++)
-          xfree (recipientAddrs[i]);
-        goto failure;
-      }
+  if (engine_create_filter (&filter, write_buffer_for_cb, sink))
+    {
+      goto failure;
+    }
 
-    encsink->cb_data = filter;
-    encsink->writefnc = sink_encryption_write;
+  encsink->cb_data = filter;
+  encsink->writefnc = sink_encryption_write;
 
-    engine_set_session_number (filter, session_number);
-    engine_set_session_title (filter, _("GpgOL"));
+  engine_set_session_number (filter, session_number);
+  engine_set_session_title (filter, _("GpgOL"));
 
-    if ((rc=engine_encrypt_prepare (filter, curWindow,
-                                    PROTOCOL_UNKNOWN,
-                                    0 /* ENGINE_FLAG_SIGN_FOLLOWS */,
-                                    senderAddr, recipientAddrs, &protocol)))
-      {
-        for (i = 0; i < recipientsCnt; i++)
-          xfree (recipientAddrs[i]);
-        log_error ("%s:%s: engine encrypt prepare failed : %s",
-                   SRCNAME, __func__, gpg_strerror (rc));
-        goto failure;
-      }
-    for (i = 0; i < recipientsCnt; i++)
-      xfree (recipientAddrs[i]);
+  if ((rc=engine_encrypt_prepare (filter, curWindow,
+                                  PROTOCOL_UNKNOWN,
+                                  0 /* ENGINE_FLAG_SIGN_FOLLOWS */,
+                                  senderAddr, recipientAddrs, &protocol)))
+    {
+      log_error ("%s:%s: engine encrypt prepare failed : %s",
+                 SRCNAME, __func__, gpg_strerror (rc));
+      goto failure;
+    }
 
-    /* lets go */
+  /* lets go */
 
-    if ((rc=engine_encrypt_start (filter, 0)))
-      {
-        log_error ("%s:%s: engine encrypt start failed: %s",
-                   SRCNAME, __func__, gpg_strerror (rc));
-        goto failure;
-      }
+  if ((rc=engine_encrypt_start (filter, 0)))
+    {
+      log_error ("%s:%s: engine encrypt start failed: %s",
+                 SRCNAME, __func__, gpg_strerror (rc));
+      goto failure;
+    }
 
-    /* Write the text in the encryption sink. */
-    rc = write_buffer (encsink, plaintext, strlen (plaintext));
+  /* Write the text in the encryption sink. */
+  rc = write_buffer (encsink, plaintext, strlen (plaintext));
 
-    if (rc)
-      {
-        log_error ("%s:%s: writing tmpstream to encsink failed: %s",
-                   SRCNAME, __func__, gpg_strerror (rc));
-        goto failure;
-      }
-    /* Flush the encryption sink and wait for the encryption to get
-       ready.  */
-    if ((rc = write_buffer (encsink, NULL, 0)))
-      goto failure;
-    if ((rc = engine_wait (filter)))
+  if (rc)
+    {
+      log_error ("%s:%s: writing tmpstream to encsink failed: %s",
+                 SRCNAME, __func__, gpg_strerror (rc));
       goto failure;
-    filter = NULL; /* Not valid anymore.  */
-    encsink->cb_data = NULL; /* Not needed anymore.  */
+    }
+  /* Flush the encryption sink and wait for the encryption to get
+     ready.  */
+  if ((rc = write_buffer (encsink, NULL, 0)))
+    goto failure;
+  if ((rc = engine_wait (filter)))
+    goto failure;
+  filter = NULL; /* Not valid anymore.  */
+  encsink->cb_data = NULL; /* Not needed anymore.  */
 
-    if (!sink->enc_counter)
-      {
-        log_debug ("%s:%s: nothing received from engine", SRCNAME, __func__);
-        goto failure;
-      }
-  }
+  if (!sink->enc_counter)
+    {
+      log_debug ("%s:%s: nothing received from engine", SRCNAME, __func__);
+      goto failure;
+    }
 
   /* Check the size of the encrypted data */
   tmpstream->Stat (&tmpStat, 0);
@@ -344,7 +314,7 @@ encryptInspector (LPDISPATCH ctrl, int flags)
       }
   }
 
- failure:
+failure:
   if (rc)
     log_debug ("%s:%s: failed rc=%d (%s) <%s>", SRCNAME, __func__, rc,
                gpg_strerror (rc), gpg_strsource (rc));
@@ -358,6 +328,11 @@ encryptInspector (LPDISPATCH ctrl, int flags)
   RELDISP(tmpstream);
   xfree (plaintext);
   xfree (senderAddr);
+  while (recipientAddrs && *recipientAddrs)
+  {
+    xfree (*recipientAddrs++);
+  }
+  xfree (recipientAddrs);
 
   return S_OK;
 }
@@ -610,7 +585,7 @@ decryptInspector (LPDISPATCH ctrl, int flags)
   /* Write the text in the decryption sink. */
   rc = write_buffer (decsink, encData, encDataLen);
 
-  /* Flush the decryption sink and wait for the encryption to get
+  /* Flush the decryption sink and wait for the decryption to get
      ready.  */
   if ((rc = write_buffer (decsink, NULL, 0)))
     goto failure;
@@ -635,7 +610,7 @@ decryptInspector (LPDISPATCH ctrl, int flags)
       goto failure;
     }
 
-  /* Copy the encrypted stream to the message editor.  */
+  /* Copy the decrypted stream to the message editor.  */
   {
     LARGE_INTEGER off;
     ULONG nread;
@@ -660,7 +635,7 @@ decryptInspector (LPDISPATCH ctrl, int flags)
       }
     if (strlen (buffer) > 1)
       {
-        /* Now replace the crypto data with the encData or show it
+        /* Now replace the crypto data with the decrypted data or show it
         somehow.*/
         int err;
         if (flags & DECRYPT_INSPECTOR_SELECTION)

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

Summary of changes:
 src/oomhelp.cpp          |   35 +++++++++++
 src/oomhelp.h            |    4 +
 src/ribbon-callbacks.cpp |  153 +++++++++++++++++++---------------------------
 3 files changed, 103 insertions(+), 89 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Aug  1 15:38:04 2013
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Thu, 01 Aug 2013 15:38:04 +0200
Subject: [git] GpgOL - branch, master, updated. gpgol-1.1.3-48-g1a9124f
Message-ID: <E1V4sd4-0000ud-Sl@lists.gnupg.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".

The branch, master has been updated
       via  1a9124f08d88a4549623b45146870fe7125ab60d (commit)
      from  e5f2b3f718ab56c1ecc0528d9117cbdd953815f6 (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 1a9124f08d88a4549623b45146870fe7125ab60d
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Aug 1 13:05:45 2013 +0000

    Be more agressive in fix linebreaks
    
        This now replaces all consecutive break indicating characters
        by a single \n.
    
        * src/common.c (fix_linebreaks): Replace all consecutive
        linebreaks.
    
    --
        There are problems that some messages can not be decrypted because
        the line endings are so messed up. \r\r\n\r\r\n is an example
        of a line break I get when I've sent an encrypted message with
        KMail. Outlook shows only one break but returns that if you
        access the body over the OOM.

diff --git a/src/common.c b/src/common.c
index f458b15..9818ae5 100644
--- a/src/common.c
+++ b/src/common.c
@@ -1023,10 +1023,11 @@ percent_escape (const char *str, const char *extra)
 }
 
 /* Fix linebreaks.
-   This either removes the \r if it is followed by a \n
-   or replaces it by a \n. This is neccessary because
-   Micrsoft Word buffers appearently use only the \r
-   to indicate line breaks.
+   This replaces all consecutive \r or \n characters
+   by a single \n.
+   There can be extremly weird combinations of linebreaks
+   like \r\r\n\r\r\n at the end of each line when
+   getting the body of a mail message.
 */
 void
 fix_linebreaks (char *str, int *len)
@@ -1038,11 +1039,17 @@ fix_linebreaks (char *str, int *len)
   dst = str;
   while (*src)
     {
-      if (src[0] == '\r' && src[1] == '\n')
-        src++;
-      else if (src[0] == '\r')
-        src[0] = '\n';
-      *(dst++) = *(src++);
+      if (*src == '\r' || *src == '\n')
+        {
+          do
+            src++;
+          while (*src == '\r' || *src == '\n');
+          *(dst++) = '\n';
+        }
+      else
+        {
+          *(dst++) = *(src++);
+        }
     }
   *dst = '\0';
   *len = dst - str;

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

Summary of changes:
 src/common.c |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Aug  1 20:22:28 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Thu, 01 Aug 2013 20:22:28 +0200
Subject: [git] GnuPG - branch, STABLE-BRANCH-2-0,
 updated. gnupg-2.0.20-23-g4f90c7b
Message-ID: <E1V4x4H-0005oI-E6@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-0 has been updated
       via  4f90c7b914693b72341fa1e93dda7e075f9717c0 (commit)
       via  aff557409cde6ee38ac086046d9bb5eb2dc5c95b (commit)
       via  1b89863ec195dbfdbc33432569a7b2e7f0f83821 (commit)
      from  c3a57d767719a58ec791a0791842bcc80c859081 (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 4f90c7b914693b72341fa1e93dda7e075f9717c0
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 1 19:50:52 2013 +0200

    w32: Add code to support a portable use of GnuPG.
    
    * common/homedir.c (w32_bin_is_bin, w32_portable_app) [W32]: New.
    (check_portable_app) [W32]: New.
    (standard_homedir, default_homedir) [W32]: Support the portable flag.
    (w32_rootdir, w32_commondir) [W32]: Ditto.
    (gnupg_bindir) [W32]: Ditto.
    --
    
    A portable use of GnuPG under Windows means that GnuPG uses a home
    directory depending on the location of the actual binary.  No registry
    variables are considered.  The portable mode is enabled if in the
    installation directory of the the binary "gpgconf.exe" and a file
    "gpgconf.ctl" are found.  The latter file shall be empty or consist
    only of empty or '#'-style comment lines.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/NEWS b/NEWS
index 782a54b..990e241 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,8 @@ Noteworthy changes in version 2.0.21 (unreleased)
  * The new option --enable-putty-support allows gpg-agent on Windows
    to act as a Pageant replacement with full smartcard support.
 
+ * Support installation as portable application under Windows.
+
 
 Noteworthy changes in version 2.0.20 (2013-05-10)
 -------------------------------------------------
diff --git a/common/homedir.c b/common/homedir.c
index 5adf46a..4b03cfe 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -1,5 +1,6 @@
 /* homedir.c - Setup the home directory.
- *	Copyright (C) 2004, 2006, 2007 Free Software Foundation, Inc.
+ * Copyright (C) 2004, 2006, 2007 Free Software Foundation, Inc.
+ * Copyright (C) 2013 Werner Koch
  *
  * This file is part of GnuPG.
  *
@@ -47,6 +48,33 @@
 #include "sysutils.h"
 
 
+#ifdef HAVE_W32_SYSTEM
+/* A flag used to indicate that a control file for gpgconf has been
+   detected.  Under Windows the presence of this file indicates a
+   portable installations and triggers several changes:
+
+   - The GNUGHOME directory is fixed relative to installation
+     directory.  All other means to set the home directory are
+     ignored.
+
+   - All registry variables are ignored.
+
+   This flag is not used on Unix systems.
+ */
+static int w32_portable_app;
+
+/* This flag is true if this process' binary has been installed under
+   bin and not in the root directory. */
+static int w32_bin_is_bin;
+
+/* Just a little prototype.  */
+static const char *w32_rootdir (void);
+
+#endif /*HAVE_W32_SYSTEM*/
+
+
+
+
 /* This is a helper function to load a Windows function from either of
    one DLLs. */
 #ifdef HAVE_W32_SYSTEM
@@ -99,28 +127,39 @@ standard_homedir (void)
 
   if (!dir)
     {
-      char path[MAX_PATH];
+      const char *rdir;
 
-      /* It might be better to use LOCAL_APPDATA because this is
-         defined as "non roaming" and thus more likely to be kept
-         locally.  For private keys this is desired.  However, given
-         that many users copy private keys anyway forth and back,
-         using a system roaming services might be better than to let
-         them do it manually.  A security conscious user will anyway
-         use the registry entry to have better control.  */
-      if (w32_shgetfolderpath (NULL, CSIDL_APPDATA|CSIDL_FLAG_CREATE,
-                               NULL, 0, path) >= 0)
+      rdir = w32_rootdir ();
+      if (w32_portable_app)
         {
-          char *tmp = xmalloc (strlen (path) + 6 +1);
-          strcpy (stpcpy (tmp, path), "\\gnupg");
-          dir = tmp;
-
-          /* Try to create the directory if it does not yet exists.  */
-          if (access (dir, F_OK))
-            CreateDirectory (dir, NULL);
+          dir = xstrconcat (rdir, DIRSEP_S "home", NULL);
         }
       else
-        dir = GNUPG_DEFAULT_HOMEDIR;
+        {
+          char path[MAX_PATH];
+
+          /* It might be better to use LOCAL_APPDATA because this is
+             defined as "non roaming" and thus more likely to be kept
+             locally.  For private keys this is desired.  However,
+             given that many users copy private keys anyway forth and
+             back, using a system roaming services might be better
+             than to let them do it manually.  A security conscious
+             user will anyway use the registry entry to have better
+             control.  */
+          if (w32_shgetfolderpath (NULL, CSIDL_APPDATA|CSIDL_FLAG_CREATE,
+                                   NULL, 0, path) >= 0)
+            {
+              char *tmp = xmalloc (strlen (path) + 6 +1);
+              strcpy (stpcpy (tmp, path), "\\gnupg");
+              dir = tmp;
+
+              /* Try to create the directory if it does not yet exists.  */
+              if (access (dir, F_OK))
+                CreateDirectory (dir, NULL);
+            }
+          else
+            dir = GNUPG_DEFAULT_HOMEDIR;
+        }
     }
   return dir;
 #else/*!HAVE_W32_SYSTEM*/
@@ -135,6 +174,13 @@ default_homedir (void)
 {
   const char *dir;
 
+#ifdef HAVE_W32_SYSTEM
+  /* For a portable application we only use the standard homedir.  */
+  w32_rootdir ();
+  if (w32_portable_app)
+    return standard_homedir ();
+#endif /*HAVE_W32_SYSTEM*/
+
   dir = getenv ("GNUPGHOME");
 #ifdef HAVE_W32_SYSTEM
   if (!dir || !*dir)
@@ -172,6 +218,31 @@ default_homedir (void)
 
 
 #ifdef HAVE_W32_SYSTEM
+/* Check whether gpgconf is installed and if so read the gpgconf.ctl
+   file. */
+static void
+check_portable_app (const char *dir)
+{
+  char *fname;
+
+  fname = xstrconcat (dir, DIRSEP_S "gpgconf.exe", NULL);
+  if (access (fname, F_OK))
+    log_error ("required binary '%s' is not installed\n", fname);
+  else
+    {
+      strcpy (fname + strlen (fname) - 3, "ctl");
+      if (!access (fname, F_OK))
+        {
+          /* gpgconf.ctl file found.  Record this fact.  */
+          w32_portable_app = 1;
+
+          /* FIXME: We should read the file to detect special flags
+             and print a warning if we don't understand them.  */
+        }
+    }
+  xfree (fname);
+}
+
 static const char *
 w32_rootdir (void)
 {
@@ -190,8 +261,22 @@ w32_rootdir (void)
       got_dir = 1;
       p = strrchr (dir, DIRSEP_C);
       if (p)
-        *p = 0;
-      else
+        {
+          *p = 0;
+
+          check_portable_app (dir);
+
+          /* If we are installed below "bin" we strip that and use
+             the top directory instead.  */
+          p = strrchr (dir, DIRSEP_C);
+
+          if (p && !strcmp (p+1, "bin"))
+            {
+              *p = 0;
+              w32_bin_is_bin = 1;
+            }
+        }
+      if (!p)
         {
           log_debug ("bad filename `%s' returned for this process\n", dir);
           *dir = 0;
@@ -211,8 +296,17 @@ w32_commondir (void)
 
   if (!dir)
     {
+      const char *rdir;
       char path[MAX_PATH];
 
+      /* Make sure that w32_rootdir has been called so that we are
+         able to check the portable application flag.  The common dir
+         is identical to the rootdir.  In that case there is also no
+         need to strdup its value.  */
+      rdir = w32_rootdir ();
+      if (w32_portable_app)
+        return rdir;
+
       if (w32_shgetfolderpath (NULL, CSIDL_COMMON_APPDATA,
                                NULL, 0, path) >= 0)
         {
@@ -226,7 +320,7 @@ w32_commondir (void)
         {
           /* Ooops: Not defined - probably an old Windows version.
              Use the installation directory instead.  */
-          dir = xstrdup (w32_rootdir ());
+          dir = xstrdup (rdir);
         }
     }
 
@@ -235,8 +329,6 @@ w32_commondir (void)
 #endif /*HAVE_W32_SYSTEM*/
 
 
-
-
 /* Return the name of the sysconfdir.  This is a static string.  This
    function is required because under Windows we can't simply compile
    it in.  */
@@ -265,7 +357,19 @@ const char *
 gnupg_bindir (void)
 {
 #ifdef HAVE_W32_SYSTEM
-  return w32_rootdir ();
+  const char *rdir;
+
+  rdir = w32_rootdir ();
+  if (w32_bin_is_bin)
+    {
+      static char *name;
+
+      if (!name)
+        name = xstrconcat (rdir, DIRSEP_S "bin", NULL);
+      return name;
+    }
+  else
+    return rdir;
 #else /*!HAVE_W32_SYSTEM*/
   return GNUPG_BINDIR;
 #endif /*!HAVE_W32_SYSTEM*/
@@ -278,7 +382,7 @@ const char *
 gnupg_libexecdir (void)
 {
 #ifdef HAVE_W32_SYSTEM
-  return w32_rootdir ();
+  return gnupg_bindir ();
 #else /*!HAVE_W32_SYSTEM*/
   return GNUPG_LIBEXECDIR;
 #endif /*!HAVE_W32_SYSTEM*/
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index dcd96fb..f832b8e 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -449,6 +449,16 @@ Do not make use of the scdaemon tool.  This option has the effect of
 disabling the ability to do smartcard operations.  Note, that enabling
 this option at runtime does not kill an already forked scdaemon.
 
+ at ifset gpgtwoone
+ at item --disable-check-own-socket
+ at opindex disable-check-own-socket
+ at command{gpg-agent} employs a periodic self-test to detect a stolen
+socket.  This usually means a second instance of @command{gpg-agent}
+has taken over the socket and @command{gpg-agent} will then terminate
+itself.  This option may be used to disable this self-test for
+debugging purposes.
+ at end ifset
+
 @item --use-standard-socket
 @itemx --no-use-standard-socket
 @opindex use-standard-socket
@@ -695,14 +705,16 @@ Here is a list of supported signals:
 @item SIGHUP
 @cpindex SIGHUP
 This signal flushes all cached passphrases and if the program has been
-started with a configuration file, the configuration file is read again.
-Only certain options are honored: @code{quiet}, @code{verbose},
- at code{debug}, @code{debug-all}, @code{debug-level}, @code{no-grab},
- at code{pinentry-program}, @code{default-cache-ttl}, @code{max-cache-ttl},
- at code{ignore-cache-for-signing}, @code{allow-mark-trusted} and
- at code{disable-scdaemon}.  @code{scdaemon-program} is also supported but
-due to the current implementation, which calls the scdaemon only once,
-it is not of much use unless you manually kill the scdaemon.
+started with a configuration file, the configuration file is read
+again.  Only certain options are honored: @code{quiet},
+ at code{verbose}, @code{debug}, @code{debug-all}, @code{debug-level},
+ at code{no-grab}, @code{pinentry-program}, @code{default-cache-ttl},
+ at code{max-cache-ttl}, @code{ignore-cache-for-signing},
+ at code{allow-mark-trusted}, @code{disable-scdaemon}, and
+ at code{disable-check-own-socket}.  @code{scdaemon-program} is also
+supported but due to the current implementation, which calls the
+scdaemon only once, it is not of much use unless you manually kill the
+scdaemon.
 
 
 @item SIGTERM

commit aff557409cde6ee38ac086046d9bb5eb2dc5c95b
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 1 19:48:00 2013 +0200

    w32: Always require libiconv.
    
    * configure.ac (missing_iconv): Set and die if we have no libiconv.
    * m4/iconv.m4: Update from libiconv 1.14.
    * tools/Makefile.am (gpgtar_LDADD): Add LIBICONV.
    * jnlib/utf8conv.c: Always include iconv.h
    (load_libiconv): Remove this w32 only function.
    (iconv_open, iconv, iconv_close): Remove W32 function pointer.
    (set_native_charset): Do not call load_libiconv.
    (jnlib_iconv_open, jnlib_iconv, jnlib_iconv_close): Ditto.
    --
    
    This patch removes the on-demand-loading of libiconv which we did for
    13 years or so.  The rationale back then was that libiconv is too
    large and often not used.  Nowadays all kind of Unix software has been
    ported to Windows and many of them require libiconv.  Thus in the end
    there is no saving from not requiring it.  It also remove a common
    source of trouble with awrong or missing iconv.dll.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/autogen.sh b/autogen.sh
index b81a6b2..605babf 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -94,6 +94,7 @@ if test "$1" = "--build-w32"; then
 	     --with-zlib=${w32root} \
 	     --with-regex=${w32root} \
              --with-pth-prefix=${w32root} \
+             --with-libiconv-prefix=${w32root} \
              --with-adns=${w32root} "$@"
     rc=$?
     exit $rc
diff --git a/configure.ac b/configure.ac
index 702b8d3..4080699 100644
--- a/configure.ac
+++ b/configure.ac
@@ -979,7 +979,11 @@ AC_DEFINE_UNQUOTED(PRINTABLE_OS_NAME, "$PRINTABLE_OS_NAME",
 #
 # Checking for iconv
 #
+missing_iconv=no
 AM_ICONV
+if test "$am_cv_func_iconv" != yes; then
+   missing_iconv=yes
+fi
 
 
 #
@@ -1498,6 +1502,14 @@ if test "$missing_pth" = "yes"; then
 ***]])
    die=yes
 fi
+if test "$missing_iconv" = "yes"; then
+    AC_MSG_NOTICE([[
+***
+*** It is now required to build with support for iconv
+*** Please install a suitable iconv implementation.
+***]])
+   die=yes
+fi
 
 if test "$die" = "yes"; then
     AC_MSG_ERROR([[
diff --git a/jnlib/utf8conv.c b/jnlib/utf8conv.c
index fee4dc6..b5cf6a8 100644
--- a/jnlib/utf8conv.c
+++ b/jnlib/utf8conv.c
@@ -27,9 +27,7 @@
 #include <langinfo.h>
 #endif
 #include <errno.h>
-#ifndef HAVE_W32_SYSTEM
-# include <iconv.h>
-#endif
+#include <iconv.h>
 
 #include "libjnlib-config.h"
 #include "stringhelp.h"
@@ -45,59 +43,6 @@ static int no_translation;     /* Set to true if we let simply pass through. */
 static int use_iconv;          /* iconv comversion fucntions required. */
 
 
-/* Under W32 we dlopen the iconv dll and don't require any iconv
-   related headers at all.  However we need to define some stuff.  */
-#ifdef HAVE_W32_SYSTEM
-typedef void *iconv_t;
-#ifndef ICONV_CONST
-#define ICONV_CONST const 
-#endif
-static iconv_t (* __stdcall iconv_open) (const char *tocode,
-                                         const char *fromcode);
-static size_t  (* __stdcall iconv) (iconv_t cd,
-                                    const char **inbuf, size_t *inbytesleft,
-                                    char **outbuf, size_t *outbytesleft);
-static int     (* __stdcall iconv_close) (iconv_t cd);
-
-static int 
-load_libiconv (void)
-{
-  static int done;
-  
-  if (!done)
-    {
-      void *handle;
-
-      done = 1; /* Do it right now because we might get called recursivly
-                   through gettext.  */
-    
-      handle = dlopen ("iconv.dll", RTLD_LAZY);
-      if (handle)
-        {
-          iconv_open  = dlsym (handle, "libiconv_open");
-          if (iconv_open)
-            iconv = dlsym (handle, "libiconv");
-          if (iconv)    
-            iconv_close = dlsym (handle, "libiconv_close");
-        }
-      if (!handle || !iconv_close)
-        {
-          log_info (_("error loading `%s': %s\n"),
-                     "iconv.dll",  dlerror ());
-          log_info (_("please see %s for more information\n"),
-                    "http://www.gnupg.org/download/iconv.html");
-          iconv_open = NULL;
-          iconv = NULL;
-          iconv_close = NULL;
-          if (handle)
-            dlclose (handle);
-        }
-    }
-  return iconv_open? 0: -1;
-}    
-#endif /*HAVE_W32_SYSTEM*/
-
-
 /* Error handler for iconv failures. This is needed to not clutter the
    output with repeated diagnostics about a missing conversion. */
 static void
@@ -152,13 +97,13 @@ set_native_charset (const char *newset)
 {
   const char *full_newset;
 
-  if (!newset) 
+  if (!newset)
     {
 #ifdef HAVE_W32_SYSTEM
       static char codepage[30];
       unsigned int cpno;
       const char *aliases;
-      
+
       /* We are a console program thus we need to use the
          GetConsoleOutputCP function and not the the GetACP which
          would give the codepage for a GUI program.  Note this is not
@@ -201,7 +146,7 @@ set_native_charset (const char *newset)
         }
 
 #else /*!HAVE_W32_SYSTEM*/
-      
+
 #ifdef HAVE_LANGINFO_CODESET
       newset = nl_langinfo (CODESET);
 #else /*!HAVE_LANGINFO_CODESET*/
@@ -225,7 +170,7 @@ set_native_charset (const char *newset)
               mod = strchr (++dot, '@');
               if (!mod)
                 mod = dot + strlen (dot);
-              if (mod - dot < sizeof codepage && dot != mod) 
+              if (mod - dot < sizeof codepage && dot != mod)
                 {
                   memcpy (codepage, dot, mod - dot);
                   codepage [mod - dot] = 0;
@@ -272,21 +217,16 @@ set_native_charset (const char *newset)
   else
     {
       iconv_t cd;
-      
-#ifdef HAVE_W32_SYSTEM
-      if (load_libiconv ())
-        return -1;
-#endif /*HAVE_W32_SYSTEM*/      
 
       cd = iconv_open (full_newset, "utf-8");
-      if (cd == (iconv_t)-1) 
+      if (cd == (iconv_t)-1)
         {
           handle_iconv_error (full_newset, "utf-8", 0);
           return -1;
         }
       iconv_close (cd);
       cd = iconv_open ("utf-8", full_newset);
-      if (cd == (iconv_t)-1) 
+      if (cd == (iconv_t)-1)
         {
           handle_iconv_error ("utf-8", full_newset, 0);
           return -1;
@@ -306,7 +246,7 @@ get_native_charset ()
 }
 
 /* Return true if the native charset is utf-8.  */
-int 
+int
 is_native_utf8 (void)
 {
   return no_translation;
@@ -353,13 +293,13 @@ native_to_utf8 (const char *orig_string)
       *p = 0;
     }
   else
-    { 
+    {
       /* Need to use iconv.  */
       iconv_t cd;
       const char *inptr;
       char *outptr;
       size_t inbytes, outbytes;
-     
+
       cd = iconv_open ("utf-8", active_charset_name);
       if (cd == (iconv_t)-1)
         {
@@ -367,14 +307,14 @@ native_to_utf8 (const char *orig_string)
           return native_to_utf8 (string);
         }
 
-      for (s=string; *s; s++ ) 
+      for (s=string; *s; s++ )
         {
           length++;
           if ((*s & 0x80))
             length += 5; /* We may need up to 6 bytes for the utf8 output. */
         }
       buffer = jnlib_xmalloc (length + 1);
-      
+
       inptr = string;
       inbytes = strlen (string);
       outptr = buffer;
@@ -448,10 +388,10 @@ do_utf8_to_native (const char *string, size_t length, int delim,
 	  if (!nleft)
 	    {
 	      if (!(*s & 0x80))
-		{	
+		{
                   /* Plain ascii. */
 		  if ( delim != -1
-                       && (*s < 0x20 || *s == 0x7f || *s == delim 
+                       && (*s < 0x20 || *s == 0x7f || *s == delim
                            || (delim && *s == '\\')))
 		    {
 		      n++;
@@ -490,35 +430,35 @@ do_utf8_to_native (const char *string, size_t length, int delim,
 		  encbuf[encidx++] = *s;
 		}
 	      else if ((*s & 0xf0) == 0xe0) /* 1110 xxxx */
-		{	
+		{
 		  val = *s & 0x0f;
 		  nleft = 2;
 		  encidx = 0;
 		  encbuf[encidx++] = *s;
 		}
 	      else if ((*s & 0xf8) == 0xf0) /* 1111 0xxx */
-		{	
+		{
 		  val = *s & 0x07;
 		  nleft = 3;
 		  encidx = 0;
 		  encbuf[encidx++] = *s;
 		}
 	      else if ((*s & 0xfc) == 0xf8) /* 1111 10xx */
-		{	
+		{
 		  val = *s & 0x03;
 		  nleft = 4;
 		  encidx = 0;
 		  encbuf[encidx++] = *s;
 		}
 	      else if ((*s & 0xfe) == 0xfc) /* 1111 110x */
-		{		
+		{
 		  val = *s & 0x01;
 		  nleft = 5;
 		  encidx = 0;
 		  encbuf[encidx++] = *s;
 		}
 	      else /* Invalid encoding: print as \xNN. */
-		{		
+		{
 		  if (p)
 		    {
 		      sprintf (p, "\\x%02x", *s);
@@ -551,7 +491,7 @@ do_utf8_to_native (const char *string, size_t length, int delim,
 	      val <<= 6;
 	      val |= *s & 0x3f;
 	      if (!--nleft)  /* Ready. */
-		{ 
+		{
 		  if (no_translation)
 		    {
 		      if (p)
@@ -590,12 +530,12 @@ do_utf8_to_native (const char *string, size_t length, int delim,
 		      if (val >= 0x80 && val < 256)
 			{
                           /* We can simply print this character */
-			  n++;	
+			  n++;
 			  if (p)
 			    *p++ = val;
 			}
 		      else
-			{	
+			{
                           /* We do not have a translation: print utf8. */
 			  if (p)
 			    {
@@ -625,7 +565,7 @@ do_utf8_to_native (const char *string, size_t length, int delim,
           const char *inptr;
           char *outbuf, *outptr;
           size_t inbytes, outbytes;
-          
+
           *p = 0;  /* Terminate the buffer. */
 
           cd = iconv_open (active_charset_name, "utf-8");
@@ -642,14 +582,14 @@ do_utf8_to_native (const char *string, size_t length, int delim,
           inbytes = n - 1;;
           inptr = buffer;
           outbytes = n * MB_LEN_MAX;
-          if (outbytes / MB_LEN_MAX != n) 
+          if (outbytes / MB_LEN_MAX != n)
             BUG (); /* Actually an overflow. */
           outbuf = outptr = jnlib_xmalloc (outbytes);
           if ( iconv (cd, (ICONV_CONST char **)&inptr, &inbytes,
-                      &outptr, &outbytes) == (size_t)-1) 
+                      &outptr, &outbytes) == (size_t)-1)
             {
               static int shown;
-              
+
               if (!shown)
                 log_info (_("conversion from `%s' to `%s' failed: %s\n"),
                           "utf-8", active_charset_name, strerror (errno));
@@ -661,7 +601,7 @@ do_utf8_to_native (const char *string, size_t length, int delim,
               outbuf = do_utf8_to_native (string, length, delim, 0);
             }
             else /* Success.  */
-              { 
+              {
                 *outptr = 0; /* Make sure it is a string. */
                 /* We could realloc the buffer now but I doubt that it
                    makes much sense given that it will get freed
@@ -694,45 +634,29 @@ utf8_to_native (const char *string, size_t length, int delim)
 
 
 
-/* Wrapper function for iconv_open, required for W32 as we dlopen that
-   library on that system.  */
-jnlib_iconv_t 
+/* Wrapper function for iconv_open, formerly required for W32 as we
+   used to dlopen that library on that system.  */
+jnlib_iconv_t
 jnlib_iconv_open (const char *tocode, const char *fromcode)
 {
-#ifdef HAVE_W32_SYSTEM
-  if (load_libiconv ())
-    return (jnlib_iconv_t)(-1);
-#endif /*HAVE_W32_SYSTEM*/      
-
   return (jnlib_iconv_t)iconv_open (tocode, fromcode);
 }
 
 
-/* Wrapper function for iconv, required for W32 as we dlopen that
-   library on that system.  */
+/* Wrapper function for iconv, formerly required for W32 as we used to
+   dlopen that library on that system.  */
 size_t
 jnlib_iconv (jnlib_iconv_t cd,
              const char **inbuf, size_t *inbytesleft,
              char **outbuf, size_t *outbytesleft)
 {
-
-#ifdef HAVE_W32_SYSTEM
-  if (load_libiconv ())
-    return 0;
-#endif /*HAVE_W32_SYSTEM*/      
-
   return iconv ((iconv_t)cd, (char**)inbuf, inbytesleft, outbuf, outbytesleft);
 }
 
-/* Wrapper function for iconv_close, required for W32 as we dlopen that
-   library on that system.  */
+/* Wrapper function for iconv_close, formerly required for W32 as we
+   used to dlopen that library on that system.  */
 int
 jnlib_iconv_close (jnlib_iconv_t cd)
 {
-#ifdef HAVE_W32_SYSTEM
-  if (load_libiconv ())
-    return 0;
-#endif /*HAVE_W32_SYSTEM*/      
-
   return iconv_close ((iconv_t)cd);
 }
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index 66bc76f..085cd06 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -1,5 +1,5 @@
-# iconv.m4 serial AM6 (gettext-0.17)
-dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc.
+# iconv.m4 serial 17 (gettext-0.18.2)
+dnl Copyright (C) 2000-2002, 2007-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -30,44 +30,55 @@ AC_DEFUN([AM_ICONV_LINK],
   dnl Add $INCICONV to CPPFLAGS before performing the following checks,
   dnl because if the user has installed libiconv and not disabled its use
   dnl via --without-libiconv-prefix, he wants to use it. The first
-  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
+  dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
   am_save_CPPFLAGS="$CPPFLAGS"
   AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
 
-  AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [
+  AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
-    AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-      [iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);],
-      am_cv_func_iconv=yes)
+    AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM(
+         [[
+#include <stdlib.h>
+#include <iconv.h>
+         ]],
+         [[iconv_t cd = iconv_open("","");
+           iconv(cd,NULL,NULL,NULL,NULL);
+           iconv_close(cd);]])],
+      [am_cv_func_iconv=yes])
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
-      AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-        [iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);],
-        am_cv_lib_iconv=yes
-        am_cv_func_iconv=yes)
+      AC_LINK_IFELSE(
+        [AC_LANG_PROGRAM(
+           [[
+#include <stdlib.h>
+#include <iconv.h>
+           ]],
+           [[iconv_t cd = iconv_open("","");
+             iconv(cd,NULL,NULL,NULL,NULL);
+             iconv_close(cd);]])],
+        [am_cv_lib_iconv=yes]
+        [am_cv_func_iconv=yes])
       LIBS="$am_save_LIBS"
     fi
   ])
   if test "$am_cv_func_iconv" = yes; then
-    AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [
-      dnl This tests against bugs in AIX 5.1 and HP-UX 11.11.
+    AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
+      dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
+      dnl Solaris 10.
       am_save_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
-      AC_TRY_RUN([
+      AC_RUN_IFELSE(
+        [AC_LANG_SOURCE([[
 #include <iconv.h>
 #include <string.h>
 int main ()
 {
+  int result = 0;
   /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
      returns.  */
   {
@@ -84,7 +95,47 @@ int main ()
                             (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          return 1;
+          result |= 1;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
+  /* Test against Solaris 10 bug: Failures are not distinguishable from
+     successful returns.  */
+  {
+    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
+    if (cd_ascii_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\263";
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_ascii_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 2;
+        iconv_close (cd_ascii_to_88591);
+      }
+  }
+  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304";
+        static char buf[2] = { (char)0xDE, (char)0xAD };
+        const char *inptr = input;
+        size_t inbytesleft = 1;
+        char *outptr = buf;
+        size_t outbytesleft = 1;
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
+          result |= 4;
+        iconv_close (cd_88591_to_utf8);
       }
   }
 #if 0 /* This bug could be worked around by the caller.  */
@@ -103,7 +154,8 @@ int main ()
                             (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if ((int)res > 0)
-          return 1;
+          result |= 8;
+        iconv_close (cd_88591_to_utf8);
       }
   }
 #endif
@@ -117,13 +169,19 @@ int main ()
       && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
       /* Try HP-UX names.  */
       && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    return 1;
-  return 0;
-}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
-        [case "$host_os" in
+    result |= 16;
+  return result;
+}]])],
+        [am_cv_func_iconv_works=yes],
+        [am_cv_func_iconv_works=no],
+        [
+changequote(,)dnl
+         case "$host_os" in
            aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
            *)            am_cv_func_iconv_works="guessing yes" ;;
-         esac])
+         esac
+changequote([,])dnl
+        ])
       LIBS="$am_save_LIBS"
     ])
     case "$am_cv_func_iconv_works" in
@@ -134,7 +192,7 @@ int main ()
     am_func_iconv=no am_cv_lib_iconv=no
   fi
   if test "$am_func_iconv" = yes; then
-    AC_DEFINE(HAVE_ICONV, 1,
+    AC_DEFINE([HAVE_ICONV], [1],
       [Define if you have the iconv() function and it works.])
   fi
   if test "$am_cv_lib_iconv" = yes; then
@@ -147,17 +205,37 @@ int main ()
     LIBICONV=
     LTLIBICONV=
   fi
-  AC_SUBST(LIBICONV)
-  AC_SUBST(LTLIBICONV)
+  AC_SUBST([LIBICONV])
+  AC_SUBST([LTLIBICONV])
 ])
 
-AC_DEFUN([AM_ICONV],
+dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
+dnl avoid warnings like
+dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
+dnl This is tricky because of the way 'aclocal' is implemented:
+dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
+dnl   Otherwise aclocal's initial scan pass would miss the macro definition.
+dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
+dnl   Otherwise aclocal would emit many "Use of uninitialized value $1"
+dnl   warnings.
+m4_define([gl_iconv_AC_DEFUN],
+  m4_version_prereq([2.64],
+    [[AC_DEFUN_ONCE(
+        [$1], [$2])]],
+    [m4_ifdef([gl_00GNULIB],
+       [[AC_DEFUN_ONCE(
+           [$1], [$2])]],
+       [[AC_DEFUN(
+           [$1], [$2])]])]))
+gl_iconv_AC_DEFUN([AM_ICONV],
 [
   AM_ICONV_LINK
   if test "$am_cv_func_iconv" = yes; then
     AC_MSG_CHECKING([for iconv declaration])
-    AC_CACHE_VAL(am_cv_proto_iconv, [
-      AC_TRY_COMPILE([
+    AC_CACHE_VAL([am_cv_proto_iconv], [
+      AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM(
+           [[
 #include <stdlib.h>
 #include <iconv.h>
 extern
@@ -169,12 +247,22 @@ size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, si
 #else
 size_t iconv();
 #endif
-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
+           ]],
+           [[]])],
+        [am_cv_proto_iconv_arg1=""],
+        [am_cv_proto_iconv_arg1="const"])
       am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
     am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    AC_MSG_RESULT([$]{ac_t:-
-         }[$]am_cv_proto_iconv)
-    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
+    AC_MSG_RESULT([
+         $am_cv_proto_iconv])
+    AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
       [Define as const if the declaration of iconv() needs const.])
+    dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
+    m4_ifdef([gl_ICONV_H_DEFAULTS],
+      [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
+       if test -n "$am_cv_proto_iconv_arg1"; then
+         ICONV_CONST="const"
+       fi
+      ])
   fi
 ])
diff --git a/tools/Makefile.am b/tools/Makefile.am
index bacdaf3..a94fbcd 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -118,7 +118,8 @@ gpgtar_SOURCES = \
 	gpgtar-list.c \
 	no-libgcrypt.c
 gpgtar_CFLAGS = $(GPG_ERROR_CFLAGS) $(PTH_CFLAGS)
-gpgtar_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(W32SOCKLIBS)
+gpgtar_LDADD = $(common_libs) $(GPG_ERROR_LIBS) \
+               $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS)
 
 # Make sure that all libs are build before we use them.  This is
 # important for things like make -j2.

commit 1b89863ec195dbfdbc33432569a7b2e7f0f83821
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 1 14:02:50 2013 +0200

    w32: Remove unused code.
    
    * jnlib/w32-reg.c (write_w32_registry_string): Remove.

diff --git a/jnlib/w32-reg.c b/jnlib/w32-reg.c
index a6e2395..e55f806 100644
--- a/jnlib/w32-reg.c
+++ b/jnlib/w32-reg.c
@@ -148,38 +148,4 @@ read_w32_registry_string (const char *root, const char *dir, const char *name)
 }
 
 
-int
-write_w32_registry_string (const char *root, const char *dir,
-                           const char *name, const char *value)
-{
-  HKEY root_key, reg_key;
-
-  if ( !(root_key = get_root_key(root) ) )
-    return -1;
-
-  if ( RegOpenKeyEx( root_key, dir, 0, KEY_WRITE, &reg_key )
-       != ERROR_SUCCESS )
-    return -1;
-
-  if ( RegSetValueEx (reg_key, name, 0, REG_SZ, (BYTE *)value,
-                      strlen( value ) ) != ERROR_SUCCESS )
-    {
-      if ( RegCreateKey( root_key, name, &reg_key ) != ERROR_SUCCESS )
-        {
-          RegCloseKey(reg_key);
-          return -1;
-        }
-      if ( RegSetValueEx (reg_key, name, 0, REG_SZ, (BYTE *)value,
-                          strlen( value ) ) != ERROR_SUCCESS )
-        {
-          RegCloseKey(reg_key);
-          return -1;
-        }
-    }
-
-  RegCloseKey (reg_key);
-
-  return 0;
-}
-
 #endif /*HAVE_W32_SYSTEM*/
diff --git a/jnlib/w32help.h b/jnlib/w32help.h
index c503ad2..c7aa5cb 100644
--- a/jnlib/w32help.h
+++ b/jnlib/w32help.h
@@ -24,8 +24,6 @@
 /*-- w32-reg.c --*/
 char *read_w32_registry_string (const char *root,
 				const char *dir, const char *name );
-int write_w32_registry_string (const char *root, const char *dir,
-                               const char *name, const char *value);
 
 #ifdef USE_SIMPLE_GETTEXT
 char *bindtextdomain (const char *domainname, const char *dirname);

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

Summary of changes:
 NEWS               |    2 +
 autogen.sh         |    1 +
 common/homedir.c   |  156 +++++++++++++++++++++++++++++++++++++++++--------
 configure.ac       |   12 ++++
 doc/gpg-agent.texi |   28 +++++++---
 jnlib/utf8conv.c   |  144 +++++++++++-----------------------------------
 jnlib/w32-reg.c    |   34 -----------
 jnlib/w32help.h    |    2 -
 m4/iconv.m4        |  162 ++++++++++++++++++++++++++++++++++++++++------------
 tools/Makefile.am  |    3 +-
 10 files changed, 326 insertions(+), 218 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Aug  1 20:24:47 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Thu, 01 Aug 2013 20:24:47 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-231-gca6fe88
Message-ID: <E1V4x6W-0005rv-EA@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  ca6fe88c0068f8d45ef39df0fc7b161998a91fe9 (commit)
      from  ef6a6d973c2bcc54006c04dc41f978ff01005c97 (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 ca6fe88c0068f8d45ef39df0fc7b161998a91fe9
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 1 19:54:11 2013 +0200

    w32: Fix recent patch 9ff72e4.
    
    * common/homedir.c (check_portable_app): Fix the name of the control
    file.

diff --git a/common/homedir.c b/common/homedir.c
index 9fec78f..faf9787 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -258,7 +258,7 @@ check_portable_app (const char *dir)
     log_error ("required binary '%s' is not installed\n", fname);
   else
     {
-      strcpy (fname + strlen (fname) - 3, ".ctl");
+      strcpy (fname + strlen (fname) - 3, "ctl");
       if (!access (fname, F_OK))
         {
           /* gpgconf.ctl file found.  Record this fact.  */

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

Summary of changes:
 common/homedir.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Aug  2 09:49:04 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 02 Aug 2013 09:49:04 +0200
Subject: [git] GnuPG - branch, STABLE-BRANCH-1-4,
 updated. gnupg-1.4.14-2-ga1a59e6
Message-ID: <E1V59en-0002eW-5s@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-1-4 has been updated
       via  a1a59e6a539e597996976d0afb6aa3062e954188 (commit)
      from  6f634b0e089f253f07a470670449ba0722408d46 (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 a1a59e6a539e597996976d0afb6aa3062e954188
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 2 09:17:52 2013 +0200

    gpg: No need to create a trustdb when encrypting with --always-trust.
    
    * g10/gpg.c (main): Special case setup_trustdb for --encrypt.
    --
    
    (back ported from commit 498b9a95dc65c43240835d64cc92d8fb43014d53)
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/gpg.c b/g10/gpg.c
index 96f9086..b310308 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -3318,6 +3318,12 @@ main (int argc, char **argv )
       case aFixTrustDB:
       case aExportOwnerTrust: rc = setup_trustdb( 0, trustdb_name ); break;
       case aListTrustDB: rc = setup_trustdb( argc? 1:0, trustdb_name ); break;
+      case aEncr:
+      case aEncrFiles:
+        /* No need to create the trust model if we are using the
+         * always trust model.  */
+        rc = setup_trustdb (opt.trust_model != TM_ALWAYS, trustdb_name);
+        break;
       default: rc = setup_trustdb(1, trustdb_name ); break;
     }
     if( rc )

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

Summary of changes:
 g10/gpg.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Aug  2 09:50:11 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 02 Aug 2013 09:50:11 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-232-g498b9a9
Message-ID: <E1V59fr-0002iO-GF@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  498b9a95dc65c43240835d64cc92d8fb43014d53 (commit)
      from  ca6fe88c0068f8d45ef39df0fc7b161998a91fe9 (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 498b9a95dc65c43240835d64cc92d8fb43014d53
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 2 09:10:17 2013 +0200

    gpg: No need to create a trustdb when encrypting with --always-trust.
    
    * g10/gpg.c (main): Special case setup_trustdb for --encrypt.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/gpg.c b/g10/gpg.c
index a141164..599948f 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -3440,7 +3440,8 @@ main (int argc, char **argv)
     ctrl = xcalloc (1, sizeof *ctrl);
     gpg_init_default_ctrl (ctrl);
 
-    switch( cmd ) {
+    switch (cmd)
+      {
       case aPrimegen:
       case aPrintMD:
       case aPrintMDs:
@@ -3449,12 +3450,24 @@ main (int argc, char **argv)
       case aEnArmor:
 	break;
       case aFixTrustDB:
-      case aExportOwnerTrust: rc = setup_trustdb( 0, trustdb_name ); break;
-      case aListTrustDB: rc = setup_trustdb( argc? 1:0, trustdb_name ); break;
-      default: rc = setup_trustdb(1, trustdb_name ); break;
-    }
-    if( rc )
-	log_error(_("failed to initialize the TrustDB: %s\n"), g10_errstr(rc));
+      case aExportOwnerTrust:
+        rc = setup_trustdb (0, trustdb_name);
+        break;
+      case aListTrustDB:
+        rc = setup_trustdb (argc? 1:0, trustdb_name);
+        break;
+      case aEncr:
+      case aEncrFiles:
+        /* If we are using TM_ALWAYS, we do not need to create the
+           trustdb.  */
+        rc = setup_trustdb (opt.trust_model != TM_ALWAYS, trustdb_name);
+        break;
+      default:
+        rc = setup_trustdb (1, trustdb_name );
+        break;
+      }
+    if (rc)
+      log_error (_("failed to initialize the TrustDB: %s\n"), g10_errstr(rc));
 
 
     switch (cmd)

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

Summary of changes:
 g10/gpg.c |   27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Aug  2 09:57:12 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 02 Aug 2013 09:57:12 +0200
Subject: [git] GnuPG - branch, STABLE-BRANCH-2-0,
 updated. gnupg-2.0.20-24-g7c028ef
Message-ID: <E1V59me-000338-RT@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-0 has been updated
       via  7c028efc182234cd28bbfbeccff0107f334064f2 (commit)
      from  4f90c7b914693b72341fa1e93dda7e075f9717c0 (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 7c028efc182234cd28bbfbeccff0107f334064f2
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 2 09:10:17 2013 +0200

    gpg: No need to create a trustdb when encrypting with --always-trust.
    
    * g10/gpg.c (main): Special case setup_trustdb for --encrypt.
    --
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
    
    (cherry picked from commit 498b9a95dc65c43240835d64cc92d8fb43014d53)

diff --git a/g10/gpg.c b/g10/gpg.c
index ffe964e..1238f47 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -3389,7 +3389,8 @@ main (int argc, char **argv)
     if(fname && utf8_strings)
       opt.flags.utf8_filename=1;
 
-    switch( cmd ) {
+    switch (cmd)
+      {
       case aPrimegen:
       case aPrintMD:
       case aPrintMDs:
@@ -3398,12 +3399,24 @@ main (int argc, char **argv)
       case aEnArmor:
 	break;
       case aFixTrustDB:
-      case aExportOwnerTrust: rc = setup_trustdb( 0, trustdb_name ); break;
-      case aListTrustDB: rc = setup_trustdb( argc? 1:0, trustdb_name ); break;
-      default: rc = setup_trustdb(1, trustdb_name ); break;
-    }
-    if( rc )
-	log_error(_("failed to initialize the TrustDB: %s\n"), g10_errstr(rc));
+      case aExportOwnerTrust:
+        rc = setup_trustdb (0, trustdb_name);
+        break;
+      case aListTrustDB:
+        rc = setup_trustdb (argc? 1:0, trustdb_name);
+        break;
+      case aEncr:
+      case aEncrFiles:
+        /* If we are using TM_ALWAYS, we do not need to create the
+           trustdb.  */
+        rc = setup_trustdb (opt.trust_model != TM_ALWAYS, trustdb_name);
+        break;
+      default:
+        rc = setup_trustdb (1, trustdb_name );
+        break;
+      }
+    if (rc)
+      log_error (_("failed to initialize the TrustDB: %s\n"), g10_errstr(rc));
 
 
     switch (cmd)

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

Summary of changes:
 g10/gpg.c |   27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Aug  2 12:28:36 2013
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Fri, 02 Aug 2013 12:28:36 +0200
Subject: [git] GpgOL - branch, master, updated. gpgol-1.1.3-50-ga81d689
Message-ID: <E1V5C9A-0007EU-Ai@lists.gnupg.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".

The branch, master has been updated
       via  a81d6897e302fa0fceb73647d41ee27370bf1a57 (commit)
       via  8a668dc4eb5e6451f09dccfa4981db0c17d648dc (commit)
      from  1a9124f08d88a4549623b45146870fe7125ab60d (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 a81d6897e302fa0fceb73647d41ee27370bf1a57
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Aug 2 09:57:03 2013 +0000

    Fix possible crash in encryptInspector
    
        The recipientAddr pointer got moved to an invalid location
        before free.
    
        * src/ribbons-callbacks.cpp (encryptInspector): Fix free of
        recipients.
    
    --
        Thats what you get when you let Python / Java coders write C

diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index adf24f1..0afead1 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -93,6 +93,8 @@ encryptInspector (LPDISPATCH ctrl, int flags)
   int i;
   STATSTG tmpStat;
 
+  log_debug ("%s:%s: enter", SRCNAME, __func__);
+
   hr = getContext (ctrl, &context);
   if (FAILED(hr))
       return hr;
@@ -328,11 +330,13 @@ failure:
   RELDISP(tmpstream);
   xfree (plaintext);
   xfree (senderAddr);
-  while (recipientAddrs && *recipientAddrs)
-  {
-    xfree (*recipientAddrs++);
-  }
-  xfree (recipientAddrs);
+  if (recipientAddrs)
+    {
+      for (i=0; recipientAddrs && recipientAddrs[i]; i++)
+        xfree (recipientAddrs[i]);
+      xfree (recipientAddrs);
+    }
+  log_debug ("%s:%s: leave", SRCNAME, __func__);
 
   return S_OK;
 }

commit 8a668dc4eb5e6451f09dccfa4981db0c17d648dc
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Aug 2 09:55:51 2013 +0000

    Add some more initalization also for encryption
    
        * src/ribbon-callbacks.cpp (encryptInspector): Initialize
        dispatcher pointers

diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index 529cdf2..adf24f1 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -69,12 +69,12 @@ HRESULT
 encryptInspector (LPDISPATCH ctrl, int flags)
 {
   LPDISPATCH context = NULL;
-  LPDISPATCH selection;
-  LPDISPATCH wordEditor;
-  LPDISPATCH application;
-  LPDISPATCH mailItem;
-  LPDISPATCH sender;
-  LPDISPATCH recipients;
+  LPDISPATCH selection = NULL;
+  LPDISPATCH wordEditor = NULL;
+  LPDISPATCH application = NULL;
+  LPDISPATCH mailItem = NULL;
+  LPDISPATCH sender = NULL;
+  LPDISPATCH recipients = NULL;
 
   struct sink_s encsinkmem;
   sink_t encsink = &encsinkmem;

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

Summary of changes:
 src/ribbon-callbacks.cpp |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Aug  2 13:19:07 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 02 Aug 2013 13:19:07 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.4.2-5-g3881ea4
Message-ID: <E1V5Cw2-00082J-G5@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  3881ea4e83d1533ef497b7332398fc1850e29205 (commit)
      from  393a9471f2f3ac0a5b14f3534a5bfc7ffe948567 (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 3881ea4e83d1533ef497b7332398fc1850e29205
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 2 12:48:30 2013 +0200

    w32: Try to locate gpg in the gpgme installation dir.
    
    * src/w32-util.c (my_hmodule): New.
    (wchar_to_utf8): New.
    (DllMain): New.
    (_gpgme_get_inst_dir): New.
    (find_program_in_dir): New.
    (find_program_in_inst_dir): Add arg INST_DIR.
    (_gpgme_get_gpg_path): Get inst_dir before acquiring the lock.
    (_gpgme_get_gpgconf_path): Ditto.
    (_gpgme_get_g13_path): Ditto.
    (_gpgme_get_w32spawn_path): Ditto.

diff --git a/src/w32-util.c b/src/w32-util.c
index a90f405..27dc5bc 100644
--- a/src/w32-util.c
+++ b/src/w32-util.c
@@ -1,24 +1,23 @@
 /* w32-util.c - Utility functions for the W32 API
-   Copyright (C) 1999 Free Software Foundation, Inc
-   Copyright (C) 2001 Werner Koch (dd9jn)
-   Copyright (C) 2001, 2002, 2003, 2004, 2007 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) 1999 Free Software Foundation, Inc
+ * Copyright (C) 2001 Werner Koch (dd9jn)
+ * Copyright (C) 2001, 2002, 2003, 2004, 2007, 2013 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/>.
+ **/
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -75,6 +74,12 @@
 
 DEFINE_STATIC_LOCK (get_path_lock);
 
+/* The module handle of this DLL.  If we are linked statically,
+   dllmain does not exists and thus the value of my_hmodule will be
+   NULL.  The effect is that a GetModuleFileName always returns the
+   file name of the DLL or executable which contains the gpgme code.  */
+static HMODULE my_hmodule;
+
 
 #ifdef HAVE_ALLOW_SET_FOREGROUND_WINDOW
 
@@ -112,6 +117,39 @@ dlclose (void * hd)
 }
 #endif /* HAVE_ALLOW_SET_FOREGROUND_WINDOW */
 
+
+/* Return a malloced string encoded in UTF-8 from the wide char input
+   string STRING.  Caller must free this value.  Returns NULL and sets
+   ERRNO on failure.  Calling this function with STRING set to NULL is
+   not defined.  */
+static char *
+wchar_to_utf8 (const wchar_t *string)
+{
+  int n;
+  char *result;
+
+  n = WideCharToMultiByte (CP_UTF8, 0, string, -1, NULL, 0, NULL, NULL);
+  if (n < 0)
+    {
+      gpg_err_set_errno (EINVAL);
+      return NULL;
+    }
+
+  result = malloc (n+1);
+  if (!result)
+    return NULL;
+
+  n = WideCharToMultiByte (CP_UTF8, 0, string, -1, result, n, NULL, NULL);
+  if (n < 0)
+    {
+      free (result);
+      gpg_err_set_errno (EINVAL);
+      result = NULL;
+    }
+  return result;
+}
+
+
 void
 _gpgme_allow_set_foreground_window (pid_t pid)
 {
@@ -270,51 +308,53 @@ read_w32_registry_string (const char *root, const char *dir, const char *name)
 }
 
 
-#if 0
-static char *
-find_program_in_registry (const char *name)
+/* Return the name of the directory with the gpgme DLL or the EXE (if
+   statically linked).  May return NULL on severe errors. */
+const char *
+_gpgme_get_inst_dir (void)
 {
-  char *program = NULL;
+  static char *inst_dir;
 
-  program = read_w32_registry_string (NULL, "Software\\GNU\\GnuPG", name);
-  if (program)
+  LOCK (get_path_lock);
+  if (!inst_dir)
     {
-      int i;
+      wchar_t *moddir;
 
-      TRACE2 (DEBUG_CTX, "gpgme:find_program_in_registry", 0,
-	      "found %s in registry: `%s'", name, program);
-      for (i = 0; program[i]; i++)
-	{
-	  if (program[i] == '/')
-	    program[i] = '\\';
-	}
+      moddir = malloc ((MAX_PATH+5) * sizeof *moddir);
+      if (moddir)
+        {
+          if (!GetModuleFileNameW (my_hmodule, moddir, MAX_PATH))
+            *moddir = 0;
+          if (!*moddir)
+            gpg_err_set_errno (ENOENT);
+          else
+            {
+              inst_dir = wchar_to_utf8 (moddir);
+              if (inst_dir)
+                {
+                  char *p = strrchr (inst_dir, '\\');
+                  if (p)
+                    *p = 0;
+                }
+            }
+          free (moddir);
+        }
     }
-  return program;
+  UNLOCK (get_path_lock);
+  return inst_dir;
 }
-#endif
 
 
 static char *
-find_program_in_inst_dir (const char *name)
+find_program_in_dir (const char *dir, const char *name)
 {
-  char *result = NULL;
-  char *tmp;
+  char *result;
 
-  tmp = read_w32_registry_string ("HKEY_LOCAL_MACHINE",
-				  "Software\\GNU\\GnuPG",
-				  "Install Directory");
-  if (!tmp)
-    return NULL;
-
-  result = malloc (strlen (tmp) + 1 + strlen (name) + 1);
+  result = malloc (strlen (dir) + 1 + strlen (name) + 1);
   if (!result)
-    {
-      free (tmp);
-      return NULL;
-    }
+    return NULL;
 
-  strcpy (stpcpy (stpcpy (result, tmp), "\\"), name);
-  free (tmp);
+  strcpy (stpcpy (stpcpy (result, dir), "\\"), name);
   if (access (result, F_OK))
     {
       free (result);
@@ -326,6 +366,40 @@ find_program_in_inst_dir (const char *name)
 
 
 static char *
+find_program_in_inst_dir (const char *inst_dir, const char *name)
+{
+  char *result;
+  char *dir;
+
+  /* If an installation directory has been passed, this overrides a
+     location given bu the registry.  The idea here is that we prefer
+     a a program installed alongside with gpgme.  We don't want the
+     registry to override this to have a better isolation of an gpgme
+     aware applications for other effects.  Note that the "Install
+     Directory" registry item has been used for ages in Gpg4win and
+     earlier GnuPG windows installers.  It is technically not anymore
+     required.  */
+  if (inst_dir)
+    {
+      result = find_program_in_dir (inst_dir, name);
+      if (result)
+        return result;
+    }
+
+  dir = read_w32_registry_string ("HKEY_LOCAL_MACHINE",
+				  "Software\\GNU\\GnuPG",
+				  "Install Directory");
+  if (dir)
+    {
+      result = find_program_in_dir (dir, name);
+      free (dir);
+      return result;
+    }
+  return NULL;
+}
+
+
+static char *
 find_program_at_standard_place (const char *name)
 {
   char path[MAX_PATH];
@@ -353,14 +427,12 @@ const char *
 _gpgme_get_gpg_path (void)
 {
   static char *gpg_program;
+  const char *inst_dir;
 
+  inst_dir = _gpgme_get_inst_dir ();
   LOCK (get_path_lock);
-#if 0
   if (!gpg_program)
-    gpg_program = find_program_in_registry ("gpgProgram");
-#endif
-  if (!gpg_program)
-    gpg_program = find_program_in_inst_dir ("gpg.exe");
+    gpg_program = find_program_in_inst_dir (inst_dir, "gpg.exe");
   if (!gpg_program)
     gpg_program = find_program_at_standard_place ("GNU\\GnuPG\\gpg.exe");
   UNLOCK (get_path_lock);
@@ -372,14 +444,12 @@ const char *
 _gpgme_get_gpgsm_path (void)
 {
   static char *gpgsm_program;
+  const char *inst_dir;
 
+  inst_dir = _gpgme_get_inst_dir ();
   LOCK (get_path_lock);
-#if 0
   if (!gpgsm_program)
-    gpgsm_program = find_program_in_registry ("gpgsmProgram");
-#endif
-  if (!gpgsm_program)
-    gpgsm_program = find_program_in_inst_dir ("gpgsm.exe");
+    gpgsm_program = find_program_in_inst_dir (inst_dir, "gpgsm.exe");
   if (!gpgsm_program)
     gpgsm_program = find_program_at_standard_place ("GNU\\GnuPG\\gpgsm.exe");
   UNLOCK (get_path_lock);
@@ -391,14 +461,12 @@ const char *
 _gpgme_get_gpgconf_path (void)
 {
   static char *gpgconf_program;
+  const char *inst_dir;
 
+  inst_dir = _gpgme_get_inst_dir ();
   LOCK (get_path_lock);
-#if 0
   if (!gpgconf_program)
-    gpgconf_program = find_program_in_registry ("gpgconfProgram");
-#endif
-  if (!gpgconf_program)
-    gpgconf_program = find_program_in_inst_dir ("gpgconf.exe");
+    gpgconf_program = find_program_in_inst_dir (inst_dir, "gpgconf.exe");
   if (!gpgconf_program)
     gpgconf_program
       = find_program_at_standard_place ("GNU\\GnuPG\\gpgconf.exe");
@@ -411,14 +479,12 @@ const char *
 _gpgme_get_g13_path (void)
 {
   static char *g13_program;
+  const char *inst_dir;
 
+  inst_dir = _gpgme_get_inst_dir ();
   LOCK (get_path_lock);
-#if 0
-  if (!g13_program)
-    g13_program = find_program_in_registry ("g13Program");
-#endif
   if (!g13_program)
-    g13_program = find_program_in_inst_dir ("g13.exe");
+    g13_program = find_program_in_inst_dir (inst_dir, "g13.exe");
   if (!g13_program)
     g13_program = find_program_at_standard_place ("GNU\\GnuPG\\g13.exe");
   UNLOCK (get_path_lock);
@@ -453,10 +519,12 @@ const char *
 _gpgme_get_w32spawn_path (void)
 {
   static char *w32spawn_program;
+  const char *inst_dir;
 
+  inst_dir = _gpgme_get_inst_dir ();
   LOCK (get_path_lock);
   if (!w32spawn_program)
-    w32spawn_program = find_program_in_inst_dir ("gpgme-w32spawn.exe");
+    w32spawn_program = find_program_in_inst_dir (inst_dir,"gpgme-w32spawn.exe");
   if (!w32spawn_program)
     w32spawn_program
       = find_program_at_standard_place ("GNU\\GnuPG\\gpgme-w32spawn.exe");
@@ -641,3 +709,18 @@ _gpgme_w32ce_get_debug_envvar (void)
   return tmp;
 }
 #endif /*HAVE_W32CE_SYSTEM*/
+
+
+/* Entry point called by the DLL loader.  */
+#ifdef DLL_EXPORT
+int WINAPI
+DllMain (HINSTANCE hinst, DWORD reason, LPVOID reserved)
+{
+  (void)reserved;
+
+  if (reason == DLL_PROCESS_ATTACH)
+    my_hmodule = hinst;
+
+  return TRUE;
+}
+#endif /*DLL_EXPORT*/

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

Summary of changes:
 src/w32-util.c |  229 ++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 156 insertions(+), 73 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Aug  2 15:56:25 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 02 Aug 2013 15:56:25 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.4.2-6-ga4c8012
Message-ID: <E1V5FOF-0004gu-Vj@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  a4c80126ae4754c8478c69a8a24a6ffd975485fc (commit)
      from  3881ea4e83d1533ef497b7332398fc1850e29205 (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 a4c80126ae4754c8478c69a8a24a6ffd975485fc
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 2 15:25:23 2013 +0200

    Prefer GnuPG-2 engines over GnuPG-1.
    
    * src/util.h: Move some prototypes to ...
    * src/sys-util.h: New.
    * src/Makefile.am (main_sources): Add sys-util.h.
    * configure.ac (AH_VERBATIM): Add DIRSEP_C and DIRSEP_S.
    * src/dirinfo.c: Include sys-util.h.
    (WANT_GPG_NAME, WANT_GPGSM_NAME, WANT_G13_NAME)
    (WANT_UISRV_SOCKET): New.
    (dirinfo): Add corresponding fields.
    (parse_output): Add arg COMPONENTS and set new fields.
    (read_gpgconf_dirs): Add arg components and act upon it.
    (get_gpgconf_item): Call read_gpgconf_dirs two times.  Add debug
    output.
    (_gpgme_get_default_gpg_name): New.
    (_gpgme_get_default_gpgsm_name): New.
    (_gpgme_get_default_g13_name): New.
    (_gpgme_get_default_gpgconf_name): New.
    (_gpgme_get_default_uisrv_socket): New.
    * src/engine-gpg.c, src/engine-g13.c, src/engine-gpgconf.c
    * src/engine-gpgsm.c, src/engine-uiserver.c: Change to use
    _gpgme_get_default_ instead of those from sys-util.h.
    * src/posix-util.c (_gpgme_get_gpg_path): Include sys-util.h.
    (_gpgme_get_uiserver_socket_path): Remove.
    * src/w32-util.c (_gpgme_get_gpg_path): Include sys-util.h.
    (_gpgme_get_uiserver_socket_path): Remove.
    --
    
    The default engines names are now taken from the output of gpgconf.
    If gpgconf is not installed gpg 1 is assumed and locate the same was
    as gpgconf.

diff --git a/NEWS b/NEWS
index 55c8660..5c871dd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,12 @@
 Noteworthy changes in version 1.4.3 (unreleased)
 ------------------------------------------------
 
+ * The default engine names are now taken from the output of gpgconf.
+   If gpgconf is not found the use of gpg 1 is assumed.
+
+ * Under Windows the default engines names are first searched in the
+   installation directory of the gpgme DLL.
+
  * Interface changes relative to the 1.4.2 release:
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  gpgme_signers_count            NEW.
diff --git a/configure.ac b/configure.ac
index 2d26dbb..d3258be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -920,11 +920,15 @@ AM_CONDITIONAL(HAVE_UISERVER, test "$uiserver" != "no")
 # Add a few constants to help porting to W32
 AH_VERBATIM([SEPCONSTANTS],
 [
-/* Separators as used in $PATH.  */
+/* Separators as used in $PATH and file name.  */
 #ifdef HAVE_DOSISH_SYSTEM
 #define PATHSEP_C ';'
+#define DIRSEP_C '\\'
+#define DIRSEP_S "\\"
 #else
 #define PATHSEP_C ':'
+#define DIRSEP_C '/'
+#define DIRSEP_S "/"
 #endif
 ])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index fa3b077..37e3407 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -118,7 +118,7 @@ main_sources =								\
 	$(uiserver_components)						\
 	$(g13_components) vfs-mount.c vfs-create.c			\
 	gpgconf.c							\
-	sema.h priv-io.h $(system_components) dirinfo.c			\
+	sema.h priv-io.h $(system_components) sys-util.h dirinfo.c	\
 	debug.c debug.h gpgme.c version.c error.c
 
 libgpgme_la_SOURCES = $(main_sources)					\
diff --git a/src/dirinfo.c b/src/dirinfo.c
index 267e988..27c0dd7 100644
--- a/src/dirinfo.c
+++ b/src/dirinfo.c
@@ -1,5 +1,5 @@
 /* dirinfo.c - Get directory information
- * Copyright (C) 2009 g10 Code GmbH
+ * Copyright (C) 2009, 2013 g10 Code GmbH
  *
  * This file is part of GPGME.
  *
@@ -29,6 +29,7 @@
 #include "priv-io.h"
 #include "debug.h"
 #include "sema.h"
+#include "sys-util.h"
 
 DEFINE_STATIC_LOCK (dirinfo_lock);
 
@@ -36,7 +37,11 @@ DEFINE_STATIC_LOCK (dirinfo_lock);
 enum
   {
     WANT_HOMEDIR,
-    WANT_AGENT_SOCKET
+    WANT_AGENT_SOCKET,
+    WANT_GPG_NAME,
+    WANT_GPGSM_NAME,
+    WANT_G13_NAME,
+    WANT_UISRV_SOCKET
   };
 
 /* Values retrieved via gpgconf and cached here.  */
@@ -44,13 +49,18 @@ static struct {
   int  valid;         /* Cached information is valid.  */
   char *homedir;
   char *agent_socket;
+  char *gpg_name;
+  char *gpgsm_name;
+  char *g13_name;
+  char *uisrv_socket;
 } dirinfo;
 
 
 /* Parse the output of "gpgconf --list-dirs".  This function expects
-   that DIRINFO_LOCK is held by the caller.  */
+   that DIRINFO_LOCK is held by the caller.  If COMPONENTS is set, the
+   output of --list-components is expected. */
 static void
-parse_output (char *line)
+parse_output (char *line, int components)
 {
   char *value, *p;
 
@@ -58,6 +68,14 @@ parse_output (char *line)
   if (!value)
     return;
   *value++ = 0;
+  if (components)
+    {
+      /* Skip the second field.  */
+      value = strchr (value, ':');
+      if (!value)
+        return;
+      *value++ = 0;
+    }
   p = strchr (value, ':');
   if (p)
     *p = 0;
@@ -66,19 +84,45 @@ parse_output (char *line)
   if (!*value)
     return;
 
-  if (!strcmp (line, "homedir") && !dirinfo.homedir)
-    dirinfo.homedir = strdup (value);
-  else if (!strcmp (line, "agent-socket") && !dirinfo.agent_socket)
-    dirinfo.agent_socket = strdup (value);
+  if (components)
+    {
+      if (!strcmp (line, "gpg") && !dirinfo.gpg_name)
+        dirinfo.gpg_name = strdup (value);
+      else if (!strcmp (line, "gpgsm") && !dirinfo.gpgsm_name)
+        dirinfo.gpgsm_name = strdup (value);
+      else if (!strcmp (line, "g13") && !dirinfo.g13_name)
+        dirinfo.g13_name = strdup (value);
+    }
+  else
+    {
+      if (!strcmp (line, "homedir") && !dirinfo.homedir)
+        {
+          const char name[] = "S.uiserver";
+
+          dirinfo.homedir = strdup (value);
+          if (dirinfo.homedir)
+            {
+              dirinfo.uisrv_socket = malloc (strlen (dirinfo
+                                                     .homedir)
+                                             + 1 + strlen (name) + 1);
+              if (dirinfo.uisrv_socket)
+                strcpy (stpcpy (stpcpy (dirinfo.uisrv_socket, dirinfo.homedir),
+                                DIRSEP_S), name);
+            }
+        }
+      else if (!strcmp (line, "agent-socket") && !dirinfo.agent_socket)
+        dirinfo.agent_socket = strdup (value);
+    }
 }
 
 
 /* Read the directory information from gpgconf.  This function expects
-   that DIRINFO_LOCK is held by the caller.  */
+   that DIRINFO_LOCK is held by the caller.  PGNAME is the name of the
+   gpgconf binary. If COMPONENTS is set, not the directories bit the
+   name of the componeNts are read. */
 static void
-read_gpgconf_dirs (void)
+read_gpgconf_dirs (const char *pgmname, int components)
 {
-  const char *pgmname;
   char linebuf[1024] = {0};
   int linelen = 0;
   char * argv[3];
@@ -89,12 +133,8 @@ read_gpgconf_dirs (void)
   int nread;
   char *mark = NULL;
 
-  pgmname = _gpgme_get_gpgconf_path ();
-  if (!pgmname)
-    return;  /* No way.  */
-
   argv[0] = (char *)pgmname;
-  argv[1] = "--list-dirs";
+  argv[1] = components? "--list-components" : "--list-dirs";
   argv[2] = NULL;
 
   if (_gpgme_io_pipe (rp, 1) < 0)
@@ -132,7 +172,7 @@ read_gpgconf_dirs (void)
               else
                 mark[0] = '\0';
 
-              parse_output (line);
+              parse_output (line, components);
 	    }
 
           nused = lastmark? (lastmark + 1 - linebuf) : 0;
@@ -147,14 +187,38 @@ read_gpgconf_dirs (void)
 
 
 static const char *
-get_gpgconf_dir (int what)
+get_gpgconf_item (int what)
 {
   const char *result = NULL;
 
   LOCK (dirinfo_lock);
   if (!dirinfo.valid)
     {
-      read_gpgconf_dirs ();
+      const char *pgmname;
+
+      pgmname = _gpgme_get_gpgconf_path ();
+      if (pgmname && access (pgmname, F_OK))
+        {
+          _gpgme_debug (DEBUG_INIT,
+                        "gpgme_dinfo: gpgconf='%s' [not installed]\n", pgmname);
+          pgmname = NULL; /* Not available.  */
+        }
+      else
+        _gpgme_debug (DEBUG_INIT, "gpgme_dinfo: gpgconf='%s'\n",
+                      pgmname? pgmname : "[null]");
+      if (!pgmname)
+        {
+          /* Probably gpgconf is not installed.  Assume we are using
+             GnuPG-1.  */
+          pgmname = _gpgme_get_gpg_path ();
+          if (pgmname)
+            dirinfo.gpg_name = strdup (pgmname);
+        }
+      else
+        {
+          read_gpgconf_dirs (pgmname, 0);
+          read_gpgconf_dirs (pgmname, 1);
+        }
       /* Even if the reading of the directories failed (e.g. due to an
          too old version gpgconf or no gpgconf at all), we need to
          mark the entries as valid so that we won't try over and over
@@ -162,11 +226,33 @@ get_gpgconf_dir (int what)
          the read values later because they are practically statically
          allocated.  */
       dirinfo.valid = 1;
+      if (dirinfo.gpg_name)
+        _gpgme_debug (DEBUG_INIT, "gpgme_dinfo:     gpg='%s'\n",
+                      dirinfo.gpg_name);
+      if (dirinfo.g13_name)
+        _gpgme_debug (DEBUG_INIT, "gpgme_dinfo:     g13='%s'\n",
+                      dirinfo.g13_name);
+      if (dirinfo.gpgsm_name)
+        _gpgme_debug (DEBUG_INIT, "gpgme_dinfo:   gpgsm='%s'\n",
+                      dirinfo.gpgsm_name);
+      if (dirinfo.homedir)
+        _gpgme_debug (DEBUG_INIT, "gpgme_dinfo: homedir='%s'\n",
+                      dirinfo.homedir);
+      if (dirinfo.agent_socket)
+        _gpgme_debug (DEBUG_INIT, "gpgme_dinfo:   agent='%s'\n",
+                      dirinfo.agent_socket);
+      if (dirinfo.uisrv_socket)
+        _gpgme_debug (DEBUG_INIT, "gpgme_dinfo:   uisrv='%s'\n",
+                      dirinfo.uisrv_socket);
     }
   switch (what)
     {
     case WANT_HOMEDIR: result = dirinfo.homedir; break;
     case WANT_AGENT_SOCKET: result = dirinfo.agent_socket; break;
+    case WANT_GPG_NAME:   result = dirinfo.gpg_name; break;
+    case WANT_GPGSM_NAME: result = dirinfo.gpgsm_name; break;
+    case WANT_G13_NAME:   result = dirinfo.g13_name; break;
+    case WANT_UISRV_SOCKET:  result = dirinfo.uisrv_socket; break;
     }
   UNLOCK (dirinfo_lock);
   return result;
@@ -177,13 +263,51 @@ get_gpgconf_dir (int what)
 const char *
 _gpgme_get_default_homedir (void)
 {
-  return get_gpgconf_dir (WANT_HOMEDIR);
+  return get_gpgconf_item (WANT_HOMEDIR);
 }
 
 /* Return the default gpg-agent socket name.  Returns NULL if not known.  */
 const char *
 _gpgme_get_default_agent_socket (void)
 {
-  return get_gpgconf_dir (WANT_AGENT_SOCKET);
+  return get_gpgconf_item (WANT_AGENT_SOCKET);
+}
+
+/* Return the default gpg file name.  Returns NULL if not known.  */
+const char *
+_gpgme_get_default_gpg_name (void)
+{
+  return get_gpgconf_item (WANT_GPG_NAME);
+}
+
+/* Return the default gpgsm file name.  Returns NULL if not known.  */
+const char *
+_gpgme_get_default_gpgsm_name (void)
+{
+  return get_gpgconf_item (WANT_GPGSM_NAME);
+}
+
+/* Return the default g13 file name.  Returns NULL if not known.  */
+const char *
+_gpgme_get_default_g13_name (void)
+{
+  return get_gpgconf_item (WANT_G13_NAME);
 }
 
+/* Return the default gpgconf file name.  Returns NULL if not known.
+   Because gpgconf is the binary used to retrieved all these default
+   names, this function is merely a simple wrapper around the function
+   used to locate this binary.  */
+const char *
+_gpgme_get_default_gpgconf_name (void)
+{
+  return _gpgme_get_gpgconf_path ();
+}
+
+/* Return the default UI-server socket name.  Returns NULL if not
+   known.  */
+const char *
+_gpgme_get_default_uisrv_socket (void)
+{
+  return get_gpgconf_item (WANT_UISRV_SOCKET);
+}
diff --git a/src/engine-g13.c b/src/engine-g13.c
index de0aac8..b97e0b4 100644
--- a/src/engine-g13.c
+++ b/src/engine-g13.c
@@ -100,7 +100,7 @@ static char *
 g13_get_version (const char *file_name)
 {
   return _gpgme_get_program_version (file_name ? file_name
-				     : _gpgme_get_g13_path ());
+				     : _gpgme_get_default_g13_name ());
 }
 
 
@@ -251,11 +251,11 @@ g13_new (void **engine, const char *file_name, const char *home_dir)
 
 #if USE_DESCRIPTOR_PASSING
   err = assuan_pipe_connect
-    (g13->assuan_ctx, file_name ? file_name : _gpgme_get_g13_path (),
+    (g13->assuan_ctx, file_name ? file_name : _gpgme_get_default_g13_name (),
      argv, NULL, NULL, NULL, ASSUAN_PIPE_CONNECT_FDPASSING);
 #else
   err = assuan_pipe_connect
-    (g13->assuan_ctx, file_name ? file_name : _gpgme_get_g13_path (),
+    (g13->assuan_ctx, file_name ? file_name : _gpgme_get_default_g13_name (),
      argv, NULL, NULL, NULL, 0);
 #endif
   if (err)
@@ -757,7 +757,7 @@ g13_io_event (void *engine, gpgme_event_io_t type, void *type_data)
 struct engine_ops _gpgme_engine_ops_g13 =
   {
     /* Static functions.  */
-    _gpgme_get_g13_path,
+    _gpgme_get_default_g13_name,
     NULL,
     g13_get_version,
     g13_get_req_version,
diff --git a/src/engine-gpg.c b/src/engine-gpg.c
index 72d3ad1..3bc9f66 100644
--- a/src/engine-gpg.c
+++ b/src/engine-gpg.c
@@ -296,7 +296,7 @@ static char *
 gpg_get_version (const char *file_name)
 {
   return _gpgme_get_program_version (file_name ? file_name
-				     : _gpgme_get_gpg_path ());
+				     : _gpgme_get_default_gpg_name ());
 }
 
 
@@ -1296,7 +1296,7 @@ start (engine_gpg_t gpg)
   if (!gpg)
     return gpg_error (GPG_ERR_INV_VALUE);
 
-  if (!gpg->file_name && !_gpgme_get_gpg_path ())
+  if (!gpg->file_name && !_gpgme_get_default_gpg_name ())
     return trace_gpg_error (GPG_ERR_INV_ENGINE);
 
   if (gpg->lc_ctype)
@@ -1352,7 +1352,7 @@ start (engine_gpg_t gpg)
   fd_list[n].dup_to = -1;
 
   status = _gpgme_io_spawn (gpg->file_name ? gpg->file_name :
-			    _gpgme_get_gpg_path (), gpg->argv,
+			    _gpgme_get_default_gpg_name (), gpg->argv,
                             IOSPAWN_FLAG_ALLOW_SET_FG,
                             fd_list, NULL, NULL, &pid);
   {
@@ -2401,7 +2401,7 @@ gpg_set_pinentry_mode (void *engine, gpgme_pinentry_mode_t mode)
 struct engine_ops _gpgme_engine_ops_gpg =
   {
     /* Static functions.  */
-    _gpgme_get_gpg_path,
+    _gpgme_get_default_gpg_name,
     NULL,
     gpg_get_version,
     gpg_get_req_version,
diff --git a/src/engine-gpgconf.c b/src/engine-gpgconf.c
index 3a1c1c1..1d457bb 100644
--- a/src/engine-gpgconf.c
+++ b/src/engine-gpgconf.c
@@ -61,7 +61,7 @@ static char *
 gpgconf_get_version (const char *file_name)
 {
   return _gpgme_get_program_version (file_name ? file_name
-				     : _gpgme_get_gpgconf_path ());
+				     : _gpgme_get_default_gpgconf_name ());
 }
 
 
@@ -100,7 +100,7 @@ gpgconf_new (void **engine, const char *file_name, const char *home_dir)
     return gpg_error_from_syserror ();
 
   gpgconf->file_name = strdup (file_name ? file_name
-			       : _gpgme_get_gpgconf_path ());
+			       : _gpgme_get_default_gpgconf_name ());
   if (!gpgconf->file_name)
     err = gpg_error_from_syserror ();
 
@@ -923,7 +923,7 @@ _gpgme_conf_release (gpgme_conf_comp_t conf)
 struct engine_ops _gpgme_engine_ops_gpgconf =
   {
     /* Static functions.  */
-    _gpgme_get_gpgconf_path,
+    _gpgme_get_default_gpgconf_name,
     NULL,
     gpgconf_get_version,
     gpgconf_get_req_version,
diff --git a/src/engine-gpgsm.c b/src/engine-gpgsm.c
index 391b632..cee20e3 100644
--- a/src/engine-gpgsm.c
+++ b/src/engine-gpgsm.c
@@ -120,7 +120,7 @@ static char *
 gpgsm_get_version (const char *file_name)
 {
   return _gpgme_get_program_version (file_name ? file_name
-				     : _gpgme_get_gpgsm_path ());
+				     : _gpgme_get_default_gpgsm_name ());
 }
 
 
@@ -340,7 +340,8 @@ gpgsm_new (void **engine, const char *file_name, const char *home_dir)
 
 #if USE_DESCRIPTOR_PASSING
   err = assuan_pipe_connect
-    (gpgsm->assuan_ctx, file_name ? file_name : _gpgme_get_gpgsm_path (),
+    (gpgsm->assuan_ctx,
+     file_name ? file_name : _gpgme_get_default_gpgsm_name (),
      argv, NULL, NULL, NULL, ASSUAN_PIPE_CONNECT_FDPASSING);
 #else
   {
@@ -352,7 +353,8 @@ gpgsm_new (void **engine, const char *file_name, const char *home_dir)
       achild_fds[i] = (assuan_fd_t) child_fds[i];
 
     err = assuan_pipe_connect
-      (gpgsm->assuan_ctx, file_name ? file_name : _gpgme_get_gpgsm_path (),
+      (gpgsm->assuan_ctx,
+       file_name ? file_name : _gpgme_get_default_gpgsm_name (),
        argv, achild_fds, NULL, NULL, 0);
 
     /* For now... */
@@ -1945,7 +1947,7 @@ gpgsm_passwd (void *engine, gpgme_key_t key, unsigned int flags)
 struct engine_ops _gpgme_engine_ops_gpgsm =
   {
     /* Static functions.  */
-    _gpgme_get_gpgsm_path,
+    _gpgme_get_default_gpgsm_name,
     NULL,
     gpgsm_get_version,
     gpgsm_get_req_version,
diff --git a/src/engine-uiserver.c b/src/engine-uiserver.c
index a0008e4..bd140f9 100644
--- a/src/engine-uiserver.c
+++ b/src/engine-uiserver.c
@@ -296,7 +296,7 @@ uiserver_new (void **engine, const char *file_name, const char *home_dir)
 
   err = assuan_socket_connect (uiserver->assuan_ctx,
 			       file_name ?
-			       file_name : _gpgme_get_uiserver_socket_path (),
+			       file_name : _gpgme_get_default_uisrv_socket (),
 			       0, ASSUAN_SOCKET_SERVER_FDPASSING);
   if (err)
     goto leave;
@@ -1302,7 +1302,7 @@ uiserver_io_event (void *engine, gpgme_event_io_t type, void *type_data)
 struct engine_ops _gpgme_engine_ops_uiserver =
   {
     /* Static functions.  */
-    _gpgme_get_uiserver_socket_path,
+    _gpgme_get_default_uisrv_socket,
     NULL,
     uiserver_get_version,
     uiserver_get_req_version,
diff --git a/src/posix-util.c b/src/posix-util.c
index 478055a..fd44507 100644
--- a/src/posix-util.c
+++ b/src/posix-util.c
@@ -28,6 +28,7 @@
 #include <assert.h>
 
 #include "util.h"
+#include "sys-util.h"
 
 const char *
 _gpgme_get_gpg_path (void)
@@ -70,29 +71,6 @@ _gpgme_get_g13_path (void)
 }
 
 
-const char *
-_gpgme_get_uiserver_socket_path (void)
-{
-  static char *socket_path;
-  const char *homedir;
-  const char name[] = "S.uiserver";
-
-  if (socket_path)
-    return socket_path;
-
-  homedir = _gpgme_get_default_homedir ();
-  if (! homedir)
-    return NULL;
-
-  socket_path = malloc (strlen (homedir) + 1 + strlen (name) + 1);
-  if (! socket_path)
-    return NULL;
-
-  strcpy (stpcpy (stpcpy (socket_path, homedir), "/"), name);
-  return socket_path;
-}
-
-
 /* See w32-util.c */
 int
 _gpgme_get_conf_int (const char *key, int *value)
diff --git a/src/sys-util.h b/src/sys-util.h
new file mode 100644
index 0000000..f6506d3
--- /dev/null
+++ b/src/sys-util.h
@@ -0,0 +1,29 @@
+/* sys-util.h - System utilities not generally used.
+ * Copyright (C) 2013 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/>.
+ */
+
+#ifndef SYS_UTIL_H
+#define SYS_UTIL_H
+
+/*-- {posix,w32}-util.c --*/
+const char *_gpgme_get_gpg_path (void);
+const char *_gpgme_get_gpgsm_path (void);
+const char *_gpgme_get_gpgconf_path (void);
+const char *_gpgme_get_g13_path (void);
+
+#endif /* SYS_UTIL_H */
diff --git a/src/util.h b/src/util.h
index db8dc39..c432980 100644
--- a/src/util.h
+++ b/src/util.h
@@ -47,18 +47,17 @@
 
 

 /*-- {posix,w32}-util.c --*/
-const char *_gpgme_get_gpg_path (void);
-const char *_gpgme_get_gpgsm_path (void);
-const char *_gpgme_get_gpgconf_path (void);
-const char *_gpgme_get_g13_path (void);
-const char *_gpgme_get_uiserver_socket_path (void);
-
 int _gpgme_get_conf_int (const char *key, int *value);
 void _gpgme_allow_set_foreground_window (pid_t pid);
 
 /*-- dirinfo.c --*/
 const char *_gpgme_get_default_homedir (void);
 const char *_gpgme_get_default_agent_socket (void);
+const char *_gpgme_get_default_gpg_name (void);
+const char *_gpgme_get_default_gpgsm_name (void);
+const char *_gpgme_get_default_g13_name (void);
+const char *_gpgme_get_default_gpgconf_name (void);
+const char *_gpgme_get_default_uisrv_socket (void);
 
 
 

diff --git a/src/w32-util.c b/src/w32-util.c
index 27dc5bc..4cee1cb 100644
--- a/src/w32-util.c
+++ b/src/w32-util.c
@@ -62,6 +62,7 @@
 #include "ath.h"
 #include "sema.h"
 #include "debug.h"
+#include "sys-util.h"
 
 
 #ifndef HAVE_W32CE_SYSTEM
@@ -493,29 +494,6 @@ _gpgme_get_g13_path (void)
 
 
 const char *
-_gpgme_get_uiserver_socket_path (void)
-{
-  static char *socket_path;
-  const char *homedir;
-  const char name[] = "S.uiserver";
-
-  if (socket_path)
-    return socket_path;
-
-  homedir = _gpgme_get_default_homedir ();
-  if (! homedir)
-    return NULL;
-
-  socket_path = malloc (strlen (homedir) + 1 + strlen (name) + 1);
-  if (! socket_path)
-    return NULL;
-
-  strcpy (stpcpy (stpcpy (socket_path, homedir), "\\"), name);
-  return socket_path;
-}
-
-
-const char *
 _gpgme_get_w32spawn_path (void)
 {
   static char *w32spawn_program;

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

Summary of changes:
 NEWS                  |    6 ++
 configure.ac          |    6 ++-
 src/Makefile.am       |    2 +-
 src/dirinfo.c         |  166 ++++++++++++++++++++++++++++++++++++++++++------
 src/engine-g13.c      |    8 +-
 src/engine-gpg.c      |    8 +-
 src/engine-gpgconf.c  |    6 +-
 src/engine-gpgsm.c    |   10 ++-
 src/engine-uiserver.c |    4 +-
 src/posix-util.c      |   24 +-------
 src/sys-util.h        |   29 +++++++++
 src/util.h            |   11 ++--
 src/w32-util.c        |   24 +-------
 13 files changed, 212 insertions(+), 92 deletions(-)
 create mode 100644 src/sys-util.h


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



From cvs at cvs.gnupg.org  Mon Aug  5 19:29:40 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Mon, 05 Aug 2013 19:29:40 +0200
Subject: [git] GCRYPT - branch, master, updated. libgcrypt-1.5.0-178-gd8e99a0
Message-ID: <E1V6O8s-0008Uz-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 GNU crypto library".

The branch, master has been updated
       via  d8e99a04dba6a606e879464cd11deee760d1e000 (commit)
      from  10dfa41b43a906031bc674ea41cd3073701011f3 (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 d8e99a04dba6a606e879464cd11deee760d1e000
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 5 18:58:41 2013 +0200

    mpi: Improve gcry_mpi_invm to detect bad input.
    
    * mpi/mpi-inv.c (gcry_mpi_invm): Return 0 for bad input.
    --
    
    Without this patch the function may enter and endless loop.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/mpi/mpi-inv.c b/mpi/mpi-inv.c
index 5d26946..15fa58f 100644
--- a/mpi/mpi-inv.c
+++ b/mpi/mpi-inv.c
@@ -165,6 +165,11 @@ gcry_mpi_invm( gcry_mpi_t x, gcry_mpi_t a, gcry_mpi_t n )
     int sign;
     int odd ;
 
+    if (!mpi_cmp_ui (a, 0))
+        return 0; /* Inverse does not exists.  */
+    if (!mpi_cmp_ui (n, 1))
+        return 0; /* Inverse does not exists.  */
+
     u = mpi_copy(a);
     v = mpi_copy(n);
 

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

Summary of changes:
 mpi/mpi-inv.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


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



From cvs at cvs.gnupg.org  Tue Aug  6 10:40:22 2013
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Tue, 06 Aug 2013 10:40:22 +0200
Subject: [git] GCRYPT - branch, master, updated. libgcrypt-1.5.0-181-g9a42181
Message-ID: <E1V6cM8-0006Bz-6d@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  9a421813123a2f5db0a91eaee4a45138efc9ad34 (commit)
       via  87eddc31ccba6decbddd1761dd42a208666cd311 (commit)
       via  ae6ffd9af38cbcac57c220960f683aab91db85cb (commit)
      from  d8e99a04dba6a606e879464cd11deee760d1e000 (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 9a421813123a2f5db0a91eaee4a45138efc9ad34
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Aug 6 14:38:51 2013 +0900

    cipher: fix another memory leak.
    
    * cipher/ecc.c (ecc_get_curve): Free TMP.

diff --git a/cipher/ecc.c b/cipher/ecc.c
index 375eeaf..b694d76 100644
--- a/cipher/ecc.c
+++ b/cipher/ecc.c
@@ -1319,6 +1319,7 @@ ecc_get_curve (gcry_mpi_t *pkey, int iterator, unsigned int *r_nbits)
                           tmp = scanval (domain_parms[idx].g_y);
                           if (!mpi_cmp (tmp, E.G.y))
                             {
+                              mpi_free (tmp);
                               result = domain_parms[idx].desc;
                               if (r_nbits)
                                 *r_nbits = domain_parms[idx].nbits;

commit 87eddc31ccba6decbddd1761dd42a208666cd311
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Aug 6 12:59:35 2013 +0900

    tests: fix memory leaks.
    
    * tests/pubkey.c (check_keys_crypt): Release L, X0, and X1.
    (check_keys): Release X.

diff --git a/tests/pubkey.c b/tests/pubkey.c
index ffaecb3..baf234c 100644
--- a/tests/pubkey.c
+++ b/tests/pubkey.c
@@ -144,6 +144,7 @@ check_keys_crypt (gcry_sexp_t pkey, gcry_sexp_t skey,
   /* Extract data from plaintext.  */
   l = gcry_sexp_find_token (plain0, "value", 0);
   x0 = gcry_sexp_nth_mpi (l, 1, GCRYMPI_FMT_USG);
+  gcry_sexp_release (l);
 
   /* Encrypt data.  */
   rc = gcry_pk_encrypt (&cipher, plain0, pkey);
@@ -160,7 +161,10 @@ check_keys_crypt (gcry_sexp_t pkey, gcry_sexp_t skey,
   if (rc)
     {
       if (decrypt_fail_code && gpg_err_code (rc) == decrypt_fail_code)
-        return; /* This is the expected failure code.  */
+	{
+	  gcry_mpi_release (x0);
+	  return; /* This is the expected failure code.  */
+	}
       die ("decryption failed: %s\n", gcry_strerror (rc));
     }
 
@@ -189,6 +193,8 @@ check_keys_crypt (gcry_sexp_t pkey, gcry_sexp_t skey,
   /* Compare.  */
   if (gcry_mpi_cmp (x0, x1))
     die ("data corrupted\n");
+  gcry_mpi_release (x0);
+  gcry_mpi_release (x1);
 }
 
 static void
@@ -218,6 +224,7 @@ check_keys (gcry_sexp_t pkey, gcry_sexp_t skey, unsigned int nbits_data,
 
   rc = gcry_sexp_build (&plain, NULL,
                         "(data (flags raw no-blinding) (value %m))", x);
+  gcry_mpi_release (x);
   if (rc)
     die ("converting data for encryption failed: %s\n",
 	 gcry_strerror (rc));

commit ae6ffd9af38cbcac57c220960f683aab91db85cb
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Aug 6 12:57:10 2013 +0900

    cipher: fix memory leaks.
    
    * cipher/elgamal.c (elg_generate_ext): Free XVALUE.
    
    * cipher/pubkey.c (sexp_elements_extract): Don't use IDX for loop.
    Call mpi_free.
    (sexp_elements_extract_ecc): Call mpi_free.

diff --git a/cipher/elgamal.c b/cipher/elgamal.c
index b40d132..7540e3f 100644
--- a/cipher/elgamal.c
+++ b/cipher/elgamal.c
@@ -641,7 +641,10 @@ elg_generate_ext (int algo, unsigned int nbits, unsigned long evalue,
     }
 
   if (xvalue)
-    ec = generate_using_x (&sk, nbits, xvalue, retfactors);
+    {
+      ec = generate_using_x (&sk, nbits, xvalue, retfactors);
+      mpi_free (xvalue);
+    }
   else
     {
       generate (&sk, nbits, retfactors);
diff --git a/cipher/pubkey.c b/cipher/pubkey.c
index b540bd5..e867169 100644
--- a/cipher/pubkey.c
+++ b/cipher/pubkey.c
@@ -1832,8 +1832,8 @@ sexp_elements_extract (gcry_sexp_t key_sexp, const char *element_names,
   if (!err)
     {
       /* Check that all elements are available.  */
-      for (name = element_names, idx = 0; *name; name++, idx++)
-        if (!elements[idx])
+      for (name = element_names, i = 0; *name; name++, i++)
+        if (!elements[i])
           break;
       if (*name)
         {
@@ -1857,7 +1857,7 @@ sexp_elements_extract (gcry_sexp_t key_sexp, const char *element_names,
     {
       for (i = 0; i < idx; i++)
         if (elements[i])
-          gcry_free (elements[i]);
+          mpi_free (elements[i]);
     }
   return err;
 }
@@ -1963,7 +1963,7 @@ sexp_elements_extract_ecc (gcry_sexp_t key_sexp, const char *element_names,
     {
       for (name = element_names, idx = 0; *name; name++, idx++)
         if (elements[idx])
-          gcry_free (elements[idx]);
+          mpi_free (elements[idx]);
     }
   return err;
 }

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

Summary of changes:
 cipher/ecc.c     |    1 +
 cipher/elgamal.c |    5 ++++-
 cipher/pubkey.c  |    8 ++++----
 tests/pubkey.c   |    9 ++++++++-
 4 files changed, 17 insertions(+), 6 deletions(-)


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



From cvs at cvs.gnupg.org  Tue Aug  6 11:06:04 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 06 Aug 2013 11:06:04 +0200
Subject: [git] GnuPG - branch, STABLE-BRANCH-2-0,
 updated. gnupg-2.0.20-26-g110b52f
Message-ID: <E1V6cl0-0006me-9z@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-0 has been updated
       via  110b52fffa77b339e6d59eba939408f7e87e7138 (commit)
       via  f3c5cc8bcd37e38b5d65db6a50466e22d03d1f0c (commit)
      from  7c028efc182234cd28bbfbeccff0107f334064f2 (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 110b52fffa77b339e6d59eba939408f7e87e7138
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Aug 6 10:31:54 2013 +0200

    Improve libcurl detection.
    
    * m4/libcurl.m4: Do not use AC_PATH_PROG if --with-libcurl as been
    given.  Suggested by John Marshall.
    --
    
    GnuPG-bug-id: 1510

diff --git a/m4/libcurl.m4 b/m4/libcurl.m4
index fe9809e..6299501 100644
--- a/m4/libcurl.m4
+++ b/m4/libcurl.m4
@@ -75,7 +75,11 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
      if test -d "$_libcurl_with" ; then
         LIBCURL_CPPFLAGS="-I$withval/include"
         _libcurl_ldflags="-L$withval/lib"
-        AC_PATH_PROG([_libcurl_config],["$withval/bin/curl-config"])
+        if test -x "$withval/bin/curl-config" ; then
+          _libcurl_config="$withval/bin/curl-config"
+        else
+          _libcurl_config=
+        fi
      else
 	AC_PATH_PROG([_libcurl_config],[curl-config])
      fi

commit f3c5cc8bcd37e38b5d65db6a50466e22d03d1f0c
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Aug 6 10:04:12 2013 +0200

    gpg: Remove legacy keyserver examples from the template conf file.
    
    * g10/options.skel: Update.

diff --git a/g10/options.skel b/g10/options.skel
index 534affc..e21431b 100644
--- a/g10/options.skel
+++ b/g10/options.skel
@@ -4,11 +4,11 @@
 # Options for GnuPG
 # Copyright 1998, 1999, 2000, 2001, 2002, 2003,
 #           2010 Free Software Foundation, Inc.
-# 
+#
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
-# 
+#
 # This file is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -101,14 +101,9 @@ require-cross-certification
 #
 # Example HKP keyservers:
 #      hkp://keys.gnupg.net
-#      hkp://subkeys.pgp.net
-#
-# Example email keyserver:
-#      mailto:pgp-public-keys at keys.pgp.net
 #
 # Example LDAP keyservers:
 #      ldap://pgp.surfnet.nl:11370
-#      ldap://keyserver.pgp.com
 #
 # Regular URL syntax applies, and you can set an alternate port
 # through the usual method:
@@ -131,8 +126,6 @@ require-cross-certification
 keyserver hkp://keys.gnupg.net
 #keyserver http://http-keys.gnupg.net
 #keyserver mailto:pgp-public-keys at keys.nl.pgp.net
-#keyserver ldap://pgp.surfnet.nl:11370
-#keyserver ldap://keyserver.pgp.com
 
 # Common options for keyserver functions:
 #

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

Summary of changes:
 g10/options.skel |   11 ++---------
 m4/libcurl.m4    |    6 +++++-
 2 files changed, 7 insertions(+), 10 deletions(-)


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



From cvs at cvs.gnupg.org  Tue Aug  6 18:41:54 2013
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Tue, 06 Aug 2013 18:41:54 +0200
Subject: [git] GpgOL - branch, master, updated. gpgol-1.1.3-51-gd1a9b54
Message-ID: <E1V6js5-0003L1-TQ@lists.gnupg.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".

The branch, master has been updated
       via  d1a9b54ba57016d0194ada1778f09126af1e9afd (commit)
      from  a81d6897e302fa0fceb73647d41ee27370bf1a57 (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 d1a9b54ba57016d0194ada1778f09126af1e9afd
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Aug 6 16:04:17 2013 +0000

    Implement add encrypted attachment
    
        Add a binary encrypted attachment to a Message object using
        OOM. The binary option requires very recent Versions of
        GPA or Kleopatra.
    
        * src/common.c, src/common.h (get_pretty_attachment_name),
        (get_tmp_outfile): New. Helper functions for attachments.
        * src/engine-assuan.c (op_assuan_encrypt): Handle binary option.
        * src/engine.h (ENGINE_FLAG_BINARY_OUTPUT): New.
        * src/mimemaker.c, src/mimemaker.h (sink_file_write): New. Sink
        to work on a file handle.
        * src/oomhelp.cpp, src/oomhelp.h (add_oom_attachment): New.
        Add an attachment to an Object with an Attachments collection.
        * src/ribbon-callbacks.cpp (addEncSignedAttachment): Implment
        adding an encrypted attachment.
    
    --
      Although it is still possible to add an attachment over MAPI
      I found no way to update the Inspector of the Message Object
      aside from closing it / opening a new inspector.

diff --git a/src/common.c b/src/common.c
index 9818ae5..dd8b2d7 100644
--- a/src/common.c
+++ b/src/common.c
@@ -1054,3 +1054,116 @@ fix_linebreaks (char *str, int *len)
   *dst = '\0';
   *len = dst - str;
 }
+
+/* Get a pretty name for the file at path path. File extension
+   will be set to work for the protocol as provided in protocol.
+   Returns NULL on success.
+   Caller must free result. */
+wchar_t *
+get_pretty_attachment_name (wchar_t *path, protocol_t protocol)
+{
+  wchar_t* pretty;
+  wchar_t* buf;
+
+  if (!path || !wcslen (path))
+    {
+      log_error("%s:%s: No path given", SRCNAME, __func__);
+      return NULL;
+    }
+
+  pretty = (wchar_t*) xmalloc ((MAX_PATH + 1) * sizeof (wchar_t));
+  memset (pretty, 0, (MAX_PATH + 1) * sizeof (wchar_t));
+
+  buf = wcsrchr (path, '\\') + 1;
+
+  if (!buf || !*buf)
+    {
+      log_error("%s:%s: No filename found in path", SRCNAME, __func__);
+      xfree (pretty);
+      return NULL;
+    }
+
+  wcscpy (pretty, buf);
+
+  buf = pretty + wcslen(pretty);
+  if (protocol == PROTOCOL_SMIME)
+    {
+      *(buf++) = '.';
+      *(buf++) = 'p';
+      *(buf++) = '7';
+      *(buf++) = 'm';
+
+    }
+  else
+    {
+      *(buf++) = '.';
+      *(buf++) = 'g';
+      *(buf++) = 'p';
+      *(buf++) = 'g';
+    }
+
+  return pretty;
+}
+
+/* Open a file in a temporary directory, take name as a
+   suggestion and put the open Handle in outHandle.
+   Returns the actually used file name in case there
+   were other files with that name. */
+wchar_t*
+get_tmp_outfile (wchar_t *name, HANDLE *outHandle)
+{
+  wchar_t tmpPath[MAX_PATH];
+  wchar_t *outName;
+  wchar_t *fileExt = NULL;
+  int tries = 1;
+
+  if (!name || !wcslen(name))
+    {
+      log_error ("%s:%s: Needs a name.",
+                 SRCNAME, __func__);
+      return NULL;
+    }
+
+  /* We should probably use the unicode variants here
+     but this would mean adding OpenStreamOnFileW to
+     out mapi */
+
+  if (!GetTempPathW (MAX_PATH, tmpPath))
+    {
+      log_error ("%s:%s: Could not get tmp path.",
+                 SRCNAME, __func__);
+      return NULL;
+    }
+
+  outName = (wchar_t*) xmalloc ((MAX_PATH + 1) * sizeof(wchar_t));
+  memset (outName, 0, (MAX_PATH + 1) * sizeof (wchar_t));
+
+  snwprintf (outName, MAX_PATH, L"%s%s", tmpPath, name);
+  fileExt = wcschr (wcschr(outName, '\\'), '.');
+
+  while ((*outHandle = CreateFileW (outName,
+                                    GENERIC_WRITE | GENERIC_READ,
+                                    0, /* We do not share this */
+                                    NULL,
+                                    CREATE_NEW,
+                                    FILE_ATTRIBUTE_TEMPORARY,
+                                    NULL)) == INVALID_HANDLE_VALUE)
+    {
+      wchar_t fnameBuf[MAX_PATH];
+      wchar_t origName[MAX_PATH];
+      snwprintf (origName, MAX_PATH, L"%s%s", tmpPath, name);
+      fileExt = wcschr (wcsrchr(origName, '\\'), '.');
+      wcsncpy (fnameBuf, origName, fileExt - origName);
+      snwprintf (outName, MAX_PATH, L"%s%i%s", fnameBuf, tries++, fileExt);
+      if (tries > 100)
+        {
+          /* You have to know when to give up,.. */
+          log_error ("%s:%s: Could not get a name out of 100 tries",
+                     SRCNAME, __func__);
+          xfree (outName);
+          return NULL;
+        }
+    }
+
+  return outName;
+}
diff --git a/src/common.h b/src/common.h
index 265a470..a3efad6 100644
--- a/src/common.h
+++ b/src/common.h
@@ -190,6 +190,11 @@ size_t qp_decode (char *buffer, size_t length, int *r_slbrk);
 void b64_init (b64_state_t *state);
 size_t b64_decode (b64_state_t *state, char *buffer, size_t length);
 
+/* Get a temporary filename with and its name */
+wchar_t *get_tmp_outfile (wchar_t *name, HANDLE *outHandle);
+
+wchar_t *get_pretty_attachment_name (wchar_t *path, protocol_t protocol);
+
 /* The length of the boundary - the buffer needs to be allocated one
    byte larger. */
 #define BOUNDARYSIZE 20
diff --git a/src/engine-assuan.c b/src/engine-assuan.c
index 6523e1b..9af3782 100644
--- a/src/engine-assuan.c
+++ b/src/engine-assuan.c
@@ -1704,7 +1704,11 @@ op_assuan_encrypt (protocol_t protocol,
   err = assuan_transact (ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
   if (err)
     goto leave;
-  snprintf (line, sizeof line, "OUTPUT FD=%d", (unsigned int)outpipe[1]);
+  if (flags & ENGINE_FLAG_BINARY_OUTPUT)
+    snprintf (line, sizeof line, "OUTPUT FD=%d --binary",
+              (unsigned int)outpipe[1]);
+  else
+    snprintf (line, sizeof line, "OUTPUT FD=%d", (unsigned int)outpipe[1]);
   err = assuan_transact (ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
   if (err)
     goto leave;
diff --git a/src/engine.h b/src/engine.h
index f92dc4f..0dd07fc 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -44,8 +44,9 @@ typedef struct engine_keyinfo_s *engine_keyinfo_t;
 struct engine_filter_s;
 typedef struct engine_filter_s *engine_filter_t;
 
-/* Flag values used by the engine functions.  */ 
-#define ENGINE_FLAG_SIGN_FOLLOWS 1  /* Expect a sign+encrypt operation.  */
+/* Flag values used by the engine functions.  */
+#define ENGINE_FLAG_SIGN_FOLLOWS  1  /* Expect a sign+encrypt operation.  */
+#define ENGINE_FLAG_BINARY_OUTPUT 2  /* Create binary output */
 
 
 
diff --git a/src/mimemaker.c b/src/mimemaker.c
index 6a358a4..93450db 100644
--- a/src/mimemaker.c
+++ b/src/mimemaker.c
@@ -95,6 +95,29 @@ sink_std_write (sink_t sink, const void *data, size_t datalen)
   return 0;
 }
 
+/* Write method used with a sink_t that contains a file object.  */
+int
+sink_file_write (sink_t sink, const void *data, size_t datalen)
+{
+  HANDLE hFile = sink->cb_data;
+  DWORD written = NULL;
+
+  if (!hFile || hFile == INVALID_HANDLE_VALUE)
+    {
+      log_error ("%s:%s: sink not setup for writing", SRCNAME, __func__);
+      return -1;
+    }
+  if (!data)
+    return 0;  /* Flush - nothing to do here.  */
+
+  if (!WriteFile (hFile, data, datalen, &written, NULL))
+    {
+      log_error ("%s:%s: Write failed: ", SRCNAME, __func__);
+      return -1;
+    }
+  return 0;
+}
+
 
 /* Make sure that PROTOCOL is usable or return a suitable protocol.
    On error PROTOCOL_UNKNOWN is returned.  */
diff --git a/src/mimemaker.h b/src/mimemaker.h
index 0c804b3..fa7eca7 100644
--- a/src/mimemaker.h
+++ b/src/mimemaker.h
@@ -50,6 +50,7 @@ int mime_encrypt (LPMESSAGE message, HWND hwnd,
 int mime_sign_encrypt (LPMESSAGE message, HWND hwnd,
                        protocol_t protocol, char **recipients);
 int sink_std_write (sink_t sink, const void *data, size_t datalen);
+int sink_file_write (sink_t sink, const void *data, size_t datalen);
 int sink_encryption_write (sink_t encsink, const void *data, size_t datalen);
 int write_buffer_for_cb (void *opaque, const void *data, size_t datalen);
 int write_buffer (sink_t sink, const void *data, size_t datalen);
diff --git a/src/oomhelp.cpp b/src/oomhelp.cpp
index 21be27f..a0e25ff 100644
--- a/src/oomhelp.cpp
+++ b/src/oomhelp.cpp
@@ -824,3 +824,75 @@ get_oom_recipients (LPDISPATCH recipients)
     }
   return recipientAddrs;
 }
+
+/* Add an attachment to the outlook dispatcher disp
+   that has an Attachment property.
+   inFile is the path to the attachment. Name is the
+   name that should be used in outlook. */
+int
+add_oom_attachment (LPDISPATCH disp, wchar_t* inFileW)
+{
+  LPDISPATCH attachments = get_oom_object (disp, "Attachments");
+
+  DISPID dispid;
+  DISPPARAMS dispparams;
+  VARIANT vtResult;
+  VARIANT aVariant[4];
+  HRESULT hr;
+  BSTR inFileB = NULL;
+  unsigned int argErr = 0;
+  EXCEPINFO execpinfo;
+
+  if (!inFileW || !wcslen (inFileW))
+    {
+      log_error ("%s:%s: no filename provided", SRCNAME, __func__);
+      return -1;
+    }
+
+  dispid = lookup_oom_dispid (attachments, "Add");
+
+  if (dispid == DISPID_UNKNOWN)
+  {
+    log_error ("%s:%s: could not find attachment dispatcher",
+               SRCNAME, __func__);
+    return -1;
+  }
+
+  inFileB = SysAllocString (inFileW);
+
+  dispparams.rgvarg = aVariant;
+
+  /* Contrary to the documentation the Source is the last
+     parameter and not the first. Additionally DisplayName
+     is documented but gets ignored by Outlook since Outlook
+     2003 */
+
+  dispparams.rgvarg[0].vt = VT_BSTR; /* DisplayName */
+  dispparams.rgvarg[0].bstrVal = NULL;
+  dispparams.rgvarg[1].vt = VT_INT;  /* Position */
+  dispparams.rgvarg[1].intVal = 1;
+  dispparams.rgvarg[2].vt = VT_INT;  /* Type */
+  dispparams.rgvarg[2].intVal = 1;
+  dispparams.rgvarg[3].vt = VT_BSTR; /* Source */
+  dispparams.rgvarg[3].bstrVal = inFileB;
+  dispparams.cArgs = 4;
+  dispparams.cNamedArgs = 0;
+  VariantInit (&vtResult);
+  hr = attachments->Invoke (dispid, IID_NULL, LOCALE_SYSTEM_DEFAULT,
+                            DISPATCH_METHOD, &dispparams,
+                            &vtResult, &execpinfo, &argErr);
+  if (hr != S_OK)
+    {
+      log_debug ("%s:%s: error: invoking Add p=%p vt=%d hr=0x%x argErr=0x%x",
+                 SRCNAME, __func__,
+                 vtResult.pdispVal, vtResult.vt, (unsigned int)hr,
+                 (unsigned int)argErr);
+      dump_excepinfo (execpinfo);
+    }
+
+  SysFreeString (inFileB);
+  VariantClear (&vtResult);
+  RELDISP (attachments);
+
+  return hr == S_OK ? 0 : -1;
+}
diff --git a/src/oomhelp.h b/src/oomhelp.h
index 231c27d..7858b42 100644
--- a/src/oomhelp.h
+++ b/src/oomhelp.h
@@ -122,8 +122,11 @@ void del_oom_button (LPDISPATCH button);
 HWND get_oom_context_window (LPDISPATCH context);
 
 /* Get the address of the recipients as string list */
-char **
-get_oom_recipients (LPDISPATCH recipients);
+char ** get_oom_recipients (LPDISPATCH recipients);
+
+/* Add an attachment to a dispatcher */
+int
+add_oom_attachment (LPDISPATCH disp, wchar_t* inFile);
 
 #ifdef __cplusplus
 }
diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index 0afead1..966d74f 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -825,6 +825,216 @@ encryptSelection (LPDISPATCH ctrl)
 HRESULT
 addEncSignedAttachment (LPDISPATCH ctrl)
 {
-  /* TODO */
+  LPDISPATCH context = NULL;
+  LPDISPATCH mailItem = NULL;
+  LPDISPATCH sender = NULL;
+  LPDISPATCH recipients = NULL;
+  HRESULT hr;
+  char* senderAddr = NULL;
+  char** recipientAddrs = NULL;
+
+  HWND curWindow;
+  char *fileToEncrypt = NULL;
+  wchar_t *fileToEncryptW = NULL;
+  wchar_t *encryptedFile = NULL;
+  wchar_t *attachName = NULL;
+  HANDLE hFile = NULL;
+  HANDLE hEncFile = NULL;
+
+  unsigned int session_number;
+  struct sink_s encsinkmem;
+  sink_t encsink = &encsinkmem;
+  struct sink_s sinkmem;
+  sink_t sink = &sinkmem;
+  engine_filter_t filter = NULL;
+  protocol_t protocol;
+  STATSTG tmpStat;
+  int rc = 0;
+  int i = 0;
+  LPSTREAM tmpstream = NULL;
+
+  memset (encsink, 0, sizeof *encsink);
+  memset (sink, 0, sizeof *sink);
+
+  hr = getContext (ctrl, &context);
+  if (FAILED(hr))
+      return hr;
+
+  /* First do the check for recipients as this is likely
+     to fail */
+  mailItem = get_oom_object (context, "CurrentItem");
+  sender = get_oom_object (mailItem, "Session.CurrentUser");
+  recipients = get_oom_object (mailItem, "Recipients");
+  recipientAddrs = get_oom_recipients (recipients);
+
+  if (!recipientAddrs || !(*recipientAddrs))
+    {
+      MessageBox (NULL,
+                  _("Please add at least one recipent."),
+                  _("GpgOL"),
+                  MB_ICONINFORMATION|MB_OK);
+      goto failure;
+    }
+
+  /* Get a file handle to read from */
+  fileToEncrypt = get_open_filename (NULL, _("Select file to encrypt"));
+
+  if (!fileToEncrypt)
+    {
+      log_debug ("No file selected");
+      goto failure;
+    }
+
+  fileToEncryptW = utf8_to_wchar2 (fileToEncrypt, strlen(fileToEncrypt));
+  xfree (fileToEncrypt);
+
+  hFile = CreateFileW (fileToEncryptW,
+                       GENERIC_READ,
+                       FILE_SHARE_READ,
+                       NULL,
+                       OPEN_EXISTING,
+                       FILE_ATTRIBUTE_NORMAL,
+                       NULL);
+  if (hFile == INVALID_HANDLE_VALUE)
+    {
+      /* Should not happen as the Open File dialog
+         should have prevented this.
+         Maybe this also happens when a file is
+         not readable. In that case we might want
+         to switch to a localized error naming the file. */
+      MessageBox (NULL,
+                  "Internal error in GpgOL.\n"
+                  "Could not open File.",
+                  _("GpgOL"),
+                  MB_ICONERROR|MB_OK);
+      return S_OK;
+    }
+
+  /* Now do the encryption preperations */
+
+  if (!mailItem || !sender || !recipients)
+    {
+      MessageBox (NULL,
+                  "Internal error in GpgOL.\n"
+                  "Could not find all objects.",
+                  _("GpgOL"),
+                  MB_ICONERROR|MB_OK);
+      log_error ("%s:%s: Could not find all objects.",
+                 SRCNAME, __func__);
+      goto failure;
+    }
+
+  senderAddr = get_oom_string (sender, "Address");
+
+  session_number = engine_new_session_number ();
+
+  /* Prepare the encryption sink */
+  if ((rc = engine_create_filter (&filter, write_buffer_for_cb, sink)))
+    {
+      goto failure;
+    }
+
+  encsink->cb_data = filter;
+  encsink->writefnc = sink_encryption_write;
+
+  engine_set_session_number (filter, session_number);
+  engine_set_session_title (filter, _("GpgOL"));
+  if ((rc=engine_encrypt_prepare (filter, curWindow,
+                                  PROTOCOL_UNKNOWN,
+                                  ENGINE_FLAG_BINARY_OUTPUT,
+                                  senderAddr, recipientAddrs, &protocol)))
+    {
+      log_error ("%s:%s: engine encrypt prepare failed : %s",
+                 SRCNAME, __func__, gpg_strerror (rc));
+      goto failure;
+    }
+
+  attachName = get_pretty_attachment_name (fileToEncryptW, protocol);
+
+  if (!attachName)
+    {
+      log_error ("%s:%s: Could not get a decent attachment name",
+                 SRCNAME, __func__);
+      goto failure;
+    }
+
+  encryptedFile = get_tmp_outfile (attachName, &hEncFile);
+  sink->cb_data = hEncFile;
+  sink->writefnc = sink_file_write;
+
+  if ((rc=engine_encrypt_start (filter, 0)))
+    {
+      log_error ("%s:%s: engine encrypt start failed: %s",
+                 SRCNAME, __func__, gpg_strerror (rc));
+      goto failure;
+    }
+
+  /* Read the file in chunks and write them to the encryption
+     buffer */
+  {
+    char buf[4096];
+    DWORD bytesRead = 0;
+    do
+      {
+        if (!ReadFile (hFile, buf, sizeof buf, &bytesRead, NULL))
+          {
+            rc = -1;
+            log_error ("%s:%s: Could not read source file: %s",
+                       SRCNAME, __func__);
+            goto failure;
+          }
+        if ((rc = write_buffer (encsink, bytesRead ? buf : NULL, bytesRead)))
+          {
+            rc = -1;
+            log_error ("%s:%s: Could not wirte out buffer",
+                       SRCNAME, __func__);
+            goto failure;
+          }
+      }
+    while (bytesRead);
+  }
+  /* Lets hope the user did not select a huge file. We are hanging
+     here until encryption is completed.. */
+  if ((rc = engine_wait (filter)))
+    goto failure;
+
+  filter = NULL; /* Not valid anymore.  */
+  encsink->cb_data = NULL; /* Not needed anymore.  */
+
+  if (!sink->enc_counter)
+    {
+      log_error ("%s:%s: nothing received from engine", SRCNAME, __func__);
+      goto failure;
+    }
+
+  /* Now we have an encrypted file behind encryptedFile. Let's add it */
+  add_oom_attachment (mailItem, encryptedFile);
+
+failure:
+  if (filter)
+    engine_cancel (filter);
+
+  if (hEncFile)
+    {
+      CloseHandle (hEncFile);
+      DeleteFileW (encryptedFile);
+    }
+  xfree (senderAddr);
+  xfree (encryptedFile);
+  xfree (fileToEncryptW);
+  xfree (attachName);
+  RELDISP (mailItem);
+  RELDISP (sender);
+  RELDISP (recipients);
+
+  if (hFile)
+    CloseHandle (hFile);
+  if (recipientAddrs)
+    {
+      for (i=0; recipientAddrs && recipientAddrs[i]; i++)
+        xfree (recipientAddrs[i]);
+      xfree (recipientAddrs);
+    }
+
   return S_OK;
 }

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

Summary of changes:
 src/common.c             |  113 ++++++++++++++++++++++++
 src/common.h             |    5 +
 src/engine-assuan.c      |    6 +-
 src/engine.h             |    5 +-
 src/mimemaker.c          |   23 +++++
 src/mimemaker.h          |    1 +
 src/oomhelp.cpp          |   72 ++++++++++++++++
 src/oomhelp.h            |    7 +-
 src/ribbon-callbacks.cpp |  212 +++++++++++++++++++++++++++++++++++++++++++++-
 9 files changed, 438 insertions(+), 6 deletions(-)


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



From cvs at cvs.gnupg.org  Wed Aug  7 10:18:55 2013
From: cvs at cvs.gnupg.org (by Jussi Kivilinna)
Date: Wed, 07 Aug 2013 10:18:55 +0200
Subject: [git] GCRYPT - branch, master, updated. libgcrypt-1.5.0-182-g065d446
Message-ID: <E1V6yUo-0000gd-9T@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  065d446478bf68553339fc77a89b8369bd110a18 (commit)
      from  9a421813123a2f5db0a91eaee4a45138efc9ad34 (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 065d446478bf68553339fc77a89b8369bd110a18
Author: Jussi Kivilinna <jussi.kivilinna at iki.fi>
Date:   Wed Aug 7 10:36:41 2013 +0300

    Fix building on W32 (cannot export symbol 'gcry_sexp_get_buffer')
    
    * src/libgcrypt.def: Change 'gcry_sexp_get_buffer' to
    'gcry_sexp_nth_buffer'.
    --
    
    Commit 2d3e8d4d9 "sexp: Add function gcry_sexp_nth_buffer." added
    'gcry_sexp_get_buffer' to libgcrypt.def, when it should have been
    'gcry_sexp_nth_buffer'.
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>

diff --git a/src/libgcrypt.def b/src/libgcrypt.def
index bbc8f43..f275ae9 100644
--- a/src/libgcrypt.def
+++ b/src/libgcrypt.def
@@ -237,7 +237,7 @@ EXPORTS
 
       _gcry_mpi_get_const       @213
 
-      gcry_sexp_get_buffer      @214
+      gcry_sexp_nth_buffer      @214
 
 
 ;; end of file with public symbols for Windows.

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

Summary of changes:
 src/libgcrypt.def |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


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



From cvs at cvs.gnupg.org  Wed Aug  7 11:30:05 2013
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Wed, 07 Aug 2013 11:30:05 +0200
Subject: [git] GCRYPT - branch, master, updated. libgcrypt-1.5.0-183-gcc08264
Message-ID: <E1V6zbf-0001tS-Li@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  cc082642c1b0f2a3e9ca78e1ffd3f64417c204bd (commit)
      from  065d446478bf68553339fc77a89b8369bd110a18 (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 cc082642c1b0f2a3e9ca78e1ffd3f64417c204bd
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Wed Aug 7 08:56:18 2013 +0900

    tests: fix memory leaks.
    
    * tests/benchmark.c (dsa_bench): Release SIG.
    
    * tests/mpitests.c (test_powm): Release BASE, EXP, MOD, and RES.
    
    * tests/prime.c (check_primes): Release PRIME.
    
    * tests/tsexp.c (basic): Use intermediate variable M for constant.
    Release S1, S2 and A.

diff --git a/tests/benchmark.c b/tests/benchmark.c
index 79048a3..f332003 100644
--- a/tests/benchmark.c
+++ b/tests/benchmark.c
@@ -864,7 +864,7 @@ dsa_bench (int iterations, int print_header)
   int p_sizes[3] = { 1024, 2048, 3072 };
   int q_sizes[3] = { 160, 224, 256 };
   gcry_sexp_t data;
-  gcry_sexp_t sig;
+  gcry_sexp_t sig = NULL;
   int i, j;
 
   err = gcry_sexp_sscan (pub_key+0, NULL, sample_public_dsa_key_1024,
@@ -916,6 +916,7 @@ dsa_bench (int iterations, int print_header)
       start_timer ();
       for (j=0; j < iterations; j++)
         {
+          gcry_sexp_release (sig);
           err = gcry_pk_sign (&sig, data, sec_key[i]);
           if (err)
             {
@@ -947,6 +948,7 @@ dsa_bench (int iterations, int print_header)
 
       gcry_sexp_release (sig);
       gcry_sexp_release (data);
+      sig = NULL;
     }
 
 
diff --git a/tests/mpitests.c b/tests/mpitests.c
index 432f3e8..03c15b9 100644
--- a/tests/mpitests.c
+++ b/tests/mpitests.c
@@ -362,6 +362,10 @@ test_powm (void)
   if (gcry_mpi_cmp (res, base))
     die ("test_powm failed at %d\n", __LINE__);
 
+  gcry_mpi_release (base);
+  gcry_mpi_release (exp);
+  gcry_mpi_release (mod);
+  gcry_mpi_release (res);
   /* Fixme: We should add the rest of the cases of course.  */
 
 
diff --git a/tests/prime.c b/tests/prime.c
index 6e825ae..89800e8 100644
--- a/tests/prime.c
+++ b/tests/prime.c
@@ -95,6 +95,7 @@ check_primes (void)
       gcry_mpi_add_ui (prime, prime, 1);
       err = gcry_prime_check (prime, 0);
       assert (err);
+      gcry_mpi_release (prime); prime = NULL;
     }
 }
 
diff --git a/tests/tsexp.c b/tests/tsexp.c
index cef3ed1..7c4f7c8 100644
--- a/tests/tsexp.c
+++ b/tests/tsexp.c
@@ -89,44 +89,52 @@ basic (void)
 
   for (pass=0;;pass++)
     {
+      gcry_mpi_t m;
+
       switch (pass)
         {
         case 0:
           string = ("(public-key (dsa (p #41424344#) (y this_is_y) "
                     "(q #61626364656667#) (g %m)))");
 
-          if ( gcry_sexp_build (&sexp, NULL, string,
-                                gcry_mpi_set_ui (NULL, 42)) )
+          m = gcry_mpi_set_ui (NULL, 42);
+          if ( gcry_sexp_build (&sexp, NULL, string, m ) )
             {
+              gcry_mpi_release (m);
               fail (" scanning `%s' failed\n", string);
               return;
             }
+          gcry_mpi_release (m);
           break;
 
         case 1:
           string = ("(public-key (dsa (p #41424344#) (y this_is_y) "
                     "(q %b) (g %m)))");
 
+          m = gcry_mpi_set_ui (NULL, 42);
           if ( gcry_sexp_build (&sexp, NULL, string,
-                                15, "foo\0\x01\0x02789012345",
-                                gcry_mpi_set_ui (NULL, 42)) )
+                                15, "foo\0\x01\0x02789012345", m) )
             {
+              gcry_mpi_release (m);
               fail (" scanning `%s' failed\n", string);
               return;
             }
+          gcry_mpi_release (m);
           break;
 
         case 2:
           string = ("(public-key (dsa (p #41424344#) (y silly_y_value) "
                     "(q %b) (g %m)))");
 
+          m = gcry_mpi_set_ui (NULL, 17);
           if ( gcry_sexp_build (&sexp, NULL, string,
-                                secure_buffer_len, secure_buffer,
-                                gcry_mpi_set_ui (NULL, 17)) )
+                                secure_buffer_len, secure_buffer, m) )
             {
+              gcry_mpi_release (m);
               fail (" scanning `%s' failed\n", string);
               return;
             }
+          gcry_mpi_release (m);
           if (!gcry_is_secure (sexp))
             fail ("gcry_sexp_build did not switch to secure memory\n");
           break;
@@ -144,13 +152,15 @@ basic (void)
 
             string = ("(public-key (dsa (p #41424344#) (parm %S) "
                       "(y dummy)(q %b) (g %m)))");
+            m = gcry_mpi_set_ui (NULL, 17);
             if ( gcry_sexp_build (&sexp, NULL, string, help_sexp,
-                                  secure_buffer_len, secure_buffer,
-                                  gcry_mpi_set_ui (NULL, 17)) )
+                                  secure_buffer_len, secure_buffer, m) )
               {
+                gcry_mpi_release (m);
                 fail (" scanning `%s' failed\n", string);
                 return;
               }
+            gcry_mpi_release (m);
             gcry_sexp_release (help_sexp);
           }
           break;
@@ -181,6 +191,7 @@ basic (void)
           p = gcry_sexp_nth_data (s1, 0, &n);
           if (!p)
             {
+              gcry_sexp_release (s1);
               fail ("no car for `%s'\n", token);
               continue;
             }
@@ -189,13 +200,16 @@ basic (void)
           s2 = gcry_sexp_cdr (s1);
           if (!s2)
             {
+              gcry_sexp_release (s1);
               fail ("no cdr for `%s'\n", token);
               continue;
             }
 
           p = gcry_sexp_nth_data (s2, 0, &n);
+          gcry_sexp_release (s2);
           if (p)
             {
+              gcry_sexp_release (s1);
               fail ("data at car of `%s'\n", token);
               continue;
             }
@@ -203,6 +217,7 @@ basic (void)
           if (parm)
             {
               s2 = gcry_sexp_find_token (s1, parm, strlen (parm));
+              gcry_sexp_release (s1);
               if (!s2)
                 {
                   fail ("didn't found `%s'\n", parm);
@@ -211,6 +226,7 @@ basic (void)
               p = gcry_sexp_nth_data (s2, 0, &n);
               if (!p)
                 {
+                  gcry_sexp_release (s2);
                   fail("no car for `%s'\n", parm );
                   continue;
                 }
@@ -218,18 +234,23 @@ basic (void)
               p = gcry_sexp_nth_data (s2, 1, &n);
               if (!p)
                 {
+                  gcry_sexp_release (s2);
                   fail("no cdr for `%s'\n", parm );
                   continue;
                 }
               info ("cdr=`%.*s'\n", (int)n, p);
 
               a = gcry_sexp_nth_mpi (s2, 0, GCRYMPI_FMT_USG);
+              gcry_sexp_release (s2);
               if (!a)
                 {
                   fail("failed to cdr the mpi for `%s'\n", parm);
                   continue;
                 }
+              gcry_mpi_release (a);
             }
+          else
+            gcry_sexp_release (s1);
         }
 
       gcry_sexp_release (sexp);

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

Summary of changes:
 tests/benchmark.c |    4 +++-
 tests/mpitests.c  |    4 ++++
 tests/prime.c     |    1 +
 tests/tsexp.c     |   37 +++++++++++++++++++++++++++++--------
 4 files changed, 37 insertions(+), 9 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Aug  8 15:48:39 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Thu, 08 Aug 2013 15:48:39 +0200
Subject: [git] GCRYPT - branch, master, updated. libgcrypt-1.5.0-184-g426cbc9
Message-ID: <E1V7Q7I-0007sa-M3@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  426cbc9feca0c8f46208fb3670adab95f9e46087 (commit)
      from  cc082642c1b0f2a3e9ca78e1ffd3f64417c204bd (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 426cbc9feca0c8f46208fb3670adab95f9e46087
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 8 15:16:48 2013 +0200

    mpi: Clear immutable flag on the result of gcry_mpi_set.
    
    * mpi/mpiutil.c (gcry_mpi_set): Reset immutable and const flags.
    * tests/mpitests.c (test_const_and_immutable): Add a test for this.
    --
    
    gcry_mpi_set shall behave like gcry_mpi_copy and thus reset those
    special flags.  Problem reported by Christian Grothoff.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/mpi/mpiutil.c b/mpi/mpiutil.c
index cff15b7..a65d236 100644
--- a/mpi/mpiutil.c
+++ b/mpi/mpiutil.c
@@ -397,6 +397,7 @@ gcry_mpi_set( gcry_mpi_t w, gcry_mpi_t u)
   MPN_COPY( wp, up, usize );
   w->nlimbs = usize;
   w->flags = u->flags;
+  w->flags &= ~(16|32); /* Reset the immutable and constant flags.  */
   w->sign = usign;
   return w;
 }
diff --git a/tests/mpitests.c b/tests/mpitests.c
index 03c15b9..e1c51d1 100644
--- a/tests/mpitests.c
+++ b/tests/mpitests.c
@@ -143,6 +143,23 @@ test_const_and_immutable (void)
   if (!gcry_mpi_get_flag (one, GCRYMPI_FLAG_CONST))
     die ("const flag unexpectly cleared\n");
 
+
+  second_one = gcry_mpi_set (NULL, GCRYMPI_CONST_ONE);
+  if (gcry_mpi_get_flag (second_one, GCRYMPI_FLAG_IMMUTABLE))
+    die ("immutable flag not cleared by mpi_set (NULL,x)\n");
+  if (gcry_mpi_get_flag (second_one, GCRYMPI_FLAG_CONST))
+    die ("const flag not cleared by mpi_set (NULL,x)\n");
+  gcry_mpi_release (second_one);
+
+  second_one = gcry_mpi_set_ui (NULL, 42);
+  gcry_mpi_set (second_one, GCRYMPI_CONST_ONE);
+  if (gcry_mpi_get_flag (second_one, GCRYMPI_FLAG_IMMUTABLE))
+    die ("immutable flag not cleared after mpi_set (a,x)\n");
+  if (gcry_mpi_get_flag (second_one, GCRYMPI_FLAG_CONST))
+    die ("const flag not cleared mpi_set (a,x)\n");
+  gcry_mpi_release (second_one);
+
+
   /* Due to the the constant flag the release below should be a NOP
      and will leak memory.  */
   gcry_mpi_release (one);

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

Summary of changes:
 mpi/mpiutil.c    |    1 +
 tests/mpitests.c |   17 +++++++++++++++++
 2 files changed, 18 insertions(+), 0 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Aug  8 16:52:21 2013
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Thu, 08 Aug 2013 16:52:21 +0200
Subject: [git] GpgOL - branch, master, updated. gpgol-1.1.3-56-gc607ce5
Message-ID: <E1V7R6w-0000Q6-PS@lists.gnupg.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".

The branch, master has been updated
       via  c607ce5551ec261b0c51daf10c32142cd7c60eb2 (commit)
       via  d7e589d22a2bce76847d7f77ae89b45d7b911eb2 (commit)
       via  08984c034b6e04a5f49c5705eac1499fd94f06ad (commit)
       via  eb4a8b909508994236fcb8e967fe90a1ddbcf8b5 (commit)
       via  02c82f9197d0fa7dabce2e9fda1f8ca6514eec3b (commit)
      from  d1a9b54ba57016d0194ada1778f09126af1e9afd (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 c607ce5551ec261b0c51daf10c32142cd7c60eb2
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Aug 8 14:10:36 2013 +0000

    Add signature support for files and text
    
        For files a detached signature is created and additionally
        attached. This also generalizes the encryptInspector and
        uses it as a more generic interface to the message composer
        context.
    
        * src/common.c, src/common.h (get_pretty_attachment_name): Add
        Parameter to query for the name of a detached signature.
        * src/dialogs.h: Define ID for sign-48.png
        * src/engine-assuan.c, src/engine-assuan.h (op_assuan_sign): Add
        flags parameter to control signature options.
        * src/engine.c (engine_sign_start): Create detached signatures
        by default.
        (engine_sign_opaque_start): New. Creates an opaque signature.
        * src/engine.h (ENGINE_FLAG_DETACHED): New.
        * src/gpgoladdin.cpp (GetIDsOfNames, Invoke, GetCustomUI): Add
        sign Action.
        * src/sign-48.png: New.
        * src/Makefile.am (EXTRA_DIST): Add sing-48.png
        * src/ribbon-callbacks.cpp (copyFileToSink): New. Helper function
        to copy the contents of a file into a sink.
        (attachSignature): New. Helper function to add a detached signature
        of a File to a MailItem.
        (encryptInspector, do_composer_action): Renamed. Actions and data is
        now controled by flags. Added sign action.
        (decryptInspector): Use subject as session title.
        (attachEncryptedFile): New. Attaches an encrypted file. Optionally
        also attaches the signature of that file.
        * src/ribbon-callbacks.h: Update accordingly.
    
    --
      It is not clear how we will handle text sign. For now you can just
      dump opaque signed data in the messagecomposer if you want to.
      Some clients like Kmail handle this gracefully. But we also need
      support for verify in Outlook.

diff --git a/src/Makefile.am b/src/Makefile.am
index 1c01565..c61a5d6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,6 +34,7 @@ EXTRA_DIST = \
 	key-manager-64.png \
 	decrypt-16.png decrypt-48.png \
 	encrypt-sign-file-48.png \
+	sign-48.png \
 	logo.bmp README.icons
 
 EXEEXT = .dll
diff --git a/src/common.c b/src/common.c
index 199103f..8473fee 100644
--- a/src/common.c
+++ b/src/common.c
@@ -1056,11 +1056,14 @@ fix_linebreaks (char *str, int *len)
 }
 
 /* Get a pretty name for the file at path path. File extension
-   will be set to work for the protocol as provided in protocol.
+   will be set to work for the protocol as provided in protocol and
+   depends on the signature setting. Set signature to 0 if the
+   extension should not be a signature extension.
    Returns NULL on success.
    Caller must free result. */
 wchar_t *
-get_pretty_attachment_name (wchar_t *path, protocol_t protocol)
+get_pretty_attachment_name (wchar_t *path, protocol_t protocol,
+                            int signature)
 {
   wchar_t* pretty;
   wchar_t* buf;
@@ -1086,20 +1089,39 @@ get_pretty_attachment_name (wchar_t *path, protocol_t protocol)
   wcscpy (pretty, buf);
 
   buf = pretty + wcslen(pretty);
-  if (protocol == PROTOCOL_SMIME)
+  if (signature)
     {
-      *(buf++) = '.';
-      *(buf++) = 'p';
-      *(buf++) = '7';
-      *(buf++) = 'm';
-
+      if (protocol == PROTOCOL_SMIME)
+        {
+          *(buf++) = '.';
+          *(buf++) = 'p';
+          *(buf++) = '7';
+          *(buf++) = 's';
+        }
+      else
+        {
+          *(buf++) = '.';
+          *(buf++) = 's';
+          *(buf++) = 'i';
+          *(buf++) = 'g';
+        }
     }
   else
     {
-      *(buf++) = '.';
-      *(buf++) = 'g';
-      *(buf++) = 'p';
-      *(buf++) = 'g';
+      if (protocol == PROTOCOL_SMIME)
+        {
+          *(buf++) = '.';
+          *(buf++) = 'p';
+          *(buf++) = '7';
+          *(buf++) = 'm';
+        }
+      else
+        {
+          *(buf++) = '.';
+          *(buf++) = 'g';
+          *(buf++) = 'p';
+          *(buf++) = 'g';
+        }
     }
 
   return pretty;
diff --git a/src/common.h b/src/common.h
index a3efad6..c525a17 100644
--- a/src/common.h
+++ b/src/common.h
@@ -193,7 +193,8 @@ size_t b64_decode (b64_state_t *state, char *buffer, size_t length);
 /* Get a temporary filename with and its name */
 wchar_t *get_tmp_outfile (wchar_t *name, HANDLE *outHandle);
 
-wchar_t *get_pretty_attachment_name (wchar_t *path, protocol_t protocol);
+wchar_t *get_pretty_attachment_name (wchar_t *path, protocol_t protocol,
+                                     int signature);
 
 /* The length of the boundary - the buffer needs to be allocated one
    byte larger. */
diff --git a/src/dialogs.h b/src/dialogs.h
index e140507..7da915a 100644
--- a/src/dialogs.h
+++ b/src/dialogs.h
@@ -141,5 +141,6 @@
 #define IDI_DECRYPT_48_PNG              6011
 #define IDI_KEY_MANAGER_64_PNG          6020
 #define IDI_ENCSIGN_FILE_48_PNG         6030
+#define IDI_SIGN_48_PNG                 6040
 
 #endif /*DIALOGS_H*/
diff --git a/src/dialogs.rc b/src/dialogs.rc
index a5ba635..48ab013 100644
--- a/src/dialogs.rc
+++ b/src/dialogs.rc
@@ -34,6 +34,7 @@ IDB_SIGN_16               BITMAP  DISCARDABLE  "sign-16.bmp"
 IDB_SIGN_16M              BITMAP  DISCARDABLE  "sign-16m.bmp"
 IDB_SIGN_32               BITMAP  DISCARDABLE  "sign-32.bmp"
 IDB_SIGN_32M              BITMAP  DISCARDABLE  "sign-32m.bmp"
+IDI_SIGN_48_PNG           RCDATA               "sign-48.png"
 
 IDB_KEY_MANAGER_16        BITMAP  DISCARDABLE  "key-manager-16.bmp"
 IDB_KEY_MANAGER_16M       BITMAP  DISCARDABLE  "key-manager-16m.bmp"
diff --git a/src/engine-assuan.c b/src/engine-assuan.c
index 9af3782..c7f3312 100644
--- a/src/engine-assuan.c
+++ b/src/engine-assuan.c
@@ -1805,11 +1805,12 @@ sign_closure (closure_data_t cld)
    called with FILTER as the first argument.  SENDER is the sender's
    mail address (a mailbox).  The used protocol will be stored at
    R_USED_PROTOCOL on return. */
-int 
-op_assuan_sign (protocol_t protocol, 
+int
+op_assuan_sign (protocol_t protocol,
                 gpgme_data_t indata, gpgme_data_t outdata,
                 engine_filter_t filter, void *hwnd,
-                const char *sender, protocol_t *r_used_protocol)
+                const char *sender, protocol_t *r_used_protocol,
+                int flags)
 {
   gpg_error_t err;
   closure_data_t cld;
@@ -1894,8 +1895,11 @@ op_assuan_sign (protocol_t protocol,
   enqueue_callback ("output", ctx, outdata, outpipe[0], 0, finalize_handler, 
                     cmdid, NULL, 1 /* Wait on success */, 0); 
 
-  snprintf (line, sizeof line, "SIGN --protocol=%s --detached",
-            protocol_name);
+  if (flags & ENGINE_FLAG_DETACHED)
+    snprintf (line, sizeof line, "SIGN --protocol=%s --detached",
+              protocol_name);
+  else
+    snprintf (line, sizeof line, "SIGN --protocol=%s", protocol_name);
   err = start_command (ctx, cld, cmdid, line);
   cld = NULL; /* Now owned by start_command.  */
   if (err)
diff --git a/src/engine-assuan.h b/src/engine-assuan.h
index de2a144..237bd85 100644
--- a/src/engine-assuan.h
+++ b/src/engine-assuan.h
@@ -37,7 +37,7 @@ int  op_assuan_init (void);
 void op_assuan_deinit (void);
 void engine_assuan_cancel (void *cancel_data);
 
-int op_assuan_encrypt (protocol_t protocol, 
+int op_assuan_encrypt (protocol_t protocol,
                        gpgme_data_t indata, gpgme_data_t outdata,
                        engine_filter_t notify_data, void *hwnd,
                        unsigned int flags,
@@ -46,15 +46,16 @@ int op_assuan_encrypt (protocol_t protocol,
                        struct engine_assuan_encstate_s **r_encstate);
 int op_assuan_encrypt_bottom (struct engine_assuan_encstate_s *encstate,
                               int cancel);
-int op_assuan_sign (protocol_t protocol, 
+int op_assuan_sign (protocol_t protocol,
                     gpgme_data_t indata, gpgme_data_t outdata,
                     engine_filter_t filter, void *hwnd,
-                    const char *sender, protocol_t *r_used_protocol);
+                    const char *sender, protocol_t *r_used_protocol,
+                    int flags);
 int op_assuan_decrypt (protocol_t protocol,
-                       gpgme_data_t indata, gpgme_data_t outdata, 
+                       gpgme_data_t indata, gpgme_data_t outdata,
                        engine_filter_t filter, void *hwnd,
                        int with_verify, const char *from_address);
-int op_assuan_verify (gpgme_protocol_t protocol, 
+int op_assuan_verify (gpgme_protocol_t protocol,
                       gpgme_data_t data, const char *signature, size_t sig_len,
                       gpgme_data_t outdata,
                       engine_filter_t filter, void *hwnd,
diff --git a/src/engine.c b/src/engine.c
index 04c45ef..1dc471e 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -906,7 +906,8 @@ engine_sign_start (engine_filter_t filter, HWND hwnd, protocol_t protocol,
   if (filter->use_assuan)
     {
       err = op_assuan_sign (protocol, filter->indata, filter->outdata,
-                            filter, hwnd, sender, &used_protocol);
+                            filter, hwnd, sender, &used_protocol,
+                            ENGINE_FLAG_DETACHED);
       if (!err)
         *r_protocol = used_protocol;
     }
@@ -921,6 +922,30 @@ engine_sign_start (engine_filter_t filter, HWND hwnd, protocol_t protocol,
   return err;
 }
 
+/* Start an inline signing operation. Same as engine_sign_start but
+   without the detatched option. */
+int
+engine_sign_opaque_start (engine_filter_t filter, HWND hwnd,
+                          protocol_t protocol, const char *sender,
+                          protocol_t *r_protocol)
+{
+  gpg_error_t err;
+  protocol_t used_protocol;
+
+  if (filter->use_assuan)
+    {
+      err = op_assuan_sign (protocol, filter->indata, filter->outdata,
+                            filter, hwnd, sender, &used_protocol,
+                            0);
+      if (!err)
+        *r_protocol = used_protocol;
+    }
+  else
+    return gpg_error (GPG_ERR_NOT_SUPPORTED);
+
+  return err;
+}
+
 
 /* Start an decrypt operation.  FILTER is an object created by
    engine_create_filter.  The caller needs to call engine_wait to
diff --git a/src/engine.h b/src/engine.h
index 0dd07fc..bba50c3 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -47,6 +47,7 @@ typedef struct engine_filter_s *engine_filter_t;
 /* Flag values used by the engine functions.  */
 #define ENGINE_FLAG_SIGN_FOLLOWS  1  /* Expect a sign+encrypt operation.  */
 #define ENGINE_FLAG_BINARY_OUTPUT 2  /* Create binary output */
+#define ENGINE_FLAG_DETACHED      4  /* Create detached signature */
 
 
 
@@ -81,6 +82,9 @@ int engine_encrypt_prepare (engine_filter_t filter, HWND hwnd,
 int engine_encrypt_start (engine_filter_t filter, int cancel);
 int engine_sign_start (engine_filter_t filter, HWND hwnd, protocol_t protocol,
                        const char *sender, protocol_t *r_protocol);
+int engine_sign_opaque_start (engine_filter_t filter, HWND hwnd,
+                              protocol_t protocol, const char *sender,
+                              protocol_t *r_protocol);
 
 int engine_decrypt_start (engine_filter_t filter, HWND hwnd,
                           protocol_t protocol, int with_verify,
diff --git a/src/gpgoladdin.cpp b/src/gpgoladdin.cpp
index 74bafcf..35e1f72 100644
--- a/src/gpgoladdin.cpp
+++ b/src/gpgoladdin.cpp
@@ -451,9 +451,11 @@ GpgolRibbonExtender::GetIDsOfNames (REFIID riid, LPOLESTR *rgszNames,
       ID_MAPPER (L"btnEncrypt", ID_BTN_ENCRYPT)
       ID_MAPPER (L"btnEncryptLarge", ID_BTN_ENCRYPT_LARGE)
       ID_MAPPER (L"btnEncryptFileLarge", ID_BTN_ENCSIGN_LARGE)
+      ID_MAPPER (L"btnSignLarge", ID_BTN_SIGN_LARGE)
       ID_MAPPER (L"encryptBody", ID_CMD_ENCRYPT_BODY)
       ID_MAPPER (L"decryptBody", ID_CMD_DECRYPT_BODY)
       ID_MAPPER (L"addEncSignedAttachment", ID_CMD_ATT_ENCSIGN_FILE)
+      ID_MAPPER (L"signBody", ID_CMD_SIGN_BODY)
     }
 
   if (cNames > 1)
@@ -497,12 +499,15 @@ GpgolRibbonExtender::Invoke (DISPID dispid, REFIID riid, LCID lcid,
         return decryptBody (parms->rgvarg[0].pdispVal);
       case ID_CMD_ATT_ENCSIGN_FILE:
         return addEncSignedAttachment (parms->rgvarg[0].pdispVal);
+      case ID_CMD_SIGN_BODY:
+        return signBody (parms->rgvarg[0].pdispVal);
       case ID_BTN_CERTMANAGER:
       case ID_BTN_ENCRYPT:
       case ID_BTN_DECRYPT:
       case ID_BTN_DECRYPT_LARGE:
       case ID_BTN_ENCRYPT_LARGE:
       case ID_BTN_ENCSIGN_LARGE:
+      case ID_BTN_SIGN_LARGE:
         return getIcon (dispid, result);
     }
 
@@ -560,6 +565,11 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
         L"               size=\"large\""
         L"               label=\"%S\""
         L"               onAction=\"decryptBody\"/>"
+        L"       <button id=\"fullTextSign\""
+        L"               getImage=\"btnSignLarge\""
+        L"               size=\"large\""
+        L"               label=\"%S\""
+        L"               onAction=\"signBody\"/>"
         L"     </group>"
         L"     <group id=\"attachmentGroup\""
         L"            label=\"%S\">"
@@ -589,8 +599,9 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
         _("Textbody"),
         _("Encrypt"),
         _("Decrypt"),
+        _("Sign"),
         _("Attachments"),
-        _("Add Encrypted file"),
+        _("Encrypted file and Signature"),
         _("Encrypt"), _("Decrypt")
         );
     }
diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index 0143f7c..9ebc1d2 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -56,17 +56,126 @@ HRESULT getContext (LPDISPATCH ctrl, LPDISPATCH *context)
   return context ? S_OK : E_FAIL;
 }
 
-#define ENCRYPT_INSPECTOR_SELECTION  1
-#define ENCRYPT_INSPECTOR_BODY       2
+#define OP_ENCRYPT     1 /* Encrypt the data */
+#define OP_SIGN        2 /* Sign the data */
+#define DATA_BODY      4 /* Use text body as data */
+#define DATA_SELECTION 8 /* Use selection as data */
+
+/* Read hfile in chunks of 4KB and writes them to the sink */
+static int
+copyFileToSink (HANDLE hFile, sink_t sink)
+{
+  char buf[4096];
+  DWORD bytesRead = 0;
+  do
+    {
+      if (!ReadFile (hFile, buf, sizeof buf, &bytesRead, NULL))
+        {
+          log_error ("%s:%s: Could not read source file.",
+                     SRCNAME, __func__);
+          return -1;
+        }
+      if (write_buffer (sink, bytesRead ? buf : NULL, bytesRead))
+        {
+          log_error ("%s:%s: Could not write out buffer",
+                     SRCNAME, __func__);
+          return -1;
+        }
+    }
+  while (bytesRead);
+  return 0;
+}
+
+static int
+attachSignature (LPDISPATCH mailItem, char *subject, HANDLE hFileToSign,
+                 protocol_t protocol, unsigned int session_number,
+                 HWND curWindow, wchar_t *originalFilename, char *sender)
+{
+  wchar_t *sigName = NULL;
+  wchar_t *sigFileName = NULL;
+  HANDLE hSigFile = NULL;
+  int rc = 0;
+  struct sink_s encsinkmem;
+  sink_t encsink = &encsinkmem;
+  struct sink_s sinkmem;
+  sink_t sink = &sinkmem;
+  engine_filter_t filter = NULL;
+
+  memset (encsink, 0, sizeof *encsink);
+  memset (sink, 0, sizeof *sink);
+
+  /* Prepare a fresh filter */
+  if ((rc = engine_create_filter (&filter, write_buffer_for_cb, sink)))
+    {
+      goto failure;
+    }
+  encsink->cb_data = filter;
+  encsink->writefnc = sink_encryption_write;
+  engine_set_session_number (filter, session_number);
+  engine_set_session_title (filter, subject ? subject :_("GpgOL"));
+
+  if (engine_sign_start (filter, curWindow, protocol, sender, &protocol))
+    goto failure;
+
+  sigName = get_pretty_attachment_name (originalFilename, protocol, 1);
+
+  /* If we are unlucky the number of temporary file artifacts might
+     differ for the signature and the encrypted file but we have
+     to live with that. */
+  sigFileName = get_tmp_outfile (sigName, &hSigFile);
+  sink->cb_data = hSigFile;
+  sink->writefnc = sink_file_write;
+
+  if (!sigFileName)
+    {
+      log_error ("%s:%s: Could not get a decent attachment name",
+                 SRCNAME, __func__);
+      goto failure;
+    }
+
+  /* Reset the file to sign handle to the beginning of the file and
+     copy it to the signature buffer */
+  SetFilePointer (hFileToSign, 0, NULL, 0);
+  if ((rc=copyFileToSink (hFileToSign, encsink)))
+    goto failure;
+
+  /* Lets hope the user did not select a huge file. We are hanging
+     here until encryption is completed.. */
+  if ((rc = engine_wait (filter)))
+    goto failure;
+
+  filter = NULL; /* Not valid anymore.  */
+  encsink->cb_data = NULL; /* Not needed anymore.  */
+
+  if (!sink->enc_counter)
+    {
+      log_error ("%s:%s: nothing received from engine", SRCNAME, __func__);
+      goto failure;
+    }
 
-/* encryptInspector
-   Encrypts text in an IInspector context. Depending on
-   the flags either the active selection or the full body
-   is encrypted.
+  /* Now we have an encrypted file behind encryptedFile. Let's add it */
+  add_oom_attachment (mailItem, sigFileName);
+
+failure:
+  xfree (sigFileName);
+  xfree (sigName);
+  if (hSigFile)
+    {
+      CloseHandle (hSigFile);
+      DeleteFileW (sigFileName);
+    }
+  return rc;
+}
+
+/* do_composer_action
+   Encrypts / Signs text in an IInspector context.
+   Depending on the flags either the
+   active selection or the full body is encrypted.
+   Combine OP_ENCRYPT and OP_SIGN if you want both.
 */
 
 HRESULT
-encryptInspector (LPDISPATCH ctrl, int flags)
+do_composer_action (LPDISPATCH ctrl, int flags)
 {
   LPDISPATCH context = NULL;
   LPDISPATCH selection = NULL;
@@ -124,7 +233,7 @@ encryptInspector (LPDISPATCH ctrl, int flags)
       goto failure;
     }
 
-  if (flags & ENCRYPT_INSPECTOR_SELECTION)
+  if (flags & DATA_SELECTION)
     {
       plaintext = get_oom_string (selection, "Text");
 
@@ -137,7 +246,7 @@ encryptInspector (LPDISPATCH ctrl, int flags)
           goto failure;
         }
     }
-  else if (flags & ENCRYPT_INSPECTOR_BODY)
+  else if (flags & DATA_BODY)
     {
       plaintext = get_oom_string (mailItem, "Body");
       if (!plaintext || strlen (plaintext) <= 1)
@@ -167,19 +276,6 @@ encryptInspector (LPDISPATCH ctrl, int flags)
   sink->cb_data = tmpstream;
   sink->writefnc = sink_std_write;
 
-  senderAddr = get_oom_string (sender, "Address");
-
-  recipientAddrs = get_oom_recipients (recipients);
-
-  if (!recipientAddrs || !(*recipientAddrs))
-    {
-      MessageBox (NULL,
-                  _("Please add at least one recipent."),
-                  _("GpgOL"),
-                  MB_ICONINFORMATION|MB_OK);
-      goto failure;
-    }
-
   /* Now lets prepare our encryption */
   session_number = engine_new_session_number ();
 
@@ -196,23 +292,51 @@ encryptInspector (LPDISPATCH ctrl, int flags)
   engine_set_session_number (filter, session_number);
   engine_set_session_title (filter, _("GpgOL"));
 
-  if ((rc=engine_encrypt_prepare (filter, curWindow,
-                                  PROTOCOL_UNKNOWN,
-                                  0 /* ENGINE_FLAG_SIGN_FOLLOWS */,
-                                  senderAddr, recipientAddrs, &protocol)))
+  senderAddr = get_oom_string (sender, "Address");
+
+  if (flags & OP_ENCRYPT)
     {
-      log_error ("%s:%s: engine encrypt prepare failed : %s",
-                 SRCNAME, __func__, gpg_strerror (rc));
-      goto failure;
-    }
+      recipientAddrs = get_oom_recipients (recipients);
+
+      if (!recipientAddrs || !(*recipientAddrs))
+        {
+          MessageBox (NULL,
+                      _("Please add at least one recipent."),
+                      _("GpgOL"),
+                      MB_ICONINFORMATION|MB_OK);
+          goto failure;
+        }
 
-  /* lets go */
+      if ((rc=engine_encrypt_prepare (filter, curWindow,
+                                      PROTOCOL_UNKNOWN,
+                                      (flags & OP_SIGN) ?
+                                      ENGINE_FLAG_SIGN_FOLLOWS : 0,
+                                      senderAddr, recipientAddrs,
+                                      &protocol)))
+        {
+          log_error ("%s:%s: engine encrypt prepare failed : %s",
+                     SRCNAME, __func__, gpg_strerror (rc));
+          goto failure;
+        }
 
-  if ((rc=engine_encrypt_start (filter, 0)))
+      if ((rc=engine_encrypt_start (filter, 0)))
+        {
+          log_error ("%s:%s: engine encrypt start failed: %s",
+                     SRCNAME, __func__, gpg_strerror (rc));
+          goto failure;
+        }
+    }
+  else
     {
-      log_error ("%s:%s: engine encrypt start failed: %s",
-                 SRCNAME, __func__, gpg_strerror (rc));
-      goto failure;
+      /* We could do some kind of clearsign / sign text as attachment here
+      but it is error prone */
+      if ((rc=engine_sign_opaque_start (filter, curWindow, PROTOCOL_UNKNOWN,
+                                        senderAddr, &protocol)))
+        {
+          log_error ("%s:%s: engine sign start failed: %s",
+                     SRCNAME, __func__, gpg_strerror (rc));
+          goto failure;
+        }
     }
 
   /* Write the text in the encryption sink. */
@@ -286,17 +410,17 @@ encryptInspector (LPDISPATCH ctrl, int flags)
                       "-----BEGIN ENCRYPTED MESSAGE-----\r\n"
                       "%s"
                       "-----END ENCRYPTED MESSAGE-----\r\n", buffer);
-            if (flags & ENCRYPT_INSPECTOR_SELECTION)
+            if (flags & DATA_SELECTION)
               put_oom_string (selection, "Text", enclosedData);
-            else if (flags & ENCRYPT_INSPECTOR_BODY)
+            else if (flags & DATA_BODY)
               put_oom_string (mailItem, "Body", enclosedData);
 
           }
         else
           {
-            if (flags & ENCRYPT_INSPECTOR_SELECTION)
+            if (flags & DATA_SELECTION)
               put_oom_string (selection, "Text", buffer);
-            else if (flags & ENCRYPT_INSPECTOR_BODY)
+            else if (flags & DATA_BODY)
               {
                 put_oom_string (mailItem, "Body", buffer);
               }
@@ -438,7 +562,7 @@ decryptAttachments (LPDISPATCH ctrl)
 
 /* decryptInspector
    decrypts the content of an inspector. Controled by flags
-   similary to the encryptInspector.
+   similary to the do_composer_action.
 */
 
 HRESULT
@@ -459,6 +583,8 @@ decryptInspector (LPDISPATCH ctrl, int flags)
   engine_filter_t filter = NULL;
   HWND curWindow;
   char* encData = NULL;
+  char* senderAddr = NULL;
+  char* subject = NULL;
   int encDataLen = 0;
   int rc = 0;
   unsigned int session_number;
@@ -542,6 +668,9 @@ decryptInspector (LPDISPATCH ctrl, int flags)
 
   fix_linebreaks (encData, &encDataLen);
 
+  subject = get_oom_string (mailItem, "Subject");
+  senderAddr = get_oom_string (mailItem, "SenderEmailAddress");
+
   /* Determine the protocol based on the content */
   protocol = is_cms_data (encData, encDataLen) ? PROTOCOL_SMIME :
     PROTOCOL_OPENPGP;
@@ -570,7 +699,7 @@ decryptInspector (LPDISPATCH ctrl, int flags)
   decsink->writefnc = sink_encryption_write;
 
   engine_set_session_number (filter, session_number);
-  engine_set_session_title (filter, _("GpgOL"));
+  engine_set_session_title (filter, subject ? subject : _("GpgOL"));
 
   if ((rc=engine_decrypt_start (filter, curWindow,
                                 protocol,
@@ -638,7 +767,7 @@ decryptInspector (LPDISPATCH ctrl, int flags)
       {
         /* Now replace the crypto data with the decrypted data or show it
         somehow.*/
-        int err;
+        int err = 0;
         if (flags & DECRYPT_INSPECTOR_SELECTION)
           {
             err = put_oom_string (selection, "Text", buffer);
@@ -674,6 +803,8 @@ decryptInspector (LPDISPATCH ctrl, int flags)
   RELDISP (wordEditor);
   RELDISP (wordApplication);
   xfree (encData);
+  xfree (senderAddr);
+  xfree (subject);
   if (tmpstream)
     tmpstream->Release();
 
@@ -779,48 +910,10 @@ getIcon (int id, VARIANT* result)
   return S_OK;
 }
 
-HRESULT
-startCertManager (LPDISPATCH ctrl)
-{
-  HRESULT hr;
-  LPDISPATCH context;
-  HWND curWindow;
-
-  hr = getContext (ctrl, &context);
-  if (FAILED(hr))
-      return hr;
-
-  curWindow = get_oom_context_window (context);
-
-  engine_start_keymanager (curWindow);
-}
-
-HRESULT
-decryptBody (LPDISPATCH ctrl)
-{
-  return decryptInspector (ctrl, DECRYPT_INSPECTOR_BODY);
-}
-
-HRESULT
-decryptSelection (LPDISPATCH ctrl)
-{
-  return decryptInspector (ctrl, DECRYPT_INSPECTOR_SELECTION);
-}
-
-HRESULT
-encryptBody (LPDISPATCH ctrl)
-{
-  return encryptInspector (ctrl, ENCRYPT_INSPECTOR_BODY);
-}
-
-HRESULT
-encryptSelection (LPDISPATCH ctrl)
-{
-  return encryptInspector (ctrl, ENCRYPT_INSPECTOR_SELECTION);
-}
-
-HRESULT
-addEncSignedAttachment (LPDISPATCH ctrl)
+/* Adds an encrypted attachment if the flag OP_SIGN is set
+   a detached signature of the encrypted file is also added. */
+static HRESULT
+attachEncryptedFile (LPDISPATCH ctrl, int flags)
 {
   LPDISPATCH context = NULL;
   LPDISPATCH mailItem = NULL;
@@ -829,6 +922,7 @@ addEncSignedAttachment (LPDISPATCH ctrl)
   HRESULT hr;
   char* senderAddr = NULL;
   char** recipientAddrs = NULL;
+  char* subject = NULL;
 
   HWND curWindow;
   char *fileToEncrypt = NULL;
@@ -845,10 +939,8 @@ addEncSignedAttachment (LPDISPATCH ctrl)
   sink_t sink = &sinkmem;
   engine_filter_t filter = NULL;
   protocol_t protocol;
-  STATSTG tmpStat;
   int rc = 0;
   int i = 0;
-  LPSTREAM tmpstream = NULL;
 
   memset (encsink, 0, sizeof *encsink);
   memset (sink, 0, sizeof *sink);
@@ -923,8 +1015,12 @@ addEncSignedAttachment (LPDISPATCH ctrl)
 
   senderAddr = get_oom_string (sender, "Address");
 
+  curWindow = get_oom_context_window (context);
+
   session_number = engine_new_session_number ();
 
+  subject = get_oom_string (mailItem, "Subject");
+
   /* Prepare the encryption sink */
   if ((rc = engine_create_filter (&filter, write_buffer_for_cb, sink)))
     {
@@ -935,7 +1031,7 @@ addEncSignedAttachment (LPDISPATCH ctrl)
   encsink->writefnc = sink_encryption_write;
 
   engine_set_session_number (filter, session_number);
-  engine_set_session_title (filter, _("GpgOL"));
+  engine_set_session_title (filter, subject ? subject :_("GpgOL"));
   if ((rc=engine_encrypt_prepare (filter, curWindow,
                                   PROTOCOL_UNKNOWN,
                                   ENGINE_FLAG_BINARY_OUTPUT,
@@ -946,7 +1042,7 @@ addEncSignedAttachment (LPDISPATCH ctrl)
       goto failure;
     }
 
-  attachName = get_pretty_attachment_name (fileToEncryptW, protocol);
+  attachName = get_pretty_attachment_name (fileToEncryptW, protocol, 0);
 
   if (!attachName)
     {
@@ -966,32 +1062,11 @@ addEncSignedAttachment (LPDISPATCH ctrl)
       goto failure;
     }
 
-  /* Read the file in chunks and write them to the encryption
-     buffer */
-  {
-    char buf[4096];
-    DWORD bytesRead = 0;
-    do
-      {
-        if (!ReadFile (hFile, buf, sizeof buf, &bytesRead, NULL))
-          {
-            rc = -1;
-            log_error ("%s:%s: Could not read source file: %s",
-                       SRCNAME, __func__);
-            goto failure;
-          }
-        if ((rc = write_buffer (encsink, bytesRead ? buf : NULL, bytesRead)))
-          {
-            rc = -1;
-            log_error ("%s:%s: Could not wirte out buffer",
-                       SRCNAME, __func__);
-            goto failure;
-          }
-      }
-    while (bytesRead);
-  }
+  if ((rc=copyFileToSink (hFile, encsink)))
+    goto failure;
+
   /* Lets hope the user did not select a huge file. We are hanging
-     here until encryption is completed.. */
+   here until encryption is completed.. */
   if ((rc = engine_wait (filter)))
     goto failure;
 
@@ -1007,6 +1082,12 @@ addEncSignedAttachment (LPDISPATCH ctrl)
   /* Now we have an encrypted file behind encryptedFile. Let's add it */
   add_oom_attachment (mailItem, encryptedFile);
 
+  if (flags & OP_SIGN)
+    {
+      attachSignature (mailItem, subject, hEncFile, protocol, session_number,
+                       curWindow, fileToEncryptW, senderAddr);
+    }
+
 failure:
   if (filter)
     engine_cancel (filter);
@@ -1020,6 +1101,7 @@ failure:
   xfree (encryptedFile);
   xfree (fileToEncryptW);
   xfree (attachName);
+  xfree (subject);
   RELDISP (mailItem);
   RELDISP (sender);
   RELDISP (recipients);
@@ -1035,3 +1117,55 @@ failure:
 
   return S_OK;
 }
+
+HRESULT
+startCertManager (LPDISPATCH ctrl)
+{
+  HRESULT hr;
+  LPDISPATCH context;
+  HWND curWindow;
+
+  hr = getContext (ctrl, &context);
+  if (FAILED(hr))
+      return hr;
+
+  curWindow = get_oom_context_window (context);
+
+  engine_start_keymanager (curWindow);
+  return S_OK;
+}
+
+HRESULT
+decryptBody (LPDISPATCH ctrl)
+{
+  return decryptInspector (ctrl, DECRYPT_INSPECTOR_BODY);
+}
+
+HRESULT
+decryptSelection (LPDISPATCH ctrl)
+{
+  return decryptInspector (ctrl, DECRYPT_INSPECTOR_SELECTION);
+}
+
+HRESULT
+encryptBody (LPDISPATCH ctrl)
+{
+  return do_composer_action (ctrl, OP_ENCRYPT | DATA_BODY);
+}
+
+HRESULT
+encryptSelection (LPDISPATCH ctrl)
+{
+  return do_composer_action (ctrl, OP_ENCRYPT | DATA_SELECTION);
+}
+
+HRESULT
+addEncSignedAttachment (LPDISPATCH ctrl)
+{
+  return attachEncryptedFile (ctrl, OP_SIGN);
+}
+
+HRESULT signBody (LPDISPATCH ctrl)
+{
+  return do_composer_action (ctrl, DATA_BODY | OP_SIGN);
+}
diff --git a/src/ribbon-callbacks.h b/src/ribbon-callbacks.h
index f3b2eb2..fa6d63c 100644
--- a/src/ribbon-callbacks.h
+++ b/src/ribbon-callbacks.h
@@ -33,6 +33,7 @@
 #define ID_CMD_ENCRYPT_BODY      6
 #define ID_CMD_DECRYPT_BODY      8
 #define ID_CMD_ATT_ENCSIGN_FILE  9
+#define ID_CMD_SIGN_BODY        10
 
 #define ID_BTN_CERTMANAGER       IDI_KEY_MANAGER_64_PNG
 #define ID_BTN_DECRYPT           IDI_DECRYPT_16_PNG
@@ -40,6 +41,7 @@
 #define ID_BTN_ENCRYPT           IDI_ENCRYPT_16_PNG
 #define ID_BTN_ENCRYPT_LARGE     IDI_ENCRYPT_48_PNG
 #define ID_BTN_ENCSIGN_LARGE     IDI_ENCSIGN_FILE_48_PNG
+#define ID_BTN_SIGN_LARGE        IDI_SIGN_48_PNG
 
 HRESULT decryptAttachments (LPDISPATCH ctrl);
 HRESULT encryptSelection (LPDISPATCH ctrl);
@@ -49,4 +51,5 @@ HRESULT encryptBody (LPDISPATCH ctrl);
 HRESULT addEncSignedAttachment (LPDISPATCH ctrl);
 HRESULT getIcon (int id, VARIANT* result);
 HRESULT startCertManager (LPDISPATCH ctrl);
+HRESULT signBody (LPDISPATCH ctrl);
 #endif
diff --git a/src/sign-48.png b/src/sign-48.png
new file mode 100644
index 0000000..9d21a57
Binary files /dev/null and b/src/sign-48.png differ

commit d7e589d22a2bce76847d7f77ae89b45d7b911eb2
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Aug 8 14:04:55 2013 +0000

    Add icon for decrypt selection context action
    
        * src/gpgoladdin.cpp (GetCustomUI): Add btnDecrypt to
        decryptSelection action.

diff --git a/src/gpgoladdin.cpp b/src/gpgoladdin.cpp
index 7738c39..74bafcf 100644
--- a/src/gpgoladdin.cpp
+++ b/src/gpgoladdin.cpp
@@ -636,9 +636,10 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
         L" </ribbon>"
         L"<contextMenus>"
         L"<contextMenu idMso=\"ContextMenuReadOnlyMailText\">"
-        L" <button id=\"decryptReadButton\""
-        L"         label=\"%S\""
-        L"         onAction=\"decryptSelection\"/>"
+        L"   <button id=\"decryptReadButton\""
+        L"           label=\"%S\""
+        L"           getImage=\"btnDecrypt\""
+        L"           onAction=\"decryptSelection\"/>"
         L" </contextMenu>"
         L" <contextMenu idMso=\"ContextMenuAttachments\">"
         L"   <button id=\"gpgol_decrypt\""

commit 08984c034b6e04a5f49c5705eac1499fd94f06ad
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Aug 8 10:36:08 2013 +0000

    Initialize output buffers for encrypt / decrypt
    
        Fixes the uninialized data seen at the end of those actions
        and makes the lastlinebreak hack uneccessary.
    
        * src/ribbon-callbacks.cpp (decryptInspector, encryptInspector):
        Initialize buffers to make sure they are terminated.

diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index 966d74f..0143f7c 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -253,7 +253,10 @@ encryptInspector (LPDISPATCH ctrl, int flags)
   {
     LARGE_INTEGER off;
     ULONG nread;
-    char buffer[(unsigned int)tmpStat.cbSize.QuadPart];
+
+    char buffer[(unsigned int)tmpStat.cbSize.QuadPart + 1];
+
+    memset (buffer, 0, sizeof buffer);
 
     off.QuadPart = 0;
     hr = tmpstream->Seek (off, STREAM_SEEK_SET, NULL);
@@ -264,7 +267,7 @@ encryptInspector (LPDISPATCH ctrl, int flags)
         rc = gpg_error (GPG_ERR_EIO);
         goto failure;
       }
-    hr = tmpstream->Read (buffer, sizeof buffer, &nread);
+    hr = tmpstream->Read (buffer, sizeof (buffer) - 1, &nread);
     if (hr)
       {
         log_error ("%s:%s: IStream::Read failed: hr=%#lx",
@@ -274,14 +277,6 @@ encryptInspector (LPDISPATCH ctrl, int flags)
       }
     if (strlen (buffer) > 1)
       {
-        char* lastlinebreak = strrchr (buffer, '\n');
-        if (lastlinebreak && (lastlinebreak - buffer) > 1)
-          {
-            /*XXX there is some strange data in the buffer
-              after the last linebreak investigate this and
-              fix it! */
-            lastlinebreak[1] = '\0';
-          }
         /* Now replace the selection with the encrypted text */
         if (protocol == PROTOCOL_SMIME)
           {
@@ -618,7 +613,9 @@ decryptInspector (LPDISPATCH ctrl, int flags)
   {
     LARGE_INTEGER off;
     ULONG nread;
-    char buffer[(unsigned int)tmpStat.cbSize.QuadPart];
+    char buffer[(unsigned int)tmpStat.cbSize.QuadPart + 1];
+
+    memset (buffer, 0, sizeof buffer);
 
     off.QuadPart = 0;
     hr = tmpstream->Seek (off, STREAM_SEEK_SET, NULL);
@@ -629,7 +626,7 @@ decryptInspector (LPDISPATCH ctrl, int flags)
         rc = gpg_error (GPG_ERR_EIO);
         goto failure;
       }
-    hr = tmpstream->Read (buffer, sizeof buffer, &nread);
+    hr = tmpstream->Read (buffer, sizeof (buffer) - 1, &nread);
     if (hr)
       {
         log_error ("%s:%s: IStream::Read failed: hr=%#lx",

commit eb4a8b909508994236fcb8e967fe90a1ddbcf8b5
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Aug 8 10:16:17 2013 +0000

    Initialize strings in conflict handler
    
        This fixes the name conflict handling as wcsncpy did not
        terminate the string with \0. Also add the space for
        the terminator in case our strings are MAX_PATH in length.
    
        * src/common.c (get_tmp_outfile): Initialize buffer variables

diff --git a/src/common.c b/src/common.c
index 3d101f5..199103f 100644
--- a/src/common.c
+++ b/src/common.c
@@ -1149,8 +1149,11 @@ get_tmp_outfile (wchar_t *name, HANDLE *outHandle)
                                     FILE_ATTRIBUTE_TEMPORARY,
                                     NULL)) == INVALID_HANDLE_VALUE)
     {
-      wchar_t fnameBuf[MAX_PATH];
-      wchar_t origName[MAX_PATH];
+      wchar_t fnameBuf[MAX_PATH + 1];
+      wchar_t origName[MAX_PATH + 1];
+      memset (fnameBuf, 0, MAX_PATH + 1);
+      memset (origName, 0, MAX_PATH + 1);
+
       snwprintf (origName, MAX_PATH, L"%s%s", tmpPath, name);
       fileExt = wcschr (wcsrchr(origName, '\\'), '.');
       wcsncpy (fnameBuf, origName, fileExt - origName);

commit 02c82f9197d0fa7dabce2e9fda1f8ca6514eec3b
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Aug 7 10:15:47 2013 +0000

    Share encrypted file for reading again.
    
        * src/common.c (get_tmp_outfile): Share for reading
    --
        The share mode and file attribute settings were a last minute
        addition to the previous patch and not properly tested.
        Without the share read setting outlook fails with an undefined
        errorcode on adding the attachment.

diff --git a/src/common.c b/src/common.c
index dd8b2d7..3d101f5 100644
--- a/src/common.c
+++ b/src/common.c
@@ -1143,7 +1143,7 @@ get_tmp_outfile (wchar_t *name, HANDLE *outHandle)
 
   while ((*outHandle = CreateFileW (outName,
                                     GENERIC_WRITE | GENERIC_READ,
-                                    0, /* We do not share this */
+                                    FILE_SHARE_READ,
                                     NULL,
                                     CREATE_NEW,
                                     FILE_ATTRIBUTE_TEMPORARY,

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

Summary of changes:
 src/Makefile.am          |    1 +
 src/common.c             |   55 +++++--
 src/common.h             |    3 +-
 src/dialogs.h            |    1 +
 src/dialogs.rc           |    1 +
 src/engine-assuan.c      |   14 +-
 src/engine-assuan.h      |   11 +-
 src/engine.c             |   27 +++-
 src/engine.h             |    4 +
 src/gpgoladdin.cpp       |   20 ++-
 src/ribbon-callbacks.cpp |  381 +++++++++++++++++++++++++++++++---------------
 src/ribbon-callbacks.h   |    3 +
 src/sign-48.png          |  Bin 0 -> 1531 bytes
 13 files changed, 365 insertions(+), 156 deletions(-)
 create mode 100644 src/sign-48.png


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



From cvs at cvs.gnupg.org  Thu Aug  8 19:51:06 2013
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Thu, 08 Aug 2013 19:51:06 +0200
Subject: [git] GpgOL - branch, master, updated. gpgol-1.1.3-59-g94e0c02
Message-ID: <E1V7Ttu-0002rg-Ho@lists.gnupg.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".

The branch, master has been updated
       via  94e0c024ce44bb6a6c62647c806b55f4c26cf9a6 (commit)
       via  b867c7a12fc2e8436f358d02dcdfbc38dada710d (commit)
       via  82c9d671ed9dc56c04ceb56eb7ebb44884da4698 (commit)
      from  c607ce5551ec261b0c51daf10c32142cd7c60eb2 (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 94e0c024ce44bb6a6c62647c806b55f4c26cf9a6
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Aug 8 17:18:33 2013 +0000

    Add verify action for opaque signatures
    
        This is at least minimal signature support and the most
        robust way because we can avoid data sanitizing.
    
        * src/verify-48.png: New.
        * src/Makefile.am (EXTRA_DIST): Add verify png
        * src/dialogs.h, src/dialogs.rc: Add verify png
        * src/gpgoladdin.cpp (GetIDsOfNames, Invoke, GetCustomUI):
        Add and handle verify action to the reader.
        * src/ribbon-callbacks.cpp (decryptInspector, do_reader_action):
        Renamed. Do reader action now works similar to the
        do_composer_action.
        (do_composer_action): Add support for verify
        (verifyBody): New.
        * src/ribbon-callbacks.h: Update accordingly.

diff --git a/src/Makefile.am b/src/Makefile.am
index c61a5d6..76d1dc6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,7 +34,7 @@ EXTRA_DIST = \
 	key-manager-64.png \
 	decrypt-16.png decrypt-48.png \
 	encrypt-sign-file-48.png \
-	sign-48.png \
+	sign-48.png verify-48.png \
 	logo.bmp README.icons
 
 EXEEXT = .dll
diff --git a/src/dialogs.h b/src/dialogs.h
index 7da915a..aec411c 100644
--- a/src/dialogs.h
+++ b/src/dialogs.h
@@ -142,5 +142,6 @@
 #define IDI_KEY_MANAGER_64_PNG          6020
 #define IDI_ENCSIGN_FILE_48_PNG         6030
 #define IDI_SIGN_48_PNG                 6040
+#define IDI_VERIFY_48_PNG               6050
 
 #endif /*DIALOGS_H*/
diff --git a/src/dialogs.rc b/src/dialogs.rc
index 48ab013..dc88866 100644
--- a/src/dialogs.rc
+++ b/src/dialogs.rc
@@ -55,6 +55,7 @@ IDB_VERIFY_16             BITMAP  DISCARDABLE  "verify-16.bmp"
 IDB_VERIFY_16M            BITMAP  DISCARDABLE  "verify-16m.bmp"
 IDB_VERIFY_32             BITMAP  DISCARDABLE  "verify-32.bmp"
 IDB_VERIFY_32M            BITMAP  DISCARDABLE  "verify-32m.bmp"
+IDI_VERIFY_48_PNG         RCDATA               "verify-48.png"
 
 IDB_DECRYPT_VERIFY_16     BITMAP  DISCARDABLE  "decrypt-verify-16.bmp" 
 IDB_DECRYPT_VERIFY_16M    BITMAP  DISCARDABLE  "decrypt-verify-16m.bmp"
diff --git a/src/gpgoladdin.cpp b/src/gpgoladdin.cpp
index 9a01221..4bb6e22 100644
--- a/src/gpgoladdin.cpp
+++ b/src/gpgoladdin.cpp
@@ -452,11 +452,13 @@ GpgolRibbonExtender::GetIDsOfNames (REFIID riid, LPOLESTR *rgszNames,
       ID_MAPPER (L"btnEncryptLarge", ID_BTN_ENCRYPT_LARGE)
       ID_MAPPER (L"btnEncryptFileLarge", ID_BTN_ENCSIGN_LARGE)
       ID_MAPPER (L"btnSignLarge", ID_BTN_SIGN_LARGE)
+      ID_MAPPER (L"btnVerifyLarge", ID_BTN_VERIFY_LARGE)
       ID_MAPPER (L"encryptBody", ID_CMD_ENCRYPT_BODY)
       ID_MAPPER (L"decryptBody", ID_CMD_DECRYPT_BODY)
       ID_MAPPER (L"addEncSignedAttachment", ID_CMD_ATT_ENCSIGN_FILE)
       ID_MAPPER (L"addEncAttachment", ID_CMD_ATT_ENC_FILE)
       ID_MAPPER (L"signBody", ID_CMD_SIGN_BODY)
+      ID_MAPPER (L"verifyBody", ID_CMD_VERIFY_BODY)
     }
 
   if (cNames > 1)
@@ -504,6 +506,8 @@ GpgolRibbonExtender::Invoke (DISPID dispid, REFIID riid, LCID lcid,
         return addEncAttachment (parms->rgvarg[0].pdispVal);
       case ID_CMD_SIGN_BODY:
         return signBody (parms->rgvarg[0].pdispVal);
+      case ID_CMD_VERIFY_BODY:
+        return verifyBody (parms->rgvarg[0].pdispVal);
       case ID_BTN_CERTMANAGER:
       case ID_BTN_ENCRYPT:
       case ID_BTN_DECRYPT:
@@ -511,6 +515,7 @@ GpgolRibbonExtender::Invoke (DISPID dispid, REFIID riid, LCID lcid,
       case ID_BTN_ENCRYPT_LARGE:
       case ID_BTN_ENCSIGN_LARGE:
       case ID_BTN_SIGN_LARGE:
+      case ID_BTN_VERIFY_LARGE:
         return getIcon (dispid, result);
     }
 
@@ -637,6 +642,11 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
         L"               size=\"large\""
         L"               label=\"%S\""
         L"               onAction=\"decryptBody\"/>"
+        L"       <button id=\"fullTextVerify\""
+        L"               getImage=\"btnVerifyLarge\""
+        L"               size=\"large\""
+        L"               label=\"%S\""
+        L"               onAction=\"verifyBody\"/>"
         L"     </group>"
         L"    </tab>"
         L"   </tabs>"
@@ -671,6 +681,7 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
         L"</customUI>",
         _("GpgOL"), _("General"), _("Start Certificate Manager"),
         _("Textbody"), _("Decrypt"),
+        _("Verify"),
         _("GpgOL"), _("Save and decrypt"),
         _("Decrypt"),
         _("Decrypt"));
diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index 8b02ece..8fe2715 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -58,6 +58,8 @@ HRESULT getContext (LPDISPATCH ctrl, LPDISPATCH *context)
 
 #define OP_ENCRYPT     1 /* Encrypt the data */
 #define OP_SIGN        2 /* Sign the data */
+#define OP_DECRYPT     1 /* Decrypt the data */
+#define OP_VERIFY      2 /* Verify the data */
 #define DATA_BODY      4 /* Use text body as data */
 #define DATA_SELECTION 8 /* Use selection as data */
 
@@ -557,16 +559,13 @@ decryptAttachments (LPDISPATCH ctrl)
                   callback function failed in an ugly window. */
 }
 
-#define DECRYPT_INSPECTOR_SELECTION  1
-#define DECRYPT_INSPECTOR_BODY       2
-
-/* decryptInspector
+/* do_reader_action
    decrypts the content of an inspector. Controled by flags
    similary to the do_composer_action.
 */
 
 HRESULT
-decryptInspector (LPDISPATCH ctrl, int flags)
+do_reader_action (LPDISPATCH ctrl, int flags)
 {
   LPDISPATCH context = NULL;
   LPDISPATCH selection = NULL;
@@ -602,7 +601,7 @@ decryptInspector (LPDISPATCH ctrl, int flags)
 
   curWindow = get_oom_context_window (context);
 
-  if (!(flags & DECRYPT_INSPECTOR_BODY))
+  if (!(flags & DATA_BODY))
     {
       wordEditor = get_oom_object (context, "WordEditor");
       wordApplication = get_oom_object (wordEditor, "get_Application");
@@ -611,7 +610,7 @@ decryptInspector (LPDISPATCH ctrl, int flags)
   mailItem = get_oom_object (context, "CurrentItem");
 
   if ((!wordEditor || !wordApplication || !selection || !mailItem) &&
-      !(flags & DECRYPT_INSPECTOR_BODY))
+      !(flags & DATA_BODY))
     {
       MessageBox (NULL,
                   "Internal error in GpgOL.\n"
@@ -639,7 +638,7 @@ decryptInspector (LPDISPATCH ctrl, int flags)
         }
     }
 
-  if (flags & DECRYPT_INSPECTOR_SELECTION)
+  if (flags & DATA_SELECTION)
     {
       encData = get_oom_string (selection, "Text");
 
@@ -652,7 +651,7 @@ decryptInspector (LPDISPATCH ctrl, int flags)
           goto failure;
         }
     }
-  else if (flags & DECRYPT_INSPECTOR_BODY)
+  else if (flags & DATA_BODY)
     {
       encData = get_oom_string (mailItem, "Body");
 
@@ -701,13 +700,27 @@ decryptInspector (LPDISPATCH ctrl, int flags)
   engine_set_session_number (filter, session_number);
   engine_set_session_title (filter, subject ? subject : _("GpgOL"));
 
-  if ((rc=engine_decrypt_start (filter, curWindow,
-                                protocol,
-                                1, NULL)))
+  if (flags & OP_DECRYPT)
     {
-      log_error ("%s:%s: engine decrypt start failed: %s",
-                 SRCNAME, __func__, gpg_strerror (rc));
-      goto failure;
+      if ((rc=engine_decrypt_start (filter, curWindow,
+                                    protocol,
+                                    1, NULL)))
+        {
+          log_error ("%s:%s: engine decrypt start failed: %s",
+                     SRCNAME, __func__, gpg_strerror (rc));
+          goto failure;
+        }
+    }
+  else if (flags & OP_VERIFY)
+    {
+      log_debug ("Starting verify");
+      if ((rc=engine_verify_start (filter, curWindow,
+                                   NULL, 0, protocol, senderAddr)))
+        {
+          log_error ("%s:%s: engine verify start failed: %s",
+                     SRCNAME, __func__, gpg_strerror (rc));
+          goto failure;
+        }
     }
 
   /* Write the text in the decryption sink. */
@@ -768,11 +781,11 @@ decryptInspector (LPDISPATCH ctrl, int flags)
         /* Now replace the crypto data with the decrypted data or show it
         somehow.*/
         int err = 0;
-        if (flags & DECRYPT_INSPECTOR_SELECTION)
+        if (flags & DATA_SELECTION)
           {
             err = put_oom_string (selection, "Text", buffer);
           }
-        else if (flags & DECRYPT_INSPECTOR_BODY)
+        else if (flags & DATA_BODY)
           {
             err = put_oom_string (mailItem, "Body", buffer);
           }
@@ -780,7 +793,8 @@ decryptInspector (LPDISPATCH ctrl, int flags)
         if (err)
           {
             MessageBox (NULL, buffer,
-                        _("Plain text"),
+                        flags & OP_DECRYPT ? _("Plain text") :
+                        _("Signed text"),
                         MB_ICONINFORMATION|MB_OK);
           }
       }
@@ -1138,13 +1152,13 @@ startCertManager (LPDISPATCH ctrl)
 HRESULT
 decryptBody (LPDISPATCH ctrl)
 {
-  return decryptInspector (ctrl, DECRYPT_INSPECTOR_BODY);
+  return do_reader_action (ctrl, OP_DECRYPT | DATA_BODY);
 }
 
 HRESULT
 decryptSelection (LPDISPATCH ctrl)
 {
-  return decryptInspector (ctrl, DECRYPT_INSPECTOR_SELECTION);
+  return do_reader_action (ctrl, OP_DECRYPT | DATA_SELECTION);
 }
 
 HRESULT
@@ -1175,3 +1189,8 @@ HRESULT signBody (LPDISPATCH ctrl)
 {
   return do_composer_action (ctrl, DATA_BODY | OP_SIGN);
 }
+
+HRESULT verifyBody (LPDISPATCH ctrl)
+{
+  return do_reader_action (ctrl, DATA_BODY | OP_VERIFY);
+}
diff --git a/src/ribbon-callbacks.h b/src/ribbon-callbacks.h
index ed5961e..0f46af4 100644
--- a/src/ribbon-callbacks.h
+++ b/src/ribbon-callbacks.h
@@ -35,6 +35,7 @@
 #define ID_CMD_ATT_ENCSIGN_FILE  9
 #define ID_CMD_SIGN_BODY        10
 #define ID_CMD_ATT_ENC_FILE     11
+#define ID_CMD_VERIFY_BODY      12
 
 #define ID_BTN_CERTMANAGER       IDI_KEY_MANAGER_64_PNG
 #define ID_BTN_DECRYPT           IDI_DECRYPT_16_PNG
@@ -43,6 +44,7 @@
 #define ID_BTN_ENCRYPT_LARGE     IDI_ENCRYPT_48_PNG
 #define ID_BTN_ENCSIGN_LARGE     IDI_ENCSIGN_FILE_48_PNG
 #define ID_BTN_SIGN_LARGE        IDI_SIGN_48_PNG
+#define ID_BTN_VERIFY_LARGE      IDI_VERIFY_48_PNG
 
 HRESULT decryptAttachments (LPDISPATCH ctrl);
 HRESULT encryptSelection (LPDISPATCH ctrl);
@@ -54,4 +56,5 @@ HRESULT addEncAttachment (LPDISPATCH ctrl);
 HRESULT getIcon (int id, VARIANT* result);
 HRESULT startCertManager (LPDISPATCH ctrl);
 HRESULT signBody (LPDISPATCH ctrl);
+HRESULT verifyBody (LPDISPATCH ctrl);
 #endif
diff --git a/src/verify-48.png b/src/verify-48.png
new file mode 100644
index 0000000..304df7f
Binary files /dev/null and b/src/verify-48.png differ

commit b867c7a12fc2e8436f358d02dcdfbc38dada710d
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Aug 8 16:21:06 2013 +0000

    Add Action to add encrypted attachment without sig
    
        Adds a new Action to add an encrypted attachment
        without the signature.
    
        * src/gpgoladdin.cpp (GetIDsOfNames, Invoke): Add callback
        handling.
        (GetCustomUI): Add new UI for action.
        * src/ribbon-callbacks.cpp, src/ribbon-callbacks.h
        (addEncAttachment): New.

diff --git a/src/gpgoladdin.cpp b/src/gpgoladdin.cpp
index 35e1f72..9a01221 100644
--- a/src/gpgoladdin.cpp
+++ b/src/gpgoladdin.cpp
@@ -455,6 +455,7 @@ GpgolRibbonExtender::GetIDsOfNames (REFIID riid, LPOLESTR *rgszNames,
       ID_MAPPER (L"encryptBody", ID_CMD_ENCRYPT_BODY)
       ID_MAPPER (L"decryptBody", ID_CMD_DECRYPT_BODY)
       ID_MAPPER (L"addEncSignedAttachment", ID_CMD_ATT_ENCSIGN_FILE)
+      ID_MAPPER (L"addEncAttachment", ID_CMD_ATT_ENC_FILE)
       ID_MAPPER (L"signBody", ID_CMD_SIGN_BODY)
     }
 
@@ -499,6 +500,8 @@ GpgolRibbonExtender::Invoke (DISPID dispid, REFIID riid, LCID lcid,
         return decryptBody (parms->rgvarg[0].pdispVal);
       case ID_CMD_ATT_ENCSIGN_FILE:
         return addEncSignedAttachment (parms->rgvarg[0].pdispVal);
+      case ID_CMD_ATT_ENC_FILE:
+        return addEncAttachment (parms->rgvarg[0].pdispVal);
       case ID_CMD_SIGN_BODY:
         return signBody (parms->rgvarg[0].pdispVal);
       case ID_BTN_CERTMANAGER:
@@ -573,6 +576,11 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
         L"     </group>"
         L"     <group id=\"attachmentGroup\""
         L"            label=\"%S\">"
+        L"       <button id=\"encryptedFile\""
+        L"               getImage=\"btnEncryptLarge\""
+        L"               size=\"large\""
+        L"               label=\"%S\""
+        L"               onAction=\"addEncAttachment\"/>"
         L"       <button id=\"encryptSignFile\""
         L"               getImage=\"btnEncryptFileLarge\""
         L"               size=\"large\""
@@ -601,6 +609,7 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
         _("Decrypt"),
         _("Sign"),
         _("Attachments"),
+        _("Encrypted file"),
         _("Encrypted file and Signature"),
         _("Encrypt"), _("Decrypt")
         );
diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index 9884a29..8b02ece 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -1165,6 +1165,12 @@ addEncSignedAttachment (LPDISPATCH ctrl)
   return attachEncryptedFile (ctrl, OP_SIGN);
 }
 
+HRESULT
+addEncAttachment (LPDISPATCH ctrl)
+{
+  return attachEncryptedFile (ctrl, 0);
+}
+
 HRESULT signBody (LPDISPATCH ctrl)
 {
   return do_composer_action (ctrl, DATA_BODY | OP_SIGN);
diff --git a/src/ribbon-callbacks.h b/src/ribbon-callbacks.h
index fa6d63c..ed5961e 100644
--- a/src/ribbon-callbacks.h
+++ b/src/ribbon-callbacks.h
@@ -34,6 +34,7 @@
 #define ID_CMD_DECRYPT_BODY      8
 #define ID_CMD_ATT_ENCSIGN_FILE  9
 #define ID_CMD_SIGN_BODY        10
+#define ID_CMD_ATT_ENC_FILE     11
 
 #define ID_BTN_CERTMANAGER       IDI_KEY_MANAGER_64_PNG
 #define ID_BTN_DECRYPT           IDI_DECRYPT_16_PNG
@@ -49,6 +50,7 @@ HRESULT decryptSelection (LPDISPATCH ctrl);
 HRESULT decryptBody (LPDISPATCH ctrl);
 HRESULT encryptBody (LPDISPATCH ctrl);
 HRESULT addEncSignedAttachment (LPDISPATCH ctrl);
+HRESULT addEncAttachment (LPDISPATCH ctrl);
 HRESULT getIcon (int id, VARIANT* result);
 HRESULT startCertManager (LPDISPATCH ctrl);
 HRESULT signBody (LPDISPATCH ctrl);

commit 82c9d671ed9dc56c04ceb56eb7ebb44884da4698
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Aug 8 16:17:53 2013 +0000

    Use correct filename for the signature
    
        This uses the name of the encrypted file as the basename
        for the signature and not the name of the original file.
    
        * src/ribbon-callbacks.cpp (attachSignature, attachEncryptedFile):
        Use correct filename for signature.

diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index 9ebc1d2..9884a29 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -89,7 +89,7 @@ copyFileToSink (HANDLE hFile, sink_t sink)
 static int
 attachSignature (LPDISPATCH mailItem, char *subject, HANDLE hFileToSign,
                  protocol_t protocol, unsigned int session_number,
-                 HWND curWindow, wchar_t *originalFilename, char *sender)
+                 HWND curWindow, wchar_t *fileNameToSign, char *sender)
 {
   wchar_t *sigName = NULL;
   wchar_t *sigFileName = NULL;
@@ -117,7 +117,7 @@ attachSignature (LPDISPATCH mailItem, char *subject, HANDLE hFileToSign,
   if (engine_sign_start (filter, curWindow, protocol, sender, &protocol))
     goto failure;
 
-  sigName = get_pretty_attachment_name (originalFilename, protocol, 1);
+  sigName = get_pretty_attachment_name (fileNameToSign, protocol, 1);
 
   /* If we are unlucky the number of temporary file artifacts might
      differ for the signature and the encrypted file but we have
@@ -1085,7 +1085,7 @@ attachEncryptedFile (LPDISPATCH ctrl, int flags)
   if (flags & OP_SIGN)
     {
       attachSignature (mailItem, subject, hEncFile, protocol, session_number,
-                       curWindow, fileToEncryptW, senderAddr);
+                       curWindow, encryptedFile, senderAddr);
     }
 
 failure:

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

Summary of changes:
 src/Makefile.am          |    2 +-
 src/dialogs.h            |    1 +
 src/dialogs.rc           |    1 +
 src/gpgoladdin.cpp       |   20 +++++++++++++
 src/ribbon-callbacks.cpp |   71 +++++++++++++++++++++++++++++++---------------
 src/ribbon-callbacks.h   |    5 +++
 src/verify-48.png        |  Bin 0 -> 3465 bytes
 7 files changed, 76 insertions(+), 24 deletions(-)
 create mode 100644 src/verify-48.png


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



From cvs at cvs.gnupg.org  Thu Aug  8 21:56:32 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Thu, 08 Aug 2013 21:56:32 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-233-g50c98c7
Message-ID: <E1V7VrH-0004nb-Is@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  50c98c7ed6b542857ee2f902eca36cda37407737 (commit)
      from  498b9a95dc65c43240835d64cc92d8fb43014d53 (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 50c98c7ed6b542857ee2f902eca36cda37407737
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 8 21:22:38 2013 +0200

    agent: Extend cmd KEYINFO to return data from sshcontrol.
    
    * agent/command-ssh.c (struct control_file_s): Rename to
    ssh_control_file_s.
    (ssh_open_control_file, ssh_close_control_file)
    (ssh_read_control_file, ssh_search_control_file): New.
    (control_file_t):  Rename and move to ...
    * agent/agent.h (ssh_control_file_t): here.
    * agent/command.c (do_one_keyinfo): Add args is_ssh, ttl, disabled,
    and confirm. Rename unknown keytype indicator from '-' to 'X'.  Extend
    output.
    (cmd_keyinfo): Add options --ssh-list and --with-ssh.
    --
    
    This extension allows the development of frontends to manage the
    sshcontrol file.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/agent/agent.h b/agent/agent.h
index 7445061..885e7fe 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -157,6 +157,10 @@ struct
 /* Forward reference for local definitions in command.c.  */
 struct server_local_s;
 
+/* Declaration of objects from command-ssh.c.  */
+struct ssh_control_file_s;
+typedef struct ssh_control_file_s *ssh_control_file_t;
+
 /* Forward reference for local definitions in call-scd.c.  */
 struct scd_local_s;
 
@@ -290,6 +294,16 @@ gpg_error_t pinentry_loopback(ctrl_t, const char *keyword,
 			      size_t max_length);
 
 /*-- command-ssh.c --*/
+ssh_control_file_t ssh_open_control_file (void);
+void ssh_close_control_file (ssh_control_file_t cf);
+gpg_error_t ssh_read_control_file (ssh_control_file_t cf,
+                                   char *r_hexgrip, int *r_disabled,
+                                   int *r_ttl, int *r_confirm);
+gpg_error_t ssh_search_control_file (ssh_control_file_t cf,
+                                     const char *hexgrip,
+                                     int *r_disabled,
+                                     int *r_ttl, int *r_confirm);
+
 void start_command_handler_ssh (ctrl_t, gnupg_fd_t);
 
 /*-- findkey.c --*/
diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 39435aa..f378ade 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -1,5 +1,6 @@
 /* command-ssh.c - gpg-agent's ssh-agent emulation layer
  * Copyright (C) 2004, 2005, 2006, 2009, 2012 Free Software Foundation, Inc.
+ * Copyright (C) 2013 Werner Koch
  *
  * This file is part of GnuPG.
  *
@@ -87,7 +88,7 @@ static const char sshcontrolblurb[] =
 "# the format of the entries is fixed and checked by gpg-agent. A\n"
 "# non-comment line starts with optional white spaces, followed by the\n"
 "# keygrip of the key given as 40 hex digits, optionally followed by a\n"
-"# the caching TTL in seconds and another optional field for arbitrary\n"
+"# caching TTL in seconds, and another optional field for arbitrary\n"
 "# flags.   Prepend the keygrip with an '!' mark to disable it.\n"
 "\n";
 
@@ -186,8 +187,8 @@ struct ssh_key_type_spec
 };
 
 
-/* An object used to access the sshcontrol file.  */
-struct control_file_s
+/* Definition of an object to access the sshcontrol file.  */
+struct ssh_control_file_s
 {
   char *fname;  /* Name of the file.  */
   FILE *fp;     /* This is never NULL. */
@@ -200,8 +201,6 @@ struct control_file_s
     char hexgrip[40+1];  /* The hexgrip of the item (uppercase).  */
   } item;
 };
-typedef struct control_file_s *control_file_t;
-
 
 
 /* Prototypes.  */
@@ -730,10 +729,10 @@ file_to_buffer (const char *filename, unsigned char **buffer, size_t *buffer_n)
    control file object stored at R_CF.  On error an error code is
    returned and NULL is stored at R_CF.  */
 static gpg_error_t
-open_control_file (control_file_t *r_cf, int append)
+open_control_file (ssh_control_file_t *r_cf, int append)
 {
   gpg_error_t err;
-  control_file_t cf;
+  ssh_control_file_t cf;
 
   cf = xtrycalloc (1, sizeof *cf);
   if (!cf)
@@ -795,7 +794,7 @@ open_control_file (control_file_t *r_cf, int append)
 
 
 static void
-rewind_control_file (control_file_t cf)
+rewind_control_file (ssh_control_file_t cf)
 {
   fseek (cf->fp, 0, SEEK_SET);
   cf->lnr = 0;
@@ -804,7 +803,7 @@ rewind_control_file (control_file_t cf)
 
 
 static void
-close_control_file (control_file_t cf)
+close_control_file (ssh_control_file_t cf)
 {
   if (!cf)
     return;
@@ -818,7 +817,7 @@ close_control_file (control_file_t cf)
 /* Read the next line from the control file and store the data in CF.
    Returns 0 on success, GPG_ERR_EOF on EOF, or other error codes. */
 static gpg_error_t
-read_control_file_item (control_file_t cf)
+read_control_file_item (ssh_control_file_t cf)
 {
   int c, i, n;
   char *p, *pend, line[256];
@@ -921,7 +920,7 @@ read_control_file_item (control_file_t cf)
    a specified TTL for that key is stored there.  If R_CONFIRM is not
    NULL it is set to 1 if the key has the confirm flag set. */
 static gpg_error_t
-search_control_file (control_file_t cf, const char *hexgrip,
+search_control_file (ssh_control_file_t cf, const char *hexgrip,
                      int *r_disabled, int *r_ttl, int *r_confirm)
 {
   gpg_error_t err;
@@ -965,7 +964,7 @@ add_control_entry (ctrl_t ctrl, const char *hexgrip, const char *fmtfpr,
                    int ttl, int confirm)
 {
   gpg_error_t err;
-  control_file_t cf;
+  ssh_control_file_t cf;
   int disabled;
 
   (void)ctrl;
@@ -1001,7 +1000,7 @@ add_control_entry (ctrl_t ctrl, const char *hexgrip, const char *fmtfpr,
 static int
 ttl_from_sshcontrol (const char *hexgrip)
 {
-  control_file_t cf;
+  ssh_control_file_t cf;
   int disabled, ttl;
 
   if (!hexgrip || strlen (hexgrip) != 40)
@@ -1024,7 +1023,7 @@ ttl_from_sshcontrol (const char *hexgrip)
 static int
 confirm_flag_from_sshcontrol (const char *hexgrip)
 {
-  control_file_t cf;
+  ssh_control_file_t cf;
   int disabled, confirm;
 
   if (!hexgrip || strlen (hexgrip) != 40)
@@ -1044,6 +1043,87 @@ confirm_flag_from_sshcontrol (const char *hexgrip)
 }
 
 
+

+
+/* Open the ssh control file for reading.  This is a public version of
+   open_control_file.  The caller must use ssh_close_control_file to
+   release the retruned handle.  */
+ssh_control_file_t
+ssh_open_control_file (void)
+{
+  ssh_control_file_t cf;
+
+  /* Then look at all the registered and non-disabled keys. */
+  if (open_control_file (&cf, 0))
+    return NULL;
+  return cf;
+}
+
+/* Close an ssh control file handle.  This is the public version of
+   close_control_file.  CF may be NULL.  */
+void
+ssh_close_control_file (ssh_control_file_t cf)
+{
+  close_control_file (cf);
+}
+
+/* Read the next item from the ssh control file.  The function returns
+   0 if a item was read, GPG_ERR_EOF on eof or another error value.
+   R_HEXGRIP shall either be null or a BUFFER of at least 41 byte.
+   R_DISABLED, R_TTLm and R_CONFIRM return flags from the control
+   file; they are only set on success. */
+gpg_error_t
+ssh_read_control_file (ssh_control_file_t cf,
+                       char *r_hexgrip,
+                       int *r_disabled, int *r_ttl, int *r_confirm)
+{
+  gpg_error_t err;
+
+  do
+    err = read_control_file_item (cf);
+  while (!err && !cf->item.valid);
+  if (!err)
+    {
+      if (r_hexgrip)
+        strcpy (r_hexgrip, cf->item.hexgrip);
+      if (r_disabled)
+        *r_disabled = cf->item.disabled;
+      if (r_ttl)
+        *r_ttl = cf->item.ttl;
+      if (r_confirm)
+        *r_confirm = cf->item.confirm;
+    }
+  return err;
+}
+
+
+/* Search for a key with HEXGRIP in sshcontrol and return all
+   info.  */
+gpg_error_t
+ssh_search_control_file (ssh_control_file_t cf,
+                         const char *hexgrip,
+                         int *r_disabled, int *r_ttl, int *r_confirm)
+{
+  gpg_error_t err;
+  int i;
+  const char *s;
+  char uphexgrip[41];
+
+  /* We need to make sure that HEXGRIP is all uppercase.  The easiest
+     way to do this and also check its length is by copying to a
+     second buffer. */
+  for (i=0, s=hexgrip; i < 40; s++, i++)
+    uphexgrip[i] = *s >= 'a'? (*s & 0xdf): *s;
+  uphexgrip[i] = 0;
+  if (i != 40)
+    err = gpg_error (GPG_ERR_INV_LENGTH);
+  else
+    err = search_control_file (cf, uphexgrip, r_disabled, r_ttl, r_confirm);
+  if (gpg_err_code (err) == GPG_ERR_EOF)
+    err = gpg_error (GPG_ERR_NOT_FOUND);
+  return err;
+}
+
 
 

 
@@ -2185,7 +2265,7 @@ ssh_handler_request_identities (ctrl_t ctrl,
   gcry_sexp_t key_public;
   gpg_error_t err;
   int ret;
-  control_file_t cf = NULL;
+  ssh_control_file_t cf = NULL;
   char *cardsn;
   gpg_error_t ret_err;
 
diff --git a/agent/command.c b/agent/command.c
index 0364868..5e955ab 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -998,13 +998,15 @@ cmd_readkey (assuan_context_t ctx, char *line)
 
 

 static const char hlp_keyinfo[] =
-  "KEYINFO [--list] [--data] [--ssh-fpr] <keygrip>\n"
+  "KEYINFO [--[ssh-]list] [--data] [--ssh-fpr] [--with-ssh] <keygrip>\n"
   "\n"
   "Return information about the key specified by the KEYGRIP.  If the\n"
   "key is not available GPG_ERR_NOT_FOUND is returned.  If the option\n"
   "--list is given the keygrip is ignored and information about all\n"
-  "available keys are returned.  The information is returned as a\n"
-  "status line unless --data was specified, with this format:\n"
+  "available keys are returned.  If --ssh-list is given information\n"
+  "about all keys listed in the sshcontrol are returned.  With --with-ssh\n"
+  "information from sshcontrol is always added to the info. Unless --data\n"
+  "is given, the information is returned as a status line using the format:\n"
   "\n"
   "  KEYINFO <keygrip> <type> <serialno> <idstr> <cached> <protection> <fpr>\n"
   "\n"
@@ -1013,7 +1015,8 @@ static const char hlp_keyinfo[] =
   "TYPE is describes the type of the key:\n"
   "    'D' - Regular key stored on disk,\n"
   "    'T' - Key is stored on a smartcard (token),\n"
-  "    '-' - Unknown type.\n"
+  "    'X' - Unknown type,\n"
+  "    '-' - Key is missing.\n"
   "\n"
   "SERIALNO is an ASCII string with the serial number of the\n"
   "         smartcard.  If the serial number is not known a single\n"
@@ -1031,13 +1034,21 @@ static const char hlp_keyinfo[] =
   "    '-' - Unknown protection.\n"
   "\n"
   "FPR returns the formatted ssh-style fingerprint of the key.  It is only\n"
-  "    print if the option --ssh-fpr has been used. '-' is printed if the\n"
-  "    fingerprint is not available.\n"
+  "    printed if the option --ssh-fpr has been used.  It defaults to '-'.\n"
+  "\n"
+  "TTL is the TTL in seconds for that key or '-' if n/a.\n"
+  "\n"
+  "FLAGS is a word consisting of one-letter flags:\n"
+  "      'D' - The key has been disabled,\n"
+  "      'S' - The key is listed in sshcontrol (requires --with-ssh),\n"
+  "      'c' - Use of the key needs to be confirmed,\n"
+  "      '-' - No flags given.\n"
   "\n"
   "More information may be added in the future.";
 static gpg_error_t
 do_one_keyinfo (ctrl_t ctrl, const unsigned char *grip, assuan_context_t ctx,
-                int data, int with_ssh_fpr)
+                int data, int with_ssh_fpr, int in_ssh,
+                int ttl, int disabled, int confirm)
 {
   gpg_error_t err;
   char hexgrip[40+1];
@@ -1050,24 +1061,55 @@ do_one_keyinfo (ctrl_t ctrl, const unsigned char *grip, assuan_context_t ctx,
   const char *cached;
   const char *protectionstr;
   char *pw;
+  int missing_key = 0;
+  char ttlbuf[20];
+  char flagsbuf[5];
 
   err = agent_key_info_from_file (ctrl, grip, &keytype, &shadow_info);
   if (err)
-    goto leave;
+    {
+      if (in_ssh && gpg_err_code (err) == GPG_ERR_NOT_FOUND)
+        missing_key = 1;
+      else
+        goto leave;
+    }
 
   /* Reformat the grip so that we use uppercase as good style. */
   bin2hex (grip, 20, hexgrip);
 
-  switch (keytype)
+  if (ttl > 0)
+    snprintf (ttlbuf, sizeof ttlbuf, "%d", ttl);
+  else
+    strcpy (ttlbuf, "-");
+
+  *flagsbuf = 0;
+  if (disabled)
+    strcat (flagsbuf, "D");
+  if (in_ssh)
+    strcat (flagsbuf, "S");
+  if (confirm)
+    strcat (flagsbuf, "c");
+  if (!*flagsbuf)
+    strcpy (flagsbuf, "-");
+
+
+  if (missing_key)
     {
-    case PRIVATE_KEY_CLEAR: protectionstr = "C"; keytypestr = "D";
-      break;
-    case PRIVATE_KEY_PROTECTED: protectionstr = "P"; keytypestr = "D";
-      break;
-    case PRIVATE_KEY_SHADOWED: protectionstr = "-"; keytypestr = "T";
-      break;
-    default: protectionstr = "-"; keytypestr = "-";
-      break;
+      protectionstr = "-"; keytypestr = "-";
+    }
+  else
+    {
+      switch (keytype)
+        {
+        case PRIVATE_KEY_CLEAR: protectionstr = "C"; keytypestr = "D";
+          break;
+        case PRIVATE_KEY_PROTECTED: protectionstr = "P"; keytypestr = "D";
+          break;
+        case PRIVATE_KEY_SHADOWED: protectionstr = "-"; keytypestr = "T";
+          break;
+        default: protectionstr = "-"; keytypestr = "X";
+          break;
+        }
     }
 
   /* Compute the ssh fingerprint if requested.  */
@@ -1105,16 +1147,20 @@ do_one_keyinfo (ctrl_t ctrl, const unsigned char *grip, assuan_context_t ctx,
                               cached,
 			      protectionstr,
                               fpr? fpr : "-",
+                              ttlbuf,
+                              flagsbuf,
                               NULL);
   else
     {
       char *string;
 
-      string = xtryasprintf ("%s %s %s %s %s %s %s\n",
+      string = xtryasprintf ("%s %s %s %s %s %s %s %s %s\n",
                              hexgrip, keytypestr,
                              serialno? serialno : "-",
                              idstr? idstr : "-", cached, protectionstr,
-                             fpr? fpr : "-");
+                             fpr? fpr : "-",
+                             ttlbuf,
+                             flagsbuf);
       if (!string)
         err = gpg_error_from_syserror ();
       else
@@ -1141,18 +1187,44 @@ cmd_keyinfo (assuan_context_t ctx, char *line)
   unsigned char grip[20];
   DIR *dir = NULL;
   int list_mode;
-  int opt_data, opt_ssh_fpr;
+  int opt_data, opt_ssh_fpr, opt_with_ssh;
+  ssh_control_file_t cf = NULL;
+  char hexgrip[41];
+  int disabled, ttl, confirm, is_ssh;
 
-  list_mode = has_option (line, "--list");
+  if (has_option (line, "--ssh-list"))
+    list_mode = 2;
+  else
+    list_mode = has_option (line, "--list");
   opt_data = has_option (line, "--data");
   opt_ssh_fpr = has_option (line, "--ssh-fpr");
+  opt_with_ssh = has_option (line, "--with-ssh");
   line = skip_options (line);
 
-  if (list_mode)
+  if (opt_with_ssh || list_mode == 2)
+    cf = ssh_open_control_file ();
+
+  if (list_mode == 2)
+    {
+      if (cf)
+        {
+          while (!ssh_read_control_file (cf, hexgrip,
+                                         &disabled, &ttl, &confirm))
+            {
+              if (hex2bin (hexgrip, grip, 20) < 0 )
+                continue; /* Bad hex string.  */
+              err = do_one_keyinfo (ctrl, grip, ctx, opt_data, opt_ssh_fpr, 1,
+                                    ttl, disabled, confirm);
+              if (err)
+                goto leave;
+            }
+        }
+      err = 0;
+    }
+  else if (list_mode)
     {
       char *dirname;
       struct dirent *dir_entry;
-      char hexgrip[41];
 
       dirname = make_filename_try (opt.homedir, GNUPG_PRIVATE_KEYS_DIR, NULL);
       if (!dirname)
@@ -1180,7 +1252,19 @@ cmd_keyinfo (assuan_context_t ctx, char *line)
           if ( hex2bin (hexgrip, grip, 20) < 0 )
             continue; /* Bad hex string.  */
 
-          err = do_one_keyinfo (ctrl, grip, ctx, opt_data, opt_ssh_fpr);
+          disabled = ttl = confirm = is_ssh = 0;
+          if (opt_with_ssh)
+            {
+              err = ssh_search_control_file (cf, hexgrip,
+                                             &disabled, &ttl, &confirm);
+              if (!err)
+                is_ssh = 1;
+              else if (gpg_err_code (err) != GPG_ERR_NOT_FOUND)
+                goto leave;
+            }
+
+          err = do_one_keyinfo (ctrl, grip, ctx, opt_data, opt_ssh_fpr, is_ssh,
+                                ttl, disabled, confirm);
           if (err)
             goto leave;
         }
@@ -1191,10 +1275,23 @@ cmd_keyinfo (assuan_context_t ctx, char *line)
       err = parse_keygrip (ctx, line, grip);
       if (err)
         goto leave;
-      err = do_one_keyinfo (ctrl, grip, ctx, opt_data, opt_ssh_fpr);
+      disabled = ttl = confirm = is_ssh = 0;
+      if (opt_with_ssh)
+        {
+          err = ssh_search_control_file (cf, line,
+                                         &disabled, &ttl, &confirm);
+          if (!err)
+            is_ssh = 1;
+          else if (gpg_err_code (err) != GPG_ERR_NOT_FOUND)
+            goto leave;
+        }
+
+      err = do_one_keyinfo (ctrl, grip, ctx, opt_data, opt_ssh_fpr, is_ssh,
+                            ttl, disabled, confirm);
     }
 
  leave:
+  ssh_close_control_file (cf);
   if (dir)
     closedir (dir);
   if (err && gpg_err_code (err) != GPG_ERR_NOT_FOUND)

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

Summary of changes:
 agent/agent.h       |   14 +++++
 agent/command-ssh.c |  110 +++++++++++++++++++++++++++++++++-----
 agent/command.c     |  147 ++++++++++++++++++++++++++++++++++++++++++---------
 3 files changed, 231 insertions(+), 40 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Aug  8 22:23:22 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Thu, 08 Aug 2013 22:23:22 +0200
Subject: [git] GnuPG - branch, STABLE-BRANCH-2-0,
 updated. gnupg-2.0.20-27-g88914a9
Message-ID: <E1V7WHF-0005EJ-BU@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-0 has been updated
       via  88914a9e24a8a116508d5b7d52b76b947e4d21a6 (commit)
      from  110b52fffa77b339e6d59eba939408f7e87e7138 (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 88914a9e24a8a116508d5b7d52b76b947e4d21a6
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 8 21:22:38 2013 +0200

    agent: Extend cmd KEYINFO to return data from sshcontrol.
    
    * agent/command-ssh.c (struct control_file_s): Rename to
    ssh_control_file_s.
    (ssh_open_control_file, ssh_close_control_file)
    (ssh_read_control_file, ssh_search_control_file): New.
    (control_file_t):  Rename and move to ...
    * agent/agent.h (ssh_control_file_t): here.
    * agent/command.c (do_one_keyinfo): Add args is_ssh, ttl, disabled,
    and confirm. Rename unknown keytype indicator from '-' to 'X'.  Extend
    output.
    (cmd_keyinfo): Add options --ssh-list and --with-ssh.
    --
    
    This extension allows the development of frontends to manage the
    sshcontrol file.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
    
    (cherry picked from commit 50c98c7ed6b542857ee2f902eca36cda37407737)
    
    Conflicts in agent/command.c (due to less information printed by
    keyinfo) solved.

diff --git a/agent/agent.h b/agent/agent.h
index 4afe6e9..938a9aa 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -126,7 +126,14 @@ struct
 #define DBG_HASHING (opt.debug & DBG_HASHING_VALUE)
 #define DBG_ASSUAN  (opt.debug & DBG_ASSUAN_VALUE)
 
+/* Forward reference for local definitions in command.c.  */
 struct server_local_s;
+
+/* Declaration of objects from command-ssh.c.  */
+struct ssh_control_file_s;
+typedef struct ssh_control_file_s *ssh_control_file_t;
+
+/* Forward reference for local definitions in call-scd.c.  */
 struct scd_local_s;
 
 /* Collection of data per session (aka connection). */
@@ -226,6 +233,16 @@ int serve_mmapped_ssh_request (ctrl_t ctrl,
 #endif /*HAVE_W32_SYSTEM*/
 
 /*-- command-ssh.c --*/
+ssh_control_file_t ssh_open_control_file (void);
+void ssh_close_control_file (ssh_control_file_t cf);
+gpg_error_t ssh_read_control_file (ssh_control_file_t cf,
+                                   char *r_hexgrip, int *r_disabled,
+                                   int *r_ttl, int *r_confirm);
+gpg_error_t ssh_search_control_file (ssh_control_file_t cf,
+                                     const char *hexgrip,
+                                     int *r_disabled,
+                                     int *r_ttl, int *r_confirm);
+
 void start_command_handler_ssh (ctrl_t, gnupg_fd_t);
 
 /*-- findkey.c --*/
diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 6533730..a767697 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -1,5 +1,6 @@
 /* command-ssh.c - gpg-agent's ssh-agent emulation layer
  * Copyright (C) 2004, 2005, 2006, 2009, 2012 Free Software Foundation, Inc.
+ * Copyright (C) 2013 Werner Koch
  *
  * This file is part of GnuPG.
  *
@@ -88,7 +89,7 @@ static const char sshcontrolblurb[] =
 "# the format of the entries is fixed and checked by gpg-agent. A\n"
 "# non-comment line starts with optional white spaces, followed by the\n"
 "# keygrip of the key given as 40 hex digits, optionally followed by a\n"
-"# the caching TTL in seconds and another optional field for arbitrary\n"
+"# caching TTL in seconds, and another optional field for arbitrary\n"
 "# flags.   Prepend the keygrip with an '!' mark to disable it.\n"
 "\n";
 
@@ -187,8 +188,8 @@ struct ssh_key_type_spec
 };
 
 
-/* An object used to access the sshcontrol file.  */
-struct control_file_s
+/* Definition of an object to access the sshcontrol file.  */
+struct ssh_control_file_s
 {
   char *fname;  /* Name of the file.  */
   FILE *fp;     /* This is never NULL. */
@@ -201,8 +202,6 @@ struct control_file_s
     char hexgrip[40+1];  /* The hexgrip of the item (uppercase).  */
   } item;
 };
-typedef struct control_file_s *control_file_t;
-
 
 
 /* Prototypes.  */
@@ -731,10 +730,10 @@ file_to_buffer (const char *filename, unsigned char **buffer, size_t *buffer_n)
    control file object stored at R_CF.  On error an error code is
    returned and NULL is stored at R_CF.  */
 static gpg_error_t
-open_control_file (control_file_t *r_cf, int append)
+open_control_file (ssh_control_file_t *r_cf, int append)
 {
   gpg_error_t err;
-  control_file_t cf;
+  ssh_control_file_t cf;
 
   cf = xtrycalloc (1, sizeof *cf);
   if (!cf)
@@ -796,7 +795,7 @@ open_control_file (control_file_t *r_cf, int append)
 
 
 static void
-rewind_control_file (control_file_t cf)
+rewind_control_file (ssh_control_file_t cf)
 {
   fseek (cf->fp, 0, SEEK_SET);
   cf->lnr = 0;
@@ -805,7 +804,7 @@ rewind_control_file (control_file_t cf)
 
 
 static void
-close_control_file (control_file_t cf)
+close_control_file (ssh_control_file_t cf)
 {
   if (!cf)
     return;
@@ -819,7 +818,7 @@ close_control_file (control_file_t cf)
 /* Read the next line from the control file and store the data in CF.
    Returns 0 on success, GPG_ERR_EOF on EOF, or other error codes. */
 static gpg_error_t
-read_control_file_item (control_file_t cf)
+read_control_file_item (ssh_control_file_t cf)
 {
   int c, i, n;
   char *p, *pend, line[256];
@@ -922,7 +921,7 @@ read_control_file_item (control_file_t cf)
    a specified TTL for that key is stored there.  If R_CONFIRM is not
    NULL it is set to 1 if the key has the confirm flag set. */
 static gpg_error_t
-search_control_file (control_file_t cf, const char *hexgrip,
+search_control_file (ssh_control_file_t cf, const char *hexgrip,
                      int *r_disabled, int *r_ttl, int *r_confirm)
 {
   gpg_error_t err;
@@ -966,7 +965,7 @@ add_control_entry (ctrl_t ctrl, const char *hexgrip, const char *fmtfpr,
                    int ttl, int confirm)
 {
   gpg_error_t err;
-  control_file_t cf;
+  ssh_control_file_t cf;
   int disabled;
 
   (void)ctrl;
@@ -1002,7 +1001,7 @@ add_control_entry (ctrl_t ctrl, const char *hexgrip, const char *fmtfpr,
 static int
 ttl_from_sshcontrol (const char *hexgrip)
 {
-  control_file_t cf;
+  ssh_control_file_t cf;
   int disabled, ttl;
 
   if (!hexgrip || strlen (hexgrip) != 40)
@@ -1025,7 +1024,7 @@ ttl_from_sshcontrol (const char *hexgrip)
 static int
 confirm_flag_from_sshcontrol (const char *hexgrip)
 {
-  control_file_t cf;
+  ssh_control_file_t cf;
   int disabled, confirm;
 
   if (!hexgrip || strlen (hexgrip) != 40)
@@ -1045,6 +1044,87 @@ confirm_flag_from_sshcontrol (const char *hexgrip)
 }
 
 
+

+
+/* Open the ssh control file for reading.  This is a public version of
+   open_control_file.  The caller must use ssh_close_control_file to
+   release the retruned handle.  */
+ssh_control_file_t
+ssh_open_control_file (void)
+{
+  ssh_control_file_t cf;
+
+  /* Then look at all the registered and non-disabled keys. */
+  if (open_control_file (&cf, 0))
+    return NULL;
+  return cf;
+}
+
+/* Close an ssh control file handle.  This is the public version of
+   close_control_file.  CF may be NULL.  */
+void
+ssh_close_control_file (ssh_control_file_t cf)
+{
+  close_control_file (cf);
+}
+
+/* Read the next item from the ssh control file.  The function returns
+   0 if a item was read, GPG_ERR_EOF on eof or another error value.
+   R_HEXGRIP shall either be null or a BUFFER of at least 41 byte.
+   R_DISABLED, R_TTLm and R_CONFIRM return flags from the control
+   file; they are only set on success. */
+gpg_error_t
+ssh_read_control_file (ssh_control_file_t cf,
+                       char *r_hexgrip,
+                       int *r_disabled, int *r_ttl, int *r_confirm)
+{
+  gpg_error_t err;
+
+  do
+    err = read_control_file_item (cf);
+  while (!err && !cf->item.valid);
+  if (!err)
+    {
+      if (r_hexgrip)
+        strcpy (r_hexgrip, cf->item.hexgrip);
+      if (r_disabled)
+        *r_disabled = cf->item.disabled;
+      if (r_ttl)
+        *r_ttl = cf->item.ttl;
+      if (r_confirm)
+        *r_confirm = cf->item.confirm;
+    }
+  return err;
+}
+
+
+/* Search for a key with HEXGRIP in sshcontrol and return all
+   info.  */
+gpg_error_t
+ssh_search_control_file (ssh_control_file_t cf,
+                         const char *hexgrip,
+                         int *r_disabled, int *r_ttl, int *r_confirm)
+{
+  gpg_error_t err;
+  int i;
+  const char *s;
+  char uphexgrip[41];
+
+  /* We need to make sure that HEXGRIP is all uppercase.  The easiest
+     way to do this and also check its length is by copying to a
+     second buffer. */
+  for (i=0, s=hexgrip; i < 40; s++, i++)
+    uphexgrip[i] = *s >= 'a'? (*s & 0xdf): *s;
+  uphexgrip[i] = 0;
+  if (i != 40)
+    err = gpg_error (GPG_ERR_INV_LENGTH);
+  else
+    err = search_control_file (cf, uphexgrip, r_disabled, r_ttl, r_confirm);
+  if (gpg_err_code (err) == GPG_ERR_EOF)
+    err = gpg_error (GPG_ERR_NOT_FOUND);
+  return err;
+}
+
 
 

 
@@ -2187,7 +2267,7 @@ ssh_handler_request_identities (ctrl_t ctrl,
   gcry_sexp_t key_public;
   gpg_error_t err;
   int ret;
-  control_file_t cf = NULL;
+  ssh_control_file_t cf = NULL;
   char *cardsn;
   gpg_error_t ret_err;
 
diff --git a/agent/command.c b/agent/command.c
index 97cf507..2405c54 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1,6 +1,7 @@
 /* command.c - gpg-agent command handler
  * Copyright (C) 2001, 2002, 2003, 2004, 2005,
  *               2006, 2008, 2009  Free Software Foundation, Inc.
+ * Copyright (C) 2013 Werner Koch
  *
  * This file is part of GnuPG.
  *
@@ -833,22 +834,25 @@ cmd_readkey (assuan_context_t ctx, char *line)
 
 

 static const char hlp_keyinfo[] =
-  "KEYINFO [--list] [--data] [--ssh-fpr] <keygrip>\n"
+  "KEYINFO [--[ssh-]list] [--data] [--ssh-fpr] [--with-ssh] <keygrip>\n"
   "\n"
   "Return information about the key specified by the KEYGRIP.  If the\n"
   "key is not available GPG_ERR_NOT_FOUND is returned.  If the option\n"
   "--list is given the keygrip is ignored and information about all\n"
-  "available keys are returned.  The information is returned as a\n"
-  "status line unless --data was specified, with this format:\n"
+  "available keys are returned.  If --ssh-list is given information\n"
+  "about all keys listed in the sshcontrol are returned.  With --with-ssh\n"
+  "information from sshcontrol is always added to the info. Unless --data\n"
+  "is given, the information is returned as a status line using the format:\n"
   "\n"
-  "  KEYINFO <keygrip> <type> <serialno> <idstr> - - <fpr>\n"
+  "  KEYINFO <keygrip> <type> <serialno> <idstr> - - <fpr> <ttl> <flags>\n"
   "\n"
   "KEYGRIP is the keygrip.\n"
   "\n"
-  "TYPE is describes the type of the key:\n"
+  "TYPE describes the type of the key:\n"
   "    'D' - Regular key stored on disk,\n"
-  "    'T' - Key is stored on a smartcard (token).\n"
-  "    '-' - Unknown type.\n"
+  "    'T' - Key is stored on a smartcard (token),\n"
+  "    'X' - Unknown type,\n"
+  "    '-' - Key is missing.\n"
   "\n"
   "SERIALNO is an ASCII string with the serial number of the\n"
   "         smartcard.  If the serial number is not known a single\n"
@@ -858,13 +862,21 @@ static const char hlp_keyinfo[] =
   "      is not known a dash is used instead.\n"
   "\n"
   "FPR returns the formatted ssh-style fingerprint of the key.  It is only\n"
-  "    print if the option --ssh-fpr has been used. '-' is printed if the\n"
-  "    fingerprint is not available.\n"
+  "    printed if the option --ssh-fpr has been used.  It defaults to '-'.\n"
+  "\n"
+  "TTL is the TTL in seconds for that key or '-' if n/a.\n"
+  "\n"
+  "FLAGS is a word consisting of one-letter flags:\n"
+  "      'D' - The key has been disabled,\n"
+  "      'S' - The key is listed in sshcontrol (requires --with-ssh),\n"
+  "      'c' - Use of the key needs to be confirmed,\n"
+  "      '-' - No flags given.\n"
   "\n"
   "More information may be added in the future.";
 static gpg_error_t
 do_one_keyinfo (ctrl_t ctrl, const unsigned char *grip, assuan_context_t ctx,
-                int data, int with_ssh_fpr)
+                int data, int with_ssh_fpr, int in_ssh,
+                int ttl, int disabled, int confirm)
 {
   gpg_error_t err;
   char hexgrip[40+1];
@@ -874,21 +886,56 @@ do_one_keyinfo (ctrl_t ctrl, const unsigned char *grip, assuan_context_t ctx,
   char *serialno = NULL;
   char *idstr = NULL;
   const char *keytypestr;
+  int missing_key = 0;
+  char ttlbuf[20];
+  char flagsbuf[5];
 
   err = agent_key_info_from_file (ctrl, grip, &keytype, &shadow_info);
   if (err)
-    goto leave;
+    {
+      if (in_ssh && gpg_err_code (err) == GPG_ERR_NOT_FOUND)
+        missing_key = 1;
+      else
+        goto leave;
+    }
 
   /* Reformat the grip so that we use uppercase as good style. */
   bin2hex (grip, 20, hexgrip);
 
-  if (keytype == PRIVATE_KEY_CLEAR
-      || keytype == PRIVATE_KEY_PROTECTED)
-    keytypestr = "D";
-  else if (keytype == PRIVATE_KEY_SHADOWED)
-    keytypestr = "T";
+  if (ttl > 0)
+    snprintf (ttlbuf, sizeof ttlbuf, "%d", ttl);
   else
-    keytypestr = "-";
+    strcpy (ttlbuf, "-");
+
+  *flagsbuf = 0;
+  if (disabled)
+    strcat (flagsbuf, "D");
+  if (in_ssh)
+    strcat (flagsbuf, "S");
+  if (confirm)
+    strcat (flagsbuf, "c");
+  if (!*flagsbuf)
+    strcpy (flagsbuf, "-");
+
+
+  if (missing_key)
+    {
+      keytypestr = "-";
+    }
+  else
+    {
+      switch (keytype)
+        {
+        case PRIVATE_KEY_CLEAR: keytypestr = "D";
+          break;
+        case PRIVATE_KEY_PROTECTED: keytypestr = "D";
+          break;
+        case PRIVATE_KEY_SHADOWED: keytypestr = "T";
+          break;
+        default: keytypestr = "X";
+          break;
+        }
+    }
 
   /* Compute the ssh fingerprint if requested.  */
   if (with_ssh_fpr)
@@ -921,16 +968,21 @@ do_one_keyinfo (ctrl_t ctrl, const unsigned char *grip, assuan_context_t ctx,
                               "-",
 			      "-",
                               fpr? fpr : "-",
+                              ttlbuf,
+                              flagsbuf,
                               NULL);
   else
     {
       char *string;
 
-      string = xtryasprintf ("%s %s %s %s - - %s\n",
+      string = xtryasprintf ("%s %s %s %s - - %s %s %s\n",
                              hexgrip, keytypestr,
                              serialno? serialno : "-",
                              idstr? idstr : "-",
-                             fpr? fpr : "-");
+                             fpr? fpr : "-",
+                             ttlbuf,
+                             flagsbuf);
+
       if (!string)
         err = gpg_error_from_syserror ();
       else
@@ -955,18 +1007,44 @@ cmd_keyinfo (assuan_context_t ctx, char *line)
   unsigned char grip[20];
   DIR *dir = NULL;
   int list_mode;
-  int opt_data, opt_ssh_fpr;
+  int opt_data, opt_ssh_fpr, opt_with_ssh;
+  ssh_control_file_t cf = NULL;
+  char hexgrip[41];
+  int disabled, ttl, confirm, is_ssh;
 
-  list_mode = has_option (line, "--list");
+  if (has_option (line, "--ssh-list"))
+    list_mode = 2;
+  else
+    list_mode = has_option (line, "--list");
   opt_data = has_option (line, "--data");
   opt_ssh_fpr = has_option (line, "--ssh-fpr");
+  opt_with_ssh = has_option (line, "--with-ssh");
   line = skip_options (line);
 
-  if (list_mode)
+  if (opt_with_ssh || list_mode == 2)
+    cf = ssh_open_control_file ();
+
+  if (list_mode == 2)
+    {
+      if (cf)
+        {
+          while (!ssh_read_control_file (cf, hexgrip,
+                                         &disabled, &ttl, &confirm))
+            {
+              if (hex2bin (hexgrip, grip, 20) < 0 )
+                continue; /* Bad hex string.  */
+              err = do_one_keyinfo (ctrl, grip, ctx, opt_data, opt_ssh_fpr, 1,
+                                    ttl, disabled, confirm);
+              if (err)
+                goto leave;
+            }
+        }
+      err = 0;
+    }
+  else if (list_mode)
     {
       char *dirname;
       struct dirent *dir_entry;
-      char hexgrip[41];
 
       dirname = make_filename_try (opt.homedir, GNUPG_PRIVATE_KEYS_DIR, NULL);
       if (!dirname)
@@ -994,7 +1072,19 @@ cmd_keyinfo (assuan_context_t ctx, char *line)
           if ( hex2bin (hexgrip, grip, 20) < 0 )
             continue; /* Bad hex string.  */
 
-          err = do_one_keyinfo (ctrl, grip, ctx, opt_data, opt_ssh_fpr);
+          disabled = ttl = confirm = is_ssh = 0;
+          if (opt_with_ssh)
+            {
+              err = ssh_search_control_file (cf, hexgrip,
+                                             &disabled, &ttl, &confirm);
+              if (!err)
+                is_ssh = 1;
+              else if (gpg_err_code (err) != GPG_ERR_NOT_FOUND)
+                goto leave;
+            }
+
+          err = do_one_keyinfo (ctrl, grip, ctx, opt_data, opt_ssh_fpr, is_ssh,
+                                ttl, disabled, confirm);
           if (err)
             goto leave;
         }
@@ -1005,10 +1095,23 @@ cmd_keyinfo (assuan_context_t ctx, char *line)
       err = parse_keygrip (ctx, line, grip);
       if (err)
         goto leave;
-      err = do_one_keyinfo (ctrl, grip, ctx, opt_data, opt_ssh_fpr);
+      disabled = ttl = confirm = is_ssh = 0;
+      if (opt_with_ssh)
+        {
+          err = ssh_search_control_file (cf, line,
+                                         &disabled, &ttl, &confirm);
+          if (!err)
+            is_ssh = 1;
+          else if (gpg_err_code (err) != GPG_ERR_NOT_FOUND)
+            goto leave;
+        }
+
+      err = do_one_keyinfo (ctrl, grip, ctx, opt_data, opt_ssh_fpr, is_ssh,
+                            ttl, disabled, confirm);
     }
 
  leave:
+  ssh_close_control_file (cf);
   if (dir)
     closedir (dir);
   if (err && gpg_err_code (err) != GPG_ERR_NOT_FOUND)

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

Summary of changes:
 agent/agent.h       |   17 ++++++
 agent/command-ssh.c |  110 +++++++++++++++++++++++++++++++-----
 agent/command.c     |  153 ++++++++++++++++++++++++++++++++++++++++++--------
 3 files changed, 240 insertions(+), 40 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Aug  9 01:59:51 2013
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Fri, 09 Aug 2013 01:59:51 +0200
Subject: [git] GCRYPT - branch, master, updated. libgcrypt-1.5.0-185-g2b5bbe2
Message-ID: <E1V7Zej-0008Nj-S0@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  2b5bbe264fcd61e5e458e5f71a6507ba0271c729 (commit)
      from  426cbc9feca0c8f46208fb3670adab95f9e46087 (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 2b5bbe264fcd61e5e458e5f71a6507ba0271c729
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Aug 9 08:26:27 2013 +0900

    cipher: fix memory leak.
    
    * cipher/pubkey.c (gcry_pk_sign): Handle the specific case of ECC,
    where there is NULL whichi is not the sentinel.
    
    --
    
    This is a kind of makeshift fix, but the MPI array API is internal
    only and will be removed, it is better not to change API now.

diff --git a/cipher/pubkey.c b/cipher/pubkey.c
index e867169..e6c1cf6 100644
--- a/cipher/pubkey.c
+++ b/cipher/pubkey.c
@@ -3339,7 +3339,16 @@ gcry_pk_sign (gcry_sexp_t *r_sig, gcry_sexp_t s_hash, gcry_sexp_t s_skey)
  leave:
   if (skey)
     {
-      release_mpi_array (skey);
+      if (is_ecc)
+        /* Q is optional and may be NULL, while there is D after Q.  */
+        for (i = 0; i < 7; i++)
+          {
+            if (skey[i])
+              mpi_free (skey[i]);
+            skey[i] = NULL;
+          }
+      else
+        release_mpi_array (skey);
       gcry_free (skey);
     }
 

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

Summary of changes:
 cipher/pubkey.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Aug  9 19:51:15 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 09 Aug 2013 19:51:15 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.4.2-7-g8579091
Message-ID: <E1V7qNT-0007fI-Ec@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  8579091c4f6a36e6bb06fcfbd147a776166fd3ea (commit)
      from  a4c80126ae4754c8478c69a8a24a6ffd975485fc (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 8579091c4f6a36e6bb06fcfbd147a776166fd3ea
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 9 19:19:26 2013 +0200

    Add function gpgme_data_identify.
    
    * src/gpgme.h.in (gpgme_data_type_t): New.
    (gpgme_data_identify): New prototype.
    * src/data-identify.c: New.
    * src/parsetlv.c, src/parsetlv.h: New.  Take from gpa.
    * src/libgpgme.vers, src/gpgme.def: Add gpgme_data_identify.
    * src/gpgme-tool.c (status): Add STATUS_IDENTIFY_RESULT.
    (gt_identify): New.
    (cmd_identify): New.
    
    (hlp_passwd): Move close to cmd_passwd.
    --
    
    It is often useful to have a way to identify the data which needs
    processing.  This is such a common task that it makes sense to
    implement this in gpgme to avoid diverging implementations.

diff --git a/NEWS b/NEWS
index 5c871dd..8f700fd 100644
--- a/NEWS
+++ b/NEWS
@@ -7,9 +7,13 @@ Noteworthy changes in version 1.4.3 (unreleased)
  * Under Windows the default engines names are first searched in the
    installation directory of the gpgme DLL.
 
+ * New function gpgme_data_identify to detect the type of a message.
+
  * Interface changes relative to the 1.4.2 release:
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  gpgme_signers_count            NEW.
+ gpgme_data_type_t              NEW.
+ gpgme_data_identify            NEW.
 
 
 Noteworthy changes in version 1.4.2 (2013-05-28)
diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index 08e2f0f..4ec0bfe 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -1885,6 +1885,7 @@ be used to manipulate both.
 @menu
 * Data Buffer I/O Operations::    I/O operations on data buffers.
 * Data Buffer Meta-Data::         Meta-data manipulation of data buffers.
+* Data Buffer Convenience::       Convenience fucntion for data buffers.
 @end menu
 
 
@@ -2047,6 +2048,56 @@ The function @code{gpgme_data_set_encoding} changes the encoding of
 the data object with the handle @var{dh} to @var{enc}.
 @end deftypefun
 
+ at node Data Buffer Convenience
+ at subsection Data Buffer Convenience Functions
+ at cindex data buffer, convenience
+ at cindex type of data
+ at cindex identify
+
+ at deftp {Data type} {enum gpgme_data_type_t}
+ at tindex gpgme_data_type_t
+The @code{gpgme_data_type_t} type is used to return the detected type
+of the content of a data buffer.
+ at end deftp
+
+ at table @code
+ at item GPGME_DATA_TYPE_INVALID
+This is returned by @code{gpgme_data_identify} if it was not possible
+to identify the data.  Reasons for this might be a non-seekable stream
+or a memory problem.  The value is 0.
+ at item GPGME_DATA_TYPE_UNKNOWN
+The type of the data is not known.
+ at item GPGME_DATA_TYPE_PGP_SIGNED
+The data is an OpenPGP signed message.  This may be a binary
+signature, a detached one or a cleartext signature.
+ at item GPGME_DATA_TYPE_PGP_OTHER
+This is a generic OpenPGP message.  In most cases this will be
+encrypted data.
+ at item GPGME_DATA_TYPE_PGP_KEY
+This is an OpenPGP key (private or public).
+ at item GPGME_DATA_TYPE_CMS_SIGNED
+This is a CMS signed message.
+ at item GPGME_DATA_TYPE_CMS_ENCRYPTED
+This is a CMS encrypted (enveloped data) message.
+ at item GPGME_DATA_TYPE_CMS_OTHER
+This is used for other CMS message types.
+ at item GPGME_DATA_TYPE_X509_CERT
+The data is a X.509 certificate
+ at item GPGME_DATA_TYPE_PKCS12
+The data is a PKCS#12 message.  This is commonly used to exchange
+private keys for X.509.
+ at end table
+
+ at deftypefun gpgme_data_type_t gpgme_data_identify (@w{gpgme_data_t @var{dh}})
+The function @code{gpgme_data_identify} returns the type of the data
+with the handle @var{dh}.  If it is not possible to perform the
+identification, the function returns zero
+(@code{GPGME_DATA_TYPE_INVALID}).  Note that depending on how the data
+object has been created the identification may not be possible or the
+data object may change its internal state (file pointer moved).  For
+file or memory based data object, the state should not change.
+ at end deftypefun
+
 
 @c
 @c    Chapter Contexts
diff --git a/src/Makefile.am b/src/Makefile.am
index 37e3407..1f95103 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -103,8 +103,9 @@ endif
 # unresolved symbols to the thread module.
 main_sources =								\
 	util.h conversion.c get-env.c context.h ops.h		        \
+	parsetlv.c parsetlv.h                                           \
 	data.h data.c data-fd.c data-stream.c data-mem.c data-user.c	\
-	data-compat.c							\
+	data-compat.c data-identify.c					\
 	signers.c sig-notation.c					\
 	wait.c wait-global.c wait-private.c wait-user.c wait.h		\
 	op-support.c							\
diff --git a/src/data-identify.c b/src/data-identify.c
new file mode 100644
index 0000000..9600633
--- /dev/null
+++ b/src/data-identify.c
@@ -0,0 +1,247 @@
+/* data-identify.c - Try to identify the data
+   Copyright (C) 2013 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/>.
+ */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "gpgme.h"
+#include "data.h"
+#include "util.h"
+#include "parsetlv.h"
+
+/* The size of the sample data we take for detection.  */
+#define SAMPLE_SIZE 2048
+
+
+
+/* Note that DATA may be binary but a final nul is required so that
+   string operations will find a terminator.
+
+   Returns: GPGME_DATA_TYPE_xxxx */
+static gpgme_data_type_t
+basic_detection (const char *data, size_t datalen)
+{
+  tlvinfo_t ti;
+  const char *s;
+  size_t n;
+  int maybe_p12 = 0;
+
+  if (datalen < 24) /* Object is probably too short for detection.  */
+    return GPGME_DATA_TYPE_UNKNOWN;
+
+  /* This is a common example of a CMS object - it is obvious that we
+     only need to read a few bytes to get to the OID:
+  30 82 0B 59 06 09 2A 86 48 86 F7 0D 01 07 02 A0 82 0B 4A 30 82 0B 46 02
+  ----------- ++++++++++++++++++++++++++++++++
+  SEQUENCE    OID (signedData)
+  (2 byte len)
+
+    A PKCS#12 message is:
+
+  30 82 08 59 02 01 03 30 82 08 1F 06 09 2A 86 48 86 F7 0D 01 07 01 A0 82
+  ----------- ++++++++ ----------- ++++++++++++++++++++++++++++++++
+  SEQUENCE    INTEGER  SEQUENCE    OID (data)
+
+    A X.509 certificate is:
+
+  30 82 05 B8 30 82 04 A0 A0 03 02 01 02 02 07 15 46 A0 BF 30 07 39 30 0D
+  ----------- +++++++++++ ----- ++++++++ --------------------------
+  SEQUENCE    SEQUENCE    [0]   INTEGER  INTEGER                    SEQU
+              (tbs)            (version) (s/n)                      (Algo)
+
+    Thus we need to read at least 22 bytes, we add 2 bytes to cope with
+    length headers stored with 4 bytes.
+  */
+
+
+  s = data;
+  n = datalen;
+
+  if (parse_tlv (&s, &n, &ti))
+    goto try_pgp; /* Not properly BER encoded.  */
+  if (!(ti.cls == ASN1_CLASS_UNIVERSAL && ti.tag == ASN1_TAG_SEQUENCE
+        && ti.is_cons))
+    goto try_pgp; /* A CMS object always starts with a sequence.  */
+
+  if (parse_tlv (&s, &n, &ti))
+    goto try_pgp; /* Not properly BER encoded.  */
+  if (ti.cls == ASN1_CLASS_UNIVERSAL && ti.tag == ASN1_TAG_SEQUENCE
+      && ti.is_cons && n >= ti.length)
+    {
+      if (parse_tlv (&s, &n, &ti))
+        goto try_pgp;
+      if (!(ti.cls == ASN1_CLASS_CONTEXT && ti.tag == 0
+            && ti.is_cons && ti.length == 3 && n >= ti.length))
+        goto try_pgp;
+
+      if (parse_tlv (&s, &n, &ti))
+        goto try_pgp;
+      if (!(ti.cls == ASN1_CLASS_UNIVERSAL && ti.tag == ASN1_TAG_INTEGER
+            && !ti.is_cons && ti.length == 1 && n && (*s == 1 || *s == 2)))
+        goto try_pgp;
+      s++;
+      n--;
+      if (!(ti.cls == ASN1_CLASS_UNIVERSAL && ti.tag == ASN1_TAG_INTEGER
+            && !ti.is_cons))
+        goto try_pgp;
+      /* Because the now following S/N may be larger than the sample
+         data we have, we stop parsing here and don't check for the
+         algorithm ID.  */
+      return GPGME_DATA_TYPE_X509_CERT;
+    }
+  if (ti.cls == ASN1_CLASS_UNIVERSAL && ti.tag == ASN1_TAG_INTEGER
+      && !ti.is_cons && ti.length == 1 && n && *s == 3)
+    {
+      maybe_p12 = 1;
+      s++;
+      n--;
+      if (parse_tlv (&s, &n, &ti))
+        goto try_pgp;
+      if (!(ti.cls == ASN1_CLASS_UNIVERSAL && ti.tag == ASN1_TAG_SEQUENCE
+            && ti.is_cons))
+        goto try_pgp;
+      if (parse_tlv (&s, &n, &ti))
+        goto try_pgp;
+    }
+  if (ti.cls == ASN1_CLASS_UNIVERSAL && ti.tag == ASN1_TAG_OBJECT_ID
+      && !ti.is_cons && ti.length && n >= ti.length)
+    {
+      if (ti.length == 9)
+        {
+          if (!memcmp (s, "\x2A\x86\x48\x86\xF7\x0D\x01\x07\x01", 9))
+            {
+              /* Data.  */
+              return (maybe_p12 ? GPGME_DATA_TYPE_PKCS12
+                      /*     */ : GPGME_DATA_TYPE_CMS_OTHER);
+            }
+          if (!memcmp (s, "\x2A\x86\x48\x86\xF7\x0D\x01\x07\x02", 9))
+            {
+              /* Signed Data.  */
+              return (maybe_p12 ? GPGME_DATA_TYPE_PKCS12
+                      /*     */ : GPGME_DATA_TYPE_CMS_SIGNED);
+            }
+          if (!memcmp (s, "\x2A\x86\x48\x86\xF7\x0D\x01\x07\x03", 9))
+            return GPGME_DATA_TYPE_CMS_ENCRYPTED; /* Enveloped Data.  */
+          if (!memcmp (s, "\x2A\x86\x48\x86\xF7\x0D\x01\x07\x05", 9))
+            return GPGME_DATA_TYPE_CMS_OTHER; /* Digested Data.  */
+          if (!memcmp (s, "\x2A\x86\x48\x86\xF7\x0D\x01\x07\x06", 9))
+            return GPGME_DATA_TYPE_CMS_OTHER; /* Encrypted Data.  */
+        }
+      else if (ti.length == 11)
+        {
+          if (!memcmp (s, "\x2A\x86\x48\x86\xF7\x0D\x01\x09\x10\x01\x02", 11))
+            return GPGME_DATA_TYPE_CMS_OTHER; /* Auth Data.  */
+        }
+    }
+
+
+ try_pgp:
+  /* Check whether this might be a non-armored PGP message.  We need
+     to do this before checking for armor lines, so that we don't get
+     fooled by armored messages inside a signed binary PGP message.  */
+  if ((data[0] & 0x80))
+    {
+      /* That might be a binary PGP message.  At least it is not plain
+         ASCII.  Of course this might be certain lead-in text of
+         armored CMS messages.  However, I am not sure whether this is
+         at all defined and in any case it is uncommon.  Thus we don't
+         do any further plausibility checks but stupidly assume no CMS
+         armored data will follow.  */
+      return GPGME_DATA_TYPE_UNKNOWN;
+    }
+
+  /* Now check whether there are armor lines.  */
+  for (s = data; s && *s; s = (*s=='\n')?(s+1):((s=strchr (s,'\n'))?(s+1):s))
+    {
+      if (!strncmp (s, "-----BEGIN ", 11))
+        {
+          if (!strncmp (s+11, "SIGNED ", 7))
+            return GPGME_DATA_TYPE_CMS_SIGNED;
+          if (!strncmp (s+11, "ENCRYPTED ", 10))
+            return GPGME_DATA_TYPE_CMS_ENCRYPTED;
+          if (!strncmp (s+11, "PGP ", 4))
+            {
+              if (!strncmp (s+15, "SIGNATURE", 9))
+                return GPGME_DATA_TYPE_PGP_SIGNED;
+              if (!strncmp (s+15, "SIGNED MESSAGE", 14))
+                return GPGME_DATA_TYPE_PGP_SIGNED;
+              if (!strncmp (s+15, "PUBLIC KEY BLOCK", 16))
+                return GPGME_DATA_TYPE_PGP_KEY;
+              if (!strncmp (s+15, "PRIVATE KEY BLOCK", 17))
+                return GPGME_DATA_TYPE_PGP_KEY;
+              if (!strncmp (s+15, "SECRET KEY BLOCK", 16))
+                return GPGME_DATA_TYPE_PGP_KEY;
+              if (!strncmp (s+15, "ARMORED FILE", 12))
+                return GPGME_DATA_TYPE_UNKNOWN;
+              return GPGME_DATA_TYPE_PGP_OTHER; /* PGP MESSAGE */
+            }
+          if (!strncmp (s+11, "CERTIFICATE", 11))
+            return GPGME_DATA_TYPE_X509_CERT;
+          if (!strncmp (s+11, "PKCS12", 6))
+            return GPGME_DATA_TYPE_PKCS12;
+          return GPGME_DATA_TYPE_CMS_OTHER; /* Not PGP, thus we assume CMS.  */
+        }
+    }
+
+  return GPGME_DATA_TYPE_UNKNOWN;
+}
+
+
+/* Try to detect the type of the data.  Note that this function works
+   only on seekable data objects.  The function tries to reset the
+   file pointer but there is no guarantee that it will work.
+
+   FIXME: We may want to add internal buffering so that this function
+   can be implemented for allmost all kind of data objects.
+ */
+gpgme_data_type_t
+gpgme_data_identify (gpgme_data_t dh, int reserved)
+{
+  gpgme_data_type_t result;
+  char *sample;
+  int n;
+  gpgme_off_t off;
+
+  /* Check whether we can seek the data object.  */
+  off = gpgme_data_seek (dh, 0, SEEK_CUR);
+  if (off == (gpgme_off_t)(-1))
+    return GPGME_DATA_TYPE_INVALID;
+
+  /* Allocate a buffer and read the data. */
+  sample = malloc (SAMPLE_SIZE);
+  if (!sample)
+    return GPGME_DATA_TYPE_INVALID; /* Ooops.  */
+  n = gpgme_data_read (dh, sample, SAMPLE_SIZE - 1);
+  if (n < 0)
+    {
+      free (sample);
+      return GPGME_DATA_TYPE_INVALID; /* Ooops.  */
+    }
+  sample[n] = 0;  /* (Required for our string functions.)  */
+
+  result = basic_detection (sample, n);
+  free (sample);
+  gpgme_data_seek (dh, off, SEEK_SET);
+
+  return result;
+}
diff --git a/src/gpgme-tool.c b/src/gpgme-tool.c
index 0ebabab..2bf7654 100644
--- a/src/gpgme-tool.c
+++ b/src/gpgme-tool.c
@@ -1435,7 +1435,8 @@ typedef enum status
     STATUS_INCLUDE_CERTS,
     STATUS_KEYLIST_MODE,
     STATUS_RECIPIENT,
-    STATUS_ENCRYPT_RESULT
+    STATUS_ENCRYPT_RESULT,
+    STATUS_IDENTIFY_RESULT
   } status_t;
 
 const char *status_string[] =
@@ -1448,7 +1449,8 @@ const char *status_string[] =
     "INCLUDE_CERTS",
     "KEYLIST_MODE",
     "RECIPIENT",
-    "ENCRYPT_RESULT"
+    "ENCRYPT_RESULT",
+    "IDENTIFY_RESULT"
   };
 
 struct gpgme_tool
@@ -2065,11 +2067,6 @@ gt_vfs_create (gpgme_tool_t gt, const char *container_file, int flags)
 }
 
 
-static const char hlp_passwd[] =
-  "PASSWD <user-id>\n"
-  "\n"
-  "Ask the backend to change the passphrase for the key\n"
-  "specified by USER-ID.";
 gpg_error_t
 gt_passwd (gpgme_tool_t gt, char *fpr)
 {
@@ -2086,6 +2083,29 @@ gt_passwd (gpgme_tool_t gt, char *fpr)
 }
 
 
+gpg_error_t
+gt_identify (gpgme_tool_t gt, gpgme_data_t data)
+{
+  const char *s = "?";
+
+  switch (gpgme_data_identify (data, 0))
+    {
+    case GPGME_DATA_TYPE_INVALID: return gpg_error (GPG_ERR_GENERAL);
+    case GPGME_DATA_TYPE_UNKNOWN      : s = "unknown"; break;
+    case GPGME_DATA_TYPE_PGP_SIGNED   : s = "PGP-signed"; break;
+    case GPGME_DATA_TYPE_PGP_OTHER    : s = "PGP"; break;
+    case GPGME_DATA_TYPE_PGP_KEY      : s = "PGP-key"; break;
+    case GPGME_DATA_TYPE_CMS_SIGNED   : s = "CMS-signed"; break;
+    case GPGME_DATA_TYPE_CMS_ENCRYPTED: s = "CMS-encrypted"; break;
+    case GPGME_DATA_TYPE_CMS_OTHER    : s = "CMS"; break;
+    case GPGME_DATA_TYPE_X509_CERT    : s = "X.509"; break;
+    case GPGME_DATA_TYPE_PKCS12       : s = "PKCS12"; break;
+    }
+  gt_write_status (gt, STATUS_IDENTIFY_RESULT, s, NULL);
+  return 0;
+}
+
+
 #define GT_RESULT_ENCRYPT 0x1
 #define GT_RESULT_DECRYPT 0x2
 #define GT_RESULT_SIGN 0x4
@@ -3374,6 +3394,11 @@ cmd_vfs_create (assuan_context_t ctx, char *line)
 }
 
 
+static const char hlp_passwd[] =
+  "PASSWD <user-id>\n"
+  "\n"
+  "Ask the backend to change the passphrase for the key\n"
+  "specified by USER-ID.";
 static gpg_error_t
 cmd_passwd (assuan_context_t ctx, char *line)
 {
@@ -3430,6 +3455,39 @@ cmd_hash_algo_name (assuan_context_t ctx, char *line)
 }
 
 
+static const char hlp_identify[] =
+  "IDENTIY\n"
+  "\n"
+  "Identify the type of data set with the INPUT command.";
+static gpg_error_t
+cmd_identify (assuan_context_t ctx, char *line)
+{
+  struct server *server = assuan_get_pointer (ctx);
+  gpg_error_t err;
+  assuan_fd_t inp_fd;
+  char *inp_fn;
+  gpgme_data_t inp_data;
+
+  inp_fd = server->input_fd;
+  inp_fn = server->input_filename;
+  if (inp_fd == ASSUAN_INVALID_FD && !inp_fn)
+    return GPG_ERR_ASS_NO_INPUT;
+
+  err = server_data_obj (inp_fd, inp_fn, 0, server->input_enc, &inp_data,
+                         &server->input_stream);
+  if (err)
+    return err;
+
+  err = gt_identify (server->gt, inp_data);
+
+  gpgme_data_release (inp_data);
+  server_reset_fds (server);
+
+  return err;
+}
+
+
+
 /* Tell the assuan library about our commands.  */
 static gpg_error_t
 register_commands (assuan_context_t ctx)
@@ -3488,6 +3546,7 @@ register_commands (assuan_context_t ctx)
     { "PUBKEY_ALGO_NAME", cmd_pubkey_algo_name },
     { "HASH_ALGO_NAME", cmd_hash_algo_name },
     { "PASSWD", cmd_passwd, hlp_passwd },
+    { "IDENTIFY", cmd_identify, hlp_identify },
     { NULL }
   };
   int idx;
diff --git a/src/gpgme.def b/src/gpgme.def
index 7610d37..0478cb6 100644
--- a/src/gpgme.def
+++ b/src/gpgme.def
@@ -211,5 +211,7 @@ EXPORTS
 
     gpgme_signers_count                   @160
 
+    gpgme_data_identify                   @161
+
 ; END
 
diff --git a/src/gpgme.h.in b/src/gpgme.h.in
index f644a50..5c4de6b 100644
--- a/src/gpgme.h.in
+++ b/src/gpgme.h.in
@@ -210,6 +210,22 @@ typedef enum
   }
 gpgme_data_encoding_t;
 
+/* Known data types.  */
+typedef enum
+  {
+    GPGME_DATA_TYPE_INVALID      = 0,   /* Not detected.  */
+    GPGME_DATA_TYPE_UNKNOWN      = 1,
+    GPGME_DATA_TYPE_PGP_SIGNED   = 0x10,
+    GPGME_DATA_TYPE_PGP_OTHER    = 0x12,
+    GPGME_DATA_TYPE_PGP_KEY      = 0x13,
+    GPGME_DATA_TYPE_CMS_SIGNED   = 0x20,
+    GPGME_DATA_TYPE_CMS_ENCRYPTED= 0x21,
+    GPGME_DATA_TYPE_CMS_OTHER    = 0x22,
+    GPGME_DATA_TYPE_X509_CERT    = 0x23,
+    GPGME_DATA_TYPE_PKCS12       = 0x24,
+  }
+gpgme_data_type_t;
+
 

 /* Public key algorithms from libgcrypt.  */
 typedef enum
@@ -1149,6 +1165,9 @@ char *gpgme_data_get_file_name (gpgme_data_t dh);
 gpgme_error_t gpgme_data_set_file_name (gpgme_data_t dh,
 					const char *file_name);
 
+/* Try to identify the type of the data in DH.  */
+gpgme_data_type_t gpgme_data_identify (gpgme_data_t dh, int reserved);
+
 
 /* Create a new data buffer which retrieves the data from the callback
    function READ_CB.  Deprecated, please use gpgme_data_new_from_cbs
diff --git a/src/libgpgme.vers b/src/libgpgme.vers
index 0b2e89d..fe18e6a 100644
--- a/src/libgpgme.vers
+++ b/src/libgpgme.vers
@@ -29,6 +29,7 @@ GPGME_1.1 {
 
     gpgme_data_set_file_name;
     gpgme_data_get_file_name;
+    gpgme_data_identify;
 
     gpgme_sig_notation_clear;
     gpgme_sig_notation_add;
diff --git a/src/parsetlv.c b/src/parsetlv.c
new file mode 100644
index 0000000..70c9518
--- /dev/null
+++ b/src/parsetlv.c
@@ -0,0 +1,103 @@
+/* parsetlv.c -  ASN.1 TLV functions
+ * Copyright (C) 2005, 2007, 2008, 2012 g10 Code GmbH
+ *
+ * This file 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 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 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/>.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "parsetlv.h"
+
+
+/* Simple but pretty complete ASN.1 BER parser.  Parse the data at the
+   address of BUFFER with a length given at the address of SIZE.  On
+   success return 0 and update BUFFER and SIZE to point to the value.
+   Do not update them on error.  The information about the object are
+   stored in the caller allocated TI structure.  */
+int
+_gpgme_parse_tlv (char const **buffer, size_t *size, tlvinfo_t *ti)
+{
+  int c;
+  unsigned long tag;
+  const unsigned char *buf = (const unsigned char *)(*buffer);
+  size_t length = *size;
+
+  ti->cls = 0;
+  ti->tag = 0;
+  ti->is_cons = 0;
+  ti->is_ndef = 0;
+  ti->length = 0;
+  ti->nhdr = 0;
+
+  if (!length)
+    return -1;
+  c = *buf++; length--; ++ti->nhdr;
+
+  ti->cls = (c & 0xc0) >> 6;
+  ti->is_cons = !!(c & 0x20);
+  tag = c & 0x1f;
+
+  if (tag == 0x1f)
+    {
+      tag = 0;
+      do
+        {
+          tag <<= 7;
+          if (!length)
+            return -1;
+          c = *buf++; length--; ++ti->nhdr;
+          tag |= c & 0x7f;
+        }
+      while (c & 0x80);
+    }
+  ti->tag = tag;
+
+  if (!length)
+    return -1;
+  c = *buf++; length--; ++ti->nhdr;
+
+  if ( !(c & 0x80) )
+    ti->length = c;
+  else if (c == 0x80)
+    ti->is_ndef = 1;
+  else if (c == 0xff)
+    return -1;
+  else
+    {
+      unsigned long len = 0;
+      int count = (c & 0x7f);
+
+      if (count > sizeof (len) || count > sizeof (size_t))
+        return -1;
+
+      for (; count; count--)
+        {
+          len <<= 8;
+          if (!length)
+            return -1;
+          c = *buf++; length--; ++ti->nhdr;
+          len |= c & 0xff;
+        }
+      ti->length = len;
+    }
+
+  *buffer = (void*)buf;
+  *size = length;
+  return 0;
+}
diff --git a/src/parsetlv.h b/src/parsetlv.h
new file mode 100644
index 0000000..153073c
--- /dev/null
+++ b/src/parsetlv.h
@@ -0,0 +1,48 @@
+/* parsetlv.h -  TLV functions defintions
+ * Copyright (C) 2012 g10 Code GmbH
+ *
+ * This file 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 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 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/>.
+ */
+
+#ifndef PARSETLV_H
+#define PARSETLV_H
+
+/* ASN.1 constants.  */
+#define ASN1_CLASS_UNIVERSAL   0
+#define ASN1_CLASS_APPLICATION 1
+#define ASN1_CLASS_CONTEXT     2
+#define ASN1_CLASS_PRIVATE     3
+#define ASN1_TAG_INTEGER       2
+#define ASN1_TAG_OBJECT_ID     6
+#define ASN1_TAG_SEQUENCE     16
+
+
+/* Object used with parse_tlv.  */
+struct tlvinfo_s
+{
+  int cls;            /* The class of the tag.  */
+  int tag;            /* The tag.  */
+  int is_cons;        /* True if it is a constructed object.  */
+  int is_ndef;        /* True if the object has an indefinite length.  */
+  size_t length;      /* The length of the value.  */
+  size_t nhdr;        /* The number of octets in the header (tag,length). */
+};
+typedef struct tlvinfo_s tlvinfo_t;
+
+/*-- parsetlv.c --*/
+int _gpgme_parse_tlv (char const **buffer, size_t *size, tlvinfo_t *ti);
+#define parse_tlv(a,b,c) _gpgme_parse_tlv ((a), (b), (c))
+
+
+#endif /*PARSETLV_H*/

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

Summary of changes:
 NEWS                |    4 +
 doc/gpgme.texi      |   51 +++++++++++
 src/Makefile.am     |    3 +-
 src/data-identify.c |  247 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/gpgme-tool.c    |   73 ++++++++++++++--
 src/gpgme.def       |    2 +
 src/gpgme.h.in      |   19 ++++
 src/libgpgme.vers   |    1 +
 src/parsetlv.c      |  103 +++++++++++++++++++++
 src/parsetlv.h      |   48 ++++++++++
 10 files changed, 543 insertions(+), 8 deletions(-)
 create mode 100644 src/data-identify.c
 create mode 100644 src/parsetlv.c
 create mode 100644 src/parsetlv.h


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



From cvs at cvs.gnupg.org  Fri Aug  9 20:17:30 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 09 Aug 2013 20:17:30 +0200
Subject: [git] GPA - branch, master, updated. gpa-0.9.4-4-g3a8458a
Message-ID: <E1V7qmt-0007ot-2Z@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  3a8458ae7c083fd46e8d5e165997422a35bdd21f (commit)
      from  5574ece82ed5950dca11d729744f52ac159444d5 (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 3a8458ae7c083fd46e8d5e165997422a35bdd21f
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 9 19:46:10 2013 +0200

    Improve detection of CMS objects.
    
    * configure.ac: Detect gpgme_data_identify.
    * src/filetype.c (is_cms_data, is_cms_file): Use gpgme_data_identify
    is available.
    --
    
    The gpgme_data_identify function has the advantage that it also
    detects X.509 certificates.  This offers way to detect certificate
    files and import them.  As of now the import function does only work
    with PGP.

diff --git a/configure.ac b/configure.ac
index 57d677f..9f5213d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -244,6 +244,15 @@ else
                 have_gpgme=yes,have_gpgme=no)
 fi
 
+_save_libs=$LIBS
+_save_cflags=$CFLAGS
+LIBS="$LIBS $GPGME_LIBS"
+CFLAGS="$CFLAGS $GPGME_CFLAGS"
+AC_CHECK_FUNCS([gpgme_data_identify])
+LIBS=$_save_libs
+CFLAGS="$_save_cflags"
+
+
 dnl The tests below are not anymore used because we now depend on a
 dnl gpgme which has all these features.  However, I keep the code here
 dnl for future work.
diff --git a/src/filetype.c b/src/filetype.c
index c59dde7..4e68d27 100644
--- a/src/filetype.c
+++ b/src/filetype.c
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <gpgme.h>
 
 #include "parsetlv.h"
 #include "filetype.h"
@@ -32,6 +33,7 @@
 
 
 /* Warning: DATA may be binary but there must be a Nul before DATALEN.  */
+#ifndef HAVE_GPGME_DATA_IDENTIFY
 static int
 detect_cms (const char *data, size_t datalen)
 {
@@ -90,6 +92,7 @@ detect_cms (const char *data, size_t datalen)
 
   return 0;
 }
+#endif /*!HAVE_GPGME_DATA_IDENTIFY*/
 
 
 /* Return true if the file FNAME looks like an CMS file.  There is no
@@ -98,6 +101,34 @@ detect_cms (const char *data, size_t datalen)
 int
 is_cms_file (const char *fname)
 {
+#ifdef HAVE_GPGME_DATA_IDENTIFY
+  FILE *fp;
+  gpgme_data_t dh;
+  gpgme_data_type_t dt;
+
+  fp = fopen (fname, "rb");
+  if (!fp)
+    return 0; /* Not found - can't be a CMS file.  */
+  if (gpgme_data_new_from_stream (&dh, fp))
+    {
+      fclose (fp);
+      return 0;
+    }
+  dt = gpgme_data_identify (dh, 0);
+  gpgme_data_release (dh);
+  fclose (fp);
+  switch (dt)
+    {
+    case GPGME_DATA_TYPE_CMS_SIGNED:
+    case GPGME_DATA_TYPE_CMS_ENCRYPTED:
+    case GPGME_DATA_TYPE_CMS_OTHER:
+    case GPGME_DATA_TYPE_X509_CERT:
+    case GPGME_DATA_TYPE_PKCS12:
+      return 1;
+    default:
+      return 0;
+    }
+#else
   int result;
   FILE *fp;
   char *data;
@@ -121,6 +152,7 @@ is_cms_file (const char *fname)
   result = detect_cms (data, datalen);
   free (data);
   return result;
+#endif
 }
 
 
@@ -129,9 +161,28 @@ is_cms_file (const char *fname)
 int
 is_cms_data (const char *data, size_t datalen)
 {
+#ifdef HAVE_GPGME_DATA_IDENTIFY
+  gpgme_data_t dh;
+  gpgme_data_type_t dt;
+
+  if (gpgme_data_new_from_mem (&dh, data, datalen, 0))
+    return 0;
+  dt = gpgme_data_identify (dh, 0);
+  gpgme_data_release (dh);
+  switch (dt)
+    {
+    case GPGME_DATA_TYPE_CMS_SIGNED:
+    case GPGME_DATA_TYPE_CMS_ENCRYPTED:
+    case GPGME_DATA_TYPE_CMS_OTHER:
+    case GPGME_DATA_TYPE_X509_CERT:
+    case GPGME_DATA_TYPE_PKCS12:
+      return 1;
+    default:
+      return 0;
+    }
+#else
   int result;
   char *buffer;
-
   if (datalen < 24)
     return 0; /* Too short - don't bother to copy the buffer.  */
 
@@ -147,4 +198,5 @@ is_cms_data (const char *data, size_t datalen)
   result = detect_cms (buffer, datalen);
   free (buffer);
   return result;
+#endif
 }

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

Summary of changes:
 configure.ac   |    9 +++++++++
 src/filetype.c |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 62 insertions(+), 1 deletions(-)


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



From cvs at cvs.gnupg.org  Sat Aug 10 09:06:21 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Sat, 10 Aug 2013 09:06:21 +0200
Subject: [git] GPA - branch, master, updated. gpa-0.9.4-5-g6742525
Message-ID: <E1V82mr-0004MT-Sb@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  6742525110270b0098e41157edfb13e36483f1ca (commit)
      from  3a8458ae7c083fd46e8d5e165997422a35bdd21f (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 6742525110270b0098e41157edfb13e36483f1ca
Author: Werner Koch <wk at gnupg.org>
Date:   Sat Aug 10 08:34:38 2013 +0200

    Allow import and export of X.509 certificates.
    
    * src/filetype.c (is_cms_data_ext): New.
    * src/gpaimportop.c (gpa_import_operation_idle_cb): Set the
    appropriate protocol.
    * src/gpaexportop.c (gpa_export_operation_idle_cb): Ditto.

diff --git a/src/filetype.c b/src/filetype.c
index 4e68d27..58b4145 100644
--- a/src/filetype.c
+++ b/src/filetype.c
@@ -200,3 +200,26 @@ is_cms_data (const char *data, size_t datalen)
   return result;
 #endif
 }
+
+/* New version of is_cms_data which requires a decent version of
+   gpgme.  In contrast to is_cms_data this works directly on a gpgme
+   data object.  */
+int
+is_cms_data_ext (gpgme_data_t dh)
+{
+#ifdef HAVE_GPGME_DATA_IDENTIFY
+  switch (gpgme_data_identify (dh, 0))
+    {
+    case GPGME_DATA_TYPE_CMS_SIGNED:
+    case GPGME_DATA_TYPE_CMS_ENCRYPTED:
+    case GPGME_DATA_TYPE_CMS_OTHER:
+    case GPGME_DATA_TYPE_X509_CERT:
+    case GPGME_DATA_TYPE_PKCS12:
+      return 1;
+    default:
+      return 0;
+    }
+#else
+  return 0;
+#endif
+}
diff --git a/src/filetype.h b/src/filetype.h
index 6c88c68..8ba4c2e 100644
--- a/src/filetype.h
+++ b/src/filetype.h
@@ -20,6 +20,7 @@
 
 int is_cms_file (const char *fname);
 int is_cms_data (const char *data, size_t datalen);
+int is_cms_data_ext (gpgme_data_t dh);
 
 
 #endif /*FILETYPE_H*/
diff --git a/src/gpaexportop.c b/src/gpaexportop.c
index 51df806..9caf49f 100644
--- a/src/gpaexportop.c
+++ b/src/gpaexportop.c
@@ -38,7 +38,7 @@ enum
 static gboolean gpa_export_operation_idle_cb (gpointer data);
 static void gpa_export_operation_done_cb (GpaContext *context, gpg_error_t err,
 			      GpaExportOperation *op);
-static void gpa_export_operation_done_error_cb (GpaContext *context, 
+static void gpa_export_operation_done_error_cb (GpaContext *context,
 						gpg_error_t err,
 						GpaExportOperation *op);
 
@@ -97,7 +97,7 @@ gpa_export_operation_finalize (GObject *object)
     {
       gpgme_data_release (op->dest);
     }
-  
+
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
@@ -138,14 +138,14 @@ static void
 gpa_export_operation_class_init (GpaExportOperationClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  
+
   parent_class = g_type_class_peek_parent (klass);
 
   object_class->constructor = gpa_export_operation_constructor;
   object_class->finalize = gpa_export_operation_finalize;
   object_class->set_property = gpa_export_operation_set_property;
   object_class->get_property = gpa_export_operation_get_property;
-  
+
   /* Virtual methods */
   klass->get_destination = NULL;
   klass->complete_export = NULL;
@@ -153,7 +153,7 @@ gpa_export_operation_class_init (GpaExportOperationClass *klass)
   /* Properties */
   g_object_class_install_property (object_class,
 				   PROP_KEYS,
-				   g_param_spec_pointer 
+				   g_param_spec_pointer
 				   ("keys", "Keys",
 				    "Keys",
 				    G_PARAM_WRITABLE|G_PARAM_CONSTRUCT_ONLY));
@@ -163,7 +163,7 @@ GType
 gpa_export_operation_get_type (void)
 {
   static GType file_operation_type = 0;
-  
+
   if (!file_operation_type)
     {
       static const GTypeInfo file_operation_info =
@@ -178,12 +178,12 @@ gpa_export_operation_get_type (void)
         0,              /* n_preallocs */
         (GInstanceInitFunc) gpa_export_operation_init,
       };
-      
+
       file_operation_type = g_type_register_static (GPA_OPERATION_TYPE,
 						    "GpaExportOperation",
 						    &file_operation_info, 0);
     }
-  
+
   return file_operation_type;
 }
 
@@ -198,10 +198,11 @@ gpa_export_operation_idle_cb (gpointer data)
   if (GPA_EXPORT_OPERATION_GET_CLASS (op)->get_destination (op, &op->dest,
 							    &armor))
     {
-      gpg_error_t err;
+      gpg_error_t err = 0;
       const char **patterns;
       GList *k;
       int i;
+      gpgme_protocol_t prot = GPGME_PROTOCOL_UNKNOWN;
 
       gpgme_set_armor (GPA_OPERATION (op)->context->ctx, armor);
       /* Create the set of keys to export */
@@ -210,17 +211,33 @@ gpa_export_operation_idle_cb (gpointer data)
 	{
 	  gpgme_key_t key = (gpgme_key_t) k->data;
 	  patterns[i] = key->subkeys->fpr;
+          if (prot == GPGME_PROTOCOL_UNKNOWN)
+            prot = key->protocol;
+          else if (prot != key->protocol)
+            {
+              gpa_window_error
+                (_("Only keys of the same procotol may be exported"
+                   " as a collection."), NULL);
+              g_signal_emit_by_name (GPA_OPERATION (op), "completed", err);
+              goto cleanup;
+            }
 	}
+      if (prot == GPGME_PROTOCOL_UNKNOWN)
+        {
+          g_signal_emit_by_name (GPA_OPERATION (op), "completed", err);
+          goto cleanup;  /* No keys.  */
+        }
+      gpgme_set_protocol (GPA_OPERATION (op)->context->ctx, prot);
       /* Export to the gpgme_data_t */
-      err = gpgme_op_export_ext_start (GPA_OPERATION (op)->context->ctx, 
+      err = gpgme_op_export_ext_start (GPA_OPERATION (op)->context->ctx,
 				       patterns, 0, op->dest);
       if (err)
 	{
 	  gpa_gpgme_warning (err);
 	  g_signal_emit_by_name (GPA_OPERATION (op), "completed", err);
 	}
-      /* Clean up */
-      g_free (patterns);      
+    cleanup:
+      g_free (patterns);
     }
   else
     /* Abort the operation.  */
diff --git a/src/gpaimportop.c b/src/gpaimportop.c
index 81ed769..0680a21 100644
--- a/src/gpaimportop.c
+++ b/src/gpaimportop.c
@@ -25,6 +25,7 @@
 #include "i18n.h"
 #include "gtktools.h"
 #include "gpaimportop.h"
+#include "filetype.h"
 
 static GObjectClass *parent_class = NULL;
 
@@ -40,7 +41,7 @@ static guint signals [LAST_SIGNAL] = { 0 };
 static gboolean gpa_import_operation_idle_cb (gpointer data);
 static void gpa_import_operation_done_cb (GpaContext *context, gpg_error_t err,
 			      GpaImportOperation *op);
-static void gpa_import_operation_done_error_cb (GpaContext *context, 
+static void gpa_import_operation_done_error_cb (GpaContext *context,
 						gpg_error_t err,
 						GpaImportOperation *op);
 
@@ -56,7 +57,7 @@ gpa_import_operation_finalize (GObject *object)
     {
       gpgme_data_release (op->source);
     }
-  
+
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
@@ -95,12 +96,12 @@ static void
 gpa_import_operation_class_init (GpaImportOperationClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  
+
   parent_class = g_type_class_peek_parent (klass);
 
   object_class->constructor = gpa_import_operation_constructor;
   object_class->finalize = gpa_import_operation_finalize;
-  
+
   /* Virtual methods */
   klass->get_source = NULL;
   klass->complete_import = NULL;
@@ -130,7 +131,7 @@ GType
 gpa_import_operation_get_type (void)
 {
   static GType file_operation_type = 0;
-  
+
   if (!file_operation_type)
     {
       static const GTypeInfo file_operation_info =
@@ -145,12 +146,12 @@ gpa_import_operation_get_type (void)
         0,              /* n_preallocs */
         (GInstanceInitFunc) gpa_import_operation_init,
       };
-      
+
       file_operation_type = g_type_register_static (GPA_OPERATION_TYPE,
 						    "GpaImportOperation",
 						    &file_operation_info, 0);
     }
-  
+
   return file_operation_type;
 }
 
@@ -164,7 +165,10 @@ gpa_import_operation_idle_cb (gpointer data)
   if (GPA_IMPORT_OPERATION_GET_CLASS (op)->get_source (op, &op->source))
     {
       gpg_error_t err;
-      
+
+      gpgme_set_protocol (GPA_OPERATION (op)->context->ctx,
+                          is_cms_data_ext (op->source)?
+                          GPGME_PROTOCOL_CMS : GPGME_PROTOCOL_OpenPGP);
       err = gpgme_op_import_start (GPA_OPERATION (op)->context->ctx,
 				   op->source);
       if (err)
@@ -181,8 +185,8 @@ gpa_import_operation_idle_cb (gpointer data)
   return FALSE;
 }
 
-static void 
-key_import_results_dialog_run (GtkWidget *parent, 
+static void
+key_import_results_dialog_run (GtkWidget *parent,
 			       gpgme_import_result_t info)
 {
   GtkWidget *dialog;
@@ -211,7 +215,7 @@ key_import_results_dialog_run (GtkWidget *parent,
                                        info->unchanged, info->secret_read,
                                        info->secret_imported,
 				       info->secret_unchanged);
-    }			   
+    }
 
   /* Run the dialog */
   gtk_widget_show_all (dialog);

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

Summary of changes:
 src/filetype.c    |   23 +++++++++++++++++++++++
 src/filetype.h    |    1 +
 src/gpaexportop.c |   41 +++++++++++++++++++++++++++++------------
 src/gpaimportop.c |   26 +++++++++++++++-----------
 4 files changed, 68 insertions(+), 23 deletions(-)


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



From cvs at cvs.gnupg.org  Mon Aug 12 15:17:42 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Mon, 12 Aug 2013 15:17:42 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.4.2-10-gd788c35
Message-ID: <E1V8rX3-0004Jw-VH@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  d788c35e19df9eade8eb0b880ca1dc47ae7928ad (commit)
       via  3ca7e96e384d5872c71ceb3b2e2a05b0c1b7e1a0 (commit)
       via  069ac580373923f5635b7172ecff79eb189f6944 (commit)
      from  8579091c4f6a36e6bb06fcfbd147a776166fd3ea (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 d788c35e19df9eade8eb0b880ca1dc47ae7928ad
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 12 14:33:49 2013 +0200

    Release 1.4.3.
    
    * configure.ac: Change LT version to C22/A11/R0.

diff --git a/NEWS b/NEWS
index 8f700fd..f68035d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Noteworthy changes in version 1.4.3 (unreleased)
+Noteworthy changes in version 1.4.3 (2013-08-12)
 ------------------------------------------------
 
  * The default engine names are now taken from the output of gpgconf.
diff --git a/configure.ac b/configure.ac
index 6eef3a1..92375e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,10 +55,10 @@ AC_INIT([gpgme],[mym4_full_version],[http://bugs.gnupg.org])
 #   (Interfaces added:			AGE++)
 #   (Interfaces removed/changed:	AGE=0)
 #
-LIBGPGME_LT_CURRENT=21
+LIBGPGME_LT_CURRENT=22
 # Subtract 2 from this value if you want to make the LFS transition an
 # ABI break.  [Note to self: Remove this comment with the next regular break.]
-LIBGPGME_LT_AGE=10
+LIBGPGME_LT_AGE=11
 LIBGPGME_LT_REVISION=0
 
 # If the API is changed in an incompatible way: increment the next counter.

commit 3ca7e96e384d5872c71ceb3b2e2a05b0c1b7e1a0
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 12 14:32:21 2013 +0200

    Make test suite workable with GnuPG 2.1.
    
    * tests/gpg/start-stop-agent: New.
    * tests/gpg/initial.test: New.
    * tests/gpg/final.test: New.
    * tests/gpg/Makefile.am (c_tests): New.
    (TESTS): Move all to c_tests.  Add initial.test, final.test, and
    c_tests.
    (TESTS_ENVIRONMENT): Add C_ALL=C
    (private_keys): New.
    (EXTRA_DIST): Add new files.
    (./private-keys-v1.d/gpg-sample.stamp): Copy private keys.
    (all-local): Depend on gpg-sample.stamp.
    * tests/gpg/13CBE3758AFE42B5E5E2AE4CED27AFA455E3F87F: New.
    * tests/gpg/13CD0F3BDF24BE53FE192D62F18737256FF6E4FD: New.
    * tests/gpg/76F7E2B35832976B50A27A282D9B87E44577EB66: New.
    * tests/gpg/7A030357C0F253A5BBCD282FFC4E521B37558F5C: New.
    * tests/gpg/A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD: New.
    --
    
    GnuPG 2.1 requires that the agent knows the private keys.  Thus we
    need to install them.  The code should still work with GnuPG < 2.1.
    
    To make the whole testing using a agent more robust, the way to start
    the agent has also be changed.

diff --git a/tests/gpg/13CBE3758AFE42B5E5E2AE4CED27AFA455E3F87F b/tests/gpg/13CBE3758AFE42B5E5E2AE4CED27AFA455E3F87F
new file mode 100644
index 0000000..4ec6d13
Binary files /dev/null and b/tests/gpg/13CBE3758AFE42B5E5E2AE4CED27AFA455E3F87F differ
diff --git a/tests/gpg/13CD0F3BDF24BE53FE192D62F18737256FF6E4FD b/tests/gpg/13CD0F3BDF24BE53FE192D62F18737256FF6E4FD
new file mode 100644
index 0000000..16138cf
Binary files /dev/null and b/tests/gpg/13CD0F3BDF24BE53FE192D62F18737256FF6E4FD differ
diff --git a/tests/gpg/76F7E2B35832976B50A27A282D9B87E44577EB66 b/tests/gpg/76F7E2B35832976B50A27A282D9B87E44577EB66
new file mode 100644
index 0000000..079cc7b
Binary files /dev/null and b/tests/gpg/76F7E2B35832976B50A27A282D9B87E44577EB66 differ
diff --git a/tests/gpg/7A030357C0F253A5BBCD282FFC4E521B37558F5C b/tests/gpg/7A030357C0F253A5BBCD282FFC4E521B37558F5C
new file mode 100644
index 0000000..ad505ab
Binary files /dev/null and b/tests/gpg/7A030357C0F253A5BBCD282FFC4E521B37558F5C differ
diff --git a/tests/gpg/A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD b/tests/gpg/A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD
new file mode 100644
index 0000000..f30792e
Binary files /dev/null and b/tests/gpg/A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD differ
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index dd28d5e..c9000c9 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -1,18 +1,18 @@
 # Copyright (C) 2000 Werner Koch (dd9jn)
 # Copyright (C) 2001, 2004, 2005, 2009 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
@@ -20,8 +20,9 @@
 ## Process this file with automake to produce Makefile.in
 
 GPG = @GPG@
+GPG_AGENT = @GPG_AGENT@
 
-TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO=
+TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) LC_ALL=C GPG_AGENT_INFO=
 
 # The keylist tests must come after the import and the edit test.
 noinst_HEADERS = t-support.h
@@ -32,17 +33,29 @@ else
 tests_unix = t-eventloop t-thread1
 endif
 
-TESTS = t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers		\
+c_tests = \
+        t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers		\
 	t-decrypt t-verify t-decrypt-verify t-sig-notation t-export	\
 	t-import t-trustlist t-edit t-keylist t-keylist-sig t-wait	\
 	t-encrypt-large t-file-name t-gpgconf $(tests_unix)
 
+TESTS = initial.test $(c_tests) final.test
+
 CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
 	gpg-agent.conf pubring.kbx~ S.gpg-agent gpg.conf pubring.gpg~ \
-	random_seed
+	random_seed S.gpg-agent
+
+private_keys = \
+        13CD0F3BDF24BE53FE192D62F18737256FF6E4FD \
+        76F7E2B35832976B50A27A282D9B87E44577EB66 \
+        A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD \
+        13CBE3758AFE42B5E5E2AE4CED27AFA455E3F87F \
+        7A030357C0F253A5BBCD282FFC4E521B37558F5C
 
-EXTRA_DIST = pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
-	geheim.txt pubkey-1.asc seckey-1.asc pinentry
+
+EXTRA_DIST = start-stop-agent initial.test final.test \
+        pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
+	geheim.txt pubkey-1.asc seckey-1.asc pinentry $(private_keys)
 
 INCLUDES = -I$(top_builddir)/src
 
@@ -51,17 +64,25 @@ LDADD = ../../src/libgpgme.la
 t_thread1_LDADD = ../../src/libgpgme-pthread.la -lpthread
 
 # We don't run t-genkey in the test suite, because it takes too long
-noinst_PROGRAMS = $(TESTS) t-genkey
+noinst_PROGRAMS = $(c_tests) t-genkey
 
 clean-local:
-	-gpg-connect-agent KILLAGENT /bye
+	-$(srcdir)/start-stop-agent --stop
 	-rm -fR private-keys-v1.d
 
-all-local: ./gpg.conf ./gpg-agent.conf ./pubring.gpg 
+all-local: ./gpg.conf ./gpg-agent.conf ./pubring.gpg \
+           ./private-keys-v1.d/gpg-sample.stamp
 
 export GNUPGHOME := $(abs_builddir)
 
-export GPG_AGENT_INFO := 
+export GPG_AGENT_INFO :=
+
+./private-keys-v1.d/gpg-sample.stamp: $(srcdir)/$(private_keys)
+	test -d ./private-keys-v1.d || mkdir ./private-keys-v1.d
+	for k in $(private_keys); do \
+          cp $(srcdir)/$$k private-keys-v1.d/$$k.key; \
+        done
+	echo x > ./private-keys-v1.d/gpg-sample.stamp
 
 ./pubring.gpg: $(srcdir)/pubdemo.asc
 	-$(GPG) --no-permission-warning \
diff --git a/tests/gpg/final.test b/tests/gpg/final.test
new file mode 100755
index 0000000..5148a34
--- /dev/null
+++ b/tests/gpg/final.test
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+${srcdir}/start-stop-agent --stop
+exit 0
diff --git a/tests/gpg/initial.test b/tests/gpg/initial.test
new file mode 100755
index 0000000..1981c99
--- /dev/null
+++ b/tests/gpg/initial.test
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+${srcdir}/start-stop-agent --start
+exit 0
diff --git a/tests/gpg/start-stop-agent b/tests/gpg/start-stop-agent
new file mode 100755
index 0000000..ab47d8d
--- /dev/null
+++ b/tests/gpg/start-stop-agent
@@ -0,0 +1,45 @@
+#!/bin/sh
+# Copyright (C) 2013 g10 Code GmbH
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.  This file is
+# distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY, to the extent permitted by law; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+if [ -z "$(command -v gpg-connect-agent)" ]; then
+   echo "gpg-agent not installed and thus not started" >&2
+   exit 0;
+fi
+
+GPG_AGENT_INFO=
+export GPG_AGENT_INFO
+
+token=$(echo "gpgme-$(pwd)" | tr ' ' '_')
+
+if [ "$1" = "--stop" ]; then
+  if [ "$(gpg-connect-agent getval\ $token /bye 2>/dev/null | head -1)" \
+        != "D set" ]; then
+    echo "gpg-agent not running" >&2
+    exit 0
+  fi
+  echo "stopping gpg-agent " >&2
+  gpg-connect-agent KILLAGENT /bye >/dev/null 2>&1
+  exit 0
+fi
+
+if [ "$(gpg-connect-agent getval\ $token /bye 2>/dev/null | head -1)" \
+      = "D set" ]; then
+  echo "gpg-agent already running" >&2
+  exit 0
+fi
+
+echo "starting gpg-agent " >&2
+gpg-connect-agent putval\ $token\ set /bye >/dev/null 2>&1
+if [ "$(gpg-connect-agent getval\ $token /bye 2>/dev/null | head -1)" \
+      != "D set" ]; then
+  echo "error starting gpg-agent" >&2
+  exit 1
+fi
+exit 0

commit 069ac580373923f5635b7172ecff79eb189f6944
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 12 14:24:34 2013 +0200

    Improve detection of default gpg by configure.
    
    * configure.ac: Move test for gpgconf before test for gpg.
    (GPG, GPGSM, G13): Use gpgconf instead of AC_PATH_PROG if possible.
    --
    
    This change is required so that the t-engine-info test does not
    fail.  In any case, it is a good idea to use gpgconf for these test
    because this is how it works at runtime.

diff --git a/configure.ac b/configure.ac
index d3258be..6eef3a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,6 +77,8 @@ AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/gpgme.h.in)
 AC_CONFIG_HEADER(config.h)
+# Note: For automake 1.13 add the option
+#          serial-tests
 AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
 AC_CANONICAL_HOST
@@ -443,16 +445,121 @@ if test "$NEED_G13_VERSION" = "no"; then
   NEED_G13_VERSION=0.0.0
 fi
 
+AC_DEFINE_UNQUOTED(NEED_GPGCONF_VERSION, "$NEED_GPGCONF_VERSION",
+				         [Min. needed GPGCONF version.])
 AC_DEFINE_UNQUOTED(NEED_GPG_VERSION, "$NEED_GPG_VERSION",
 				     [Min. needed GnuPG version.])
 AC_DEFINE_UNQUOTED(NEED_GPGSM_VERSION, "$NEED_GPGSM_VERSION",
 				       [Min. needed GPGSM version.])
-AC_DEFINE_UNQUOTED(NEED_GPGCONF_VERSION, "$NEED_GPGCONF_VERSION",
-				         [Min. needed GPGCONF version.])
 AC_DEFINE_UNQUOTED(NEED_G13_VERSION, "$NEED_G13_VERSION",
 				     [Min. needed G13 version.])
 
+#
+# Check for GPGCONF
+#
+gpgconf_usable_for_test=no
+NO_OVERRIDE=no
+AC_ARG_WITH(gpgconf,
+	    AC_HELP_STRING([--with-gpgconf=PATH],
+                           [use gpgconf binary at PATH]),
+	    GPGCONF=$withval, NO_OVERRIDE=yes)
+if test "$NO_OVERRIDE" = "yes" || test "$GPGCONF" = "yes"; then
+  GPGCONF=
+  NO_OVERRIDE=yes
+  if test "$cross_compiling" != "yes"; then
+    AC_PATH_PROG(GPGCONF, gpgconf)
+  fi
+  if test -z "$GPGCONF"; then
+    GPGCONF="$GPGCONF_DEFAULT"
+  fi
+fi
+if test "$GPGCONF" = no; then
+  if test "$NO_OVERRIDE" = "yes"; then
+    if test "$cross_compiling" != "yes"; then
+      AC_MSG_WARN([
+***
+*** Could not find gpgconf, install gpgconf or use --with-gpgconf=PATH to enable it
+***])
+    else
+      AC_MSG_ERROR([
+***
+*** Can not determine path to gpgconf when cross-compiling, use --with-gpgconf=PATH
+***])
+    fi
+  fi
+else
+  AC_DEFINE_UNQUOTED(GPGCONF_PATH, "$GPGCONF", [Path to the GPGCONF binary.])
+  AC_DEFINE(ENABLE_GPGCONF,1,[Whether GPGCONF support is enabled])
+fi
+AM_CONDITIONAL(HAVE_GPGCONF, test "$GPGCONF" != "no")
+
+dnl Check for GPGCONF version requirement.
+GPGCONF_VERSION=unknown
+ok=maybe
+if test -z "$GPGCONF" -o "x$GPGCONF" = "xno"; then
+  ok=no
+else
+  if test "$cross_compiling" = "yes"; then
+    AC_MSG_WARN([GPGCONF version can not be checked when cross compiling])
+    ok=no
+  else
+    if test ! -x "$GPGCONF"; then
+      AC_MSG_WARN([GPGCONF not executable, version check disabled])
+      ok=no
+    fi
+  fi
+fi
+if test "$ok" = "maybe"; then
+  AC_MSG_CHECKING(for GPGCONF >= $NEED_GPGCONF_VERSION)
+  req_major=`echo $NEED_GPGCONF_VERSION | \
+             sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+  req_minor=`echo $NEED_GPGCONF_VERSION | \
+	     sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
+  req_micro=`echo $NEED_GPGCONF_VERSION | \
+	     sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+  GPGCONF_VERSION=`$GPGCONF --version | sed -n '1 s/[[^0-9]]*\(.*\)/\1/p'`
+  major=`echo $GPGCONF_VERSION | \
+	 sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
+  minor=`echo $GPGCONF_VERSION | \
+	 sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
+  micro=`echo $GPGCONF_VERSION | \
+	 sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
+
+  if test "$major" -gt "$req_major"; then
+    ok=yes
+  else
+    if test "$major" -eq "$req_major"; then
+      if test "$minor" -gt "$req_minor"; then
+        ok=yes
+      else
+        if test "$minor" -eq "$req_minor"; then
+          if test "$micro" -ge "$req_micro"; then
+            ok=yes
+	  fi
+        fi
+      fi
+    fi
+  fi
+  if test "$ok" = "yes"; then
+    AC_MSG_RESULT(yes)
+    if test "$cross_compiling" != "yes"; then
+       gpgconf_usable_for_test=yes
+    fi
+  else
+    AC_MSG_RESULT(no)
+    AC_MSG_WARN([GPGCONF must be at least version $NEED_GPGCONF_VERSION])
+  fi
+fi
+run_gpgconf_test="$ok"
+AC_ARG_ENABLE(gpgconf-test,
+  AC_HELP_STRING([--disable-gpgconf-test], [disable GPGCONF run test]),
+         run_gpgconf_test=$enableval)
+AM_CONDITIONAL(RUN_GPGCONF_TESTS, test "$run_gpgconf_test" = "yes")
+
 
+#
+# Check for GPG
+#
 NO_OVERRIDE=no
 AC_ARG_WITH(gpg,
 	    AC_HELP_STRING([--with-gpg=PATH], [use GnuPG binary at PATH]),
@@ -461,7 +568,11 @@ if test "$NO_OVERRIDE" = "yes" || test "$GPG" = "yes"; then
   GPG=
   NO_OVERRIDE=yes
   if test "$cross_compiling" != "yes"; then
-    AC_PATH_PROG(GPG, gpg)
+    if test "$gpgconf_usable_for_test" = "yes"; then
+      GPG="`$GPGCONF --list-components | grep ^gpg: | cut -d: -f 3`"
+    else
+      AC_PATH_PROG(GPG, gpg)
+    fi
   fi
   if test -z "$GPG"; then
     GPG="$GPG_DEFAULT"
@@ -546,6 +657,10 @@ AC_ARG_ENABLE(gpg-test,
 AM_CONDITIONAL(RUN_GPG_TESTS, test "$run_gpg_test" = "yes")
 AC_SUBST(GPG_PATH)
 
+
+#
+# Check for GPGSM
+#
 NO_OVERRIDE=no
 AC_ARG_WITH(gpgsm,
 	    AC_HELP_STRING([--with-gpgsm=PATH], [use GpgSM binary at PATH]),
@@ -554,7 +669,11 @@ if test "$NO_OVERRIDE" = "yes" || test "$GPGSM" = "yes"; then
   GPGSM=
   NO_OVERRIDE=yes
   if test "$cross_compiling" != "yes"; then
-    AC_PATH_PROG(GPGSM, gpgsm)
+    if test "$gpgconf_usable_for_test" = "yes"; then
+      GPGSM="`$GPGCONF --list-components | grep ^gpgsm: | cut -d: -f 3`"
+    else
+      AC_PATH_PROG(GPGSM, gpgsm)
+    fi
   fi
   if test -z "$GPGSM"; then
     GPGSM="$GPGSM_DEFAULT"
@@ -642,102 +761,9 @@ AC_ARG_ENABLE(gpgsm-test,
 AM_CONDITIONAL(RUN_GPGSM_TESTS, test "$run_gpgsm_test" = "yes")
 
 
-NO_OVERRIDE=no
-AC_ARG_WITH(gpgconf,
-	    AC_HELP_STRING([--with-gpgconf=PATH],
-                           [use gpgconf binary at PATH]),
-	    GPGCONF=$withval, NO_OVERRIDE=yes)
-if test "$NO_OVERRIDE" = "yes" || test "$GPGCONF" = "yes"; then
-  GPGCONF=
-  NO_OVERRIDE=yes
-  if test "$cross_compiling" != "yes"; then
-    AC_PATH_PROG(GPGCONF, gpgconf)
-  fi
-  if test -z "$GPGCONF"; then
-    GPGCONF="$GPGCONF_DEFAULT"
-  fi
-fi
-if test "$GPGCONF" = no; then
-  if test "$NO_OVERRIDE" = "yes"; then
-    if test "$cross_compiling" != "yes"; then
-      AC_MSG_WARN([
-***
-*** Could not find gpgconf, install gpgconf or use --with-gpgconf=PATH to enable it
-***])
-    else
-      AC_MSG_ERROR([
-***
-*** Can not determine path to gpgconf when cross-compiling, use --with-gpgconf=PATH
-***])
-    fi
-  fi
-else
-  AC_DEFINE_UNQUOTED(GPGCONF_PATH, "$GPGCONF", [Path to the GPGCONF binary.])
-  AC_DEFINE(ENABLE_GPGCONF,1,[Whether GPGCONF support is enabled])
-fi
-AM_CONDITIONAL(HAVE_GPGCONF, test "$GPGCONF" != "no")
-
-dnl Check for GPGCONF version requirement.
-GPGCONF_VERSION=unknown
-ok=maybe
-if test -z "$GPGCONF" -o "x$GPGCONF" = "xno"; then
-  ok=no
-else
-  if test "$cross_compiling" = "yes"; then
-    AC_MSG_WARN([GPGCONF version can not be checked when cross compiling])
-    ok=no
-  else
-    if test ! -x "$GPGCONF"; then
-      AC_MSG_WARN([GPGCONF not executable, version check disabled])
-      ok=no
-    fi
-  fi
-fi
-if test "$ok" = "maybe"; then
-  AC_MSG_CHECKING(for GPGCONF >= $NEED_GPGCONF_VERSION)
-  req_major=`echo $NEED_GPGCONF_VERSION | \
-             sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
-  req_minor=`echo $NEED_GPGCONF_VERSION | \
-	     sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
-  req_micro=`echo $NEED_GPGCONF_VERSION | \
-	     sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
-  GPGCONF_VERSION=`$GPGCONF --version | sed -n '1 s/[[^0-9]]*\(.*\)/\1/p'`
-  major=`echo $GPGCONF_VERSION | \
-	 sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
-  minor=`echo $GPGCONF_VERSION | \
-	 sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
-  micro=`echo $GPGCONF_VERSION | \
-	 sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
-
-  if test "$major" -gt "$req_major"; then
-    ok=yes
-  else
-    if test "$major" -eq "$req_major"; then
-      if test "$minor" -gt "$req_minor"; then
-        ok=yes
-      else
-        if test "$minor" -eq "$req_minor"; then
-          if test "$micro" -ge "$req_micro"; then
-            ok=yes
-	  fi
-        fi
-      fi
-    fi
-  fi
-  if test "$ok" = "yes"; then
-    AC_MSG_RESULT(yes)
-  else
-    AC_MSG_RESULT(no)
-    AC_MSG_WARN([GPGCONF must be at least version $NEED_GPGCONF_VERSION])
-  fi
-fi
-run_gpgconf_test="$ok"
-AC_ARG_ENABLE(gpgconf-test,
-  AC_HELP_STRING([--disable-gpgconf-test], [disable GPGCONF run test]),
-         run_gpgconf_test=$enableval)
-AM_CONDITIONAL(RUN_GPGCONF_TESTS, test "$run_gpgconf_test" = "yes")
-
-
+#
+# Check for G13
+#
 NO_OVERRIDE=no
 AC_ARG_WITH(g13,
 	    AC_HELP_STRING([--with-g13=PATH],
@@ -747,7 +773,15 @@ if test "$NO_OVERRIDE" = "yes" || test "$G13" = "yes"; then
   G13=
   NO_OVERRIDE=yes
   if test "$cross_compiling" != "yes"; then
-    AC_PATH_PROG(G13, g13)
+    if test "$gpgconf_usable_for_test" = "yes"; then
+      G13="`$GPGCONF --list-components | grep ^g13: | cut -d: -f 3`"
+      if test -z "$G13"; then
+        # Use a hack if gpgconf has no support for g13.
+        G13="`$GPGCONF --list-dirs | grep ^bindir: | cut -d: -f 2`/g13"
+      fi
+    else
+      AC_PATH_PROG(G13, g13)
+    fi
   fi
   if test -z "$G13"; then
     G13="$G13_DEFAULT"
@@ -834,6 +868,10 @@ AC_ARG_ENABLE(g13-test,
 AM_CONDITIONAL(RUN_G13_TESTS, test "$run_g13_test" = "yes")
 
 
+#
+# Other checks
+#
+
 # Check for funopen
 AC_CHECK_FUNCS(funopen)
 if test $ac_cv_func_funopen != yes; then
@@ -1029,13 +1067,13 @@ echo "
         Revision:        mym4_revision  (mym4_revision_dec)
         Platform:        $host
 
-        GnuPG path:      $GPG
-        GnuPG version:   $GPG_VERSION, min. $NEED_GPG_VERSION
-        GpgSM path:      $GPGSM
-        GpgSM version:   $GPGSM_VERSION, min. $NEED_GPGSM_VERSION
-        GpgConf path:    $GPGCONF
-        GpgConf version: $GPGCONF_VERSION, min. $NEED_GPGCONF_VERSION
-        G13 path:        $G13
+        Gpgconf at:      $GPGCONF
+        Gpgconf version: $GPGCONF_VERSION, min. $NEED_GPGCONF_VERSION
+        GPG at:          $GPG
+        GPG version:     $GPG_VERSION, min. $NEED_GPG_VERSION
+        Gpgsm at:        $GPGSM
+        Gpgsm version:   $GPGSM_VERSION, min. $NEED_GPGSM_VERSION
+        G13 at:          $G13
         G13 version:     $G13_VERSION, min. $NEED_G13_VERSION
 
         Assuan version:  $libassuan_config_version, min. $NEED_LIBASSUAN_VERSION

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

Summary of changes:
 NEWS                                               |    2 +-
 configure.ac                                       |  258 +++++++++++---------
 tests/gpg/13CBE3758AFE42B5E5E2AE4CED27AFA455E3F87F |  Bin 0 -> 682 bytes
 tests/gpg/13CD0F3BDF24BE53FE192D62F18737256FF6E4FD |  Bin 0 -> 828 bytes
 tests/gpg/76F7E2B35832976B50A27A282D9B87E44577EB66 |  Bin 0 -> 493 bytes
 tests/gpg/7A030357C0F253A5BBCD282FFC4E521B37558F5C |  Bin 0 -> 636 bytes
 tests/gpg/A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD |  Bin 0 -> 636 bytes
 tests/gpg/Makefile.am                              |   47 +++-
 tests/gpg/final.test                               |    4 +
 tests/gpg/initial.test                             |    4 +
 tests/gpg/start-stop-agent                         |   45 ++++
 11 files changed, 236 insertions(+), 124 deletions(-)
 create mode 100644 tests/gpg/13CBE3758AFE42B5E5E2AE4CED27AFA455E3F87F
 create mode 100644 tests/gpg/13CD0F3BDF24BE53FE192D62F18737256FF6E4FD
 create mode 100644 tests/gpg/76F7E2B35832976B50A27A282D9B87E44577EB66
 create mode 100644 tests/gpg/7A030357C0F253A5BBCD282FFC4E521B37558F5C
 create mode 100644 tests/gpg/A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD
 create mode 100755 tests/gpg/final.test
 create mode 100755 tests/gpg/initial.test
 create mode 100755 tests/gpg/start-stop-agent


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



From cvs at cvs.gnupg.org  Mon Aug 12 19:16:06 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Mon, 12 Aug 2013 19:16:06 +0200
Subject: [git] GPA - branch, master, updated. gpa-0.9.4-6-g398fd02
Message-ID: <E1V8vFk-0008ED-6j@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  398fd028c762dd6c0fc7a5945f55eb2dbd2edaec (commit)
      from  6742525110270b0098e41157edfb13e36483f1ca (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 398fd028c762dd6c0fc7a5945f55eb2dbd2edaec
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 12 18:44:06 2013 +0200

    Detect default homedir via gpgconf.
    
    * src/server.c (decode_percent_string): Move to ..
    * src/utils.c (decode_percent_string): here.
    * src/gpgmetools.c (gpa_start_simple_gpg_command): Add arg use_stderr
    and change all callers.
    (gpg_simple_stdio_cb): Implement the !use_stderr case.
    * src/get-path.c: Include string.h and gpa.h.
    (struct homedir_from_gpgconf_s): New.
    (homedir_from_gpgconf_parser): New.
    (homedir_from_gpgconf): New.
    (default_homedir): First try to detect via gpgconf.
    --
    
    It would be useful to equip GPGME with a function to parse the output
    of "gpgconf --list-dir".  Until then we need to go into some length to
    read it.

diff --git a/src/cm-netkey.c b/src/cm-netkey.c
index 8b4aba2..8ddbcb7 100644
--- a/src/cm-netkey.c
+++ b/src/cm-netkey.c
@@ -14,7 +14,7 @@
  * 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/>. 
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "gpa.h"   
+#include "gpa.h"
 #include "gtktools.h"
 #include "convert.h"
 #include "gpa-key-details.h"
@@ -49,7 +49,7 @@ enum
     ENTRY_SIGG_PUK_RETRYCOUNTER,
 
     ENTRY_LAST
-  }; 
+  };
 
 
 /* A structure for PIN information.  */
@@ -65,7 +65,7 @@ struct pininfo_s
 
 
 /* Object's class definition.  */
-struct _GpaCMNetkeyClass 
+struct _GpaCMNetkeyClass
 {
   GpaCMObjectClass parent_class;
 };
@@ -106,7 +106,7 @@ static void gpa_cm_netkey_finalize (GObject *object);
 
 
 

-/************************************************************ 
+/************************************************************
  *******************   Implementation   *********************
  ************************************************************/
 
@@ -127,13 +127,13 @@ clear_card_data (GpaCMNetkey *card)
 /* Put the PIN information into the field with ENTRY_ID.  If BUTTON is
    not NULL its sensitivity is set as well. */
 static void
-update_entry_retry_counter (GpaCMNetkey *card, int entry_id, 
+update_entry_retry_counter (GpaCMNetkey *card, int entry_id,
                             struct pininfo_s *info, int any_isnull,
                             int is_puk, GtkWidget *button)
 {
   char numbuf[50];
   const char *string;
-  
+
   if (!info->valid)
     string = _("unknown");
   else if (info->nullpin)
@@ -150,12 +150,12 @@ update_entry_retry_counter (GpaCMNetkey *card, int entry_id,
   gtk_label_set_text (GTK_LABEL (card->entries[entry_id]), string);
   if (button)
     {
-      gtk_button_set_label (GTK_BUTTON (button), 
+      gtk_button_set_label (GTK_BUTTON (button),
                             (info->valid && !info->nullpin
                              && (info->blocked || !info->tries_left))
                             ? (is_puk? _("Reset PUK") : _("Reset PIN"))
                             : (is_puk? _("Change PUK"): _("Change PIN")));
-      gtk_widget_set_sensitive (button, 
+      gtk_widget_set_sensitive (button,
                                 (info->valid && !any_isnull
                                  && !info->nullpin && !info->blocked
                                  && !info->nopin));
@@ -168,12 +168,12 @@ update_entry_retry_counter (GpaCMNetkey *card, int entry_id,
 static void
 update_entry_chv_status (GpaCMNetkey *card, int entry_id, char *string)
 {
-  struct { 
+  struct {
     int info_idx;
     int is_puk;
     int entry_id;
     GtkWidget *widget;
-  } tbl[] = 
+  } tbl[] =
     {
       {  0, 0, ENTRY_PIN_RETRYCOUNTER },
       {  1, 1, ENTRY_PUK_RETRYCOUNTER  },
@@ -190,7 +190,7 @@ update_entry_chv_status (GpaCMNetkey *card, int entry_id, char *string)
   tbl[3].widget = card->change_sigg_puk_btn;
 
   (void)entry_id; /* Not used.  */
-  
+
   for (idx=0; idx < DIM (card->pininfo); idx++)
     memset (&card->pininfo[idx], 0, sizeof card->pininfo[0]);
 
@@ -203,7 +203,7 @@ update_entry_chv_status (GpaCMNetkey *card, int entry_id, char *string)
         string++;
       while (spacep (string))
         string++;
-      
+
       card->pininfo[idx].valid = 1;
       if (value >= 0)
         card->pininfo[idx].tries_left = value;
@@ -224,7 +224,7 @@ update_entry_chv_status (GpaCMNetkey *card, int entry_id, char *string)
     if (tbl[idx].info_idx < DIM (card->pininfo))
       update_entry_retry_counter (card, tbl[idx].entry_id,
                                   &card->pininfo[tbl[idx].info_idx],
-                                  any_isnull, 
+                                  any_isnull,
                                   tbl[idx].is_puk, tbl[idx].widget);
 
   gtk_widget_set_no_show_all (card->warning_frame, FALSE);
@@ -371,7 +371,7 @@ reload_more_data (GpaCMNetkey *card)
 
       align = gtk_alignment_new (0.5, 0, 0, 0);
       button = gtk_button_new_with_label (_("Learn keys"));
-      gpa_add_tooltip 
+      gpa_add_tooltip
         (button, _("For some or all of the keys available on the card, "
                    "the GnuPG crypto engine does not yet know the "
                    "corresponding certificates.\n"
@@ -404,7 +404,7 @@ static gboolean
 reload_more_data_idle_cb (void *user_data)
 {
   GpaCMNetkey *card = user_data;
-  
+
   if (card->reloading)
     {
       g_debug ("already reloading (count=%d)", card->reloading);
@@ -414,7 +414,7 @@ reload_more_data_idle_cb (void *user_data)
 
   card->reloading++;
   reload_more_data (card);
-  g_object_unref (card); 
+  g_object_unref (card);
   card->reloading--;
 
   return FALSE;  /* Remove us from the idle queue.  */
@@ -450,17 +450,17 @@ scd_getattr_cb (void *opaque, const char *status, const char *args)
           if (parm->updfnc)
             parm->updfnc (parm->card, entry_id, tmp);
           else if (GTK_IS_LABEL (parm->card->entries[entry_id]))
-            gtk_label_set_text 
+            gtk_label_set_text
               (GTK_LABEL (parm->card->entries[entry_id]), tmp);
           else
-            gtk_entry_set_text 
+            gtk_entry_set_text
               (GTK_ENTRY (parm->card->entries[entry_id]), tmp);
           xfree (tmp);
         }
     }
 
   return 0;
-}     
+}
 
 
 /* Use the assuan machinery to load the bulk of the OpenPGP card data.  */
@@ -509,7 +509,7 @@ reload_data (GpaCMNetkey *card)
         {
           /* The NKS-VERSION is only supported by GnuPG > 2.0.11
              thus we ignore the error.  */
-          gtk_label_set_text 
+          gtk_label_set_text
             (GTK_LABEL (card->entries[attrtbl[attridx].entry_id]),
              _("unknown"));
         }
@@ -519,7 +519,7 @@ reload_data (GpaCMNetkey *card)
             ; /* Lost the card.  */
           else
             {
-              g_debug ("assuan command `%s' failed: %s <%s>\n", 
+              g_debug ("assuan command `%s' failed: %s <%s>\n",
                        command, gpg_strerror (err), gpg_strsource (err));
             }
           clear_card_data (card);
@@ -537,7 +537,7 @@ reload_data (GpaCMNetkey *card)
 
 
 /* A structure used to pass data to the learn_keys_gpg_status_cb.  */
-struct learn_keys_gpg_status_parm 
+struct learn_keys_gpg_status_parm
 {
   GpaCMNetkey    *card;
   GtkWidget      *button;
@@ -546,11 +546,11 @@ struct learn_keys_gpg_status_parm
 
 
 /* Helper for learn_keys_clicked_cb.  */
-static gboolean 
+static gboolean
 learn_keys_gpg_status_cb (void *opaque, char *line)
 {
   struct learn_keys_gpg_status_parm *parm = opaque;
-  
+
   if (!line)
     {
       /* We are finished with the command.  */
@@ -590,7 +590,7 @@ learn_keys_clicked_cb (GtkButton *button, void *user_data)
 
   widget = gtk_progress_bar_new ();
   gtk_container_add (GTK_CONTAINER (button), widget);
-  gtk_progress_bar_set_text (GTK_PROGRESS_BAR (widget), 
+  gtk_progress_bar_set_text (GTK_PROGRESS_BAR (widget),
                               _("Learning keys ..."));
   gtk_widget_show_all (GTK_WIDGET (button));
 
@@ -600,8 +600,8 @@ learn_keys_clicked_cb (GtkButton *button, void *user_data)
   parm->button = GTK_WIDGET (button);
   parm->pbar = GTK_PROGRESS_BAR (widget);
 
-  err = gpa_start_simple_gpg_command 
-    (learn_keys_gpg_status_cb, parm, GPGME_PROTOCOL_CMS,
+  err = gpa_start_simple_gpg_command
+    (learn_keys_gpg_status_cb, parm, GPGME_PROTOCOL_CMS, 1,
      "--learn-card", "-v", NULL);
   if (err)
     {
@@ -633,7 +633,7 @@ change_nullpin (GpaCMNetkey *card)
   else
     return; /* Oops: No NullPIN.  */
 
-  string = g_strdup_printf 
+  string = g_strdup_printf
     (_("<b>Setting the Initial PIN</b> (%s)\n\n"
        "You selected to set the initial PIN of your card.  "
        "The PIN is currently set to the NullPIN.  Setting an "
@@ -653,12 +653,12 @@ change_nullpin (GpaCMNetkey *card)
          "PIN to the same value as used for the NKS keys.")
      : _("You are now setting the PIN for the NKS keys used for standard "
          "signatures, encryption and authentication."));
-    
+
   /* FIXME:  How do we figure out our GtkWindow?  */
   dialog = gtk_message_dialog_new_with_markup (NULL /*GTK_WINDOW (card)*/,
                                                GTK_DIALOG_DESTROY_WITH_PARENT,
-                                               GTK_MESSAGE_INFO, 
-                                               GTK_BUTTONS_OK_CANCEL, 
+                                               GTK_MESSAGE_INFO,
+                                               GTK_BUTTONS_OK_CANCEL,
                                                NULL);
   gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (dialog), string);
   g_free (string);
@@ -679,7 +679,7 @@ change_nullpin (GpaCMNetkey *card)
         okay = 0; /* No need to reload the data.  */
       else if (err)
         {
-          char *message = g_strdup_printf 
+          char *message = g_strdup_printf
             (_("Error changing the NullPIN.\n"
                "(%s <%s>)"), gpg_strerror (err), gpg_strsource (err));
           gpa_window_error (message, NULL);
@@ -709,7 +709,7 @@ change_or_reset_pin (GpaCMNetkey *card, int info_idx)
   g_return_if_fail (gpgagent);
   g_return_if_fail (info_idx < DIM (card->pininfo));
 
-  if (!card->pininfo[info_idx].valid 
+  if (!card->pininfo[info_idx].valid
       || card->pininfo[info_idx].nopin
       || card->pininfo[info_idx].nullpin)
     {
@@ -741,7 +741,7 @@ change_or_reset_pin (GpaCMNetkey *card, int info_idx)
                 "of the PIN and the corresponding PUK are both down "
                 "to zero, the keys controlled by the PIN are not anymore "
                 "usable and there is no way to unblock them!")
-            : is_puk 
+            : is_puk
             ? _("<b>Resetting a PUK</b>\n"
                 "\n"
                 "Although <i>PUK</i> stands for <i>PIN Unblocking Code</i> "
@@ -766,12 +766,12 @@ change_or_reset_pin (GpaCMNetkey *card, int info_idx)
                 "value of the PUK and then to enter a new value for the "
                 "blocked PIN and repeat that new value at another prompt.")
             );
-              
+
   /* FIXME:  How do we figure out our GtkWindow?  */
   dialog = gtk_message_dialog_new_with_markup (NULL /*GTK_WINDOW (card)*/,
                                                GTK_DIALOG_DESTROY_WITH_PARENT,
-                                               GTK_MESSAGE_INFO, 
-                                               GTK_BUTTONS_OK_CANCEL, 
+                                               GTK_MESSAGE_INFO,
+                                               GTK_BUTTONS_OK_CANCEL,
                                                NULL);
   gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (dialog), string);
   okay = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK);
@@ -783,13 +783,13 @@ change_or_reset_pin (GpaCMNetkey *card, int info_idx)
                 reset_mode? " --reset":"", pwidstr);
       err = gpgme_op_assuan_transact (gpgagent, command,
                                       NULL, NULL, NULL, NULL, NULL, NULL);
-      if (!err) 
+      if (!err)
         err = gpgme_op_assuan_result (gpgagent)->err;
       if (gpg_err_code (err) == GPG_ERR_CANCELED)
         okay = 0; /* No need to reload the data.  */
-      else if (err) 
+      else if (err)
         {
-          char *message = g_strdup_printf 
+          char *message = g_strdup_printf
             (_("Error changing or resetting the PIN/PUK.\n"
                "(%s <%s>)"), gpg_strerror (err), gpg_strsource (err));
           gpa_window_error (message, NULL);
@@ -840,12 +840,12 @@ add_table_row (GtkWidget *table, int *rowidx,
   label = gtk_label_new (labelstr);
   gtk_label_set_width_chars  (GTK_LABEL (label), 22);
   gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
-  gtk_table_attach (GTK_TABLE (table), label, 0, 1,	       
-                    *rowidx, *rowidx + 1, GTK_FILL, GTK_SHRINK, 0, 0); 
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1,
+                    *rowidx, *rowidx + 1, GTK_FILL, GTK_SHRINK, 0, 0);
 
   if (is_label)
     gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
-  
+
   if (readonly)
     {
       if (!is_label && GTK_IS_ENTRY (widget))
@@ -859,7 +859,7 @@ add_table_row (GtkWidget *table, int *rowidx,
       if (is_label)
         gtk_label_set_selectable (GTK_LABEL (widget), TRUE);
     }
-      
+
   gtk_table_attach (GTK_TABLE (table), widget, 1, 2,
                     *rowidx, *rowidx + 1, GTK_FILL, GTK_SHRINK, 0, 0);
   if (widget2)
@@ -893,17 +893,17 @@ construct_data_widget (GpaCMNetkey *card)
   gtk_container_set_border_width (GTK_CONTAINER (table), 10);
   gtk_container_add (GTK_CONTAINER (frame), table);
   rowidx = 0;
-  
+
   card->entries[ENTRY_SERIALNO] = gtk_label_new (NULL);
   add_table_row (table, &rowidx, _("Serial number:"),
                  card->entries[ENTRY_SERIALNO], NULL, 0);
 
   card->entries[ENTRY_NKS_VERSION] = gtk_label_new (NULL);
-  add_table_row (table, &rowidx, _("Card version:"), 
+  add_table_row (table, &rowidx, _("Card version:"),
                  card->entries[ENTRY_NKS_VERSION], NULL, 0);
 
   gtk_box_pack_start (GTK_BOX (card), frame, FALSE, TRUE, 0);
-  
+
 
   /* Warning frame.  */
   frame = gtk_frame_new (NULL);
@@ -939,7 +939,7 @@ construct_data_widget (GpaCMNetkey *card)
      widgets are added while figuring out the keys of the card.  */
   label = gtk_label_new (_("scanning ..."));
   gtk_container_add (GTK_CONTAINER (frame), label);
-  
+
   gtk_box_pack_start (GTK_BOX (card), frame, FALSE, TRUE, 0);
   card->keys_frame = frame;
 
@@ -957,42 +957,42 @@ construct_data_widget (GpaCMNetkey *card)
 
   card->entries[ENTRY_PIN_RETRYCOUNTER] = gtk_label_new (NULL);
   button = gtk_button_new ();
-  add_table_row (table, &rowidx, _("PIN retry counter:"), 
+  add_table_row (table, &rowidx, _("PIN retry counter:"),
                  card->entries[ENTRY_PIN_RETRYCOUNTER], button, 1);
-  card->change_pin_btn = button; 
+  card->change_pin_btn = button;
   g_signal_connect (G_OBJECT (button), "clicked",
                     G_CALLBACK (change_pin_clicked_cb), card);
 
   card->entries[ENTRY_PUK_RETRYCOUNTER] = gtk_label_new (NULL);
   button = gtk_button_new ();
-  add_table_row (table, &rowidx, _("PUK retry counter:"), 
+  add_table_row (table, &rowidx, _("PUK retry counter:"),
                  card->entries[ENTRY_PUK_RETRYCOUNTER], button, 1);
-  card->change_puk_btn = button; 
+  card->change_puk_btn = button;
   g_signal_connect (G_OBJECT (button), "clicked",
                     G_CALLBACK (change_pin_clicked_cb), card);
 
   card->entries[ENTRY_SIGG_PIN_RETRYCOUNTER] = gtk_label_new (NULL);
   button = gtk_button_new ();
-  add_table_row (table, &rowidx, _("SigG PIN retry counter:"), 
+  add_table_row (table, &rowidx, _("SigG PIN retry counter:"),
                  card->entries[ENTRY_SIGG_PIN_RETRYCOUNTER], button, 1);
-  card->change_sigg_pin_btn = button; 
+  card->change_sigg_pin_btn = button;
   g_signal_connect (G_OBJECT (button), "clicked",
                     G_CALLBACK (change_pin_clicked_cb), card);
 
   card->entries[ENTRY_SIGG_PUK_RETRYCOUNTER] = gtk_label_new (NULL);
   button = gtk_button_new ();
-  add_table_row (table, &rowidx, _("SigG PUK retry counter:"), 
+  add_table_row (table, &rowidx, _("SigG PUK retry counter:"),
                  card->entries[ENTRY_SIGG_PUK_RETRYCOUNTER], button, 1);
-  card->change_sigg_puk_btn = button; 
+  card->change_sigg_puk_btn = button;
   g_signal_connect (G_OBJECT (button), "clicked",
                     G_CALLBACK (change_pin_clicked_cb), card);
-  
+
   gtk_box_pack_start (GTK_BOX (card), frame, FALSE, TRUE, 0);
 }
 
 
 

-/************************************************************ 
+/************************************************************
  ******************   Object Management  ********************
  ************************************************************/
 
@@ -1002,7 +1002,7 @@ gpa_cm_netkey_class_init (void *class_ptr, void *class_data)
   GpaCMNetkeyClass *klass = class_ptr;
 
   parent_class = g_type_class_peek_parent (klass);
-  
+
   G_OBJECT_CLASS (klass)->finalize = gpa_cm_netkey_finalize;
 }
 
@@ -1019,7 +1019,7 @@ gpa_cm_netkey_init (GTypeInstance *instance, void *class_ptr)
 
 static void
 gpa_cm_netkey_finalize (GObject *object)
-{  
+{
 /*   GpaCMNetkey *card = GPA_CM_NETKEY (object); */
 
   parent_class->finalize (object);
@@ -1031,7 +1031,7 @@ GType
 gpa_cm_netkey_get_type (void)
 {
   static GType this_type = 0;
-  
+
   if (!this_type)
     {
       static const GTypeInfo this_info =
@@ -1046,23 +1046,23 @@ gpa_cm_netkey_get_type (void)
 	  0,    /* n_preallocs */
 	  gpa_cm_netkey_init
 	};
-      
+
       this_type = g_type_register_static (GPA_CM_OBJECT_TYPE,
                                           "GpaCMNetkey",
                                           &this_info, 0);
     }
-  
+
   return this_type;
 }
 
 

-/************************************************************ 
+/************************************************************
  **********************  Public API  ************************
  ************************************************************/
 GtkWidget *
 gpa_cm_netkey_new ()
 {
-  return GTK_WIDGET (g_object_new (GPA_CM_NETKEY_TYPE, NULL));  
+  return GTK_WIDGET (g_object_new (GPA_CM_NETKEY_TYPE, NULL));
 }
 
 
diff --git a/src/get-path.c b/src/get-path.c
index f50e21b..71fe0e1 100644
--- a/src/get-path.c
+++ b/src/get-path.c
@@ -1,6 +1,6 @@
 /* get-path.c - Find a system path.
    Copyright (C) 2000-2002 G-N-U GmbH.
-   Copyright (C) 2005, 2008 g10 Code GmbH.
+   Copyright (C) 2005, 2008, 2013 g10 Code GmbH.
 
    This file is part of GPA.
 
@@ -23,7 +23,10 @@
 #endif
 
 #include <glib.h>
+#include <string.h>
+#include <gpgme.h>
 
+#include "gpa.h"
 #include "get-path.h"
 
 

@@ -31,7 +34,7 @@
 
 #include <unistd.h>
 
-#include <windows.h> 
+#include <windows.h>
 
 #include "w32reg.h"
 
@@ -55,7 +58,7 @@ w32_strerror (int w32_errno)
 {
   static char strerr[256];
   int ec = (int) GetLastError ();
-  
+
   if (w32_errno == 0)
     w32_errno = ec;
   FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, NULL, w32_errno,
@@ -103,7 +106,7 @@ dlclose (void *hd)
       return 0;
     }
   return -1;
-}  
+}
 
 
 static HRESULT
@@ -143,13 +146,83 @@ w32_shgetfolderpath (HWND a, int b, HANDLE c, DWORD d, LPSTR e)
 
 #endif	/* G_OS_WIN32 */
 
+
+
+
 

+struct homedir_from_gpgconf_s
+{
+  GMainLoop *loop;
+  char *homedir;
+};
+
+static gboolean
+homedir_from_gpgconf_parser (void *opaque, char *line)
+{
+  struct homedir_from_gpgconf_s *parm = opaque;
+  char *value, *p;
+
+  if (!line)
+    {
+      /* We are finished with the command.  Stop the loop.  */
+      g_main_loop_quit (parm->loop);
+      return FALSE; /* (The return code does not matter here.)  */
+    }
+
+  value = strchr (line, ':');
+  if (!value)
+    return TRUE; /* Invalid line - keep on running.  */;
+  *value++ = 0;
+  if (strcmp (line, "homedir"))
+    return TRUE; /* Not the right item - keep on running.  */
+
+  p = strchr (value, ':');
+  if (p)
+    *p = 0;
+  decode_percent_string (value);
+  parm->homedir = g_strdup (value);
+  return FALSE; /* Ready - force an EOF.  */
+}
+
+
+/* Retrieve the default home directory via gpgconf and return it as a
+   malloced string.  If this is not possible, return NULL.  */
+static char *
+homedir_from_gpgconf (void)
+{
+  struct homedir_from_gpgconf_s parm;
+
+  memset (&parm, 0, sizeof parm);
+
+  parm.loop = g_main_loop_new (NULL, TRUE);
+
+  if (gpa_start_simple_gpg_command
+      (homedir_from_gpgconf_parser, &parm,
+       GPGME_PROTOCOL_GPGCONF, 0, "--list-dirs", NULL))
+    {
+      g_main_loop_unref (parm.loop);
+      return NULL;
+    }
+
+  g_main_loop_run (parm.loop);
+  g_main_loop_unref (parm.loop);
+  return parm.homedir;
+}
+
+
 /* Get the path to the default home directory.  */
 gchar *
 default_homedir (void)
 {
   gchar *dir;
 
+  dir = homedir_from_gpgconf ();
+  if (dir)
+    {
+      g_debug ("Found homedir '%s' via gpgconf", dir);
+      return dir;
+    }
+
   /* g_getenv returns string in filename encoding.  */
   dir = (gchar *) g_getenv ("GNUPGHOME");
   if (dir && dir[0])
@@ -166,7 +239,7 @@ default_homedir (void)
 	  dir = NULL;
 	}
     }
-	
+
   if (! dir)
     {
       char path[MAX_PATH];
@@ -178,7 +251,7 @@ default_homedir (void)
          using a system roaming serives might be better than to let
          them do it manually.  A security conscious user will anyway
          use the registry entry to have better control.  */
-      if (w32_shgetfolderpath (NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE, 
+      if (w32_shgetfolderpath (NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE,
                                NULL, 0, path) >= 0)
         {
 	  dir = g_build_filename (path, "gnupg", NULL);
diff --git a/src/gpa.h b/src/gpa.h
index a20d704..a321698 100644
--- a/src/gpa.h
+++ b/src/gpa.h
@@ -131,6 +131,7 @@ char *decode_c_string (const char *src);
 char *percent_escape (const char *string,
                       const char *delimiters, int space2plus);
 size_t percent_unescape (char *string, int plus2space);
+void decode_percent_string (char *str);
 
 
 /*-- Convenience macros. -- */
diff --git a/src/gpgmetools.c b/src/gpgmetools.c
index 5d4beae..a6ff3d8 100644
--- a/src/gpgmetools.c
+++ b/src/gpgmetools.c
@@ -1435,20 +1435,21 @@ is_gpg_version_at_least (const char *need_version)
 }
 
 
-/* Structure used to communicate with gpg_simple_stderr_cb.  */
-struct gpg_simple_stderr_parm_s
+/* Structure used to communicate with gpg_simple_stdio_cb.  */
+struct gpg_simple_stdio_parm_s
 {
   gboolean (*cb)(void *opaque, char *line);
   void *cb_arg;
   GString *string;
+  int only_status_lines;
 };
 
 /* Helper for gpa_start_simple_gpg_command.  */
 static gboolean
-gpg_simple_stderr_cb (GIOChannel *channel, GIOCondition condition,
-                      void *user_data)
+gpg_simple_stdio_cb (GIOChannel *channel, GIOCondition condition,
+                     void *user_data)
 {
-  struct gpg_simple_stderr_parm_s *parm = user_data;
+  struct gpg_simple_stdio_parm_s *parm = user_data;
   GIOStatus status;
   char *line, *p;
 
@@ -1461,27 +1462,41 @@ gpg_simple_stderr_cb (GIOChannel *channel, GIOCondition condition,
         {
           line = parm->string->str;
 
+          /* Strip line terminator.  */
+          p = strchr (line, '\n');
+          if (p)
+            {
+              if (p > line && p[-1] == '\r')
+                p[-1] = 0;
+              else
+                *p = 0;
+            }
+
           /* We care only about status lines.  */
-          if (!strncmp (line, "[GNUPG:] ", 9))
+          if (parm->only_status_lines && !strncmp (line, "[GNUPG:] ", 9))
             {
               line += 9;
 
-              /* Strip line terminator.  */
-              p = strchr (line, '\n');
-              if (p)
+              /* Call user callback.  */
+              if (parm->cb && !parm->cb (parm->cb_arg, line))
                 {
-                  if (p > line && p[-1] == '\r')
-                    p[-1] = 0;
-                  else
-                    *p = 0;
+                  /* User requested EOF.  */
+                  goto cleanup;
                 }
-
+              /* Return direct so that we do not run into the G_IO_HUP
+                 check.  This is required to read all buffered input.  */
+              return TRUE;  /* Keep on watching this channel. */
+            }
+          else if (!parm->only_status_lines)
+            {
               /* Call user callback.  */
               if (parm->cb && !parm->cb (parm->cb_arg, line))
                 {
                   /* User requested EOF.  */
                   goto cleanup;
                 }
+
+              return TRUE;  /* Keep on watching this channel. */
             }
         }
       if (status != G_IO_STATUS_NORMAL && status != G_IO_STATUS_AGAIN )
@@ -1517,20 +1532,22 @@ gpg_simple_stderr_cb (GIOChannel *channel, GIOCondition condition,
    is used to call gpg-connect-agent.
 
    If the function returns success the provided callback CB is called
-   for each line received on STDERR.  EOF is send to this callback by
-   passing a LINE argument of NULL.  The callback may use this for
-   cleanup. If the callback returns FALSE, an EOF is forced with the
-   result that the callback is called once more with LINE set to NULL.  */
+   for each line received on stdout (respective stderr if USE_STADERR
+   is true).  EOF is send to this callback by passing a LINE as NULL.
+   The callback may use this for cleanup.  If the callback returns
+   FALSE, an EOF is forced so that the callback is called once more
+   with LINE set to NULL.  */
 gpg_error_t
 gpa_start_simple_gpg_command (gboolean (*cb)(void *opaque, char *line),
                               void *cb_arg, gpgme_protocol_t protocol,
+                              int use_stderr,
                               const char *first_arg, ...)
 {
   char *argv[24];
   int argc;
-  int fd_stderr;
+  int fd_stdio;
   GIOChannel *channel;
-  struct gpg_simple_stderr_parm_s *parm = NULL;
+  struct gpg_simple_stdio_parm_s *parm = NULL;
   char *freeme = NULL;
 
   if (protocol == GPGME_PROTOCOL_OpenPGP)
@@ -1571,11 +1588,17 @@ gpa_start_simple_gpg_command (gboolean (*cb)(void *opaque, char *line),
   parm->cb = cb;
   parm->cb_arg = cb_arg;
   parm->string = g_string_sized_new (200);
+  parm->only_status_lines = use_stderr;
 
   if (!g_spawn_async_with_pipes (NULL, argv, NULL,
-                                 (G_SPAWN_STDOUT_TO_DEV_NULL),
+                                 (use_stderr
+                                  ? G_SPAWN_STDOUT_TO_DEV_NULL
+                                  : G_SPAWN_STDERR_TO_DEV_NULL),
                                  NULL, NULL, NULL,
-                                 NULL, NULL, &fd_stderr, NULL))
+                                 NULL,
+                                 use_stderr? NULL : &fd_stdio,
+                                 use_stderr? &fd_stdio : NULL,
+                                 NULL))
     {
       gpa_window_error (_("Calling the crypto engine program failed."), NULL);
       xfree (parm);
@@ -1584,9 +1607,9 @@ gpa_start_simple_gpg_command (gboolean (*cb)(void *opaque, char *line),
     }
   g_free (freeme);
 #ifdef G_OS_WIN32
-  channel = g_io_channel_win32_new_fd (fd_stderr);
+  channel = g_io_channel_win32_new_fd (fd_stdio);
 #else
-  channel = g_io_channel_unix_new (fd_stderr);
+  channel = g_io_channel_unix_new (fd_stdio);
 #endif
   g_io_channel_set_encoding (channel, NULL, NULL);
   /* Note that we need a buffered channel, so that we can use the read
@@ -1595,7 +1618,7 @@ gpa_start_simple_gpg_command (gboolean (*cb)(void *opaque, char *line),
 
   /* Create a watch for the channel.  */
   if (!g_io_add_watch (channel, (G_IO_IN|G_IO_HUP),
-                       gpg_simple_stderr_cb, parm))
+                       gpg_simple_stdio_cb, parm))
     {
       g_debug ("error creating watch for gpg command");
       g_io_channel_unref (channel);
@@ -1613,7 +1636,7 @@ gpa_start_simple_gpg_command (gboolean (*cb)(void *opaque, char *line),
 void
 gpa_start_agent (void)
 {
-  gpa_start_simple_gpg_command (NULL, NULL, GPGME_PROTOCOL_ASSUAN,
+  gpa_start_simple_gpg_command (NULL, NULL, GPGME_PROTOCOL_ASSUAN, 1,
                                 "NOP", "/bye", NULL);
 }
 
diff --git a/src/gpgmetools.h b/src/gpgmetools.h
index 2953362..e8b2c34 100644
--- a/src/gpgmetools.h
+++ b/src/gpgmetools.h
@@ -209,6 +209,7 @@ gpg_error_t gpa_start_simple_gpg_command (gboolean (*cb)
                                           (void *opaque, char *line),
                                           void *cb_arg,
                                           gpgme_protocol_t protocol,
+                                          int use_stderr,
                                           const char *first_arg, ...
                                           ) G_GNUC_NULL_TERMINATED;
 
diff --git a/src/server.c b/src/server.c
index d220ccb..1ce9a89 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1255,53 +1255,6 @@ hextobyte (const char *str)
 }
 
 
-/* Decode the percent escaped string STR in place.  */
-static void
-decode_percent_string (char *str)
-{
-  char *src = str;
-  char *dest = str;
-
-  /* Convert the string.  */
-  while (*src)
-    {
-      if (*src != '%')
-        {
-          *(dest++) = *(src++);
-          continue;
-        }
-      else
-        {
-          int val = hextobyte (&src[1]);
-
-          if (val == -1)
-            {
-              /* Should not happen.  */
-              *(dest++) = *(src++);
-              if (*src)
-                *(dest++) = *(src++);
-              if (*src)
-                *(dest++) = *(src++);
-            }
-          else
-            {
-              if (!val)
-                {
-                  /* A binary zero is not representable in a C
-                     string.  */
-                  *(dest++) = '\\';
-                  *(dest++) = '0';
-                }
-              else
-                *((unsigned char *) dest++) = val;
-              src += 3;
-            }
-        }
-    }
-  *(dest++) = 0;
-}
-
-
 /* FILE <file> [--continued]
 
    Set the files on which to operate.
diff --git a/src/utils.c b/src/utils.c
index 1b8dbaa..0d3379f 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -65,7 +65,7 @@ xcalloc (size_t n, size_t m)
     memset (p, 0, nbytes);
   else
     {
-      g_error ("%s: failed to allocate %lu bytes", 
+      g_error ("%s: failed to allocate %lu bytes",
                G_STRLOC, (unsigned long)nbytes);
       abort (); /* Just in case g_error returns.  */
     }
@@ -97,7 +97,7 @@ translate_sys2libc_fd (assuan_fd_t fd, int for_write)
 
   if (fd == ASSUAN_INVALID_FD)
     return -1;
-  
+
   /* Note that _open_osfhandle is currently defined to take and return
      a long.  */
   x = _open_osfhandle ((long)fd, for_write ? 1 : 0);
@@ -111,15 +111,15 @@ translate_sys2libc_fd (assuan_fd_t fd, int for_write)
 
 
 #ifdef HAVE_W32_SYSTEM
-int 
+int
 inet_aton (const char *cp, struct in_addr *inp)
 {
   if (!cp || !*cp || !inp)
     {
       errno = EINVAL;
-      return 0; 
+      return 0;
     }
-  
+
   if (!strcmp(cp, "255.255.255.255"))
     {
       /*  Although this is a valid address, the old inet_addr function
@@ -127,7 +127,7 @@ inet_aton (const char *cp, struct in_addr *inp)
         inp->s_addr = INADDR_NONE;
         return 1;
     }
-  
+
   inp->s_addr = inet_addr (cp);
   return (inp->s_addr != INADDR_NONE);
 }
@@ -226,9 +226,9 @@ decode_c_string (const char *src)
 		       this will also never be larger than the source
 		       string.  */
 		    *(dest++) = '\\';
-		    *(dest++) = '0'; 
+		    *(dest++) = '0';
 		  }
-		else 
+		else
 		  *((unsigned char *) dest++) = val;
 		src += 4;
 	      }
@@ -322,7 +322,7 @@ percent_unescape (char *string, int plus2space)
   while (*string)
     {
       if (*string == '%' && string[1] && string[2])
-        { 
+        {
           string++;
           *p++ = xtoi_2 (string);
           n++;
@@ -345,3 +345,50 @@ percent_unescape (char *string, int plus2space)
 }
 
 
+/* Decode the percent escaped string STR in place.  In contrast to
+   percent_unescape, this make sure that the result is a string and in
+   addition escapes embedded nuls. */
+void
+decode_percent_string (char *str)
+{
+  char *src = str;
+  char *dest = str;
+
+  /* Convert the string.  */
+  while (*src)
+    {
+      if (*src != '%')
+        {
+          *(dest++) = *(src++);
+          continue;
+        }
+      else
+        {
+          int val = hextobyte (&src[1]);
+
+          if (val == -1)
+            {
+              /* Should not happen.  */
+              *(dest++) = *(src++);
+              if (*src)
+                *(dest++) = *(src++);
+              if (*src)
+                *(dest++) = *(src++);
+            }
+          else
+            {
+              if (!val)
+                {
+                  /* A binary zero is not representable in a C
+                     string.  */
+                  *(dest++) = '\\';
+                  *(dest++) = '0';
+                }
+              else
+                *((unsigned char *) dest++) = val;
+              src += 3;
+            }
+        }
+    }
+  *(dest++) = 0;
+}

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

Summary of changes:
 src/cm-netkey.c  |  132 +++++++++++++++++++++++++++---------------------------
 src/get-path.c   |   85 ++++++++++++++++++++++++++++++++---
 src/gpa.h        |    1 +
 src/gpgmetools.c |   75 ++++++++++++++++++++-----------
 src/gpgmetools.h |    1 +
 src/server.c     |   47 -------------------
 src/utils.c      |   65 +++++++++++++++++++++++----
 7 files changed, 252 insertions(+), 154 deletions(-)


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



From cvs at cvs.gnupg.org  Tue Aug 13 11:53:14 2013
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Tue, 13 Aug 2013 11:53:14 +0200
Subject: [git] GpgOL - branch, master, updated. gpgol-1.1.3-64-ge512053
Message-ID: <E1V9Aod-0000NU-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 "GnuPG extension for MS Outlook".

The branch, master has been updated
       via  e512053443e6f1d7fd2fa87d625535c95c9a400f (commit)
       via  7f11a04956e10e3c7e3742b852aa5d1b55962b8d (commit)
       via  b86f87156a46376272df9595fd0f38069a06af84 (commit)
       via  f95945400c04e54a5b7bc0bd83f12d38124431b9 (commit)
       via  4455aaf2f2274becf5746b38da0a4a0ffb88ce72 (commit)
      from  94e0c024ce44bb6a6c62647c806b55f4c26cf9a6 (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 e512053443e6f1d7fd2fa87d625535c95c9a400f
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Aug 13 09:23:41 2013 +0000

    Update translations
    
        * po/de.po: Update translated messages
        * po/pt.po, po/sv.po: Update autogenerated files.
        * src/gpgoladdin.cpp (getCustomUI): Minor message changes.

diff --git a/po/de.po b/po/de.po
index 58b2b8d..ad13f19 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GpgOL 1.0.0\n"
 "Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2013-07-15 08:09+0000\n"
+"POT-Creation-Date: 2013-08-13 09:16+0000\n"
 "PO-Revision-Date: 2009-06-18 19:18+0200\n"
 "Last-Translator: Werner Koch <wk at gnupg.org>\n"
 "Language-Team: de\n"
@@ -41,7 +41,7 @@ msgstr ""
 "um die gesamte Nachricht nochmal zu entschl??sseln.  Danach k??nnen\n"
 "Sie das Attachment wieder ??ffenen."
 
-#: src/common.c:232
+#: src/common.c:269
 msgid "GpgOL - Save attachment"
 msgstr "GpgOL - Anlage Speichern"
 
@@ -59,13 +59,15 @@ msgstr ""
 
 #: src/engine.c:395 src/engine.c:405 src/main.c:699 src/main.c:705
 #: src/message.cpp:303 src/explorers.cpp:204 src/explorers.cpp:209
-#: src/gpgoladdin.cpp:588 src/gpgoladdin.cpp:635 src/gpgoladdin.cpp:703
-#: src/gpgoladdin.cpp:705 src/ribbon-callbacks.cpp:132
-#: src/ribbon-callbacks.cpp:148 src/ribbon-callbacks.cpp:161
-#: src/ribbon-callbacks.cpp:192 src/ribbon-callbacks.cpp:234
-#: src/ribbon-callbacks.cpp:556 src/ribbon-callbacks.cpp:573
-#: src/ribbon-callbacks.cpp:587 src/ribbon-callbacks.cpp:600
-#: src/ribbon-callbacks.cpp:636
+#: src/gpgoladdin.cpp:663 src/gpgoladdin.cpp:740 src/gpgoladdin.cpp:745
+#: src/gpgoladdin.cpp:813 src/gpgoladdin.cpp:816 src/ribbon-callbacks.cpp:117
+#: src/ribbon-callbacks.cpp:231 src/ribbon-callbacks.cpp:246
+#: src/ribbon-callbacks.cpp:258 src/ribbon-callbacks.cpp:295
+#: src/ribbon-callbacks.cpp:307 src/ribbon-callbacks.cpp:632
+#: src/ribbon-callbacks.cpp:649 src/ribbon-callbacks.cpp:663
+#: src/ribbon-callbacks.cpp:676 src/ribbon-callbacks.cpp:726
+#: src/ribbon-callbacks.cpp:1002 src/ribbon-callbacks.cpp:1036
+#: src/ribbon-callbacks.cpp:1048 src/ribbon-callbacks.cpp:1073
 msgid "GpgOL"
 msgstr "GpgOL"
 
@@ -360,8 +362,8 @@ msgstr "Dateischreibfehler"
 msgid "I/O-Error"
 msgstr "Ein-/Ausgabefehler"
 
-#: src/olflange-dlgs.cpp:43 src/gpgoladdin.cpp:588 src/gpgoladdin.cpp:635
-#: src/gpgoladdin.cpp:703
+#: src/olflange-dlgs.cpp:43 src/gpgoladdin.cpp:663 src/gpgoladdin.cpp:740
+#: src/gpgoladdin.cpp:813
 msgid "General"
 msgstr "Allgemein"
 
@@ -429,7 +431,7 @@ msgstr ""
 msgid "This is GpgOL version %s"
 msgstr "Dies ist GpgOL Version %s"
 
-#: src/olflange.cpp:526
+#: src/olflange.cpp:527
 msgid "Welcome to GpgOL "
 msgstr "Willkommen zu GpgOL "
 
@@ -724,55 +726,158 @@ msgstr ""
 msgid "Do you want to revert this folder?"
 msgstr "M??chten Sie diesen Ordner von GpgOL befreien?"
 
-#: src/gpgoladdin.cpp:589 src/gpgoladdin.cpp:636 src/gpgoladdin.cpp:703
+#: src/gpgoladdin.cpp:541
+msgid "Start the Certificate Management Software"
+msgstr "Starten der Zertifikatsverwaltung"
+
+#: src/gpgoladdin.cpp:543
+msgid ""
+"Open GPA or Kleopatra to manage your certificates. You can use this you to "
+"generate your own certificates. "
+msgstr ""
+"??ffnet GPA oder Kleopatra um Zertifikate zu verwalten. Dies kann genutzt "
+"werden um eigene Zertifikate zu generieren."
+
+#: src/gpgoladdin.cpp:547
+msgid "Encrypt the text of the message"
+msgstr "Verschl??sselt den Text der Nachricht"
+
+#: src/gpgoladdin.cpp:549
+msgid ""
+"Choose the certificates for which the message should be encrypted and "
+"replace the text with the encrypted message."
+msgstr ""
+"Ausw??hlen der Empf??ngerzertifikate und ersetzen des Nachrichtentexts durch "
+"die verschl??sselte Nachricht."
+
+#: src/gpgoladdin.cpp:553
+msgid "Add a file as an encrypted attachment"
+msgstr "Hinzuf??gen einer Datei als verschl??sselter Anhang"
+
+#: src/gpgoladdin.cpp:555
+msgid "Encrypts a file and adds it as an attachment to the message. "
+msgstr "Verschl??sselt eine Datei und f??gt diese als Anhang hinzu"
+
+#: src/gpgoladdin.cpp:558
+msgid "Add a file as an encrypted attachment with a signature"
+msgstr "Hinzuf??gen einer Datei als verschl??sselter Anhang mit Signatur"
+
+#: src/gpgoladdin.cpp:560
+msgid ""
+"Encrypts a file, signs it and adds both the encrypted file and the signature "
+"as attachments to the message. "
+msgstr ""
+"Verschl??sselt eine Datei, signiert diese und f??gt die Signatur und die "
+"Verschl??sselte Datei als Anhang an."
+
+#: src/gpgoladdin.cpp:563
+msgid "Decrypt the message"
+msgstr "Entschl??sseln der Nachricht."
+
+#: src/gpgoladdin.cpp:565
+msgid ""
+"Look for PGP or S/MIME encrypted data in the message text and decrypt it."
+msgstr ""
+"Sucht nach PGP oder S/MIME verschl??sselten Daten im Nachrichtentext und "
+"entschl??sselt diese."
+
+#: src/gpgoladdin.cpp:568
+msgid "Add a signature of the message"
+msgstr "Hinzuf??gen einer Signierten Nachricht"
+
+#: src/gpgoladdin.cpp:570
+msgid ""
+"Appends a signed copy of the message text in an opaque signature. An opaque "
+"signature ensures that the signed text is not modified by embedding it in "
+"the signature itself. The combination of the signed message text and your "
+"signature is added below the plain text. The message will not be encrypted!"
+msgstr ""
+"F??gt eine signierte Kopie des Nachrichtentexts als opake Signatur an. Eine "
+"opake Signatur stellt sicher das der signierte Text nicht verf??lscht wird "
+"indem es den Text in die Signatur einbettet. Die Kombination aus Signatur "
+"und Nachricht wird unterhalb des Textes angef??gt. Die Nachricht wird "
+"hierdurch nicht verschl??sselt!"
+
+#: src/gpgoladdin.cpp:664 src/gpgoladdin.cpp:741 src/gpgoladdin.cpp:814
 msgid "Start Certificate Manager"
 msgstr "Zertifikatsverwaltung starten"
 
-#: src/gpgoladdin.cpp:590 src/gpgoladdin.cpp:637
+#: src/gpgoladdin.cpp:665 src/gpgoladdin.cpp:742
 msgid "Textbody"
 msgstr "Textk??rper"
 
-#: src/gpgoladdin.cpp:591 src/gpgoladdin.cpp:598
+#: src/gpgoladdin.cpp:666 src/gpgoladdin.cpp:673
 msgid "Encrypt"
 msgstr "Verschl??sseln"
 
-#: src/gpgoladdin.cpp:592 src/gpgoladdin.cpp:598 src/gpgoladdin.cpp:638
-#: src/gpgoladdin.cpp:639
+#: src/gpgoladdin.cpp:667 src/gpgoladdin.cpp:673 src/gpgoladdin.cpp:743
+#: src/gpgoladdin.cpp:746 src/gpgoladdin.cpp:747
 msgid "Decrypt"
 msgstr "Entschl??sseln"
 
-#: src/gpgoladdin.cpp:705 src/gpgoladdin.cpp:706
+#: src/gpgoladdin.cpp:668
+msgid "Sign"
+msgstr "Signieren"
+
+#: src/gpgoladdin.cpp:669 src/gpgoladdin.cpp:744
+msgid "Verify"
+msgstr "Signatur pr??fen"
+
+#: src/gpgoladdin.cpp:670
+msgid "Attachments"
+msgstr "Anh??nge"
+
+#: src/gpgoladdin.cpp:671
+msgid "Encrypted file"
+msgstr "Verschl??sselte Datei"
+
+#: src/gpgoladdin.cpp:672
+msgid "Encrypted file and Signature"
+msgstr "Verschl??sselte Datei mit Signatur"
+
+#: src/gpgoladdin.cpp:745 src/gpgoladdin.cpp:816 src/gpgoladdin.cpp:817
 msgid "Save and decrypt"
 msgstr "Speichern und Entschl??sseln"
 
-#: src/ribbon-callbacks.cpp:147
+#: src/ribbon-callbacks.cpp:245
 msgid "Please select text to encrypt."
 msgstr "Bitte selektieren Sie den zu verschl??sselnden Text."
 
-#: src/ribbon-callbacks.cpp:160
+#: src/ribbon-callbacks.cpp:257
 msgid "Textbody empty."
 msgstr "Textk??rper leer."
 
-#: src/ribbon-callbacks.cpp:191
+#: src/ribbon-callbacks.cpp:306 src/ribbon-callbacks.cpp:1001
 msgid "Please add at least one recipent."
 msgstr "Bitte f??gen Sie mindestens einen Empf??nger hinzu."
 
-#: src/ribbon-callbacks.cpp:572
+#: src/ribbon-callbacks.cpp:648
 msgid "Please select a Mail."
-msgstr "Bitte w??heln Sie eine Mail aus."
+msgstr "Bitte w??hlen Sie eine Mail aus."
 
-#: src/ribbon-callbacks.cpp:586
+#: src/ribbon-callbacks.cpp:662
 msgid "Please select the data you wish to decrypt."
 msgstr "Bitte selektieren Sie die zu entschl??sselnden Daten."
 
-#: src/ribbon-callbacks.cpp:599
+#: src/ribbon-callbacks.cpp:675
 msgid "Nothing to decrypt."
 msgstr "Nichts zu entschl??sseln."
 
-#: src/ribbon-callbacks.cpp:715
+#: src/ribbon-callbacks.cpp:821
 msgid "Plain text"
 msgstr "Klartext"
 
+#: src/ribbon-callbacks.cpp:822
+msgid "Signed text"
+msgstr "Signierter Text"
+
+#: src/ribbon-callbacks.cpp:1008
+msgid "Select file to encrypt"
+msgstr "Ausw??hlen der zu verschl??sselnden Datei"
+
+#~ msgid "Add a file and it's signature as an encrypted attachment"
+#~ msgstr "Hinzuf??gen einer Datei als verschl??sselter Anhang mit Signatur"
+
 #~ msgid ""
 #~ "Internal error in GpgOL.\n"
 #~ "Could not find all objects."
@@ -1028,9 +1133,6 @@ msgstr "Klartext"
 #~ "@LIST@\n"
 #~ "M??chten Sie diese entschl??sseln und abspeichern?"
 
-#~ msgid "Attachment Decryption"
-#~ msgstr "Entschl??sselung eines Anhangs"
-
 #~ msgid "Attachment Encryption Failure"
 #~ msgstr "Verschl??sselungsfehler eines Anhangs"
 
@@ -1061,9 +1163,6 @@ msgstr "Klartext"
 #~ msgid "GPG &sign message"
 #~ msgstr "Mit GPG unter&schreiben"
 
-#~ msgid "Decrypt and verify the message."
-#~ msgstr "Entschl??sseln und Pr??fen der Nachricht."
-
 #~ msgid "Open GPG Key Manager"
 #~ msgstr "Die GPG Schl??sselverwaltung ??ffnen"
 
diff --git a/po/pt.po b/po/pt.po
index cc5f5af..1d81748 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GpgOL 1.1.1\n"
 "Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2013-07-15 08:09+0000\n"
+"POT-Creation-Date: 2013-08-13 09:16+0000\n"
 "PO-Revision-Date: 2010-07-18 20:41-0000\n"
 "Last-Translator: Marco A.G.Pinto <marcoagpinto at mail.telepac.pt>\n"
 "Language-Team: Portuguese <marcoagpinto at mail.telepac.pt>\n"
@@ -43,7 +43,7 @@ msgstr ""
 "Por favor usa o bot?o Desencriptar/Verificar para desencriptar\n"
 "a mensagem completa novamente. Depois abre este anexo."
 
-#: src/common.c:232
+#: src/common.c:269
 #, fuzzy
 msgid "GpgOL - Save attachment"
 msgstr "GpgOL - Gravar anexo desencriptado"
@@ -62,13 +62,15 @@ msgstr ""
 
 #: src/engine.c:395 src/engine.c:405 src/main.c:699 src/main.c:705
 #: src/message.cpp:303 src/explorers.cpp:204 src/explorers.cpp:209
-#: src/gpgoladdin.cpp:588 src/gpgoladdin.cpp:635 src/gpgoladdin.cpp:703
-#: src/gpgoladdin.cpp:705 src/ribbon-callbacks.cpp:132
-#: src/ribbon-callbacks.cpp:148 src/ribbon-callbacks.cpp:161
-#: src/ribbon-callbacks.cpp:192 src/ribbon-callbacks.cpp:234
-#: src/ribbon-callbacks.cpp:556 src/ribbon-callbacks.cpp:573
-#: src/ribbon-callbacks.cpp:587 src/ribbon-callbacks.cpp:600
-#: src/ribbon-callbacks.cpp:636
+#: src/gpgoladdin.cpp:663 src/gpgoladdin.cpp:740 src/gpgoladdin.cpp:745
+#: src/gpgoladdin.cpp:813 src/gpgoladdin.cpp:816 src/ribbon-callbacks.cpp:117
+#: src/ribbon-callbacks.cpp:231 src/ribbon-callbacks.cpp:246
+#: src/ribbon-callbacks.cpp:258 src/ribbon-callbacks.cpp:295
+#: src/ribbon-callbacks.cpp:307 src/ribbon-callbacks.cpp:632
+#: src/ribbon-callbacks.cpp:649 src/ribbon-callbacks.cpp:663
+#: src/ribbon-callbacks.cpp:676 src/ribbon-callbacks.cpp:726
+#: src/ribbon-callbacks.cpp:1002 src/ribbon-callbacks.cpp:1036
+#: src/ribbon-callbacks.cpp:1048 src/ribbon-callbacks.cpp:1073
 msgid "GpgOL"
 msgstr "GpgOL"
 
@@ -346,8 +348,8 @@ msgstr "Erro ao escrever no stream"
 msgid "I/O-Error"
 msgstr "I/O-Erro"
 
-#: src/olflange-dlgs.cpp:43 src/gpgoladdin.cpp:588 src/gpgoladdin.cpp:635
-#: src/gpgoladdin.cpp:703
+#: src/olflange-dlgs.cpp:43 src/gpgoladdin.cpp:663 src/gpgoladdin.cpp:740
+#: src/gpgoladdin.cpp:813
 msgid "General"
 msgstr "Geral"
 
@@ -410,7 +412,7 @@ msgstr ""
 msgid "This is GpgOL version %s"
 msgstr "Esta ? a vers?o do GpgOL %s"
 
-#: src/olflange.cpp:526
+#: src/olflange.cpp:527
 msgid "Welcome to GpgOL "
 msgstr ""
 
@@ -707,62 +709,158 @@ msgstr ""
 msgid "Do you want to revert this folder?"
 msgstr "Queres reverter esta pasta?"
 
-#: src/gpgoladdin.cpp:589 src/gpgoladdin.cpp:636 src/gpgoladdin.cpp:703
+#: src/gpgoladdin.cpp:541
+#, fuzzy
+msgid "Start the Certificate Management Software"
+msgstr "GnuPG Zertifikats&verwaltung"
+
+#: src/gpgoladdin.cpp:543
+msgid ""
+"Open GPA or Kleopatra to manage your certificates. You can use this you to "
+"generate your own certificates. "
+msgstr ""
+
+#: src/gpgoladdin.cpp:547
+#, fuzzy
+msgid "Encrypt the text of the message"
+msgstr "Entschl?sseln und Pr?fen der Nachricht."
+
+#: src/gpgoladdin.cpp:549
+msgid ""
+"Choose the certificates for which the message should be encrypted and "
+"replace the text with the encrypted message."
+msgstr ""
+
+#: src/gpgoladdin.cpp:553
+#, fuzzy
+msgid "Add a file as an encrypted attachment"
+msgstr "Apresentar mensagem encriptada como anexo"
+
+#: src/gpgoladdin.cpp:555
+msgid "Encrypts a file and adds it as an attachment to the message. "
+msgstr ""
+
+#: src/gpgoladdin.cpp:558
+#, fuzzy
+msgid "Add a file as an encrypted attachment with a signature"
+msgstr "Apresentar mensagem encriptada como anexo"
+
+#: src/gpgoladdin.cpp:560
+msgid ""
+"Encrypts a file, signs it and adds both the encrypted file and the signature "
+"as attachments to the message. "
+msgstr ""
+
+#: src/gpgoladdin.cpp:563
+#, fuzzy
+msgid "Decrypt the message"
+msgstr "Entschl?sseln und Pr?fen der Nachricht."
+
+#: src/gpgoladdin.cpp:565
+msgid ""
+"Look for PGP or S/MIME encrypted data in the message text and decrypt it."
+msgstr ""
+
+#: src/gpgoladdin.cpp:568
+#, fuzzy
+msgid "Add a signature of the message"
+msgstr "Entschl?sseln und Pr?fen der Nachricht."
+
+#: src/gpgoladdin.cpp:570
+msgid ""
+"Appends a signed copy of the message text in an opaque signature. An opaque "
+"signature ensures that the signed text is not modified by embedding it in "
+"the signature itself. The combination of the signed message text and your "
+"signature is added below the plain text. The message will not be encrypted!"
+msgstr ""
+
+#: src/gpgoladdin.cpp:664 src/gpgoladdin.cpp:741 src/gpgoladdin.cpp:814
 #, fuzzy
 msgid "Start Certificate Manager"
 msgstr "GnuPG Zertifikats&verwaltung"
 
-#: src/gpgoladdin.cpp:590 src/gpgoladdin.cpp:637
+#: src/gpgoladdin.cpp:665 src/gpgoladdin.cpp:742
 msgid "Textbody"
 msgstr ""
 
-#: src/gpgoladdin.cpp:591 src/gpgoladdin.cpp:598
+#: src/gpgoladdin.cpp:666 src/gpgoladdin.cpp:673
 #, fuzzy
 msgid "Encrypt"
 msgstr "Encripta??o"
 
-#: src/gpgoladdin.cpp:592 src/gpgoladdin.cpp:598 src/gpgoladdin.cpp:638
-#: src/gpgoladdin.cpp:639
+#: src/gpgoladdin.cpp:667 src/gpgoladdin.cpp:673 src/gpgoladdin.cpp:743
+#: src/gpgoladdin.cpp:746 src/gpgoladdin.cpp:747
 #, fuzzy
 msgid "Decrypt"
 msgstr "Entschl?sselung"
 
-#: src/gpgoladdin.cpp:705 src/gpgoladdin.cpp:706
+#: src/gpgoladdin.cpp:668
+msgid "Sign"
+msgstr ""
+
+#: src/gpgoladdin.cpp:669 src/gpgoladdin.cpp:744
+msgid "Verify"
+msgstr ""
+
+#: src/gpgoladdin.cpp:670
+#, fuzzy
+msgid "Attachments"
+msgstr "Entschl?sselung eines Anhangs"
+
+#: src/gpgoladdin.cpp:671
+#, fuzzy
+msgid "Encrypted file"
+msgstr "Encripta??o"
+
+#: src/gpgoladdin.cpp:672
+msgid "Encrypted file and Signature"
+msgstr ""
+
+#: src/gpgoladdin.cpp:745 src/gpgoladdin.cpp:816 src/gpgoladdin.cpp:817
 msgid "Save and decrypt"
 msgstr ""
 
-#: src/ribbon-callbacks.cpp:147
+#: src/ribbon-callbacks.cpp:245
 #, fuzzy
 msgid "Please select text to encrypt."
 msgstr "Por favor selecciona pelo menos um certificado de destinat?rio."
 
-#: src/ribbon-callbacks.cpp:160
+#: src/ribbon-callbacks.cpp:257
 msgid "Textbody empty."
 msgstr ""
 
-#: src/ribbon-callbacks.cpp:191
+#: src/ribbon-callbacks.cpp:306 src/ribbon-callbacks.cpp:1001
 #, fuzzy
 msgid "Please add at least one recipent."
 msgstr "Por favor selecciona pelo menos um certificado de destinat?rio."
 
-#: src/ribbon-callbacks.cpp:572
+#: src/ribbon-callbacks.cpp:648
 #, fuzzy
 msgid "Please select a Mail."
 msgstr "Por favor selecciona pelo menos um certificado de destinat?rio."
 
-#: src/ribbon-callbacks.cpp:586
+#: src/ribbon-callbacks.cpp:662
 #, fuzzy
 msgid "Please select the data you wish to decrypt."
 msgstr "Por favor selecciona pelo menos um certificado de destinat?rio."
 
-#: src/ribbon-callbacks.cpp:599
+#: src/ribbon-callbacks.cpp:675
 msgid "Nothing to decrypt."
 msgstr ""
 
-#: src/ribbon-callbacks.cpp:715
+#: src/ribbon-callbacks.cpp:821
 msgid "Plain text"
 msgstr ""
 
+#: src/ribbon-callbacks.cpp:822
+msgid "Signed text"
+msgstr ""
+
+#: src/ribbon-callbacks.cpp:1008
+#, fuzzy
+msgid "Select file to encrypt"
+msgstr "Por favor selecciona pelo menos um certificado de destinat?rio."
+
 #, fuzzy
 #~ msgid "Decrypt Selection"
 #~ msgstr "Entschl?sselung"
@@ -1008,9 +1106,6 @@ msgstr ""
 #~ "@LIST@\n"
 #~ "M?chten Sie diese entschl?sseln und abspeichern?"
 
-#~ msgid "Attachment Decryption"
-#~ msgstr "Entschl?sselung eines Anhangs"
-
 #~ msgid "Attachment Encryption Failure"
 #~ msgstr "Verschl?sselungsfehler eines Anhangs"
 
@@ -1041,9 +1136,6 @@ msgstr ""
 #~ msgid "GPG &sign message"
 #~ msgstr "Mit GPG unter&schreiben"
 
-#~ msgid "Decrypt and verify the message."
-#~ msgstr "Entschl?sseln und Pr?fen der Nachricht."
-
 #~ msgid "Open GPG Key Manager"
 #~ msgstr "Die GPG Schl?sselverwaltung ?ffnen"
 
diff --git a/po/sv.po b/po/sv.po
index 5f5c367..9a7c5a2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GPGol\n"
 "Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2013-07-15 08:09+0000\n"
+"POT-Creation-Date: 2013-08-13 09:16+0000\n"
 "PO-Revision-Date: 2006-12-12 23:52+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -40,7 +40,7 @@ msgid ""
 "entire message again.  Then open this attachment."
 msgstr ""
 
-#: src/common.c:232
+#: src/common.c:269
 #, fuzzy
 msgid "GpgOL - Save attachment"
 msgstr "GPG - Spara dekrypterad bilaga"
@@ -57,13 +57,15 @@ msgstr ""
 
 #: src/engine.c:395 src/engine.c:405 src/main.c:699 src/main.c:705
 #: src/message.cpp:303 src/explorers.cpp:204 src/explorers.cpp:209
-#: src/gpgoladdin.cpp:588 src/gpgoladdin.cpp:635 src/gpgoladdin.cpp:703
-#: src/gpgoladdin.cpp:705 src/ribbon-callbacks.cpp:132
-#: src/ribbon-callbacks.cpp:148 src/ribbon-callbacks.cpp:161
-#: src/ribbon-callbacks.cpp:192 src/ribbon-callbacks.cpp:234
-#: src/ribbon-callbacks.cpp:556 src/ribbon-callbacks.cpp:573
-#: src/ribbon-callbacks.cpp:587 src/ribbon-callbacks.cpp:600
-#: src/ribbon-callbacks.cpp:636
+#: src/gpgoladdin.cpp:663 src/gpgoladdin.cpp:740 src/gpgoladdin.cpp:745
+#: src/gpgoladdin.cpp:813 src/gpgoladdin.cpp:816 src/ribbon-callbacks.cpp:117
+#: src/ribbon-callbacks.cpp:231 src/ribbon-callbacks.cpp:246
+#: src/ribbon-callbacks.cpp:258 src/ribbon-callbacks.cpp:295
+#: src/ribbon-callbacks.cpp:307 src/ribbon-callbacks.cpp:632
+#: src/ribbon-callbacks.cpp:649 src/ribbon-callbacks.cpp:663
+#: src/ribbon-callbacks.cpp:676 src/ribbon-callbacks.cpp:726
+#: src/ribbon-callbacks.cpp:1002 src/ribbon-callbacks.cpp:1036
+#: src/ribbon-callbacks.cpp:1048 src/ribbon-callbacks.cpp:1073
 msgid "GpgOL"
 msgstr ""
 
@@ -328,8 +330,8 @@ msgstr "Fel vid skrivning av fil"
 msgid "I/O-Error"
 msgstr "In-/Ut-fel"
 
-#: src/olflange-dlgs.cpp:43 src/gpgoladdin.cpp:588 src/gpgoladdin.cpp:635
-#: src/gpgoladdin.cpp:703
+#: src/olflange-dlgs.cpp:43 src/gpgoladdin.cpp:663 src/gpgoladdin.cpp:740
+#: src/gpgoladdin.cpp:813
 msgid "General"
 msgstr ""
 
@@ -376,7 +378,7 @@ msgstr ""
 msgid "This is GpgOL version %s"
 msgstr ""
 
-#: src/olflange.cpp:526
+#: src/olflange.cpp:527
 msgid "Welcome to GpgOL "
 msgstr ""
 
@@ -648,62 +650,156 @@ msgstr ""
 msgid "Do you want to revert this folder?"
 msgstr ""
 
-#: src/gpgoladdin.cpp:589 src/gpgoladdin.cpp:636 src/gpgoladdin.cpp:703
+#: src/gpgoladdin.cpp:541
+#, fuzzy
+msgid "Start the Certificate Management Software"
+msgstr "GPG-nyckel&hanterare"
+
+#: src/gpgoladdin.cpp:543
+msgid ""
+"Open GPA or Kleopatra to manage your certificates. You can use this you to "
+"generate your own certificates. "
+msgstr ""
+
+#: src/gpgoladdin.cpp:547
+#, fuzzy
+msgid "Encrypt the text of the message"
+msgstr "Dekryptera och validera meddelandet."
+
+#: src/gpgoladdin.cpp:549
+msgid ""
+"Choose the certificates for which the message should be encrypted and "
+"replace the text with the encrypted message."
+msgstr ""
+
+#: src/gpgoladdin.cpp:553
+msgid "Add a file as an encrypted attachment"
+msgstr ""
+
+#: src/gpgoladdin.cpp:555
+msgid "Encrypts a file and adds it as an attachment to the message. "
+msgstr ""
+
+#: src/gpgoladdin.cpp:558
+msgid "Add a file as an encrypted attachment with a signature"
+msgstr ""
+
+#: src/gpgoladdin.cpp:560
+msgid ""
+"Encrypts a file, signs it and adds both the encrypted file and the signature "
+"as attachments to the message. "
+msgstr ""
+
+#: src/gpgoladdin.cpp:563
+#, fuzzy
+msgid "Decrypt the message"
+msgstr "Dekryptera och validera meddelandet."
+
+#: src/gpgoladdin.cpp:565
+msgid ""
+"Look for PGP or S/MIME encrypted data in the message text and decrypt it."
+msgstr ""
+
+#: src/gpgoladdin.cpp:568
+#, fuzzy
+msgid "Add a signature of the message"
+msgstr "Dekryptera och validera meddelandet."
+
+#: src/gpgoladdin.cpp:570
+msgid ""
+"Appends a signed copy of the message text in an opaque signature. An opaque "
+"signature ensures that the signed text is not modified by embedding it in "
+"the signature itself. The combination of the signed message text and your "
+"signature is added below the plain text. The message will not be encrypted!"
+msgstr ""
+
+#: src/gpgoladdin.cpp:664 src/gpgoladdin.cpp:741 src/gpgoladdin.cpp:814
 #, fuzzy
 msgid "Start Certificate Manager"
 msgstr "GPG-nyckel&hanterare"
 
-#: src/gpgoladdin.cpp:590 src/gpgoladdin.cpp:637
+#: src/gpgoladdin.cpp:665 src/gpgoladdin.cpp:742
 msgid "Textbody"
 msgstr ""
 
-#: src/gpgoladdin.cpp:591 src/gpgoladdin.cpp:598
+#: src/gpgoladdin.cpp:666 src/gpgoladdin.cpp:673
 #, fuzzy
 msgid "Encrypt"
 msgstr "Kryptering"
 
-#: src/gpgoladdin.cpp:592 src/gpgoladdin.cpp:598 src/gpgoladdin.cpp:638
-#: src/gpgoladdin.cpp:639
+#: src/gpgoladdin.cpp:667 src/gpgoladdin.cpp:673 src/gpgoladdin.cpp:743
+#: src/gpgoladdin.cpp:746 src/gpgoladdin.cpp:747
 #, fuzzy
 msgid "Decrypt"
 msgstr "Dekryptering"
 
-#: src/gpgoladdin.cpp:705 src/gpgoladdin.cpp:706
+#: src/gpgoladdin.cpp:668
+msgid "Sign"
+msgstr ""
+
+#: src/gpgoladdin.cpp:669 src/gpgoladdin.cpp:744
+msgid "Verify"
+msgstr ""
+
+#: src/gpgoladdin.cpp:670
+#, fuzzy
+msgid "Attachments"
+msgstr "Dekryptering av bilaga"
+
+#: src/gpgoladdin.cpp:671
+#, fuzzy
+msgid "Encrypted file"
+msgstr "Kryptering"
+
+#: src/gpgoladdin.cpp:672
+msgid "Encrypted file and Signature"
+msgstr ""
+
+#: src/gpgoladdin.cpp:745 src/gpgoladdin.cpp:816 src/gpgoladdin.cpp:817
 msgid "Save and decrypt"
 msgstr ""
 
-#: src/ribbon-callbacks.cpp:147
+#: src/ribbon-callbacks.cpp:245
 #, fuzzy
 msgid "Please select text to encrypt."
 msgstr "V??lj ??tminstone en mottagarnyckel."
 
-#: src/ribbon-callbacks.cpp:160
+#: src/ribbon-callbacks.cpp:257
 msgid "Textbody empty."
 msgstr ""
 
-#: src/ribbon-callbacks.cpp:191
+#: src/ribbon-callbacks.cpp:306 src/ribbon-callbacks.cpp:1001
 #, fuzzy
 msgid "Please add at least one recipent."
 msgstr "V??lj ??tminstone en mottagarnyckel."
 
-#: src/ribbon-callbacks.cpp:572
+#: src/ribbon-callbacks.cpp:648
 #, fuzzy
 msgid "Please select a Mail."
 msgstr "V??lj ??tminstone en mottagarnyckel."
 
-#: src/ribbon-callbacks.cpp:586
+#: src/ribbon-callbacks.cpp:662
 #, fuzzy
 msgid "Please select the data you wish to decrypt."
 msgstr "V??lj ??tminstone en mottagarnyckel."
 
-#: src/ribbon-callbacks.cpp:599
+#: src/ribbon-callbacks.cpp:675
 msgid "Nothing to decrypt."
 msgstr ""
 
-#: src/ribbon-callbacks.cpp:715
+#: src/ribbon-callbacks.cpp:821
 msgid "Plain text"
 msgstr ""
 
+#: src/ribbon-callbacks.cpp:822
+msgid "Signed text"
+msgstr ""
+
+#: src/ribbon-callbacks.cpp:1008
+#, fuzzy
+msgid "Select file to encrypt"
+msgstr "V??lj ??tminstone en mottagarnyckel."
+
 #, fuzzy
 #~ msgid "Decrypt Selection"
 #~ msgstr "Dekryptering"
@@ -862,9 +958,6 @@ msgstr ""
 #~ "@LIST@\n"
 #~ "Vill du dekryptera och spara dem?"
 
-#~ msgid "Attachment Decryption"
-#~ msgstr "Dekryptering av bilaga"
-
 #~ msgid "Attachment Encryption Failure"
 #~ msgstr "Kryptering av bilaga misslyckades"
 
@@ -892,8 +985,5 @@ msgstr ""
 #~ msgid "GPG &sign message"
 #~ msgstr "GPG-&signera meddelandet"
 
-#~ msgid "Decrypt and verify the message."
-#~ msgstr "Dekryptera och validera meddelandet."
-
 #~ msgid "Open GPG Key Manager"
 #~ msgstr "??ppna GPG-nyckelhanteraren"
diff --git a/src/gpgoladdin.cpp b/src/gpgoladdin.cpp
index c25e246..e24fe85 100644
--- a/src/gpgoladdin.cpp
+++ b/src/gpgoladdin.cpp
@@ -555,7 +555,7 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
     _("Encrypts a file and adds it as an attachment to the "
       "message. ");
   const char *encryptSignFileTTip =
-    _("Add a file and it's signature as an encrypted attachment");
+    _("Add a file as an encrypted attachment with a signature");
   const char *encryptSignFileSTip =
     _("Encrypts a file, signs it and adds both the encrypted file "
       "and the signature as attachments to the message. ");
@@ -565,9 +565,9 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
     _("Look for PGP or S/MIME encrypted data in the message text "
       "and decrypt it.");
   const char *signTextTTip =
-    _("Add a signature with the embedded message");
+    _("Add a signature of the message");
   const char *signTextSTip =
-    _("Append a signed copy of the message text in an opaque signature. "
+    _("Appends a signed copy of the message text in an opaque signature. "
       "An opaque signature ensures that the signed text is not modified by "
       "embedding it in the signature itself. "
       "The combination of the signed message text and your signature is "

commit 7f11a04956e10e3c7e3742b852aa5d1b55962b8d
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Aug 13 09:00:26 2013 +0000

    Ensure sender address for verify
    
        If the message has not been sent use the current sender
        address for verification.
    
        * src/ribbon-callbacks.cpp (do_reader_action): Check
        for sender address if message was not sent before.

diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index 22f8e3b..987e46d 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -682,7 +682,18 @@ do_reader_action (LPDISPATCH ctrl, int flags)
   fix_linebreaks (encData, &encDataLen);
 
   subject = get_oom_string (mailItem, "Subject");
-  senderAddr = get_oom_string (mailItem, "SenderEmailAddress");
+  if (get_oom_bool (mailItem, "Sent"))
+    {
+      senderAddr = get_oom_string (mailItem, "SenderEmailAddress");
+    }
+  else
+    {
+      /* If the message has not been sent we might be composing
+         in this case use the current address */
+      LPDISPATCH sender = get_oom_object (mailItem, "Session.CurrentUser");
+      senderAddr = get_oom_string (sender, "Address");
+      RELDISP (sender);
+    }
 
   /* Determine the protocol based on the content */
   protocol = is_cms_data (encData, encDataLen) ? PROTOCOL_SMIME :

commit b86f87156a46376272df9595fd0f38069a06af84
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Aug 13 08:59:31 2013 +0000

    Append signature after the message text
    
        Do not replace the text anymore but add the signature below.
    
        * src/ribbon-callbacks.cpp (do_composer_action): Append
        signature to body.

diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index 8fe2715..22f8e3b 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -403,8 +403,22 @@ do_composer_action (LPDISPATCH ctrl, int flags)
       }
     if (strlen (buffer) > 1)
       {
-        /* Now replace the selection with the encrypted text */
-        if (protocol == PROTOCOL_SMIME)
+        if (flags & OP_SIGN)
+          {
+            /* When signing we append the signature after the body */
+            unsigned int combinedSize = strlen (buffer) +
+              strlen (plaintext) + 5;
+            char combinedBody[combinedSize];
+            memset (combinedBody, 0, combinedSize);
+            snprintf (combinedBody, combinedSize, "%s\r\n\r\n%s", plaintext,
+                      buffer);
+            if (flags & DATA_SELECTION)
+              put_oom_string (selection, "Text", combinedBody);
+            else if (flags & DATA_BODY)
+              put_oom_string (mailItem, "Body", combinedBody);
+
+          }
+        else if (protocol == PROTOCOL_SMIME)
           {
             unsigned int enclosedSize = strlen (buffer) + 34 + 31 + 1;
             char enclosedData[enclosedSize];

commit f95945400c04e54a5b7bc0bd83f12d38124431b9
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Aug 13 08:57:22 2013 +0000

    Add ui for verify in composer and Tooltips
    
        * src/gpgoladdin.cpp (getCustomUI): Use tooltips and supertips
        to explain some more whats happening.
        (getCustomUI): Add verify action to the reader

diff --git a/src/gpgoladdin.cpp b/src/gpgoladdin.cpp
index 4bb6e22..c25e246 100644
--- a/src/gpgoladdin.cpp
+++ b/src/gpgoladdin.cpp
@@ -536,7 +536,43 @@ GpgolRibbonExtender::Invoke (DISPID dispid, REFIID riid, LCID lcid,
 STDMETHODIMP
 GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
 {
-  wchar_t buffer[4096];
+  wchar_t buffer[8192];
+  const char *certManagerTTip =
+    _("Start the Certificate Management Software");
+  const char *certManagerSTip =
+    _("Open GPA or Kleopatra to manage your certificates. "
+      "You can use this you to generate your "
+      "own certificates. ");
+  const char *encryptTextTTip =
+    _("Encrypt the text of the message");
+  const char *encryptTextSTip =
+    _("Choose the certificates for which the message "
+      "should be encrypted and replace the text "
+      "with the encrypted message.");
+  const char *encryptFileTTip =
+    _("Add a file as an encrypted attachment");
+  const char *encryptFileSTip =
+    _("Encrypts a file and adds it as an attachment to the "
+      "message. ");
+  const char *encryptSignFileTTip =
+    _("Add a file and it's signature as an encrypted attachment");
+  const char *encryptSignFileSTip =
+    _("Encrypts a file, signs it and adds both the encrypted file "
+      "and the signature as attachments to the message. ");
+  const char *decryptTextTTip=
+    _("Decrypt the message");
+  const char *decryptTextSTip =
+    _("Look for PGP or S/MIME encrypted data in the message text "
+      "and decrypt it.");
+  const char *signTextTTip =
+    _("Add a signature with the embedded message");
+  const char *signTextSTip =
+    _("Append a signed copy of the message text in an opaque signature. "
+      "An opaque signature ensures that the signed text is not modified by "
+      "embedding it in the signature itself. "
+      "The combination of the signed message text and your signature is "
+      "added below the plain text. "
+      "The message will not be encrypted!");
 
   memset(buffer, 0, sizeof buffer);
 
@@ -559,6 +595,8 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
         L"               getImage=\"btnCertManager\""
         L"               size=\"large\""
         L"               label=\"%S\""
+        L"               screentip=\"%S\""
+        L"               supertip=\"%S\""
         L"               onAction=\"startCertManager\"/>"
         L"     </group>"
         L"     <group id=\"textGroup\""
@@ -567,17 +605,28 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
         L"               getImage=\"btnEncryptLarge\""
         L"               size=\"large\""
         L"               label=\"%S\""
+        L"               screentip=\"%S\""
+        L"               supertip=\"%S\""
         L"               onAction=\"encryptBody\"/>"
         L"       <button id=\"fullTextDecrypt\""
         L"               getImage=\"btnDecryptLarge\""
         L"               size=\"large\""
         L"               label=\"%S\""
+        L"               screentip=\"%S\""
+        L"               supertip=\"%S\""
         L"               onAction=\"decryptBody\"/>"
         L"       <button id=\"fullTextSign\""
         L"               getImage=\"btnSignLarge\""
         L"               size=\"large\""
         L"               label=\"%S\""
+        L"               screentip=\"%S\""
+        L"               supertip=\"%S\""
         L"               onAction=\"signBody\"/>"
+        L"       <button id=\"fullTextVerify\""
+        L"               getImage=\"btnVerifyLarge\""
+        L"               size=\"large\""
+        L"               label=\"%S\""
+        L"               onAction=\"verifyBody\"/>"
         L"     </group>"
         L"     <group id=\"attachmentGroup\""
         L"            label=\"%S\">"
@@ -585,11 +634,15 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
         L"               getImage=\"btnEncryptLarge\""
         L"               size=\"large\""
         L"               label=\"%S\""
+        L"               screentip=\"%S\""
+        L"               supertip=\"%S\""
         L"               onAction=\"addEncAttachment\"/>"
         L"       <button id=\"encryptSignFile\""
         L"               getImage=\"btnEncryptFileLarge\""
         L"               size=\"large\""
         L"               label=\"%S\""
+        L"               screentip=\"%S\""
+        L"               supertip=\"%S\""
         L"               onAction=\"addEncSignedAttachment\"/>"
         L"     </group>"
         L"    </tab>"
@@ -608,14 +661,15 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
         L" </contextMenu>"
         L"</contextMenus>"
         L"</customUI>", _("GpgOL"), _("General"),
-        _("Start Certificate Manager"),
+        _("Start Certificate Manager"), certManagerTTip, certManagerSTip,
         _("Textbody"),
-        _("Encrypt"),
-        _("Decrypt"),
-        _("Sign"),
+        _("Encrypt"), encryptTextTTip, encryptTextSTip,
+        _("Decrypt"), decryptTextTTip, decryptTextSTip,
+        _("Sign"), signTextTTip, signTextSTip,
+        _("Verify"),
         _("Attachments"),
-        _("Encrypted file"),
-        _("Encrypted file and Signature"),
+        _("Encrypted file"), encryptFileTTip, encryptFileSTip,
+        _("Encrypted file and Signature"), encryptSignFileTTip, encryptSignFileSTip,
         _("Encrypt"), _("Decrypt")
         );
     }
@@ -633,6 +687,8 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
         L"               getImage=\"btnCertManager\""
         L"               size=\"large\""
         L"               label=\"%S\""
+        L"               screentip=\"%S\""
+        L"               supertip=\"%S\""
         L"               onAction=\"startCertManager\"/>"
         L"     </group>"
         L"     <group id=\"textGroup\""
@@ -641,6 +697,8 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
         L"               getImage=\"btnDecryptLarge\""
         L"               size=\"large\""
         L"               label=\"%S\""
+        L"               screentip=\"%S\""
+        L"               supertip=\"%S\""
         L"               onAction=\"decryptBody\"/>"
         L"       <button id=\"fullTextVerify\""
         L"               getImage=\"btnVerifyLarge\""
@@ -679,8 +737,10 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
         L" </contextMenu>"
         L"</contextMenus>"
         L"</customUI>",
-        _("GpgOL"), _("General"), _("Start Certificate Manager"),
-        _("Textbody"), _("Decrypt"),
+        _("GpgOL"), _("General"),
+        _("Start Certificate Manager"), certManagerTTip, certManagerSTip,
+        _("Textbody"),
+        _("Decrypt"), decryptTextTTip, decryptTextSTip,
         _("Verify"),
         _("GpgOL"), _("Save and decrypt"),
         _("Decrypt"),
@@ -700,6 +760,8 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
         L"               getImage=\"btnCertManager\""
         L"               size=\"large\""
         L"               label=\"%S\""
+        L"               screentip=\"%S\""
+        L"               supertip=\"%S\""
         L"               onAction=\"startCertManager\"/>"
         L"     </group>"
         /* This would be totally nice but Outlook
@@ -748,7 +810,8 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
         L" </contextMenu>"
         L" </contextMenus>"
         L"</customUI>",
-        _("GpgOL"), _("General"), _("Start Certificate Manager"),
+        _("GpgOL"), _("General"),
+        _("Start Certificate Manager"), certManagerTTip, certManagerSTip,
         /*_("Mail Body"), _("Decrypt"),*/
         _("GpgOL"), _("Save and decrypt"),/*_("Decrypt"), */
         _("Save and decrypt"));

commit 4455aaf2f2274becf5746b38da0a4a0ffb88ce72
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Aug 13 08:56:29 2013 +0000

    Statically link against compiler libraries
    
        * src/Makefile.am (gpgol_LDFLAGS): New.

diff --git a/src/Makefile.am b/src/Makefile.am
index 76d1dc6..59ba6cf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -116,6 +116,8 @@ libassuan.a:
 clean-local:
 	rm -f libmapi32.a libgpg-error.a libgpgme.a libassuan.a
 
+gpgol_LDFLAGS = -static-libgcc -static-libstdc++
+
 gpgol_LDADD = $(srcdir)/gpgol.def  \
 	-L . -lgpgme -lassuan -lgpg-error \
 	-lmapi32 -lshell32 -lgdi32 -lcomdlg32 \

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

Summary of changes:
 po/de.po                 |  163 +++++++++++++++++++++++++++++++++++++---------
 po/pt.po                 |  154 ++++++++++++++++++++++++++++++++++---------
 po/sv.po                 |  152 ++++++++++++++++++++++++++++++++++---------
 src/Makefile.am          |    2 +
 src/gpgoladdin.cpp       |   83 +++++++++++++++++++++---
 src/ribbon-callbacks.cpp |   31 ++++++++-
 6 files changed, 478 insertions(+), 107 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Aug 16 16:45:14 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 16 Aug 2013 16:45:14 +0200
Subject: [git] GPA - branch, master, updated. gpa-0.9.4-10-gd3f20e7
Message-ID: <E1VAKnS-0004Md-RP@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  d3f20e7883f2fb9e52e487fd516bdc7b9bc695ed (commit)
       via  8e7043438fe42864b2413345b2cda8be29b08bf8 (commit)
       via  da655ad040fed39fa8e93e0d27fe6700f1cdf373 (commit)
       via  eaa716883eff8c9611f06fea5bc989b6e342964e (commit)
      from  398fd028c762dd6c0fc7a5945f55eb2dbd2edaec (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 d3f20e7883f2fb9e52e487fd516bdc7b9bc695ed
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 16 15:18:57 2013 +0200

    w32: Fix crash due to bad conversions of utf-8 in the clipboard.
    
    * src/gpgmetools.c (dos_to_unix): Remove.  Remove all calls.
    (dump_data_to_clipboard): Return an error code instead of calling
    exit.
    * src/gpaexportclipop.c
    (gpa_export_clipboard_operation_complete_export): Print success
    message only on success.
    --
    
    The removal of dos_to_unix is possible due to the patch
    https://bugzilla.gnome.org/show_bug.cgi?id=649390 which will go into
    the next Gtk+ 2.24 version.dos_to_unix was anyway not correct because
    it scanned for an embedded nul but it is not guaranteed that it is
    always called with one.
    
    The other patch which will be helpful is:
    https://bugzilla.gnome.org/show_bug.cgi?id=696232
    (g_utf8_to_utf16() is not guaranteed to succeed. Check the error and
     return if it failed.)
    
    Gpg4win uses both patches.
    
    GnuPG-bug-id: 1525

diff --git a/src/clipboard.c b/src/clipboard.c
index 682bd34..01b6058 100644
--- a/src/clipboard.c
+++ b/src/clipboard.c
@@ -283,10 +283,6 @@ file_created_cb (GpaFileOperation *op, gpa_file_item_t item, gpointer data)
                        NULL, &len, NULL);
       if (str)
         {
-#ifdef G_OS_WIN32
-          dos_to_unix (str, &item->direct_out_len);
-#endif
-
           gtk_text_buffer_set_text (clipboard->text_buffer, str, len);
           g_free (str);
           return;
@@ -296,10 +292,6 @@ file_created_cb (GpaFileOperation *op, gpa_file_item_t item, gpointer data)
       /* Enough warnings: Try to show even with invalid encoding.  */
     }
 
-#ifdef G_OS_WIN32
-  dos_to_unix (item->direct_out, &item->direct_out_len);
-#endif
-
   gtk_text_buffer_set_text (clipboard->text_buffer,
 			    item->direct_out, item->direct_out_len);
 }
@@ -481,10 +473,6 @@ file_open (GtkAction *action, gpointer param)
       return;
     }
 
-#ifdef G_OS_WIN32
-  dos_to_unix (contents, &length);
-#endif
-
   gtk_text_buffer_set_text (clipboard->text_buffer, contents, length);
   g_free (contents);
 }
diff --git a/src/gpaexportclipop.c b/src/gpaexportclipop.c
index 0ce88af..62edb12 100644
--- a/src/gpaexportclipop.c
+++ b/src/gpaexportclipop.c
@@ -134,10 +134,10 @@ static void
 gpa_export_clipboard_operation_complete_export (GpaExportOperation *operation)
 {
   GpaExportClipboardOperation *op = GPA_EXPORT_CLIPBOARD_OPERATION (operation);
-  dump_data_to_clipboard (operation->dest, gtk_clipboard_get
-			  (GDK_SELECTION_CLIPBOARD));
-  gpa_window_message (_("The keys have been copied to the clipboard."),
-		      GPA_OPERATION (op)->window);
+  if (!dump_data_to_clipboard (operation->dest, gtk_clipboard_get
+                               (GDK_SELECTION_CLIPBOARD)))
+    gpa_window_message (_("The keys have been copied to the clipboard."),
+                        GPA_OPERATION (op)->window);
 }
 
 /* API */
diff --git a/src/gpgmetools.c b/src/gpgmetools.c
index 2b4be56..63f6b8d 100644
--- a/src/gpgmetools.c
+++ b/src/gpgmetools.c
@@ -294,37 +294,12 @@ gpa_gpgme_data_new_from_file (gpgme_data_t *data,
 }
 
 
-#ifdef G_OS_WIN32
-/* Convert newlines.  */
-void
-dos_to_unix (gchar *str, gsize *len)
-{
-  /* On Windows 2000, we need to convert \r\n to \n in the output for
-     cut & paste to work properly (otherwise, extra newlines will be
-     inserted).  */
-  gchar *src;
-  gchar *dst;
-
-  src = str;
-  dst = str;
-  while (*src)
-    {
-      if (src[0] == '\r' && src[1] == '\n')
-	src++;
-      *(dst++) = *(src++);
-    }
-  *dst = '\0';
-  *len = dst - str;
-}
-#endif
-
-
 /* Write the contents of the gpgme_data_t into the clipboard.  Assumes
-   that the data is ASCII.  */
-void
+   that the data is ASCII.  Return 0 on success.  */
+int
 dump_data_to_clipboard (gpgme_data_t data, GtkClipboard *clipboard)
 {
-  char buffer[128];
+  char buffer[512];
   int nread;
   gchar *text = NULL;
   size_t len = 0;
@@ -333,27 +308,23 @@ dump_data_to_clipboard (gpgme_data_t data, GtkClipboard *clipboard)
   if (nread == -1)
     {
       gpa_window_error (strerror (errno), NULL);
-      exit (EXIT_FAILURE);
+      return -1;
     }
   while ((nread = gpgme_data_read (data, buffer, sizeof (buffer))) > 0)
     {
-      text = g_realloc (text, len + nread);
+      text = g_realloc (text, len + nread + 1);
       strncpy (text + len, buffer, nread);
       len += nread;
     }
   if (nread == -1)
     {
       gpa_window_error (strerror (errno), NULL);
-      exit (EXIT_FAILURE);
+      return -1;
     }
 
-#ifdef G_OS_WIN32
-  dos_to_unix (text, &len);
-#endif
-
   gtk_clipboard_set_text (clipboard, text, (int)len);
   g_free (text);
-  return;
+  return 0;
 }
 
 
diff --git a/src/gpgmetools.h b/src/gpgmetools.h
index a4ce122..2c6877d 100644
--- a/src/gpgmetools.h
+++ b/src/gpgmetools.h
@@ -113,11 +113,6 @@ int gpa_open_output (const char *filename, gpgme_data_t *data,
 int gpa_open_input (const char *filename, gpgme_data_t *data,
 		    GtkWidget *parent);
 
-#ifdef G_OS_WIN32
-/* Convert newlines.  */
-void dos_to_unix (gchar *str, gsize *len);
-#endif
-
 /* Write the contents of the gpgme_data_t into the clipboard.  */
 int dump_data_to_clipboard (gpgme_data_t data, GtkClipboard *clipboard);
 

commit 8e7043438fe42864b2413345b2cda8be29b08bf8
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 16 15:44:55 2013 +0200

    Improve code readability.
    
    * src/server-access.c (server_get_key): Make error checking better
    readable.

diff --git a/src/gpgmetools.c b/src/gpgmetools.c
index a6ff3d8..2b4be56 100644
--- a/src/gpgmetools.c
+++ b/src/gpgmetools.c
@@ -138,7 +138,8 @@ gpa_gpgme_new (void)
 /* Write the contents of the gpgme_data_t object to the file.
    Receives a filehandle instead of the filename, so that the caller
    can make sure the file is accesible before putting anything into
-   data.  */
+   data.  This is only used for a TMP file, thus it is okay to
+   terminate the application on error. */
 void
 dump_data_to_file (gpgme_data_t data, FILE *file)
 {
diff --git a/src/gpgmetools.h b/src/gpgmetools.h
index d88e48e..a4ce122 100644
--- a/src/gpgmetools.h
+++ b/src/gpgmetools.h
@@ -119,7 +119,7 @@ void dos_to_unix (gchar *str, gsize *len);
 #endif
 
 /* Write the contents of the gpgme_data_t into the clipboard.  */
-void dump_data_to_clipboard (gpgme_data_t data, GtkClipboard *clipboard);
+int dump_data_to_clipboard (gpgme_data_t data, GtkClipboard *clipboard);
 
 /* Begin generation of a key with the given parameters.  It prepares
    the parameters required by Gpgme and returns whatever
diff --git a/src/server-access.c b/src/server-access.c
index 2164f28..94fe0ca 100644
--- a/src/server-access.c
+++ b/src/server-access.c
@@ -581,7 +581,7 @@ server_get_key (const gchar *server, const gchar *keyid,
     {
       /* Create an empty gpgme_data_t, so that we always return a valid one */
       err = gpgme_data_new (data);
-      if (gpg_err_code (err) != GPG_ERR_NO_ERROR)
+      if (err)
         gpa_gpgme_error (err);
       gpa_window_error (_("The keyserver you specified is not valid"), parent);
       return FALSE;
@@ -599,7 +599,7 @@ server_get_key (const gchar *server, const gchar *keyid,
   /* Read the output */
   /* No error checking: the import will take care of that. */
   err = gpa_gpgme_data_new_from_file (data, output_filename, parent);
-  if (gpg_err_code (err) != GPG_ERR_NO_ERROR)
+  if (err)
     gpa_gpgme_error (err);
   g_free (keyserver);
   /* Delete temp files */

commit da655ad040fed39fa8e93e0d27fe6700f1cdf373
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 16 15:42:37 2013 +0200

    Add noreturn attribute to gpa_gpgme_error.
    
    * src/gpgmetools.h (_gpa_gpgme_error): Add attribute.
    * src/gpa-key-details.c (gpa_key_details_find): Remove dead code.

diff --git a/src/gpa-key-details.c b/src/gpa-key-details.c
index da46476..c43c8ca 100644
--- a/src/gpa-key-details.c
+++ b/src/gpa-key-details.c
@@ -697,11 +697,7 @@ gpa_key_details_find (GtkWidget *keydetails, const char *pattern)
 
   err = gpgme_new (&ctx);
   if (err)
-    {
-      gpa_gpgme_error (err);
-      gpa_key_details_update (keydetails, NULL, 0);
-      return;
-    }
+    gpa_gpgme_error (err);
   gpgme_set_protocol (ctx, GPGME_PROTOCOL_OpenPGP);
 
   if (!gpgme_op_keylist_start (ctx, pattern, 0))
diff --git a/src/gpgmetools.h b/src/gpgmetools.h
index e8b2c34..d88e48e 100644
--- a/src/gpgmetools.h
+++ b/src/gpgmetools.h
@@ -72,7 +72,8 @@ typedef struct
    Better to use the macro instead of the function.  */
 #define gpa_gpgme_error(err) \
          do { _gpa_gpgme_error (err, __FILE__, __LINE__); } while (0)
-void _gpa_gpgme_error (gpg_error_t err, const char *file, int line);
+void _gpa_gpgme_error (gpg_error_t err,
+                       const char *file, int line) G_GNUC_NORETURN;
 
 /* The same as gpa_gpgme_error, without quitting.  */
 void gpa_gpgme_warning_ext (gpg_error_t err, const char *desc);

commit eaa716883eff8c9611f06fea5bc989b6e342964e
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 16 15:39:20 2013 +0200

    Remove unused function.
    
    * src/server.c (hextobyte): Remove.

diff --git a/src/server.c b/src/server.c
index 1ce9a89..9148338 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1226,35 +1226,6 @@ cmd_getinfo (assuan_context_t ctx, char *line)
 }
 
 

-
-/* Convert two hexadecimal digits from STR to the value they
-   represent.  Returns -1 if one of the characters is not a
-   hexadecimal digit.  */
-static int
-hextobyte (const char *str)
-{
-  int val = 0;
-  int i;
-
-#define NROFHEXDIGITS 2
-  for (i = 0; i < NROFHEXDIGITS; i++)
-    {
-      if (*str >= '0' && *str <= '9')
-        val += *str - '0';
-      else if (*str >= 'A' && *str <= 'F')
-        val += 10 + *str - 'A';
-      else if (*str >= 'a' && *str <= 'f')
-        val += 10 + *str - 'a';
-      else
-        return -1;
-      if (i < NROFHEXDIGITS - 1)
-        val *= 16;
-      str++;
-    }
-  return val;
-}
-
-
 /* FILE <file> [--continued]
 
    Set the files on which to operate.

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

Summary of changes:
 src/clipboard.c       |   12 ------------
 src/gpa-key-details.c |    6 +-----
 src/gpaexportclipop.c |    8 ++++----
 src/gpgmetools.c      |   46 +++++++++-------------------------------------
 src/gpgmetools.h      |   10 +++-------
 src/server-access.c   |    4 ++--
 src/server.c          |   29 -----------------------------
 7 files changed, 19 insertions(+), 96 deletions(-)


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



From cvs at cvs.gnupg.org  Mon Aug 19 12:37:19 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Mon, 19 Aug 2013 12:37:19 +0200
Subject: [git] GnuPG - branch, STABLE-BRANCH-2-0,
 updated. gnupg-2.0.20-32-g284e387
Message-ID: <E1VBMLq-00034q-JG@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-0 has been updated
       via  284e387707ef14f8f999f7b5cc869cfa74e51f17 (commit)
       via  bffd8128bfd4d7e5aca046e2a9af5cbc5158e01d (commit)
       via  9f5578c29adba6d4f7d3650121d07322c2f8d254 (commit)
       via  0c5d3da96a72ab399a8ea6d21a292875980dfac0 (commit)
       via  3966eb244518d5612385d35a5149f7164a9fb707 (commit)
      from  88914a9e24a8a116508d5b7d52b76b947e4d21a6 (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 284e387707ef14f8f999f7b5cc869cfa74e51f17
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 19 11:59:15 2013 +0200

    po: Auto updates.
    
    --

diff --git a/po/be.po b/po/be.po
index 3b64370..3492491 100644
--- a/po/be.po
+++ b/po/be.po
@@ -5141,10 +5141,6 @@ msgstr "???????????????????????????? ???????????? ??????????????????????????\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "error loading `%s': %s\n"
-msgstr "?????????????? ???????????????????? \"%s\": %s\n"
-
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
@@ -6593,6 +6589,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "?????????????? ???????????????????? \"%s\": %s\n"
+
+#, fuzzy
 #~ msgid "failed to allocated keyDB handle\n"
 #~ msgstr "%s: ?????????????????? ???????????????? ??????-??????????????: %s\n"
 
diff --git a/po/ca.po b/po/ca.po
index ef417f7..08f10b3 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -5638,10 +5638,6 @@ msgstr "opcions d'importaci?? no v??lides\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "heu trobat un bug... (%s:%d)\n"
 
-#, fuzzy, c-format
-msgid "error loading `%s': %s\n"
-msgstr "error en la lectura de ??%s??: %s\n"
-
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
@@ -7139,6 +7135,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "error en la lectura de ??%s??: %s\n"
+
+#, fuzzy
 #~ msgid "failed to allocated keyDB handle\n"
 #~ msgstr "no s'ha pogut inicialitzar la base de dades de confian??a: %s\n"
 
diff --git a/po/cs.po b/po/cs.po
index 7b21586..d9925a9 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5270,10 +5270,6 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "nalezena chyba v??programu??? (%s:%d)\n"
 
 #, c-format
-msgid "error loading `%s': %s\n"
-msgstr "chyba p??i nahr??v??n?? ???%s???: %s\n"
-
-#, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr "p??evod z?????%s??? na ???%s??? nen?? k??dispozici\n"
 
@@ -6710,6 +6706,9 @@ msgstr ""
 "Syntaxe: gpg-check-pattern [VOLBY] SOUBOR_SE_VZOREM\n"
 "Prov?????? heslo zadan?? na vstupu proti souboru se vzory\n"
 
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "chyba p??i nahr??v??n?? ???%s???: %s\n"
+
 #~ msgid "failed to allocated keyDB handle\n"
 #~ msgstr "alokace popisova??e keyDB se nezda??ila\n"
 
diff --git a/po/da.po b/po/da.po
index f64b87c..5d68850 100644
--- a/po/da.po
+++ b/po/da.po
@@ -5253,10 +5253,6 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fandt en fejl ... (%s:%d)\n"
 
 #, c-format
-msgid "error loading `%s': %s\n"
-msgstr "fejl ved l??sning af ??%s??: %s\n"
-
-#, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr "konvertering fra ??%s?? til ??%s?? er ikke tilg??ngelig\n"
 
@@ -6677,6 +6673,9 @@ msgstr ""
 "Syntaks: gpg-check-pattern [tilvalg] m??nsterfil\n"
 "Kontroller en adgangsfrase angivet p?? stdin mod m??nsterfilen\n"
 
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "fejl ved l??sning af ??%s??: %s\n"
+
 #~ msgid "Command> "
 #~ msgstr "Kommando> "
 
diff --git a/po/de.po b/po/de.po
index 8c37ac6..3961b5e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5367,10 +5367,6 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "Sie haben einen Bug (Programmfehler) gefunden ... (%s:%d)\n"
 
 #, c-format
-msgid "error loading `%s': %s\n"
-msgstr "Fehler beim Laden von `%s': %s\n"
-
-#, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr "Umwandlung von `%s' in `%s' ist nicht verf??gbar\n"
 
@@ -6812,6 +6808,9 @@ msgstr ""
 "Syntax: gpg-check-pattern [optionen] Musterdatei\n"
 "Die von stdin gelesene Passphrase gegen die Musterdatei pr??fen\n"
 
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "Fehler beim Laden von `%s': %s\n"
+
 #~ msgid "failed to allocated keyDB handle\n"
 #~ msgstr "Ein keyDB Handle konnte nicht bereitgestellt werden\n"
 
diff --git a/po/el.po b/po/el.po
index 321ff3b..6272ff4 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5500,10 +5500,6 @@ msgstr "
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "??????? ??? bug ... (%s:%d)\n"
 
-#, fuzzy, c-format
-msgid "error loading `%s': %s\n"
-msgstr "?????? ???? ??? ???????? ??? `%s': %s\n"
-
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
@@ -6974,6 +6970,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "?????? ???? ??? ???????? ??? `%s': %s\n"
+
+#, fuzzy
 #~ msgid "failed to allocated keyDB handle\n"
 #~ msgstr "???????? ????????????? ??? TrustDB: %s\n"
 
diff --git a/po/eo.po b/po/eo.po
index 17f035c..96b8d20 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5452,10 +5452,6 @@ msgstr "nevalida kiraso"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vi trovis cimon ... (%s:%d)\n"
 
-#, fuzzy, c-format
-msgid "error loading `%s': %s\n"
-msgstr "eraro dum legado de '%s': %s\n"
-
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
@@ -6937,6 +6933,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "eraro dum legado de '%s': %s\n"
+
+#, fuzzy
 #~ msgid "failed to allocated keyDB handle\n"
 #~ msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
diff --git a/po/es.po b/po/es.po
index ba9aa7b..b7d0418 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5286,10 +5286,6 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "ha encontrado un error... (%s:%d)\n"
 
 #, c-format
-msgid "error loading `%s': %s\n"
-msgstr "error cargando `%s': %s\n"
-
-#, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr "la conversi?n de `%s' en `%s' no est? disponible\n"
 
@@ -6732,6 +6728,9 @@ msgstr ""
 "Compara frase contrase?a dada en entrada est?ndar con un fichero de "
 "patrones\n"
 
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "error cargando `%s': %s\n"
+
 #~ msgid "failed to allocated keyDB handle\n"
 #~ msgstr "fallo al colocar handle de keyDB\n"
 
diff --git a/po/et.po b/po/et.po
index dcdd036..3bcc656 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5419,10 +5419,6 @@ msgstr "vigased impordi v
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "te leidsite vea ... (%s:%d)\n"
 
-#, fuzzy, c-format
-msgid "error loading `%s': %s\n"
-msgstr "viga `%s' lugemisel: %s\n"
-
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
@@ -6892,6 +6888,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "viga `%s' lugemisel: %s\n"
+
+#, fuzzy
 #~ msgid "failed to allocated keyDB handle\n"
 #~ msgstr "TrustDB initsialiseerimine eba?nnestus: %s\n"
 
diff --git a/po/fi.po b/po/fi.po
index b530eea..9422a02 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5482,10 +5482,6 @@ msgstr "virheelliset tuontivalitsimet\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "olet l??yt??nyt ohjelmistovian ... (%s:%d)\n"
 
-#, fuzzy, c-format
-msgid "error loading `%s': %s\n"
-msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
-
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
@@ -6956,6 +6952,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+
+#, fuzzy
 #~ msgid "failed to allocated keyDB handle\n"
 #~ msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
diff --git a/po/fr.po b/po/fr.po
index 17afec7..52bdfc9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5401,10 +5401,6 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "vous avez trouv?? un bogue??? (%s??: %d)\n"
 
 #, c-format
-msgid "error loading `%s': %s\n"
-msgstr "erreur de chargement de ????%s??????: %s\n"
-
-#, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr "conversion de ????%s???? vers ????%s???? non disponible\n"
 
@@ -6861,6 +6857,9 @@ msgstr ""
 "V??rifier une phrase de passe donn??e sur l'entr??e standard par rapport ?? "
 "ficmotif\n"
 
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "erreur de chargement de ????%s??????: %s\n"
+
 #~ msgid "failed to allocated keyDB handle\n"
 #~ msgstr "impossible d'allouer la gestion de base de clefs\n"
 
diff --git a/po/gl.po b/po/gl.po
index fb5f358..95ad7ff 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5487,10 +5487,6 @@ msgstr "opci
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "atopou un erro ... (%s:%d)\n"
 
-#, fuzzy, c-format
-msgid "error loading `%s': %s\n"
-msgstr "erro lendo `%s': %s\n"
-
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
@@ -6977,6 +6973,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "erro lendo `%s': %s\n"
+
+#, fuzzy
 #~ msgid "failed to allocated keyDB handle\n"
 #~ msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
diff --git a/po/hu.po b/po/hu.po
index 086fff2..947f0cc 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5451,10 +5451,6 @@ msgstr "
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Tal?lt egy programhib?t... (%s:%d)\n"
 
-#, fuzzy, c-format
-msgid "error loading `%s': %s\n"
-msgstr "Hiba \"%s\" olvas?sakor: %s\n"
-
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
@@ -6925,6 +6921,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "Hiba \"%s\" olvas?sakor: %s\n"
+
+#, fuzzy
 #~ msgid "failed to allocated keyDB handle\n"
 #~ msgstr "Bizalmi adatb?zis (%s) inicializ?l?sa sikertelen!\n"
 
diff --git a/po/id.po b/po/id.po
index 86b5ee0..523b7ed 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5448,10 +5448,6 @@ msgstr "opsi impor tidak valid\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "anda menemukan kesalahan ...(%s:%d)\n"
 
-#, fuzzy, c-format
-msgid "error loading `%s': %s\n"
-msgstr "kesalahan membaca `%s': %s\n"
-
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
@@ -6922,6 +6918,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "kesalahan membaca `%s': %s\n"
+
+#, fuzzy
 #~ msgid "failed to allocated keyDB handle\n"
 #~ msgstr "gagal inisialisasi TrustDB: %s\n"
 
diff --git a/po/it.po b/po/it.po
index 0f7159f..ac581b7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5491,10 +5491,6 @@ msgstr "opzioni di importazione non valide\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "hai trovato un bug... (%s:%d)\n"
 
-#, fuzzy, c-format
-msgid "error loading `%s': %s\n"
-msgstr "errore leggendo `%s': %s\n"
-
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
@@ -6964,6 +6960,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "errore leggendo `%s': %s\n"
+
+#, fuzzy
 #~ msgid "failed to allocated keyDB handle\n"
 #~ msgstr "inizializzazione del trustdb fallita: %s\n"
 
diff --git a/po/ja.po b/po/ja.po
index c7f585e..8a90330 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5153,10 +5153,6 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "??????????????????????????????????????? ... (%s:%d)\n"
 
 #, c-format
-msgid "error loading `%s': %s\n"
-msgstr "???%s????????????????????????: %s\n"
-
-#, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr "???%s????????????%s???????????????????????????????????????\n"
 
@@ -6566,3 +6562,6 @@ msgid ""
 msgstr ""
 "??????: gpg-check-pattern [???????????????] ????????????????????????\n"
 "????????????????????????????????????????????????????????????????????????????????????\n"
+
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "???%s????????????????????????: %s\n"
diff --git a/po/nb.po b/po/nb.po
index 6849dc7..e85db85 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -5210,10 +5210,6 @@ msgstr "ugyldige listevalg\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fant en feil ... (%s:%d)\n"
 
-#, fuzzy, c-format
-msgid "error loading `%s': %s\n"
-msgstr "feil ved lesing av ?%s?: %s\n"
-
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
@@ -6670,6 +6666,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "feil ved lesing av ?%s?: %s\n"
+
+#, fuzzy
 #~ msgid "failed to allocated keyDB handle\n"
 #~ msgstr "klarte ikke ? lagre n?kkelen: %s\n"
 
diff --git a/po/pt.po b/po/pt.po
index 6f1eb46..22739c8 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5455,10 +5455,6 @@ msgstr "op
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc? encontrou um bug ... (%s:%d)\n"
 
-#, fuzzy, c-format
-msgid "error loading `%s': %s\n"
-msgstr "erro na leitura de `%s': %s\n"
-
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
@@ -6934,6 +6930,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "erro na leitura de `%s': %s\n"
+
+#, fuzzy
 #~ msgid "failed to allocated keyDB handle\n"
 #~ msgstr "falha ao inicializar a base de dados de confian?a: %s\n"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 067566b..ddeb467 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5464,10 +5464,6 @@ msgstr "armadura inv
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc? encontrou um bug ... (%s:%d)\n"
 
-#, fuzzy, c-format
-msgid "error loading `%s': %s\n"
-msgstr "erro na leitura de `%s': %s\n"
-
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
@@ -6949,6 +6945,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "erro na leitura de `%s': %s\n"
+
+#, fuzzy
 #~ msgid "failed to allocated keyDB handle\n"
 #~ msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
diff --git a/po/ro.po b/po/ro.po
index 0227d3e..f089e47 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5357,10 +5357,6 @@ msgstr "op
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "a?i g?sit un bug ... (%s:%d)\n"
 
-#, fuzzy, c-format
-msgid "error loading `%s': %s\n"
-msgstr "eroare la citire `%s': %s\n"
-
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
@@ -6831,6 +6827,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "eroare la citire `%s': %s\n"
+
+#, fuzzy
 #~ msgid "failed to allocated keyDB handle\n"
 #~ msgstr "am e?uat s? stochez cheia: %s\n"
 
diff --git a/po/ru.po b/po/ru.po
index a264d78..b0009cb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5233,10 +5233,6 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "???? ?????????? ???????????? ... (%s:%d)\n"
 
 #, c-format
-msgid "error loading `%s': %s\n"
-msgstr "???????????? ???????????????? `%s': %s\n"
-
-#, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr "???????????????????????????? ???? `%s' ?? `%s' ????????????????????\n"
 
@@ -6664,6 +6660,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "???????????? ???????????????? `%s': %s\n"
+
 #~ msgid "Command> "
 #~ msgstr "??????????????> "
 
diff --git a/po/sk.po b/po/sk.po
index 3a57da1..78f0b4a 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5467,10 +5467,6 @@ msgstr "neplatn
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "n?jden? chyba v programe ... (%s:%d)\n"
 
-#, fuzzy, c-format
-msgid "error loading `%s': %s\n"
-msgstr "chyba pri ??tan? `%s': %s\n"
-
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
@@ -6944,6 +6940,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "chyba pri ??tan? `%s': %s\n"
+
+#, fuzzy
 #~ msgid "failed to allocated keyDB handle\n"
 #~ msgstr "nem??em inicializova? datab?zu d?very: %s\n"
 
diff --git a/po/sv.po b/po/sv.po
index 383e329..f581f15 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5390,10 +5390,6 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "du har hittat ett fel i programmet ... (%s:%d)\n"
 
 #, c-format
-msgid "error loading `%s': %s\n"
-msgstr "fel vid inl??sning av \"%s\": %s\n"
-
-#, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr "konvertering fr??n \"%s\" till \"%s\" ??r inte tillg??nglig\n"
 
@@ -6836,6 +6832,9 @@ msgstr ""
 "Syntax: gpg-check-pattern [flaggor] m??nsterfil\n"
 "Kontrollera en l??senfras angiven p?? standard in mot m??nsterfilen\n"
 
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "fel vid inl??sning av \"%s\": %s\n"
+
 #~ msgid "failed to allocated keyDB handle\n"
 #~ msgstr "misslyckades med att allokera keyDB-hanterare\n"
 
diff --git a/po/tr.po b/po/tr.po
index 4d99c82..c0a5e8f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5314,10 +5314,6 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "bir yaz??l??m hatas?? buldunuz ... (%s:%d)\n"
 
 #, c-format
-msgid "error loading `%s': %s\n"
-msgstr "`%s' y??klenirken hata: %s\n"
-
-#, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr "`%s' > `%s' d??n??????m?? elveri??li de??il\n"
 
@@ -6764,6 +6760,9 @@ msgstr ""
 "Standart girdiden verilen anahtar parolas??n?? ??r??nt?? dosyas??yla "
 "kar????la??t??r??r\n"
 
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "`%s' y??klenirken hata: %s\n"
+
 #~ msgid "failed to allocated keyDB handle\n"
 #~ msgstr "ayr??lm???? anahtar veritaban?? elde edilemedi: %s\n"
 
diff --git a/po/uk.po b/po/uk.po
index 903d2c5..2dc6973 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5330,10 +5330,6 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "???? ?????????????? ??????????? (%s:%d)\n"
 
 #, c-format
-msgid "error loading `%s': %s\n"
-msgstr "?????????????? ?????? ?????? ???????????? ???????????????????????? ??%s??: %s\n"
-
-#, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr "???????????????????????? ?? ??%s?? ?? ??%s?? ????????????????????\n"
 
@@ -6776,5 +6772,8 @@ msgstr ""
 "??????????????????: gpg-check-pattern [??????????????????] ????????_????????????????\n"
 "???????????????????? ????????????, ???????????????? ?? stdin, ???? ?????????????????? ??????????_????????????????\n"
 
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "?????????????? ?????? ?????? ???????????? ???????????????????????? ??%s??: %s\n"
+
 #~ msgid "failed to allocated keyDB handle\n"
 #~ msgstr "???? ?????????????? ???????????????????? ???????????????? keyDB\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fe86621..ef843c6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5192,10 +5192,6 @@ msgstr "?????????????????????\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "????????????????????????????????????(%s:%d)\n"
 
-#, fuzzy, c-format
-msgid "error loading `%s': %s\n"
-msgstr "?????????%s???????????????%s\n"
-
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
@@ -6657,6 +6653,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "?????????%s???????????????%s\n"
+
+#, fuzzy
 #~ msgid "failed to allocated keyDB handle\n"
 #~ msgstr "?????????????????????%s\n"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4ac3df2..f99394c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5114,10 +5114,6 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "???????????????????????? ... (%s:%d)\n"
 
 #, c-format
-msgid "error loading `%s': %s\n"
-msgstr "?????? `%s' ?????????: %s\n"
-
-#, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr "????????? `%s' ??? `%s' ?????????????????????\n"
 
@@ -6509,6 +6505,9 @@ msgstr ""
 "??????: gpg-check-pattern [??????] ????????????\n"
 "??????????????????????????????????????????????????????\n"
 
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "?????? `%s' ?????????: %s\n"
+
 #~ msgid "failed to allocated keyDB handle\n"
 #~ msgstr "?????? keyDB handle ??????\n"
 

commit bffd8128bfd4d7e5aca046e2a9af5cbc5158e01d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Aug 19 11:51:38 2013 +0200

    Update the Polish translation

diff --git a/po/pl.po b/po/pl.po
index d1ee871..d1f0dae 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -2,13 +2,13 @@
 # Copyright (C) 1998, 1999, 2000, 2001, 2002, 
 #               2007 Free Software Foundation, Inc.
 # Janusz A. Urbanowicz <alex at bofh.net.pl>, 1999, 2000, 2001, 2002, 2003-2004
-# Jakub Bogusz <qboosh at pld-linux.org>, 2003-2011.
+# Jakub Bogusz <qboosh at pld-linux.org>, 2003-2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg-2.0.17\n"
+"Project-Id-Version: gnupg-2.0.20\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2011-01-12 08:34+0100\n"
+"PO-Revision-Date: 2013-05-12 17:25+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
 "Language: pl\n"
@@ -132,27 +132,28 @@ msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
+"Proces ssh zarz?da? u?ycia klucza%%0a  %s%%0A  (%s)%%0ACzy zezwoli? na to?"
 
 msgid "Allow"
-msgstr ""
+msgstr "Zgoda"
 
 msgid "Deny"
-msgstr ""
+msgstr "Odmowa"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
-msgstr "Prosz? wprowadzi? has?o dla klucza ssh%0A  %c"
+msgstr "Prosz? wprowadzi? has?o dla klucza ssh%%0A  %F%%0A  (%c)"
 
 msgid "Please re-enter this passphrase"
 msgstr "Prosz? ponownie wprowadzi? to has?o"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr ""
 "Prosz? wprowadzi? has?o do zabezpieczenia odebranego klucza tajnego%%0A   %s"
-"%%0A w miejscu przechowywania kluczy gpg-agenta"
+"%%0A   %s%%0Aw miejscu przechowywania kluczy gpg-agenta"
 
 msgid "does not match - try again"
 msgstr "nie pasuj? - prosz? spr?bowa? jeszcze raz"
@@ -178,8 +179,7 @@ msgstr "PUK"
 msgid "Reset Code"
 msgstr "Kod resetuj?cy"
 
-#, fuzzy, c-format
-#| msgid "%s%%0A%%0AUse the reader's keypad for input."
+#, c-format
 msgid "%s%%0A%%0AUse the reader's pinpad for input."
 msgstr "%s%%0A%%0ADo wpisywania nale?y u?y? klawiatury czytnika."
 
@@ -277,8 +277,7 @@ msgstr ""
 msgid "Yes, protection is not needed"
 msgstr "Tak, ochrona nie jest potrzebna"
 
-#, fuzzy, c-format
-#| msgid "Please enter the passphrase to%0Ato protect your new key"
+#, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Prosz? wprowadzi? has?o do%0Azabezpieczenia swojego nowego klucza"
 
@@ -354,10 +353,8 @@ msgstr "zezwolenie klientom na oznaczanie kluczy jako \"zaufanych\""
 msgid "allow presetting passphrase"
 msgstr "zezwolenie na predefiniowane has?o"
 
-#, fuzzy
-#| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
-msgstr "w??czenie emulacji ssh-agenta"
+msgstr ""
 
 msgid "enable putty support"
 msgstr ""
@@ -1673,19 +1670,14 @@ msgstr ""
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo?anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 msgstr ""
 "Sk?adnia: gpg [opcje] [pliki]\n"
-"podpisywanie, sprawdzanie podpis?w, szyfrowanie, deszyfrowanie\n"
-"domy?lnie wykonywana operacja zale?y od danych wej?ciowych\n"
+"Podpisywanie, sprawdzanie podpis?w, szyfrowanie, rozszyfrowywanie\n"
+"Domy?lnie wykonywana operacja zale?y od danych wej?ciowych\n"
 
 msgid ""
 "\n"
@@ -5297,10 +5289,6 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "znalaz?e?(a?) b??d w programie ... (%s:%d)\n"
 
 #, c-format
-msgid "error loading `%s': %s\n"
-msgstr "b??d odczytu ,,%s'': %s\n"
-
-#, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr "konwersja z ,,%s'' do ,,%s'' niedost?pna\n"
 
@@ -5351,16 +5339,12 @@ msgstr "w
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Wywo?anie: kbxutil [opcje] [pliki] (-h podaje pomoc)"
 
-#, fuzzy
-#| msgid ""
-#| "Syntax: kbxutil [options] [files]\n"
-#| "list, export, import Keybox data\n"
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "List, export, import Keybox data\n"
 msgstr ""
 "Sk?adnia: kbxutil [opcje] [pliki]\n"
-"wypisywanie, eksport, import danych Keybox\n"
+"Wypisywanie, eksport, import danych Keybox\n"
 
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
@@ -5505,15 +5489,11 @@ msgstr "|AN|Nowy PIN administracyjny"
 msgid "|N|New PIN"
 msgstr "|N|Nowy PIN"
 
-#, fuzzy
-#| msgid "|A|Please enter the Admin PIN"
 msgid "||Please enter the Admin PIN and New Admin PIN"
-msgstr "|A|Prosz? wprowadzi? PIN administracyjny"
+msgstr "||Prosz? wprowadzi? PIN administracyjny i nowy PIN administracyjny"
 
-#, fuzzy
-#| msgid "||Please enter the PIN"
 msgid "||Please enter the PIN and New PIN"
-msgstr "||Prosz? wpisa? PIN"
+msgstr "||Prosz? wprowadzi? PIN i nowy PIN"
 
 msgid "error reading application data\n"
 msgstr "b??d podczas odczytu danych aplikacji\n"
@@ -5578,8 +5558,6 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nie mo?na dosta? si? do %s - niepoprawna karta OpenPGP?\n"
 
-#, fuzzy
-#| msgid "||Please enter your PIN at the reader's keypad"
 msgid "||Please enter your PIN at the reader's pinpad"
 msgstr "||Prosz? wprowadzi? PIN na klawiaturze czytnika"
 
@@ -5613,8 +5591,6 @@ msgstr "nie u
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|od??czenie karty po N sekundach nieaktywno?ci"
 
-#, fuzzy
-#| msgid "do not use a reader's keypad"
 msgid "do not use a reader's pinpad"
 msgstr "nie u?ywanie klawiatury czytnika"
 
@@ -5622,7 +5598,7 @@ msgid "deny the use of admin card commands"
 msgstr "zabronienie u?ywania polece? karty administratora"
 
 msgid "use variable length input for pinpad"
-msgstr ""
+msgstr "u?ycie wej?cia z klawiatury czytnika o zmiennej d?ugo?ci"
 
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Wywo?anie: scdaemon [opcje] (-h podaje pomoc)"
@@ -5890,23 +5866,15 @@ msgstr ""
 msgid "error getting key usage information: %s\n"
 msgstr "b??d podczas pobierania informacji o wykorzystaniu klucza: %s\n"
 
-#, fuzzy
-#| msgid "certificate should have not been used for certification\n"
 msgid "certificate should not have been used for certification\n"
 msgstr "certyfikat nie powinien by? u?ywany do po?wiadczania\n"
 
-#, fuzzy
-#| msgid "certificate should have not been used for OCSP response signing\n"
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "certyfikat nie powinien by? u?ywany do podpisywania odpowiedzi OCSP\n"
 
-#, fuzzy
-#| msgid "certificate should have not been used for encryption\n"
 msgid "certificate should not have been used for encryption\n"
 msgstr "certyfikat nie powinien by? u?ywany do szyfrowania\n"
 
-#, fuzzy
-#| msgid "certificate should have not been used for signing\n"
 msgid "certificate should not have been used for signing\n"
 msgstr "certyfikat nie powinien by? u?ywany do podpisywania\n"
 
@@ -6176,20 +6144,15 @@ msgstr "|NAZWA|u
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Wywo?anie: gpgsm [opcje] [pliki] (-h podaje pomoc)"
 
-#, fuzzy
-#| msgid ""
-#| "Syntax: gpgsm [options] [files]\n"
-#| "sign, check, encrypt or decrypt using the S/MIME protocol\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
 "Default operation depends on the input data\n"
 msgstr ""
 "Sk?adnia: gpgsm [opcje] [pliki]\n"
-"podpisywanie, sprawdzanie podpis?w, szyfrowanie, deszyfrowanie z u?yciem S/"
-"MIME\n"
-"domy?lnie wykonywana operacja zale?y od danych wej?ciowych\n"
+"Podpisywanie, sprawdzanie podpis?w, szyfrowanie, rozszyfrowywanie z u?yciem "
+"S/MIME\n"
+"Domy?lnie wykonywana operacja zale?y od danych wej?ciowych\n"
 
 msgid "usage: gpgsm [options] "
 msgstr "wywo?anie: gpgsm [opcje]"
@@ -6611,7 +6574,7 @@ msgstr ""
 " "
 
 msgid "decryption modus"
-msgstr "tryb deszyfrowania"
+msgstr "tryb rozszyfrowywania"
 
 msgid "encryption modus"
 msgstr "tryb szyfrowania"
@@ -6745,5 +6708,8 @@ msgstr ""
 "Sk?adnia: gpg-check-pattern [opcje] plik-wzorc?w\n"
 "Sprawdzanie has?a ze standardowego wej?cia wzgl?dem pliku wzorc?w\n"
 
-#~ msgid "failed to allocated keyDB handle\n"
-#~ msgstr "nie uda?o si? przydzieli? uchwytu keyDB\n"
+#~ msgid "enable ssh-agent emulation"
+#~ msgstr "w??czenie emulacji ssh-agenta"
+
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "b??d odczytu ,,%s'': %s\n"

commit 9f5578c29adba6d4f7d3650121d07322c2f8d254
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 19 11:44:59 2013 +0200

    agent: Fix UPDATESTARTUPTTY for ssh.
    
    * agent/command-ssh.c (setup_ssh_env): Fix env setting.
    --
    
    gniibe reported this to gnupg-devel on 2012-07-04:
    
      [...]
      (2) UPDATESTARTUPTTY doesn't work to switch TTY for pinentry for
          SSH.
    
      [...]
    
      Current implementation:
    
          In the function start_command_handler_ssh, the logic puts
          priority on ctrl->session_env which is initialized by
          agent_init_default_ctrl.  There are always GPG_TTY and TERM
          defined, because lines around 968 in gpg-agent.c, it says:
    
      	/* Make sure that we have a default ttyname. */
    
          While UPDATESTARTUPTTY updates opt.startup_env, it doesn't
          affect at all.
    
      Here is a patch to point the issue.  Tested and works for me.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index a767697..3583ea0 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -3369,8 +3369,7 @@ setup_ssh_env (ctrl_t ctrl)
   const char *value;
 
   for (idx=0; !err && names[idx]; idx++)
-    if (!session_env_getenv (ctrl->session_env, names[idx])
-        && (value = session_env_getenv (opt.startup_env, names[idx])))
+      if ((value = session_env_getenv (opt.startup_env, names[idx])))
       err = session_env_setenv (ctrl->session_env, names[idx], value);
 
   if (!err && !ctrl->lc_ctype && opt.startup_lc_ctype)

commit 0c5d3da96a72ab399a8ea6d21a292875980dfac0
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 19 11:35:06 2013 +0200

    tests: Make sure not to create files outside the build directory.
    
    * tests/openpgp/Makefile.am (./gpg_dearmor): Add option --homedir.
    
    --
    
    The dearmor code might create files in the source directory during a
    test run.  Adding "--homedir ." should solve this.
    
    GnuPG-bug-id: 1498.
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index 837298d..bd57e25 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -79,7 +79,7 @@ prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \
 # start before all programs are built.
 ./gpg_dearmor: $(required_pgms)
 	echo '#!/bin/sh' >./gpg_dearmor
-	echo "../../g10/gpg2 --no-options --no-greeting \
+	echo "../../g10/gpg2 --homedir . --no-options --no-greeting \
              --no-secmem-warning --batch --dearmor" >>./gpg_dearmor
 	chmod 755 ./gpg_dearmor
 

commit 3966eb244518d5612385d35a5149f7164a9fb707
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 19 11:22:11 2013 +0200

    gpgv: Init Libgcrypt to avoid syslog warning.
    
    * g10/gpgv.c (main): Check libgcrypt version and disable secure
    memory.
    --
    
    GnuPG-bug-id: 1376
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/gpgv.c b/g10/gpgv.c
index 42452b7..b700f17 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -142,14 +142,21 @@ main( int argc, char **argv )
   strlist_t sl;
   strlist_t nrings=NULL;
   unsigned configlineno;
-  
+
   set_strusage (my_strusage);
   log_set_prefix ("gpgv", 1);
-  
+
   /* Make sure that our subsystems are ready.  */
   i18n_init();
   init_common_subsystems ();
-  
+
+  if (!gcry_check_version (NEED_LIBGCRYPT_VERSION) )
+    {
+      log_fatal ( _("%s is too old (need %s, have %s)\n"), "libgcrypt",
+                  NEED_LIBGCRYPT_VERSION, gcry_check_version (NULL) );
+    }
+  gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
+
   gnupg_init_signals (0, NULL);
 
   opt.command_fd = -1; /* no command fd */
@@ -163,7 +170,9 @@ main( int argc, char **argv )
   tty_no_terminal(1);
   tty_batchmode(1);
   disable_dotlock();
-  
+
+  gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
+
   pargs.argc = &argc;
   pargs.argv = &argv;
   pargs.flags=  1;  /* do not remove the args */

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

Summary of changes:
 agent/command-ssh.c       |    3 +-
 g10/gpgv.c                |   17 ++++++--
 po/be.po                  |    8 ++--
 po/ca.po                  |    8 ++--
 po/cs.po                  |    7 +--
 po/da.po                  |    7 +--
 po/de.po                  |    7 +--
 po/el.po                  |    8 ++--
 po/eo.po                  |    8 ++--
 po/es.po                  |    7 +--
 po/et.po                  |    8 ++--
 po/fi.po                  |    8 ++--
 po/fr.po                  |    7 +--
 po/gl.po                  |    8 ++--
 po/hu.po                  |    8 ++--
 po/id.po                  |    8 ++--
 po/it.po                  |    8 ++--
 po/ja.po                  |    7 +--
 po/nb.po                  |    8 ++--
 po/pl.po                  |   90 ++++++++++++++-------------------------------
 po/pt.po                  |    8 ++--
 po/pt_BR.po               |    8 ++--
 po/ro.po                  |    8 ++--
 po/ru.po                  |    7 +--
 po/sk.po                  |    8 ++--
 po/sv.po                  |    7 +--
 po/tr.po                  |    7 +--
 po/uk.po                  |    7 +--
 po/zh_CN.po               |    8 ++--
 po/zh_TW.po               |    7 +--
 tests/openpgp/Makefile.am |    2 +-
 31 files changed, 140 insertions(+), 177 deletions(-)


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



From cvs at cvs.gnupg.org  Mon Aug 19 15:06:00 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Mon, 19 Aug 2013 15:06:00 +0200
Subject: [git] GnuPG - branch, STABLE-BRANCH-2-0,
 updated. gnupg-2.0.20-35-g45f43ed
Message-ID: <E1VBOfj-0004Zl-8L@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-0 has been updated
       via  45f43ed5f651e2f82cf4d31b960a98535dcb103e (commit)
       via  9cf37aa69051d08c738dff355bac593aba4bdbb4 (commit)
       via  2d360a96375843c437680b28a4f96f176d70a7c1 (commit)
      from  284e387707ef14f8f999f7b5cc869cfa74e51f17 (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 45f43ed5f651e2f82cf4d31b960a98535dcb103e
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 19 14:32:51 2013 +0200

    Post release updates.
    
    --

diff --git a/NEWS b/NEWS
index d40f7d5..ccd99f6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 2.0.22 (unreleased)
+-------------------------------------------------
+
+
 Noteworthy changes in version 2.0.21 (2013-08-19)
 -------------------------------------------------
 
diff --git a/announce.txt b/announce.txt
index d4e11b1..27dada7 100644
--- a/announce.txt
+++ b/announce.txt
@@ -5,7 +5,7 @@ Mail-Followup-To: gnupg-users at gnupg.org
 Hello!
 
 We are pleased to announce the availability of a new stable GnuPG-2
-release:  Version 2.0.20.
+release:  Version 2.0.21.
 
 The GNU Privacy Guard (GnuPG) is GNU's tool for secure communication
 and data storage.  It can be used to encrypt data, create digital
@@ -14,7 +14,7 @@ framework for public key cryptography.  It includes an advanced key
 management facility and is compliant with the OpenPGP and S/MIME
 standards.
 
-GnuPG-2 has a different architecture than GnuPG-1 (e.g. 1.4.13) in
+GnuPG-2 has a different architecture than GnuPG-1 (e.g. 1.4.14) in
 that it splits up functionality into several modules.  However, both
 versions may be installed alongside without any conflict.  In fact,
 the gpg version from GnuPG-1 is able to make use of the gpg-agent as
@@ -29,43 +29,23 @@ GnuPG is distributed under the terms of the GNU General Public License
 also available for other Unices, Microsoft Windows and Mac OS X.
 
 
-What's New in 2.0.20
+What's New in 2.0.21
 ====================
 
- * Decryption using smartcards keys > 3072 bit does now work.
+ * gpg-agent: By default the users are now asked via the Pinentry
+   whether they trust an X.509 root key.  To prohibit interactive
+   marking of such keys, the new option --no-allow-mark-trusted may
+   be used.
 
- * New meta option ignore-invalid-option to allow using the same
-   option file by other GnuPG versions.
+ * gpg-agent: The command KEYINFO has options to add info from
+   sshcontrol.
 
- * gpg: The hash algorithm is now printed for sig records in key listings.
+ * The included ssh agent does now support ECDSA keys.
 
- * gpg: Skip invalid keyblock packets during import to avoid a DoS.
+ * The new option --enable-putty-support allows gpg-agent to act on
+   Windows as a Pageant replacement with full smartcard support.
 
- * gpg: Correctly handle ports from DNS SRV records.
-
- * keyserver: Improve use of SRV records
-
- * gpg-agent: Avoid tty corruption when killing pinentry.
-
- * scdaemon: Improve detection of card insertion and removal.
-
- * scdaemon: Rename option --disable-keypad to --disable-pinpad.
-
- * scdaemon: Better support for CCID readers.  Now, the internal CCID
-   driver supports readers without the auto configuration feature.
-
- * scdaemon: Add pinpad input for PC/SC, if your reader has pinpad and
-   it supports variable length PIN input, and you specify
-   --enable-pinpad-varlen option.
-
- * scdaemon: New option --enable-pinpad-varlen.
-
- * scdaemon: Install into libexecdir to avoid accidental execution
-   from the command line.
-
- * Support building using w64-mingw32.
-
- * Assorted bug fixes.
+ * Support installation as portable application under Windows.
 
 
 Getting the Software
@@ -74,7 +54,7 @@ Getting the Software
 Please follow the instructions found at http://www.gnupg.org/download/
 or read on:
 
-GnuPG 2.0.20 may be downloaded from one of the GnuPG mirror sites or
+GnuPG 2.0.21 may be downloaded from one of the GnuPG mirror sites or
 direct from ftp://ftp.gnupg.org/gcrypt/gnupg/ .  The list of mirrors
 can be found at http://www.gnupg.org/mirrors.html .  Note, that GnuPG
 is not available at ftp.gnu.org.
@@ -82,14 +62,14 @@ is not available at ftp.gnu.org.
 On the FTP server and its mirrors you should find the following files
 in the gnupg/ directory:
 
-  gnupg-2.0.20.tar.bz2 (4186k)
-  gnupg-2.0.20.tar.bz2.sig
+  gnupg-2.0.21.tar.bz2 (4200k)
+  gnupg-2.0.21.tar.bz2.sig
 
       GnuPG source compressed using BZIP2 and OpenPGP signature.
 
-  gnupg-2.0.19-2.0.20.diff.bz2 (249k)
+  gnupg-2.0.20-2.0.21.diff.bz2 (39k)
 
-      A patch file to upgrade a 2.0.19 GnuPG source tree.  This patch
+      A patch file to upgrade a 2.0.20 GnuPG source tree.  This patch
       does not include updates of the language files.
 
 Note, that we don't distribute gzip compressed tarballs for GnuPG-2.
@@ -104,9 +84,9 @@ the following ways:
 
  * If you already have a trusted version of GnuPG installed, you
    can simply check the supplied signature.  For example to check the
-   signature of the file gnupg-2.0.20.tar.bz2 you would use this command:
+   signature of the file gnupg-2.0.21.tar.bz2 you would use this command:
 
-     gpg --verify gnupg-2.0.20.tar.bz2.sig
+     gpg --verify gnupg-2.0.21.tar.bz2.sig
 
    This checks whether the signature file matches the source file.
    You should see a message indicating that the signature is good and
@@ -129,15 +109,15 @@ the following ways:
 
  * If you are not able to use an old version of GnuPG, you have to verify
    the SHA-1 checksum.  Assuming you downloaded the file
-   gnupg-2.0.20.tar.bz2, you would run the sha1sum command like this:
+   gnupg-2.0.21.tar.bz2, you would run the sha1sum command like this:
 
-     sha1sum gnupg-2.0.20.tar.bz2
+     sha1sum gnupg-2.0.21.tar.bz2
 
    and check that the output matches the first line from the
    following list:
 
-7ddfefa37ee9da89a8aaa8f9059d251b4cd02562  gnupg-2.0.20.tar.bz2
-4afefda1f42c7b8065e97c6df051fab2db552642  gnupg-2.0.19-2.0.20.diff.bz2
+5ba8cce72eb4fd1a3ac1a282d25d7c7b90d3bf26  gnupg-2.0.21.tar.bz2
+cd94a6267088eeff4735641b1fc832a1e6770ba3  gnupg-2.0.20-2.0.21.diff.bz2
 
 
 Documentation
@@ -179,9 +159,9 @@ service directory at:
 
 The driving force behind the development of GnuPG is the company of
 its principal author, Werner Koch.  Maintenance and improvement of
-GnuPG and related software takes up most of their resources.  To
-allow him them continue his work he asks to either purchase a support
-contract, engage them for custom enhancements, or to donate money:
+GnuPG and related software takes up most of their resources.  To allow
+him to continue this work he kindly asks to either purchase a support
+contract, engage g10 Code for custom enhancements, or to donate money:
 
   http://g10code.com/gnupg-donation.html
 
@@ -191,7 +171,7 @@ Thanks
 
 We have to thank all the people who helped with this release, be it
 testing, coding, translating, suggesting, auditing, administering the
-servers, spreading the word or answering questions on the mailing
+servers, spreading the word, or answering questions on the mailing
 lists.
 
 
diff --git a/configure.ac b/configure.ac
index 3d0b036..9814110 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ min_automake_version="1.10"
 # (git tag -s gnupg-2.n.m) and run "./autogen.sh --force".  Please
 # bump the version number immediately *after* the release and do
 # another commit and push so that the git magic is able to work.
-m4_define([mym4_version], [2.0.21])
+m4_define([mym4_version], [2.0.22])
 
 # Below is m4 magic to extract and compute the git revision number,
 # the decimalized short revision number, a beta version string and a

commit 9cf37aa69051d08c738dff355bac593aba4bdbb4
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 19 13:09:07 2013 +0200

    Release 2.0.21

diff --git a/NEWS b/NEWS
index 990e241..d40f7d5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Noteworthy changes in version 2.0.21 (unreleased)
+Noteworthy changes in version 2.0.21 (2013-08-19)
 -------------------------------------------------
 
  * gpg-agent: By default the users are now asked via the Pinentry
@@ -6,10 +6,13 @@ Noteworthy changes in version 2.0.21 (unreleased)
    marking of such keys, the new option --no-allow-mark-trusted may
    be used.
 
+ * gpg-agent: The command KEYINFO has options to add info from
+   sshcontrol.
+
  * The included ssh agent does now support ECDSA keys.
 
- * The new option --enable-putty-support allows gpg-agent on Windows
-   to act as a Pageant replacement with full smartcard support.
+ * The new option --enable-putty-support allows gpg-agent to act on
+   Windows as a Pageant replacement with full smartcard support.
 
  * Support installation as portable application under Windows.
 

commit 2d360a96375843c437680b28a4f96f176d70a7c1
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 19 13:08:37 2013 +0200

    Require libgpg-error 1.11.
    
    * configure.ac (NEED_GPG_ERROR_VERSION): Set to 1.11.
    * common/util.h: Remove GPG_ERR_ replacements.
    --
    
    The replacement macros actually never worked because gog-error.h uses
    enums and not macros.  libgpg-error 1.11 is 6 months old and thus it
    should not be a problem to require that version.
    
    Future replacement macros may then use the new
    GPG_ERROR_VERSION_NUMBER to detect missing error codes.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/util.h b/common/util.h
index cad6c8e..becc9cf 100644
--- a/common/util.h
+++ b/common/util.h
@@ -25,13 +25,6 @@
 #include <errno.h>  /* We need errno.  */
 #include <gpg-error.h> /* We need gpg_error_t. */
 
-/* Add error codes available only in newer versions of libgpg-error.  */
-#ifndef GPG_ERR_NOT_ENABLED
-#define GPG_ERR_NOT_ENABLED 179
-#endif
-#ifndef GPG_ERR_MISSING_ISSUER_CERT
-#define GPG_ERR_MISSING_ISSUER_CERT 185
-#endif
 
 /* Hash function used with libksba. */
 #define HASH_FNC ((void (*)(void *, const void*,size_t))gcry_md_write)
@@ -62,10 +55,10 @@
 
 
 /* GCC attributes.  */
-#if __GNUC__ >= 4 
+#if __GNUC__ >= 4
 # define GNUPG_GCC_A_SENTINEL(a) __attribute__ ((sentinel(a)))
 #else
-# define GNUPG_GCC_A_SENTINEL(a) 
+# define GNUPG_GCC_A_SENTINEL(a)
 #endif
 
 
@@ -159,14 +152,14 @@ int answer_is_yes_no_quit (const char *s);
 int answer_is_okay_cancel (const char *s, int def_answer);
 
 /*-- xreadline.c --*/
-ssize_t read_line (FILE *fp, 
+ssize_t read_line (FILE *fp,
                    char **addr_of_buffer, size_t *length_of_buffer,
                    size_t *max_length);
 
 
 /*-- b64enc.c and b64dec.c --*/
-struct b64state 
-{ 
+struct b64state
+{
   unsigned int flags;
   int idx;
   int quad_count;
@@ -205,9 +198,9 @@ unsigned char *make_canon_sexp_from_rsa_pk (const void *m, size_t mlen,
                                             size_t *r_len);
 gpg_error_t get_rsa_pk_from_canon_sexp (const unsigned char *keydata,
                                         size_t keydatalen,
-                                        unsigned char const **r_n, 
+                                        unsigned char const **r_n,
                                         size_t *r_nlen,
-                                        unsigned char const **r_e, 
+                                        unsigned char const **r_e,
                                         size_t *r_elen);
 gpg_error_t get_pk_algo_from_canon_sexp (const unsigned char *keydata,
                                          size_t keydatalen,
@@ -246,7 +239,7 @@ const char *dirmngr_socket_name (void);
    gpgconf. */
 #define GNUPG_MODULE_NAME_AGENT        1
 #define GNUPG_MODULE_NAME_PINENTRY     2
-#define GNUPG_MODULE_NAME_SCDAEMON     3 
+#define GNUPG_MODULE_NAME_SCDAEMON     3
 #define GNUPG_MODULE_NAME_DIRMNGR      4
 #define GNUPG_MODULE_NAME_PROTECT_TOOL 5
 #define GNUPG_MODULE_NAME_CHECK_PATTERN 6
@@ -296,7 +289,7 @@ int match_multistr (const char *multistr,const char *match);
 #ifndef HAVE_TTYNAME
 /* Systems without ttyname (W32) will merely return NULL. */
 static inline char *
-ttyname (int fd) 
+ttyname (int fd)
 {
   (void)fd;
   return NULL;
diff --git a/configure.ac b/configure.ac
index 4080699..3d0b036 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
 
 AC_INIT([gnupg],[mym4_full_version], [http://bugs.gnupg.org])
 
-NEED_GPG_ERROR_VERSION=1.7
+NEED_GPG_ERROR_VERSION=1.11
 
 NEED_LIBGCRYPT_API=1
 NEED_LIBGCRYPT_VERSION=1.4.0

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

Summary of changes:
 NEWS          |   13 +++++++--
 announce.txt  |   76 +++++++++++++++++++++------------------------------------
 common/util.h |   25 ++++++------------
 configure.ac  |    4 +-
 4 files changed, 49 insertions(+), 69 deletions(-)


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



From cvs at cvs.gnupg.org  Mon Aug 19 16:24:25 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Mon, 19 Aug 2013 16:24:25 +0200
Subject: [git] GpgOL - branch, master, updated. gpgol-1.1.3-69-gbcc002d
Message-ID: <E1VBPtb-000623-NL@lists.gnupg.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".

The branch, master has been updated
       via  bcc002d266e0bbe6a817c74db377218a66dbe105 (commit)
       via  36bb811f0dee16e61fe58576e6d1102a8c389da3 (commit)
       via  0e767de48ad5178f190cbe3c54bbb13b6a289d7e (commit)
       via  9038766c61cbbfeb1d049a9231904fe3cc9b19e9 (commit)
       via  a124377ef96ee8710ea0a320429d2cf292df7519 (commit)
      from  e512053443e6f1d7fd2fa87d625535c95c9a400f (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 bcc002d266e0bbe6a817c74db377218a66dbe105
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 19 15:51:55 2013 +0200

    Post release updates.
    
    --

diff --git a/NEWS b/NEWS
index 40d74ab..f5d6f9f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes for version 1.2.1 (unreleased)
+=================================================
+
+
 Noteworthy changes for version 1.2.0 (2013-08-19)
 =================================================
 
diff --git a/configure.ac b/configure.ac
index 4950c34..3297975 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ min_automake_version="1.9.4"
 # (git tag -s gpgol-k.n.m) and run "./autogen.sh --force".  Please
 # bump the version number immediately *after* the release and do
 # another commit and push so that the git magic is able to work.
-m4_define([mym4_version], [1.2.0])
+m4_define([mym4_version], [1.2.1])
 
 # Below is m4 magic to extract and compute the git revision number,
 # the decimalized short revision number, a beta version string and a

commit 36bb811f0dee16e61fe58576e6d1102a8c389da3
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 19 15:38:53 2013 +0200

    Release 1.2.0.

diff --git a/AUTHORS b/AUTHORS
index b902299..288efac 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,22 +1,24 @@
-Package: gpgol
-Contact: info-gpgol at g10code.com
-Bugs:    bug-gpgol at g10code.com
-License: LGPLv2.1+
-
-
-g10 Code GmbH 
-        New code and packet maintainer.
-
-Timo Schulz <twoaday at freakmail.de>
-        All code from the years 2003, 2004
-
-Daniel Nylander <po at danielnylander.se>
-        Swedish translation.
-
-Marco A.G.Pinto  <marcoagpinto at mail.telepac.pt>
-        Portuguese translation.
-
-
-Some files may still contain code from the orginal plugin:
-Copyright (C) 2001 G Data Software AG, http://www.gdata.de
-
+Package: gpgol
+Contact: info-gpgol at g10code.com
+Bugs:    http://bugs.gnupg.org
+License: LGPLv2.1+
+
+
+g10 Code GmbH
+        New code and packet maintainer.
+
+Timo Schulz <twoaday at freakmail.de>
+        All code from the years 2003, 2004
+
+Daniel Nylander <po at danielnylander.se>
+        Swedish translation.
+
+Marco A.G.Pinto  <marcoagpinto at mail.telepac.pt>
+        Portuguese translation.
+
+Andre Heinecke <aheinecke at intevation.de>
+        Code to support Outlook 2010
+
+
+Some files may still contain code from the orginal plugin:
+Copyright (C) 2001 G Data Software AG, http://www.gdata.de
diff --git a/NEWS b/NEWS
index 56d0a8c..40d74ab 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
-Noteworthy changes for version 1.1.4 (unreleased)
+Noteworthy changes for version 1.2.0 (2013-08-19)
 =================================================
 
+ * Basic support for Outlook 2010 and later.
+
 
 Noteworthy changes for version 1.1.3 (2011-12-27)
 =================================================
diff --git a/configure.ac b/configure.ac
index 624dcc0..4950c34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ min_automake_version="1.9.4"
 # (git tag -s gpgol-k.n.m) and run "./autogen.sh --force".  Please
 # bump the version number immediately *after* the release and do
 # another commit and push so that the git magic is able to work.
-m4_define([mym4_version], [1.1.4])
+m4_define([mym4_version], [1.2.0])
 
 # Below is m4 magic to extract and compute the git revision number,
 # the decimalized short revision number, a beta version string and a

commit 0e767de48ad5178f190cbe3c54bbb13b6a289d7e
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 19 15:36:05 2013 +0200

    po: Auto updates.
    
    --

diff --git a/po/de.po b/po/de.po
index ad13f19..e7ab3a3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GpgOL 1.0.0\n"
 "Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2013-08-13 09:16+0000\n"
+"POT-Creation-Date: 2013-08-19 15:35+0200\n"
 "PO-Revision-Date: 2009-06-18 19:18+0200\n"
 "Last-Translator: Werner Koch <wk at gnupg.org>\n"
 "Language-Team: de\n"
diff --git a/po/pt.po b/po/pt.po
index 1d81748..6d057d4 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GpgOL 1.1.1\n"
 "Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2013-08-13 09:16+0000\n"
+"POT-Creation-Date: 2013-08-19 15:35+0200\n"
 "PO-Revision-Date: 2010-07-18 20:41-0000\n"
 "Last-Translator: Marco A.G.Pinto <marcoagpinto at mail.telepac.pt>\n"
 "Language-Team: Portuguese <marcoagpinto at mail.telepac.pt>\n"
diff --git a/po/sv.po b/po/sv.po
index 9a7c5a2..d66cce2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GPGol\n"
 "Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2013-08-13 09:16+0000\n"
+"POT-Creation-Date: 2013-08-19 15:35+0200\n"
 "PO-Revision-Date: 2006-12-12 23:52+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"

commit 9038766c61cbbfeb1d049a9231904fe3cc9b19e9
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 19 15:15:55 2013 +0200

    Minor configure.ac fixes for newer autoconfs.

diff --git a/configure.ac b/configure.ac
index 45098f6..624dcc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,7 +212,7 @@ if test "$GCC" = yes; then
         AC_MSG_CHECKING([if gcc supports -Wno-missing-field-initializers])
         _gcc_cflags_save=$CFLAGS
         CFLAGS="-Wno-missing-field-initializers"
-        AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]),_gcc_mfi=yes,_gcc_mfi=no)
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_mfi=yes,_gcc_mfi=no)
         AC_MSG_RESULT($_gcc_mfi)
         CFLAGS=$_gcc_cflags_save;
         if test x"$_gcc_mfi" = xyes ; then
@@ -224,7 +224,7 @@ if test "$GCC" = yes; then
     AC_MSG_CHECKING([if gcc supports -Wno-pointer-sign])
     _gcc_cflags_save=$CFLAGS
     CFLAGS="-Wno-pointer-sign"
-    AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]),_gcc_psign=yes,_gcc_psign=no)
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_psign=yes,_gcc_psign=no)
     AC_MSG_RESULT($_gcc_psign)
     CFLAGS=$_gcc_cflags_save;
     if test x"$_gcc_psign" = xyes ; then

commit a124377ef96ee8710ea0a320429d2cf292df7519
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 19 15:10:50 2013 +0200

    Update auto version numbering to the modern scheme.
    
    * configure.ac: Add git m4 magic.

diff --git a/configure.ac b/configure.ac
index ebec300..45098f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,18 +13,27 @@
 AC_PREREQ(2.59)
 min_automake_version="1.9.4"
 
-# Remember to change the version number immediately *after* a release.
-# Set my_issvn to "yes" for non-released code.  Remember to run an
-# "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [1.1.4])
-m4_define([my_isgit], [yes])
-
-m4_define([git_commit], m4_esyscmd([git branch -v 2>/dev/null \
-          | awk '/^\* / {printf "%s",$3}']))
-m4_define([my_full_version],
-          [my_version[]m4_if(my_isgit,[yes],[-git[]git_commit])])
-
-AC_INIT([gpgol],[my_full_version],[bug-gpgol at g10code.com])
+# To build a release you need to create a tag with the version number
+# (git tag -s gpgol-k.n.m) and run "./autogen.sh --force".  Please
+# bump the version number immediately *after* the release and do
+# another commit and push so that the git magic is able to work.
+m4_define([mym4_version], [1.1.4])
+
+# Below is m4 magic to extract and compute the git revision number,
+# the decimalized short revision number, a beta version string and a
+# flag indicating a development version (mym4_isgit).  Note that the
+# m4 processing is done by autoconf and not during the configure run.
+m4_define([mym4_revision],
+          m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
+m4_define([mym4_revision_dec],
+          m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
+m4_define([mym4_betastring],
+          m4_esyscmd_s([git describe --match 'gpgol-[0-9].[0-9].*[0-9]' \
+                         --long | awk -F- '$3!=0{print"-beta"$3}']))
+m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
+AC_INIT([gpgol],[mym4_full_version], [http://bugs.gnupg.org])
 
 # Bump up this value if you changed any form.
 GPGOL_FORMS_REVISION=335
@@ -36,8 +45,8 @@ NEED_LIBASSUAN_API=2
 NEED_LIBASSUAN_VERSION=2.0.0
 
 
-GIT_COMMIT=0x[]git_commit
-GIT_COMMIT_DECIMAL="$((0x$(echo git_commit | head -c 4)))"
+GIT_COMMIT=0x[]mym4_revision
+GIT_COMMIT_DECIMAL=0x[]mym4_revision_dec
 PACKAGE=$PACKAGE_NAME
 PACKAGE_GT=${PACKAGE_NAME}
 VERSION=$PACKAGE_VERSION

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

Summary of changes:
 AUTHORS      |   46 ++++++++++++++++++++++++----------------------
 NEWS         |    8 +++++++-
 configure.ac |   41 +++++++++++++++++++++++++----------------
 po/de.po     |    2 +-
 po/pt.po     |    2 +-
 po/sv.po     |    2 +-
 6 files changed, 59 insertions(+), 42 deletions(-)


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



From cvs at cvs.gnupg.org  Mon Aug 19 21:03:45 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Mon, 19 Aug 2013 21:03:45 +0200
Subject: [git] GPA - branch, master, updated. gpa-0.9.4-11-g45eb36a
Message-ID: <E1VBUFt-0001LI-Kl@lists.gnupg.org>

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

The branch, master has been updated
       via  45eb36a00e0bb39fd02cb065e79cbc53945e7103 (commit)
      from  d3f20e7883f2fb9e52e487fd516bdc7b9bc695ed (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 45eb36a00e0bb39fd02cb065e79cbc53945e7103
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 19 20:29:25 2013 +0200

    Fix wrong use of GPGME_EVENT_DONE.
    
    * src/gpacontext.c (gpa_context_event_cb): Fix use of TYPE_DATA.  Add
    debug output.
    --
    
    With GPGME commit c8e934b2 (2009-10-26) gpgme_io_event_done_data_t was
    introduced to replace the use of gpg_error_t with GPGME_EVENT_DONE.
    Unfortunately this was not documented.  Maybe at that time the event
    code was considered internal and its use in GPA was not known.  Too
    bad.

diff --git a/src/gpacontext.c b/src/gpacontext.c
index e021d5f..b049f84 100644
--- a/src/gpacontext.c
+++ b/src/gpacontext.c
@@ -405,16 +405,21 @@ static void
 gpa_context_event_cb (void *data, gpgme_event_io_t type, void *type_data)
 {
   GpaContext *context = data;
-  gpg_error_t *err;
-  
+  gpg_error_t err, op_err;
+
   switch (type)
     {
     case GPGME_EVENT_START:
       g_signal_emit (context, signals[START], 0);
       break;
     case GPGME_EVENT_DONE:
-      err = type_data;
-      g_signal_emit (context, signals[DONE], 0, *err);
+      err = ((gpgme_io_event_done_data_t)type_data)->err;
+      op_err = ((gpgme_io_event_done_data_t)type_data)->op_err;
+      g_debug ("EVENT_DONE: err=%s op_err=%s",
+               gpg_strerror (err), gpg_strerror (op_err));
+      if (!err)
+        err = op_err;
+      g_signal_emit (context, signals[DONE], 0, err);
       break;
     case GPGME_EVENT_NEXT_KEY:
       g_signal_emit (context, signals[NEXT_KEY], 0, type_data);

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

Summary of changes:
 src/gpacontext.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)


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



From cvs at cvs.gnupg.org  Mon Aug 19 21:27:25 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Mon, 19 Aug 2013 21:27:25 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.4.2-13-gb0aaa3f
Message-ID: <E1VBUcn-0001aJ-GH@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  b0aaa3f9aef36634b5c391812362f016114f02ba (commit)
       via  372bd439834c69d502668007c8c683233d676bd5 (commit)
       via  eae9c32bd9c80ca4a4ecf794808211808f2ebbdd (commit)
      from  d788c35e19df9eade8eb0b880ca1dc47ae7928ad (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 b0aaa3f9aef36634b5c391812362f016114f02ba
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 19 20:43:19 2013 +0200

    Document API change for GPGME_EVENT_DONE from 2009.
    
    * doc/gpgme.texi (I/O Callback Interface): Fix description for the
    event arg.
    --
    
    With commit c8e934b2 (2009-10-26) gpgme_io_event_done_data_t was
    introduced to replace the use of gpg_error_t with GPGME_EVENT_DONE.
    Unfortunately this was not documented.  Maybe at that time the event
    code was considered internal and its use in GPA was not known.  Too
    bad.

diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index 4ec0bfe..18b3c94 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -5335,9 +5335,9 @@ callback handlers must not be run before this event is signalled.
 @item GPGME_EVENT_DONE
 The operation is finished, the last I/O callback for this operation
 was removed.  The accompanying @var{type_data} points to a
- at code{gpgme_error_t} variable that contains the status of the operation
-that finished.  This event is signalled after the last I/O callback
-has been removed.
+ at code{struct gpgme_io_event_done_data} variable that contains the
+status of the operation that finished.  This event is signalled after
+the last I/O callback has been removed.
 
 @item GPGME_EVENT_NEXT_KEY
 In a @code{gpgme_op_keylist_start} operation, the next key was

commit 372bd439834c69d502668007c8c683233d676bd5
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 19 20:40:10 2013 +0200

    Fix possible segv in the gpgme_op_card_edit.
    
    * src/edit.c (gpgme_op_edit_start, gpgme_op_card_edit_start): Do not
    deref a NULL KEY in TRACE_BEG.

diff --git a/src/edit.c b/src/edit.c
index 1f73078..72fa458 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -143,7 +143,7 @@ gpgme_op_edit_start (gpgme_ctx_t ctx, gpgme_key_t key,
 
   TRACE_BEG5 (DEBUG_CTX, "gpgme_op_edit_start", ctx,
 	      "key=%p (%s), fnc=%p fnc_value=%p, out=%p", key,
-	      (key->subkeys && key->subkeys->fpr) ?
+	      (key && key->subkeys && key->subkeys->fpr) ?
 	      key->subkeys->fpr : "invalid", fnc, fnc_value, out);
 
   if (!ctx)
@@ -164,7 +164,7 @@ gpgme_op_edit (gpgme_ctx_t ctx, gpgme_key_t key,
 
   TRACE_BEG5 (DEBUG_CTX, "gpgme_op_edit", ctx,
 	      "key=%p (%s), fnc=%p fnc_value=%p, out=%p", key,
-	      (key->subkeys && key->subkeys->fpr) ?
+	      (key && key->subkeys && key->subkeys->fpr) ?
 	      key->subkeys->fpr : "invalid", fnc, fnc_value, out);
 
   if (!ctx)
@@ -187,7 +187,7 @@ gpgme_op_card_edit_start (gpgme_ctx_t ctx, gpgme_key_t key,
 
   TRACE_BEG5 (DEBUG_CTX, "gpgme_op_card_edit_start", ctx,
 	      "key=%p (%s), fnc=%p fnc_value=%p, out=%p", key,
-	      (key->subkeys && key->subkeys->fpr) ?
+	      (key && key->subkeys && key->subkeys->fpr) ?
 	      key->subkeys->fpr : "invalid", fnc, fnc_value, out);
 
   if (!ctx)
@@ -208,7 +208,7 @@ gpgme_op_card_edit (gpgme_ctx_t ctx, gpgme_key_t key,
 
   TRACE_BEG5 (DEBUG_CTX, "gpgme_op_card_edit", ctx,
 	      "key=%p (%s), fnc=%p fnc_value=%p, out=%p", key,
-	      (key->subkeys && key->subkeys->fpr) ?
+	      (key && key->subkeys && key->subkeys->fpr) ?
 	      key->subkeys->fpr : "invalid", fnc, fnc_value, out);
 
   if (!ctx)

commit eae9c32bd9c80ca4a4ecf794808211808f2ebbdd
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 19 20:38:36 2013 +0200

    tests: Fix NULL ptr deref in gpgsm/t-verify.
    
    * tests/gpgsm/t-verify.c (check_result): Do not dereference a sig or
    sig->fpr if NULL.

diff --git a/tests/gpgsm/t-verify.c b/tests/gpgsm/t-verify.c
index a26617e..901b46f 100644
--- a/tests/gpgsm/t-verify.c
+++ b/tests/gpgsm/t-verify.c
@@ -63,6 +63,8 @@ check_result (gpgme_verify_result_t result, int summary, char *fpr,
       fprintf (stderr, "%s:%i: Unexpected number of signatures\n",
 	       __FILE__, __LINE__);
       got_errors = 1;
+      if (!sig)
+        return;
     }
   if (sig->summary != summary)
     {
@@ -71,7 +73,7 @@ check_result (gpgme_verify_result_t result, int summary, char *fpr,
 	       __FILE__, __LINE__, summary, sig->summary);
       got_errors = 1;
     }
-  if (strcmp (sig->fpr, fpr))
+  if (sig->fpr && strcmp (sig->fpr, fpr))
     {
       fprintf (stderr, "%s:%i: Unexpected fingerprint: %s\n",
 	       __FILE__, __LINE__, sig->fpr);

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

Summary of changes:
 doc/gpgme.texi         |    6 +++---
 src/edit.c             |    8 ++++----
 tests/gpgsm/t-verify.c |    4 +++-
 3 files changed, 10 insertions(+), 8 deletions(-)


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



From cvs at cvs.gnupg.org  Tue Aug 20 12:11:09 2013
From: cvs at cvs.gnupg.org (by Jussi Kivilinna)
Date: Tue, 20 Aug 2013 12:11:09 +0200
Subject: [git] GCRYPT - branch, master, updated. libgcrypt-1.5.0-194-gda327ae
Message-ID: <E1VBiPw-0000v6-Rt@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  da327aef3fe24fdf98fffbc8aea69de42ed12456 (commit)
       via  151f1e518be2d16bed748ba832384b0472ddcf9b (commit)
       via  c030e33533fb819afe195eff5f89ec39863b1fbc (commit)
       via  796dda37b957b20dba391343937c6325a8c8b288 (commit)
       via  79895b9459b9bf8c60cb7abf09d5bf16ed0cf6e3 (commit)
      from  cafadc1e4fb97581262b0081ba251e05613d4394 (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 da327aef3fe24fdf98fffbc8aea69de42ed12456
Author: Jussi Kivilinna <jussi.kivilinna at iki.fi>
Date:   Sat Aug 17 13:41:03 2013 +0300

    mpi: add ARMv6 assembly
    
    * mpi/armv6/mpi-asm-defs.h: New.
    * mpi/armv6/mpih-add1.S: New.
    * mpi/armv6/mpih-mul1.S: New.
    * mpi/armv6/mpih-mul2.S: New.
    * mpi/armv6/mpih-mul3.S: New.
    * mpi/armv6/mpih-sub1.S: New.
    * mpi/config.links [arm]: Enable ARMv6 assembly.
    --
    
    Add mpi assembly for ARMv6 (or later). These are partly based on ARM assembly
    found in GMP 4.2.1.
    
    Old vs new (Cortex-A8, 1Ghz):
    
    Algorithm         generate  100*sign  100*verify
    ------------------------------------------------
    ECDSA 192 bit        1.14x     1.10x       1.13x
    ECDSA 224 bit        1.11x     1.12x       1.12x
    ECDSA 256 bit        1.20x     1.13x       1.14x
    ECDSA 384 bit        1.13x     1.21x       1.21x
    ECDSA 521 bit        1.17x     1.20x       1.22x
    Algorithm         generate  100*sign  100*verify
    ------------------------------------------------
    RSA 1024 bit             -     1.31x       1.60x
    RSA 2048 bit             -     1.41x       1.47x
    RSA 3072 bit             -     1.50x       1.63x
    RSA 4096 bit             -     1.50x       1.57x
    Algorithm         generate  100*sign  100*verify
    ------------------------------------------------
    DSA 1024/160             -     1.39x       1.38x
    DSA 2048/224             -     1.50x       1.51x
    DSA 3072/256             -     1.59x       1.64x
    
    NEW:
    
    Algorithm         generate  100*sign  100*verify
    ------------------------------------------------
    ECDSA 192 bit         70ms    1750ms      3170ms
    ECDSA 224 bit         90ms    2210ms      4250ms
    ECDSA 256 bit        100ms    2710ms      5170ms
    ECDSA 384 bit        230ms    5670ms     11040ms
    ECDSA 521 bit        540ms   13370ms     25870ms
    Algorithm         generate  100*sign  100*verify
    ------------------------------------------------
    RSA 1024 bit         360ms    2200ms        50ms
    RSA 2048 bit        2770ms   11900ms       150ms
    RSA 3072 bit        6680ms   32530ms       270ms
    RSA 4096 bit       10320ms   69440ms       460ms
    Algorithm         generate  100*sign  100*verify
    ------------------------------------------------
    DSA 1024/160             -     990ms       910ms
    DSA 2048/224             -    3830ms      3410ms
    DSA 3072/256             -    8270ms      7030ms
    
    OLD:
    
    Algorithm         generate  100*sign  100*verify
    ------------------------------------------------
    ECDSA 192 bit         80ms    1920ms      3580ms
    ECDSA 224 bit        100ms    2470ms      4760ms
    ECDSA 256 bit        120ms    3050ms      5870ms
    ECDSA 384 bit        260ms    6840ms     13330ms
    ECDSA 521 bit        630ms   16080ms     31500ms
    Algorithm         generate  100*sign  100*verify
    ------------------------------------------------
    RSA 1024 bit         450ms    2890ms        80ms
    RSA 2048 bit        2320ms   16760ms       220ms
    RSA 3072 bit       26300ms   48650ms       440ms
    RSA 4096 bit       15700ms   103910ms      720ms
    Algorithm         generate  100*sign  100*verify
    ------------------------------------------------
    DSA 1024/160             -    1380ms      1260ms
    DSA 2048/224             -    5740ms      5140ms
    DSA 3072/256             -   13130ms     11510ms
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>

diff --git a/mpi/armv6/mpi-asm-defs.h b/mpi/armv6/mpi-asm-defs.h
new file mode 100644
index 0000000..047d1f5
--- /dev/null
+++ b/mpi/armv6/mpi-asm-defs.h
@@ -0,0 +1,4 @@
+/* This file defines some basic constants for the MPI machinery.  We
+ * need to define the types on a per-CPU basis, so it is done with
+ * this file here.  */
+#define BYTES_PER_MPI_LIMB  (SIZEOF_UNSIGNED_LONG)
diff --git a/mpi/armv6/mpih-add1.S b/mpi/armv6/mpih-add1.S
new file mode 100644
index 0000000..60ea4c3
--- /dev/null
+++ b/mpi/armv6/mpih-add1.S
@@ -0,0 +1,76 @@
+/* ARMv6 add_n -- Add two limb vectors of the same length > 0 and store
+ *                sum in a third limb vector.
+ *
+ *      Copyright ? 2013 Jussi Kivilinna <jussi.kivilinna at iki.fi>
+ *
+ * This file is part of Libgcrypt.
+ *
+ * Libgcrypt 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.
+ *
+ * Libgcrypt 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/>.
+ *
+ * Note: This code is heavily based on the GNU MP Library (version 4.2.1).
+ */
+
+#include "sysdep.h"
+#include "asm-syntax.h"
+
+.syntax unified
+.arm
+
+/*******************
+ *  mpi_limb_t
+ *  _gcry_mpih_add_n( mpi_ptr_t res_ptr,	%r0
+ *		   mpi_ptr_t s1_ptr,		%r1
+ *		   mpi_ptr_t s2_ptr,		%r2
+ *		   mpi_size_t size)		%r3
+ */
+
+.text
+
+.globl _gcry_mpih_add_n
+.type  _gcry_mpih_add_n,%function
+_gcry_mpih_add_n:
+	push	{%r4, %r5, %r6, %r7, %r8, %r9, %r10, %lr};
+	cmn	%r0, #0; /* clear carry flag */
+
+	tst	%r3, #3;
+	beq	.Large_loop;
+
+.Loop:
+	ldr	%r4, [%r1], #4;
+	sub	%r3, #1;
+	ldr	%lr, [%r2], #4;
+	adcs	%r4, %lr;
+	tst	%r3, #3;
+	str	%r4, [%r0], #4;
+	bne	.Loop;
+
+	teq	%r3, #0;
+	beq	.Lend;
+
+.Large_loop:
+	ldm	%r1!, {%r4, %r6, %r8, %r10};
+	ldm	%r2!, {%r5, %r7, %r9, %lr};
+	sub	%r3, #4;
+	adcs	%r4, %r5;
+	adcs	%r6, %r7;
+	adcs	%r8, %r9;
+	adcs	%r10, %lr;
+	teq	%r3, #0;
+	stm	%r0!, {%r4, %r6, %r8, %r10};
+	bne	.Large_loop;
+
+.Lend:
+	adc	%r0, %r3, #0;
+	pop	{%r4, %r5, %r6, %r7, %r8, %r9, %r10, %pc};
+.size _gcry_mpih_add_n,.-_gcry_mpih_add_n;
diff --git a/mpi/armv6/mpih-mul1.S b/mpi/armv6/mpih-mul1.S
new file mode 100644
index 0000000..ae19a15
--- /dev/null
+++ b/mpi/armv6/mpih-mul1.S
@@ -0,0 +1,80 @@
+/* ARMv6 mul_1 -- Multiply a limb vector with a limb and store the result in
+ *                a second limb vector.
+ *
+ *      Copyright ? 2013 Jussi Kivilinna <jussi.kivilinna at iki.fi>
+ *
+ * This file is part of Libgcrypt.
+ *
+ * Libgcrypt 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.
+ *
+ * Libgcrypt 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/>.
+ *
+ * Note: This code is heavily based on the GNU MP Library (version 4.2.1).
+ */
+
+#include "sysdep.h"
+#include "asm-syntax.h"
+
+.syntax unified
+.arm
+
+/*******************
+ * mpi_limb_t
+ * _gcry_mpih_mul_1( mpi_ptr_t res_ptr,		%r0
+ *		  mpi_ptr_t s1_ptr,		%r1
+ *		  mpi_size_t s1_size,		%r2
+ *		  mpi_limb_t s2_limb)		%r3
+ */
+
+.text
+
+.globl _gcry_mpih_mul_1
+.type  _gcry_mpih_mul_1,%function
+_gcry_mpih_mul_1:
+	push	{%r4, %r5, %r6, %r7, %r8, %r9, %r10, %r11, %lr};
+	mov	%r4, #0;
+
+	tst	%r2, #3;
+	beq	.Large_loop;
+
+.Loop:
+	ldr	%r5, [%r1], #4;
+	mov	%lr, #0;
+	umlal	%r4, %lr, %r5, %r3;
+	sub	%r2, #1;
+	str	%r4, [%r0], #4;
+	tst	%r2, #3;
+	mov	%r4, %lr;
+	bne	.Loop;
+
+	teq	%r2, #0;
+	beq	.Lend;
+
+.Large_loop:
+	mov	%r9, #0;
+	ldm	%r1!, {%r5, %r6, %r7, %r8};
+	mov	%r10, #0;
+	umlal	%r4, %r9, %r5, %r3;
+	mov	%r11, #0;
+	umlal	%r9, %r10, %r6, %r3;
+	mov	%lr, #0;
+	umlal	%r10, %r11, %r7, %r3;
+	subs	%r2, #4;
+	umlal	%r11, %lr, %r8, %r3;
+	stm	%r0!, {%r4, %r9, %r10, %r11};
+	mov	%r4, %lr;
+	bne	.Large_loop;
+
+.Lend:
+	mov	%r0, %r4;
+	pop	{%r4, %r5, %r6, %r7, %r8, %r9, %r10, %r11, %pc};
+.size _gcry_mpih_mul_1,.-_gcry_mpih_mul_1;
diff --git a/mpi/armv6/mpih-mul2.S b/mpi/armv6/mpih-mul2.S
new file mode 100644
index 0000000..02f7c07
--- /dev/null
+++ b/mpi/armv6/mpih-mul2.S
@@ -0,0 +1,94 @@
+/* ARMv6 mul_2 -- Multiply a limb vector with a limb and add the result to
+ *                a second limb vector.
+ *
+ *      Copyright ? 2013 Jussi Kivilinna <jussi.kivilinna at iki.fi>
+ *
+ * This file is part of Libgcrypt.
+ *
+ * Libgcrypt 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.
+ *
+ * Libgcrypt 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/>.
+ *
+ * Note: This code is heavily based on the GNU MP Library (version 4.2.1).
+ */
+
+#include "sysdep.h"
+#include "asm-syntax.h"
+
+.syntax unified
+.arm
+
+/*******************
+ * mpi_limb_t
+ * _gcry_mpih_addmul_1( mpi_ptr_t res_ptr,	%r0
+ *		     mpi_ptr_t s1_ptr,		%r1
+ *		     mpi_size_t s1_size,	%r2
+ *		     mpi_limb_t s2_limb)	%r3
+ */
+
+.text
+
+.globl _gcry_mpih_addmul_1
+.type  _gcry_mpih_addmul_1,%function
+_gcry_mpih_addmul_1:
+	push	{%r4, %r5, %r6, %r8, %r10, %lr};
+	mov	%lr, #0;
+	cmn	%r0, #0; /* clear carry flag */
+
+	tst	%r2, #3;
+	beq	.Large_loop;
+.Loop:
+	ldr	%r5, [%r1], #4;
+	ldr	%r4, [%r0];
+	sub	%r2, #1;
+	adcs	%r4, %lr;
+	mov	%lr, #0;
+	umlal	%r4, %lr, %r5, %r3;
+	tst	%r2, #3;
+	str	%r4, [%r0], #4;
+	bne	.Loop;
+
+	teq	%r2, #0;
+	beq	.Lend;
+
+.Large_loop:
+	ldm	%r0, {%r4, %r6, %r8, %r10};
+	ldr	%r5, [%r1], #4;
+
+	sub	%r2, #4;
+	adcs	%r4, %lr;
+	mov	%lr, #0;
+	umlal	%r4, %lr, %r5, %r3;
+
+	ldr	%r5, [%r1], #4;
+	adcs	%r6, %lr;
+	mov	%lr, #0;
+	umlal	%r6, %lr, %r5, %r3;
+
+	ldr	%r5, [%r1], #4;
+	adcs	%r8, %lr;
+	mov	%lr, #0;
+	umlal	%r8, %lr, %r5, %r3;
+
+	ldr	%r5, [%r1], #4;
+	adcs	%r10, %lr;
+	mov	%lr, #0;
+	umlal	%r10, %lr, %r5, %r3;
+
+	teq	%r2, #0;
+	stm	%r0!, {%r4, %r6, %r8, %r10};
+	bne	.Large_loop;
+
+.Lend:
+	adc	%r0, %lr, #0;
+	pop	{%r4, %r5, %r6, %r8, %r10, %pc};
+.size _gcry_mpih_addmul_1,.-_gcry_mpih_addmul_1;
diff --git a/mpi/armv6/mpih-mul3.S b/mpi/armv6/mpih-mul3.S
new file mode 100644
index 0000000..e42fc30
--- /dev/null
+++ b/mpi/armv6/mpih-mul3.S
@@ -0,0 +1,97 @@
+/* ARMv6 mul_3 -- Multiply a limb vector with a limb and subtract the result
+ *                from a second limb vector.
+ *
+ *      Copyright ? 2013 Jussi Kivilinna <jussi.kivilinna at iki.fi>
+ *
+ * This file is part of Libgcrypt.
+ *
+ * Libgcrypt 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.
+ *
+ * Libgcrypt 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/>.
+ *
+ * Note: This code is heavily based on the GNU MP Library (version 4.2.1).
+ */
+
+#include "sysdep.h"
+#include "asm-syntax.h"
+
+.syntax unified
+.arm
+
+/*******************
+ * mpi_limb_t
+ * _gcry_mpih_submul_1( mpi_ptr_t res_ptr,	%r0
+ *		     mpi_ptr_t s1_ptr,		%r1
+ *		     mpi_size_t s1_size,	%r2
+ *		     mpi_limb_t s2_limb)	%r3
+ */
+
+.text
+
+.globl _gcry_mpih_submul_1
+.type  _gcry_mpih_submul_1,%function
+_gcry_mpih_submul_1:
+	push	{%r4, %r5, %r6, %r8, %r9, %r10, %lr};
+	mov	%lr, #0;
+	cmp	%r0, #0; /* prepare carry flag for sbc */
+
+	tst	%r2, #3;
+	beq	.Large_loop;
+.Loop:
+	ldr	%r5, [%r1], #4;
+	mov	%r4, %lr;
+	mov	%lr, #0;
+	ldr	%r6, [%r0];
+	umlal	%r4, %lr, %r5, %r3;
+	sub	%r2, #1;
+	sbcs	%r4, %r6, %r4;
+	tst	%r2, #3;
+	str	%r4, [%r0], #4;
+	bne	.Loop;
+
+	teq	%r2, #0;
+	beq	.Lend;
+
+.Large_loop:
+	ldr	%r5, [%r1], #4;
+	ldm	%r0, {%r4, %r6, %r8, %r10};
+
+	mov	%r9, #0;
+	umlal	%lr, %r9, %r5, %r3;
+	ldr	%r5, [%r1], #4;
+	sbcs	%r4, %r4, %lr;
+
+	mov	%lr, #0;
+	umlal	%r9, %lr, %r5, %r3;
+	ldr	%r5, [%r1], #4;
+	sbcs	%r6, %r6, %r9;
+
+	mov	%r9, #0;
+	umlal	%lr, %r9, %r5, %r3;
+	ldr	%r5, [%r1], #4;
+	sbcs	%r8, %r8, %lr;
+
+	mov	%lr, #0;
+	umlal	%r9, %lr, %r5, %r3;
+	sub	%r2, #4;
+	sbcs	%r10, %r10, %r9;
+
+	teq	%r2, #0;
+	stm	%r0!, {%r4, %r6, %r8, %r10};
+	bne	.Large_loop;
+
+.Lend:
+	it	cc
+	movcc	%r2, #1;
+	add	%r0, %lr, %r2;
+	pop	{%r4, %r5, %r6, %r8, %r9, %r10, %pc};
+.size _gcry_mpih_submul_1,.-_gcry_mpih_submul_1;
diff --git a/mpi/armv6/mpih-sub1.S b/mpi/armv6/mpih-sub1.S
new file mode 100644
index 0000000..77d05eb
--- /dev/null
+++ b/mpi/armv6/mpih-sub1.S
@@ -0,0 +1,77 @@
+/* ARMv6 sub_n -- Subtract two limb vectors of the same length > 0 and store
+ *		  sum in a third limb vector.
+ *
+ *      Copyright ? 2013 Jussi Kivilinna <jussi.kivilinna at iki.fi>
+ *
+ * This file is part of Libgcrypt.
+ *
+ * Libgcrypt 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.
+ *
+ * Libgcrypt 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/>.
+ *
+ * Note: This code is heavily based on the GNU MP Library (version 4.2.1).
+ */
+
+#include "sysdep.h"
+#include "asm-syntax.h"
+
+.syntax unified
+.arm
+
+/*******************
+ *  mpi_limb_t
+ *  _gcry_mpih_sub_n( mpi_ptr_t res_ptr,	%r0
+ *		   mpi_ptr_t s1_ptr,		%r1
+ *		   mpi_ptr_t s2_ptr,		%r2
+ *		   mpi_size_t size)		%r3
+ */
+
+.text
+
+.globl _gcry_mpih_sub_n
+.type  _gcry_mpih_sub_n,%function
+_gcry_mpih_sub_n:
+	push	{%r4, %r5, %r6, %r7, %r8, %r9, %r10, %lr};
+	cmp	%r0, #0; /* prepare carry flag for sub */
+
+	tst	%r3, #3;
+	beq	.Large_loop;
+
+.Loop:
+	ldr	%r4, [%r1], #4;
+	sub	%r3, #1;
+	ldr	%lr, [%r2], #4;
+	sbcs	%r4, %lr;
+	tst	%r3, #3;
+	str	%r4, [%r0], #4;
+	bne	.Loop;
+
+	teq	%r3, #0;
+	beq	.Lend;
+
+.Large_loop:
+	ldm	%r1!, {%r4, %r6, %r8, %r10};
+	sub	%r3, #4;
+	ldm	%r2!, {%r5, %r7, %r9, %lr};
+	sbcs	%r4, %r5;
+	sbcs	%r6, %r7;
+	sbcs	%r8, %r9;
+	sbcs	%r10, %lr;
+	teq	%r3, #0;
+	stm	%r0!, {%r4, %r6, %r8, %r10};
+	bne	.Large_loop;
+
+.Lend:
+	sbc	%r0, %r3, #0;
+	neg	%r0, %r0;
+	pop	{%r4, %r5, %r6, %r7, %r8, %r9, %r10, %pc};
+.size _gcry_mpih_sub_n,.-_gcry_mpih_sub_n;
diff --git a/mpi/config.links b/mpi/config.links
index bcc6e3e..f300255 100644
--- a/mpi/config.links
+++ b/mpi/config.links
@@ -136,6 +136,21 @@ case "${host}" in
 	mpi_extra_modules="udiv-qrnnd"
         mpi_cpu_arch="alpha"
 	;;
+    arm*-*-*)
+	if test "$gcry_cv_gcc_arm_platform_as_ok" = "yes" ; then
+	  if test "$gcry_cv_cc_arm_arch_is_v6" = "yes" ; then
+	    echo '/* configured for armv6 */' >>./mpi/asm-syntax.h
+	    path="armv6"
+	    mpi_cpu_arch="armv6"
+	  else
+	    echo '/* No assembler modules configured */' >>./mpi/asm-syntax.h
+	    path=""
+	  fi
+	else
+	  echo '/* No assembler modules configured */' >>./mpi/asm-syntax.h
+	  path=""
+	fi
+	;;
     hppa7000*-*-*)
 	echo '/* configured for HPPA (pa7000) */' >>./mpi/asm-syntax.h
 	path="hppa1.1 hppa"

commit 151f1e518be2d16bed748ba832384b0472ddcf9b
Author: Jussi Kivilinna <jussi.kivilinna at iki.fi>
Date:   Sat Aug 17 13:41:46 2013 +0300

    Move ARMv6 detection to configure.ac
    
    * cipher/blowfish-armv6.S: Replace __ARM_ARCH >= 6 checks with
    HAVE_ARM_ARCH_V6.
    * cipher/blowfish.c: Ditto.
    * cipher/camellia-armv6.S: Ditto.
    * cipher/camellia.h: Ditto.
    * cipher/cast5-armv6.S: Ditto.
    * cipher/cast5.c: Ditto.
    * cipher/rijndael-armv6.S: Ditto.
    * cipher/rijndael.c: Ditto.
    * configure.ac: Add HAVE_ARM_ARCH_V6 check.
    --
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>

diff --git a/cipher/blowfish-armv6.S b/cipher/blowfish-armv6.S
index b11d27f..eea879f 100644
--- a/cipher/blowfish-armv6.S
+++ b/cipher/blowfish-armv6.S
@@ -20,14 +20,7 @@
 
 #include <config.h>
 
-#if defined(__arm__) && defined(__ARMEL__) && \
-	 ((defined(__ARM_ARCH) && __ARM_ARCH >= 6) \
-	|| defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
-	|| defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) \
-	|| defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) \
-	|| defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
-	|| defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \
-	|| defined(__ARM_ARCH_7EM__))
+#if defined(HAVE_ARM_ARCH_V6) && defined(__ARMEL__)
 #ifdef HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS
 
 .text
diff --git a/cipher/blowfish.c b/cipher/blowfish.c
index fe4e280..2806433 100644
--- a/cipher/blowfish.c
+++ b/cipher/blowfish.c
@@ -52,14 +52,7 @@
 
 /* USE_ARMV6_ASM indicates whether to use ARMv6 assembly code. */
 #undef USE_ARMV6_ASM
-#if defined(__arm__) && defined(__ARMEL__) && \
-	 ((defined(__ARM_ARCH) && __ARM_ARCH >= 6) \
-	|| defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
-	|| defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) \
-	|| defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) \
-	|| defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
-	|| defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \
-	|| defined(__ARM_ARCH_7EM__))
+#if defined(HAVE_ARM_ARCH_V6) && defined(__ARMEL__)
 # if (BLOWFISH_ROUNDS == 16) && defined(HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS)
 #  define USE_ARMV6_ASM 1
 # endif
diff --git a/cipher/camellia-armv6.S b/cipher/camellia-armv6.S
index 769db02..3544754 100644
--- a/cipher/camellia-armv6.S
+++ b/cipher/camellia-armv6.S
@@ -20,14 +20,7 @@
 
 #include <config.h>
 
-#if defined(__arm__) && defined(__ARMEL__) && \
-	 ((defined(__ARM_ARCH) && __ARM_ARCH >= 6) \
-	|| defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
-	|| defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) \
-	|| defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) \
-	|| defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
-	|| defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \
-	|| defined(__ARM_ARCH_7EM__))
+#if defined(HAVE_ARM_ARCH_V6) && defined(__ARMEL__)
 #ifdef HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS
 
 .text
diff --git a/cipher/camellia.h b/cipher/camellia.h
index 48f9160..72f2d1f 100644
--- a/cipher/camellia.h
+++ b/cipher/camellia.h
@@ -32,14 +32,7 @@
 #include <config.h>
 /* USE_ARMV6_ASM indicates whether to use ARMv6 assembly code. */
 # undef USE_ARMV6_ASM
-# if defined(__arm__) && defined(__ARMEL__) && \
-	 ((defined(__ARM_ARCH) && __ARM_ARCH >= 6) \
-	|| defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
-	|| defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) \
-	|| defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) \
-	|| defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
-	|| defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \
-	|| defined(__ARM_ARCH_7EM__))
+# if defined(HAVE_ARM_ARCH_V6) && defined(__ARMEL__)
 #  ifdef HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS
 #   define USE_ARMV6_ASM 1
 #  endif
diff --git a/cipher/cast5-armv6.S b/cipher/cast5-armv6.S
index e4b2339..038fc4f 100644
--- a/cipher/cast5-armv6.S
+++ b/cipher/cast5-armv6.S
@@ -20,14 +20,7 @@
 
 #include <config.h>
 
-#if defined(__arm__) && defined(__ARMEL__) && \
-	 ((defined(__ARM_ARCH) && __ARM_ARCH >= 6) \
-	|| defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
-	|| defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) \
-	|| defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) \
-	|| defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
-	|| defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \
-	|| defined(__ARM_ARCH_7EM__))
+#if defined(HAVE_ARM_ARCH_V6) && defined(__ARMEL__)
 #ifdef HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS
 
 .text
diff --git a/cipher/cast5.c b/cipher/cast5.c
index 9e7b50f..4377c28 100644
--- a/cipher/cast5.c
+++ b/cipher/cast5.c
@@ -53,14 +53,7 @@
 
 /* USE_ARMV6_ASM indicates whether to use ARMv6 assembly code. */
 #undef USE_ARMV6_ASM
-#if defined(__arm__) && defined(__ARMEL__) && \
-	 ((defined(__ARM_ARCH) && __ARM_ARCH >= 6) \
-	|| defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
-	|| defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) \
-	|| defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) \
-	|| defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
-	|| defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \
-	|| defined(__ARM_ARCH_7EM__))
+#if defined(HAVE_ARM_ARCH_V6) && defined(__ARMEL__)
 # ifdef HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS
 #  define USE_ARMV6_ASM 1
 # endif
diff --git a/cipher/rijndael-armv6.S b/cipher/rijndael-armv6.S
index e778a94..bbbfb0e 100644
--- a/cipher/rijndael-armv6.S
+++ b/cipher/rijndael-armv6.S
@@ -20,14 +20,7 @@
 
 #include <config.h>
 
-#if defined(__arm__) && defined(__ARMEL__) && \
-	 ((defined(__ARM_ARCH) && __ARM_ARCH >= 6) \
-	|| defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
-	|| defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) \
-	|| defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) \
-	|| defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
-	|| defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \
-	|| defined(__ARM_ARCH_7EM__))
+#if defined(HAVE_ARM_ARCH_V6) && defined(__ARMEL__)
 #ifdef HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS
 
 .text
diff --git a/cipher/rijndael.c b/cipher/rijndael.c
index 8855e0c..314f106 100644
--- a/cipher/rijndael.c
+++ b/cipher/rijndael.c
@@ -69,14 +69,7 @@
 
 /* USE_ARMV6_ASM indicates whether to use ARMv6 assembly code. */
 #undef USE_ARMV6_ASM
-#if defined(__arm__) && defined(__ARMEL__) && \
-	 ((defined(__ARM_ARCH) && __ARM_ARCH >= 6) \
-	|| defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
-	|| defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) \
-	|| defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) \
-	|| defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
-	|| defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \
-	|| defined(__ARM_ARCH_7EM__))
+#if defined(HAVE_ARM_ARCH_V6) && defined(__ARMEL__)
 # ifdef HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS
 #  define USE_ARMV6_ASM 1
 # endif
diff --git a/configure.ac b/configure.ac
index c33f36b..f20d0a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -965,6 +965,29 @@ fi
 
 
 #
+# Check whether compiler is configured for ARMv6 or newer architecture
+#
+AC_CACHE_CHECK([whether compiler is configured for ARMv6 or newer architecture],
+       [gcry_cv_cc_arm_arch_is_v6],
+       [AC_EGREP_CPP(yes,
+          [#if defined(__arm__) && \
+             ((defined(__ARM_ARCH) && __ARM_ARCH >= 6) \
+             || defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
+             || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) \
+             || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) \
+             || defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
+             || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \
+             || defined(__ARM_ARCH_7EM__))
+            yes
+           #endif
+          ], gcry_cv_cc_arm_arch_is_v6=yes, gcry_cv_cc_arm_arch_is_v6=no)])
+if test "$gcry_cv_cc_arm_arch_is_v6" = "yes" ; then
+   AC_DEFINE(HAVE_ARM_ARCH_V6,1,
+     [Defined if ARM architecture is v6 or newer])
+fi
+
+
+#
 # Check whether GCC assembler supports features needed for our ARM
 # implementations
 #

commit c030e33533fb819afe195eff5f89ec39863b1fbc
Author: Jussi Kivilinna <jussi.kivilinna at iki.fi>
Date:   Sat Aug 17 10:09:33 2013 +0300

    Add optimized wipememory for ARM
    
    src/g10lib.h [__arm__] (fast_wipememory2_unaligned_head)
    (fast_wipememory2): New macros.
    --
    
    Previous patch that removed _gcry_burn_stack optimization causes burn_stack
    take over 30% CPU usage when looping 'benchmark cipher blowfish' on
    ARM/Cortex-A8. Optimizing wipememory2 for ARM helps situation a lot.
    
    Old vs new (Cortex-A8):
                      ECB/Stream         CBC             CFB             OFB             CTR
                   --------------- --------------- --------------- --------------- ---------------
    IDEA            1.20x   1.18x   1.16x   1.15x   1.16x   1.18x   1.18x   1.16x   1.16x   1.17x
    3DES            1.14x   1.14x   1.12x   1.13x   1.12x   1.13x   1.12x   1.13x   1.13x   1.15x
    CAST5           1.66x   1.67x   1.43x   1.00x   1.48x   1.00x   1.44x   1.44x   1.04x   0.96x
    BLOWFISH        1.56x   1.66x   1.47x   1.00x   1.54x   1.05x   1.44x   1.47x   1.00x   1.00x
    AES             1.52x   1.42x   1.04x   1.00x   1.00x   1.00x   1.38x   1.37x   1.00x   1.00x
    AES192          1.36x   1.36x   1.00x   1.00x   1.00x   1.04x   1.26x   1.22x   1.00x   1.04x
    AES256          1.32x   1.31x   1.03x   1.00x   1.00x   1.00x   1.24x   1.30x   1.03x   0.97x
    TWOFISH         1.31x   1.26x   1.23x   1.00x   1.25x   1.00x   1.24x   1.23x   1.00x   1.03x
    ARCFOUR         1.05x   0.96x
    DES             1.31x   1.33x   1.26x   1.29x   1.28x   1.29x   1.26x   1.29x   1.27x   1.29x
    TWOFISH128      1.27x   1.24x   1.23x   1.00x   1.28x   1.00x   1.21x   1.26x   0.97x   1.06x
    SERPENT128      1.19x   1.19x   1.15x   1.00x   1.14x   1.00x   1.17x   1.17x   0.98x   1.00x
    SERPENT192      1.19x   1.24x   1.17x   1.00x   1.14x   1.00x   1.15x   1.17x   1.00x   1.00x
    SERPENT256      1.16x   1.19x   1.17x   1.00x   1.14x   1.00x   1.15x   1.15x   1.00x   1.00x
    RFC2268_40      1.00x   0.99x   1.00x   1.01x   1.00x   1.00x   1.03x   1.00x   1.01x   1.00x
    SEED            1.20x   1.20x   1.18x   1.17x   1.17x   1.19x   1.18x   1.16x   1.19x   1.19x
    CAMELLIA128     1.38x   1.34x   1.31x   1.00x   1.31x   1.00x   1.29x   1.32x   1.00x   1.00x
    CAMELLIA192     1.27x   1.27x   1.23x   1.00x   1.25x   1.03x   1.20x   1.23x   1.00x   1.00x
    CAMELLIA256     1.27x   1.27x   1.26x   1.00x   1.25x   1.03x   1.20x   1.23x   1.00x   1.00x
    SALSA20         1.04x   1.00x
    
    (Note: bulk encryption/decryption do burn_stack after full buffer processing,
    instead of after each block.)
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>

diff --git a/src/g10lib.h b/src/g10lib.h
index e6d20e9..198ab38 100644
--- a/src/g10lib.h
+++ b/src/g10lib.h
@@ -248,7 +248,7 @@ void _gcry_burn_stack (int bytes);
 #define wipememory(_ptr,_len) wipememory2(_ptr,0,_len)
 
 
-/* Optimized fast_wipememory2 for i386 and x86-64 architechtures.  Maybe leave
+/* Optimized fast_wipememory2 for i386, x86-64 and arm architectures.  May leave
    tail bytes unhandled, in which case tail bytes are handled by wipememory2.
  */
 #if defined(__x86_64__) && __GNUC__ >= 4
@@ -283,6 +283,38 @@ void _gcry_burn_stack (int bytes);
                 _vptr += 4; \
               } while (_vlen >= 4); \
                   } while (0)
+#elif defined (__arm__) && (defined (__thumb2__) || !defined (__thumb__)) && \
+	__GNUC__ >= 4
+
+#ifdef __ARM_FEATURE_UNALIGNED
+#define fast_wipememory2_unaligned_head(_ptr,_set,_len) /*do nothing*/
+#else
+#define fast_wipememory2_unaligned_head(_vptr,_vset,_vlen) do { \
+              while((size_t)(_vptr)&3 && _vlen) \
+	        { *_vptr=(_vset); _vptr++; _vlen--; } \
+                  } while(0)
+#endif
+
+#define fast_wipememory2(_vptr,_vset,_vlen) do { \
+              unsigned long _vset4 = _vset; \
+              fast_wipememory2_unaligned_head(_vptr,_vset,_vlen); \
+              if (_vlen < 8) \
+                break; \
+              _vset4 *= 0x01010101; \
+              asm volatile( \
+                "mov %%r4, %[set];\n\t" \
+                "mov %%r5, %[set];\n\t" \
+                "1:;\n\t" \
+                "stm %[ptr]!, {%%r4, %%r5};\n\t" \
+                "cmp %[end], %[ptr];\n\t" \
+                "bne 1b;\n\t" \
+                : [ptr] "=r" (_vptr) \
+                : [set] "r" (_vset4), \
+                  [end] "r" (_vptr+(_vlen&(~0x7))), \
+                  "0" (_vptr) \
+                : "memory", "r4", "r5", "cc"); \
+              _vlen &= 0x7; \
+                  } while (0)
 #else
 #define fast_wipememory2(_ptr,_set,_len)
 #endif

commit 796dda37b957b20dba391343937c6325a8c8b288
Author: Jussi Kivilinna <jussi.kivilinna at iki.fi>
Date:   Fri Aug 16 19:44:55 2013 +0300

    cipher: bufhelp: allow unaligned memory accesses on ARM
    
    * cipher/bufhelp.h [__arm__ && __ARM_FEATURE_UNALIGNED]: Enable
    BUFHELP_FAST_UNALIGNED_ACCESS.
    --
    
    Newer ARM systems support unaligned memory accesses and on gcc-4.7 and onwards
    this is identified by __ARM_FEATURE_UNALIGNED macro.
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>

diff --git a/cipher/bufhelp.h b/cipher/bufhelp.h
index 1c173e2..d829cf1 100644
--- a/cipher/bufhelp.h
+++ b/cipher/bufhelp.h
@@ -29,7 +29,8 @@
 #endif
 
 
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(__x86_64__) || \
+    (defined(__arm__) && defined(__ARM_FEATURE_UNALIGNED))
 /* These architectures are able of unaligned memory accesses and can
    handle those fast.
  */

commit 79895b9459b9bf8c60cb7abf09d5bf16ed0cf6e3
Author: Jussi Kivilinna <jussi.kivilinna at iki.fi>
Date:   Sat Aug 17 10:48:36 2013 +0300

    Remove burn_stack optimization
    
    * src/misc.c (_gcry_burn_stack): Remove SIZEOF_UNSIGNED_LONG == 4 or 8
    optimization.
    --
    
    At least GCC 4.6 on Debian Wheezy (armhf) generates wrong code for burn_stack,
    causing recursive structure to be transformed in to iterative without updating
    stack pointer between iterations. Therefore only first 64 bytes of stack get
    zeroed. This appears to be fixed in GCC 4.7, but lets play this safe and
    remove this optimization.
    
    Better approach would probably be to add architecture specific assembly
    routine(s) that replace this generic function.
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>

diff --git a/src/misc.c b/src/misc.c
index 67c2e80..2d9c73a 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -290,35 +290,10 @@ _gcry_log_printhex (const char *text, const void *buffer, size_t length)
 void
 _gcry_burn_stack (int bytes)
 {
-#if SIZEOF_UNSIGNED_LONG == 4 || SIZEOF_UNSIGNED_LONG == 8
-    /* Optimized burn_stack for 32-bit and 64-bit architectures.  In addition
-       to loop unrolling, compiler sees that writes are within 'buf' and
-       generation of stack-protection code is avoided.  */
-    volatile unsigned long buf[64 / SIZEOF_UNSIGNED_LONG];
-
-    buf[0] = 0;
-    buf[1] = 0;
-    buf[2] = 0;
-    buf[3] = 0;
-    buf[4] = 0;
-    buf[5] = 0;
-    buf[6] = 0;
-    buf[7] = 0;
-# if SIZEOF_UNSIGNED_LONG == 4
-    buf[8] = 0;
-    buf[9] = 0;
-    buf[10] = 0;
-    buf[11] = 0;
-    buf[12] = 0;
-    buf[13] = 0;
-    buf[14] = 0;
-    buf[15] = 0;
-# endif
-#else
     char buf[64];
 
     wipememory (buf, sizeof buf);
-#endif
+
     bytes -= sizeof buf;
     if (bytes > 0)
         _gcry_burn_stack (bytes);

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

Summary of changes:
 cipher/blowfish-armv6.S               |    9 +---
 cipher/blowfish.c                     |    9 +---
 cipher/bufhelp.h                      |    3 +-
 cipher/camellia-armv6.S               |    9 +---
 cipher/camellia.h                     |    9 +---
 cipher/cast5-armv6.S                  |    9 +---
 cipher/cast5.c                        |    9 +---
 cipher/rijndael-armv6.S               |    9 +---
 cipher/rijndael.c                     |    9 +---
 configure.ac                          |   23 ++++++++
 mpi/{generic => armv6}/mpi-asm-defs.h |    6 --
 mpi/armv6/mpih-add1.S                 |   76 ++++++++++++++++++++++++++
 mpi/armv6/mpih-mul1.S                 |   80 +++++++++++++++++++++++++++
 mpi/armv6/mpih-mul2.S                 |   94 ++++++++++++++++++++++++++++++++
 mpi/armv6/mpih-mul3.S                 |   97 +++++++++++++++++++++++++++++++++
 mpi/armv6/mpih-sub1.S                 |   77 ++++++++++++++++++++++++++
 mpi/config.links                      |   15 +++++
 src/g10lib.h                          |   34 +++++++++++-
 src/misc.c                            |   27 +---------
 19 files changed, 506 insertions(+), 98 deletions(-)
 copy mpi/{generic => armv6}/mpi-asm-defs.h (97%)
 create mode 100644 mpi/armv6/mpih-add1.S
 create mode 100644 mpi/armv6/mpih-mul1.S
 create mode 100644 mpi/armv6/mpih-mul2.S
 create mode 100644 mpi/armv6/mpih-mul3.S
 create mode 100644 mpi/armv6/mpih-sub1.S


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



From cvs at cvs.gnupg.org  Wed Aug 21 17:18:32 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 21 Aug 2013 17:18:32 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-235-g5c5e52d
Message-ID: <E1VC9gp-0003IK-3A@lists.gnupg.org>

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

The branch, master has been updated
       via  5c5e52df4b92e23045ac87abac09357de58920d4 (commit)
       via  7bde2bf3b0ddb5d3515a44879e1a7ddb581a5c0b (commit)
      from  50c98c7ed6b542857ee2f902eca36cda37407737 (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 5c5e52df4b92e23045ac87abac09357de58920d4
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Aug 21 16:45:48 2013 +0200

    scd: Make SPRx32 pinpad work with PC/SC on Windows.
    
    * scd/apdu.c (CM_IOCTL_GET_FEATURE_REQUEST): Use SCARD_CTL_CODE.
    (SCARD_CTL_CODE): Define if not defined.
    (reader_table_s): Add is_spr532.
    (new_reader_slot): Clear it.
    (check_pcsc_pinpad): Set it.
    (pcsc_pinpad_verify, pcsc_pinpad_modify): Add fix for SPR532.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/scd/apdu.c b/scd/apdu.c
index ca45fc1..e05869f 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -134,6 +134,7 @@ struct reader_table_s {
   int last_status;
   int status;
   int is_t0;         /* True if we know that we are running T=0. */
+  int is_spr532;     /* True if we know that the reader is a SPR532.  */
   unsigned char atr[33];
   size_t atrlen;           /* A zero length indicates that the ATR has
                               not yet been read; i.e. the card is not
@@ -237,7 +238,12 @@ static char (* DLSTDCALL CT_close) (unsigned short ctn);
 #define PCSC_E_NO_SERVICE              0x8010001D
 #define PCSC_W_REMOVED_CARD            0x80100069
 
-#define CM_IOCTL_GET_FEATURE_REQUEST (0x42000000 + 3400)
+/* Fix pcsc-lite ABI incompatibilty.  */
+#ifndef SCARD_CTL_CODE
+# define SCARD_CTL_CODE(code) (0x42000000 + (code))
+#endif
+
+#define CM_IOCTL_GET_FEATURE_REQUEST     SCARD_CTL_CODE(3400)
 #define FEATURE_VERIFY_PIN_DIRECT        0x06
 #define FEATURE_MODIFY_PIN_DIRECT        0x07
 
@@ -393,6 +399,7 @@ new_reader_slot (void)
   reader_table[reader].any_status = 0;
   reader_table[reader].last_status = 0;
   reader_table[reader].is_t0 = 1;
+  reader_table[reader].is_spr532 = 0;
 #ifdef NEED_PCSC_WRAPPER
   reader_table[reader].pcsc.req_fd = -1;
   reader_table[reader].pcsc.rsp_fd = -1;
@@ -2008,7 +2015,10 @@ check_pcsc_pinpad (int slot, int command, pininfo_t *pininfo)
      Alternatively use the USB ids to detect known readers.  */
   if (reader_table[slot].rdrname
       && strstr (reader_table[slot].rdrname, "SPRx32"))
-    pininfo->fixedlen = 0;
+    {
+      reader_table[slot].is_spr532 = 1;
+      pininfo->fixedlen = 0;
+    }
 
  check_again:
   if (command == ISO7816_VERIFY)
@@ -2067,6 +2077,7 @@ pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1,
   int len = PIN_VERIFY_STRUCTURE_SIZE + pininfo->fixedlen;
   unsigned char result[2];
   pcsc_dword_t resultlen = 2;
+  int no_lc;
 
   if (!reader_table[slot].atrlen
       && (sw = reset_pcsc_reader (slot)))
@@ -2090,6 +2101,8 @@ pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1,
   if (!pin_verify)
     return SW_HOST_OUT_OF_CORE;
 
+  no_lc = (!pininfo->fixedlen && reader_table[slot].is_spr532);
+
   pin_verify[0] = 0x00; /* bTimerOut */
   pin_verify[1] = 0x00; /* bTimerOut2 */
   pin_verify[2] = 0x82; /* bmFormatString: Byte, pos=0, left, ASCII. */
@@ -2106,8 +2119,8 @@ pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1,
   pin_verify[11] = 0x00; /* bMsgIndex */
   pin_verify[12] = 0x00; /* bTeoPrologue[0] */
   pin_verify[13] = 0x00; /* bTeoPrologue[1] */
-  pin_verify[14] = pininfo->fixedlen + 0x05; /* bTeoPrologue[2] */
-  pin_verify[15] = pininfo->fixedlen + 0x05; /* ulDataLength */
+  pin_verify[14] = pininfo->fixedlen + 0x05 - no_lc; /* bTeoPrologue[2] */
+  pin_verify[15] = pininfo->fixedlen + 0x05 - no_lc; /* ulDataLength */
   pin_verify[16] = 0x00; /* ulDataLength */
   pin_verify[17] = 0x00; /* ulDataLength */
   pin_verify[18] = 0x00; /* ulDataLength */
@@ -2118,6 +2131,8 @@ pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1,
   pin_verify[23] = pininfo->fixedlen; /* abData[4] */
   if (pininfo->fixedlen)
     memset (&pin_verify[24], 0xff, pininfo->fixedlen);
+  else if (no_lc)
+    len--;
 
   if (DBG_CARD_IO)
     log_debug ("send secure: c=%02X i=%02X p1=%02X p2=%02X len=%d pinmax=%d\n",
@@ -2150,6 +2165,7 @@ pcsc_pinpad_modify (int slot, int class, int ins, int p0, int p1,
   int len = PIN_MODIFY_STRUCTURE_SIZE + 2 * pininfo->fixedlen;
   unsigned char result[2];
   pcsc_dword_t resultlen = 2;
+  int no_lc;
 
   if (!reader_table[slot].atrlen
       && (sw = reset_pcsc_reader (slot)))
@@ -2173,6 +2189,8 @@ pcsc_pinpad_modify (int slot, int class, int ins, int p0, int p1,
   if (!pin_modify)
     return SW_HOST_OUT_OF_CORE;
 
+  no_lc = (!pininfo->fixedlen && reader_table[slot].is_spr532);
+
   pin_modify[0] = 0x00; /* bTimerOut */
   pin_modify[1] = 0x00; /* bTimerOut2 */
   pin_modify[2] = 0x82; /* bmFormatString: Byte, pos=0, left, ASCII. */
@@ -2193,15 +2211,15 @@ pcsc_pinpad_modify (int slot, int class, int ins, int p0, int p1,
   if (pininfo->minlen && pininfo->maxlen && pininfo->minlen == pininfo->maxlen)
     pin_modify[10] |= 0x01; /* Max size reached.  */
   pin_modify[11] = 0xff; /* bNumberMessage: Default */
-  pin_modify[12] =  0x09; /* wLangId: 0x0409: US English */
+  pin_modify[12] = 0x09; /* wLangId: 0x0409: US English */
   pin_modify[13] = 0x04; /* wLangId: 0x0409: US English */
   pin_modify[14] = 0x00; /* bMsgIndex1 */
   pin_modify[15] = 0x00; /* bMsgIndex2 */
   pin_modify[16] = 0x00; /* bMsgIndex3 */
   pin_modify[17] = 0x00; /* bTeoPrologue[0] */
   pin_modify[18] = 0x00; /* bTeoPrologue[1] */
-  pin_modify[19] = 2 * pininfo->fixedlen + 0x05; /* bTeoPrologue[2] */
-  pin_modify[20] = 2 * pininfo->fixedlen + 0x05; /* ulDataLength */
+  pin_modify[19] = 2 * pininfo->fixedlen + 0x05 - no_lc; /* bTeoPrologue[2] */
+  pin_modify[20] = 2 * pininfo->fixedlen + 0x05 - no_lc; /* ulDataLength */
   pin_modify[21] = 0x00; /* ulDataLength */
   pin_modify[22] = 0x00; /* ulDataLength */
   pin_modify[23] = 0x00; /* ulDataLength */
@@ -2212,6 +2230,8 @@ pcsc_pinpad_modify (int slot, int class, int ins, int p0, int p1,
   pin_modify[28] = 2 * pininfo->fixedlen; /* abData[4] */
   if (pininfo->fixedlen)
     memset (&pin_modify[29], 0xff, 2 * pininfo->fixedlen);
+  else if (no_lc)
+    len--;
 
   if (DBG_CARD_IO)
     log_debug ("send secure: c=%02X i=%02X p1=%02X p2=%02X len=%d pinmax=%d\n",

commit 7bde2bf3b0ddb5d3515a44879e1a7ddb581a5c0b
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Aug 21 15:44:52 2013 +0200

    scd: Improve --enable-pinpad-varlen.
    
    * tools/gpgconf-comp.c (gc_options_scdaemon): Add
    enable-pinpad-varlen.
    * scd/apdu.c (check_pcsc_pinpad): Detect SPRx32 reader.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/doc/scdaemon.texi b/doc/scdaemon.texi
index ed2cc51..f454f14 100644
--- a/doc/scdaemon.texi
+++ b/doc/scdaemon.texi
@@ -290,10 +290,10 @@ than 0.
 @item --enable-pinpad-varlen
 @opindex enable-pinpad-varlen
 Please specify this option when the card reader supports variable
-length input for pinpad (default is no).  For known readers listed in
-ccid-driver, this option is not needed.  Note that if your card reader
-doesn't supports variable length input but you want to use it, you
-need to specify your pinpad request on your card.
+length input for pinpad (default is no).  For known readers (listed in
+ccid-driver.c and apdu.c), this option is not needed.  Note that if
+your card reader doesn't supports variable length input but you want
+to use it, you need to specify your pinpad request on your card.
 
 
 @item --disable-pinpad
diff --git a/scd/apdu.c b/scd/apdu.c
index 133058d..ca45fc1 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -2002,7 +2002,13 @@ check_pcsc_pinpad (int slot, int command, pininfo_t *pininfo)
   pcsc_dword_t len = 256;
   int sw;
 
-  (void)pininfo;      /* XXX: Identify reader and set pininfo->fixedlen.  */
+  /* Hack to identify the SCM SPR532 and SPR332 readers which support
+     variable length PIN input.
+     FIXME: Figure out whether there is a feature attribute for this.
+     Alternatively use the USB ids to detect known readers.  */
+  if (reader_table[slot].rdrname
+      && strstr (reader_table[slot].rdrname, "SPRx32"))
+    pininfo->fixedlen = 0;
 
  check_again:
   if (command == ISO7816_VERIFY)
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 0b3c9c0..ffe7eab 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -620,6 +620,10 @@ static gc_option_t gc_options_scdaemon[] =
    { "disable-pinpad", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
      "gnupg", "do not use a reader's pinpad",
      GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON },
+   { "enable-pinpad-varlen",
+     GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
+     "gnupg", "use variable length input for pinpad",
+     GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON },
    { "card-timeout", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
      "gnupg", "|N|disconnect the card after N seconds of inactivity",
      GC_ARG_TYPE_UINT32, GC_BACKEND_SCDAEMON },

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

Summary of changes:
 doc/scdaemon.texi    |    8 ++++----
 scd/apdu.c           |   40 +++++++++++++++++++++++++++++++++-------
 tools/gpgconf-comp.c |    4 ++++
 3 files changed, 41 insertions(+), 11 deletions(-)


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



From cvs at cvs.gnupg.org  Wed Aug 21 17:27:56 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 21 Aug 2013 17:27:56 +0200
Subject: [git] GnuPG - branch, STABLE-BRANCH-2-0,
 updated. gnupg-2.0.21-3-gb637170
Message-ID: <E1VC9pu-0003WZ-Q3@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-0 has been updated
       via  b63717031d8ee3f9ded44a182516158f8a349bd1 (commit)
       via  43e85d7bee4644ca84ef0ab0c3b08b2d02e4a699 (commit)
      from  45f43ed5f651e2f82cf4d31b960a98535dcb103e (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 b63717031d8ee3f9ded44a182516158f8a349bd1
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Aug 21 16:45:48 2013 +0200

    scd: Make SPRx32 pinpad work with PC/SC on Windows.
    
    * scd/apdu.c (CM_IOCTL_GET_FEATURE_REQUEST): Use SCARD_CTL_CODE.
    (SCARD_CTL_CODE): Define if not defined.
    (reader_table_s): Add is_spr532.
    (new_reader_slot): Clear it.
    (check_pcsc_pinpad): Set it.
    (pcsc_pinpad_verify, pcsc_pinpad_modify): Add fix for SPR532.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
    (cherry picked from commit 5c5e52df4b92e23045ac87abac09357de58920d4)

diff --git a/scd/apdu.c b/scd/apdu.c
index 4b3509e..ecb3e82 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -133,6 +133,7 @@ struct reader_table_s {
   int last_status;
   int status;
   int is_t0;         /* True if we know that we are running T=0. */
+  int is_spr532;     /* True if we know that the reader is a SPR532.  */
   unsigned char atr[33];
   size_t atrlen;           /* A zero length indicates that the ATR has
                               not yet been read; i.e. the card is not
@@ -219,7 +220,12 @@ static char (* DLSTDCALL CT_close) (unsigned short ctn);
 #define PCSC_E_NO_SERVICE              0x8010001D
 #define PCSC_W_REMOVED_CARD            0x80100069
 
-#define CM_IOCTL_GET_FEATURE_REQUEST (0x42000000 + 3400)
+/* Fix pcsc-lite ABI incompatibilty.  */
+#ifndef SCARD_CTL_CODE
+# define SCARD_CTL_CODE(code) (0x42000000 + (code))
+#endif
+
+#define CM_IOCTL_GET_FEATURE_REQUEST     SCARD_CTL_CODE(3400)
 #define FEATURE_VERIFY_PIN_DIRECT        0x06
 #define FEATURE_MODIFY_PIN_DIRECT        0x07
 
@@ -417,6 +423,7 @@ new_reader_slot (void)
   reader_table[reader].any_status = 0;
   reader_table[reader].last_status = 0;
   reader_table[reader].is_t0 = 1;
+  reader_table[reader].is_spr532 = 0;
 #ifdef NEED_PCSC_WRAPPER
   reader_table[reader].pcsc.req_fd = -1;
   reader_table[reader].pcsc.rsp_fd = -1;
@@ -2038,7 +2045,10 @@ check_pcsc_pinpad (int slot, int command, pininfo_t *pininfo)
      Alternatively use the USB ids to detect known readers.  */
   if (reader_table[slot].rdrname
       && strstr (reader_table[slot].rdrname, "SPRx32"))
-    pininfo->fixedlen = 0;
+    {
+      reader_table[slot].is_spr532 = 1;
+      pininfo->fixedlen = 0;
+    }
 
  check_again:
   if (command == ISO7816_VERIFY)
@@ -2097,6 +2107,7 @@ pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1,
   int len = PIN_VERIFY_STRUCTURE_SIZE + pininfo->fixedlen;
   unsigned char result[2];
   pcsc_dword_t resultlen = 2;
+  int no_lc;
 
   if (!reader_table[slot].atrlen
       && (sw = reset_pcsc_reader (slot)))
@@ -2120,6 +2131,8 @@ pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1,
   if (!pin_verify)
     return SW_HOST_OUT_OF_CORE;
 
+  no_lc = (!pininfo->fixedlen && reader_table[slot].is_spr532);
+
   pin_verify[0] = 0x00; /* bTimerOut */
   pin_verify[1] = 0x00; /* bTimerOut2 */
   pin_verify[2] = 0x82; /* bmFormatString: Byte, pos=0, left, ASCII. */
@@ -2136,8 +2149,8 @@ pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1,
   pin_verify[11] = 0x00; /* bMsgIndex */
   pin_verify[12] = 0x00; /* bTeoPrologue[0] */
   pin_verify[13] = 0x00; /* bTeoPrologue[1] */
-  pin_verify[14] = pininfo->fixedlen + 0x05; /* bTeoPrologue[2] */
-  pin_verify[15] = pininfo->fixedlen + 0x05; /* ulDataLength */
+  pin_verify[14] = pininfo->fixedlen + 0x05 - no_lc; /* bTeoPrologue[2] */
+  pin_verify[15] = pininfo->fixedlen + 0x05 - no_lc; /* ulDataLength */
   pin_verify[16] = 0x00; /* ulDataLength */
   pin_verify[17] = 0x00; /* ulDataLength */
   pin_verify[18] = 0x00; /* ulDataLength */
@@ -2148,6 +2161,8 @@ pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1,
   pin_verify[23] = pininfo->fixedlen; /* abData[4] */
   if (pininfo->fixedlen)
     memset (&pin_verify[24], 0xff, pininfo->fixedlen);
+  else if (no_lc)
+    len--;
 
   if (DBG_CARD_IO)
     log_debug ("send secure: c=%02X i=%02X p1=%02X p2=%02X len=%d pinmax=%d\n",
@@ -2178,6 +2193,7 @@ pcsc_pinpad_modify (int slot, int class, int ins, int p0, int p1,
   int len = PIN_MODIFY_STRUCTURE_SIZE + 2 * pininfo->fixedlen;
   unsigned char result[2];
   pcsc_dword_t resultlen = 2;
+  int no_lc;
 
   if (!reader_table[slot].atrlen
       && (sw = reset_pcsc_reader (slot)))
@@ -2201,6 +2217,8 @@ pcsc_pinpad_modify (int slot, int class, int ins, int p0, int p1,
   if (!pin_modify)
     return SW_HOST_OUT_OF_CORE;
 
+  no_lc = (!pininfo->fixedlen && reader_table[slot].is_spr532);
+
   pin_modify[0] = 0x00; /* bTimerOut */
   pin_modify[1] = 0x00; /* bTimerOut2 */
   pin_modify[2] = 0x82; /* bmFormatString: Byte, pos=0, left, ASCII. */
@@ -2221,15 +2239,15 @@ pcsc_pinpad_modify (int slot, int class, int ins, int p0, int p1,
   if (pininfo->minlen && pininfo->maxlen && pininfo->minlen == pininfo->maxlen)
     pin_modify[10] |= 0x01; /* Max size reached.  */
   pin_modify[11] = 0xff; /* bNumberMessage: Default */
-  pin_modify[12] =  0x09; /* wLangId: 0x0409: US English */
+  pin_modify[12] = 0x09; /* wLangId: 0x0409: US English */
   pin_modify[13] = 0x04; /* wLangId: 0x0409: US English */
   pin_modify[14] = 0x00; /* bMsgIndex1 */
   pin_modify[15] = 0x00; /* bMsgIndex2 */
   pin_modify[16] = 0x00; /* bMsgIndex3 */
   pin_modify[17] = 0x00; /* bTeoPrologue[0] */
   pin_modify[18] = 0x00; /* bTeoPrologue[1] */
-  pin_modify[19] = 2 * pininfo->fixedlen + 0x05; /* bTeoPrologue[2] */
-  pin_modify[20] = 2 * pininfo->fixedlen + 0x05; /* ulDataLength */
+  pin_modify[19] = 2 * pininfo->fixedlen + 0x05 - no_lc; /* bTeoPrologue[2] */
+  pin_modify[20] = 2 * pininfo->fixedlen + 0x05 - no_lc; /* ulDataLength */
   pin_modify[21] = 0x00; /* ulDataLength */
   pin_modify[22] = 0x00; /* ulDataLength */
   pin_modify[23] = 0x00; /* ulDataLength */
@@ -2240,6 +2258,8 @@ pcsc_pinpad_modify (int slot, int class, int ins, int p0, int p1,
   pin_modify[28] = 2 * pininfo->fixedlen; /* abData[4] */
   if (pininfo->fixedlen)
     memset (&pin_modify[29], 0xff, 2 * pininfo->fixedlen);
+  else if (no_lc)
+    len--;
 
   if (DBG_CARD_IO)
     log_debug ("send secure: c=%02X i=%02X p1=%02X p2=%02X len=%d pinmax=%d\n",

commit 43e85d7bee4644ca84ef0ab0c3b08b2d02e4a699
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Aug 21 15:44:52 2013 +0200

    scd: Improve --enable-pinpad-varlen.
    
    * tools/gpgconf-comp.c (gc_options_scdaemon): Add
    enable-pinpad-varlen.
    * scd/apdu.c (check_pcsc_pinpad): Detect SPRx32 reader.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
    (cherry picked from commit 7bde2bf3b0ddb5d3515a44879e1a7ddb581a5c0b)

diff --git a/doc/scdaemon.texi b/doc/scdaemon.texi
index ed2cc51..f454f14 100644
--- a/doc/scdaemon.texi
+++ b/doc/scdaemon.texi
@@ -290,10 +290,10 @@ than 0.
 @item --enable-pinpad-varlen
 @opindex enable-pinpad-varlen
 Please specify this option when the card reader supports variable
-length input for pinpad (default is no).  For known readers listed in
-ccid-driver, this option is not needed.  Note that if your card reader
-doesn't supports variable length input but you want to use it, you
-need to specify your pinpad request on your card.
+length input for pinpad (default is no).  For known readers (listed in
+ccid-driver.c and apdu.c), this option is not needed.  Note that if
+your card reader doesn't supports variable length input but you want
+to use it, you need to specify your pinpad request on your card.
 
 
 @item --disable-pinpad
diff --git a/scd/apdu.c b/scd/apdu.c
index 372932a..4b3509e 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -2032,7 +2032,13 @@ check_pcsc_pinpad (int slot, int command, pininfo_t *pininfo)
   pcsc_dword_t len = 256;
   int sw;
 
-  (void)pininfo;      /* XXX: Identify reader and set pininfo->fixedlen.  */
+  /* Hack to identify the SCM SPR532 and SPR332 readers which support
+     variable length PIN input.
+     FIXME: Figure out whether there is a feature attribute for this.
+     Alternatively use the USB ids to detect known readers.  */
+  if (reader_table[slot].rdrname
+      && strstr (reader_table[slot].rdrname, "SPRx32"))
+    pininfo->fixedlen = 0;
 
  check_again:
   if (command == ISO7816_VERIFY)
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 078dcea..c43e87a 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -612,6 +612,10 @@ static gc_option_t gc_options_scdaemon[] =
    { "disable-pinpad", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
      "gnupg", "do not use a reader's pinpad",
      GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON },
+   { "enable-pinpad-varlen",
+     GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
+     "gnupg", "use variable length input for pinpad",
+     GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON },
    { "card-timeout", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
      "gnupg", "|N|disconnect the card after N seconds of inactivity",
      GC_ARG_TYPE_UINT32, GC_BACKEND_SCDAEMON },

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

Summary of changes:
 doc/scdaemon.texi    |    8 ++++----
 scd/apdu.c           |   40 +++++++++++++++++++++++++++++++++-------
 tools/gpgconf-comp.c |    4 ++++
 3 files changed, 41 insertions(+), 11 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Aug 22 14:55:30 2013
From: cvs at cvs.gnupg.org (by Jussi Kivilinna)
Date: Thu, 22 Aug 2013 14:55:30 +0200
Subject: [git] GCRYPT - branch, master, updated. libgcrypt-1.5.0-196-g040aa76
Message-ID: <E1VCTvq-0000TK-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 GNU crypto library".

The branch, master has been updated
       via  040aa7688296e93659cb32ca31e9a001a6ab1edd (commit)
       via  82db04a6a0058cf870485459abe7c1659b138ec5 (commit)
      from  da327aef3fe24fdf98fffbc8aea69de42ed12456 (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 040aa7688296e93659cb32ca31e9a001a6ab1edd
Author: Jussi Kivilinna <jussi.kivilinna at iki.fi>
Date:   Thu Aug 22 15:26:52 2013 +0300

    serpent-sse2-amd64: Move register clearing to assembly functions
    
    cipher/serpent-sse2-amd64.S (_gcry_serpent_sse2_ctr_enc)
    (_gcry_serpent_sse2_cbc_dec, _gcry_serpent_sse2_cfb_dec): Clear used
    XMM registers.
    cipher/serpent.c (_gcry_serpent_ctr_enc, _gcry_serpent_cbc_dec)
    ( _gcry_serpent_cfb_dec) [USE_SSE2]: Remove XMM register clearing from
    bulk functions.
    --
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>

diff --git a/cipher/serpent-sse2-amd64.S b/cipher/serpent-sse2-amd64.S
index fe9feee..a5cf353 100644
--- a/cipher/serpent-sse2-amd64.S
+++ b/cipher/serpent-sse2-amd64.S
@@ -756,6 +756,20 @@ _gcry_serpent_sse2_ctr_enc:
 	movdqu RB2, (6 * 16)(%rsi);
 	movdqu RB3, (7 * 16)(%rsi);
 
+	/* clear the used registers */
+	pxor RA0, RA0;
+	pxor RA1, RA1;
+	pxor RA2, RA2;
+	pxor RA3, RA3;
+	pxor RB0, RB0;
+	pxor RB1, RB1;
+	pxor RB2, RB2;
+	pxor RB3, RB3;
+	pxor RTMP0, RTMP0;
+	pxor RTMP1, RTMP1;
+	pxor RTMP2, RTMP2;
+	pxor RNOT, RNOT;
+
 	ret
 .size _gcry_serpent_sse2_ctr_enc,.-_gcry_serpent_sse2_ctr_enc;
 
@@ -819,6 +833,20 @@ _gcry_serpent_sse2_cbc_dec:
 	movdqu RB2, (6 * 16)(%rsi);
 	movdqu RB3, (7 * 16)(%rsi);
 
+	/* clear the used registers */
+	pxor RA0, RA0;
+	pxor RA1, RA1;
+	pxor RA2, RA2;
+	pxor RA3, RA3;
+	pxor RB0, RB0;
+	pxor RB1, RB1;
+	pxor RB2, RB2;
+	pxor RB3, RB3;
+	pxor RTMP0, RTMP0;
+	pxor RTMP1, RTMP1;
+	pxor RTMP2, RTMP2;
+	pxor RNOT, RNOT;
+
 	ret
 .size _gcry_serpent_sse2_cbc_dec,.-_gcry_serpent_sse2_cbc_dec;
 
@@ -885,6 +913,20 @@ _gcry_serpent_sse2_cfb_dec:
 	movdqu RB2, (6 * 16)(%rsi);
 	movdqu RB3, (7 * 16)(%rsi);
 
+	/* clear the used registers */
+	pxor RA0, RA0;
+	pxor RA1, RA1;
+	pxor RA2, RA2;
+	pxor RA3, RA3;
+	pxor RB0, RB0;
+	pxor RB1, RB1;
+	pxor RB2, RB2;
+	pxor RB3, RB3;
+	pxor RTMP0, RTMP0;
+	pxor RTMP1, RTMP1;
+	pxor RTMP2, RTMP2;
+	pxor RNOT, RNOT;
+
 	ret
 .size _gcry_serpent_sse2_cfb_dec,.-_gcry_serpent_sse2_cfb_dec;
 
diff --git a/cipher/serpent.c b/cipher/serpent.c
index 8aded34..bf03fe7 100644
--- a/cipher/serpent.c
+++ b/cipher/serpent.c
@@ -875,22 +875,6 @@ _gcry_serpent_ctr_enc(void *context, unsigned char *ctr,
 
     if (did_use_sse2)
       {
-        /* clear SSE2 registers used by serpent-sse2 */
-        asm volatile (
-          "pxor %%xmm0, %%xmm0;\n"
-          "pxor %%xmm1, %%xmm1;\n"
-          "pxor %%xmm2, %%xmm2;\n"
-          "pxor %%xmm3, %%xmm3;\n"
-          "pxor %%xmm4, %%xmm4;\n"
-          "pxor %%xmm5, %%xmm5;\n"
-          "pxor %%xmm6, %%xmm6;\n"
-          "pxor %%xmm7, %%xmm7;\n"
-          "pxor %%xmm10, %%xmm10;\n"
-          "pxor %%xmm11, %%xmm11;\n"
-          "pxor %%xmm12, %%xmm12;\n"
-          "pxor %%xmm13, %%xmm13;\n"
-          :::);
-
         /* serpent-sse2 assembly code does not use stack */
         if (nblocks == 0)
           burn_stack_depth = 0;
@@ -982,22 +966,6 @@ _gcry_serpent_cbc_dec(void *context, unsigned char *iv,
 
     if (did_use_sse2)
       {
-        /* clear SSE2 registers used by serpent-sse2 */
-        asm volatile (
-          "pxor %%xmm0, %%xmm0;\n"
-          "pxor %%xmm1, %%xmm1;\n"
-          "pxor %%xmm2, %%xmm2;\n"
-          "pxor %%xmm3, %%xmm3;\n"
-          "pxor %%xmm4, %%xmm4;\n"
-          "pxor %%xmm5, %%xmm5;\n"
-          "pxor %%xmm6, %%xmm6;\n"
-          "pxor %%xmm7, %%xmm7;\n"
-          "pxor %%xmm10, %%xmm10;\n"
-          "pxor %%xmm11, %%xmm11;\n"
-          "pxor %%xmm12, %%xmm12;\n"
-          "pxor %%xmm13, %%xmm13;\n"
-          :::);
-
         /* serpent-sse2 assembly code does not use stack */
         if (nblocks == 0)
           burn_stack_depth = 0;
@@ -1084,22 +1052,6 @@ _gcry_serpent_cfb_dec(void *context, unsigned char *iv,
 
     if (did_use_sse2)
       {
-        /* clear SSE2 registers used by serpent-sse2 */
-        asm volatile (
-          "pxor %%xmm0, %%xmm0;\n"
-          "pxor %%xmm1, %%xmm1;\n"
-          "pxor %%xmm2, %%xmm2;\n"
-          "pxor %%xmm3, %%xmm3;\n"
-          "pxor %%xmm4, %%xmm4;\n"
-          "pxor %%xmm5, %%xmm5;\n"
-          "pxor %%xmm6, %%xmm6;\n"
-          "pxor %%xmm7, %%xmm7;\n"
-          "pxor %%xmm10, %%xmm10;\n"
-          "pxor %%xmm11, %%xmm11;\n"
-          "pxor %%xmm12, %%xmm12;\n"
-          "pxor %%xmm13, %%xmm13;\n"
-          :::);
-
         /* serpent-sse2 assembly code does not use stack */
         if (nblocks == 0)
           burn_stack_depth = 0;

commit 82db04a6a0058cf870485459abe7c1659b138ec5
Author: Jussi Kivilinna <jussi.kivilinna at iki.fi>
Date:   Thu Aug 22 15:26:52 2013 +0300

    twofish-amd64: do not make __twofish_dec_blk3 global
    
    * cipher/twofish-amd64.S (__twofish_dec_blk3): Do not export symbol as
    global.
    (__twofish_dec_blk3): Mark symbol as function.
    --
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>

diff --git a/cipher/twofish-amd64.S b/cipher/twofish-amd64.S
index d466834..45548d2 100644
--- a/cipher/twofish-amd64.S
+++ b/cipher/twofish-amd64.S
@@ -488,7 +488,7 @@ __twofish_enc_blk3:
 .size __twofish_enc_blk3,.-__twofish_enc_blk3;
 
 .align 8
-.global __twofish_dec_blk3
+.type  __twofish_dec_blk3, at function;
 
 __twofish_dec_blk3:
 	/* input:

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

Summary of changes:
 cipher/serpent-sse2-amd64.S |   42 +++++++++++++++++++++++++++++++++++++
 cipher/serpent.c            |   48 -------------------------------------------
 cipher/twofish-amd64.S      |    2 +-
 3 files changed, 43 insertions(+), 49 deletions(-)


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



From cvs at cvs.gnupg.org  Tue Aug 27 03:48:37 2013
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Tue, 27 Aug 2013 03:48:37 +0200
Subject: [git] GnuPG - branch, STABLE-BRANCH-2-0,
 updated. gnupg-2.0.21-4-g6d8f36a
Message-ID: <E1VE7tf-0006qV-M5@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-0 has been updated
       via  6d8f36a0458a50685e130c55018e0d941101d952 (commit)
      from  b63717031d8ee3f9ded44a182516158f8a349bd1 (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 6d8f36a0458a50685e130c55018e0d941101d952
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Aug 27 10:15:46 2013 +0900

    scd: fix Vega for Alpha reader.
    
    * scd/ccid-driver.c (ccid_vendor_specific_init): Fix error handling
    and size of command.
    
    --
    
    Signed-off-by: NIIBE Yutaka

diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 42a219f..b812cb0 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -1537,6 +1537,7 @@ ccid_vendor_specific_init (ccid_driver_t handle)
 {
   if (handle->id_vendor == VENDOR_VEGA && handle->id_product == VEGA_ALPHA)
     {
+      int r;
       /*
        * Vega alpha has a feature to show retry counter on the pinpad
        * display.  But it assumes that the card returns the value of
@@ -1545,9 +1546,12 @@ ccid_vendor_specific_init (ccid_driver_t handle)
        * VERIFY command with empty data.  This vendor specific command
        * sequence is to disable the feature.
        */
-      const unsigned char cmd[] = "\xb5\x01\x00\x03\x00";
+      const unsigned char cmd[] = { '\xb5', '\x01', '\x00', '\x03', '\x00' };
 
-      return send_escape_cmd (handle, cmd, sizeof (cmd), NULL, 0, NULL);
+      r = send_escape_cmd (handle, cmd, sizeof (cmd), NULL, 0, NULL);
+      if (r != 0 && r != CCID_DRIVER_ERR_CARD_INACTIVE
+          && r != CCID_DRIVER_ERR_NO_CARD)
+        return r;
     }
 
   return 0;

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

Summary of changes:
 scd/ccid-driver.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


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



From cvs at cvs.gnupg.org  Tue Aug 27 03:48:39 2013
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Tue, 27 Aug 2013 03:48:39 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-236-g54cbab2
Message-ID: <E1VE7th-0006qm-7H@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  54cbab29c700db2df74e808f16db49170e6c42f1 (commit)
      from  5c5e52df4b92e23045ac87abac09357de58920d4 (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 54cbab29c700db2df74e808f16db49170e6c42f1
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Aug 27 10:15:46 2013 +0900

    scd: fix Vega for Alpha reader.
    
    * scd/ccid-driver.c (ccid_vendor_specific_init): Fix error handling
    and size of command.
    
    --
    
    Signed-off-by: NIIBE Yutaka

diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 8c91767..3376be0 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -1534,6 +1534,7 @@ ccid_vendor_specific_init (ccid_driver_t handle)
 {
   if (handle->id_vendor == VENDOR_VEGA && handle->id_product == VEGA_ALPHA)
     {
+      int r;
       /*
        * Vega alpha has a feature to show retry counter on the pinpad
        * display.  But it assumes that the card returns the value of
@@ -1542,9 +1543,12 @@ ccid_vendor_specific_init (ccid_driver_t handle)
        * VERIFY command with empty data.  This vendor specific command
        * sequence is to disable the feature.
        */
-      const unsigned char cmd[] = "\xb5\x01\x00\x03\x00";
+      const unsigned char cmd[] = { '\xb5', '\x01', '\x00', '\x03', '\x00' };
 
-      return send_escape_cmd (handle, cmd, sizeof (cmd), NULL, 0, NULL);
+      r = send_escape_cmd (handle, cmd, sizeof (cmd), NULL, 0, NULL);
+      if (r != 0 && r != CCID_DRIVER_ERR_CARD_INACTIVE
+          && r != CCID_DRIVER_ERR_NO_CARD)
+        return r;
     }
 
   return 0;

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

Summary of changes:
 scd/ccid-driver.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


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



From cvs at cvs.gnupg.org  Tue Aug 27 05:03:31 2013
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Tue, 27 Aug 2013 05:03:31 +0200
Subject: [git] GnuPG - branch, STABLE-BRANCH-2-0,
 updated. gnupg-2.0.21-5-g9158f58
Message-ID: <E1VE948-00088T-P0@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-0 has been updated
       via  9158f58822a9258390b857aee5bf9751328793bb (commit)
      from  6d8f36a0458a50685e130c55018e0d941101d952 (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 9158f58822a9258390b857aee5bf9751328793bb
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Aug 27 10:23:09 2013 +0900

    scd: fix parsing login-data DO.
    
    * scd/app-openpgp.c (parse_login_data): Release RELPTR.  Fix parsing.
    
    --
    
    Signed-off-by: NIIBE Yutaka

diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 4af4e93..9186e18 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -629,7 +629,11 @@ parse_login_data (app_t app)
     if (*buffer == '\n')
       break;
   if (buflen < 2 || buffer[1] != '\x14')
-    return; /* No control sequences.  */
+    {
+      xfree (relptr);
+      return; /* No control sequences.  */
+    }
+
   buflen--;
   buffer++;
   do
@@ -676,14 +680,11 @@ parse_login_data (app_t app)
                       m = strtol (q, &q, 10);
                     }
 
-                  buffer = q;
                   if (buflen < ((unsigned char *)q - buffer))
-                    {
-                      buflen = 0;
-                      break;
-                    }
-                  else
-                    buflen -= ((unsigned char *)q - buffer);
+                    break;
+
+                  buflen -= ((unsigned char *)q - buffer);
+                  buffer = q;
 
                   if (buflen && !(*buffer == '\n' || *buffer == '\x18'))
                     goto next;
@@ -694,11 +695,11 @@ parse_login_data (app_t app)
             }
         }
     next:
-      for (; buflen && *buffer != '\x18'; buflen--, buffer++)
-        if (*buffer == '\n')
-          buflen = 1;
+      /* Skip to FS (0x18) or LF (\n).  */
+      for (; buflen && *buffer != '\x18' && *buffer != '\n'; buflen--)
+        buffer++;
     }
-  while (buflen);
+  while (buflen && *buffer != '\n');
 
   xfree (relptr);
 }

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

Summary of changes:
 scd/app-openpgp.c |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)


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



From cvs at cvs.gnupg.org  Tue Aug 27 05:03:33 2013
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Tue, 27 Aug 2013 05:03:33 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-237-gb6d54f1
Message-ID: <E1VE94A-00088l-Iz@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  b6d54f1196d5f110fd94dfd661e74dbc60ca9811 (commit)
      from  54cbab29c700db2df74e808f16db49170e6c42f1 (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 b6d54f1196d5f110fd94dfd661e74dbc60ca9811
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Aug 27 10:23:09 2013 +0900

    scd: fix parsing login-data DO.
    
    * scd/app-openpgp.c (parse_login_data): Release RELPTR.  Fix parsing.
    
    --
    
    Signed-off-by: NIIBE Yutaka

diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 673570d..011c248 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -660,7 +660,11 @@ parse_login_data (app_t app)
     if (*buffer == '\n')
       break;
   if (buflen < 2 || buffer[1] != '\x14')
-    return; /* No control sequences.  */
+    {
+      xfree (relptr);
+      return; /* No control sequences.  */
+    }
+
   buflen--;
   buffer++;
   do
@@ -707,14 +711,11 @@ parse_login_data (app_t app)
                       m = strtol (q, &q, 10);
                     }
 
-                  buffer = q;
                   if (buflen < ((unsigned char *)q - buffer))
-                    {
-                      buflen = 0;
-                      break;
-                    }
-                  else
-                    buflen -= ((unsigned char *)q - buffer);
+                    break;
+
+                  buflen -= ((unsigned char *)q - buffer);
+                  buffer = q;
 
                   if (buflen && !(*buffer == '\n' || *buffer == '\x18'))
                     goto next;
@@ -725,11 +726,11 @@ parse_login_data (app_t app)
             }
         }
     next:
-      for (; buflen && *buffer != '\x18'; buflen--, buffer++)
-        if (*buffer == '\n')
-          buflen = 1;
+      /* Skip to FS (0x18) or LF (\n).  */
+      for (; buflen && *buffer != '\x18' && *buffer != '\n'; buflen--)
+        buffer++;
     }
-  while (buflen);
+  while (buflen && *buffer != '\n');
 
   xfree (relptr);
 }

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

Summary of changes:
 scd/app-openpgp.c |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)


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



From cvs at cvs.gnupg.org  Wed Aug 28 13:33:36 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 28 Aug 2013 13:33:36 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-238-g04e2c83
Message-ID: <E1VEdV9-0004LD-1u@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  04e2c83f189cc56342e1be784bdc63761ccdb5bb (commit)
      from  b6d54f1196d5f110fd94dfd661e74dbc60ca9811 (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 04e2c83f189cc56342e1be784bdc63761ccdb5bb
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 22 09:35:21 2013 +0200

    agent: Fix two compiler warnings.
    
    * agent/command.c (cmd_preset_passphrase, pinentry_loopback): Use %zu
    in format string.
    * scd/ccid-driver.c (ccid_get_atr): Ditto.
    * agent/command-ssh.c (stream_read_string): Init arg STRING_SIZE to
    avoid maybe_unitialized warning.
    --
    
    Actually the first one might have been a problem on big endian
    machines.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index f378ade..0ff70b5 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -487,6 +487,8 @@ stream_read_string (estream_t stream, unsigned int secure,
   unsigned char *buffer = NULL;
   u32 length = 0;
 
+  *string_size = 0;
+
   /* Read string length.  */
   err = stream_read_uint32 (stream, &length);
   if (err)
diff --git a/agent/command.c b/agent/command.c
index 5e955ab..8e5d180 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1809,7 +1809,7 @@ cmd_preset_passphrase (assuan_context_t ctx, char *line)
        * limit is 480 characters. */
       size_t maxlen = 480;
 
-      rc = print_assuan_status (ctx, "INQUIRE_MAXLEN", "%u", maxlen);
+      rc = print_assuan_status (ctx, "INQUIRE_MAXLEN", "%zu", maxlen);
       if (!rc)
 	rc = assuan_inquire (ctx, "PASSPHRASE", &passphrase, &len, maxlen);
     }
@@ -3038,7 +3038,7 @@ pinentry_loopback(ctrl_t ctrl, const char *keyword,
   gpg_error_t rc;
   assuan_context_t ctx = ctrl->server_local->assuan_ctx;
 
-  rc = print_assuan_status (ctx, "INQUIRE_MAXLEN", "%u", max_length);
+  rc = print_assuan_status (ctx, "INQUIRE_MAXLEN", "%zu", max_length);
   if (rc)
     return rc;
 
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 3376be0..478d8c6 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -2673,7 +2673,7 @@ ccid_get_atr (ccid_driver_t handle,
 
       if (msglen != 10 + 4)
         {
-          DEBUGOUT_1 ("Setting PPS failed: %d\n", msglen);
+          DEBUGOUT_1 ("Setting PPS failed: %zu\n", msglen);
           return CCID_DRIVER_ERR_CARD_IO_ERROR;
         }
 

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

Summary of changes:
 agent/command-ssh.c |    2 ++
 agent/command.c     |    4 ++--
 scd/ccid-driver.c   |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)


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



From cvs at cvs.gnupg.org  Wed Aug 28 18:27:39 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 28 Aug 2013 18:27:39 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-240-gfdbf76e
Message-ID: <E1VEi5g-0002uZ-M0@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  fdbf76eee6a4e81b040d423926b71af7b491fb4a (commit)
       via  780ba3233618393835970bac4cf8aab713f4d7fa (commit)
      from  04e2c83f189cc56342e1be784bdc63761ccdb5bb (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 fdbf76eee6a4e81b040d423926b71af7b491fb4a
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Aug 28 17:58:43 2013 +0200

    Fix commit 04e2c83f.
    
    * agent/command-ssh.c (stream_read_string): Do not assign to a NULL
    ptr.

diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 0ff70b5..8f8e285 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -487,7 +487,8 @@ stream_read_string (estream_t stream, unsigned int secure,
   unsigned char *buffer = NULL;
   u32 length = 0;
 
-  *string_size = 0;
+  if (string_size)
+    *string_size = 0;
 
   /* Read string length.  */
   err = stream_read_uint32 (stream, &length);

commit 780ba3233618393835970bac4cf8aab713f4d7fa
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 26 17:29:54 2013 +0200

    gpg: Make decryption with the OpenPGP card work.
    
    * scd/app-common.h (APP_DECIPHER_INFO_NOPAD): New.
    * scd/app-openpgp.c (do_decipher): Add arg R_INFO.
    * scd/app-nks.c (do_decipher): Add arg R_INFO as a dummy.
    * scd/app.c (app_decipher): Add arg R_INFO.
    * scd/command.c (cmd_pkdecrypt): Print status line "PADDING".
    * agent/call-scd.c (padding_info_cb): New.
    (agent_card_pkdecrypt): Add arg R_PADDING.
    * agent/divert-scd.c (divert_pkdecrypt): Ditto.
    * agent/pkdecrypt.c (agent_pkdecrypt): Ditto.
    * agent/command.c (cmd_pkdecrypt):  Print status line "PADDING".
    * g10/call-agent.c (padding_info_cb): New.
    (agent_pkdecrypt): Add arg R_PADDING.
    * g10/pubkey-enc.c (get_it): Use padding info.
    --
    
    Decryption using a card never worked in gpg 2.1 because the
    information whether the pkcs#1 padding needs to be removed was not
    available.  Gpg < 2.1 too this info from the secret sub key but that
    has gone in 2.1.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/NEWS b/NEWS
index 3b2016f..eb1bdbc 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,8 @@ Noteworthy changes in version 2.1.0-betaN (unreleased)
 
  * Support installation as portable application under Windows.
 
+ * Fixed GPG to decrypt using an OpenPGP card.
+
 
 Noteworthy changes in version 2.1.0beta3 (2011-12-20)
 -----------------------------------------------------
diff --git a/agent/agent.h b/agent/agent.h
index 885e7fe..ae4e468 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -370,7 +370,7 @@ int agent_pksign (ctrl_t ctrl, const char *cache_nonce,
 /*-- pkdecrypt.c --*/
 int agent_pkdecrypt (ctrl_t ctrl, const char *desc_text,
                      const unsigned char *ciphertext, size_t ciphertextlen,
-                     membuf_t *outbuf);
+                     membuf_t *outbuf, int *r_padding);
 
 /*-- genkey.c --*/
 int check_passphrase_constraints (ctrl_t ctrl, const char *pw, int silent);
@@ -425,7 +425,7 @@ int divert_pksign (ctrl_t ctrl,
 int divert_pkdecrypt (ctrl_t ctrl,
                       const unsigned char *cipher,
                       const unsigned char *shadow_info,
-                      char **r_buf, size_t *r_len);
+                      char **r_buf, size_t *r_len, int *r_padding);
 int divert_generic_cmd (ctrl_t ctrl,
                         const char *cmdline, void *assuan_context);
 int divert_writekey (ctrl_t ctrl, int force, const char *serialno,
@@ -459,7 +459,7 @@ int agent_card_pkdecrypt (ctrl_t ctrl,
                           int (*getpin_cb)(void *, const char *, char*,size_t),
                           void *getpin_cb_arg,
                           const unsigned char *indata, size_t indatalen,
-                          char **r_buf, size_t *r_buflen);
+                          char **r_buf, size_t *r_buflen, int *r_padding);
 int agent_card_readcert (ctrl_t ctrl,
                          const char *id, char **r_buf, size_t *r_buflen);
 int agent_card_readkey (ctrl_t ctrl, const char *id, unsigned char **r_buf);
diff --git a/agent/call-scd.c b/agent/call-scd.c
index a334b15..a6c429c 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -1,6 +1,7 @@
 /* call-scd.c - fork of the scdaemon to do SC operations
  * Copyright (C) 2001, 2002, 2005, 2007, 2010,
  *               2011 Free Software Foundation, Inc.
+ * Copyright (C) 2013 Werner Koch
  *
  * This file is part of GnuPG.
  *
@@ -874,14 +875,36 @@ agent_card_pksign (ctrl_t ctrl,
   return unlock_scd (ctrl, 0);
 }
 
-/* Decipher INDATA using the current card. Note that the returned value is */
+
+
+

+/* Check whether there is any padding info from scdaemon.  */
+static gpg_error_t
+padding_info_cb (void *opaque, const char *line)
+{
+  int *r_padding = opaque;
+  const char *s;
+
+  if ((s=has_leading_keyword (line, "PADDING")))
+    {
+      *r_padding = atoi (s);
+    }
+
+  return 0;
+}
+
+
+/* Decipher INDATA using the current card.  Note that the returned
+   value is not an s-expression but the raw data as returned by
+   scdaemon.  The padding information is stored at R_PADDING with -1
+   for not known.  */
 int
 agent_card_pkdecrypt (ctrl_t ctrl,
                       const char *keyid,
                       int (*getpin_cb)(void *, const char *, char*, size_t),
                       void *getpin_cb_arg,
                       const unsigned char *indata, size_t indatalen,
-                      char **r_buf, size_t *r_buflen)
+                      char **r_buf, size_t *r_buflen, int *r_padding)
 {
   int rc, i;
   char *p, line[ASSUAN_LINELENGTH];
@@ -890,6 +913,7 @@ agent_card_pkdecrypt (ctrl_t ctrl,
   size_t len;
 
   *r_buf = NULL;
+  *r_padding = -1; /* Unknown.  */
   rc = start_scd (ctrl);
   if (rc)
     return rc;
@@ -923,7 +947,7 @@ agent_card_pkdecrypt (ctrl_t ctrl,
   rc = assuan_transact (ctrl->scd_local->ctx, line,
                         membuf_data_cb, &data,
                         inq_needpin, &inqparm,
-                        NULL, NULL);
+                        padding_info_cb, r_padding);
   if (inqparm.any_inq_seen && (gpg_err_code(rc) == GPG_ERR_CANCELED ||
 	gpg_err_code(rc) == GPG_ERR_ASS_CANCELED))
     rc = cancel_inquire (ctrl, rc);
diff --git a/agent/command.c b/agent/command.c
index 8e5d180..938778a 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -865,6 +865,7 @@ cmd_pkdecrypt (assuan_context_t ctx, char *line)
   unsigned char *value;
   size_t valuelen;
   membuf_t outbuf;
+  int padding;
 
   (void)line;
 
@@ -879,12 +880,19 @@ cmd_pkdecrypt (assuan_context_t ctx, char *line)
   init_membuf (&outbuf, 512);
 
   rc = agent_pkdecrypt (ctrl, ctrl->server_local->keydesc,
-                        value, valuelen, &outbuf);
+                        value, valuelen, &outbuf, &padding);
   xfree (value);
   if (rc)
     clear_outbuf (&outbuf);
   else
-    rc = write_and_clear_outbuf (ctx, &outbuf);
+    {
+      if (padding != -1)
+        rc = print_assuan_status (ctx, "PADDING", "%d", padding);
+      else
+        rc = 0;
+      if (!rc)
+        rc = write_and_clear_outbuf (ctx, &outbuf);
+    }
   xfree (ctrl->server_local->keydesc);
   ctrl->server_local->keydesc = NULL;
   return leave_cmd (ctx, rc);
diff --git a/agent/divert-scd.c b/agent/divert-scd.c
index f0d8473..ceef588 100644
--- a/agent/divert-scd.c
+++ b/agent/divert-scd.c
@@ -383,12 +383,13 @@ divert_pksign (ctrl_t ctrl,
 
 /* Decrypt the the value given asn an S-expression in CIPHER using the
    key identified by SHADOW_INFO and return the plaintext in an
-   allocated buffer in R_BUF.  */
+   allocated buffer in R_BUF.  The padding information is stored at
+   R_PADDING with -1 for not known.  */
 int
 divert_pkdecrypt (ctrl_t ctrl,
                   const unsigned char *cipher,
                   const unsigned char *shadow_info,
-                  char **r_buf, size_t *r_len)
+                  char **r_buf, size_t *r_len, int *r_padding)
 {
   int rc;
   char *kid;
@@ -399,6 +400,8 @@ divert_pkdecrypt (ctrl_t ctrl,
   char *plaintext;
   size_t plaintextlen;
 
+  *r_padding = -1;
+
   s = cipher;
   if (*s != '(')
     return gpg_error (GPG_ERR_INV_SEXP);
@@ -436,7 +439,7 @@ divert_pkdecrypt (ctrl_t ctrl,
 
   rc = agent_card_pkdecrypt (ctrl, kid, getpin_cb, ctrl,
                              ciphertext, ciphertextlen,
-                             &plaintext, &plaintextlen);
+                             &plaintext, &plaintextlen, r_padding);
   if (!rc)
     {
       *r_buf = plaintext;
diff --git a/agent/pkdecrypt.c b/agent/pkdecrypt.c
index 7df7f1d..9924d6d 100644
--- a/agent/pkdecrypt.c
+++ b/agent/pkdecrypt.c
@@ -32,11 +32,12 @@
 
 /* DECRYPT the stuff in ciphertext which is expected to be a S-Exp.
    Try to get the key from CTRL and write the decoded stuff back to
-   OUTFP. */
+   OUTFP.   The padding information is stored at R_PADDING with -1
+   for not known.  */
 int
 agent_pkdecrypt (ctrl_t ctrl, const char *desc_text,
                  const unsigned char *ciphertext, size_t ciphertextlen,
-                 membuf_t *outbuf)
+                 membuf_t *outbuf, int *r_padding)
 {
   gcry_sexp_t s_skey = NULL, s_cipher = NULL, s_plain = NULL;
   unsigned char *shadow_info = NULL;
@@ -44,6 +45,8 @@ agent_pkdecrypt (ctrl_t ctrl, const char *desc_text,
   char *buf = NULL;
   size_t len;
 
+  *r_padding = -1;
+
   if (!ctrl->have_keygrip)
     {
       log_error ("speculative decryption not yet supported\n");
@@ -85,7 +88,8 @@ agent_pkdecrypt (ctrl_t ctrl, const char *desc_text,
           goto leave;
         }
 
-      rc = divert_pkdecrypt (ctrl, ciphertext, shadow_info, &buf, &len );
+      rc = divert_pkdecrypt (ctrl, ciphertext, shadow_info,
+                             &buf, &len, r_padding);
       if (rc)
         {
           log_error ("smartcard decryption failed: %s\n", gpg_strerror (rc));
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index f832b8e..bfb1d93 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -897,10 +897,15 @@ Here is an example session:
    C: D    (b 3F444677CA)))
    C: END
    S: # session key follows
+   S: S PADDING 0
    S: D (value 1234567890ABCDEF0)
    S: OK descryption successful
 @end example
 
+The ?PADDING? status line is only send if gpg-agent can tell what kind
+of padding is used.  As of now only the value 0 is used to indicate
+that the padding has been removed.
+
 
 @node Agent PKSIGN
 @subsection Signing a Hash
diff --git a/doc/scdaemon.texi b/doc/scdaemon.texi
index f454f14..1a4b6d7 100644
--- a/doc/scdaemon.texi
+++ b/doc/scdaemon.texi
@@ -600,6 +600,10 @@ using the command
 
 where @var{keyid} is the hexified ID of the key to be used.
 
+If the card is ware of the apdding format a status line with padding
+information is send before the plaintext data.  The key for this
+status line is @code{PADDING} with the only defined value being 0 and
+meaning padding has been removed.
 
 @node Scdaemon GETATTR
 @subsection Read an attribute's value.
diff --git a/g10/call-agent.c b/g10/call-agent.c
index 17290ec..4ce6a06 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -1816,17 +1816,34 @@ inq_ciphertext_cb (void *opaque, const char *line)
 }
 
 
+/* Check whether there is any padding info from the agent.  */
+static gpg_error_t
+padding_info_cb (void *opaque, const char *line)
+{
+  int *r_padding = opaque;
+  const char *s;
+
+  if ((s=has_leading_keyword (line, "PADDING")))
+    {
+      *r_padding = atoi (s);
+    }
+
+  return 0;
+}
+
+
 /* Call the agent to do a decrypt operation using the key identified
    by the hex string KEYGRIP and the input data S_CIPHERTEXT.  On the
    success the decoded value is stored verbatim at R_BUF and its
    length at R_BUF; the callers needs to release it.  KEYID, MAINKEYID
    and PUBKEY_ALGO are used to construct additional promots or status
-   messages. */
+   messages.   The padding information is stored at R_PADDING with -1
+   for not known.  */
 gpg_error_t
 agent_pkdecrypt (ctrl_t ctrl, const char *keygrip, const char *desc,
                  u32 *keyid, u32 *mainkeyid, int pubkey_algo,
                  gcry_sexp_t s_ciphertext,
-                 unsigned char **r_buf, size_t *r_buflen)
+                 unsigned char **r_buf, size_t *r_buflen, int *r_padding)
 {
   gpg_error_t err;
   char line[ASSUAN_LINELENGTH];
@@ -1841,9 +1858,12 @@ agent_pkdecrypt (ctrl_t ctrl, const char *keygrip, const char *desc,
   dfltparm.keyinfo.mainkeyid   = mainkeyid;
   dfltparm.keyinfo.pubkey_algo = pubkey_algo;
 
-  if (!keygrip || strlen(keygrip) != 40 || !s_ciphertext || !r_buf || !r_buflen)
+  if (!keygrip || strlen(keygrip) != 40
+      || !s_ciphertext || !r_buf || !r_buflen || !r_padding)
     return gpg_error (GPG_ERR_INV_VALUE);
+
   *r_buf = NULL;
+  *r_padding = -1;
 
   err = start_agent (ctrl, 0);
   if (err)
@@ -1881,7 +1901,8 @@ agent_pkdecrypt (ctrl_t ctrl, const char *keygrip, const char *desc,
       return err;
     err = assuan_transact (agent_ctx, "PKDECRYPT",
                            membuf_data_cb, &data,
-                           inq_ciphertext_cb, &parm, NULL, NULL);
+                           inq_ciphertext_cb, &parm,
+                           padding_info_cb, r_padding);
     xfree (parm.ciphertext);
   }
   if (err)
diff --git a/g10/call-agent.h b/g10/call-agent.h
index cce8304..2b944d2 100644
--- a/g10/call-agent.h
+++ b/g10/call-agent.h
@@ -168,7 +168,8 @@ gpg_error_t agent_pksign (ctrl_t ctrl, const char *cache_nonce,
 gpg_error_t agent_pkdecrypt (ctrl_t ctrl, const char *keygrip, const char *desc,
                              u32 *keyid, u32 *mainkeyid, int pubkey_algo,
                              gcry_sexp_t s_ciphertext,
-                             unsigned char **r_buf, size_t *r_buflen);
+                             unsigned char **r_buf, size_t *r_buflen,
+                             int *r_padding);
 
 /* Retrieve a key encryption key.  */
 gpg_error_t agent_keywrap_key (ctrl_t ctrl, int forexport,
diff --git a/g10/pubkey-enc.c b/g10/pubkey-enc.c
index a328e1a..1e72557 100644
--- a/g10/pubkey-enc.c
+++ b/g10/pubkey-enc.c
@@ -146,7 +146,7 @@ get_it (PKT_pubkey_enc *enc, DEK *dek, PKT_public_key *sk, u32 *keyid)
   unsigned int n;
   size_t nframe;
   u16 csum, csum2;
-  int card = 0;
+  int padding;
   gcry_sexp_t s_data;
   char *desc;
   char *keygrip;
@@ -203,7 +203,7 @@ get_it (PKT_pubkey_enc *enc, DEK *dek, PKT_public_key *sk, u32 *keyid)
   desc = gpg_format_keydesc (sk, 0, 1);
   err = agent_pkdecrypt (NULL, keygrip,
                          desc, sk->keyid, sk->main_keyid, sk->pubkey_algo,
-                         s_data, &frame, &nframe);
+                         s_data, &frame, &nframe, &padding);
   xfree (desc);
   gcry_sexp_release (s_data);
   if (err)
@@ -270,7 +270,7 @@ get_it (PKT_pubkey_enc *enc, DEK *dek, PKT_public_key *sk, u32 *keyid)
     }
   else
     {
-      if (!card)
+      if (padding)
         {
           if (n + 7 > nframe)
             {
diff --git a/scd/app-common.h b/scd/app-common.h
index e3d23c2..66430b6 100644
--- a/scd/app-common.h
+++ b/scd/app-common.h
@@ -34,6 +34,9 @@
 #define APP_CHANGE_FLAG_RESET    1
 #define APP_CHANGE_FLAG_NULLPIN  2
 
+/* Bit flags set by the decipher function into R_INFO.  */
+#define APP_DECIPHER_INFO_NOPAD  1  /* Padding has been removed.  */
+
 
 struct app_local_s;  /* Defined by all app-*.c.  */
 
@@ -93,10 +96,11 @@ struct app_ctx_s {
                  const void *indata, size_t indatalen,
                  unsigned char **outdata, size_t *outdatalen);
     gpg_error_t (*decipher) (app_t app, const char *keyidstr,
-                     gpg_error_t (*pincb)(void*, const char *, char **),
-                     void *pincb_arg,
-                     const void *indata, size_t indatalen,
-                     unsigned char **outdata, size_t *outdatalen);
+                             gpg_error_t (*pincb)(void*, const char *, char **),
+                             void *pincb_arg,
+                             const void *indata, size_t indatalen,
+                             unsigned char **outdata, size_t *outdatalen,
+                             unsigned int *r_info);
     gpg_error_t (*writecert) (app_t app, ctrl_t ctrl,
                               const char *certid,
                               gpg_error_t (*pincb)(void*,const char *,char **),
@@ -168,15 +172,16 @@ gpg_error_t app_sign (app_t app, const char *keyidstr, int hashalgo,
               const void *indata, size_t indatalen,
               unsigned char **outdata, size_t *outdatalen );
 gpg_error_t app_auth (app_t app, const char *keyidstr,
-              gpg_error_t (*pincb)(void*, const char *, char **),
-              void *pincb_arg,
-              const void *indata, size_t indatalen,
-              unsigned char **outdata, size_t *outdatalen);
+                      gpg_error_t (*pincb)(void*, const char *, char **),
+                      void *pincb_arg,
+                      const void *indata, size_t indatalen,
+                      unsigned char **outdata, size_t *outdatalen);
 gpg_error_t app_decipher (app_t app, const char *keyidstr,
-                  gpg_error_t (*pincb)(void*, const char *, char **),
-                  void *pincb_arg,
-                  const void *indata, size_t indatalen,
-                  unsigned char **outdata, size_t *outdatalen );
+                          gpg_error_t (*pincb)(void*, const char *, char **),
+                          void *pincb_arg,
+                          const void *indata, size_t indatalen,
+                          unsigned char **outdata, size_t *outdatalen,
+                          unsigned int *r_info);
 gpg_error_t app_writecert (app_t app, ctrl_t ctrl,
                            const char *certidstr,
                            gpg_error_t (*pincb)(void*, const char *, char **),
diff --git a/scd/app-nks.c b/scd/app-nks.c
index 72e726d..c83217f 100644
--- a/scd/app-nks.c
+++ b/scd/app-nks.c
@@ -985,13 +985,16 @@ do_decipher (app_t app, const char *keyidstr,
              gpg_error_t (*pincb)(void*, const char *, char **),
              void *pincb_arg,
              const void *indata, size_t indatalen,
-             unsigned char **outdata, size_t *outdatalen )
+             unsigned char **outdata, size_t *outdatalen,
+             unsigned int *r_info)
 {
   int rc, i;
   int is_sigg = 0;
   int fid;
   int kid;
 
+  (void)r_info;
+
   if (!keyidstr || !*keyidstr || !indatalen)
     return gpg_error (GPG_ERR_INV_VALUE);
 
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 011c248..dd4a2d9 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -3598,7 +3598,8 @@ do_decipher (app_t app, const char *keyidstr,
              gpg_error_t (*pincb)(void*, const char *, char **),
              void *pincb_arg,
              const void *indata, size_t indatalen,
-             unsigned char **outdata, size_t *outdatalen )
+             unsigned char **outdata, size_t *outdatalen,
+             unsigned int *r_info)
 {
   int rc;
   unsigned char tmp_sn[20]; /* actually 16 but we use it also for the fpr. */
@@ -3727,6 +3728,8 @@ do_decipher (app_t app, const char *keyidstr,
           && app->card_version == 0x0200)
         log_info ("NOTE: Cards with manufacturer id 5 and s/n <= 346 (0x15a)"
                   " do not work with encryption keys > 2048 bits\n");
+
+      *r_info |= APP_DECIPHER_INFO_NOPAD;
     }
 
   return rc;
diff --git a/scd/app.c b/scd/app.c
index e6a663e..a0bb5f5 100644
--- a/scd/app.c
+++ b/scd/app.c
@@ -801,10 +801,13 @@ app_decipher (app_t app, const char *keyidstr,
               gpg_error_t (*pincb)(void*, const char *, char **),
               void *pincb_arg,
               const void *indata, size_t indatalen,
-              unsigned char **outdata, size_t *outdatalen )
+              unsigned char **outdata, size_t *outdatalen,
+              unsigned int *r_info)
 {
   gpg_error_t err;
 
+  *r_info = 0;
+
   if (!app || !indata || !indatalen || !outdata || !outdatalen || !pincb)
     return gpg_error (GPG_ERR_INV_VALUE);
   if (!app->ref_count)
@@ -817,7 +820,8 @@ app_decipher (app_t app, const char *keyidstr,
   err = app->fnc.decipher (app, keyidstr,
                            pincb, pincb_arg,
                            indata, indatalen,
-                           outdata, outdatalen);
+                           outdata, outdatalen,
+                           r_info);
   unlock_reader (app->slot);
   if (opt.verbose)
     log_info ("operation decipher result: %s\n", gpg_strerror (err));
diff --git a/scd/command.c b/scd/command.c
index d5cc32c..05b50b9 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -1089,6 +1089,7 @@ cmd_pkdecrypt (assuan_context_t ctx, char *line)
   unsigned char *outdata;
   size_t outdatalen;
   char *keyidstr;
+  unsigned int infoflags;
 
   if ( IS_LOCKED (ctrl) )
     return gpg_error (GPG_ERR_LOCKED);
@@ -1103,7 +1104,7 @@ cmd_pkdecrypt (assuan_context_t ctx, char *line)
                      keyidstr,
                      pin_cb, ctx,
                      ctrl->in_data.value, ctrl->in_data.valuelen,
-                     &outdata, &outdatalen);
+                     &outdata, &outdatalen, &infoflags);
 
   xfree (keyidstr);
   if (rc)
@@ -1112,6 +1113,13 @@ cmd_pkdecrypt (assuan_context_t ctx, char *line)
     }
   else
     {
+      /* If the card driver told us that there is no padding, send a
+         status line.  If there is a padding it is assumed that the
+         caller knows what padding is used.  It would have been better
+         to always send that information but for backward
+         compatibility we can't do that.  */
+      if ((infoflags & APP_DECIPHER_INFO_NOPAD))
+        send_status_direct (ctrl, "PADDING", "0");
       rc = assuan_send_data (ctx, outdata, outdatalen);
       xfree (outdata);
       if (rc)

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

Summary of changes:
 NEWS                |    2 ++
 agent/agent.h       |    6 +++---
 agent/call-scd.c    |   30 +++++++++++++++++++++++++++---
 agent/command-ssh.c |    3 ++-
 agent/command.c     |   12 ++++++++++--
 agent/divert-scd.c  |    9 ++++++---
 agent/pkdecrypt.c   |   10 +++++++---
 doc/gpg-agent.texi  |    5 +++++
 doc/scdaemon.texi   |    4 ++++
 g10/call-agent.c    |   29 +++++++++++++++++++++++++----
 g10/call-agent.h    |    3 ++-
 g10/pubkey-enc.c    |    6 +++---
 scd/app-common.h    |   29 +++++++++++++++++------------
 scd/app-nks.c       |    5 ++++-
 scd/app-openpgp.c   |    5 ++++-
 scd/app.c           |    8 ++++++--
 scd/command.c       |   10 +++++++++-
 17 files changed, 136 insertions(+), 40 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Aug 29 18:23:29 2013
From: cvs at cvs.gnupg.org (by Jonas Borgström)
Date: Thu, 29 Aug 2013 18:23:29 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-242-gcc67918
Message-ID: <E1VF4V4-0008FJ-Vj@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  cc67918c088e90c1d9a507af5f6288e8faa93d87 (commit)
       via  3adfaa9beee4502479b5673c7dfd386680a920c5 (commit)
      from  fdbf76eee6a4e81b040d423926b71af7b491fb4a (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 cc67918c088e90c1d9a507af5f6288e8faa93d87
Author: Jonas Borgstr?m <jonas at borgstrom.se>
Date:   Wed Aug 28 11:21:10 2013 +0200

    scd: add support for RSA_CRT and RSA_CRT_N key import.
    
    * scd/app-openpgp.c (do_writekey): Added RSA_CRT and RSA_CRT_N support.
    
    --
    
    Updates of original patch by wk:
    
      -      unsigned char *rsa_u, *rsa_dp, rsa_dq;
      +      unsigned char *rsa_u, *rsa_dp, *rsa_dq;
    
    and AUTHORS.  Missing signed-off-by assumed due to DCO send the other
    day.

diff --git a/AUTHORS b/AUTHORS
index a915919..f237d53 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -137,6 +137,9 @@ Authors with a DCO
 Christian Aistleitner <christian at quelltextlich.at>
 2013-05-26:20130626112332.GA2228 at quelltextlich.at:
 
+Jonas Borgstr?m <jonas at borgstrom.se>
+2013-08-29:521F1E7A.5080602 at borgstrom.se:
+
 Hans of Guardian <hans at guardianproject.info>
 2013-06-26:D84473D7-F3F7-43D5-A9CE-16580B88D574 at guardianproject.info:
 
@@ -144,6 +147,7 @@ Werner Koch <wk at gnupg.org>
 2013-03-29:87620ahchj.fsf at vigenere.g10code.de:
 
 
+
 Other authors
 =============
 
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index dd4a2d9..3d7136f 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -2508,10 +2508,13 @@ build_privkey_template (app_t app, int keyno,
                         const unsigned char *rsa_e, size_t rsa_e_len,
                         const unsigned char *rsa_p, size_t rsa_p_len,
                         const unsigned char *rsa_q, size_t rsa_q_len,
+                        const unsigned char *rsa_u, size_t rsa_u_len,
+                        const unsigned char *rsa_dp, size_t rsa_dp_len,
+                        const unsigned char *rsa_dq, size_t rsa_dq_len,
                         unsigned char **result, size_t *resultlen)
 {
   size_t rsa_e_reqlen;
-  unsigned char privkey[7*(1+3)];
+  unsigned char privkey[7*(1+3+3)];
   size_t privkey_len;
   unsigned char exthdr[2+2+3];
   size_t exthdr_len;
@@ -2529,17 +2532,16 @@ build_privkey_template (app_t app, int keyno,
     {
     case RSA_STD:
     case RSA_STD_N:
-      break;
     case RSA_CRT:
     case RSA_CRT_N:
-      return gpg_error (GPG_ERR_NOT_SUPPORTED);
+      break;
 
     default:
       return gpg_error (GPG_ERR_INV_VALUE);
     }
 
-  /* Get the required length for E.  */
-  rsa_e_reqlen = app->app_local->keyattr[keyno].rsa.e_bits/8;
+  /* Get the required length for E. Rounded up to the nearest byte  */
+  rsa_e_reqlen = (app->app_local->keyattr[keyno].rsa.e_bits + 7) / 8;
   assert (rsa_e_len <= rsa_e_reqlen);
 
   /* Build the 7f48 cardholder private key template.  */
@@ -2555,6 +2557,17 @@ build_privkey_template (app_t app, int keyno,
   tp += add_tlv (tp, 0x93, rsa_q_len);
   datalen += rsa_q_len;
 
+  if (app->app_local->keyattr[keyno].rsa.format == RSA_CRT
+      || app->app_local->keyattr[keyno].rsa.format == RSA_CRT_N)
+    {
+      tp += add_tlv (tp, 0x94, rsa_u_len);
+      datalen += rsa_u_len;
+      tp += add_tlv (tp, 0x95, rsa_dp_len);
+      datalen += rsa_dp_len;
+      tp += add_tlv (tp, 0x96, rsa_dq_len);
+      datalen += rsa_dq_len;
+    }
+
   if (app->app_local->keyattr[keyno].rsa.format == RSA_STD_N
       || app->app_local->keyattr[keyno].rsa.format == RSA_CRT_N)
     {
@@ -2608,6 +2621,17 @@ build_privkey_template (app_t app, int keyno,
   memcpy (tp, rsa_q, rsa_q_len);
   tp += rsa_q_len;
 
+  if (app->app_local->keyattr[keyno].rsa.format == RSA_CRT
+      || app->app_local->keyattr[keyno].rsa.format == RSA_CRT_N)
+    {
+      memcpy (tp, rsa_u, rsa_u_len);
+      tp += rsa_u_len;
+      memcpy (tp, rsa_dp, rsa_dp_len);
+      tp += rsa_dp_len;
+      memcpy (tp, rsa_dq, rsa_dq_len);
+      tp += rsa_dq_len;
+    }
+
   if (app->app_local->keyattr[keyno].rsa.format == RSA_STD_N
       || app->app_local->keyattr[keyno].rsa.format == RSA_CRT_N)
     {
@@ -2954,16 +2978,53 @@ do_writekey (app_t app, ctrl_t ctrl,
 
   if (app->app_local->extcap.is_v2)
     {
-      /* Build the private key template as described in section 4.3.3.7 of
-         the OpenPGP card specs version 2.0.  */
+      unsigned char *rsa_u, *rsa_dp, *rsa_dq;
+      size_t rsa_u_len, rsa_dp_len, rsa_dq_len;
+      gcry_mpi_t mpi_e, mpi_p, mpi_q;
+      gcry_mpi_t mpi_u = gcry_mpi_snew (0);
+      gcry_mpi_t mpi_dp = gcry_mpi_snew (0);
+      gcry_mpi_t mpi_dq = gcry_mpi_snew (0);
+      gcry_mpi_t mpi_tmp = gcry_mpi_snew (0);
       int exmode;
 
+      /* Calculate the u, dp and dq components needed by RSA_CRT cards */
+      gcry_mpi_scan (&mpi_e, GCRYMPI_FMT_USG, rsa_e, rsa_e_len, NULL);
+      gcry_mpi_scan (&mpi_p, GCRYMPI_FMT_USG, rsa_p, rsa_p_len, NULL);
+      gcry_mpi_scan (&mpi_q, GCRYMPI_FMT_USG, rsa_q, rsa_q_len, NULL);
+
+      gcry_mpi_invm (mpi_u, mpi_q, mpi_p);
+      gcry_mpi_sub_ui (mpi_tmp, mpi_p, 1);
+      gcry_mpi_invm (mpi_dp, mpi_e, mpi_tmp);
+      gcry_mpi_sub_ui (mpi_tmp, mpi_q, 1);
+      gcry_mpi_invm (mpi_dq, mpi_e, mpi_tmp);
+
+      gcry_mpi_aprint (GCRYMPI_FMT_USG, &rsa_u, &rsa_u_len, mpi_u);
+      gcry_mpi_aprint (GCRYMPI_FMT_USG, &rsa_dp, &rsa_dp_len, mpi_dp);
+      gcry_mpi_aprint (GCRYMPI_FMT_USG, &rsa_dq, &rsa_dq_len, mpi_dq);
+
+      gcry_mpi_release (mpi_e);
+      gcry_mpi_release (mpi_p);
+      gcry_mpi_release (mpi_q);
+      gcry_mpi_release (mpi_u);
+      gcry_mpi_release (mpi_dp);
+      gcry_mpi_release (mpi_dq);
+      gcry_mpi_release (mpi_tmp);
+
+      /* Build the private key template as described in section 4.3.3.7 of
+         the OpenPGP card specs version 2.0.  */
       err = build_privkey_template (app, keyno,
                                     rsa_n, rsa_n_len,
                                     rsa_e, rsa_e_len,
                                     rsa_p, rsa_p_len,
                                     rsa_q, rsa_q_len,
+                                    rsa_u, rsa_u_len,
+                                    rsa_dp, rsa_dp_len,
+                                    rsa_dq, rsa_dq_len,
                                     &template, &template_len);
+      xfree(rsa_u);
+      xfree(rsa_dp);
+      xfree(rsa_dq);
+
       if (err)
         goto leave;
 

commit 3adfaa9beee4502479b5673c7dfd386680a920c5
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 29 17:39:35 2013 +0200

    kbx: Add a few macros for easier readability.
    
    * kbx/keybox-update.c (FILECOPY_INSERT)
    (FILECOPY_DELETE, FILECOPY_UPDATE): New macros.  Replace numbers by
    them.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/kbx/keybox-update.c b/kbx/keybox-update.c
index 6428bb2..1fdf435 100644
--- a/kbx/keybox-update.c
+++ b/kbx/keybox-update.c
@@ -31,6 +31,10 @@
 
 #define EXTSEP_S "."
 
+#define FILECOPY_INSERT 1
+#define FILECOPY_DELETE 2
+#define FILECOPY_UPDATE 3
+
 
 #if !defined(HAVE_FSEEKO) && !defined(fseeko)
 
@@ -208,9 +212,7 @@ rename_tmp_file (const char *bakfname, const char *tmpfname,
 
 
 /* Perform insert/delete/update operation.
-    mode 1 = insert
- 	 2 = delete
- 	 3 = update
+   MODE is one of FILECOPY_INSERT, FILECOPY_DELETE, FILECOPY_UPDATE.
 */
 static int
 blob_filecopy (int mode, const char *fname, KEYBOXBLOB blob,
@@ -229,7 +231,7 @@ blob_filecopy (int mode, const char *fname, KEYBOXBLOB blob,
     return gpg_error_from_syserror ();
 
   fp = fopen (fname, "rb");
-  if (mode == 1 && !fp && errno == ENOENT)
+  if (mode == FILECOPY_INSERT && !fp && errno == ENOENT)
     {
       /* Insert mode but file does not exist:
          Create a new keybox file. */
@@ -271,7 +273,7 @@ blob_filecopy (int mode, const char *fname, KEYBOXBLOB blob,
     }
 
   /* prepare for insert */
-  if (mode == 1)
+  if (mode == FILECOPY_INSERT)
     {
       /* Copy everything to the new file. */
       while ( (nread = fread (buffer, 1, DIM(buffer), fp)) > 0 )
@@ -290,7 +292,7 @@ blob_filecopy (int mode, const char *fname, KEYBOXBLOB blob,
     }
 
   /* Prepare for delete or update. */
-  if ( mode == 2 || mode == 3 )
+  if ( mode == FILECOPY_DELETE || mode == FILECOPY_UPDATE )
     {
       off_t current = 0;
 
@@ -324,7 +326,7 @@ blob_filecopy (int mode, const char *fname, KEYBOXBLOB blob,
     }
 
   /* Do an insert or update. */
-  if ( mode == 1 || mode == 3 )
+  if ( mode == FILECOPY_INSERT || mode == FILECOPY_UPDATE )
     {
       rc = _keybox_write_blob (blob, newfp);
       if (rc)
@@ -332,7 +334,7 @@ blob_filecopy (int mode, const char *fname, KEYBOXBLOB blob,
     }
 
   /* Copy the rest of the packet for an delete or update. */
-  if (mode == 2 || mode == 3)
+  if (mode == FILECOPY_DELETE || mode == FILECOPY_UPDATE)
     {
       while ( (nread = fread (buffer, 1, DIM(buffer), fp)) > 0 )
         {
@@ -407,7 +409,7 @@ keybox_insert_keyblock (KEYBOX_HANDLE hd, const void *image, size_t imagelen,
   _keybox_destroy_openpgp_info (&info);
   if (!err)
     {
-      err = blob_filecopy (1, fname, blob, hd->secret, 0);
+      err = blob_filecopy (FILECOPY_INSERT, fname, blob, hd->secret, 0);
       _keybox_release_blob (blob);
       /*    if (!rc && !hd->secret && kb_offtbl) */
       /*      { */
@@ -456,7 +458,7 @@ keybox_insert_cert (KEYBOX_HANDLE hd, ksba_cert_t cert,
   rc = _keybox_create_x509_blob (&blob, cert, sha1_digest, hd->ephemeral);
   if (!rc)
     {
-      rc = blob_filecopy (1, fname, blob, hd->secret, 0);
+      rc = blob_filecopy (FILECOPY_INSERT, fname, blob, hd->secret, 0);
       _keybox_release_blob (blob);
       /*    if (!rc && !hd->secret && kb_offtbl) */
       /*      { */

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

Summary of changes:
 AUTHORS             |    4 +++
 kbx/keybox-update.c |   22 ++++++++-------
 scd/app-openpgp.c   |   75 ++++++++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 84 insertions(+), 17 deletions(-)


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



From cvs at cvs.gnupg.org  Thu Aug 29 18:40:13 2013
From: cvs at cvs.gnupg.org (by Jonas Borgström)
Date: Thu, 29 Aug 2013 18:40:13 +0200
Subject: [git] GnuPG - branch, STABLE-BRANCH-2-0,
 updated. gnupg-2.0.21-6-g6acb1d0
Message-ID: <E1VF4lG-0008Lh-Ny@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-0 has been updated
       via  6acb1d06f02ced837b423c725943c73f7d6f428a (commit)
      from  9158f58822a9258390b857aee5bf9751328793bb (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 6acb1d06f02ced837b423c725943c73f7d6f428a
Author: Jonas Borgstr?m <jonas at borgstrom.se>
Date:   Wed Aug 28 11:21:10 2013 +0200

    scd: add support for RSA_CRT and RSA_CRT_N key import.
    
    * scd/app-openpgp.c (do_writekey): Added RSA_CRT and RSA_CRT_N support.
    
    --
    
    Updates of original patch by wk:
    
      -      unsigned char *rsa_u, *rsa_dp, rsa_dq;
      +      unsigned char *rsa_u, *rsa_dp, *rsa_dq;
    
    and AUTHORS.  Missing signed-off-by assumed due to DCO send the other
    day.
    
    (cherry picked from commit cc67918c088e90c1d9a507af5f6288e8faa93d87)
    
    Solved conflicts:
    	AUTHORS => Removed
    	scd/app-openpgp.c => s/.rsa.format/.format/.

diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 9186e18..0d4ce90 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -2380,10 +2380,13 @@ build_privkey_template (app_t app, int keyno,
                         const unsigned char *rsa_e, size_t rsa_e_len,
                         const unsigned char *rsa_p, size_t rsa_p_len,
                         const unsigned char *rsa_q, size_t rsa_q_len,
+                        const unsigned char *rsa_u, size_t rsa_u_len,
+                        const unsigned char *rsa_dp, size_t rsa_dp_len,
+                        const unsigned char *rsa_dq, size_t rsa_dq_len,
                         unsigned char **result, size_t *resultlen)
 {
   size_t rsa_e_reqlen;
-  unsigned char privkey[7*(1+3)];
+  unsigned char privkey[7*(1+3+3)];
   size_t privkey_len;
   unsigned char exthdr[2+2+3];
   size_t exthdr_len;
@@ -2401,17 +2404,16 @@ build_privkey_template (app_t app, int keyno,
     {
     case RSA_STD:
     case RSA_STD_N:
-      break;
     case RSA_CRT:
     case RSA_CRT_N:
-      return gpg_error (GPG_ERR_NOT_SUPPORTED);
+      break;
 
     default:
       return gpg_error (GPG_ERR_INV_VALUE);
     }
 
-  /* Get the required length for E.  */
-  rsa_e_reqlen = app->app_local->keyattr[keyno].e_bits/8;
+  /* Get the required length for E. Rounded up to the nearest byte  */
+  rsa_e_reqlen = (app->app_local->keyattr[keyno].e_bits + 7) / 8;
   assert (rsa_e_len <= rsa_e_reqlen);
 
   /* Build the 7f48 cardholder private key template.  */
@@ -2427,6 +2429,17 @@ build_privkey_template (app_t app, int keyno,
   tp += add_tlv (tp, 0x93, rsa_q_len);
   datalen += rsa_q_len;
 
+  if (app->app_local->keyattr[keyno].format == RSA_CRT
+      || app->app_local->keyattr[keyno].format == RSA_CRT_N)
+    {
+      tp += add_tlv (tp, 0x94, rsa_u_len);
+      datalen += rsa_u_len;
+      tp += add_tlv (tp, 0x95, rsa_dp_len);
+      datalen += rsa_dp_len;
+      tp += add_tlv (tp, 0x96, rsa_dq_len);
+      datalen += rsa_dq_len;
+    }
+
   if (app->app_local->keyattr[keyno].format == RSA_STD_N
       || app->app_local->keyattr[keyno].format == RSA_CRT_N)
     {
@@ -2480,6 +2493,17 @@ build_privkey_template (app_t app, int keyno,
   memcpy (tp, rsa_q, rsa_q_len);
   tp += rsa_q_len;
 
+  if (app->app_local->keyattr[keyno].format == RSA_CRT
+      || app->app_local->keyattr[keyno].format == RSA_CRT_N)
+    {
+      memcpy (tp, rsa_u, rsa_u_len);
+      tp += rsa_u_len;
+      memcpy (tp, rsa_dp, rsa_dp_len);
+      tp += rsa_dp_len;
+      memcpy (tp, rsa_dq, rsa_dq_len);
+      tp += rsa_dq_len;
+    }
+
   if (app->app_local->keyattr[keyno].format == RSA_STD_N
       || app->app_local->keyattr[keyno].format == RSA_CRT_N)
     {
@@ -2826,16 +2850,53 @@ do_writekey (app_t app, ctrl_t ctrl,
 
   if (app->app_local->extcap.is_v2)
     {
-      /* Build the private key template as described in section 4.3.3.7 of
-         the OpenPGP card specs version 2.0.  */
+      unsigned char *rsa_u, *rsa_dp, *rsa_dq;
+      size_t rsa_u_len, rsa_dp_len, rsa_dq_len;
+      gcry_mpi_t mpi_e, mpi_p, mpi_q;
+      gcry_mpi_t mpi_u = gcry_mpi_snew (0);
+      gcry_mpi_t mpi_dp = gcry_mpi_snew (0);
+      gcry_mpi_t mpi_dq = gcry_mpi_snew (0);
+      gcry_mpi_t mpi_tmp = gcry_mpi_snew (0);
       int exmode;
 
+      /* Calculate the u, dp and dq components needed by RSA_CRT cards */
+      gcry_mpi_scan (&mpi_e, GCRYMPI_FMT_USG, rsa_e, rsa_e_len, NULL);
+      gcry_mpi_scan (&mpi_p, GCRYMPI_FMT_USG, rsa_p, rsa_p_len, NULL);
+      gcry_mpi_scan (&mpi_q, GCRYMPI_FMT_USG, rsa_q, rsa_q_len, NULL);
+
+      gcry_mpi_invm (mpi_u, mpi_q, mpi_p);
+      gcry_mpi_sub_ui (mpi_tmp, mpi_p, 1);
+      gcry_mpi_invm (mpi_dp, mpi_e, mpi_tmp);
+      gcry_mpi_sub_ui (mpi_tmp, mpi_q, 1);
+      gcry_mpi_invm (mpi_dq, mpi_e, mpi_tmp);
+
+      gcry_mpi_aprint (GCRYMPI_FMT_USG, &rsa_u, &rsa_u_len, mpi_u);
+      gcry_mpi_aprint (GCRYMPI_FMT_USG, &rsa_dp, &rsa_dp_len, mpi_dp);
+      gcry_mpi_aprint (GCRYMPI_FMT_USG, &rsa_dq, &rsa_dq_len, mpi_dq);
+
+      gcry_mpi_release (mpi_e);
+      gcry_mpi_release (mpi_p);
+      gcry_mpi_release (mpi_q);
+      gcry_mpi_release (mpi_u);
+      gcry_mpi_release (mpi_dp);
+      gcry_mpi_release (mpi_dq);
+      gcry_mpi_release (mpi_tmp);
+
+      /* Build the private key template as described in section 4.3.3.7 of
+         the OpenPGP card specs version 2.0.  */
       err = build_privkey_template (app, keyno,
                                     rsa_n, rsa_n_len,
                                     rsa_e, rsa_e_len,
                                     rsa_p, rsa_p_len,
                                     rsa_q, rsa_q_len,
+                                    rsa_u, rsa_u_len,
+                                    rsa_dp, rsa_dp_len,
+                                    rsa_dq, rsa_dq_len,
                                     &template, &template_len);
+      xfree(rsa_u);
+      xfree(rsa_dp);
+      xfree(rsa_dq);
+
       if (err)
         goto leave;
 

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

Summary of changes:
 scd/app-openpgp.c |   75 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 68 insertions(+), 7 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Aug 30 04:42:37 2013
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Fri, 30 Aug 2013 04:42:37 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-243-g95a3bff
Message-ID: <E1VFEAC-0003aa-4e@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  95a3bffeaf07e8bf9487d4b165c336d166236fc1 (commit)
      from  cc67918c088e90c1d9a507af5f6288e8faa93d87 (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 95a3bffeaf07e8bf9487d4b165c336d166236fc1
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Aug 30 11:06:50 2013 +0900

    scd: PC/SC pinpad input improvement.
    
    * scd/apdu.c (struct reader_table_s): Add members: PINMIN, PINMAX, and
    PINPAD_VERLEN_SUPPORTED.
    (CM_IOCTL_VENDOR_IFD_EXCHANGE, FEATURE_GET_TLV_PROPERTIES,
    PCSCv2_PART10_PROPERTY_*): New.
    (new_reader_slot): Initialize pinpad_varlen_supported, pinmin, pinmax.
    (pcsc_vendor_specific_init): New.
    (open_pcsc_reader_direct, open_pcsc_reader_wrapped): Call
    pcsc_vendor_specific_init.
    (check_pcsc_pinpad): Not detect here but use the result of
    pcsc_vendor_specific_init.
    (pcsc_pinpad_verify, pcsc_pinpad_modify): Specify bNumberMessage.
    
    --
    
    Signed-off-by: NIIBE Yutaka
    
    --

diff --git a/scd/apdu.c b/scd/apdu.c
index e05869f..d02a42e 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -118,6 +118,8 @@ struct reader_table_s {
     pcsc_dword_t protocol;
     pcsc_dword_t verify_ioctl;
     pcsc_dword_t modify_ioctl;
+    int pinmin;
+    int pinmax;
 #ifdef NEED_PCSC_WRAPPER
     int req_fd;
     int rsp_fd;
@@ -135,6 +137,9 @@ struct reader_table_s {
   int status;
   int is_t0;         /* True if we know that we are running T=0. */
   int is_spr532;     /* True if we know that the reader is a SPR532.  */
+  int pinpad_varlen_supported;  /* True if we know that the reader
+                                   supports variable length pinpad
+                                   input.  */
   unsigned char atr[33];
   size_t atrlen;           /* A zero length indicates that the ATR has
                               not yet been read; i.e. the card is not
@@ -244,8 +249,17 @@ static char (* DLSTDCALL CT_close) (unsigned short ctn);
 #endif
 
 #define CM_IOCTL_GET_FEATURE_REQUEST     SCARD_CTL_CODE(3400)
+#define CM_IOCTL_VENDOR_IFD_EXCHANGE     SCARD_CTL_CODE(1)
 #define FEATURE_VERIFY_PIN_DIRECT        0x06
 #define FEATURE_MODIFY_PIN_DIRECT        0x07
+#define FEATURE_GET_TLV_PROPERTIES       0x12
+
+#define PCSCv2_PART10_PROPERTY_bEntryValidationCondition 2
+#define PCSCv2_PART10_PROPERTY_bTimeOut2                 3
+#define PCSCv2_PART10_PROPERTY_bMinPINSize               6
+#define PCSCv2_PART10_PROPERTY_bMaxPINSize               7
+#define PCSCv2_PART10_PROPERTY_wIdVendor                11
+#define PCSCv2_PART10_PROPERTY_wIdProduct               12
 
 
 /* The PC/SC error is defined as a long as per specs.  Due to left
@@ -400,6 +414,7 @@ new_reader_slot (void)
   reader_table[reader].last_status = 0;
   reader_table[reader].is_t0 = 1;
   reader_table[reader].is_spr532 = 0;
+  reader_table[reader].pinpad_varlen_supported = 0;
 #ifdef NEED_PCSC_WRAPPER
   reader_table[reader].pcsc.req_fd = -1;
   reader_table[reader].pcsc.rsp_fd = -1;
@@ -407,6 +422,8 @@ new_reader_slot (void)
 #endif
   reader_table[reader].pcsc.verify_ioctl = 0;
   reader_table[reader].pcsc.modify_ioctl = 0;
+  reader_table[reader].pcsc.pinmin = -1;
+  reader_table[reader].pcsc.pinmax = -1;
 
   return reader;
 }
@@ -1676,6 +1693,132 @@ reset_pcsc_reader (int slot)
 }
 
 
+/* Examine reader specific parameters and initialize.  This is mostly
+   for pinpad input.  Called at opening the connection to the reader.  */
+static int
+pcsc_vendor_specific_init (int slot)
+{
+  unsigned char buf[256];
+  pcsc_dword_t len;
+  int sw;
+  int vendor = 0;
+  int product = 0;
+  pcsc_dword_t get_tlv_ioctl = (pcsc_dword_t)-1;
+  unsigned char *p;
+
+  len = sizeof (buf);
+  sw = control_pcsc (slot, CM_IOCTL_GET_FEATURE_REQUEST, NULL, 0, buf, &len);
+  if (sw)
+    {
+      log_error ("pcsc_vendor_specific_init: GET_FEATURE_REQUEST failed: %d\n",
+                 sw);
+      return SW_NOT_SUPPORTED;
+    }
+  else
+    {
+      p = buf;
+      while (p < buf + len)
+        {
+          unsigned char code = *p++;
+          int l = *p++;
+          unsigned int v = 0;
+
+          if (l == 1)
+            v = p[0];
+          else if (l == 2)
+            v = ((p[0] << 8) | p[1]);
+          else if (l == 4)
+            v = ((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
+
+          if (code == FEATURE_VERIFY_PIN_DIRECT)
+            reader_table[slot].pcsc.verify_ioctl = v;
+          else if (code == FEATURE_MODIFY_PIN_DIRECT)
+            reader_table[slot].pcsc.modify_ioctl = v;
+          else if (code == FEATURE_GET_TLV_PROPERTIES)
+            get_tlv_ioctl = v;
+
+          if (DBG_CARD_IO)
+            log_debug ("feature: code=%02X, len=%d, v=%02X\n", code, l, v);
+
+          p += l;
+        }
+    }
+
+  /*
+   * For system which doesn't support GET_TLV_PROPERTIES,
+   * we put some heuristics here.
+   */
+  if (reader_table[slot].rdrname
+      && strstr (reader_table[slot].rdrname, "SPRx32"))
+    {
+      reader_table[slot].is_spr532 = 1;
+      reader_table[slot].pinpad_varlen_supported = 1;
+      return 0;
+    }
+
+  if (get_tlv_ioctl == (pcsc_dword_t)-1)
+    return 0;
+
+  len = sizeof (buf);
+  sw = control_pcsc (slot, get_tlv_ioctl, NULL, 0, buf, &len);
+  if (sw)
+    {
+      log_error ("pcsc_vendor_specific_init: GET_TLV_IOCTL failed: %d\n", sw);
+      return SW_NOT_SUPPORTED;
+    }
+
+  p = buf;
+  while (p < buf + len)
+    {
+      unsigned char tag = *p++;
+      int l = *p++;
+      unsigned int v = 0;
+
+      /* Umm... here is little endian, while the encoding above is big.  */
+      if (l == 1)
+        v = p[0];
+      else if (l == 2)
+        v = ((p[1] << 8) | p[0]);
+      else if (l == 4)
+        v = ((p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0]);
+
+      if (tag == PCSCv2_PART10_PROPERTY_bMinPINSize)
+        reader_table[slot].pcsc.pinmin = v;
+      else if (tag == PCSCv2_PART10_PROPERTY_bMaxPINSize)
+        reader_table[slot].pcsc.pinmax = v;
+      else if (tag == PCSCv2_PART10_PROPERTY_wIdVendor)
+        vendor = v;
+      else if (tag == PCSCv2_PART10_PROPERTY_wIdProduct)
+        product = v;
+
+      if (DBG_CARD_IO)
+        log_debug ("TLV properties: tag=%02X, len=%d, v=%08X\n", tag, l, v);
+
+      p += l;
+    }
+
+  if (vendor == 0x0982 && product == 0x0008) /* Vega Alpha */
+    {
+      /*
+       * Please read the comment of ccid_vendor_specific_init in
+       * ccid-driver.c.
+       */
+      const unsigned char cmd[] = { '\xb5', '\x01', '\x00', '\x03', '\x00' };
+      sw = control_pcsc (slot, CM_IOCTL_VENDOR_IFD_EXCHANGE,
+                         cmd, sizeof (cmd), NULL, 0);
+      if (sw)
+        return SW_NOT_SUPPORTED;
+    }
+  else if (vendor == 0x04e6 && product == 0xe003) /* SCM SPR532 */
+    {
+      reader_table[slot].is_spr532 = 1;
+      reader_table[slot].pinpad_varlen_supported = 1;
+    }
+
+  return 0;
+}
+
+
 /* Open the PC/SC reader without using the wrapper.  Returns -1 on
    error or a slot number for the reader.  */
 #ifndef NEED_PCSC_WRAPPER
@@ -1770,6 +1913,7 @@ open_pcsc_reader_direct (const char *portstr)
   reader_table[slot].send_apdu_reader = pcsc_send_apdu;
   reader_table[slot].dump_status_reader = dump_pcsc_reader_status;
 
+  pcsc_vendor_specific_init (slot);
   dump_reader_status (slot);
   return slot;
 }
@@ -1967,6 +2111,8 @@ open_pcsc_reader_wrapped (const char *portstr)
   reader_table[slot].send_apdu_reader = pcsc_send_apdu;
   reader_table[slot].dump_status_reader = dump_pcsc_reader_status;
 
+  pcsc_vendor_specific_init (slot);
+
   /* Read the status so that IS_T0 will be set. */
   pcsc_get_status (slot, &dummy_status);
 
@@ -2005,68 +2151,28 @@ open_pcsc_reader (const char *portstr)
 static int
 check_pcsc_pinpad (int slot, int command, pininfo_t *pininfo)
 {
-  unsigned char buf[256];
-  pcsc_dword_t len = 256;
-  int sw;
+  int r;
 
-  /* Hack to identify the SCM SPR532 and SPR332 readers which support
-     variable length PIN input.
-     FIXME: Figure out whether there is a feature attribute for this.
-     Alternatively use the USB ids to detect known readers.  */
-  if (reader_table[slot].rdrname
-      && strstr (reader_table[slot].rdrname, "SPRx32"))
-    {
-      reader_table[slot].is_spr532 = 1;
-      pininfo->fixedlen = 0;
-    }
+  pininfo->minlen = reader_table[slot].pcsc.pinmin;
+  pininfo->maxlen = reader_table[slot].pcsc.pinmax;
 
- check_again:
-  if (command == ISO7816_VERIFY)
-    {
-      if (reader_table[slot].pcsc.verify_ioctl == (pcsc_dword_t)-1)
-        return SW_NOT_SUPPORTED;
-      else if (reader_table[slot].pcsc.verify_ioctl != 0)
-        return 0;                       /* Success */
-    }
-  else if (command == ISO7816_CHANGE_REFERENCE_DATA)
-    {
-      if (reader_table[slot].pcsc.modify_ioctl == (pcsc_dword_t)-1)
-        return SW_NOT_SUPPORTED;
-      else if (reader_table[slot].pcsc.modify_ioctl != 0)
-        return 0;                       /* Success */
-    }
-  else
-    return SW_NOT_SUPPORTED;
-
-  reader_table[slot].pcsc.verify_ioctl = (pcsc_dword_t)-1;
-  reader_table[slot].pcsc.modify_ioctl = (pcsc_dword_t)-1;
-
-  sw = control_pcsc (slot, CM_IOCTL_GET_FEATURE_REQUEST, NULL, 0, buf, &len);
-  if (sw)
-    return SW_NOT_SUPPORTED;
+  if ((command == ISO7816_VERIFY && reader_table[slot].pcsc.verify_ioctl != 0)
+      || (command == ISO7816_CHANGE_REFERENCE_DATA
+          && reader_table[slot].pcsc.modify_ioctl != 0))
+    r = 0;                       /* Success */
   else
-    {
-      unsigned char *p = buf;
+    r = SW_NOT_SUPPORTED;
 
-      while (p < buf + len)
-        {
-          unsigned char code = *p++;
+  if (DBG_CARD_IO)
+    log_debug ("check_pcsc_pinpad: command=%02X, r=%d\n",
+               (unsigned int)command, r);
 
-          p++;                  /* Skip length */
-          if (code == FEATURE_VERIFY_PIN_DIRECT)
-            reader_table[slot].pcsc.verify_ioctl
-              = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
-          else if (code == FEATURE_MODIFY_PIN_DIRECT)
-            reader_table[slot].pcsc.modify_ioctl
-              = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
-          p += 4;
-        }
-    }
+  if (reader_table[slot].pinpad_varlen_supported)
+    pininfo->fixedlen = 0;
 
-  goto check_again;
+  return r;
 }
 
-
 #define PIN_VERIFY_STRUCTURE_SIZE 24
 static int
 pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1,
@@ -2103,8 +2209,8 @@ pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1,
 
   no_lc = (!pininfo->fixedlen && reader_table[slot].is_spr532);
 
-  pin_verify[0] = 0x00; /* bTimerOut */
-  pin_verify[1] = 0x00; /* bTimerOut2 */
+  pin_verify[0] = 0x00; /* bTimeOut */
+  pin_verify[1] = 0x00; /* bTimeOut2 */
   pin_verify[2] = 0x82; /* bmFormatString: Byte, pos=0, left, ASCII. */
   pin_verify[3] = pininfo->fixedlen; /* bmPINBlockString */
   pin_verify[4] = 0x00; /* bmPINLengthFormat */
@@ -2113,7 +2219,7 @@ pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1,
   pin_verify[7] = 0x02; /* bEntryValidationCondition: Validation key pressed */
   if (pininfo->minlen && pininfo->maxlen && pininfo->minlen == pininfo->maxlen)
     pin_verify[7] |= 0x01; /* Max size reached.  */
-  pin_verify[8] = 0xff; /* bNumberMessage: Default */
+  pin_verify[8] = 0x01; /* bNumberMessage: One message */
   pin_verify[9] =  0x09; /* wLangId: 0x0409: US English */
   pin_verify[10] = 0x04; /* wLangId: 0x0409: US English */
   pin_verify[11] = 0x00; /* bMsgIndex */
@@ -2191,8 +2297,8 @@ pcsc_pinpad_modify (int slot, int class, int ins, int p0, int p1,
 
   no_lc = (!pininfo->fixedlen && reader_table[slot].is_spr532);
 
-  pin_modify[0] = 0x00; /* bTimerOut */
-  pin_modify[1] = 0x00; /* bTimerOut2 */
+  pin_modify[0] = 0x00; /* bTimeOut */
+  pin_modify[1] = 0x00; /* bTimeOut2 */
   pin_modify[2] = 0x82; /* bmFormatString: Byte, pos=0, left, ASCII. */
   pin_modify[3] = pininfo->fixedlen; /* bmPINBlockString */
   pin_modify[4] = 0x00; /* bmPINLengthFormat */
@@ -2210,12 +2316,12 @@ pcsc_pinpad_modify (int slot, int class, int ins, int p0, int p1,
   pin_modify[10] = 0x02; /* bEntryValidationCondition: Validation key pressed */
   if (pininfo->minlen && pininfo->maxlen && pininfo->minlen == pininfo->maxlen)
     pin_modify[10] |= 0x01; /* Max size reached.  */
-  pin_modify[11] = 0xff; /* bNumberMessage: Default */
+  pin_modify[11] = 0x03; /* bNumberMessage: Three messages */
   pin_modify[12] = 0x09; /* wLangId: 0x0409: US English */
   pin_modify[13] = 0x04; /* wLangId: 0x0409: US English */
   pin_modify[14] = 0x00; /* bMsgIndex1 */
-  pin_modify[15] = 0x00; /* bMsgIndex2 */
-  pin_modify[16] = 0x00; /* bMsgIndex3 */
+  pin_modify[15] = 0x01; /* bMsgIndex2 */
+  pin_modify[16] = 0x02; /* bMsgIndex3 */
   pin_modify[17] = 0x00; /* bTeoPrologue[0] */
   pin_modify[18] = 0x00; /* bTeoPrologue[1] */
   pin_modify[19] = 2 * pininfo->fixedlen + 0x05 - no_lc; /* bTeoPrologue[2] */

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

Summary of changes:
 scd/apdu.c |  230 ++++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 168 insertions(+), 62 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Aug 30 04:44:34 2013
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Fri, 30 Aug 2013 04:44:34 +0200
Subject: [git] GnuPG - branch, STABLE-BRANCH-2-0,
 updated. gnupg-2.0.21-7-g755f92e
Message-ID: <E1VFEC4-0003cC-FS@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-0 has been updated
       via  755f92e2afaa7be32e4d60253971724639b99c16 (commit)
      from  6acb1d06f02ced837b423c725943c73f7d6f428a (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 755f92e2afaa7be32e4d60253971724639b99c16
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Aug 30 11:06:50 2013 +0900

    scd: PC/SC pinpad input improvement.
    
    * scd/apdu.c (struct reader_table_s): Add members: PINMIN, PINMAX, and
    PINPAD_VERLEN_SUPPORTED.
    (CM_IOCTL_VENDOR_IFD_EXCHANGE, FEATURE_GET_TLV_PROPERTIES,
    PCSCv2_PART10_PROPERTY_*): New.
    (new_reader_slot): Initialize pinpad_varlen_supported, pinmin, pinmax.
    (pcsc_vendor_specific_init): New.
    (open_pcsc_reader_direct, open_pcsc_reader_wrapped): Call
    pcsc_vendor_specific_init.
    (check_pcsc_pinpad): Not detect here but use the result of
    pcsc_vendor_specific_init.
    (pcsc_pinpad_verify, pcsc_pinpad_modify): Specify bNumberMessage.
    
    --
    
    (cherry picked from commit 95a3bffeaf07e8bf9487d4b165c336d166236fc1)
    
    Signed-off-by: NIIBE Yutaka
    
    --

diff --git a/scd/apdu.c b/scd/apdu.c
index ecb3e82..8a778df 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -117,6 +117,8 @@ struct reader_table_s {
     pcsc_dword_t protocol;
     pcsc_dword_t verify_ioctl;
     pcsc_dword_t modify_ioctl;
+    int pinmin;
+    int pinmax;
 #ifdef NEED_PCSC_WRAPPER
     int req_fd;
     int rsp_fd;
@@ -134,6 +136,9 @@ struct reader_table_s {
   int status;
   int is_t0;         /* True if we know that we are running T=0. */
   int is_spr532;     /* True if we know that the reader is a SPR532.  */
+  int pinpad_varlen_supported;  /* True if we know that the reader
+                                   supports variable length pinpad
+                                   input.  */
   unsigned char atr[33];
   size_t atrlen;           /* A zero length indicates that the ATR has
                               not yet been read; i.e. the card is not
@@ -226,8 +231,17 @@ static char (* DLSTDCALL CT_close) (unsigned short ctn);
 #endif
 
 #define CM_IOCTL_GET_FEATURE_REQUEST     SCARD_CTL_CODE(3400)
+#define CM_IOCTL_VENDOR_IFD_EXCHANGE     SCARD_CTL_CODE(1)
 #define FEATURE_VERIFY_PIN_DIRECT        0x06
 #define FEATURE_MODIFY_PIN_DIRECT        0x07
+#define FEATURE_GET_TLV_PROPERTIES       0x12
+
+#define PCSCv2_PART10_PROPERTY_bEntryValidationCondition 2
+#define PCSCv2_PART10_PROPERTY_bTimeOut2                 3
+#define PCSCv2_PART10_PROPERTY_bMinPINSize               6
+#define PCSCv2_PART10_PROPERTY_bMaxPINSize               7
+#define PCSCv2_PART10_PROPERTY_wIdVendor                11
+#define PCSCv2_PART10_PROPERTY_wIdProduct               12
 
 
 /* The PC/SC error is defined as a long as per specs.  Due to left
@@ -424,6 +438,7 @@ new_reader_slot (void)
   reader_table[reader].last_status = 0;
   reader_table[reader].is_t0 = 1;
   reader_table[reader].is_spr532 = 0;
+  reader_table[reader].pinpad_varlen_supported = 0;
 #ifdef NEED_PCSC_WRAPPER
   reader_table[reader].pcsc.req_fd = -1;
   reader_table[reader].pcsc.rsp_fd = -1;
@@ -431,6 +446,8 @@ new_reader_slot (void)
 #endif
   reader_table[reader].pcsc.verify_ioctl = 0;
   reader_table[reader].pcsc.modify_ioctl = 0;
+  reader_table[reader].pcsc.pinmin = -1;
+  reader_table[reader].pcsc.pinmax = -1;
 
   return reader;
 }
@@ -1694,6 +1711,132 @@ reset_pcsc_reader (int slot)
 }
 
 
+/* Examine reader specific parameters and initialize.  This is mostly
+   for pinpad input.  Called at opening the connection to the reader.  */
+static int
+pcsc_vendor_specific_init (int slot)
+{
+  unsigned char buf[256];
+  pcsc_dword_t len;
+  int sw;
+  int vendor = 0;
+  int product = 0;
+  pcsc_dword_t get_tlv_ioctl = (pcsc_dword_t)-1;
+  unsigned char *p;
+
+  len = sizeof (buf);
+  sw = control_pcsc (slot, CM_IOCTL_GET_FEATURE_REQUEST, NULL, 0, buf, &len);
+  if (sw)
+    {
+      log_error ("pcsc_vendor_specific_init: GET_FEATURE_REQUEST failed: %d\n",
+                 sw);
+      return SW_NOT_SUPPORTED;
+    }
+  else
+    {
+      p = buf;
+      while (p < buf + len)
+        {
+          unsigned char code = *p++;
+          int l = *p++;
+          unsigned int v = 0;
+
+          if (l == 1)
+            v = p[0];
+          else if (l == 2)
+            v = ((p[0] << 8) | p[1]);
+          else if (l == 4)
+            v = ((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
+
+          if (code == FEATURE_VERIFY_PIN_DIRECT)
+            reader_table[slot].pcsc.verify_ioctl = v;
+          else if (code == FEATURE_MODIFY_PIN_DIRECT)
+            reader_table[slot].pcsc.modify_ioctl = v;
+          else if (code == FEATURE_GET_TLV_PROPERTIES)
+            get_tlv_ioctl = v;
+
+          if (DBG_CARD_IO)
+            log_debug ("feature: code=%02X, len=%d, v=%02X\n", code, l, v);
+
+          p += l;
+        }
+    }
+
+  /*
+   * For system which doesn't support GET_TLV_PROPERTIES,
+   * we put some heuristics here.
+   */
+  if (reader_table[slot].rdrname
+      && strstr (reader_table[slot].rdrname, "SPRx32"))
+    {
+      reader_table[slot].is_spr532 = 1;
+      reader_table[slot].pinpad_varlen_supported = 1;
+      return 0;
+    }
+
+  if (get_tlv_ioctl == (pcsc_dword_t)-1)
+    return 0;
+
+  len = sizeof (buf);
+  sw = control_pcsc (slot, get_tlv_ioctl, NULL, 0, buf, &len);
+  if (sw)
+    {
+      log_error ("pcsc_vendor_specific_init: GET_TLV_IOCTL failed: %d\n", sw);
+      return SW_NOT_SUPPORTED;
+    }
+
+  p = buf;
+  while (p < buf + len)
+    {
+      unsigned char tag = *p++;
+      int l = *p++;
+      unsigned int v = 0;
+
+      /* Umm... here is little endian, while the encoding above is big.  */
+      if (l == 1)
+        v = p[0];
+      else if (l == 2)
+        v = ((p[1] << 8) | p[0]);
+      else if (l == 4)
+        v = ((p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0]);
+
+      if (tag == PCSCv2_PART10_PROPERTY_bMinPINSize)
+        reader_table[slot].pcsc.pinmin = v;
+      else if (tag == PCSCv2_PART10_PROPERTY_bMaxPINSize)
+        reader_table[slot].pcsc.pinmax = v;
+      else if (tag == PCSCv2_PART10_PROPERTY_wIdVendor)
+        vendor = v;
+      else if (tag == PCSCv2_PART10_PROPERTY_wIdProduct)
+        product = v;
+
+      if (DBG_CARD_IO)
+        log_debug ("TLV properties: tag=%02X, len=%d, v=%08X\n", tag, l, v);
+
+      p += l;
+    }
+
+  if (vendor == 0x0982 && product == 0x0008) /* Vega Alpha */
+    {
+      /*
+       * Please read the comment of ccid_vendor_specific_init in
+       * ccid-driver.c.
+       */
+      const unsigned char cmd[] = { '\xb5', '\x01', '\x00', '\x03', '\x00' };
+      sw = control_pcsc (slot, CM_IOCTL_VENDOR_IFD_EXCHANGE,
+                         cmd, sizeof (cmd), NULL, 0);
+      if (sw)
+        return SW_NOT_SUPPORTED;
+    }
+  else if (vendor == 0x04e6 && product == 0xe003) /* SCM SPR532 */
+    {
+      reader_table[slot].is_spr532 = 1;
+      reader_table[slot].pinpad_varlen_supported = 1;
+    }
+
+  return 0;
+}
+
+
 /* Open the PC/SC reader without using the wrapper.  Returns -1 on
    error or a slot number for the reader.  */
 #ifndef NEED_PCSC_WRAPPER
@@ -1792,6 +1935,7 @@ open_pcsc_reader_direct (const char *portstr)
   reader_table[slot].send_apdu_reader = pcsc_send_apdu;
   reader_table[slot].dump_status_reader = dump_pcsc_reader_status;
 
+  pcsc_vendor_specific_init (slot);
   dump_reader_status (slot);
   unlock_slot (slot);
   return slot;
@@ -1996,6 +2140,8 @@ open_pcsc_reader_wrapped (const char *portstr)
   reader_table[slot].send_apdu_reader = pcsc_send_apdu;
   reader_table[slot].dump_status_reader = dump_pcsc_reader_status;
 
+  pcsc_vendor_specific_init (slot);
+
   /* Read the status so that IS_T0 will be set. */
   pcsc_get_status (slot, &dummy_status);
 
@@ -2035,68 +2181,28 @@ open_pcsc_reader (const char *portstr)
 static int
 check_pcsc_pinpad (int slot, int command, pininfo_t *pininfo)
 {
-  unsigned char buf[256];
-  pcsc_dword_t len = 256;
-  int sw;
+  int r;
 
-  /* Hack to identify the SCM SPR532 and SPR332 readers which support
-     variable length PIN input.
-     FIXME: Figure out whether there is a feature attribute for this.
-     Alternatively use the USB ids to detect known readers.  */
-  if (reader_table[slot].rdrname
-      && strstr (reader_table[slot].rdrname, "SPRx32"))
-    {
-      reader_table[slot].is_spr532 = 1;
-      pininfo->fixedlen = 0;
-    }
+  pininfo->minlen = reader_table[slot].pcsc.pinmin;
+  pininfo->maxlen = reader_table[slot].pcsc.pinmax;
 
- check_again:
-  if (command == ISO7816_VERIFY)
-    {
-      if (reader_table[slot].pcsc.verify_ioctl == (pcsc_dword_t)-1)
-        return SW_NOT_SUPPORTED;
-      else if (reader_table[slot].pcsc.verify_ioctl != 0)
-        return 0;                       /* Success */
-    }
-  else if (command == ISO7816_CHANGE_REFERENCE_DATA)
-    {
-      if (reader_table[slot].pcsc.modify_ioctl == (pcsc_dword_t)-1)
-        return SW_NOT_SUPPORTED;
-      else if (reader_table[slot].pcsc.modify_ioctl != 0)
-        return 0;                       /* Success */
-    }
-  else
-    return SW_NOT_SUPPORTED;
-
-  reader_table[slot].pcsc.verify_ioctl = (pcsc_dword_t)-1;
-  reader_table[slot].pcsc.modify_ioctl = (pcsc_dword_t)-1;
-
-  sw = control_pcsc (slot, CM_IOCTL_GET_FEATURE_REQUEST, NULL, 0, buf, &len);
-  if (sw)
-    return SW_NOT_SUPPORTED;
+  if ((command == ISO7816_VERIFY && reader_table[slot].pcsc.verify_ioctl != 0)
+      || (command == ISO7816_CHANGE_REFERENCE_DATA
+          && reader_table[slot].pcsc.modify_ioctl != 0))
+    r = 0;                       /* Success */
   else
-    {
-      unsigned char *p = buf;
+    r = SW_NOT_SUPPORTED;
 
-      while (p < buf + len)
-        {
-          unsigned char code = *p++;
+  if (DBG_CARD_IO)
+    log_debug ("check_pcsc_pinpad: command=%02X, r=%d\n",
+               (unsigned int)command, r);
 
-          p++;                  /* Skip length */
-          if (code == FEATURE_VERIFY_PIN_DIRECT)
-            reader_table[slot].pcsc.verify_ioctl
-              = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
-          else if (code == FEATURE_MODIFY_PIN_DIRECT)
-            reader_table[slot].pcsc.modify_ioctl
-              = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
-          p += 4;
-        }
-    }
+  if (reader_table[slot].pinpad_varlen_supported)
+    pininfo->fixedlen = 0;
 
-  goto check_again;
+  return r;
 }
 
-
 #define PIN_VERIFY_STRUCTURE_SIZE 24
 static int
 pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1,
@@ -2133,8 +2239,8 @@ pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1,
 
   no_lc = (!pininfo->fixedlen && reader_table[slot].is_spr532);
 
-  pin_verify[0] = 0x00; /* bTimerOut */
-  pin_verify[1] = 0x00; /* bTimerOut2 */
+  pin_verify[0] = 0x00; /* bTimeOut */
+  pin_verify[1] = 0x00; /* bTimeOut2 */
   pin_verify[2] = 0x82; /* bmFormatString: Byte, pos=0, left, ASCII. */
   pin_verify[3] = pininfo->fixedlen; /* bmPINBlockString */
   pin_verify[4] = 0x00; /* bmPINLengthFormat */
@@ -2143,7 +2249,7 @@ pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1,
   pin_verify[7] = 0x02; /* bEntryValidationCondition: Validation key pressed */
   if (pininfo->minlen && pininfo->maxlen && pininfo->minlen == pininfo->maxlen)
     pin_verify[7] |= 0x01; /* Max size reached.  */
-  pin_verify[8] = 0xff; /* bNumberMessage: Default */
+  pin_verify[8] = 0x01; /* bNumberMessage: One message */
   pin_verify[9] =  0x09; /* wLangId: 0x0409: US English */
   pin_verify[10] = 0x04; /* wLangId: 0x0409: US English */
   pin_verify[11] = 0x00; /* bMsgIndex */
@@ -2219,8 +2325,8 @@ pcsc_pinpad_modify (int slot, int class, int ins, int p0, int p1,
 
   no_lc = (!pininfo->fixedlen && reader_table[slot].is_spr532);
 
-  pin_modify[0] = 0x00; /* bTimerOut */
-  pin_modify[1] = 0x00; /* bTimerOut2 */
+  pin_modify[0] = 0x00; /* bTimeOut */
+  pin_modify[1] = 0x00; /* bTimeOut2 */
   pin_modify[2] = 0x82; /* bmFormatString: Byte, pos=0, left, ASCII. */
   pin_modify[3] = pininfo->fixedlen; /* bmPINBlockString */
   pin_modify[4] = 0x00; /* bmPINLengthFormat */
@@ -2238,12 +2344,12 @@ pcsc_pinpad_modify (int slot, int class, int ins, int p0, int p1,
   pin_modify[10] = 0x02; /* bEntryValidationCondition: Validation key pressed */
   if (pininfo->minlen && pininfo->maxlen && pininfo->minlen == pininfo->maxlen)
     pin_modify[10] |= 0x01; /* Max size reached.  */
-  pin_modify[11] = 0xff; /* bNumberMessage: Default */
+  pin_modify[11] = 0x03; /* bNumberMessage: Three messages */
   pin_modify[12] = 0x09; /* wLangId: 0x0409: US English */
   pin_modify[13] = 0x04; /* wLangId: 0x0409: US English */
   pin_modify[14] = 0x00; /* bMsgIndex1 */
-  pin_modify[15] = 0x00; /* bMsgIndex2 */
-  pin_modify[16] = 0x00; /* bMsgIndex3 */
+  pin_modify[15] = 0x01; /* bMsgIndex2 */
+  pin_modify[16] = 0x02; /* bMsgIndex3 */
   pin_modify[17] = 0x00; /* bTeoPrologue[0] */
   pin_modify[18] = 0x00; /* bTeoPrologue[1] */
   pin_modify[19] = 2 * pininfo->fixedlen + 0x05 - no_lc; /* bTeoPrologue[2] */

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

Summary of changes:
 scd/apdu.c |  230 ++++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 168 insertions(+), 62 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Aug 30 09:57:23 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 30 Aug 2013 09:57:23 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-244-gfc31d73
Message-ID: <E1VFJ4m-0000Ov-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 "The GNU Privacy Guard".

The branch, master has been updated
       via  fc31d730d8506b069de1d3529ed26660856bf07f (commit)
      from  95a3bffeaf07e8bf9487d4b165c336d166236fc1 (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 fc31d730d8506b069de1d3529ed26660856bf07f
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 30 09:28:17 2013 +0200

    scd: Use vendor and product id macros also in apdu.c
    
    * scd/ccid-driver.c: Move vendor and product ids to ...
    * scd/ccid-driver.h: here.
    * scd/apdu.c (CCID_DRIVER_INCLUDE_USB_IDS): Define to include ids.
    (pcsc_vendor_specific_init): Use vendor and product id macros.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/scd/apdu.c b/scd/apdu.c
index d02a42e..2e09552 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -62,6 +62,7 @@
 
 #include "iso7816.h"
 #include "apdu.h"
+#define CCID_DRIVER_INCLUDE_USB_IDS 1
 #include "ccid-driver.h"
 
 /* Due to conflicting use of threading libraries we usually can't link
@@ -1797,7 +1798,7 @@ pcsc_vendor_specific_init (int slot)
       p += l;
     }
 
-  if (vendor == 0x0982 && product == 0x0008) /* Vega Alpha */
+  if (vendor == VENDOR_VEGA && product == VEGA_ALPHA)
     {
       /*
        * Please read the comment of ccid_vendor_specific_init in
@@ -1809,7 +1810,7 @@ pcsc_vendor_specific_init (int slot)
       if (sw)
         return SW_NOT_SUPPORTED;
     }
-  else if (vendor == 0x04e6 && product == 0xe003) /* SCM SPR532 */
+  else if (vendor == VENDOR_SCM && product == SCM_SPR532) /* SCM SPR532 */
     {
       reader_table[slot].is_spr532 = 1;
       reader_table[slot].pinpad_varlen_supported = 1;
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 478d8c6..0ac5aaf 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -91,6 +91,7 @@
 
 #include "scdaemon.h"
 #include "iso7816.h"
+#define CCID_DRIVER_INCLUDE_USB_IDS 1
 #include "ccid-driver.h"
 
 #define DRVNAME "ccid-driver: "
@@ -203,29 +204,6 @@ enum {
 #define CCID_ERROR_CODE(buf)     (((unsigned char *)(buf))[8])
 
 
-/* We need to know the vendor to do some hacks. */
-enum {
-  VENDOR_CHERRY = 0x046a,
-  VENDOR_SCM    = 0x04e6,
-  VENDOR_OMNIKEY= 0x076b,
-  VENDOR_GEMPC  = 0x08e6,
-  VENDOR_VEGA   = 0x0982,
-  VENDOR_KAAN   = 0x0d46,
-  VENDOR_FSIJ   = 0x234b,
-  VENDOR_VASCO  = 0x1a44
-};
-
-/* Some product ids.  */
-#define SCM_SCR331      0xe001
-#define SCM_SCR331DI    0x5111
-#define SCM_SCR335      0x5115
-#define SCM_SCR3320     0x5117
-#define SCM_SPR532      0xe003
-#define CHERRY_ST2000   0x003e
-#define VASCO_920       0x0920
-#define GEMPC_PINPAD    0x3478
-#define VEGA_ALPHA      0x0008
-
 /* A list and a table with special transport descriptions. */
 enum {
   TRANSPORT_USB    = 0, /* Standard USB transport. */
diff --git a/scd/ccid-driver.h b/scd/ccid-driver.h
index 1fd7ffa..a2a6e16 100644
--- a/scd/ccid-driver.h
+++ b/scd/ccid-driver.h
@@ -56,6 +56,35 @@
 #ifndef CCID_DRIVER_H
 #define CCID_DRIVER_H
 
+
+#ifdef CCID_DRIVER_INCLUDE_USB_IDS
+/* We need to know the vendor to do some hacks. */
+enum {
+  VENDOR_CHERRY = 0x046a,
+  VENDOR_SCM    = 0x04e6,
+  VENDOR_OMNIKEY= 0x076b,
+  VENDOR_GEMPC  = 0x08e6,
+  VENDOR_VEGA   = 0x0982,
+  VENDOR_KAAN   = 0x0d46,
+  VENDOR_FSIJ   = 0x234b,
+  VENDOR_VASCO  = 0x1a44
+};
+
+
+/* Some product ids.  */
+#define SCM_SCR331      0xe001
+#define SCM_SCR331DI    0x5111
+#define SCM_SCR335      0x5115
+#define SCM_SCR3320     0x5117
+#define SCM_SPR532      0xe003    /* Also used succeeding model SPR332. */
+#define CHERRY_ST2000   0x003e
+#define VASCO_920       0x0920
+#define GEMPC_PINPAD    0x3478
+#define VEGA_ALPHA      0x0008
+
+#endif /*CCID_DRIVER_INCLUDE_USB_IDS*/
+
+
 /* The CID driver returns the same error codes as the status words
    used by GnuPG's apdu.h.  For ease of maintenance they should always
    match.  */

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

Summary of changes:
 scd/apdu.c        |    5 +++--
 scd/ccid-driver.c |   24 +-----------------------
 scd/ccid-driver.h |   29 +++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 25 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Aug 30 10:40:14 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 30 Aug 2013 10:40:14 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-245-g12990ef
Message-ID: <E1VFJkE-00019C-Md@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  12990efb45ee7c425167aad19fe759d5609c5182 (commit)
      from  fc31d730d8506b069de1d3529ed26660856bf07f (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 12990efb45ee7c425167aad19fe759d5609c5182
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 30 10:05:08 2013 +0200

    gpgtar: Fix building for systems with a separate libintl.
    
    * tools/Makefile.am (gpgtar_LDADD): Add LIBINTL and LIBICONV.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/tools/Makefile.am b/tools/Makefile.am
index bc48eea..946ae4a 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -145,7 +145,8 @@ gpgtar_SOURCES = \
 	no-libgcrypt.c
 gpgtar_CFLAGS = $(GPG_ERROR_CFLAGS) $(PTH_CFLAGS)
 #gpgtar_LDADD = $(commonpth_libs) $(PTH_LIBS) $(GPG_ERROR_LIBS)
-gpgtar_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(W32SOCKLIBS)
+gpgtar_LDADD = $(common_libs) $(GPG_ERROR_LIBS) \
+               $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS)
 
 
 # Make sure that all libs are build before we use them.  This is

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

Summary of changes:
 tools/Makefile.am |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Aug 30 10:42:58 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 30 Aug 2013 10:42:58 +0200
Subject: [git] GnuPG - branch, STABLE-BRANCH-2-0,
 updated. gnupg-2.0.21-8-g4d93e5e
Message-ID: <E1VFJmt-0001Aa-44@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-0 has been updated
       via  4d93e5e3cfb5e017bcdf58e8e9ecce11a2870192 (commit)
      from  755f92e2afaa7be32e4d60253971724639b99c16 (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 4d93e5e3cfb5e017bcdf58e8e9ecce11a2870192
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 30 10:05:08 2013 +0200

    gpgtar: Fix building for systems with a separate libintl.
    
    * tools/Makefile.am (gpgtar_LDADD): Add LIBINTL.
    --
    Signed-off-by: Werner Koch <wk at gnupg.org>
    (cherry picked from commit 12990efb45ee7c425167aad19fe759d5609c5182)
    
    Resolved conflicts:
    	tools/Makefile.am => Libiconv was already there.

diff --git a/tools/Makefile.am b/tools/Makefile.am
index a94fbcd..cc782a3 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -119,7 +119,7 @@ gpgtar_SOURCES = \
 	no-libgcrypt.c
 gpgtar_CFLAGS = $(GPG_ERROR_CFLAGS) $(PTH_CFLAGS)
 gpgtar_LDADD = $(common_libs) $(GPG_ERROR_LIBS) \
-               $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS)
+               $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS)
 
 # Make sure that all libs are build before we use them.  This is
 # important for things like make -j2.

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

Summary of changes:
 tools/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Aug 30 10:48:37 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 30 Aug 2013 10:48:37 +0200
Subject: [git] GnuPG - branch, STABLE-BRANCH-2-0,
 updated. gnupg-2.0.21-9-g0f18295
Message-ID: <E1VFJsM-0001Ci-2t@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-0 has been updated
       via  0f18295ac83e0533f30b65a14bb04bd94f1627fe (commit)
      from  4d93e5e3cfb5e017bcdf58e8e9ecce11a2870192 (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 0f18295ac83e0533f30b65a14bb04bd94f1627fe
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 30 10:19:47 2013 +0200

    gpg: Use 2048 as the default keysize in batch mode.
    
    * g10/keygen.c (gen_elg, gen_dsa, gen_rsa): Set default keysize to
    2048.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/keygen.c b/g10/keygen.c
index 8c3e9f6..b68414a 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -1170,12 +1170,12 @@ gen_elg (int algo, unsigned int nbits,
   PKT_public_key *pk;
   gcry_sexp_t s_parms, s_key;
   gcry_sexp_t misc_key_info;
-  
+
   assert( is_ELGAMAL(algo) );
 
   if (nbits < 512)
     {
-      nbits = 1024;
+      nbits = 2048;
       log_info (_("keysize invalid; using %u bits\n"), nbits );
     }
 
@@ -1284,9 +1284,9 @@ gen_dsa (unsigned int nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
   gcry_sexp_t misc_key_info;
   unsigned int qbits;
 
-  if ( nbits < 512) 
+  if ( nbits < 512)
     {
-      nbits = 1024;
+      nbits = 2048;
       log_info(_("keysize invalid; using %u bits\n"), nbits );
     }
   else if ( nbits > 3072 )
@@ -1435,12 +1435,12 @@ gen_rsa (int algo, unsigned nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
   if (!nbits)
     nbits = DEFAULT_STD_KEYSIZE;
 
-  if (nbits < 1024) 
+  if (nbits < 1024)
     {
-      nbits = 1024;
+      nbits = 2048;
       log_info (_("keysize invalid; using %u bits\n"), nbits );
     }
-  
+
   if ((nbits % 32))
     {
       nbits = ((nbits + 31) / 32) * 32;

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

Summary of changes:
 g10/keygen.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Aug 30 10:57:21 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 30 Aug 2013 10:57:21 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-247-g244587e
Message-ID: <E1VFK0o-0001aA-9H@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  244587ea41d4c75cb5570356f09a6705864a7e8d (commit)
       via  4c3b35b067a4e7002bb6473b879b551014bb7857 (commit)
      from  12990efb45ee7c425167aad19fe759d5609c5182 (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 244587ea41d4c75cb5570356f09a6705864a7e8d
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 30 10:28:26 2013 +0200

    scd: Suppress gcc warning about possible uninitialized use.
    
    * scd/app-nks.c (parse_pwidstr): Always init r_pwid.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/scd/app-nks.c b/scd/app-nks.c
index c83217f..19a33ed 100644
--- a/scd/app-nks.c
+++ b/scd/app-nks.c
@@ -1125,7 +1125,10 @@ parse_pwidstr (const char *pwidstr, int new_mode, int *r_sigg, int *r_pwid)
                   "for the key to create qualified signatures."));
     }
   else
-    desc = NULL;
+    {
+      *r_pwid = 0; /* Only to avoid gcc warning in calling function.  */
+      desc = NULL; /* Error.  */
+    }
 
   return desc;
 }

commit 4c3b35b067a4e7002bb6473b879b551014bb7857
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 30 10:27:21 2013 +0200

    gpg: Use 2048 as the default keysize in batch mode.
    
    * g10/keygen.c (gen_elg, gen_dsa, gen_rsa): Set default keysize to
    2048.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/keygen.c b/g10/keygen.c
index 2017662..3b02f04 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -1408,7 +1408,7 @@ gen_elg (int algo, unsigned int nbits, KBNODE pub_root,
 
   if (nbits < 512)
     {
-      nbits = 1024;
+      nbits = 2048;
       log_info (_("keysize invalid; using %u bits\n"), nbits );
     }
 
@@ -1458,7 +1458,7 @@ gen_dsa (unsigned int nbits, KBNODE pub_root,
 
   if ( nbits < 512)
     {
-      nbits = 1024;
+      nbits = 2048;
       log_info(_("keysize invalid; using %u bits\n"), nbits );
     }
   else if ( nbits > 3072 )
@@ -1592,7 +1592,7 @@ gen_rsa (int algo, unsigned int nbits, KBNODE pub_root,
 
   if (nbits < 1024)
     {
-      nbits = 1024;
+      nbits = 2048;
       log_info (_("keysize invalid; using %u bits\n"), nbits );
     }
 

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

Summary of changes:
 g10/keygen.c  |    6 +++---
 scd/app-nks.c |    5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Aug 30 10:58:01 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 30 Aug 2013 10:58:01 +0200
Subject: [git] GnuPG - branch, STABLE-BRANCH-1-4,
 updated. gnupg-1.4.14-3-g6ed7056
Message-ID: <E1VFK1R-0001bJ-FL@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-1-4 has been updated
       via  6ed7056197e7ede1305b25457e4633c4ac4301d4 (commit)
      from  a1a59e6a539e597996976d0afb6aa3062e954188 (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 6ed7056197e7ede1305b25457e4633c4ac4301d4
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 30 10:19:14 2013 +0200

    gpg: Use 2048 as the default keysize in batch mode.
    
    * g10/keygen.c (gen_elg, gen_dsa, gen_rsa): Set default keysize to
    2048.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/keygen.c b/g10/keygen.c
index 30ec370..8353f36 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -1043,7 +1043,7 @@ gen_elg(int algo, unsigned nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
     assert( is_ELGAMAL(algo) );
 
     if( nbits < 512 ) {
-	nbits = 1024;
+	nbits = 2048;
 	log_info(_("keysize invalid; using %u bits\n"), nbits );
     }
 
@@ -1126,7 +1126,7 @@ gen_dsa(unsigned int nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
 
     if( nbits < 512)
       {
-	nbits = 1024;
+	nbits = 2048;
 	log_info(_("keysize invalid; using %u bits\n"), nbits );
       }
     else if(nbits>3072)
@@ -1256,7 +1256,7 @@ gen_rsa(int algo, unsigned nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
     assert( is_RSA(algo) );
 
     if( nbits < 1024 ) {
-	nbits = 1024;
+	nbits = 2048;
 	log_info(_("keysize invalid; using %u bits\n"), nbits );
     }
 

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

Summary of changes:
 g10/keygen.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Aug 30 17:34:10 2013
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 30 Aug 2013 17:34:10 +0200
Subject: [git] GCRYPT - branch, master, updated. libgcrypt-1.5.0-198-ge9b711e
Message-ID: <E1VFQCn-0000RE-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 crypto library".

The branch, master has been updated
       via  e9b711e6ddb480a71d2996465074e436c752c005 (commit)
       via  800d4e01376d52a94a157b53978c7c3f957fc476 (commit)
      from  040aa7688296e93659cb32ca31e9a001a6ab1edd (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 e9b711e6ddb480a71d2996465074e436c752c005
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 30 17:04:21 2013 +0200

    mpi: Make gcry_mpi_print work with negative zeroes.
    
    * mpi/mpicoder.c (gcry_mpi_print): Take care of negative zero.
    (gcry_mpi_aprint): Allocate at least 1 byte.
    * tests/t-convert.c: New.
    * tests/Makefile.am (TESTS): Add t-convert.
    --
    
    Reported-by: Christian Fuchs
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/mpi/mpicoder.c b/mpi/mpicoder.c
index aca3710..a925922 100644
--- a/mpi/mpicoder.c
+++ b/mpi/mpicoder.c
@@ -1,6 +1,7 @@
 /* mpicoder.c  -  Coder for the external representation of MPIs
  * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
  *               2008 Free Software Foundation, Inc.
+ * Copyright (C) 2013 g10 Code GmbH
  *
  * This file is part of Libgcrypt.
  *
@@ -178,7 +179,8 @@ mpi_fromstr (gcry_mpi_t val, const char *str)
 /* Dump the value of A in a format suitable for debugging to
    Libgcrypt's logging stream.  Note that one leading space but no
    trailing space or linefeed will be printed.  It is okay to pass
-   NULL for A. */
+   NULL for A.  Note that this function prints the sign as it is used
+   internally and won't map -0 to 0. */
 void
 gcry_mpi_dump (const gcry_mpi_t a)
 {
@@ -548,10 +550,21 @@ gcry_mpi_print (enum gcry_mpi_format format,
   unsigned int nbits = mpi_get_nbits (a);
   size_t len;
   size_t dummy_nwritten;
+  int negative;
 
   if (!nwritten)
     nwritten = &dummy_nwritten;
 
+  /* Libgcrypt does no always care to set clear the sign if the value
+     is 0.  For printing this is a bit of a surprise, in particular
+     because if some of the formats don't support negative numbers but
+     should be able to print a zero.  Thus we need this extra test
+     for a negative number.  */
+  if (a->sign && _gcry_mpi_cmp_ui (a, 0))
+    negative = 1;
+  else
+    negative = 0;
+
   len = buflen;
   *nwritten = 0;
   if (format == GCRYMPI_FMT_STD)
@@ -560,16 +573,20 @@ gcry_mpi_print (enum gcry_mpi_format format,
       int extra = 0;
       unsigned int n;
 
-      if (a->sign)
+      if (negative)
         return gcry_error (GPG_ERR_INTERNAL); /* Can't handle it yet. */
 
       tmp = _gcry_mpi_get_buffer (a, &n, NULL);
       if (!tmp)
         return gpg_error_from_syserror ();
+
+      /* If the high bit of the returned buffer is set, we need to
+         print an extra leading 0x00 so that the output is interpreted
+         as a positive number.  */
       if (n && (*tmp & 0x80))
         {
           n++;
-          extra=1;
+          extra = 1;
 	}
 
       if (buffer && n > len)
@@ -597,6 +614,7 @@ gcry_mpi_print (enum gcry_mpi_format format,
       /* Note:  We ignore the sign for this format.  */
       /* FIXME: for performance reasons we should put this into
 	 mpi_aprint because we can then use the buffer directly.  */
+
       if (buffer && n > len)
         return gcry_error (GPG_ERR_TOO_SHORT);
       if (buffer)
@@ -617,7 +635,7 @@ gcry_mpi_print (enum gcry_mpi_format format,
       unsigned int n = (nbits + 7)/8;
 
       /* The PGP format can only handle unsigned integers.  */
-      if( a->sign )
+      if (negative)
         return gcry_error (GPG_ERR_INV_ARG);
 
       if (buffer && n+2 > len)
@@ -646,7 +664,7 @@ gcry_mpi_print (enum gcry_mpi_format format,
       int extra = 0;
       unsigned int n;
 
-      if (a->sign)
+      if (negative)
         return gcry_error (GPG_ERR_INTERNAL); /* Can't handle it yet.  */
 
       tmp = _gcry_mpi_get_buffer (a, &n, NULL);
@@ -694,7 +712,7 @@ gcry_mpi_print (enum gcry_mpi_format format,
       if (!n || (*tmp & 0x80))
         extra = 2;
 
-      if (buffer && 2*n + extra + !!a->sign + 1 > len)
+      if (buffer && 2*n + extra + negative + 1 > len)
         {
           gcry_free(tmp);
           return gcry_error (GPG_ERR_TOO_SHORT);
@@ -703,7 +721,7 @@ gcry_mpi_print (enum gcry_mpi_format format,
         {
           unsigned char *s = buffer;
 
-          if (a->sign)
+          if (negative)
             *s++ = '-';
           if (extra)
             {
@@ -724,7 +742,7 @@ gcry_mpi_print (enum gcry_mpi_format format,
 	}
       else
         {
-          *nwritten = 2*n + extra + !!a->sign + 1;
+          *nwritten = 2*n + extra + negative + 1;
 	}
       gcry_free (tmp);
       return 0;
@@ -752,7 +770,7 @@ gcry_mpi_aprint (enum gcry_mpi_format format,
   if (rc)
     return rc;
 
-  *buffer = mpi_is_secure(a) ? gcry_malloc_secure (n) : gcry_malloc (n);
+  *buffer = mpi_is_secure(a) ? gcry_malloc_secure (n?n:1) : gcry_malloc (n?n:1);
   if (!*buffer)
     return gpg_error_from_syserror ();
   rc = gcry_mpi_print( format, *buffer, n, &n, a );
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 871e32b..35bcd60 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,7 +18,7 @@
 
 ## Process this file with automake to produce Makefile.in
 
-TESTS = version t-mpi-bit t-mpi-point prime basic \
+TESTS = version t-convert t-mpi-bit t-mpi-point prime basic \
         mpitests tsexp keygen pubkey hmac keygrip fips186-dsa aeswrap \
 	curves t-kdf pkcs1v2 random dsa-rfc6979
 
diff --git a/tests/t-convert.c b/tests/t-convert.c
new file mode 100644
index 0000000..b7f97fa
--- /dev/null
+++ b/tests/t-convert.c
@@ -0,0 +1,160 @@
+/* t-convert.c  - Tests for mpi print and scna functions
+ * Copyright (C) 2013 g10 Code GmbH
+ *
+ * This file is part of Libgcrypt.
+ *
+ * Libgcrypt 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.
+ *
+ * Libgcrypt 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/>.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <stdarg.h>
+
+#include "../src/gcrypt-int.h"
+
+#define PGM "t-mpi-point"
+
+static const char *wherestr;
+static int verbose;
+static int debug;
+static int error_count;
+
+
+#define xmalloc(a)    gcry_xmalloc ((a))
+#define xcalloc(a,b)  gcry_xcalloc ((a),(b))
+#define xfree(a)      gcry_free ((a))
+#define pass() do { ; } while (0)
+
+static void
+show (const char *format, ...)
+{
+  va_list arg_ptr;
+
+  if (!verbose)
+    return;
+  fprintf (stderr, "%s: ", PGM);
+  va_start (arg_ptr, format);
+  vfprintf (stderr, format, arg_ptr);
+  va_end (arg_ptr);
+}
+
+static void
+fail (const char *format, ...)
+{
+  va_list arg_ptr;
+
+  fflush (stdout);
+  fprintf (stderr, "%s: ", PGM);
+  if (wherestr)
+    fprintf (stderr, "%s: ", wherestr);
+  va_start (arg_ptr, format);
+  vfprintf (stderr, format, arg_ptr);
+  va_end (arg_ptr);
+  error_count++;
+}
+
+static void
+die (const char *format, ...)
+{
+  va_list arg_ptr;
+
+  fflush (stdout);
+  fprintf (stderr, "%s: ", PGM);
+  if (wherestr)
+    fprintf (stderr, "%s: ", wherestr);
+  va_start (arg_ptr, format);
+  vfprintf (stderr, format, arg_ptr);
+  va_end (arg_ptr);
+  exit (1);
+}
+
+
+/* Check that mpi_print does not return a negative zero.  */
+static void
+negative_zero (void)
+{
+  gpg_error_t err;
+  gcry_mpi_t a;
+  char *buf;
+  void *bufaddr = &buf;
+  struct { const char *name; enum gcry_mpi_format format; } fmts[] =
+    {
+      { "STD", GCRYMPI_FMT_STD },
+      { "PGP", GCRYMPI_FMT_PGP },
+      { "SSH", GCRYMPI_FMT_SSH },
+      { "HEX", GCRYMPI_FMT_HEX },
+      { "USG", GCRYMPI_FMT_USG },
+      { NULL, 0 }
+    };
+  int i;
+
+  a = gcry_mpi_new (0);
+  for (i=0; fmts[i].name; i++)
+    {
+      err = gcry_mpi_aprint (fmts[i].format, bufaddr, NULL, a);
+      if (err)
+        fail ("error printing a zero as %s: %s\n",
+              fmts[i].name,gpg_strerror (err) );
+      else
+        gcry_free (buf);
+    }
+
+  /* With the current version of libgcrypt the next two statements
+     should set a to -0. */
+  gcry_mpi_sub_ui (a, a, 1);
+  gcry_mpi_add_ui (a, a, 1);
+
+  for (i=0; fmts[i].name; i++)
+    {
+      err = gcry_mpi_aprint (fmts[i].format, bufaddr, NULL, a);
+      if (err)
+        fail ("error printing a negative zero as %s: %s\n",
+              fmts[i].name,gpg_strerror (err) );
+      else
+        gcry_free (buf);
+    }
+
+  gcry_mpi_release (a);
+}
+
+
+
+
+int
+main (int argc, char **argv)
+{
+  if (argc > 1 && !strcmp (argv[1], "--verbose"))
+    verbose = 1;
+  else if (argc > 1 && !strcmp (argv[1], "--debug"))
+    verbose = debug = 1;
+
+  if (!gcry_check_version (GCRYPT_VERSION))
+    die ("version mismatch\n");
+
+  gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
+  gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
+  if (debug)
+    gcry_control (GCRYCTL_SET_DEBUG_FLAGS, 1u, 0);
+  gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
+
+  negative_zero ();
+
+  show ("All tests completed. Errors: %d\n", error_count);
+  return error_count ? 1 : 0;
+}

commit 800d4e01376d52a94a157b53978c7c3f957fc476
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 29 21:37:30 2013 +0200

    Refactor the ECC code into 3 files.
    
    * cipher/ecc-common.h, cipher/ecc-curves.c, cipher/ecc-misc.c: New.
    * cipher/Makefile.am (EXTRA_libcipher_la_SOURCES): Add new files.
    * configure.ac (GCRYPT_PUBKEY_CIPHERS): Add new .c files.
    * cipher/ecc.c (curve_aliases, ecc_domain_parms_t, domain_parms)
    (scanval): Move to ecc-curves.c.
    (fill_in_curve): Move to ecc-curve.c as _gcry_ecc_fill_in_curve.
    (ecc_get_curve): Move to ecc-curve.c as _gcry_ecc_get_curve.
    (_gcry_mpi_ec_ec2os): Move to ecc-misc.c.
    (ec2os): Move to ecc-misc.c as _gcry_ecc_ec2os.
    (os2ec): Move to ecc-misc.c as _gcry_ecc_os2ec.
    (point_set): Move as inline function to ecc-common.h.
    (_gcry_ecc_curve_free): Move to ecc-misc.c as _gcry_ecc_curve_free.
    (_gcry_ecc_curve_copy): Move to ecc-misc.c as _gcry_ecc_curve_copy.
    (mpi_from_keyparam, point_from_keyparam): Move to ecc-curves.c.
    (_gcry_mpi_ec_new): Move to ecc-curves.c.
    (ecc_get_param): Move to ecc-curves.c as _gcry_ecc_get_param.
    (ecc_get_param_sexp): Move to ecc-curves.c as _gcry_ecc_get_param_sexp.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/cipher/Makefile.am b/cipher/Makefile.am
index c0f21fa..e233e79 100644
--- a/cipher/Makefile.am
+++ b/cipher/Makefile.am
@@ -60,7 +60,7 @@ crc.c \
 des.c \
 dsa.c \
 elgamal.c \
-ecc.c \
+ecc.c ecc-curves.c ecc-misc.c ecc-common.h \
 idea.c \
 md4.c \
 md5.c \
diff --git a/cipher/ecc-common.h b/cipher/ecc-common.h
new file mode 100644
index 0000000..94da73e
--- /dev/null
+++ b/cipher/ecc-common.h
@@ -0,0 +1,80 @@
+/* ecc-common.h - Declarations of common ECC code
+ * Copyright (C) 2013 g10 Code GmbH
+ *
+ * This file is part of Libgcrypt.
+ *
+ * Libgcrypt 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.
+ *
+ * Libgcrypt 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/>.
+ */
+
+#ifndef GCRY_ECC_COMMON_H
+#define GCRY_ECC_COMMON_H
+
+/* Definition of a curve.  */
+typedef struct
+{
+  gcry_mpi_t p;         /* Prime specifying the field GF(p).  */
+  gcry_mpi_t a;         /* First coefficient of the Weierstrass equation.  */
+  gcry_mpi_t b;         /* Second coefficient of the Weierstrass equation.  */
+  mpi_point_struct G;   /* Base point (generator).  */
+  gcry_mpi_t n;         /* Order of G.  */
+  const char *name;     /* Name of the curve or NULL.  */
+} elliptic_curve_t;
+
+
+typedef struct
+{
+  elliptic_curve_t E;
+  mpi_point_struct Q; /* Q = [d]G  */
+} ECC_public_key;
+
+
+typedef struct
+{
+  elliptic_curve_t E;
+  mpi_point_struct Q;
+  gcry_mpi_t d;
+} ECC_secret_key;
+
+
+
+/* Set the value from S into D.  */
+static inline void
+point_set (mpi_point_t d, mpi_point_t s)
+{
+  mpi_set (d->x, s->x);
+  mpi_set (d->y, s->y);
+  mpi_set (d->z, s->z);
+}
+
+
+/*-- ecc-curves.c --*/
+gpg_err_code_t _gcry_ecc_fill_in_curve (unsigned int nbits,
+                                        const char *name,
+                                        elliptic_curve_t *curve,
+                                        unsigned int *r_nbits);
+
+const char *_gcry_ecc_get_curve (gcry_mpi_t *pkey,
+                                 int iterator,
+                                 unsigned int *r_nbits);
+gcry_err_code_t _gcry_ecc_get_param (const char *name, gcry_mpi_t *pkey);
+gcry_sexp_t     _gcry_ecc_get_param_sexp (const char *name);
+
+/*-- ecc-misc.c --*/
+void _gcry_ecc_curve_free (elliptic_curve_t *E);
+elliptic_curve_t _gcry_ecc_curve_copy (elliptic_curve_t E);
+gcry_mpi_t   _gcry_ecc_ec2os (gcry_mpi_t x, gcry_mpi_t y, gcry_mpi_t p);
+gcry_error_t _gcry_ecc_os2ec (mpi_point_t result, gcry_mpi_t value);
+
+
+#endif /*GCRY_ECC_COMMON_H*/
diff --git a/cipher/ecc-curves.c b/cipher/ecc-curves.c
new file mode 100644
index 0000000..e813b6b
--- /dev/null
+++ b/cipher/ecc-curves.c
@@ -0,0 +1,731 @@
+/* ecc-curves.c  -  Elliptic Curve parameter mangement
+ * Copyright (C) 2007, 2008, 2010, 2011 Free Software Foundation, Inc.
+ * Copyright (C) 2013 g10 Code GmbH
+ *
+ * This file is part of Libgcrypt.
+ *
+ * Libgcrypt 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.
+ *
+ * Libgcrypt 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/>.
+ */
+
+#include <config.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include "g10lib.h"
+#include "mpi.h"
+#include "context.h"
+#include "ec-context.h"
+#include "ecc-common.h"
+
+
+/* This tables defines aliases for curve names.  */
+static const struct
+{
+  const char *name;  /* Our name.  */
+  const char *other; /* Other name. */
+} curve_aliases[] =
+  {
+    { "NIST P-192", "1.2.840.10045.3.1.1" }, /* X9.62 OID  */
+    { "NIST P-192", "prime192v1" },          /* X9.62 name.  */
+    { "NIST P-192", "secp192r1"  },          /* SECP name.  */
+    { "NIST P-192", "nistp192"   },          /* rfc5656.  */
+
+    { "NIST P-224", "secp224r1" },
+    { "NIST P-224", "1.3.132.0.33" },        /* SECP OID.  */
+    { "NIST P-224", "nistp224"   },          /* rfc5656.  */
+
+    { "NIST P-256", "1.2.840.10045.3.1.7" }, /* From NIST SP 800-78-1.  */
+    { "NIST P-256", "prime256v1" },
+    { "NIST P-256", "secp256r1"  },
+    { "NIST P-256", "nistp256"   },          /* rfc5656.  */
+
+    { "NIST P-384", "secp384r1" },
+    { "NIST P-384", "1.3.132.0.34" },
+    { "NIST P-384", "nistp384"   },          /* rfc5656.  */
+
+    { "NIST P-521", "secp521r1" },
+    { "NIST P-521", "1.3.132.0.35" },
+    { "NIST P-521", "nistp521"   },          /* rfc5656.  */
+
+    { "brainpoolP160r1", "1.3.36.3.3.2.8.1.1.1" },
+    { "brainpoolP192r1", "1.3.36.3.3.2.8.1.1.3" },
+    { "brainpoolP224r1", "1.3.36.3.3.2.8.1.1.5" },
+    { "brainpoolP256r1", "1.3.36.3.3.2.8.1.1.7" },
+    { "brainpoolP320r1", "1.3.36.3.3.2.8.1.1.9" },
+    { "brainpoolP384r1", "1.3.36.3.3.2.8.1.1.11"},
+    { "brainpoolP512r1", "1.3.36.3.3.2.8.1.1.13"},
+
+    { NULL, NULL}
+  };
+
+
+typedef struct
+{
+  const char *desc;           /* Description of the curve.  */
+  unsigned int nbits;         /* Number of bits.  */
+  unsigned int fips:1;        /* True if this is a FIPS140-2 approved curve. */
+  const char *p;              /* Order of the prime field.  */
+  const char *a, *b;          /* The coefficients. */
+  const char *n;              /* The order of the base point.  */
+  const char *g_x, *g_y;      /* Base point.  */
+} ecc_domain_parms_t;
+
+
+/* This static table defines all available curves.  */
+static const ecc_domain_parms_t domain_parms[] =
+  {
+    {
+      "NIST P-192", 192, 1,
+      "0xfffffffffffffffffffffffffffffffeffffffffffffffff",
+      "0xfffffffffffffffffffffffffffffffefffffffffffffffc",
+      "0x64210519e59c80e70fa7e9ab72243049feb8deecc146b9b1",
+      "0xffffffffffffffffffffffff99def836146bc9b1b4d22831",
+
+      "0x188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012",
+      "0x07192b95ffc8da78631011ed6b24cdd573f977a11e794811"
+    },
+    {
+      "NIST P-224", 224, 1,
+      "0xffffffffffffffffffffffffffffffff000000000000000000000001",
+      "0xfffffffffffffffffffffffffffffffefffffffffffffffffffffffe",
+      "0xb4050a850c04b3abf54132565044b0b7d7bfd8ba270b39432355ffb4",
+      "0xffffffffffffffffffffffffffff16a2e0b8f03e13dd29455c5c2a3d" ,
+
+      "0xb70e0cbd6bb4bf7f321390b94a03c1d356c21122343280d6115c1d21",
+      "0xbd376388b5f723fb4c22dfe6cd4375a05a07476444d5819985007e34"
+    },
+    {
+      "NIST P-256", 256, 1,
+      "0xffffffff00000001000000000000000000000000ffffffffffffffffffffffff",
+      "0xffffffff00000001000000000000000000000000fffffffffffffffffffffffc",
+      "0x5ac635d8aa3a93e7b3ebbd55769886bc651d06b0cc53b0f63bce3c3e27d2604b",
+      "0xffffffff00000000ffffffffffffffffbce6faada7179e84f3b9cac2fc632551",
+
+      "0x6b17d1f2e12c4247f8bce6e563a440f277037d812deb33a0f4a13945d898c296",
+      "0x4fe342e2fe1a7f9b8ee7eb4a7c0f9e162bce33576b315ececbb6406837bf51f5"
+    },
+    {
+      "NIST P-384", 384, 1,
+      "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
+      "ffffffff0000000000000000ffffffff",
+      "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
+      "ffffffff0000000000000000fffffffc",
+      "0xb3312fa7e23ee7e4988e056be3f82d19181d9c6efe8141120314088f5013875a"
+      "c656398d8a2ed19d2a85c8edd3ec2aef",
+      "0xffffffffffffffffffffffffffffffffffffffffffffffffc7634d81f4372ddf"
+      "581a0db248b0a77aecec196accc52973",
+
+      "0xaa87ca22be8b05378eb1c71ef320ad746e1d3b628ba79b9859f741e082542a38"
+      "5502f25dbf55296c3a545e3872760ab7",
+      "0x3617de4a96262c6f5d9e98bf9292dc29f8f41dbd289a147ce9da3113b5f0b8c0"
+      "0a60b1ce1d7e819d7a431d7c90ea0e5f"
+    },
+    {
+      "NIST P-521", 521, 1,
+      "0x01ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "0x01ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc",
+      "0x051953eb9618e1c9a1f929a21a0b68540eea2da725b99b315f3b8b489918ef10"
+      "9e156193951ec7e937b1652c0bd3bb1bf073573df883d2c34f1ef451fd46b503f00",
+      "0x1fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "ffa51868783bf2f966b7fcc0148f709a5d03bb5c9b8899c47aebb6fb71e91386409",
+
+      "0xc6858e06b70404e9cd9e3ecb662395b4429c648139053fb521f828af606b4d3d"
+      "baa14b5e77efe75928fe1dc127a2ffa8de3348b3c1856a429bf97e7e31c2e5bd66",
+      "0x11839296a789a3bc0045c8a5fb42c7d1bd998f54449579b446817afbd17273e6"
+      "62c97ee72995ef42640c550b9013fad0761353c7086a272c24088be94769fd16650"
+    },
+
+    { "brainpoolP160r1", 160, 0,
+      "0xe95e4a5f737059dc60dfc7ad95b3d8139515620f",
+      "0x340e7be2a280eb74e2be61bada745d97e8f7c300",
+      "0x1e589a8595423412134faa2dbdec95c8d8675e58",
+      "0xe95e4a5f737059dc60df5991d45029409e60fc09",
+      "0xbed5af16ea3f6a4f62938c4631eb5af7bdbcdbc3",
+      "0x1667cb477a1a8ec338f94741669c976316da6321"
+    },
+
+    { "brainpoolP192r1", 192, 0,
+      "0xc302f41d932a36cda7a3463093d18db78fce476de1a86297",
+      "0x6a91174076b1e0e19c39c031fe8685c1cae040e5c69a28ef",
+      "0x469a28ef7c28cca3dc721d044f4496bcca7ef4146fbf25c9",
+      "0xc302f41d932a36cda7a3462f9e9e916b5be8f1029ac4acc1",
+      "0xc0a0647eaab6a48753b033c56cb0f0900a2f5c4853375fd6",
+      "0x14b690866abd5bb88b5f4828c1490002e6773fa2fa299b8f"
+    },
+
+    { "brainpoolP224r1", 224, 0,
+      "0xd7c134aa264366862a18302575d1d787b09f075797da89f57ec8c0ff",
+      "0x68a5e62ca9ce6c1c299803a6c1530b514e182ad8b0042a59cad29f43",
+      "0x2580f63ccfe44138870713b1a92369e33e2135d266dbb372386c400b",
+      "0xd7c134aa264366862a18302575d0fb98d116bc4b6ddebca3a5a7939f",
+      "0x0d9029ad2c7e5cf4340823b2a87dc68c9e4ce3174c1e6efdee12c07d",
+      "0x58aa56f772c0726f24c6b89e4ecdac24354b9e99caa3f6d3761402cd"
+    },
+
+    { "brainpoolP256r1", 256, 0,
+      "0xa9fb57dba1eea9bc3e660a909d838d726e3bf623d52620282013481d1f6e5377",
+      "0x7d5a0975fc2c3057eef67530417affe7fb8055c126dc5c6ce94a4b44f330b5d9",
+      "0x26dc5c6ce94a4b44f330b5d9bbd77cbf958416295cf7e1ce6bccdc18ff8c07b6",
+      "0xa9fb57dba1eea9bc3e660a909d838d718c397aa3b561a6f7901e0e82974856a7",
+      "0x8bd2aeb9cb7e57cb2c4b482ffc81b7afb9de27e1e3bd23c23a4453bd9ace3262",
+      "0x547ef835c3dac4fd97f8461a14611dc9c27745132ded8e545c1d54c72f046997"
+    },
+
+    { "brainpoolP320r1", 320, 0,
+      "0xd35e472036bc4fb7e13c785ed201e065f98fcfa6f6f40def4f92b9ec7893ec28"
+      "fcd412b1f1b32e27",
+      "0x3ee30b568fbab0f883ccebd46d3f3bb8a2a73513f5eb79da66190eb085ffa9f4"
+      "92f375a97d860eb4",
+      "0x520883949dfdbc42d3ad198640688a6fe13f41349554b49acc31dccd88453981"
+      "6f5eb4ac8fb1f1a6",
+      "0xd35e472036bc4fb7e13c785ed201e065f98fcfa5b68f12a32d482ec7ee8658e9"
+      "8691555b44c59311",
+      "0x43bd7e9afb53d8b85289bcc48ee5bfe6f20137d10a087eb6e7871e2a10a599c7"
+      "10af8d0d39e20611",
+      "0x14fdd05545ec1cc8ab4093247f77275e0743ffed117182eaa9c77877aaac6ac7"
+      "d35245d1692e8ee1"
+    },
+
+    { "brainpoolP384r1", 384, 0,
+      "0x8cb91e82a3386d280f5d6f7e50e641df152f7109ed5456b412b1da197fb71123"
+      "acd3a729901d1a71874700133107ec53",
+      "0x7bc382c63d8c150c3c72080ace05afa0c2bea28e4fb22787139165efba91f90f"
+      "8aa5814a503ad4eb04a8c7dd22ce2826",
+      "0x04a8c7dd22ce28268b39b55416f0447c2fb77de107dcd2a62e880ea53eeb62d5"
+      "7cb4390295dbc9943ab78696fa504c11",
+      "0x8cb91e82a3386d280f5d6f7e50e641df152f7109ed5456b31f166e6cac0425a7"
+      "cf3ab6af6b7fc3103b883202e9046565",
+      "0x1d1c64f068cf45ffa2a63a81b7c13f6b8847a3e77ef14fe3db7fcafe0cbd10e8"
+      "e826e03436d646aaef87b2e247d4af1e",
+      "0x8abe1d7520f9c2a45cb1eb8e95cfd55262b70b29feec5864e19c054ff9912928"
+      "0e4646217791811142820341263c5315"
+    },
+
+    { "brainpoolP512r1", 512, 0,
+      "0xaadd9db8dbe9c48b3fd4e6ae33c9fc07cb308db3b3c9d20ed6639cca70330871"
+      "7d4d9b009bc66842aecda12ae6a380e62881ff2f2d82c68528aa6056583a48f3",
+      "0x7830a3318b603b89e2327145ac234cc594cbdd8d3df91610a83441caea9863bc"
+      "2ded5d5aa8253aa10a2ef1c98b9ac8b57f1117a72bf2c7b9e7c1ac4d77fc94ca",
+      "0x3df91610a83441caea9863bc2ded5d5aa8253aa10a2ef1c98b9ac8b57f1117a7"
+      "2bf2c7b9e7c1ac4d77fc94cadc083e67984050b75ebae5dd2809bd638016f723",
+      "0xaadd9db8dbe9c48b3fd4e6ae33c9fc07cb308db3b3c9d20ed6639cca70330870"
+      "553e5c414ca92619418661197fac10471db1d381085ddaddb58796829ca90069",
+      "0x81aee4bdd82ed9645a21322e9c4c6a9385ed9f70b5d916c1b43b62eef4d0098e"
+      "ff3b1f78e2d0d48d50d1687b93b97d5f7c6d5047406a5e688b352209bcb9f822",
+      "0x7dde385d566332ecc0eabfa9cf7822fdf209f70024a57b1aa000c55b881f8111"
+      "b2dcde494a5f485e5bca4bd88a2763aed1ca2b2fa8f0540678cd1e0f3ad80892"
+    },
+
+    { NULL, 0, 0, NULL, NULL, NULL, NULL }
+  };
+
+
+
+

+/* Helper to scan a hex string. */
+static gcry_mpi_t
+scanval (const char *string)
+{
+  gpg_error_t err;
+  gcry_mpi_t val;
+
+  err = gcry_mpi_scan (&val, GCRYMPI_FMT_HEX, string, 0, NULL);
+  if (err)
+    log_fatal ("scanning ECC parameter failed: %s\n", gpg_strerror (err));
+  return val;
+}
+
+
+/* Generate the crypto system setup.  This function takes the NAME of
+   a curve or the desired number of bits and stores at R_CURVE the
+   parameters of the named curve or those of a suitable curve.  If
+   R_NBITS is not NULL, the chosen number of bits is stored there.  */
+gpg_err_code_t
+_gcry_ecc_fill_in_curve (unsigned int nbits, const char *name,
+                         elliptic_curve_t *curve, unsigned int *r_nbits)
+{
+  int idx, aliasno;
+  const char *resname = NULL; /* Set to a found curve name.  */
+
+  if (name)
+    {
+      /* First check our native curves.  */
+      for (idx = 0; domain_parms[idx].desc; idx++)
+        if (!strcmp (name, domain_parms[idx].desc))
+          {
+            resname = domain_parms[idx].desc;
+            break;
+          }
+      /* If not found consult the alias table.  */
+      if (!domain_parms[idx].desc)
+        {
+          for (aliasno = 0; curve_aliases[aliasno].name; aliasno++)
+            if (!strcmp (name, curve_aliases[aliasno].other))
+              break;
+          if (curve_aliases[aliasno].name)
+            {
+              for (idx = 0; domain_parms[idx].desc; idx++)
+                if (!strcmp (curve_aliases[aliasno].name,
+                             domain_parms[idx].desc))
+                  {
+                    resname = domain_parms[idx].desc;
+                    break;
+                  }
+            }
+        }
+    }
+  else
+    {
+      for (idx = 0; domain_parms[idx].desc; idx++)
+        if (nbits == domain_parms[idx].nbits)
+          break;
+    }
+  if (!domain_parms[idx].desc)
+    return GPG_ERR_INV_VALUE;
+
+  /* In fips mode we only support NIST curves.  Note that it is
+     possible to bypass this check by specifying the curve parameters
+     directly.  */
+  if (fips_mode () && !domain_parms[idx].fips )
+    return GPG_ERR_NOT_SUPPORTED;
+
+  if (r_nbits)
+    *r_nbits = domain_parms[idx].nbits;
+  curve->p = scanval (domain_parms[idx].p);
+  curve->a = scanval (domain_parms[idx].a);
+  curve->b = scanval (domain_parms[idx].b);
+  curve->n = scanval (domain_parms[idx].n);
+  curve->G.x = scanval (domain_parms[idx].g_x);
+  curve->G.y = scanval (domain_parms[idx].g_y);
+  curve->G.z = mpi_alloc_set_ui (1);
+  curve->name = resname;
+
+  return 0;
+}
+
+
+/* Return the name matching the parameters in PKEY.  */
+const char *
+_gcry_ecc_get_curve (gcry_mpi_t *pkey, int iterator, unsigned int *r_nbits)
+{
+  gpg_err_code_t err;
+  elliptic_curve_t E;
+  int idx;
+  gcry_mpi_t tmp;
+  const char *result = NULL;
+
+  if (r_nbits)
+    *r_nbits = 0;
+
+  if (!pkey)
+    {
+      idx = iterator;
+      if (idx >= 0 && idx < DIM (domain_parms))
+        {
+          result = domain_parms[idx].desc;
+          if (r_nbits)
+            *r_nbits = domain_parms[idx].nbits;
+        }
+      return result;
+    }
+
+  if (!pkey[0] || !pkey[1] || !pkey[2] || !pkey[3] || !pkey[4])
+    return NULL;
+
+  E.p = pkey[0];
+  E.a = pkey[1];
+  E.b = pkey[2];
+  _gcry_mpi_point_init (&E.G);
+  err = _gcry_ecc_os2ec (&E.G, pkey[3]);
+  if (err)
+    {
+      _gcry_mpi_point_free_parts (&E.G);
+      return NULL;
+    }
+  E.n = pkey[4];
+
+  for (idx = 0; domain_parms[idx].desc; idx++)
+    {
+      tmp = scanval (domain_parms[idx].p);
+      if (!mpi_cmp (tmp, E.p))
+        {
+          mpi_free (tmp);
+          tmp = scanval (domain_parms[idx].a);
+          if (!mpi_cmp (tmp, E.a))
+            {
+              mpi_free (tmp);
+              tmp = scanval (domain_parms[idx].b);
+              if (!mpi_cmp (tmp, E.b))
+                {
+                  mpi_free (tmp);
+                  tmp = scanval (domain_parms[idx].n);
+                  if (!mpi_cmp (tmp, E.n))
+                    {
+                      mpi_free (tmp);
+                      tmp = scanval (domain_parms[idx].g_x);
+                      if (!mpi_cmp (tmp, E.G.x))
+                        {
+                          mpi_free (tmp);
+                          tmp = scanval (domain_parms[idx].g_y);
+                          if (!mpi_cmp (tmp, E.G.y))
+                            {
+                              mpi_free (tmp);
+                              result = domain_parms[idx].desc;
+                              if (r_nbits)
+                                *r_nbits = domain_parms[idx].nbits;
+                              break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+      mpi_free (tmp);
+    }
+
+  _gcry_mpi_point_free_parts (&E.G);
+
+  return result;
+}
+
+
+/* Helper to extract an MPI from key parameters.  */
+static gpg_err_code_t
+mpi_from_keyparam (gcry_mpi_t *r_a, gcry_sexp_t keyparam, const char *name)
+{
+  gcry_err_code_t ec = 0;
+  gcry_sexp_t l1;
+
+  l1 = gcry_sexp_find_token (keyparam, name, 0);
+  if (l1)
+    {
+      *r_a = gcry_sexp_nth_mpi (l1, 1, GCRYMPI_FMT_USG);
+      gcry_sexp_release (l1);
+      if (!*r_a)
+        ec = GPG_ERR_INV_OBJ;
+    }
+  return ec;
+}
+
+/* Helper to extract a point from key parameters.  If no parameter
+   with NAME is found, the functions tries to find a non-encoded point
+   by appending ".x", ".y" and ".z" to NAME.  ".z" is in this case
+   optional and defaults to 1.  */
+static gpg_err_code_t
+point_from_keyparam (gcry_mpi_point_t *r_a,
+                     gcry_sexp_t keyparam, const char *name)
+{
+  gcry_err_code_t ec;
+  gcry_mpi_t a = NULL;
+  gcry_mpi_point_t point;
+
+  ec = mpi_from_keyparam (&a, keyparam, name);
+  if (ec)
+    return ec;
+
+  if (a)
+    {
+      point = gcry_mpi_point_new (0);
+      ec = _gcry_ecc_os2ec (point, a);
+      mpi_free (a);
+      if (ec)
+        {
+          gcry_mpi_point_release (point);
+          return ec;
+        }
+    }
+  else
+    {
+      char *tmpname;
+      gcry_mpi_t x = NULL;
+      gcry_mpi_t y = NULL;
+      gcry_mpi_t z = NULL;
+
+      tmpname = gcry_malloc (strlen (name) + 2 + 1);
+      if (!tmpname)
+        return gpg_err_code_from_syserror ();
+      strcpy (stpcpy (tmpname, name), ".x");
+      ec = mpi_from_keyparam (&x, keyparam, tmpname);
+      if (ec)
+        {
+          gcry_free (tmpname);
+          return ec;
+        }
+      strcpy (stpcpy (tmpname, name), ".y");
+      ec = mpi_from_keyparam (&y, keyparam, tmpname);
+      if (ec)
+        {
+          mpi_free (x);
+          gcry_free (tmpname);
+          return ec;
+        }
+      strcpy (stpcpy (tmpname, name), ".z");
+      ec = mpi_from_keyparam (&z, keyparam, tmpname);
+      if (ec)
+        {
+          mpi_free (y);
+          mpi_free (x);
+          gcry_free (tmpname);
+          return ec;
+        }
+      if (!z)
+        z = mpi_set_ui (NULL, 1);
+      if (x && y)
+        point = gcry_mpi_point_snatch_set (NULL, x, y, z);
+      else
+        {
+          mpi_free (x);
+          mpi_free (y);
+          mpi_free (z);
+          point = NULL;
+        }
+      gcry_free (tmpname);
+    }
+
+  if (point)
+    *r_a = point;
+  return 0;
+}
+
+
+/* This function creates a new context for elliptic curve operations.
+   Either KEYPARAM or CURVENAME must be given.  If both are given and
+   KEYPARAM has no curve parameter CURVENAME is used to add missing
+   parameters.  On success 0 is returned and the new context stored at
+   R_CTX.  On error NULL is stored at R_CTX and an error code is
+   returned.  The context needs to be released using
+   gcry_ctx_release.  */
+gpg_err_code_t
+_gcry_mpi_ec_new (gcry_ctx_t *r_ctx,
+                  gcry_sexp_t keyparam, const char *curvename)
+{
+  gpg_err_code_t errc;
+  gcry_ctx_t ctx = NULL;
+  gcry_mpi_t p = NULL;
+  gcry_mpi_t a = NULL;
+  gcry_mpi_t b = NULL;
+  gcry_mpi_point_t G = NULL;
+  gcry_mpi_t n = NULL;
+  gcry_mpi_point_t Q = NULL;
+  gcry_mpi_t d = NULL;
+  gcry_sexp_t l1;
+
+  *r_ctx = NULL;
+
+  if (keyparam)
+    {
+      errc = mpi_from_keyparam (&p, keyparam, "p");
+      if (errc)
+        goto leave;
+      errc = mpi_from_keyparam (&a, keyparam, "a");
+      if (errc)
+        goto leave;
+      errc = mpi_from_keyparam (&b, keyparam, "b");
+      if (errc)
+        goto leave;
+      errc = point_from_keyparam (&G, keyparam, "g");
+      if (errc)
+        goto leave;
+      errc = mpi_from_keyparam (&n, keyparam, "n");
+      if (errc)
+        goto leave;
+      errc = point_from_keyparam (&Q, keyparam, "q");
+      if (errc)
+        goto leave;
+      errc = mpi_from_keyparam (&d, keyparam, "d");
+      if (errc)
+        goto leave;
+    }
+
+
+  /* Check whether a curve parameter is available and use that to fill
+     in missing values.  If no curve parameter is available try an
+     optional provided curvename.  If only the curvename has been
+     given use that one. */
+  if (keyparam)
+    l1 = gcry_sexp_find_token (keyparam, "curve", 5);
+  else
+    l1 = NULL;
+  if (l1 || curvename)
+    {
+      char *name;
+      elliptic_curve_t *E;
+
+      if (l1)
+        {
+          name = _gcry_sexp_nth_string (l1, 1);
+          gcry_sexp_release (l1);
+          if (!name)
+            {
+              errc = GPG_ERR_INV_OBJ; /* Name missing or out of core. */
+              goto leave;
+            }
+        }
+      else
+        name = NULL;
+
+      E = gcry_calloc (1, sizeof *E);
+      if (!E)
+        {
+          errc = gpg_err_code_from_syserror ();
+          gcry_free (name);
+          goto leave;
+        }
+
+      errc = _gcry_ecc_fill_in_curve (0, name? name : curvename, E, NULL);
+      gcry_free (name);
+      if (errc)
+        {
+          gcry_free (E);
+          goto leave;
+        }
+
+      if (!p)
+        {
+          p = E->p;
+          E->p = NULL;
+        }
+      if (!a)
+        {
+          a = E->a;
+          E->a = NULL;
+        }
+      if (!b)
+        {
+          b = E->b;
+          E->b = NULL;
+        }
+      if (!G)
+        {
+          G = gcry_mpi_point_snatch_set (NULL, E->G.x, E->G.y, E->G.z);
+          E->G.x = NULL;
+          E->G.y = NULL;
+          E->G.z = NULL;
+        }
+      if (!n)
+        {
+          n = E->n;
+          E->n = NULL;
+        }
+      _gcry_ecc_curve_free (E);
+      gcry_free (E);
+    }
+
+  errc = _gcry_mpi_ec_p_new (&ctx, p, a);
+  if (!errc)
+    {
+      mpi_ec_t ec = _gcry_ctx_get_pointer (ctx, CONTEXT_TYPE_EC);
+
+      if (b)
+        {
+          ec->b = b;
+          b = NULL;
+        }
+      if (G)
+        {
+          ec->G = G;
+          G = NULL;
+        }
+      if (n)
+        {
+          ec->n = n;
+          n = NULL;
+        }
+      if (Q)
+        {
+          ec->Q = Q;
+          Q = NULL;
+        }
+      if (d)
+        {
+          ec->d = d;
+          d = NULL;
+        }
+
+      *r_ctx = ctx;
+    }
+
+ leave:
+  mpi_free (p);
+  mpi_free (a);
+  mpi_free (b);
+  gcry_mpi_point_release (G);
+  mpi_free (n);
+  gcry_mpi_point_release (Q);
+  mpi_free (d);
+  return errc;
+}
+
+
+/* Return the parameters of the curve NAME in an MPI array.  */
+gcry_err_code_t
+_gcry_ecc_get_param (const char *name, gcry_mpi_t *pkey)
+{
+  gpg_err_code_t err;
+  unsigned int nbits;
+  elliptic_curve_t E;
+  mpi_ec_t ctx;
+  gcry_mpi_t g_x, g_y;
+
+  err = _gcry_ecc_fill_in_curve (0, name, &E, &nbits);
+  if (err)
+    return err;
+
+  g_x = mpi_new (0);
+  g_y = mpi_new (0);
+  ctx = _gcry_mpi_ec_p_internal_new (E.p, E.a);
+  if (_gcry_mpi_ec_get_affine (g_x, g_y, &E.G, ctx))
+    log_fatal ("ecc get param: Failed to get affine coordinates\n");
+  _gcry_mpi_ec_free (ctx);
+  _gcry_mpi_point_free_parts (&E.G);
+
+  pkey[0] = E.p;
+  pkey[1] = E.a;
+  pkey[2] = E.b;
+  pkey[3] = _gcry_ecc_ec2os (g_x, g_y, E.p);
+  pkey[4] = E.n;
+  pkey[5] = NULL;
+
+  mpi_free (g_x);
+  mpi_free (g_y);
+
+  return 0;
+}
+
+
+/* Return the parameters of the curve NAME as an S-expression.  */
+gcry_sexp_t
+_gcry_ecc_get_param_sexp (const char *name)
+{
+  gcry_mpi_t pkey[6];
+  gcry_sexp_t result;
+  int i;
+
+  if (_gcry_ecc_get_param (name, pkey))
+    return NULL;
+
+  if (gcry_sexp_build (&result, NULL,
+                       "(public-key(ecc(p%m)(a%m)(b%m)(g%m)(n%m)))",
+                       pkey[0], pkey[1], pkey[2], pkey[3], pkey[4]))
+    result = NULL;
+
+  for (i=0; pkey[i]; i++)
+    gcry_mpi_release (pkey[i]);
+
+  return result;
+}
diff --git a/cipher/ecc-misc.c b/cipher/ecc-misc.c
new file mode 100644
index 0000000..5e06bef
--- /dev/null
+++ b/cipher/ecc-misc.c
@@ -0,0 +1,183 @@
+/* ecc-misc.c  -  Elliptic Curve miscellaneous functions
+ * Copyright (C) 2007, 2008, 2010, 2011 Free Software Foundation, Inc.
+ * Copyright (C) 2013 g10 Code GmbH
+ *
+ * This file is part of Libgcrypt.
+ *
+ * Libgcrypt 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.
+ *
+ * Libgcrypt 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/>.
+ */
+
+#include <config.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include "g10lib.h"
+#include "mpi.h"
+#include "context.h"
+#include "ec-context.h"
+#include "ecc-common.h"
+
+
+/*
+ * Release a curve object.
+ */
+void
+_gcry_ecc_curve_free (elliptic_curve_t *E)
+{
+  mpi_free (E->p); E->p = NULL;
+  mpi_free (E->a); E->a = NULL;
+  mpi_free (E->b);  E->b = NULL;
+  _gcry_mpi_point_free_parts (&E->G);
+  mpi_free (E->n);  E->n = NULL;
+}
+
+
+/*
+ * Return a copy of a curve object.
+ */
+elliptic_curve_t
+_gcry_ecc_curve_copy (elliptic_curve_t E)
+{
+  elliptic_curve_t R;
+
+  R.p = mpi_copy (E.p);
+  R.a = mpi_copy (E.a);
+  R.b = mpi_copy (E.b);
+  _gcry_mpi_point_init (&R.G);
+  point_set (&R.G, &E.G);
+  R.n = mpi_copy (E.n);
+
+  return R;
+}
+
+
+gcry_mpi_t
+_gcry_ecc_ec2os (gcry_mpi_t x, gcry_mpi_t y, gcry_mpi_t p)
+{
+  gpg_error_t err;
+  int pbytes = (mpi_get_nbits (p)+7)/8;
+  size_t n;
+  unsigned char *buf, *ptr;
+  gcry_mpi_t result;
+
+  buf = gcry_xmalloc ( 1 + 2*pbytes );
+  *buf = 04; /* Uncompressed point.  */
+  ptr = buf+1;
+  err = gcry_mpi_print (GCRYMPI_FMT_USG, ptr, pbytes, &n, x);
+  if (err)
+    log_fatal ("mpi_print failed: %s\n", gpg_strerror (err));
+  if (n < pbytes)
+    {
+      memmove (ptr+(pbytes-n), ptr, n);
+      memset (ptr, 0, (pbytes-n));
+    }
+  ptr += pbytes;
+  err = gcry_mpi_print (GCRYMPI_FMT_USG, ptr, pbytes, &n, y);
+  if (err)
+    log_fatal ("mpi_print failed: %s\n", gpg_strerror (err));
+  if (n < pbytes)
+    {
+      memmove (ptr+(pbytes-n), ptr, n);
+      memset (ptr, 0, (pbytes-n));
+    }
+
+  err = gcry_mpi_scan (&result, GCRYMPI_FMT_USG, buf, 1+2*pbytes, NULL);
+  if (err)
+    log_fatal ("mpi_scan failed: %s\n", gpg_strerror (err));
+  gcry_free (buf);
+
+  return result;
+}
+
+
+/* Convert POINT into affine coordinates using the context CTX and
+   return a newly allocated MPI.  If the conversion is not possible
+   NULL is returned.  This function won't print an error message.  */
+gcry_mpi_t
+_gcry_mpi_ec_ec2os (gcry_mpi_point_t point, mpi_ec_t ectx)
+{
+  gcry_mpi_t g_x, g_y, result;
+
+  g_x = mpi_new (0);
+  g_y = mpi_new (0);
+  if (_gcry_mpi_ec_get_affine (g_x, g_y, point, ectx))
+    result = NULL;
+  else
+    result = _gcry_ecc_ec2os (g_x, g_y, ectx->p);
+  mpi_free (g_x);
+  mpi_free (g_y);
+
+  return result;
+}
+
+
+/* RESULT must have been initialized and is set on success to the
+   point given by VALUE.  */
+gcry_error_t
+_gcry_ecc_os2ec (mpi_point_t result, gcry_mpi_t value)
+{
+  gcry_error_t err;
+  size_t n;
+  unsigned char *buf;
+  gcry_mpi_t x, y;
+
+  n = (mpi_get_nbits (value)+7)/8;
+  buf = gcry_xmalloc (n);
+  err = gcry_mpi_print (GCRYMPI_FMT_USG, buf, n, &n, value);
+  if (err)
+    {
+      gcry_free (buf);
+      return err;
+    }
+  if (n < 1)
+    {
+      gcry_free (buf);
+      return GPG_ERR_INV_OBJ;
+    }
+  if (*buf != 4)
+    {
+      gcry_free (buf);
+      return GPG_ERR_NOT_IMPLEMENTED; /* No support for point compression.  */
+    }
+  if ( ((n-1)%2) )
+    {
+      gcry_free (buf);
+      return GPG_ERR_INV_OBJ;
+    }
+  n = (n-1)/2;
+  err = gcry_mpi_scan (&x, GCRYMPI_FMT_USG, buf+1, n, NULL);
+  if (err)
+    {
+      gcry_free (buf);
+      return err;
+    }
+  err = gcry_mpi_scan (&y, GCRYMPI_FMT_USG, buf+1+n, n, NULL);
+  gcry_free (buf);
+  if (err)
+    {
+      mpi_free (x);
+      return err;
+    }
+
+  mpi_set (result->x, x);
+  mpi_set (result->y, y);
+  mpi_set_ui (result->z, 1);
+
+  mpi_free (x);
+  mpi_free (y);
+
+  return 0;
+}
diff --git a/cipher/ecc.c b/cipher/ecc.c
index b694d76..9174f9b 100644
--- a/cipher/ecc.c
+++ b/cipher/ecc.c
@@ -47,11 +47,6 @@
   - In mpi/ec.c we use mpi_powm for x^2 mod p: Either implement a
     special case in mpi_powm or check whether mpi_mulm is faster.
 
-  - Split this up into several files.  For example the curve
-    management and gcry_mpi_ec_new are independent of the actual ECDSA
-    implementation.  This will also help to support optimized versions
-    of some curves.
-
 */
 
 
@@ -67,232 +62,7 @@
 #include "context.h"
 #include "ec-context.h"
 #include "pubkey-internal.h"
-
-/* Definition of a curve.  */
-typedef struct
-{
-  gcry_mpi_t p;         /* Prime specifying the field GF(p).  */
-  gcry_mpi_t a;         /* First coefficient of the Weierstrass equation.  */
-  gcry_mpi_t b;         /* Second coefficient of the Weierstrass equation.  */
-  mpi_point_struct G;   /* Base point (generator).  */
-  gcry_mpi_t n;         /* Order of G.  */
-  const char *name;     /* Name of the curve or NULL.  */
-} elliptic_curve_t;
-
-
-typedef struct
-{
-  elliptic_curve_t E;
-  mpi_point_struct Q; /* Q = [d]G  */
-} ECC_public_key;
-
-typedef struct
-{
-  elliptic_curve_t E;
-  mpi_point_struct Q;
-  gcry_mpi_t d;
-} ECC_secret_key;
-
-
-/* This tables defines aliases for curve names.  */
-static const struct
-{
-  const char *name;  /* Our name.  */
-  const char *other; /* Other name. */
-} curve_aliases[] =
-  {
-    { "NIST P-192", "1.2.840.10045.3.1.1" }, /* X9.62 OID  */
-    { "NIST P-192", "prime192v1" },          /* X9.62 name.  */
-    { "NIST P-192", "secp192r1"  },          /* SECP name.  */
-    { "NIST P-192", "nistp192"   },          /* rfc5656.  */
-
-    { "NIST P-224", "secp224r1" },
-    { "NIST P-224", "1.3.132.0.33" },        /* SECP OID.  */
-    { "NIST P-224", "nistp224"   },          /* rfc5656.  */
-
-    { "NIST P-256", "1.2.840.10045.3.1.7" }, /* From NIST SP 800-78-1.  */
-    { "NIST P-256", "prime256v1" },
-    { "NIST P-256", "secp256r1"  },
-    { "NIST P-256", "nistp256"   },          /* rfc5656.  */
-
-    { "NIST P-384", "secp384r1" },
-    { "NIST P-384", "1.3.132.0.34" },
-    { "NIST P-384", "nistp384"   },          /* rfc5656.  */
-
-    { "NIST P-521", "secp521r1" },
-    { "NIST P-521", "1.3.132.0.35" },
-    { "NIST P-521", "nistp521"   },          /* rfc5656.  */
-
-    { "brainpoolP160r1", "1.3.36.3.3.2.8.1.1.1" },
-    { "brainpoolP192r1", "1.3.36.3.3.2.8.1.1.3" },
-    { "brainpoolP224r1", "1.3.36.3.3.2.8.1.1.5" },
-    { "brainpoolP256r1", "1.3.36.3.3.2.8.1.1.7" },
-    { "brainpoolP320r1", "1.3.36.3.3.2.8.1.1.9" },
-    { "brainpoolP384r1", "1.3.36.3.3.2.8.1.1.11"},
-    { "brainpoolP512r1", "1.3.36.3.3.2.8.1.1.13"},
-
-    { NULL, NULL}
-  };
-
-typedef struct   {
-  const char *desc;           /* Description of the curve.  */
-  unsigned int nbits;         /* Number of bits.  */
-  unsigned int fips:1;        /* True if this is a FIPS140-2 approved curve. */
-  const char  *p;             /* Order of the prime field.  */
-  const char *a, *b;          /* The coefficients. */
-  const char *n;              /* The order of the base point.  */
-  const char *g_x, *g_y;      /* Base point.  */
-} ecc_domain_parms_t;
-
-/* This static table defines all available curves.  */
-static const ecc_domain_parms_t domain_parms[] =
-  {
-    {
-      "NIST P-192", 192, 1,
-      "0xfffffffffffffffffffffffffffffffeffffffffffffffff",
-      "0xfffffffffffffffffffffffffffffffefffffffffffffffc",
-      "0x64210519e59c80e70fa7e9ab72243049feb8deecc146b9b1",
-      "0xffffffffffffffffffffffff99def836146bc9b1b4d22831",
-
-      "0x188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012",
-      "0x07192b95ffc8da78631011ed6b24cdd573f977a11e794811"
-    },
-    {
-      "NIST P-224", 224, 1,
-      "0xffffffffffffffffffffffffffffffff000000000000000000000001",
-      "0xfffffffffffffffffffffffffffffffefffffffffffffffffffffffe",
-      "0xb4050a850c04b3abf54132565044b0b7d7bfd8ba270b39432355ffb4",
-      "0xffffffffffffffffffffffffffff16a2e0b8f03e13dd29455c5c2a3d" ,
-
-      "0xb70e0cbd6bb4bf7f321390b94a03c1d356c21122343280d6115c1d21",
-      "0xbd376388b5f723fb4c22dfe6cd4375a05a07476444d5819985007e34"
-    },
-    {
-      "NIST P-256", 256, 1,
-      "0xffffffff00000001000000000000000000000000ffffffffffffffffffffffff",
-      "0xffffffff00000001000000000000000000000000fffffffffffffffffffffffc",
-      "0x5ac635d8aa3a93e7b3ebbd55769886bc651d06b0cc53b0f63bce3c3e27d2604b",
-      "0xffffffff00000000ffffffffffffffffbce6faada7179e84f3b9cac2fc632551",
-
-      "0x6b17d1f2e12c4247f8bce6e563a440f277037d812deb33a0f4a13945d898c296",
-      "0x4fe342e2fe1a7f9b8ee7eb4a7c0f9e162bce33576b315ececbb6406837bf51f5"
-    },
-    {
-      "NIST P-384", 384, 1,
-      "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
-      "ffffffff0000000000000000ffffffff",
-      "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
-      "ffffffff0000000000000000fffffffc",
-      "0xb3312fa7e23ee7e4988e056be3f82d19181d9c6efe8141120314088f5013875a"
-      "c656398d8a2ed19d2a85c8edd3ec2aef",
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffc7634d81f4372ddf"
-      "581a0db248b0a77aecec196accc52973",
-
-      "0xaa87ca22be8b05378eb1c71ef320ad746e1d3b628ba79b9859f741e082542a38"
-      "5502f25dbf55296c3a545e3872760ab7",
-      "0x3617de4a96262c6f5d9e98bf9292dc29f8f41dbd289a147ce9da3113b5f0b8c0"
-      "0a60b1ce1d7e819d7a431d7c90ea0e5f"
-    },
-    {
-      "NIST P-521", 521, 1,
-      "0x01ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-      "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-      "0x01ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-      "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc",
-      "0x051953eb9618e1c9a1f929a21a0b68540eea2da725b99b315f3b8b489918ef10"
-      "9e156193951ec7e937b1652c0bd3bb1bf073573df883d2c34f1ef451fd46b503f00",
-      "0x1fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-      "ffa51868783bf2f966b7fcc0148f709a5d03bb5c9b8899c47aebb6fb71e91386409",
-
-      "0xc6858e06b70404e9cd9e3ecb662395b4429c648139053fb521f828af606b4d3d"
-      "baa14b5e77efe75928fe1dc127a2ffa8de3348b3c1856a429bf97e7e31c2e5bd66",
-      "0x11839296a789a3bc0045c8a5fb42c7d1bd998f54449579b446817afbd17273e6"
-      "62c97ee72995ef42640c550b9013fad0761353c7086a272c24088be94769fd16650"
-    },
-
-    { "brainpoolP160r1", 160, 0,
-      "0xe95e4a5f737059dc60dfc7ad95b3d8139515620f",
-      "0x340e7be2a280eb74e2be61bada745d97e8f7c300",
-      "0x1e589a8595423412134faa2dbdec95c8d8675e58",
-      "0xe95e4a5f737059dc60df5991d45029409e60fc09",
-      "0xbed5af16ea3f6a4f62938c4631eb5af7bdbcdbc3",
-      "0x1667cb477a1a8ec338f94741669c976316da6321"
-    },
-
-    { "brainpoolP192r1", 192, 0,
-      "0xc302f41d932a36cda7a3463093d18db78fce476de1a86297",
-      "0x6a91174076b1e0e19c39c031fe8685c1cae040e5c69a28ef",
-      "0x469a28ef7c28cca3dc721d044f4496bcca7ef4146fbf25c9",
-      "0xc302f41d932a36cda7a3462f9e9e916b5be8f1029ac4acc1",
-      "0xc0a0647eaab6a48753b033c56cb0f0900a2f5c4853375fd6",
-      "0x14b690866abd5bb88b5f4828c1490002e6773fa2fa299b8f"
-    },
-
-    { "brainpoolP224r1", 224, 0,
-      "0xd7c134aa264366862a18302575d1d787b09f075797da89f57ec8c0ff",
-      "0x68a5e62ca9ce6c1c299803a6c1530b514e182ad8b0042a59cad29f43",
-      "0x2580f63ccfe44138870713b1a92369e33e2135d266dbb372386c400b",
-      "0xd7c134aa264366862a18302575d0fb98d116bc4b6ddebca3a5a7939f",
-      "0x0d9029ad2c7e5cf4340823b2a87dc68c9e4ce3174c1e6efdee12c07d",
-      "0x58aa56f772c0726f24c6b89e4ecdac24354b9e99caa3f6d3761402cd"
-    },
-
-    { "brainpoolP256r1", 256, 0,
-      "0xa9fb57dba1eea9bc3e660a909d838d726e3bf623d52620282013481d1f6e5377",
-      "0x7d5a0975fc2c3057eef67530417affe7fb8055c126dc5c6ce94a4b44f330b5d9",
-      "0x26dc5c6ce94a4b44f330b5d9bbd77cbf958416295cf7e1ce6bccdc18ff8c07b6",
-      "0xa9fb57dba1eea9bc3e660a909d838d718c397aa3b561a6f7901e0e82974856a7",
-      "0x8bd2aeb9cb7e57cb2c4b482ffc81b7afb9de27e1e3bd23c23a4453bd9ace3262",
-      "0x547ef835c3dac4fd97f8461a14611dc9c27745132ded8e545c1d54c72f046997"
-    },
-
-    { "brainpoolP320r1", 320, 0,
-      "0xd35e472036bc4fb7e13c785ed201e065f98fcfa6f6f40def4f92b9ec7893ec28"
-      "fcd412b1f1b32e27",
-      "0x3ee30b568fbab0f883ccebd46d3f3bb8a2a73513f5eb79da66190eb085ffa9f4"
-      "92f375a97d860eb4",
-      "0x520883949dfdbc42d3ad198640688a6fe13f41349554b49acc31dccd88453981"
-      "6f5eb4ac8fb1f1a6",
-      "0xd35e472036bc4fb7e13c785ed201e065f98fcfa5b68f12a32d482ec7ee8658e9"
-      "8691555b44c59311",
-      "0x43bd7e9afb53d8b85289bcc48ee5bfe6f20137d10a087eb6e7871e2a10a599c7"
-      "10af8d0d39e20611",
-      "0x14fdd05545ec1cc8ab4093247f77275e0743ffed117182eaa9c77877aaac6ac7"
-      "d35245d1692e8ee1"
-    },
-
-    { "brainpoolP384r1", 384, 0,
-      "0x8cb91e82a3386d280f5d6f7e50e641df152f7109ed5456b412b1da197fb71123"
-      "acd3a729901d1a71874700133107ec53",
-      "0x7bc382c63d8c150c3c72080ace05afa0c2bea28e4fb22787139165efba91f90f"
-      "8aa5814a503ad4eb04a8c7dd22ce2826",
-      "0x04a8c7dd22ce28268b39b55416f0447c2fb77de107dcd2a62e880ea53eeb62d5"
-      "7cb4390295dbc9943ab78696fa504c11",
-      "0x8cb91e82a3386d280f5d6f7e50e641df152f7109ed5456b31f166e6cac0425a7"
-      "cf3ab6af6b7fc3103b883202e9046565",
-      "0x1d1c64f068cf45ffa2a63a81b7c13f6b8847a3e77ef14fe3db7fcafe0cbd10e8"
-      "e826e03436d646aaef87b2e247d4af1e",
-      "0x8abe1d7520f9c2a45cb1eb8e95cfd55262b70b29feec5864e19c054ff9912928"
-      "0e4646217791811142820341263c5315"
-    },
-
-    { "brainpoolP512r1", 512, 0,
-      "0xaadd9db8dbe9c48b3fd4e6ae33c9fc07cb308db3b3c9d20ed6639cca70330871"
-      "7d4d9b009bc66842aecda12ae6a380e62881ff2f2d82c68528aa6056583a48f3",
-      "0x7830a3318b603b89e2327145ac234cc594cbdd8d3df91610a83441caea9863bc"
-      "2ded5d5aa8253aa10a2ef1c98b9ac8b57f1117a72bf2c7b9e7c1ac4d77fc94ca",
-      "0x3df91610a83441caea9863bc2ded5d5aa8253aa10a2ef1c98b9ac8b57f1117a7"
-      "2bf2c7b9e7c1ac4d77fc94cadc083e67984050b75ebae5dd2809bd638016f723",
-      "0xaadd9db8dbe9c48b3fd4e6ae33c9fc07cb308db3b3c9d20ed6639cca70330870"
-      "553e5c414ca92619418661197fac10471db1d381085ddaddb58796829ca90069",
-      "0x81aee4bdd82ed9645a21322e9c4c6a9385ed9f70b5d916c1b43b62eef4d0098e"
-      "ff3b1f78e2d0d48d50d1687b93b97d5f7c6d5047406a5e688b352209bcb9f822",
-      "0x7dde385d566332ecc0eabfa9cf7822fdf209f70024a57b1aa000c55b881f8111"
-      "b2dcde494a5f485e5bca4bd88a2763aed1ca2b2fa8f0540678cd1e0f3ad80892"
-    },
-
-    { NULL, 0, 0, NULL, NULL, NULL, NULL }
-  };
+#include "ecc-common.h"
 
 
 /* Registered progress function and its callback value. */
@@ -303,7 +73,6 @@ static void *progress_cb_data;
 #define point_init(a)  _gcry_mpi_point_init ((a))
 #define point_free(a)  _gcry_mpi_point_free_parts ((a))
 
-
 

 /* Local prototypes. */
 static void test_keys (ECC_secret_key * sk, unsigned int nbits);
@@ -339,66 +108,6 @@ _gcry_register_pk_ecc_progress (void (*cb) (void *, const char *,
 
 

 
-/* Set the value from S into D.  */
-static void
-point_set (mpi_point_t d, mpi_point_t s)
-{
-  mpi_set (d->x, s->x);
-  mpi_set (d->y, s->y);
-  mpi_set (d->z, s->z);
-}
-
-
-/*
- * Release a curve object.
- */
-static void
-curve_free (elliptic_curve_t *E)
-{
-  mpi_free (E->p); E->p = NULL;
-  mpi_free (E->a); E->a = NULL;
-  mpi_free (E->b);  E->b = NULL;
-  point_free (&E->G);
-  mpi_free (E->n);  E->n = NULL;
-}
-
-
-/*
- * Return a copy of a curve object.
- */
-static elliptic_curve_t
-curve_copy (elliptic_curve_t E)
-{
-  elliptic_curve_t R;
-
-  R.p = mpi_copy (E.p);
-  R.a = mpi_copy (E.a);
-  R.b = mpi_copy (E.b);
-  point_init (&R.G);
-  point_set (&R.G, &E.G);
-  R.n = mpi_copy (E.n);
-
-  return R;
-}
-
-
-/* Helper to scan a hex string. */
-static gcry_mpi_t
-scanval (const char *string)
-{
-  gpg_error_t err;
-  gcry_mpi_t val;
-
-  err = gcry_mpi_scan (&val, GCRYMPI_FMT_HEX, string, 0, NULL);
-  if (err)
-    log_fatal ("scanning ECC parameter failed: %s\n", gpg_strerror (err));
-  return val;
-}
-
-
-
-

-
 /****************
  * Solve the right side of the equation that defines a curve.
  */
@@ -424,74 +133,6 @@ gen_y_2 (gcry_mpi_t x, elliptic_curve_t *base)
 }
 
 
-/* Generate the crypto system setup.  This function takes the NAME of
-   a curve or the desired number of bits and stores at R_CURVE the
-   parameters of the named curve or those of a suitable curve.  If
-   R_NBITS is not NULL, the chosen number of bits is stored there.  */
-static gpg_err_code_t
-fill_in_curve (unsigned int nbits, const char *name,
-               elliptic_curve_t *curve, unsigned int *r_nbits)
-{
-  int idx, aliasno;
-  const char *resname = NULL; /* Set to a found curve name.  */
-
-  if (name)
-    {
-      /* First check our native curves.  */
-      for (idx = 0; domain_parms[idx].desc; idx++)
-        if (!strcmp (name, domain_parms[idx].desc))
-          {
-            resname = domain_parms[idx].desc;
-            break;
-          }
-      /* If not found consult the alias table.  */
-      if (!domain_parms[idx].desc)
-        {
-          for (aliasno = 0; curve_aliases[aliasno].name; aliasno++)
-            if (!strcmp (name, curve_aliases[aliasno].other))
-              break;
-          if (curve_aliases[aliasno].name)
-            {
-              for (idx = 0; domain_parms[idx].desc; idx++)
-                if (!strcmp (curve_aliases[aliasno].name,
-                             domain_parms[idx].desc))
-                  {
-                    resname = domain_parms[idx].desc;
-                    break;
-                  }
-            }
-        }
-    }
-  else
-    {
-      for (idx = 0; domain_parms[idx].desc; idx++)
-        if (nbits == domain_parms[idx].nbits)
-          break;
-    }
-  if (!domain_parms[idx].desc)
-    return GPG_ERR_INV_VALUE;
-
-  /* In fips mode we only support NIST curves.  Note that it is
-     possible to bypass this check by specifying the curve parameters
-     directly.  */
-  if (fips_mode () && !domain_parms[idx].fips )
-    return GPG_ERR_NOT_SUPPORTED;
-
-  if (r_nbits)
-    *r_nbits = domain_parms[idx].nbits;
-  curve->p = scanval (domain_parms[idx].p);
-  curve->a = scanval (domain_parms[idx].a);
-  curve->b = scanval (domain_parms[idx].b);
-  curve->n = scanval (domain_parms[idx].n);
-  curve->G.x = scanval (domain_parms[idx].g_x);
-  curve->G.y = scanval (domain_parms[idx].g_y);
-  curve->G.z = mpi_alloc_set_ui (1);
-  curve->name = resname;
-
-  return 0;
-}
-
-
 /*
  * First obtain the setup.  Over the finite field randomize an scalar
  * secret value, and calculate the public point.
@@ -511,7 +152,7 @@ generate_key (ECC_secret_key *sk, unsigned int nbits, const char *name,
 
   *r_usedcurve = NULL;
 
-  err = fill_in_curve (nbits, name, &E, &nbits);
+  err = _gcry_ecc_fill_in_curve (nbits, name, &E, &nbits);
   if (err)
     return err;
 
@@ -605,7 +246,7 @@ generate_key (ECC_secret_key *sk, unsigned int nbits, const char *name,
   point_free (&Q);
 
   *r_usedcurve = E.name;
-  curve_free (&E);
+  _gcry_ecc_curve_free (&E);
 
   /* Now we can test our keys (this should never fail!).  */
   test_keys (sk, nbits - 64);
@@ -636,7 +277,7 @@ test_keys (ECC_secret_key *sk, unsigned int nbits)
 
   point_init (&R_);
 
-  pk.E = curve_copy (sk->E);
+  pk.E = _gcry_ecc_curve_copy (sk->E);
   point_init (&pk.Q);
   point_set (&pk.Q, &sk->Q);
 
@@ -654,7 +295,7 @@ test_keys (ECC_secret_key *sk, unsigned int nbits)
     log_debug ("ECDSA operation: sign, verify ok.\n");
 
   point_free (&pk.Q);
-  curve_free (&pk.E);
+  _gcry_ecc_curve_free (&pk.E);
 
   point_free (&R_);
   mpi_free (s);
@@ -728,7 +369,7 @@ check_secret_key (ECC_secret_key * sk)
       goto leave;
     }
 
-  /* Fast path for loaded secret keys - sk->Q is already in affine coordinates */
+  /* Fast path for loaded secret keys - Q is already in affine coordinates */
   if (!mpi_cmp_ui (sk->Q.z, 1))
     {
       if (mpi_cmp (x1, sk->Q.x) || mpi_cmp (y_2, sk->Q.y))
@@ -976,124 +617,6 @@ verify (gcry_mpi_t input, ECC_public_key *pkey, gcry_mpi_t r, gcry_mpi_t s)
 /*********************************************
  **************  interface  ******************
  *********************************************/
-static gcry_mpi_t
-ec2os (gcry_mpi_t x, gcry_mpi_t y, gcry_mpi_t p)
-{
-  gpg_error_t err;
-  int pbytes = (mpi_get_nbits (p)+7)/8;
-  size_t n;
-  unsigned char *buf, *ptr;
-  gcry_mpi_t result;
-
-  buf = gcry_xmalloc ( 1 + 2*pbytes );
-  *buf = 04; /* Uncompressed point.  */
-  ptr = buf+1;
-  err = gcry_mpi_print (GCRYMPI_FMT_USG, ptr, pbytes, &n, x);
-  if (err)
-    log_fatal ("mpi_print failed: %s\n", gpg_strerror (err));
-  if (n < pbytes)
-    {
-      memmove (ptr+(pbytes-n), ptr, n);
-      memset (ptr, 0, (pbytes-n));
-    }
-  ptr += pbytes;
-  err = gcry_mpi_print (GCRYMPI_FMT_USG, ptr, pbytes, &n, y);
-  if (err)
-    log_fatal ("mpi_print failed: %s\n", gpg_strerror (err));
-  if (n < pbytes)
-    {
-      memmove (ptr+(pbytes-n), ptr, n);
-      memset (ptr, 0, (pbytes-n));
-    }
-
-  err = gcry_mpi_scan (&result, GCRYMPI_FMT_USG, buf, 1+2*pbytes, NULL);
-  if (err)
-    log_fatal ("mpi_scan failed: %s\n", gpg_strerror (err));
-  gcry_free (buf);
-
-  return result;
-}
-
-
-/* Convert POINT into affine coordinates using the context CTX and
-   return a newly allocated MPI.  If the conversion is not possible
-   NULL is returned.  This function won't print an error message.  */
-gcry_mpi_t
-_gcry_mpi_ec_ec2os (gcry_mpi_point_t point, mpi_ec_t ectx)
-{
-  gcry_mpi_t g_x, g_y, result;
-
-  g_x = mpi_new (0);
-  g_y = mpi_new (0);
-  if (_gcry_mpi_ec_get_affine (g_x, g_y, point, ectx))
-    result = NULL;
-  else
-    result = ec2os (g_x, g_y, ectx->p);
-  mpi_free (g_x);
-  mpi_free (g_y);
-
-  return result;
-}
-
-
-/* RESULT must have been initialized and is set on success to the
-   point given by VALUE.  */
-static gcry_error_t
-os2ec (mpi_point_t result, gcry_mpi_t value)
-{
-  gcry_error_t err;
-  size_t n;
-  unsigned char *buf;
-  gcry_mpi_t x, y;
-
-  n = (mpi_get_nbits (value)+7)/8;
-  buf = gcry_xmalloc (n);
-  err = gcry_mpi_print (GCRYMPI_FMT_USG, buf, n, &n, value);
-  if (err)
-    {
-      gcry_free (buf);
-      return err;
-    }
-  if (n < 1)
-    {
-      gcry_free (buf);
-      return GPG_ERR_INV_OBJ;
-    }
-  if (*buf != 4)
-    {
-      gcry_free (buf);
-      return GPG_ERR_NOT_IMPLEMENTED; /* No support for point compression.  */
-    }
-  if ( ((n-1)%2) )
-    {
-      gcry_free (buf);
-      return GPG_ERR_INV_OBJ;
-    }
-  n = (n-1)/2;
-  err = gcry_mpi_scan (&x, GCRYMPI_FMT_USG, buf+1, n, NULL);
-  if (err)
-    {
-      gcry_free (buf);
-      return err;
-    }
-  err = gcry_mpi_scan (&y, GCRYMPI_FMT_USG, buf+1+n, n, NULL);
-  gcry_free (buf);
-  if (err)
-    {
-      mpi_free (x);
-      return err;
-    }
-
-  mpi_set (result->x, x);
-  mpi_set (result->y, y);
-  mpi_set_ui (result->z, 1);
-
-  mpi_free (x);
-  mpi_free (y);
-
-  return 0;
-}
-
 
 /* Extended version of ecc_generate.  */
 static gcry_err_code_t
@@ -1153,9 +676,9 @@ ecc_generate_ext (int algo, unsigned int nbits, unsigned long evalue,
   skey[0] = sk.E.p;
   skey[1] = sk.E.a;
   skey[2] = sk.E.b;
-  skey[3] = ec2os (g_x, g_y, sk.E.p);
+  skey[3] = _gcry_ecc_ec2os (g_x, g_y, sk.E.p);
   skey[4] = sk.E.n;
-  skey[5] = ec2os (q_x, q_y, sk.E.p);
+  skey[5] = _gcry_ecc_ec2os (q_x, q_y, sk.E.p);
   skey[6] = sk.d;
 
   mpi_free (g_x);
@@ -1195,150 +718,6 @@ ecc_generate (int algo, unsigned int nbits, unsigned long evalue,
 }
 
 
-/* Return the parameters of the curve NAME in an MPI array.  */
-static gcry_err_code_t
-ecc_get_param (const char *name, gcry_mpi_t *pkey)
-{
-  gpg_err_code_t err;
-  unsigned int nbits;
-  elliptic_curve_t E;
-  mpi_ec_t ctx;
-  gcry_mpi_t g_x, g_y;
-
-  err = fill_in_curve (0, name, &E, &nbits);
-  if (err)
-    return err;
-
-  g_x = mpi_new (0);
-  g_y = mpi_new (0);
-  ctx = _gcry_mpi_ec_p_internal_new (E.p, E.a);
-  if (_gcry_mpi_ec_get_affine (g_x, g_y, &E.G, ctx))
-    log_fatal ("ecc get param: Failed to get affine coordinates\n");
-  _gcry_mpi_ec_free (ctx);
-  point_free (&E.G);
-
-  pkey[0] = E.p;
-  pkey[1] = E.a;
-  pkey[2] = E.b;
-  pkey[3] = ec2os (g_x, g_y, E.p);
-  pkey[4] = E.n;
-  pkey[5] = NULL;
-
-  mpi_free (g_x);
-  mpi_free (g_y);
-
-  return 0;
-}
-
-
-/* Return the parameters of the curve NAME as an S-expression.  */
-static gcry_sexp_t
-ecc_get_param_sexp (const char *name)
-{
-  gcry_mpi_t pkey[6];
-  gcry_sexp_t result;
-  int i;
-
-  if (ecc_get_param (name, pkey))
-    return NULL;
-
-  if (gcry_sexp_build (&result, NULL,
-                       "(public-key(ecc(p%m)(a%m)(b%m)(g%m)(n%m)))",
-                       pkey[0], pkey[1], pkey[2], pkey[3], pkey[4]))
-    result = NULL;
-
-  for (i=0; pkey[i]; i++)
-    gcry_mpi_release (pkey[i]);
-
-  return result;
-}
-
-
-/* Return the name matching the parameters in PKEY.  */
-static const char *
-ecc_get_curve (gcry_mpi_t *pkey, int iterator, unsigned int *r_nbits)
-{
-  gpg_err_code_t err;
-  elliptic_curve_t E;
-  int idx;
-  gcry_mpi_t tmp;
-  const char *result = NULL;
-
-  if (r_nbits)
-    *r_nbits = 0;
-
-  if (!pkey)
-    {
-      idx = iterator;
-      if (idx >= 0 && idx < DIM (domain_parms))
-        {
-          result = domain_parms[idx].desc;
-          if (r_nbits)
-            *r_nbits = domain_parms[idx].nbits;
-        }
-      return result;
-    }
-
-  if (!pkey[0] || !pkey[1] || !pkey[2] || !pkey[3] || !pkey[4])
-    return NULL;
-
-  E.p = pkey[0];
-  E.a = pkey[1];
-  E.b = pkey[2];
-  point_init (&E.G);
-  err = os2ec (&E.G, pkey[3]);
-  if (err)
-    {
-      point_free (&E.G);
-      return NULL;
-    }
-  E.n = pkey[4];
-
-  for (idx = 0; domain_parms[idx].desc; idx++)
-    {
-      tmp = scanval (domain_parms[idx].p);
-      if (!mpi_cmp (tmp, E.p))
-        {
-          mpi_free (tmp);
-          tmp = scanval (domain_parms[idx].a);
-          if (!mpi_cmp (tmp, E.a))
-            {
-              mpi_free (tmp);
-              tmp = scanval (domain_parms[idx].b);
-              if (!mpi_cmp (tmp, E.b))
-                {
-                  mpi_free (tmp);
-                  tmp = scanval (domain_parms[idx].n);
-                  if (!mpi_cmp (tmp, E.n))
-                    {
-                      mpi_free (tmp);
-                      tmp = scanval (domain_parms[idx].g_x);
-                      if (!mpi_cmp (tmp, E.G.x))
-                        {
-                          mpi_free (tmp);
-                          tmp = scanval (domain_parms[idx].g_y);
-                          if (!mpi_cmp (tmp, E.G.y))
-                            {
-                              mpi_free (tmp);
-                              result = domain_parms[idx].desc;
-                              if (r_nbits)
-                                *r_nbits = domain_parms[idx].nbits;
-                              break;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-      mpi_free (tmp);
-    }
-
-  point_free (&E.G);
-
-  return result;
-}
-
-
 static gcry_err_code_t
 ecc_check_secret_key (int algo, gcry_mpi_t *skey)
 {
@@ -1356,7 +735,7 @@ ecc_check_secret_key (int algo, gcry_mpi_t *skey)
   sk.E.a = skey[1];
   sk.E.b = skey[2];
   point_init (&sk.E.G);
-  err = os2ec (&sk.E.G, skey[3]);
+  err = _gcry_ecc_os2ec (&sk.E.G, skey[3]);
   if (err)
     {
       point_free (&sk.E.G);
@@ -1364,7 +743,7 @@ ecc_check_secret_key (int algo, gcry_mpi_t *skey)
     }
   sk.E.n = skey[4];
   point_init (&sk.Q);
-  err = os2ec (&sk.Q, skey[5]);
+  err = _gcry_ecc_os2ec (&sk.Q, skey[5]);
   if (err)
     {
       point_free (&sk.E.G);
@@ -1403,7 +782,7 @@ ecc_sign (int algo, gcry_mpi_t *resarr, gcry_mpi_t data, gcry_mpi_t *skey,
   sk.E.a = skey[1];
   sk.E.b = skey[2];
   point_init (&sk.E.G);
-  err = os2ec (&sk.E.G, skey[3]);
+  err = _gcry_ecc_os2ec (&sk.E.G, skey[3]);
   if (err)
     {
       point_free (&sk.E.G);
@@ -1446,7 +825,7 @@ ecc_verify (int algo, gcry_mpi_t hash, gcry_mpi_t *data, gcry_mpi_t *pkey,
   pk.E.a = pkey[1];
   pk.E.b = pkey[2];
   point_init (&pk.E.G);
-  err = os2ec (&pk.E.G, pkey[3]);
+  err = _gcry_ecc_os2ec (&pk.E.G, pkey[3]);
   if (err)
     {
       point_free (&pk.E.G);
@@ -1454,7 +833,7 @@ ecc_verify (int algo, gcry_mpi_t hash, gcry_mpi_t *data, gcry_mpi_t *pkey,
     }
   pk.E.n = pkey[4];
   point_init (&pk.Q);
-  err = os2ec (&pk.Q, pkey[5]);
+  err = _gcry_ecc_os2ec (&pk.Q, pkey[5]);
   if (err)
     {
       point_free (&pk.E.G);
@@ -1538,7 +917,7 @@ ecc_encrypt_raw (int algo, gcry_mpi_t *resarr, gcry_mpi_t k,
   pk.E.a = pkey[1];
   pk.E.b = pkey[2];
   point_init (&pk.E.G);
-  err = os2ec (&pk.E.G, pkey[3]);
+  err = _gcry_ecc_os2ec (&pk.E.G, pkey[3]);
   if (err)
     {
       point_free (&pk.E.G);
@@ -1546,7 +925,7 @@ ecc_encrypt_raw (int algo, gcry_mpi_t *resarr, gcry_mpi_t k,
     }
   pk.E.n = pkey[4];
   point_init (&pk.Q);
-  err = os2ec (&pk.Q, pkey[5]);
+  err = _gcry_ecc_os2ec (&pk.Q, pkey[5]);
   if (err)
     {
       point_free (&pk.E.G);
@@ -1572,7 +951,7 @@ ecc_encrypt_raw (int algo, gcry_mpi_t *resarr, gcry_mpi_t k,
     if (_gcry_mpi_ec_get_affine (x, y, &R, ctx))
       log_fatal ("ecdh: Failed to get affine coordinates for kdG\n");
 
-    result[0] = ec2os (x, y, pk.E.p);
+    result[0] = _gcry_ecc_ec2os (x, y, pk.E.p);
 
     /* R = kG */
     _gcry_mpi_ec_mul_point (&R, k, &pk.E.G, ctx);
@@ -1580,7 +959,7 @@ ecc_encrypt_raw (int algo, gcry_mpi_t *resarr, gcry_mpi_t k,
     if (_gcry_mpi_ec_get_affine (x, y, &R, ctx))
       log_fatal ("ecdh: Failed to get affine coordinates for kG\n");
 
-    result[1] = ec2os (x, y, pk.E.p);
+    result[1] = _gcry_ecc_ec2os (x, y, pk.E.p);
 
     mpi_free (x);
     mpi_free (y);
@@ -1635,7 +1014,7 @@ ecc_decrypt_raw (int algo, gcry_mpi_t *result, gcry_mpi_t *data,
     return GPG_ERR_BAD_MPI;
 
   point_init (&kG);
-  err = os2ec (&kG, data[0]);
+  err = _gcry_ecc_os2ec (&kG, data[0]);
   if (err)
     {
       point_free (&kG);
@@ -1647,7 +1026,7 @@ ecc_decrypt_raw (int algo, gcry_mpi_t *result, gcry_mpi_t *data,
   sk.E.a = skey[1];
   sk.E.b = skey[2];
   point_init (&sk.E.G);
-  err = os2ec (&sk.E.G, skey[3]);
+  err = _gcry_ecc_os2ec (&sk.E.G, skey[3]);
   if (err)
     {
       point_free (&kG);
@@ -1656,7 +1035,7 @@ ecc_decrypt_raw (int algo, gcry_mpi_t *result, gcry_mpi_t *data,
     }
   sk.E.n = skey[4];
   point_init (&sk.Q);
-  err = os2ec (&sk.Q, skey[5]);
+  err = _gcry_ecc_os2ec (&sk.Q, skey[5]);
   if (err)
     {
       point_free (&kG);
@@ -1684,7 +1063,7 @@ ecc_decrypt_raw (int algo, gcry_mpi_t *result, gcry_mpi_t *data,
     if (_gcry_mpi_ec_get_affine (x, y, &R, ctx))
       log_fatal ("ecdh: Failed to get affine coordinates\n");
 
-    r = ec2os (x, y, sk.E.p);
+    r = _gcry_ecc_ec2os (x, y, sk.E.p);
     mpi_free (x);
     mpi_free (y);
   }
@@ -1764,7 +1143,7 @@ compute_keygrip (gcry_md_hd_t md, gcry_sexp_t keyparam)
           ec = GPG_ERR_INV_OBJ; /* Name missing or out of core. */
           goto leave;
         }
-      ec = ecc_get_param (curve, tmpvalues);
+      ec = _gcry_ecc_get_param (curve, tmpvalues);
       gcry_free (curve);
       if (ec)
         goto leave;
@@ -1824,274 +1203,6 @@ compute_keygrip (gcry_md_hd_t md, gcry_sexp_t keyparam)
    Low-level API helper functions.
  */
 
-/* Helper to extract an MPI from key parameters.  */
-static gpg_err_code_t
-mpi_from_keyparam (gcry_mpi_t *r_a, gcry_sexp_t keyparam, const char *name)
-{
-  gcry_err_code_t ec = 0;
-  gcry_sexp_t l1;
-
-  l1 = gcry_sexp_find_token (keyparam, name, 0);
-  if (l1)
-    {
-      *r_a = gcry_sexp_nth_mpi (l1, 1, GCRYMPI_FMT_USG);
-      gcry_sexp_release (l1);
-      if (!*r_a)
-        ec = GPG_ERR_INV_OBJ;
-    }
-  return ec;
-}
-
-/* Helper to extract a point from key parameters.  If no parameter
-   with NAME is found, the functions tries to find a non-encoded point
-   by appending ".x", ".y" and ".z" to NAME.  ".z" is in this case
-   optional and defaults to 1.  */
-static gpg_err_code_t
-point_from_keyparam (gcry_mpi_point_t *r_a,
-                     gcry_sexp_t keyparam, const char *name)
-{
-  gcry_err_code_t ec;
-  gcry_mpi_t a = NULL;
-  gcry_mpi_point_t point;
-
-  ec = mpi_from_keyparam (&a, keyparam, name);
-  if (ec)
-    return ec;
-
-  if (a)
-    {
-      point = gcry_mpi_point_new (0);
-      ec = os2ec (point, a);
-      mpi_free (a);
-      if (ec)
-        {
-          gcry_mpi_point_release (point);
-          return ec;
-        }
-    }
-  else
-    {
-      char *tmpname;
-      gcry_mpi_t x = NULL;
-      gcry_mpi_t y = NULL;
-      gcry_mpi_t z = NULL;
-
-      tmpname = gcry_malloc (strlen (name) + 2 + 1);
-      if (!tmpname)
-        return gpg_err_code_from_syserror ();
-      strcpy (stpcpy (tmpname, name), ".x");
-      ec = mpi_from_keyparam (&x, keyparam, tmpname);
-      if (ec)
-        {
-          gcry_free (tmpname);
-          return ec;
-        }
-      strcpy (stpcpy (tmpname, name), ".y");
-      ec = mpi_from_keyparam (&y, keyparam, tmpname);
-      if (ec)
-        {
-          mpi_free (x);
-          gcry_free (tmpname);
-          return ec;
-        }
-      strcpy (stpcpy (tmpname, name), ".z");
-      ec = mpi_from_keyparam (&z, keyparam, tmpname);
-      if (ec)
-        {
-          mpi_free (y);
-          mpi_free (x);
-          gcry_free (tmpname);
-          return ec;
-        }
-      if (!z)
-        z = mpi_set_ui (NULL, 1);
-      if (x && y)
-        point = gcry_mpi_point_snatch_set (NULL, x, y, z);
-      else
-        {
-          mpi_free (x);
-          mpi_free (y);
-          mpi_free (z);
-          point = NULL;
-        }
-      gcry_free (tmpname);
-    }
-
-  if (point)
-    *r_a = point;
-  return 0;
-}
-
-
-/* This function creates a new context for elliptic curve operations.
-   Either KEYPARAM or CURVENAME must be given.  If both are given and
-   KEYPARAM has no curve parameter CURVENAME is used to add missing
-   parameters.  On success 0 is returned and the new context stored at
-   R_CTX.  On error NULL is stored at R_CTX and an error code is
-   returned.  The context needs to be released using
-   gcry_ctx_release.  */
-gpg_err_code_t
-_gcry_mpi_ec_new (gcry_ctx_t *r_ctx,
-                  gcry_sexp_t keyparam, const char *curvename)
-{
-  gpg_err_code_t errc;
-  gcry_ctx_t ctx = NULL;
-  gcry_mpi_t p = NULL;
-  gcry_mpi_t a = NULL;
-  gcry_mpi_t b = NULL;
-  gcry_mpi_point_t G = NULL;
-  gcry_mpi_t n = NULL;
-  gcry_mpi_point_t Q = NULL;
-  gcry_mpi_t d = NULL;
-  gcry_sexp_t l1;
-
-  *r_ctx = NULL;
-
-  if (keyparam)
-    {
-      errc = mpi_from_keyparam (&p, keyparam, "p");
-      if (errc)
-        goto leave;
-      errc = mpi_from_keyparam (&a, keyparam, "a");
-      if (errc)
-        goto leave;
-      errc = mpi_from_keyparam (&b, keyparam, "b");
-      if (errc)
-        goto leave;
-      errc = point_from_keyparam (&G, keyparam, "g");
-      if (errc)
-        goto leave;
-      errc = mpi_from_keyparam (&n, keyparam, "n");
-      if (errc)
-        goto leave;
-      errc = point_from_keyparam (&Q, keyparam, "q");
-      if (errc)
-        goto leave;
-      errc = mpi_from_keyparam (&d, keyparam, "d");
-      if (errc)
-        goto leave;
-    }
-
-
-  /* Check whether a curve parameter is available and use that to fill
-     in missing values.  If no curve parameter is available try an
-     optional provided curvename.  If only the curvename has been
-     given use that one. */
-  if (keyparam)
-    l1 = gcry_sexp_find_token (keyparam, "curve", 5);
-  else
-    l1 = NULL;
-  if (l1 || curvename)
-    {
-      char *name;
-      elliptic_curve_t *E;
-
-      if (l1)
-        {
-          name = _gcry_sexp_nth_string (l1, 1);
-          gcry_sexp_release (l1);
-          if (!name)
-            {
-              errc = GPG_ERR_INV_OBJ; /* Name missing or out of core. */
-              goto leave;
-            }
-        }
-      else
-        name = NULL;
-
-      E = gcry_calloc (1, sizeof *E);
-      if (!E)
-        {
-          errc = gpg_err_code_from_syserror ();
-          gcry_free (name);
-          goto leave;
-        }
-
-      errc = fill_in_curve (0, name? name : curvename, E, NULL);
-      gcry_free (name);
-      if (errc)
-        {
-          gcry_free (E);
-          goto leave;
-        }
-
-      if (!p)
-        {
-          p = E->p;
-          E->p = NULL;
-        }
-      if (!a)
-        {
-          a = E->a;
-          E->a = NULL;
-        }
-      if (!b)
-        {
-          b = E->b;
-          E->b = NULL;
-        }
-      if (!G)
-        {
-          G = gcry_mpi_point_snatch_set (NULL, E->G.x, E->G.y, E->G.z);
-          E->G.x = NULL;
-          E->G.y = NULL;
-          E->G.z = NULL;
-        }
-      if (!n)
-        {
-          n = E->n;
-          E->n = NULL;
-        }
-      curve_free (E);
-      gcry_free (E);
-    }
-
-  errc = _gcry_mpi_ec_p_new (&ctx, p, a);
-  if (!errc)
-    {
-      mpi_ec_t ec = _gcry_ctx_get_pointer (ctx, CONTEXT_TYPE_EC);
-
-      if (b)
-        {
-          ec->b = b;
-          b = NULL;
-        }
-      if (G)
-        {
-          ec->G = G;
-          G = NULL;
-        }
-      if (n)
-        {
-          ec->n = n;
-          n = NULL;
-        }
-      if (Q)
-        {
-          ec->Q = Q;
-          Q = NULL;
-        }
-      if (d)
-        {
-          ec->d = d;
-          d = NULL;
-        }
-
-      *r_ctx = ctx;
-    }
-
- leave:
-  mpi_free (p);
-  mpi_free (a);
-  mpi_free (b);
-  gcry_mpi_point_release (G);
-  mpi_free (n);
-  gcry_mpi_point_release (Q);
-  mpi_free (d);
-  return errc;
-}
-
-
 /* This is the wroker function for gcry_pubkey_get_sexp for ECC
    algorithms.  Note that the caller has already stored NULL at
    R_SEXP.  */
@@ -2264,7 +1375,7 @@ pk_extra_spec_t _gcry_pubkey_extraspec_ecdsa =
     run_selftests,
     ecc_generate_ext,
     compute_keygrip,
-    ecc_get_param,
-    ecc_get_curve,
-    ecc_get_param_sexp
+    _gcry_ecc_get_param,
+    _gcry_ecc_get_curve,
+    _gcry_ecc_get_param_sexp
   };
diff --git a/configure.ac b/configure.ac
index f20d0a1..b54b4d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1452,7 +1452,8 @@ fi
 
 LIST_MEMBER(ecc, $enabled_pubkey_ciphers)
 if test "$found" = "1" ; then
-   GCRYPT_PUBKEY_CIPHERS="$GCRYPT_PUBKEY_CIPHERS ecc.lo"
+   GCRYPT_PUBKEY_CIPHERS="$GCRYPT_PUBKEY_CIPHERS \
+                          ecc.lo ecc-curves.lo ecc-misc.lo"
    AC_DEFINE(USE_ECC, 1, [Defined if this module should be included])
 fi
 

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

Summary of changes:
 cipher/Makefile.am  |    2 +-
 cipher/ecc-common.h |   80 +++++
 cipher/ecc-curves.c |  731 +++++++++++++++++++++++++++++++++++++++
 cipher/ecc-misc.c   |  183 ++++++++++
 cipher/ecc.c        |  939 ++-------------------------------------------------
 configure.ac        |    3 +-
 mpi/mpicoder.c      |   36 ++-
 tests/Makefile.am   |    2 +-
 tests/t-convert.c   |  160 +++++++++
 9 files changed, 1210 insertions(+), 926 deletions(-)
 create mode 100644 cipher/ecc-common.h
 create mode 100644 cipher/ecc-curves.c
 create mode 100644 cipher/ecc-misc.c
 create mode 100644 tests/t-convert.c


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