summaryrefslogtreecommitdiffstats
path: root/agent/cvt-openpgp.c
diff options
context:
space:
mode:
authorNIIBE Yutaka <gniibe@fsij.org>2016-08-09 04:42:20 +0200
committerNIIBE Yutaka <gniibe@fsij.org>2016-08-09 04:42:20 +0200
commitebf24e3b29766595204355d82f435a3e675bfbbc (patch)
treeca74a0e19ae9c8c31c7cd2f29091373367520363 /agent/cvt-openpgp.c
parentgpg: Cleanup of dek_to_passphrase function (part 2). (diff)
downloadgnupg2-ebf24e3b29766595204355d82f435a3e675bfbbc.tar.xz
gnupg2-ebf24e3b29766595204355d82f435a3e675bfbbc.zip
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@fsij.org>
Diffstat (limited to 'agent/cvt-openpgp.c')
-rw-r--r--agent/cvt-openpgp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/agent/cvt-openpgp.c b/agent/cvt-openpgp.c
index 40d9a3e06..eb420b061 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?";