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

Enforce uniqueness policy in IKEv1 main and aggressive modes

Browse Source
This commit is contained in:
Martin Willi
2012-06-08 16:15:22 +02:00
parent 4a10eda1a0
commit e5f0f9ff96
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/tasks/aggressive_mode.c
+16
View File
@@ -293,6 +293,14 @@ METHOD(task_t, build_i, status_t,
} }
this->id_data = chunk_empty; this->id_data = chunk_empty;
if (charon->ike_sa_manager->check_uniqueness(charon->ike_sa_manager,
this->ike_sa, FALSE))
{
DBG1(DBG_IKE, "cancelling Aggressive Mode due to uniqueness "
"policy");
return send_notify(this, AUTHENTICATION_FAILED);
}
switch (this->method) switch (this->method)
{ {
case AUTH_XAUTH_INIT_PSK: case AUTH_XAUTH_INIT_PSK:
@@ -441,6 +449,14 @@ METHOD(task_t, process_r, status_t,
return send_delete(this); return send_delete(this);
} }
if (charon->ike_sa_manager->check_uniqueness(charon->ike_sa_manager,
this->ike_sa, FALSE))
{
DBG1(DBG_IKE, "cancelling Aggressive Mode due to uniqueness "
"policy");
return send_delete(this);
}
switch (this->method) switch (this->method)
{ {
case AUTH_XAUTH_INIT_PSK: case AUTH_XAUTH_INIT_PSK:
src/libcharon/sa/ikev1/tasks/main_mode.c
+13
View File
@@ -493,6 +493,12 @@ METHOD(task_t, build_r, status_t,
{ {
return send_notify(this, AUTHENTICATION_FAILED); return send_notify(this, AUTHENTICATION_FAILED);
} }
if (charon->ike_sa_manager->check_uniqueness(charon->ike_sa_manager,
this->ike_sa, FALSE))
{
DBG1(DBG_IKE, "cancelling Main Mode due to uniqueness policy");
return send_notify(this, AUTHENTICATION_FAILED);
}
switch (this->method) switch (this->method)
{ {
@@ -616,6 +622,13 @@ METHOD(task_t, process_i, status_t,
"cancelling"); "cancelling");
return send_delete(this); return send_delete(this);
} }
if (charon->ike_sa_manager->check_uniqueness(charon->ike_sa_manager,
this->ike_sa, FALSE))
{
DBG1(DBG_IKE, "cancelling Main Mode due to uniqueness policy");
return send_delete(this);
}
switch (this->method) switch (this->method)
{ {
case AUTH_XAUTH_INIT_PSK: case AUTH_XAUTH_INIT_PSK: