From 9c731bbedfd8bded5efd886304c5ca6655768c45 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Thu, 16 Jan 2014 09:07:11 +0900 Subject: [PATCH] agent: Fix agent_is_eddsa_key. * agent/findkey.c (agent_is_eddsa_key): Implemented. Signed-off-by: NIIBE Yutaka --- agent/findkey.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/agent/findkey.c b/agent/findkey.c index aa2c6a2c1..6464b02ac 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; }