[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-288-g0ee66a6

[by NIIBE Yutaka]

This is an 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  0ee66a6f66d7389e381fffa5f9eedbc8de9add10 (commit)
       via  9c731bbedfd8bded5efd886304c5ca6655768c45 (commit)
       via  c5e41f539b9a21cbad10c7dae95572a4445d31c3 (commit)
      from  927377bc91288d121a7d8bdbb3c32d8fc728e9fb (commit)

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

- Log -----------------------------------------------------------------
commit 0ee66a6f66d7389e381fffa5f9eedbc8de9add10
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Jan 16 10:00:17 2014 +0900

    agent: Not remove SSH socket when already running.
    
    * agent/gpg-agent.c (main): Defer setting of socket_name_ssh to avoid
    removal of the socket when it will die in create_server_socket for
    socket_name.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index ed664ea..1e60717 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -1045,13 +1045,14 @@ main (int argc, char **argv )
       /* Create the sockets.  */
       socket_name = create_socket_name
         (GPG_AGENT_SOCK_NAME, "gpg-XXXXXX/"GPG_AGENT_SOCK_NAME);
-      if (opt.ssh_support)
-	socket_name_ssh = create_socket_name
-          (GPG_AGENT_SSH_SOCK_NAME, "gpg-XXXXXX/"GPG_AGENT_SSH_SOCK_NAME);
 
       fd = create_server_socket (socket_name, 0, &socket_nonce);
       if (opt.ssh_support)
-	fd_ssh = create_server_socket (socket_name_ssh, 1, &socket_nonce_ssh);
+        {
+          socket_name_ssh = create_socket_name
+            (GPG_AGENT_SSH_SOCK_NAME, "gpg-XXXXXX/"GPG_AGENT_SSH_SOCK_NAME);
+          fd_ssh = create_server_socket (socket_name_ssh, 1, &socket_nonce_ssh);
+        }
       else
 	fd_ssh = GNUPG_INVALID_FD;
 

commit 9c731bbedfd8bded5efd886304c5ca6655768c45
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Jan 16 09:07:11 2014 +0900

    agent: Fix agent_is_eddsa_key.
    
    * agent/findkey.c (agent_is_eddsa_key): Implemented.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/agent/findkey.c b/agent/findkey.c
index aa2c6a2..6464b02 100644
--- a/agent/findkey.c
+++ b/agent/findkey.c
@@ -812,14 +812,10 @@ agent_is_eddsa_key (gcry_sexp_t s_key)
     return 0;
 
   if (key_parms_from_sexp (s_key, NULL, algoname, sizeof algoname, NULL, 0))
-    return 0; /* Error - assume it is not an DSA key.  */
+    return 0; /* Error - assume it is not an EdDSA key.  */
 
-  if (!strcmp (algoname, "dsa"))
-    return GCRY_PK_DSA;
-  else if (!strcmp (algoname, "ecc"))
-    return GCRY_PK_ECDSA; /* FIXME: Check for the EdDSA flag.  */
-  else if (!strcmp (algoname, "ecdsa"))
-    return GCRY_PK_ECDSA;
+  if (!strcmp (algoname, "eddsa"))
+    return 1;
   else
     return 0;
 }

commit c5e41f539b9a21cbad10c7dae95572a4445d31c3
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Wed Jan 15 15:00:24 2014 +0900

    Add secp256k1.
    
    * common/openpgp-oid.c (openpgp_curve_to_oid): Add secp256k1.
    (openpgp_oid_to_curve): Likewise.
    
    * g10/keygen.c (ask_curve): Add secp256k1.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/common/openpgp-oid.c b/common/openpgp-oid.c
index 05b1a40..28567b7 100644
--- a/common/openpgp-oid.c
+++ b/common/openpgp-oid.c
@@ -310,6 +310,11 @@ openpgp_curve_to_oid (const char *name, unsigned int *r_nbits)
       oidstr =  "1.3.36.3.3.2.8.1.1.13";
       nbits = 512;
     }
+  else if (!strcmp (name, "secp256k1"))
+    {
+      oidstr =  "1.3.132.0.10";
+      nbits = 256;
+    }
   else
     oidstr = NULL;
 
@@ -333,6 +338,8 @@ openpgp_oid_to_curve (const char *oid)
     name = "Ed25519";
   else if (!strcmp (oid, "1.2.840.10045.3.1.7"))
     name = "nistp256";
+  else if (!strcmp (oid, "1.3.132.0.10"))
+    name = "secp256k1";
   else if (!strcmp (oid, "1.3.132.0.34"))
     name = "nistp384";
   else if (!strcmp (oid, "1.3.132.0.35"))
diff --git a/g10/keygen.c b/g10/keygen.c
index 4bb8bba..7582b0b 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -2062,6 +2062,7 @@ ask_curve (void)
     { "brainpoolP256r1", 0, 1, "Brainpool P-256" },
     { "brainpoolP384r1", 0, 1, "Brainpool P-384" },
     { "brainpoolP512r1", 0, 1, "Brainpool P-512" },
+    { "secp256k1", 0, 1 },
   };
   int idx;
   char *answer;

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

Summary of changes:
 agent/findkey.c      |   10 +++-------
 agent/gpg-agent.c    |    9 +++++----
 common/openpgp-oid.c |    7 +++++++
 g10/keygen.c         |    1 +
 4 files changed, 16 insertions(+), 11 deletions(-)


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