[git] GnuPG - branch, master, updated. gnupg-2.1.14-55-gebf24e3

by NIIBE Yutaka cvs at cvs.gnupg.org
Tue Aug 9 04:54:57 CEST 2016


This is an 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  ebf24e3b29766595204355d82f435a3e675bfbbc (commit)
      from  491d6fdabb3d95905cd96d905e1f965ce8ff07e1 (commit)

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

- Log -----------------------------------------------------------------
commit ebf24e3b29766595204355d82f435a3e675bfbbc
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Aug 9 11:42:20 2016 +0900

    agent: SSH support improvement.
    
    * agent/command-ssh.c (ssh_handler_request_identities): Skip a key with
    error, not giving up to handle the request itself.
    * agent/cvt-openpgp.c (extract_private_key): Support "ecdsa" key.
    
    --
    
    Note that "ecdsa" key is still in use by old versions of gpg-agent
    through its SSH handling (until 2.1.14).  With old versions of
    gpg-agent, adding ECDSA key by ssh-add command, "ecdsa" key will be
    created.  So, "ecdsa" key should be supported.
    
    For g10/gpg, "ecdsa" and "ecdh" was only used in some experimental
    versions of libgcrypt, with parameters.  We now use "ecc" for all cases
    in released versions.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index df38ad6..b01cc06 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -2618,7 +2618,7 @@ ssh_handler_request_identities (ctrl_t ctrl,
       if (err)
         {
           log_error ("failed to read the public key\n");
-          goto out;
+          continue;
         }
 
       err = ssh_send_key_public (key_blobs, key_public, NULL);
diff --git a/agent/cvt-openpgp.c b/agent/cvt-openpgp.c
index 40d9a3e..eb420b0 100644
--- a/agent/cvt-openpgp.c
+++ b/agent/cvt-openpgp.c
@@ -1271,7 +1271,7 @@ extract_private_key (gcry_sexp_t s_key, int req_private_key_data,
                                      array+0, array+1, array+2, array+3,
                                      array+4, NULL);
     }
-  else if (!strcmp (name, "ecc"))
+  else if (!strcmp (name, "ecc") || !strcmp (name, "ecdsa"))
     {
       algoname = "ecc";
       format = "qd?";

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

Summary of changes:
 agent/command-ssh.c | 2 +-
 agent/cvt-openpgp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


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




More information about the Gnupg-commits mailing list