denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

charon-cmd: authenticate with EAP if no private key is given

Browse Source
This commit is contained in:
Martin Willi
2013-05-06 15:28:27 +02:00
parent 7bcd96e43d
commit b48941ae16
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon-cmd/cmd/cmd_connection.c
+18 -1
View File
@@ -48,6 +48,11 @@ struct private_cmd_connection_t {
* Local identity * Local identity
*/ */
char *identity; char *identity;
/**
* Is a private key configured
*/
bool key_seen;
}; };
/** /**
@@ -93,9 +98,18 @@ static peer_cfg_t* create_peer_cfg(private_cmd_connection_t *this)
static void add_auth_cfgs(private_cmd_connection_t *this, peer_cfg_t *peer_cfg) static void add_auth_cfgs(private_cmd_connection_t *this, peer_cfg_t *peer_cfg)
{ {
auth_cfg_t *auth; auth_cfg_t *auth;
auth_class_t class;
if (this->key_seen)
{
class = AUTH_CLASS_PUBKEY;
}
else
{
class = AUTH_CLASS_EAP;
}
auth = auth_cfg_create(); auth = auth_cfg_create();
auth->add(auth, AUTH_RULE_AUTH_CLASS, AUTH_CLASS_PUBKEY); auth->add(auth, AUTH_RULE_AUTH_CLASS, class);
auth->add(auth, AUTH_RULE_IDENTITY, auth->add(auth, AUTH_RULE_IDENTITY,
identification_create_from_string(this->identity)); identification_create_from_string(this->identity));
peer_cfg->add_auth_cfg(peer_cfg, auth, TRUE); peer_cfg->add_auth_cfg(peer_cfg, auth, TRUE);
@@ -183,6 +197,9 @@ METHOD(cmd_connection_t, handle, bool,
case CMD_OPT_IDENTITY: case CMD_OPT_IDENTITY:
this->identity = arg; this->identity = arg;
break; break;
case CMD_OPT_RSA:
this->key_seen = TRUE;
break;
default: default:
return FALSE; return FALSE;
} }