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

Be a little more verbose why a peer_cfg is inacceptable

Browse Source
This commit is contained in:
Martin Willi
2013-02-26 13:15:27 +01:00
parent 289b9b7b31
commit cc787697b8
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev2/tasks/ike_auth.c
+16 -8
View File
@@ -319,7 +319,7 @@ static bool update_cfg_candidates(private_ike_auth_t *this, bool strict)
{ {
if (this->peer_cfg) if (this->peer_cfg)
{ {
bool complies = TRUE; char *comply_error = NULL;
enumerator_t *e1, *e2, *tmp; enumerator_t *e1, *e2, *tmp;
auth_cfg_t *c1, *c2; auth_cfg_t *c1, *c2;
@@ -336,22 +336,30 @@ static bool update_cfg_candidates(private_ike_auth_t *this, bool strict)
while (e1->enumerate(e1, &c1)) while (e1->enumerate(e1, &c1))
{ {
/* check if done authentications comply to configured ones */ /* check if done authentications comply to configured ones */
if ((!e2->enumerate(e2, &c2)) || if (!e2->enumerate(e2, &c2))
(!strict && !c1->complies(c1, c2, TRUE)) ||
(strict && !c2->complies(c2, c1, TRUE)))
{ {
complies = FALSE; comply_error = "insufficient authentication rounds";
break;
}
if (!strict && !c1->complies(c1, c2, TRUE))
{
comply_error = "non-matching authentication done";
break;
}
if (strict && !c2->complies(c2, c1, TRUE))
{
comply_error = "constraint checking failed";
break; break;
} }
} }
e1->destroy(e1); e1->destroy(e1);
e2->destroy(e2); e2->destroy(e2);
if (complies) if (!comply_error)
{ {
break; break;
} }
DBG1(DBG_CFG, "selected peer config '%s' inacceptable", DBG1(DBG_CFG, "selected peer config '%s' inacceptable: %s",
this->peer_cfg->get_name(this->peer_cfg)); this->peer_cfg->get_name(this->peer_cfg), comply_error);
this->peer_cfg->destroy(this->peer_cfg); this->peer_cfg->destroy(this->peer_cfg);
} }
if (this->candidates->remove_first(this->candidates, if (this->candidates->remove_first(this->candidates,