From 87fac9911241310a4b601e126fa2e26b10bd370f Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 31 Aug 2010 15:58:39 +0000 Subject: Import OpenPGP keys into the agent. --- agent/findkey.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'agent/findkey.c') diff --git a/agent/findkey.c b/agent/findkey.c index 5668aafbc..76221119e 100644 --- a/agent/findkey.c +++ b/agent/findkey.c @@ -702,7 +702,8 @@ key_parms_from_sexp (gcry_sexp_t s_key, gcry_sexp_t *r_list, } -/* Return true if S_KEY is a DSA style key. */ +/* Return the public key algorithm number if S_KEY is a DSA style key. + If it is not a DSA style key, return 0. */ int agent_is_dsa_key (gcry_sexp_t s_key) { @@ -714,7 +715,12 @@ agent_is_dsa_key (gcry_sexp_t s_key) if (key_parms_from_sexp (s_key, NULL, algoname, sizeof algoname, NULL, 0)) return 0; /* Error - assume it is not an DSA key. */ - return (!strcmp (algoname, "dsa") || !strcmp (algoname, "ecdsa")); + if (!strcmp (algoname, "dsa")) + return GCRY_PK_DSA; + else if (!strcmp (algoname, "ecdsa")) + return GCRY_PK_ECDSA; + else + return 0; } -- cgit v1.2.3