aboutsummaryrefslogtreecommitdiffstats
path: root/src/charon-cmd/cmd
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2013-04-01 19:47:23 +0200
committerTobias Brunner <tobias@strongswan.org>2013-05-07 17:08:31 +0200
commite07e489d5f4738b9c340b30ab8d83d3d2d59017c (patch)
treed32896d049a4cf7652d3f38cf25b206e03061d8d /src/charon-cmd/cmd
parentdd9e366814475f22bf22ef874cf68f8691e19c81 (diff)
downloadstrongswan-e07e489d5f4738b9c340b30ab8d83d3d2d59017c.tar.bz2
strongswan-e07e489d5f4738b9c340b30ab8d83d3d2d59017c.tar.xz
agent: Use sshkey plugin to parse keys, adds support for ECDSA
Diffstat (limited to 'src/charon-cmd/cmd')
-rw-r--r--src/charon-cmd/cmd/cmd_creds.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/charon-cmd/cmd/cmd_creds.c b/src/charon-cmd/cmd/cmd_creds.c
index 178b77d49..31e578995 100644
--- a/src/charon-cmd/cmd/cmd_creds.c
+++ b/src/charon-cmd/cmd/cmd_creds.c
@@ -148,7 +148,7 @@ static void load_agent(private_cmd_creds_t *this)
}
privkey = lib->creds->create(lib->creds, CRED_PRIVATE_KEY,
- KEY_RSA, BUILD_AGENT_SOCKET, agent, BUILD_END);
+ KEY_ANY, BUILD_AGENT_SOCKET, agent, BUILD_END);
if (!privkey)
{
DBG1(DBG_CFG, "failed to load private key from ssh-agent");
@@ -200,6 +200,8 @@ METHOD(cmd_creds_t, handle, bool,
if (this->agent && this->identity)
{
load_agent(this);
+ /* only do this once */
+ this->agent = FALSE;
}
return TRUE;
}