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

Refactor auth_cfg applying to a common function

Browse Source
This commit is contained in:
Martin Willi
2013-02-26 13:15:27 +01:00
parent bc07fef09c
commit 289b9b7b31
1 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev2/tasks/ike_auth.c
+17 -20
View File
@@ -222,6 +222,18 @@ static auth_cfg_t *get_auth_cfg(private_ike_auth_t *this, bool local)
return next; return next;
} }
/**
* Move the currently active auth config to the auth configs completed
*/
static void apply_auth_cfg(private_ike_auth_t *this, bool local)
{
auth_cfg_t *cfg;
cfg = auth_cfg_create();
cfg->merge(cfg, this->ike_sa->get_auth_cfg(this->ike_sa, local), local);
this->ike_sa->add_auth_cfg(this->ike_sa, local, cfg);
}
/** /**
* Check if we have should initiate another authentication round * Check if we have should initiate another authentication round
*/ */
@@ -464,10 +476,7 @@ METHOD(task_t, build_i, status_t,
switch (this->my_auth->build(this->my_auth, message)) switch (this->my_auth->build(this->my_auth, message))
{ {
case SUCCESS: case SUCCESS:
/* authentication step complete, reset authenticator */ apply_auth_cfg(this, TRUE);
cfg = auth_cfg_create();
cfg->merge(cfg, this->ike_sa->get_auth_cfg(this->ike_sa, TRUE), TRUE);
this->ike_sa->add_auth_cfg(this->ike_sa, TRUE, cfg);
this->my_auth->destroy(this->my_auth); this->my_auth->destroy(this->my_auth);
this->my_auth = NULL; this->my_auth = NULL;
break; break;
@@ -640,10 +649,7 @@ METHOD(task_t, process_r, status_t,
return NEED_MORE; return NEED_MORE;
} }
/* store authentication information */ apply_auth_cfg(this, FALSE);
cfg = auth_cfg_create();
cfg->merge(cfg, this->ike_sa->get_auth_cfg(this->ike_sa, FALSE), FALSE);
this->ike_sa->add_auth_cfg(this->ike_sa, FALSE, cfg);
if (!update_cfg_candidates(this, FALSE)) if (!update_cfg_candidates(this, FALSE))
{ {
@@ -778,10 +784,7 @@ METHOD(task_t, build_r, status_t,
switch (this->my_auth->build(this->my_auth, message)) switch (this->my_auth->build(this->my_auth, message))
{ {
case SUCCESS: case SUCCESS:
cfg = auth_cfg_create(); apply_auth_cfg(this, TRUE);
cfg->merge(cfg, this->ike_sa->get_auth_cfg(this->ike_sa, TRUE),
TRUE);
this->ike_sa->add_auth_cfg(this->ike_sa, TRUE, cfg);
this->my_auth->destroy(this->my_auth); this->my_auth->destroy(this->my_auth);
this->my_auth = NULL; this->my_auth = NULL;
break; break;
@@ -969,10 +972,7 @@ METHOD(task_t, process_i, status_t,
goto peer_auth_failed; goto peer_auth_failed;
} }
/* store authentication information, reset authenticator */ apply_auth_cfg(this, FALSE);
cfg = auth_cfg_create();
cfg->merge(cfg, this->ike_sa->get_auth_cfg(this->ike_sa, FALSE), FALSE);
this->ike_sa->add_auth_cfg(this->ike_sa, FALSE, cfg);
} }
if (this->my_auth) if (this->my_auth)
@@ -980,10 +980,7 @@ METHOD(task_t, process_i, status_t,
switch (this->my_auth->process(this->my_auth, message)) switch (this->my_auth->process(this->my_auth, message))
{ {
case SUCCESS: case SUCCESS:
cfg = auth_cfg_create(); apply_auth_cfg(this, TRUE);
cfg->merge(cfg, this->ike_sa->get_auth_cfg(this->ike_sa, TRUE),
TRUE);
this->ike_sa->add_auth_cfg(this->ike_sa, TRUE, cfg);
this->my_auth->destroy(this->my_auth); this->my_auth->destroy(this->my_auth);
this->my_auth = NULL; this->my_auth = NULL;
this->do_another_auth = do_another_auth(this); this->do_another_auth = do_another_auth(this);