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

Save authentication info collected during main mode authentication

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:31:23 +01:00
parent b24b73b7f3
commit ac3bc42e63
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/tasks/main_mode.c
+26 -1
View File
@@ -332,7 +332,28 @@ static auth_method_t get_auth_method(private_main_mode_t *this,
{
return AUTH_HYBRID_INIT_RSA;
}
return AUTH_NONE;;
return AUTH_NONE;
}
/**
* Save authentication information after authentication succeeded
*/
static void save_auth_cfg(private_main_mode_t *this, bool local)
{
auth_cfg_t *auth;
bool initiator;
initiator = local == this->initiator;
if ((initiator && this->auth_method == AUTH_HYBRID_INIT_RSA) ||
(!initiator && this->auth_method == AUTH_HYBRID_RESP_RSA))
{ /* peer not authenticated in main mode with hybrid methods */
return;
}
auth = auth_cfg_create();
/* for local config, we _copy_ entires from the config, as it contains
* certificates we must send later. */
auth->merge(auth, this->ike_sa->get_auth_cfg(this->ike_sa, local), local);
this->ike_sa->add_auth_cfg(this->ike_sa, local, auth);
}
/**
@@ -560,6 +581,7 @@ METHOD(task_t, build_i, status_t,
return FAILED;
}
authenticator->destroy(authenticator);
save_auth_cfg(this, TRUE);
this->state = MM_AUTH;
return NEED_MORE;
@@ -678,6 +700,7 @@ METHOD(task_t, process_r, status_t,
return send_notify(this, AUTHENTICATION_FAILED, chunk_empty);
}
authenticator->destroy(authenticator);
save_auth_cfg(this, FALSE);
this->state = MM_AUTH;
if (has_notify_errors(this, message))
@@ -877,6 +900,7 @@ METHOD(task_t, build_r, status_t,
return FAILED;
}
authenticator->destroy(authenticator);
save_auth_cfg(this, TRUE);
if (this->peer_cfg->get_virtual_ip(this->peer_cfg))
{
@@ -994,6 +1018,7 @@ METHOD(task_t, process_i, status_t,
return FAILED;
}
authenticator->destroy(authenticator);
save_auth_cfg(this, FALSE);
switch (this->auth_method)
{